resource_controller_views 0.6.6.views2 → 0.6.6

data/README.rdoc

@@ -2,12 +2,6 @@
 
 resource_controller makes RESTful controllers easier, more maintainable, and super readable.  With the RESTful controller pattern hidden away, you can focus on what makes your controller special.
 
-= Views Extension
-
-resource_controller_views expands upon resource_controller, allowing you to specify a view "fallback" directory, so you to define standard views used for your standard CRUD operations (as well as any others). Then within your controllers main view directory, you only need to provide views that differ from your application's standard views.
-
-See towards the bottom of this document for examples.
-
 == Get It
 
 Install it as a plugin:
@@ -47,11 +41,11 @@ It's really easy to make changes to the lifecycle of your actions.
   class ProjectsController < ResourceController::Base
     
     new_action.before do
-      3.times { current_object.tasks.build }
+      3.times { object.tasks.build }
     end
     
     create.after do
-      current_object.creator = current_user
+      object.creator = current_user
     end
     
   end
@@ -135,7 +129,7 @@ Loading objects in singletons is similar to plural controllers with one exceptio
   class AccountsController < ResourceController::Singleton
     private
       def object
-        @_rc_object ||= Account.find(session[:account_id])
+        @object ||= Account.find(session[:account_id])
       end
    end
 
@@ -175,7 +169,7 @@ Or maybe you used a permalink...
   class PostsController < ResourceController::Base
     private
       def object
-        @_rc_object ||= end_of_association_chain.find_by_permalink(param)
+        @object ||= end_of_association_chain.find_by_permalink(param)
       end
   end
 
@@ -186,7 +180,7 @@ Maybe you have some alternative way of building objects...
   class PostsController < ResourceController::Base
     private
       def build_object
-        @_rc_object ||= end_of_association_chain.build_my_object_some_funky_way object_params
+        @object ||= end_of_association_chain.build_my_object_some_funky_way object_params
       end
   end
   
@@ -226,7 +220,7 @@ Everything, including url generation is handled completely automatically.  Take
   map.resources :products, :has_many => :comments
   map.resources :users, :has_many => :comments
 
-All you have to do is that, and r_c will infer whichever relationship is present, and perform all the actions at the scope of the parent current_object.
+All you have to do is that, and r_c will infer whichever relationship is present, and perform all the actions at the scope of the parent object.
 
 === Parent Helpers
 
@@ -327,31 +321,6 @@ Or with namespaced, nested controllers...
   
 You get the idea.  Everything is automagical!  All parameters are inferred.
 
