radiant-templates-extension 1.0.0 → 1.0.1

data/vendor/plugins/make_resourceful/lib/resourceful/default/accessors.rb

@@ -85,10 +85,10 @@ module Resourceful
       # For example, if Person has_one Hat,
       # then in HatsController current_object essentially runs <tt>Person.find(params[:person_id]).hat</tt>.
       def current_object
-        @current_object ||= if plural?
-          current_model.find(params[:id])
+        @current_object ||= if !parent? || plural?
+          current_model.find(params[:id]) if params[:id]
         else
-          parent_object.send(instance_variable_name)
+          parent_object.send(instance_variable_name.singularize)
         end
       end
 
@@ -126,7 +126,10 @@ module Resourceful
           current_model.build(object_parameters)
         else
           returning(current_model.new(object_parameters)) do |obj|
-            obj.send("#{parent_name}_id=", parent_object.id) if singular? && parent?
+            if singular? && parent?
+              obj.send("#{parent_name}_id=", parent_object.id)
+              obj.send("#{parent_name}_type=", parent_object.class.to_s) if polymorphic_parent?
+            end
           end
         end
       end
@@ -205,6 +208,11 @@ module Resourceful
         !!parent_name
       end
 
+      # Returns whether the parent (if it exists) is polymorphic
+      def polymorphic_parent?
+        !!polymorphic_parent_name
+      end
+
       # Returns the name of the current parent object if a parent id is given, or nil otherwise.
       # For example, in HatsController where Rack has_many :hats and Person has_many :hats,
       # if <tt>params[:rack_id]</tt> is given,
@@ -235,20 +243,61 @@ module Resourceful
       # rather than <tt>@parent_name ||=</tt>. See the source code.
       # 
       # Finally, note that parents must be declared via Builder#belongs_to.
+      #
+      # FIXME - Perhaps this logic should be moved to parent?() or another init method
       def parent_name
         return @parent_name if defined?(@parent_name)
         @parent_name = parent_names.find { |name| params["#{name}_id"] }
+        if @parent_name.nil?
+          # get any polymorphic parents through :as association inspection
+          names = params.reject { |key, value| key.to_s[/_id$/].nil? }.keys.map { |key| key.chomp("_id") }
+          names.each do |name|
+            begin
+              klass = name.camelize.constantize
+              id = params["#{name}_id"]
+              object = klass.find(id)
+              if association = object.class.reflect_on_all_associations.detect { |association| association.options[:as] && parent_names.include?(association.options[:as].to_s) }
+                @parent_name = name
+                @polymorphic_parent_name = association.options[:as].to_s
+                @parent_class_name = name.camelize
+                @parent_object = object
+                break
+              end
+            rescue
+            end
+          end
+        else
+          @parent_class_name = params["#{parent_name}_type"]
+          @polymorphic_parent = !@parent_class_name.nil?
+        end
+        @parent_name
+      end
+      
+      def polymorphic_parent_name
+        @polymorphic_parent_name
+      end
+
+      # Returns the class name of the current parent.
+      # For example, in HatsController where Person has_many :hats,
+      # if <tt>params[:person_id]</tt> is given,
+      #
+      #   parent_class_name #=> 'Person'
+      #
+      # Note that parents must be declared via Builder#belongs_to.
+      def parent_class_name
+        parent_name # to init @parent_class_name
+        @parent_class_name ||= parent_name.nil? ? nil : parent_name.camelize
       end
 
       # Returns the model class of the current parent.
       # For example, in HatsController where Person has_many :hats,
       # if <tt>params[:person_id]</tt> is given,
       #
-      #   parent_models #=> Rack
+      #   parent_models #=> Person
       #
       # Note that parents must be declared via Builder#belongs_to.
       def parent_model
-        parent_name.camelize.constantize
+        parent_class_name.nil? ? nil : parent_class_name.constantize
       end
 
       # Returns the current parent object for the current object.
@@ -262,7 +311,7 @@ module Resourceful
       # Note also that the results of this method are cached
       # so that multiple calls don't result in multiple SQL queries.
       def parent_object
