inherited_resources_helpers 0.0.7 → 0.0.8

data/lib/inherited_resources/helpers.rb

@@ -2,17 +2,18 @@ require 'inherited_resources'
 
 module InheritedResources
   module Helpers
-    autoload :Accessors, 'inherited_resources/helpers/accessors'
-    autoload :LinkTo,    'inherited_resources/helpers/link_to'
-    autoload :Resources, 'inherited_resources/helpers/resources'
-    autoload :UrlFor,    'inherited_resources/helpers/url_for'
+    autoload :Accessors,       'inherited_resources/helpers/accessors'
+    autoload :LinkTo,          'inherited_resources/helpers/link_to'
+    autoload :Resources,       'inherited_resources/helpers/resources'
+    autoload :ResourcesUrlFor, 'inherited_resources/helpers/resources_url_for'
+    autoload :UrlFor,          'inherited_resources/helpers/url_for'
   end
 
   Base.class_eval do
     class << self
       def inherited_with_helpers(base)
         base.send :include, Helpers::Resources
-        base.send :include, Helpers::UrlFor
+        base.send :include, Helpers::ResourcesUrlFor
         base.send :include, Helpers::Accessors
         inherited_without_helpers(base)
       end

data/lib/inherited_resources/helpers/link_to.rb

@@ -1,9 +1,32 @@
 module InheritedResources
   module Helpers
     module LinkTo
+      def links_to_actions(actions, *args)
+        actions.map { |action| capture { send(:"link_to_#{action}", *args) } }.join.html_safe
+      end
+
       [:index, :new, :show, :edit, :destroy].each do |action|
         define_method(:"link_to_#{action}") do |*args|
-          link_to(t(:".#{action}"), controller.send(:"#{action}_path"), args.extract_options!)
+          options = args.extract_options!
+          options[:class] = [action, options[:class]].compact.join(' ')
+
+          if action == :destroy
+            model = args.last.class.respond_to?(:model_name) ? args.last : controller.resource
+            name  = model.class.model_name.human
+            options.reverse_merge!(:method => :delete, :confirm => t(:'.confirm_delete', :model_name => name))
+          end
+
+          link_text = args.shift if args.first.is_a?(String)
+          link_text = t(args.shift) if args.first.is_a?(Symbol)
+          link_text ||= t(:".#{action}")
+
+          url = if args.first.is_a?(String)
+            args.first
+          else
+            controller.send(:"#{action}_path", *args)
+          end
+
+          link_to(link_text, url, options)
         end
       end
     end

data/lib/inherited_resources/helpers/resources_url_for.rb

@@ -0,0 +1,84 @@
+module InheritedResources
+  module Helpers
+    module ResourcesUrlFor
+      include UrlFor
+
+      def self.included(base)
+        base.send(:helper_method, public_instance_methods(false) + UrlFor.public_instance_methods(false))
+      end
+
+      def index_url(*resources)
+        resources = normalize_resources_for_url(resources) { parent_resources << resource_class.base_class }
+        super(*resources)
+      end
+
+      def new_url(*resources)
+        resources = normalize_resources_for_url(resources) { parent_resources << resource_class.name.underscore }
+        super(*resources)
+      end
+
+      def show_url(*resources)
+        resources = normalize_resources_for_url(resources) { self.resources }
+        super(*resources)
+      end
+
+      def edit_url(*resources)
+        resources = normalize_resources_for_url(resources) { self.resources }
+        super(*resources)
+      end
+
+      def parent_index_url(options = {})
+        polymorphic_url(parent_resources[0..-2] << parent_resources.last.class.base_class, options)
+      end
+
+      def parent_new_url(options = {})
+        polymorphic_url(parent_resources[0..-2].unshift(:new) << parent_resources.last.class.name.underscore, options)
+      end
+
+      def parent_show_url(options = {})
+        polymorphic_url(parent_resources, options)
+      end
+
+      def parent_edit_url(options = {})
+        polymorphic_url(parent_resources.unshift(:edit), options)
+      end
+
+      [:parent_index, :parent_new, :parent_show, :parent_edit].each do |action|
+        define_method(:"#{action}_path") do |*args|
+          send(:"#{action}_url", *args << args.extract_options!.reverse_merge(:routing_type => :path))
+        end
+      end
+
+      alias :resources_url :index_url
+      alias :resources_path :index_path
+
+      alias :resource_url :show_url
+      alias :resource_path :show_path
+
+      alias :destroy_url :show_url
+      alias :destroy_path :show_path
+
+      alias :parent_resources_url :parent_index_url
+      alias :parent_resources_path :parent_index_path
+
+      alias :parent_resource_url :parent_show_url
+      alias :parent_resource_path :parent_show_path
+
+      protected
+
+        def normalize_resources_for_url(args, &default)
+          options = args.extract_options!
+          args = if args.empty?
+            default.call
+          elsif args.first.is_a?(Array)
+            args.first
+          else
+            resources = self.resources.dup
+            resources.pop if resources.last.new_record?
+            resources + args
+          end
+          [args, options]
+        end
+    end
+  end
+end

data/lib/inherited_resources/helpers/url_for.rb

@@ -2,90 +2,54 @@ module InheritedResources
   module Helpers
     module UrlFor
       def self.included(base)
-        base.send(:helper_method, public_instance_methods(false))
+        base.send(:helper_method, public_instance_methods(false)) if base.respond_to?(:helper_method, true)
       end
 
