inherited_resources_helpers 0.0.12 → 0.0.13

data/lib/inherited_resources/helpers.rb

@@ -12,13 +12,19 @@ module InheritedResources
   Base.class_eval do
     class << self
       def inherited_with_helpers(base)
+        inherited_without_helpers(base)
         base.send :include, Helpers::Resources
         base.send :include, Helpers::ResourcesUrlFor
         base.send :include, Helpers::Accessors
-        inherited_without_helpers(base)
       end
       alias_method_chain :inherited, :helpers # TODO ugh.
     end
   end
+
+  UrlHelpers.module_eval do
+    def generate_url_and_path_helpers(prefix, name, resource_segments, resource_ivars)
+      # FIXME ... we define our own helpers for now, should merge with inherited_resources.
+    end
+  end
 end
 

data/lib/inherited_resources/helpers/resources_url_for.rb

@@ -27,23 +27,29 @@ module InheritedResources
         super(*resources)
       end
 
-      def parent_index_url(options = {})
-        polymorphic_url(parent_resources[0..-2] << parent_resources.last.class.base_class, options)
+      def index_parent_url(*resources)
+        resources = normalize_parent_resources_for_url(resources) { parent_resources[0..-2] << parent_resources.last.class.base_class }
+        polymorphic_url(*resources)
       end
 
-      def parent_new_url(options = {})
-        polymorphic_url(parent_resources[0..-2].unshift(:new) << parent_resources.last.class.name.underscore, options)
+      def new_parent_url(*resources)
+        resources, options = *normalize_parent_resources_for_url(resources) { parent_resources[0..-2] << parent_resources.last.class.name.underscore }
+        resources.unshift(:new)
+        polymorphic_url(resources, options)
       end
 
-      def parent_show_url(options = {})
-        polymorphic_url(parent_resources, options)
+      def show_parent_url(*resources)
+        resources = normalize_parent_resources_for_url(resources) { parent_resources }
+        polymorphic_url(*resources)
       end
 
-      def parent_edit_url(options = {})
-        polymorphic_url(parent_resources.unshift(:edit), options)
+      def edit_parent_url(*resources)
+        resources, options = normalize_parent_resources_for_url(resources) { parent_resources }
+        resources.unshift(:edit)
+        polymorphic_url(resources, options)
       end
 
-      [:parent_index, :parent_new, :parent_show, :parent_edit].each do |action|
+      [:index_parent, :new_parent, :show_parent, :edit_parent].each do |action|
         define_method(:"#{action}_path") do |*args|
           send(:"#{action}_url", *args << args.extract_options!.reverse_merge(:routing_type => :path))
         end
@@ -58,12 +64,6 @@ module InheritedResources
       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)
@@ -79,6 +79,20 @@ module InheritedResources
           end
           [args, options]
         end
+
+        def normalize_parent_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.parent_resources.dup
+            resources.pop if resources.last.new_record?
+            resources + args
+          end
+          [args, options]
+        end
     end
   end
 end

data/lib/inherited_resources_helpers/version.rb

@@ -1,3 +1,3 @@
 module InheritedResourcesHelpers
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inherited_resources_helpers
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 +02:00
+date: 2010-10-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: active_support
+  name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -47,7 +47,7 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: active_record
+  name: activerecord
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -61,7 +61,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: action_controller
+  name: actionpack
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -116,6 +116,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
 description: "[description]"
 email: svenfuchs@artweb-design.de
 executables: []