-        @parent_object ||= parent_model.find(params["#{parent_name}_id"])
+        @parent_object ||= parent_model.nil? ? nil : parent_model.find(params["#{parent_name}_id"])
       end
 
       # Assigns the current parent object, as given by parent_objects,
@@ -272,6 +321,7 @@ module Resourceful
       # You shouldn't need to use it directly unless you're creating a new action.
       def load_parent_object
         instance_variable_set("@#{parent_name}", parent_object) if parent?
+        instance_variable_set("@#{polymorphic_parent_name}", parent_object) if polymorphic_parent?
       end
 
       # Renders a 422 error if no parent id is given.
@@ -328,6 +378,9 @@ module Resourceful
       #
       # Note that the way this is determined is based on the singularity of the controller name,
       # so it may yield false positives for oddly-named controllers and need to be overridden.
+      # 
+      # TODO: maybe we can define plural? and singular? as class_methods, 
+      # so they are not visible to the world
       def singular?
         instance_variable_name.singularize == instance_variable_name
       end
@@ -338,6 +391,9 @@ module Resourceful
       # Note that the way this is determined is based on the singularity of the controller name,
       # so it may yield false negatives for oddly-named controllers.
       # If this is the case, the singular? method should be overridden.
+      # 
+      # TODO: maybe we can define plural? and singular? as class_methods, 
+      # so they are not visible to the world
       def plural?
         !singular?
       end

data/vendor/plugins/make_resourceful/lib/resourceful/default/actions.rb

@@ -15,14 +15,15 @@ module Resourceful
     module Actions
       # GET /foos
       def index
-        load_objects
+        #load_objects
         before :index
         response_for :index
       end
 
       # GET /foos/12
       def show
-        load_object
+        # NOTE - Moved this call to a more generic place
+        #load_object
         before :show
         response_for :show
       rescue
@@ -47,9 +48,17 @@ module Resourceful
 
       # PUT /foos/12
       def update
-        load_object
+        #load_object
         before :update
-        if current_object.update_attributes object_parameters
+        
+        begin
+          result = current_object.update_attributes object_parameters
+        rescue ActiveRecord::StaleObjectError
+          current_object.reload
+          result = false
+        end
+        
+        if result
           save_succeeded!
           after :update
           response_for :update
@@ -70,14 +79,14 @@ module Resourceful
 
       # GET /foos/12/edit
       def edit
-        load_object
+        #load_object
         before :edit
         response_for :edit
       end
 
       # DELETE /foos/12
       def destroy
-        load_object
+        #load_object
         before :destroy
         if current_object.destroy
           after :destroy

data/vendor/plugins/make_resourceful/lib/resourceful/default/responses.rb

@@ -58,7 +58,7 @@ module Resourceful
           end
 
           response_for(:show_fails) do |format|
-            not_found = Proc.new { render :text => "No item found", :status => 404 }
+            not_found = Proc.new { render :text => I18n.t('make_resourceful.show.fails', :default => "No item found"), :status => 404 }
             format.html &not_found
             format.js &not_found
             format.xml &not_found
@@ -66,7 +66,7 @@ module Resourceful
 
           response_for(:create) do |format|
             format.html do
-              set_default_flash(:notice, "Create successful!")
+              set_default_flash :notice, I18n.t('make_resourceful.create.success', :default => "Create successful!")
               set_default_redirect object_path
             end
             format.js
@@ -74,7 +74,7 @@ module Resourceful
           
           response_for(:create_fails) do |format|
             format.html do
-              set_default_flash :error, "There was a problem!"
+              set_default_flash :error, I18n.t('make_resourceful.create.fails', :default => "There was a problem!")
               render :action => :new, :status => 422
             end
             format.js
@@ -82,7 +82,7 @@ module Resourceful
         
           response_for(:update) do |format|
             format.html do
