super_resources 1.0.0.rc3 → 1.0.0.rc4

data/README.md

@@ -37,7 +37,7 @@ SuperResources provides helper methods that you can use directly in the controll
     collection
 
 For member actions, `resource` answers a single object that the RESTFUL is operating on.
-For collection actions (i.e `index1), `collection` answer a scoped collection of objects.
+For collection actions (i.e `index`), `collection` answer a scoped collection of objects.
 
 SuperResources does away with specifically named instance variables, such as those created by standard scaffolds. For example, in the example above, SuperResources does not give you `@organization_unit` or `@organization_units` for free. You won't need them in the common cases. Using `resource` and `collection` in every controller makes for easier coding and maintenance.
 
@@ -61,7 +61,7 @@ have a resource that is nested inside multiple other objects. SuperResources dyn
 
 ## Nested Resource
 
-Let's face it: deailing with nested resources has always been a pain. All that fiddling about, getting the path names and inputs right. Chane the nesting and you have to go through and chaneg all your path calls too. Then, if you have a resource that can be nested within multiple other resources, such as when you have an associative object and you want to navigate to it from any of it associations, the permutations become very complex.
+Let's face it: dealing with nested resources has always been a pain. All that fiddling about, getting the path names and inputs right. Change the nesting and you have to go through and change all your path calls too. Then, if you have a resource that can be nested within multiple other resources, such as when you have an associative object and you want to navigate to it from any of it associations, the permutations become very complex.
 
 It should be much easier, especially when you take routes into account. If I have an action that is matched to this route:
 
@@ -100,9 +100,9 @@ For example, given this route:
 
 you can make these calls:
 
-  author  #=> Author with an id of :author_id
-  note    #=> Note with an id of :note_id
-  page    #=> Page with an id of :id
+    author  #=> Author with an id of :author_id
+    note    #=> Note with an id of :note_id
+    page    #=> Page with an id of :id
 
 An example of a place where you will want these, is in a layout template that presents information about the nesting objects. For example, you may want to show a page inside an author layout template. The author layout template will present information about the author. In this case, the layout will be used in the context of `PagesController`, so you can't refer to `resource` in the layout, since it will answer the page, not the author. You need some way to arbitrarily refer to the author.  Being able to call `author` provides this.
 
@@ -140,7 +140,7 @@ If that looks strange, bear in mind it's been designed so that you don't need to
 
 Before being able to use the result of `resource`, SuperResources may need to find it. The canonical way to do this is to do:
 
-  resource_class.find(:params[:id])
+    resource_class.find(:params[:id])
 
 While SuperResource uses the `find` method as the default, you can choose another finder method by redefining `finder_method`. For example:
 
@@ -169,13 +169,13 @@ SuperResources extracts the construction of a new resource into the `build_resou
 
 Yes, you can. All actions defined by SuperResources use responders and accept parameters to pass to `respond_with`, so customizing these parameters is a common adaptation.
 
-For example, suppose that after creating a comment, you want to redirect to an index of comments that apply to the same parent. Adapt teh action like this:
+For example, suppose that after creating a comment, you want to redirect to an index of comments that apply to the same parent. Adapt the action like this:
 
     def create
       super :location => polymorphic_url([ parent, :comments ])
     end
 
-Anything you can pass to `respond_with`, you can pass to he super call, including a block.
+Anything you can pass to `respond_with`, you can pass to the super call, including a block.
 
 You could, of course, completely redefine an action:
 

data/lib/super_resources/controller.rb

@@ -2,11 +2,9 @@ module SuperResources
   module Controller
     extend ActiveSupport::Concern
 
-    included do
-    	include Actions
-	    include Nesting
-	    include HasScope
-	    include URLHelpers	    
-	  end
+    include Actions
+    include Nesting
+    include HasScope
+    include URLHelpers
   end
 end

data/lib/super_resources/url_helpers.rb

@@ -4,23 +4,6 @@ module SuperResources
 
     included do
       helpers = %w(collection resource new_resource edit_resource)
-
-      helpers.each do |helper|
-        class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-          def #{helper}_path(*args)
-            url_for(hash_for_#{helper}_path(*args))
-          end
-
-          def #{helper}_url(*args)
-            url_for(hash_for_#{helper}_url(*args))
-          end
-
-          def hash_for_#{helper}_path(*args)
-            hash_for_#{helper}_url(*args).merge(:only_path => true)
-          end
-        RUBY_EVAL
-      end
-
       helper_methods = helpers.map do |helper|
         [ :"#{helper}_path", :"hash_for_#{helper}_path",
           :"#{helper}_url", :"hash_for_#{helper}_url" ]
@@ -37,27 +20,87 @@ module SuperResources
       path_parameters.except(:id, :action)
     end
 
-    # route helpers ...........................................................
+    def super_path(chain, options={})
+      polymorphic_url(chain, options)
+    rescue NoMethodError => e
+      object = chain.pop
+
+      chain.empty? ?
+        raise(e) : super_path(chain.slice(0...-1) << object, options)
+    end
+
+    def super_url(chain, options={})
+      super_path(chain, options.merge(:routing_type => :url))
+    end
+
+    # collection route helpers .................................................
+
+    def collection_url
+      super_url(with_chain(resource_class))
+    end
+
+    def collection_path
+      super_path(with_chain(resource_class))
+    end
 
     def hash_for_collection_url(options={})
       route_hash.merge(options).merge(:action => 'index')
     end
 
+    # resource route helpers ...................................................
+
+    def resource_path(*args)
+      options = args.extract_options!
+      super_path(with_chain(args.first || resource), options)
+    end
+
+    def resource_url(*args)
+      options = args.extract_options!
+      super_url(with_chain(args.first || resource), options)
+    end
+
     def hash_for_resource_url(*args)
       options = args.extract_options!
       route_hash.merge(options)
                 .merge(:action => 'show', :id => args.first || resource)
     end
 
+    # new resource route helpers ...............................................
+
+    def new_resource_path(options={})
+      options.merge! :action => :new
+      super_path(with_chain(resource_class), options)
+    end
+
+    def new_resource_url(options={})
+      options.merge! :action => :new
+      super_url(with_chain(resource_class), options)
+    end
+
     def hash_for_new_resource_url(options={})
       route_hash.merge(options).merge(:action => 'new')
     end
 
+    # edit resource route helpers ..............................................
+
+    def edit_resource_path(*args)
+      options = args.extract_options!
+      options.merge! :action => :edit
+
+      super_path(with_chain(args.first || resource), options)
+    end
+
+    def edit_resource_url(*args)
+      options = args.extract_options!
+      options.merge! :action => :edit
+
+      super_url(with_chain(args.first || resource), options)
+    end
+
     def hash_for_edit_resource_url(*args)
       options = args.extract_options!
       route_hash.merge(options)
                 .merge(:action => 'edit', :id => args.first || resource)
     end
   end
-  
 end

data/lib/super_resources/version.rb

@@ -1,3 +1,3 @@
 module SuperResources
-  VERSION = "1.0.0.rc3"
+  VERSION = "1.0.0.rc4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: super_resources
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties