@@ -8,7 +8,7 @@ Feature: Alternate preparations for recipes
Given a "pancake" recipe with "buttermilk"
And no other recipes
- When I view the recipe
+ When I visit the recipe with "buttermilk" in it
Then I should see no alternate preparations
Scenario: Alternate preparation
features/recipe_alternate_preparations.feature
@@ -7,7 +7,7 @@ Feature: Updating recipes in our cookbook
Scenario: No previous or next version of a recipe
Given a "Buttermilk Pancake" recipe with "buttermilk"
- When I view the recipe
+ When I visit the recipe with "buttermilk" in it
Then I should not see previous versions of the recipe
And I should not see updated versions of the recipe
features/recipe_replacement.feature
@@ -3,7 +3,7 @@ Given /^"([^\"]*)", (\w+) on ([-\d]+)$/ do |title, status, date_str|
type = title.split.first
permalink = date.to_s
- permalink += "-" + title.downcase.gsub(/[#\W]+/, '-') if type == 'Recipe'
+ permalink += "-" + title.downcase.gsub(/[#\W]+/, '_') if type == 'Recipe'
var_name = '@' + title.downcase.gsub(/[#\W]+/, '_') + '_permalink'
instance_variable_set(var_name.to_sym, permalink)
@@ -23,7 +23,7 @@ Given /^"([^\"]*)", (\w+) on ([-\d]+)$/ do |title, status, date_str|
end
When /^I show "Recipe #1"$/ do
- visit("/recipes/#{@recipe_1_permalink}")
+ visit("/recipes/#{@recipe_1_permalink.gsub('-', '/')}")
end
When /^I show "Meal #1"$/ do
features/step_definitions/draft.rb
@@ -19,7 +19,7 @@ Given /^the three pancake recipes are alternate preparations of each other$/ do
end
When /^I visit the "Hearty Pancake" recipe$/ do
- visit "/recipes/#{@permalink_identified_by['wheat germ']}"
+ visit "/recipes/#{@permalink_identified_by['wheat germ'].gsub(/-/, '/')}"
end
Then /^I should see no alternate preparations$/ do
features/step_definitions/recipe_alternates.rb
@@ -1,7 +1,7 @@
Given /^a recipe for Buttermilk Chocolate Chip Pancakes$/ do
@date = Date.new(2009, 3, 24)
@title = "Buttermilk Chocolate Chip Pancakes"
- @permalink = @date.to_s + "-" + @title.downcase.gsub(/\W/, '-')
+ @permalink = @date.to_s + "-" + @title.downcase.gsub(/\W/, '_')
recipe = {
:title => @title,
@@ -38,7 +38,7 @@ end
Given /^a recipe for Crockpot Lentil Andouille Soup$/ do
@date = Date.new(2009, 3, 24)
@title = "Crockpot Lentil Andouille Soup"
- @permalink = @date.to_s + "-" + @title.downcase.gsub(/\W/, '-')
+ @permalink = @date.to_s + "-" + @title.downcase.gsub(/\W/, '_')
recipe = {
:title => @title,
@@ -55,7 +55,7 @@ end
Given /^a recipe for Chicken Noodle Soup$/ do
@date = Date.new(2009, 4, 1)
@title = "Chicken Noodle Soup"
- @permalink = @date.to_s + "-" + @title.downcase.gsub(/\W/, '-')
+ @permalink = @date.to_s + "-" + @title.downcase.gsub(/\W/, '_')
recipe = {
:title => @title,
@@ -97,7 +97,7 @@ end
Given /^a recipe for Mango and Tomato Salad$/ do
@date = Date.new(2009, 4, 2)
@title = "Mango and Tomato Salad"
- @permalink = @date.to_s + "-" + @title.downcase.gsub(/\W/, '-')
+ @permalink = @date.to_s + "-" + @title.downcase.gsub(/\W/, '_')
recipe = {
:title => @title,
@@ -113,7 +113,7 @@ end
Given /^a recipe for Curried Shrimp$/ do
@date = Date.new(2009, 4, 2)
@title = "Curried Shrimp"
- @permalink = @date.to_s + "-" + @title.downcase.gsub(/\W/, '-')
+ @permalink = @date.to_s + "-" + @title.downcase.gsub(/\W/, '_')
@summary = "This dish is *yummy*."
@instructions = <<_EOM
@@ -136,7 +136,7 @@ end
Given /^a "([^\"]*)" recipe from (.+)$/ do |title, date_str|
date = Date.parse(date_str)
- @recipe_permalink = date.to_s + "-" + title.downcase.gsub(/\W/, '-')
+ @recipe_permalink = date.to_s + "-" + title.downcase.gsub(/\W/, '_')
recipe = {
:title => title,
@@ -153,11 +153,11 @@ Given /^a "([^\"]*)" recipe from (.+)$/ do |title, date_str|
end
When /^I view the recipe$/ do
- visit("/recipes/#{@permalink}")
+ visit("/recipes/#{@permalink.gsub(/-/, '/')}")
end
When /^I view the "([^\"]*)" recipe$/ do |title|
- visit("/recipes/#{@recipe_permalink}")
+ visit("/recipes/#{@recipe_permalink.gsub(/-/, '/')}")
end
features/step_definitions/recipe_details.rb
@@ -1,6 +1,6 @@
Given /^a "([^\"]*)" recipe (.*)with "([^\"]*)"$/ do |title, on, ingredient|
date = (on == "") ? Date.new(2009, 9, 5) : Date.new(2000, 9, 5)
- permalink = date.to_s + "-" + title.downcase.gsub(/\W/, '-')
+ permalink = date.to_s + "-" + title.downcase.gsub(/\W/, '_')
@permalink_identified_by ||= { }
@permalink_identified_by[ingredient] = permalink
@@ -34,7 +34,7 @@ When /^the "([^\"]*)" recipe is marked as update of the "([^\"]*)" recipe$/ do |
end
When /^I visit the recipe with "([^\"]*)" in it$/ do |ingredient|
- visit "/recipes/#{@permalink_identified_by[ingredient]}"
+ visit "/recipes/#{@permalink_identified_by[ingredient].gsub(/-/, '/')}"
end
Then /^I should not see previous versions of the recipe$/ do
@@ -47,7 +47,7 @@ end
Then /^I should see that the recipe is an update to the recipe with "([^\"]*)" in it$/ do |ingredient|
response.should have_selector(".update-of a",
- :href => "/recipes/#{@permalink_identified_by[ingredient]}")
+ :href => "/recipes/#{@permalink_identified_by[ingredient].gsub(/-/, '/')}")
end
Then /^I should see that the recipe was updated by the recipe with "([^\"]*)" in it$/ do |ingredient|
features/step_definitions/recipe_replacement.rb
@@ -69,10 +69,15 @@ module Eee
end
end
+ def url_from_permalink(permalink)
+ permalink.split(/-/, 4).join('/')
+ end
+
def recipe_link(link, title=nil)
permalink = link.gsub(/\//, '-')
recipe = JSON.parse(RestClient.get("#{_db}/#{permalink}"))
- %Q|<a href="/recipes/#{recipe['_id'].gsub(/-/, '/')}">#{title || recipe['title']}</a>|
+ url = "/recipes/" + url_from_permalink(recipe['_id'])
+ %Q|<a href="#{url}">#{title || recipe['title']}</a>|
end
def meal_link(link, title=nil)
@@ -282,7 +287,8 @@ _EOM
if previous
links = previous.map do |update_permalink|
date_str = Date.parse(update_permalink).strftime("%B %e, %Y")
- %Q|<a href="/recipes/#{update_permalink}">#{date_str}</a>|
+ url = "/recipes/" + url_from_permalink(update_permalink)
+ %Q|<a href="#{url}">#{date_str}</a>|
end
%Q|<span class="update-of">| +
@@ -324,7 +330,7 @@ _EOM
if ids && ids.size > 0
%Q|<span class="label">Alternate Preparations:</span> | +
couch_recipe_titles(ids).
- map{ |recipe| %Q|<a href="/recipes/#{recipe[:id]}">#{recipe[:title]}</a>|}.
+ map{ |recipe| %Q|<a href="/recipes/#{url_from_permalink(recipe[:id])}">#{recipe[:title]}</a>|}.
join(", ")
end
end
helpers.rb
@@ -520,7 +520,7 @@ describe "recipe_update_of" do
stub!(:couch_recipe_update_of).and_return(['2000-09-07-recipe'])
recipe_update_of('2009-09-07-recipe').
should have_selector('span.update-of a',
- :href => "/recipes/2000-09-07-recipe")
+ :href => "/recipes/2000/09/07/recipe")
end
it "should link to a pretty formatted date" do
stub!(:couch_recipe_update_of).and_return(['2000-09-07-recipe'])
spec/eee_helpers_spec.rb
@@ -50,14 +50,14 @@ describe "recipe.haml" do
it "should link to previous recipe" do
render("/views/recipe.haml")
response.should have_selector("a",
- :href => "/recipes/2009-06-01-foo",
+ :href => "/recipes/2009/06/01/foo",
:content => "June 1, 2009")
end
it "should link to previous recipe title" do
render("/views/recipe.haml")
response.should have_selector("a",
- :href => "/recipes/2009-06-01-foo",
+ :href => "/recipes/2009/06/01/foo",
:content => "Foo")
end
spec/views/recipe.haml_spec.rb
@@ -15,9 +15,9 @@
%div.navigation
‹
- =link_to_adjacent_view_date(@recipe['date'], @recipes_by_date, :previous => true) { |k, r| Date.parse(r['date']).strftime(%Q|<a id="previous-recipe" href="/recipes/#{r['id']}">#{r['title']} (%B %e, %Y)</a>|) }
+ =link_to_adjacent_view_date(@recipe['date'], @recipes_by_date, :previous => true) { |k, r| Date.parse(r['date']).strftime(%Q|<a id="previous-recipe" href="/recipes/#{url_from_permalink(r['id'])}">#{r['title']} (%B %e, %Y)</a>|) }
|
- =link_to_adjacent_view_date(@recipe['date'], @recipes_by_date) { |k, r| Date.parse(r['date']).strftime(%Q|<a id="next-recipe" href="/recipes/#{r['id']}">#{r['title']} (%B %e, %Y)</a>|) }
+ =link_to_adjacent_view_date(@recipe['date'], @recipes_by_date) { |k, r| Date.parse(r['date']).strftime(%Q|<a id="next-recipe" href="/recipes/#{url_from_permalink(r['id'])}">#{r['title']} (%B %e, %Y)</a>|) }
›
#recipe-meta
views/recipe.haml
d4cec1a25672d250fca8c9bb03a83c864b0135c2
eee-c
eee.c@eeecooks.com
http://github.com/eee-c/eee-code/commit/8a8889f65521fd3339d2aa1a7b098bd145754c9f
8a8889f65521fd3339d2aa1a7b098bd145754c9f
2009-10-16T01:50:37-07:00
2009-10-16T01:50:37-07:00
Changes in response to converting the recipe URLs from /recipes/YYYY-MM-DD-short_name to /recipes/YYYY/MM/DD/short_name.
1b469237437052bac81132f19451b2a1fa13bc0d
eee-c
eee.c@eeecooks.com