pickle-dupe 0.2.2 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/features/app/action_controllers.rb

@@ -0,0 +1,18 @@
+# controllers
+class DefaultController < ActionController::Base
+  def index
+    render :text => "index: I was invoked with #{request.path}"
+  end
+  
+  def show
+    render :text => "show: I was invoked with #{request.path}"
+  end
+  
+  def new
+    render :text => "new: I was invoked with #{request.path}"
+  end
+  
+  def edit
+    render :text => "edit: I was invoked with #{request.path}"
+  end
+end

data/features/app/active_resources.rb

@@ -1,5 +1,8 @@
 class AbstractResource < ActiveResource::Base
   self.site = ''
+  def to_param
+    label rescue super
+  end
 end
 
 class Recipe < AbstractResource

data/features/app/routes.rb

@@ -0,0 +1,10 @@
+# Routes
+ActionController::Routing::Routes.draw do |map|
+  # Since I started using recipe -> ingredient before working on path stuff, there is no turning back
+  # so even if the nestedness does not make sense, I have to use it
+  map.resources :recipes, :controller => 'default' do |recipe|
+    recipe.resources :ingredients, :controller => 'default' do |ingredient|
+      ingredient.resources :comments, :controller => 'default'
+    end
+  end
+end

data/features/path/models_page.feature

@@ -0,0 +1,44 @@
+Feature: I can visit a page for a model
+  In order to easily go to pages for models I've created
+  As a feature writer
+  I want to be able visit pages their model
+
+  Scenario: create a recipe, go its page
+    Given a recipe exists
+    When I go to the recipe's page
+    Then I should be at the recipe's page
+    And the recipe's page should match route /recipes/:id
+    
+  Scenario: create a recipe, go to its edit page, check lots of different refs to it
+    Given a recipe: "chicken fingers" exists
+    When I go to recipe: "chicken fingers"'s edit page
+    Then I should be at the 1st recipe's edit page
+    And the 1st recipe's edit page should match route /recipes/:id/edit
+    And the recipe's edit page should match route /recipes/:id/edit
+    And the recipe: "chicken fingers"'s edit page should match route /recipes/:id/edit  
+    
+  Scenario: go to a recipe's nested ingredients page
+    Given a recipe exists
+    When I go to the recipe's ingredients page
+    Then I should be at the recipe's ingredients page
+    And the recipe's ingredients page should match route /recipes/:recipe_id/ingredients
+  
+  Scenario: go to a recipe's new ingredient page
+    Given a recipe exists
+    When I go to the recipe's new ingredient page
+    Then I should be at the recipe's new ingredient page
+    And the recipe's new ingredient page should match route /recipes/:recipe_id/ingredients/new
+    
+  Scenario: go to a ingredient in recipe context page
+    Given a recipe exists
+    And an ingredient exists with recipe: the recipe
+    When I go to the recipe's ingredient's page
+    Then I should be at the recipe's ingredient's page
+    And the recipe's ingredient's page should match route /recipes/:recipe_id/ingredients/:id
+    
+  Scenario: go to a ingredient's comments in recipe context
+    Given a recipe exists
+    And an ingredient exists with recipe: the recipe
+    When I go to the recipe's ingredient's comments page
+    Then I should be at the recipe's ingredient's comments page
+    And the recipe's ingredient's comments page should match route /recipes/:recipe_id/ingredients/:ingredient_id/comments

data/features/path/named_route_page.feature

@@ -0,0 +1,11 @@
+Feature: I can visit a page by named route
+  In order to nav in my features
+  As a feature writer
+  I want to be able visit named routes
+  
+  @wip
+  Scenario: visit the new spoons page
+    When I go to the new recipe page
+    Then I should be at the new recipe page
+    And the new recipe page should match route /recipes/new
+   

data/features/step_definitions/path_steps.rb

@@ -1,7 +1,8 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
 
+#FIXME GC 04/09/2010 - Should match either a digit or a valid label
 Then(/^(.+?) should match route \/(.+?)$/) do |page, route|
-  regexp = route.gsub(/:(\w*?)id/,'\d+')
+  regexp = route.gsub(/:(\w*?)id/,'(?:\d+|[A-Za-z0-9_-]+)')
   path_to(page).should =~ /#{regexp}/
 end
 

data/lib/pickle_dupe/adapter.rb

@@ -26,12 +26,12 @@ module Pickle
         end
         @name = model.name.to_s
       end
-    
+
       def create(attrs = {})
         duped_object = ::Dupe.create(@name, attrs)
         assign_missing_associations(duped_object, attrs) unless attrs.blank?
-        
-        return duped_object
+
+        return @klass.send(:find, duped_object.id)
       end
       
     private
@@ -96,11 +96,14 @@ module Pickle
         has_many_association = has_one_association.to_s.pluralize.to_sym #=> :direction_steps
         
         # The following would check for the existence of the key :direction_steps
-        # in the duped recipe's definition 
-        if association_object.__model__.schema.attribute_templates.keys.include?(has_many_association)
-          association_object[has_many_association] << duped_object
+        # in the duped recipe's definition
+        association_duped_object = ::Dupe.find(association_object.class.name.underscore){|d| 
+            d.id == association_object.id
+          }
+        if association_duped_object.__model__.schema.attribute_templates.keys.include?(has_many_association)
+          association_duped_object[has_many_association] << duped_object
         else #assume it's a has_one association
-          association_object[has_one_association] = duped_object
+          association_duped_object[has_one_association] = duped_object
         end
       end
       
@@ -110,7 +113,7 @@ module Pickle
       # :association => [<#Duped...>] will return [[<#Duped...>,<#Duped...>],<#Duped...>]
       def collect_association_objects(attrs)
         attrs.select {|k,v| 
-          v.kind_of?(Array) || v.kind_of?(::Dupe::Database::Record)
+          v.kind_of?(Array) || v.kind_of?(ActiveResource::Base)
         }.collect {|i| i[1]}.flatten
       end
       

data/lib/pickle_dupe.rb

@@ -1,4 +1,3 @@
 require 'pickle'
 require 'pickle_dupe/adapter'
-require 'pickle_dupe/session'
 require 'pickle_dupe/parser'

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - iawgens
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 -04:00
+date: 2010-04-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,8 +61,12 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- features/app/action_controllers.rb
 - features/app/active_resources.rb
 - features/app/dupe_definitions.rb
+- features/app/routes.rb
+- features/path/models_page.feature
+- features/path/named_route_page.feature
 - features/pickle/create_from_dupe.feature
 - features/step_definitions/path_steps.rb
 - features/step_definitions/pickle_steps.rb
@@ -75,7 +79,6 @@ files:
 - lib/pickle_dupe.rb
 - lib/pickle_dupe/adapter.rb
 - lib/pickle_dupe/parser.rb
-- lib/pickle_dupe/session.rb
 has_rdoc: true
 homepage: http://github.com/iawgens/pickle-dupe
 licenses: []

data/lib/pickle_dupe/session.rb

@@ -1,17 +0,0 @@
-module Pickle
-  module Session
-    # return a newly selected model when dupe is used
-    def model_with_dupe(name)
-      model = created_model(name)
-      
-      if model.kind_of?(Dupe::Database::Record)
-        Dupe.find(model.__model__.name) {|dupe_model| dupe_model.id == model.id}
-      else
-        model_without_dupe(name)
-      end
-    end
-    
-    alias_method :model_without_dupe, :model
-    alias_method :model, :model_with_dupe
-  end
-end