-              set_default_flash :notice, "Save successful!"
+              set_default_flash :notice, I18n.t('make_resourceful.update.success', :default => "Save successful!")
               set_default_redirect object_path
             end
             format.js
@@ -90,7 +90,7 @@ module Resourceful
           
           response_for(:update_fails) do |format|
             format.html do
-              set_default_flash :error, "There was a problem saving!"
+              set_default_flash :error, I18n.t('make_resourceful.update.fails', :default => "There was a problem saving!")
               render :action => :edit, :status => 422
             end
             format.js
@@ -98,7 +98,7 @@ module Resourceful
           
           response_for(:destroy) do |format|
             format.html do
-              set_default_flash :notice, "Record deleted!"
+              set_default_flash :notice, I18n.t('make_resourceful.destroy.success', :default => "Record deleted!")
               set_default_redirect objects_path
             end
             format.js
@@ -106,7 +106,7 @@ module Resourceful
           
           response_for(:destroy_fails) do |format|
             format.html do
-              set_default_flash :error, "There was a problem deleting!"
+              set_default_flash :error, I18n.t('make_resourceful.destroy.fails', :default => "There was a problem deleting!")
               set_default_redirect :back, :status => :failure
             end
             format.js

data/vendor/plugins/make_resourceful/lib/resourceful/default/urls.rb

@@ -65,11 +65,11 @@ module Resourceful
       # This returns the path for the parent object.
       # 
       def parent_path(object = parent_object)
-        instance_route(parent_name, object, 'path')
+        instance_route(parent_class_name.underscore, object, 'path')
       end
       # Same as parent_path, but with the protocol and hostname.
       def parent_url(object = parent_object)
-        instance_route(parent_name, object, 'url')
+        instance_route(parent_class_name.underscore, object, 'url')
       end
 
       # This prefix is added to the Rails URL helper names
@@ -98,7 +98,7 @@ module Resourceful
       #
       # See also url_helper_prefix.
       def collection_url_prefix
-        parent? ? "#{parent_name}_" : ''
+        parent? ? "#{parent_class_name.underscore}_" : ''
       end
 
       private
@@ -109,7 +109,7 @@ module Resourceful
 
       def nested_object_route(object, type)
         return object_route(object, type) unless parent?
-        send("#{url_helper_prefix}#{parent_name}_#{current_model_name.underscore}_#{type}", parent_object, object)
+        send("#{url_helper_prefix}#{parent_class_name.underscore}_#{current_model_name.underscore}_#{type}", parent_object, object)
       end
 
       def edit_object_route(object, type)
@@ -125,11 +125,11 @@ module Resourceful
       end
 
       def instance_route(name, object, type, action = nil)
-        send("#{action ? action + '_' : ''}#{url_helper_prefix}#{name}_#{type}", object)
+        send("#{action ? action + '_' : ''}#{url_helper_prefix}#{collection_url_prefix}#{name}_#{type}", *(parent? ? [parent_object, object] : [object]))
       end
 
       def collection_route(name, type, action = nil)