-      def index_url(options = {})
-        polymorphic_url(parent_resources << resource_class.base_class, options)
-      end
-
-      def new_url(options = {})
-        polymorphic_url(parent_resources.unshift(:new) << resource_class.name.underscore, options)
-      end
-
-      def show_url(options = {})
-        raise_invalid_url_helper(:show_url, resource) if resource.new_record?
-        raise "can't generate show_url because the current resource (#{resource.inspect}) is a new record" if resource.new_record?
+      def index_url(resources, options = {})
+        if resources.last.respond_to?(:new_record?)
+          resources[-1, 1] = resources.last.class
+        elsif resources.last.is_a?(Symbol)
+          resources[-1, 1] = resources.last.to_s.camelize.singularize.constantize
+        end
+        validate_url_helper_arguments!(:index_url, resources)
         polymorphic_url(resources, options)
       end
 
-      def edit_url(options = {})
-        raise_invalid_url_helper(:edit_url, resource) if resource.new_record?
-        polymorphic_url(resources.unshift(:edit), options)
-      end
-
-      [:index, :new, :show, :edit].each do |action|
-        define_method(:"#{action}_path") do |*args|
-          send(:"#{action}_url", args.extract_options!.reverse_merge(:routing_type => :path))
+      def new_url(resources, options = {})
+        if resources.last.respond_to?(:new_record?)
+          resources[-1, 1] = resources.last.class.name.underscore
+        elsif resources.last.is_a?(Class) && resources.last < ActiveRecord::Base
+          resources[-1, 1] = resources.last.name.underscore
         end
+        resources.unshift(:new) unless resources.first == :new
+        validate_url_helper_arguments!(:new_url, resources)
+        polymorphic_url(resources, options)
       end
 
-      def parent_index_url(options = {})
-        polymorphic_url(parent_resources[0..-2] << parent_resources.last.class.base_class, options)
-      end
-
-      def parent_new_url(options = {})
-        polymorphic_url(parent_resources[0..-2].unshift(:new) << parent_resources.last.class.name.underscore, options)
-      end
-
-      def parent_show_url(options = {})
-        polymorphic_url(parent_resources, options)
+      def show_url(resources, options = {})
+        validate_url_helper_arguments!(:show_url, resources)
+        polymorphic_url(resources, options)
       end
 
-      def parent_edit_url(options = {})
-        polymorphic_url(parent_resources.unshift(:edit), options)
+      def edit_url(resources, options = {})
+        resources.unshift(:edit) unless resources.first == :edit
+        validate_url_helper_arguments!(:edit_url, resources)
+        polymorphic_url(resources, options)
       end
 
-      [:index, :new, :show, :edit].each do |action|
-        define_method(:"parent_#{action}_path") do |*args|
-          send(:"parent_#{action}_url", args.extract_options!.reverse_merge(:routing_type => :path))
+      [:index, :new, :show, :edit, :parent_index, :parent_new, :parent_show, :parent_edit].each do |action|
+        define_method(:"#{action}_path") do |*args|
+          send(:"#{action}_url", *args << args.extract_options!.reverse_merge(:routing_type => :path))
         end
       end
 
-      def children_index_url(child, options = {})
-        raise_invalid_url_helper("children_index_url(#{:child.inspect})", resource) if resource.new_record?
-        polymorphic_url(resources << child.to_s.pluralize, options)
-      end
-
-      def children_index_path(*args)
-        children_index_url(*args << args.extract_options!.reverse_merge(:routing_type => :path))
-      end
-
-      def children_new_url(child, options = {})
-        raise_invalid_url_helper("children_new_url(#{:child.inspect})", resource) if resource.new_record?
-        polymorphic_url(resources.unshift(:new) << child.to_s.singularize, options)
-      end
-
-      def children_new_path(*args)
-        children_new_url(*args << args.extract_options!.reverse_merge(:routing_type => :path))
-      end
-
-      alias :resources_url :index_url
-      alias :resources_path :index_path
-
-      alias :resource_url :show_url
-      alias :resource_path :show_path
-
-      alias :parent_resources_url :parent_index_url
-      alias :parent_resources_path :parent_index_path
-
-      alias :parent_resource_url :parent_show_url
-      alias :parent_resource_path :parent_show_path
-
       protected
-
-        def raise_invalid_url_helper(method, resource)
-          raise "can't generate #{method} because the current resource (#{resource.inspect}) is a new record"
+        def validate_url_helper_arguments!(method, args)
+          if new_record = args.detect { |arg| arg.respond_to?(:new_record?) && arg.new_record? }
+            raise "can't generate #{method} because #{new_record.inspect}) is a new record"
+          elsif [:show_url, :edit_url].include?(method) && !(args.last.respond_to?(:persisted?) && args.last.persisted?)
+            raise "can't generate #{method} because #{new_record.inspect}) is not a persisted record"
+          end
         end
     end
   end

data/lib/inherited_resources/helpers/version.rb

@@ -1,3 +1,3 @@
 module InheritedResourcesHelpers
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inherited_resources_helpers
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 +02:00
+date: 2010-09-22 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -31,6 +31,7 @@ files:
 - lib/inherited_resources/helpers/accessors.rb
 - lib/inherited_resources/helpers/link_to.rb
 - lib/inherited_resources/helpers/resources.rb
+- lib/inherited_resources/helpers/resources_url_for.rb
 - lib/inherited_resources/helpers/url_for.rb
 - lib/inherited_resources/helpers/version.rb
 - lib/inherited_resources/helpers.rb