josevalim-inherited_resources 0.1.1 → 0.1.2

data/README

@@ -38,7 +38,7 @@ Basic Usage
 
 To use Inherited Resources you just have to inherit (duh) it:
 
-   class ProjectsController < ResourceController::Base
+   class ProjectsController < InheritedResources::Base
    end
 
 And all actions are defined and working, check it! Your projects collection
@@ -78,6 +78,15 @@ Or:
      actions :all, :except => [ :edit, :update, :destroy ]
    end
 
+In your views, you will get the following helpers:
+
+   resource        #=> @project
+   collection      #=> @projects
+   resource_class  #=> Project
+
+As you might expect, collection (@projects instance variable) is only available
+on index actions.
+
 Overwriting defaults
 --------------------
 
@@ -179,7 +188,8 @@ but you don't want to create a before filter for it:
        @project = Project.new(params[:project])
        @project.something_special!
        create!
-     end   end
+     end
+   end
 
 Yeap, that simple! The nice part is since you already set the instance variable
 @project, it will not do it again and overwrite your @project with something
@@ -298,7 +308,7 @@ When using polymorphic associations, you get some free helpers:
    parent?         #=> true
    parent_type     #=> :task
    parent_class    #=> Task
-   parent_instance #=> @task
+   parent          #=> @task
 
 Polymorphic controller is another great idea by James Golick and he also uses
 that on resource_controller.

data/lib/inherited_resources/base.rb

@@ -167,7 +167,8 @@ module InheritedResources
     extend InheritedResources::ClassMethods
 
     helper_method :collection_url, :collection_path, :resource_url, :resource_path,
-                  :new_resource_url, :new_resource_path, :edit_resource_url, :edit_resource_path
+                  :new_resource_url, :new_resource_path, :edit_resource_url, :edit_resource_path,
+                  :resource, :collection, :resource_class
 
     def self.inherited(base)
       base.class_eval do

data/lib/inherited_resources/belongs_to.rb

@@ -123,7 +123,7 @@
 #   parent?         #=> true
 #   parent_type     #=> :task
 #   parent_class    #=> Task
-#   parent_instance #=> @task
+#   parent          #=> @task
 #
 # This polymorphic controllers thing is a great idea by James Golick and he
 # built it in resource_controller. Here is just a re-implementation.

data/lib/inherited_resources/class_methods.rb

@@ -113,6 +113,7 @@ module InheritedResources #:nodoc:
       def acts_as_polymorphic!
         if self.polymorphic_symbols.empty?
           include PolymorphicHelpers
+          helper_method :parent?, :parent_type, :parent_class, :parent
         end
       end
 

data/lib/inherited_resources/polymorphic_helpers.rb

@@ -8,12 +8,13 @@ module InheritedResources #:nodoc:
       end
 
       def parent_class
-        parent_instance.class
+        parent.class
       end
 
-      def parent_instance
+      def parent
         instance_variable_get("@#{@parent_type}")
       end
+
   end
 end
 

data/lib/inherited_resources/url_helpers.rb

@@ -52,7 +52,7 @@ module InheritedResources #:nodoc:
       base.parents_symbols.map do |symbol|
         if symbol == :polymorphic
           polymorphic = true
-          resource_ivars << :parent_instance
+          resource_ivars << :parent
         else
           config = base.resources_configuration[symbol]
           resource_segments << config[:route_name]
@@ -90,7 +90,7 @@ module InheritedResources #:nodoc:
     end
 
     def self.generate_url_and_path_helpers(base, prefix, name, resource_segments, resource_ivars, polymorphic=false)
-        ivars = resource_ivars.map{|i| i == :parent_instance ? :parent_instance : "@#{i}" }
+        ivars = resource_ivars.map{|i| i == :parent ? :parent : "@#{i}" }
 
         # If it's not a singleton, ivars are not empty, not a collection or
         # not a new hew helper, we can add args to the method.

data/test/polymorphic_base_test.rb

@@ -277,6 +277,6 @@ class PolymorphicHelpersTest < TEST_CLASS
     assert_equal :factory, @controller.send(:parent_type)
     assert_equal Factory, @controller.send(:parent_class)
     assert_equal new_factory, assigns(:factory)
-    assert_equal new_factory, @controller.send(:parent_instance)
+    assert_equal new_factory, @controller.send(:parent)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-inherited_resources
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"