-        send("#{action ? action + '_' : ''}#{url_helper_prefix || collection_url_prefix}#{name}_#{type}",
+        send("#{action ? action + '_' : ''}#{url_helper_prefix}#{collection_url_prefix}#{name}_#{type}",
              *(parent? ? [parent_object] : []))
       end
     end

data/vendor/plugins/make_resourceful/lib/resourceful/maker.rb

@@ -75,6 +75,7 @@ module Resourceful
       helper_method(:object_path, :objects_path, :new_object_path, :edit_object_path,
                     :object_url, :objects_url, :new_object_url, :edit_object_url,
                     :parent_path, :parent_url,
+                    :nested_object_path, :nested_object_url,
                     :current_objects, :current_object, :current_model, :current_model_name,
                     :namespaces, :instance_variable_name, :parent_names, :parent_name,
                     :parent?, :parent_model, :parent_object, :save_succeeded?)

data/vendor/plugins/make_resourceful/spec/accessors_spec.rb

@@ -77,7 +77,7 @@ describe Resourceful::Default::Accessors, "#current_object on a singular control
   before :each do
     mock_controller Resourceful::Default::Accessors
     @controller.stubs(:plural?).returns(false)
-    @controller.stubs(:instance_variable_name).returns("post")
+    @controller.stubs(:controller_name).returns("posts")
 
     @parent = stub('parent')
     @controller.stubs(:parent_object).returns(@parent)
@@ -86,7 +86,7 @@ describe Resourceful::Default::Accessors, "#current_object on a singular control
     @object = stub
   end
 
-  it "should look up the instance object of the parent object" do
+  it "should return the instance object from parent object" do
     @parent.expects(:post).returns(@object)
     @controller.current_object.should == @object
   end
@@ -342,6 +342,7 @@ describe Resourceful::Default::Accessors, " with no parents" do
     mock_controller Resourceful::Default::Accessors
     @controller.stubs(:parents).returns([])
     @controller.stubs(:current_model_name).returns('Line')
+    @controller.stubs(:params).returns({})
     stub_const 'Line'
   end
 

data/vendor/plugins/make_resourceful/spec/actions_spec.rb

@@ -10,7 +10,7 @@ describe Resourceful::Default::Actions, " index action" do
   after(:each) { @controller.index }
 
   it "should load the object collection" do
-    @controller.expects(:load_objects)
+    #@controller.expects(:load_objects)
   end
 
   it "should call the before :index callback" do
@@ -32,7 +32,7 @@ describe Resourceful::Default::Actions, " show action" do
   after(:each) { @controller.show }
   
   it "should load the instance object" do
-    @controller.expects(:load_object)
+    #@controller.expects(:load_object)
   end
 
   it "should call the before :show callback" do
@@ -44,7 +44,7 @@ describe Resourceful::Default::Actions, " show action" do
   end
 
   it "should run the response for show failing if an exception is raised" do
-    @controller.stubs(:load_object).raises("Oh no!")
+    @controller.stubs(:response_for).with(:show).raises("Oh no!")
     @controller.expects(:response_for).with(:show_fails)
   end
 end
@@ -128,7 +128,7 @@ describe Resourceful::Default::Actions, " successful update action" do
   after(:each) { @controller.update }
 
   it "should load the instance object" do
-    @controller.expects(:load_object)
+    #@controller.expects(:load_object)
   end
 
   it "should call the before :update callback" do
@@ -178,6 +178,33 @@ describe Resourceful::Default::Actions, " unsuccessful update action" do
   end
 end
 
+describe Resourceful::Default::Actions, " unsuccessful update action because of StaleObjectError" do
+  include ControllerMocks
+  before :each do
+    mock_controller Resourceful::Default::Actions
+    [:load_object, :before, :after, :object_parameters,
+     :save_failed!, :response_for].each(&@controller.method(:stubs))
+    @object = stub_model("Thing")
+    @object.stubs(:update_attributes).raises(ActiveRecord::StaleObjectError)
+    @object.expects(:reload)
+    @controller.stubs(:current_object).returns(@object)
+  end
+
+  after(:each) { @controller.update }
+
+  it "should record the unsuccessful save" do
+    @controller.expects(:save_failed!)
+  end
+
+  it "should call the after :update_fails callback" do
+    @controller.expects(:after).with(:update_fails)
+  end
+
+  it "should run the response for update failing" do
+    @controller.expects(:response_for).with(:update_fails)
+  end
+end
+
 describe Resourceful::Default::Actions, " new action" do
   include ControllerMocks
   before :each do
@@ -215,7 +242,7 @@ describe Resourceful::Default::Actions, " edit action" do
   after(:each) { @controller.edit }
 
   it "should load the instance object" do
-    @controller.expects(:load_object)
+    #@controller.expects(:load_object)
   end
 
   it "should call the before :edit callback" do
@@ -240,7 +267,7 @@ describe Resourceful::Default::Actions, " successful destroy action" do
   after(:each) { @controller.destroy }
 
   it "should load the instance object" do
-    @controller.expects(:load_object)
+    #@controller.expects(:load_object)
   end
 
   it "should call the before :destroy callback" do

data/vendor/plugins/make_resourceful/spec/integration_spec.rb

@@ -1,8 +1,7 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe "ThingsController", "with all the resourceful actions", :type => :integration do
-  include RailsMocks
-  #inherit Test::Unit::TestCase
+describe "ThingsController", "with all the resourceful actions" do
+  
   before :each do
     mock_resourceful do
       actions :all
@@ -21,6 +20,8 @@ describe "ThingsController", "with all the resourceful actions", :type => :integ
   (Resourceful::ACTIONS - Resourceful::MODIFYING_ACTIONS).each(&method(:should_render_html))
   Resourceful::ACTIONS.each(&method(:should_render_js))
   Resourceful::ACTIONS.each(&method(:shouldnt_render_xml))
+  
+  
 
   ## Specs for #index
 
@@ -32,7 +33,7 @@ describe "ThingsController", "with all the resourceful actions", :type => :integ
   it "should return a list of objects for #current_objects after GET /things" do
     Thing.stubs(:find).returns(@objects)
     get :index
-    controller.current_objects.should == @objects
+    current_objects.should == @objects
   end
 
   it "should assign @things to a list of objects for GET /things" do
@@ -51,7 +52,7 @@ describe "ThingsController", "with all the resourceful actions", :type => :integ
   it "should return an object for #current_object after GET /things/12" do
     Thing.stubs(:find).returns(@object)
     get :show, :id => 12
-    controller.current_object.should == @object
+    current_object.should == @object
   end
 
   it "should assign @thing to an object for GET /things/12" do
@@ -70,7 +71,7 @@ describe "ThingsController", "with all the resourceful actions", :type => :integ
   it "should return an object for #current_object after GET /things/12/edit" do
     Thing.stubs(:find).returns(@object)
     get :edit, :id => 12
-    controller.current_object.should == @object
+    current_object.should == @object
   end
 
   it "should assign @thing to an object for GET /things/12/edit" do
@@ -94,7 +95,7 @@ describe "ThingsController", "with all the resourceful actions", :type => :integ
   it "should return the new object for #current_object after GET /things/new" do
     Thing.stubs(:new).returns(@object)
     get :new
-    controller.current_object.should == @object
+    current_object.should == @object
   end
 
   it "should assign @thing to the new object for GET /things/new" do
@@ -118,7 +119,7 @@ describe "ThingsController", "with all the resourceful actions", :type => :integ
   it "should return the new object for #current_object after POST /things" do
     Thing.stubs(:new).returns(@object)
     post :create
-    controller.current_object.should == @object
+    current_object.should == @object
   end
 
   it "should assign @thing to the new object for POST /things" do
@@ -177,7 +178,7 @@ describe "ThingsController", "with all the resourceful actions", :type => :integ
   it "should return an object for #current_object after PUT /things/12" do
     Thing.stubs(:find).returns(@object)
     put :update, :id => 12
-    controller.current_object.should == @object
+    current_object.should == @object
   end
 
   it "should assign @thing to an object for PUT /things/12" do
@@ -236,7 +237,7 @@ describe "ThingsController", "with all the resourceful actions", :type => :integ
   it "should return an object for #current_object after DELETE /things/12" do
     Thing.stubs(:find).returns(@object)
     delete :destroy, :id => 12
-    controller.current_object.should == @object
+    current_object.should == @object
   end
 
   it "should assign @thing to an object for DELETE /things/12" do
@@ -286,7 +287,6 @@ describe "ThingsController", "with all the resourceful actions", :type => :integ
 end
 
 describe "ThingsController", "with several parent objects", :type => :integration do
-  include RailsMocks
   before :each do
     mock_resourceful do
       actions :all
@@ -309,19 +309,19 @@ describe "ThingsController", "with several parent objects", :type => :integratio
   it "should find all things on GET /things" do
     Thing.expects(:find).with(:all).returns(@objects)
     get :index
-    controller.current_objects.should == @objects
+    current_objects.should == @objects
   end
 
   it "should find the thing with id 12 regardless of scoping on GET /things/12" do
     Thing.expects(:find).with('12').returns(@object)
     get :show, :id => 12
-    controller.current_object.should == @object
+    current_object.should == @object
   end
 
   it "should create a new thing without a person on POST /things" do
     Thing.expects(:new).with('name' => "Lamp").returns(@object)
     post :create, :thing => {:name => "Lamp"}
-    controller.current_object.should == @object
+    current_object.should == @object
   end
 
   ## Person ids
@@ -331,7 +331,7 @@ describe "ThingsController", "with several parent objects", :type => :integratio
     @person.stubs(:things).returns(@fake_model)
     @fake_model.stubs(:find).with(:all).returns(@objects)
     get :index, :person_id => 4
-    controller.parent_object.should == @person
+    controller.instance_eval("parent_object").should == @person
     assigns(:person).should == @person
   end
 
@@ -340,7 +340,7 @@ describe "ThingsController", "with several parent objects", :type => :integratio
     @person.expects(:things).at_least_once.returns(@fake_model)
     @fake_model.expects(:find).with(:all).returns(@objects)
     get :index, :person_id => 4
-    controller.current_objects.should == @objects
+    current_objects.should == @objects
   end
 
   it "should find the thing with id 12 if it belongs to the person with id 4 on GET /person/4/things/12" do
@@ -348,7 +348,7 @@ describe "ThingsController", "with several parent objects", :type => :integratio
     @person.expects(:things).at_least_once.returns(@fake_model)
     @fake_model.expects(:find).with('12').returns(@object)
     get :show, :person_id => 4, :id => 12
-    controller.current_object.should == @object
+    current_object.should == @object
   end
 
   it "should create a new thing belonging to the person with id 4 on POST /person/4/things" do
@@ -356,7 +356,7 @@ describe "ThingsController", "with several parent objects", :type => :integratio
     @person.expects(:things).at_least_once.returns(@fake_model)
     @fake_model.expects(:build).with('name' => 'Lamp').returns(@object)
     post :create, :person_id => 4, :thing => {:name => "Lamp"}
-    controller.current_object.should == @object
+    current_object.should == @object
   end
 
   ## Category ids
@@ -366,7 +366,7 @@ describe "ThingsController", "with several parent objects", :type => :integratio
     @category.stubs(:things).returns(@fake_model)
     @fake_model.stubs(:find).with(:all).returns(@objects)
     get :index, :category_id => 4
-    controller.parent_object.should == @category
+    controller.instance_eval("parent_object").should == @category
     assigns(:category).should == @category
   end
 
@@ -375,7 +375,7 @@ describe "ThingsController", "with several parent objects", :type => :integratio
     @category.expects(:things).at_least_once.returns(@fake_model)
     @fake_model.expects(:find).with(:all).returns(@objects)
     get :index, :category_id => 4
-    controller.current_objects.should == @objects
+    current_objects.should == @objects
   end
 
   it "should find the thing with id 12 if it belongs to the category with id 4 on GET /category/4/things/12" do
@@ -383,7 +383,7 @@ describe "ThingsController", "with several parent objects", :type => :integratio
     @category.expects(:things).at_least_once.returns(@fake_model)
     @fake_model.expects(:find).with('12').returns(@object)
     get :show, :category_id => 4, :id => 12
-    controller.current_object.should == @object
+    current_object.should == @object
   end
 
   it "should create a new thing belonging to the category with id 4 on POST /category/4/things" do
@@ -391,6 +391,6 @@ describe "ThingsController", "with several parent objects", :type => :integratio
     @category.expects(:things).at_least_once.returns(@fake_model)
     @fake_model.expects(:build).with('name' => 'Lamp').returns(@object)
     post :create, :category_id => 4, :thing => {:name => "Lamp"}
-    controller.current_object.should == @object
+    current_object.should == @object
   end
 end