super_resources 1.0.0.rc2 → 1.0.0.rc3

data/lib/super_resources/nesting.rb

@@ -15,17 +15,6 @@ module SuperResources
 
     protected
 
-    def method_missing(m, *args, &block)
-      case
-      when m == resource_params_name
-        resource
-      when i = symbols_for_association_chain.index(m)
-        association_chain[i]
-      else
-        super
-      end
-    end
-
     def collection
       memoize_collection { end_of_association_chain }
     end
@@ -77,5 +66,13 @@ module SuperResources
     def with_chain(object)
       association_chain + [ object ]
     end
+
+    def method_missing(method, *args, &block)
+      if index = symbols_for_association_chain.index(method)
+        association_chain[index]
+      else
+        super
+      end
+    end
   end
 end

data/lib/super_resources/resources.rb

@@ -3,7 +3,8 @@ module SuperResources
     extend ActiveSupport::Concern
 
     included do
-      helper_method :collection, :resource, :resource_class, :parent, :nested?
+      helper_method :collection, :collection?, :resource, :resource?,
+                    :resource_class, :parent, :nested?
     end
 
     protected
@@ -32,6 +33,10 @@ module SuperResources
       @collection ||= block.call
     end
 
+    def collection?
+      not resource?
+    end
+
     def resource
       memoize_resource { resource_class.send(finder_method, params[:id]) }
     end
@@ -40,6 +45,10 @@ module SuperResources
       @resource ||= block.call
     end
 
+    def resource?
+      params[:id].present?
+    end
+
     def finder_method
       :find
     end
@@ -71,5 +80,9 @@ module SuperResources
     def destroy_resource
       resource.destroy
     end
+
+    def method_missing(method, *args, &block)
+      method == resource_instance_name ? resource : super
+    end
   end
 end

data/lib/super_resources/routing.rb

@@ -8,6 +8,10 @@ module SuperResources
       Rails.application.routes || request.env['action_dispatch.routes']
     end
 
+    def named_routes
+      routes.named_routes
+    end
+
     def router
       routes.router
     end
@@ -16,6 +20,10 @@ module SuperResources
       @route ||= recognize_route(request.path.present? ? request : mock_request)
     end
 
+    def path_parameters
+      request.env['action_dispatch.request.path_parameters'].symbolize_keys
+    end
+
     private
 
     def recognize_route(request)
@@ -24,10 +32,6 @@ module SuperResources
       end
     end
 
-    def path_parameters
-      request.env['action_dispatch.request.path_parameters'].symbolize_keys
-    end
-
     def mock_request
       # used when there's no path in +request+. only seems to happen when
       # testing controller actions

data/lib/super_resources/support/draper.rb

@@ -0,0 +1,23 @@
+module SuperResources
+  module Draper
+    extend ActiveSupport::Concern
+
+    protected
+
+    def decorator_class
+      resource_class.decorator_class
+    end
+
+    def resource
+      memoize_resource { decorator_class.decorate(super) }
+    end
+
+    def collection
+      memoize_collection { decorator_class.decorate_collection(super) }
+    end
+
+    def build_resource
+      memoize_resource { decorator_class.decorate(super) }
+    end
+  end
+end

data/lib/super_resources/url_helpers.rb

@@ -3,59 +3,61 @@ module SuperResources
     extend ActiveSupport::Concern
 
     included do
-      helper_method :collection_path, :resource_path, :new_resource_path,
-                    :edit_resource_path
-    end
+      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
 
-    protected
+      helper_methods = helpers.map do |helper|
+        [ :"#{helper}_path", :"hash_for_#{helper}_path",
+          :"#{helper}_url", :"hash_for_#{helper}_url" ]
+      end
 
-    def full_association_chain_symbols
-      symbols_for_association_chain + [resource_instance_name]
+      helper_method(*(helper_methods.flatten))
     end
 
-    def collection_route
-      chain = symbols_for_association_chain + [resource_collection_name]
-      :"#{chain.join('_')}_url"
-    end
+    protected
 
-    def resource_route
-      :"#{full_association_chain_symbols.join('_')}_url"
-    end
+    # core stuff ..............................................................
 
-    def new_resource_route
-      :"new_#{resource_route}"
+    def route_hash
+      path_parameters.except(:id, :action)
     end
 
-    def edit_resource_route
-      :"edit_#{resource_route}"
-    end
+    # route helpers ...........................................................
 
-    def collection_url
-      send(collection_route, *association_chain)
+    def hash_for_collection_url(options={})
+      route_hash.merge(options).merge(:action => 'index')
     end
 
-    alias_method :collection_path, :collection_url
-
-    def resource_url(object = resource)
-      if object.persisted?
-        send(resource_route, *(association_chain + [object]))
-      else
-        collection_url # probably a new action
-      end
+    def hash_for_resource_url(*args)
+      options = args.extract_options!
+      route_hash.merge(options)
+                .merge(:action => 'show', :id => args.first || resource)
     end
 
-    alias_method :resource_path, :resource_url
-
-    def new_resource_url
-      send(new_resource_route, *association_chain)
+    def hash_for_new_resource_url(options={})
+      route_hash.merge(options).merge(:action => 'new')
     end
 
-    alias_method :new_resource_path, :new_resource_url
-
-    def edit_resource_url(object = resource)
-      send(edit_resource_route, *(association_chain + [object]))
+    def hash_for_edit_resource_url(*args)
+      options = args.extract_options!
+      route_hash.merge(options)
+                .merge(:action => 'edit', :id => args.first || resource)
     end
-
-    alias_method :edit_resource_path, :edit_resource_url
   end
+  
 end

data/lib/super_resources/version.rb

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

data/lib/super_resources.rb

@@ -10,8 +10,9 @@ module SuperResources
   autoload :Version
 
   autoload_under 'support' do
-    autoload :HasScope
     autoload :Cancan
+    autoload :Draper
+    autoload :HasScope
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: super_resources
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -51,6 +51,7 @@ files:
 - lib/super_resources/resources.rb
 - lib/super_resources/routing.rb
 - lib/super_resources/support/cancan.rb
+- lib/super_resources/support/draper.rb
 - lib/super_resources/support/has_scope.rb
 - lib/super_resources/url_helpers.rb
 - lib/super_resources/version.rb