-== View Fallback
-
-With the view extension, you're able to provide default views for all your standard actions, so in effect you really only need to define your CRUD views once, and just have a different form partial in each controller's view directory. For example:
-
-/app/views/common/edit.html.erb:
-
-<h1>Editing <%= resource_controller_options[:english_name] %></h1>
-
-    <% form_for :object, object_url do |form| %>
-      <%= render "form", :form => form %>
-    
-      <%= form.submit "Update" %>
-    <% end %>
-
-/app/views/posts/_form.html.erb:
-
-    <%= form.label :name %>
-    <%= form.text_field :name %>
-
-/app/controllers/posts_controller.rb:
-
-    resource_controller :scaffold_root => "/app/views/common", :english_name => "Post"
-
-With the extensions installed, a GET to /posts/1/edit would cause Rails to attempt to render /app/views/posts/edit.html.erb. If that cannot be found, resource_controller_views will make Rails attempt to render /app/views/common/edit.html.erb. The common edit helper will then attempt to render the "form" partial, which again uses the same mechanism as for standard views. In the second case however it finds the _form.html.erb partial in the controllers own directory, and so renders that.
-
 == Credits
 
 resource_controller was created, and is maintained by {James Golick}[http://jamesgolick.com].

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:build: views2
-:patch: 6
 :major: 0
 :minor: 6
+:build: 
+:patch: 6

data/lib/resource_controller/actions.rb

@@ -19,7 +19,7 @@ module ResourceController
       build_object
       load_object
       before :create
-      if current_object.save
+      if object.save
         after :create
         set_flash :create
         response_for :create
@@ -33,7 +33,7 @@ module ResourceController
     def update
       load_object
       before :update
-      if current_object.update_attributes object_params
+      if object.update_attributes object_params
         after :update
         set_flash :update
         response_for :update
@@ -60,7 +60,7 @@ module ResourceController
     def destroy
       load_object
       before :destroy
-      if current_object.destroy
+      if object.destroy
         after :destroy
         set_flash :destroy
         response_for :destroy

data/lib/resource_controller/controller.rb

@@ -25,7 +25,7 @@ module ResourceController
                                 :hash_for_edit_object_path, :hash_for_new_object_path, :hash_for_collection_url, 
                                   :hash_for_object_url, :hash_for_edit_object_url, :hash_for_new_object_url, :parent?,
                                     :collection_url_options, :object_url_options, :new_object_url_options, :resource_controller_options,
-                                    :has_own_partial?, :current_object
+                                    :has_own_partial?
                                 
       end
       

data/lib/resource_controller/helpers/current_objects.rb

@@ -34,16 +34,14 @@ module ResourceController
         # class PostsController < ResourceController::Base
         #   private
         #     def object
-        #       @_rc_object ||= end_of_association_chain.find_by_permalink(param)
+        #       @object ||= end_of_association_chain.find_by_permalink(param)
         #     end
         #   end
         #
         def object
-          @_rc_object ||= end_of_association_chain.find(param) unless param.nil?
-          @_rc_object
+          @object ||= end_of_association_chain.find(param) unless param.nil?
+          @object
         end
-        
-        alias current_object object
     
         # Used internally to load the member object in to an instance variable @#{model_name} (i.e. @post)
         #
@@ -68,7 +66,7 @@ module ResourceController
         # Builds the object, but doesn't save it, during the new, and create action.
         #
         def build_object
-          @_rc_object ||= end_of_association_chain.send parent? ? :build : :new, object_params
+          @object ||= end_of_association_chain.send parent? ? :build : :new, object_params
         end
     end
   end

data/lib/resource_controller/helpers/nested.rb

@@ -7,7 +7,7 @@ module ResourceController
         # Returns the relevant association proxy of the parent. (i.e. /posts/1/comments # => @post.comments)
         #
         def parent_association
-          @parent_association ||= parent_current_object.send(model_name.to_s.pluralize.to_sym)
+          @parent_association ||= parent_object.send(model_name.to_s.pluralize.to_sym)
         end
     
         # Returns the type of the current parent

data/lib/resource_controller/helpers/singleton_customizations.rb

@@ -28,18 +28,18 @@ module ResourceController
         # class AccountsController < ResourceController::Singleton
         #   private
         #     def object
-        #       @_rc_object ||= Account.find(session[:account_id])
+        #       @object ||= Account.find(session[:account_id])
         #     end
         #   end
         #  
         def object
-          @_rc_object ||= parent? ? end_of_association_chain : nil
+          @object ||= parent? ? end_of_association_chain : nil
         end
 
         # Returns the :has_one association proxy of the parent. (i.e. /users/1/image # => @user.image)
         #  
         def parent_association
-          @parent_association ||= parent_current_object.send(model_name.to_sym)
+          @parent_association ||= parent_object.send(model_name.to_sym)
         end
   
         # Used internally to provide the options to smart_url in a singleton controller.
@@ -51,7 +51,7 @@ module ResourceController
         # Builds the object, but doesn't save it, during the new, and create action.
         #
         def build_object
-          @_rc_object ||= singleton_build_object_base.send parent? ? "build_#{model_name}".to_sym : :new, object_params
+          @object ||= singleton_build_object_base.send parent? ? "build_#{model_name}".to_sym : :new, object_params
         end
     
         # Singleton controllers don't build off of association proxy, so we can't use end_of_association_chain here

data/lib/resource_controller/helpers/urls.rb

@@ -45,19 +45,19 @@ module ResourceController
           symbol = type.blank? ? nil : type.gsub(/_/, '').to_sym
       
           define_method("#{type}object_url") do |*alternate_object|
-            smart_url *object_url_options(symbol, alternate_current_object.first)
+            smart_url *object_url_options(symbol, alternate_object.first)
           end
       
           define_method("#{type}object_path") do |*alternate_object|
-            smart_path *object_url_options(symbol, alternate_current_object.first)
+            smart_path *object_url_options(symbol, alternate_object.first)
           end
       
           define_method("hash_for_#{type}object_url") do |*alternate_object|
-            hash_for_smart_url *object_url_options(symbol, alternate_current_object.first)
+            hash_for_smart_url *object_url_options(symbol, alternate_object.first)
           end
       
           define_method("hash_for_#{type}object_path") do |*alternate_object|
-            hash_for_smart_path *object_url_options(symbol, alternate_current_object.first)
+            hash_for_smart_path *object_url_options(symbol, alternate_object.first)
           end
         end
     

data/lib/resource_controller/helpers.rb

@@ -16,7 +16,7 @@ module ResourceController
   #   class PostsController < ResourceController::Base
   #   private
   #     def object
-  #       @_rc_object ||= end_of_association_chain.find_by_permalink(param)
+  #       @object ||= end_of_association_chain.find_by_permalink(param)
   #     end
   #   end
   module Helpers

data/lib/resource_controller/partials.rb

@@ -12,11 +12,10 @@ module ResourceController
     rescue ActionView::MissingTemplate
       Rails.logger.debug("[DynamicScaffold] Using scaffold partial #{partial_path}")
       
-      raise "Attempting to call a resource_controller_views partial from a controller which isn't resource_controller enabled." if !controller.respond_to?(:resource_controller_options)
-      raise if controller.nil? || controller.resource_controller_options[:scaffold_root].blank?
+      raise if controller.nil? || self.class.resource_controller_options[:scaffold_root].blank?
       
       scaffold_paths = view_paths.class.new
-      scaffold_paths.unshift(controller.resource_controller_options[:scaffold_root] || "app/views/scaffold")
+      scaffold_paths.unshift(self.class.resource_controller_options[:scaffold_root] || "app/views/scaffold")
       scaffold_paths.find_template("_#{partial_path}", self.template_format)
     end
   end

data/lib/resource_controller/views.rb

@@ -8,11 +8,10 @@ module ResourceController
     def default_template(action_name = self.action_name)
       view_paths.find_template(default_template_name(action_name), default_template_format)
     rescue ActionView::MissingTemplate
-      raise if controller.resource_controller_options[:scaffold_root].blank?
-      action_name = "index" if action_name.blank?
+      raise if self.class.resource_controller_options[:scaffold_root].blank?
       
       scaffold_paths = view_paths.class.new
-      scaffold_paths.unshift(controller.resource_controller_options[:scaffold_root])
+      scaffold_paths.unshift(self.class.resource_controller_options[:scaffold_root])
       scaffold_paths.find_template(action_name, default_template_format)
     end
   end

data/lib/urligence.rb

@@ -19,7 +19,7 @@ module Urligence
     config = {}
     config.merge!(objects.pop) if objects.last.is_a?(Hash)
     
-    objects.reject! { |object| current_object.nil? }
+    objects.reject! { |object| object.nil? }
     
     url_fragments = objects.collect do |obj|
       if obj.is_a? Symbol

data/test/test/unit/helpers/current_objects_test.rb

@@ -10,8 +10,8 @@ class Helpers::CurrentObjectsTest < Test::Unit::TestCase
     @request = stub :path => ""
     @controller.stubs(:request).returns(@request)    
 
-    @_rc_object = Post.new
-    Post.stubs(:find).with("1").returns(@_rc_object)
+    @object = Post.new
+    Post.stubs(:find).with("1").returns(@object)
     
     @collection = mock()
     Post.stubs(:find).with(:all).returns(@collection)
@@ -37,7 +37,7 @@ class Helpers::CurrentObjectsTest < Test::Unit::TestCase
   
   context "object helper" do    
     should "find the correct object" do
-      assert_equal @_rc_object, @controller.send(:object)
+      assert_equal @object, @controller.send(:object)
     end
   end
   
@@ -47,7 +47,7 @@ class Helpers::CurrentObjectsTest < Test::Unit::TestCase
     end
       
     should "load object as instance variable" do
-      assert_equal @_rc_object, @controller.instance_variable_get("@post")
+      assert_equal @object, @controller.instance_variable_get("@post")
     end
     
     context "with an alternate object_name" do
@@ -57,7 +57,7 @@ class Helpers::CurrentObjectsTest < Test::Unit::TestCase
       end
 
       should "use the variable name" do
-        assert_equal @_rc_object, @controller.instance_variable_get("@asdf")
+        assert_equal @object, @controller.instance_variable_get("@asdf")
       end
     end
   end

data/test/test/unit/helpers/internal_test.rb

@@ -7,8 +7,8 @@ class Helpers::InternalTest < Test::Unit::TestCase
     @params = stub :[] => "1"
     @controller.stubs(:params).returns(@params)
 
-    @_rc_object = Post.new
-    Post.stubs(:find).with("1").returns(@_rc_object)
+    @object = Post.new
+    Post.stubs(:find).with("1").returns(@object)
     
     @collection = mock()
     Post.stubs(:find).with(:all).returns(@collection)

data/test/test/unit/helpers/nested_test.rb

@@ -23,8 +23,8 @@ class Helpers::NestedTest < Test::Unit::TestCase
     @request = stub :path => ""
     @controller.stubs(:request).returns(@request)        
 
-    @_rc_object = Post.new
-    Post.stubs(:find).with("1").returns(@_rc_object)
+    @object = Post.new
+    Post.stubs(:find).with("1").returns(@object)
     
     @collection = mock()
     Post.stubs(:find).with(:all).returns(@collection)

data/test/test/unit/helpers/urls_test.rb

@@ -10,8 +10,8 @@ class Helpers::UrlsTest < Test::Unit::TestCase
     @request = stub :path => ""
     @controller.stubs(:request).returns(@request)        
 
-    @_rc_object = Post.new
-    Post.stubs(:find).with("1").returns(@_rc_object)
+    @object = Post.new
+    Post.stubs(:find).with("1").returns(@object)
     
     @collection = mock()
     Post.stubs(:find).with(:all).returns(@collection)
@@ -33,7 +33,7 @@ class Helpers::UrlsTest < Test::Unit::TestCase
     end
     
     should "return the correct object options" do
-      assert_equal [nil, nil, [:post, @_rc_object]], @controller.send(:object_url_options)
+      assert_equal [nil, nil, [:post, @object]], @controller.send(:object_url_options)
     end
     
     should "return the correct collection options for a namespaced controller" do
@@ -63,8 +63,8 @@ class Helpers::UrlsTest < Test::Unit::TestCase
       end
 
       should "return the correct object options for object_url_options" do
-        @controller.expects(:object).returns @_rc_object
-        assert_equal [:edit, [:user, @user], [:post, @_rc_object]], @controller.send(:object_url_options, :edit)
+        @controller.expects(:object).returns @object
+        assert_equal [:edit, [:user, @user], [:post, @object]], @controller.send(:object_url_options, :edit)
       end
       
       should "return the correct object options for collection" do

data/test/test/unit/helpers_test.rb

@@ -8,8 +8,8 @@ class HelpersTest < ActiveSupport::TestCase
     @params = stub :[] => "1"
     @controller.stubs(:params).returns(@params)
 
-    @_rc_object = Post.new
-    Post.stubs(:find).with("1").returns(@_rc_object)
+    @object = Post.new
+    Post.stubs(:find).with("1").returns(@object)
     
     @collection = mock()
     Post.stubs(:find).with(:all).returns(@collection)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resource_controller_views
 version: !ruby/object:Gem::Version 
-  version: 0.6.6.views2
+  version: 0.6.6
 platform: ruby
 authors: 
 - James Golick
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 +11:00
+date: 2010-03-17 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -282,9 +282,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
   version: 
 requirements: []