heimdallr-resource 1.0.2 → 1.0.3

data/heimdallr-resource.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "heimdallr-resource"
-  s.version     = "1.0.2"
+  s.version     = "1.0.3"
   s.authors     = ["Peter Zotov", "Boris Staal"]
   s.email       = ["whitequark@whitequark.org", "boris@roundlake.ru"]
   s.homepage    = "http://github.com/roundlake/heimdallr-resource"

data/lib/heimdallr/resource.rb

@@ -21,17 +21,17 @@ module Heimdallr
 
             if target
               if options[:singleton]
-                scope = target.send(:"#{options[:resource].parameterize('_')}")
+                scope = target.send(:"#{variable_name(options)}")
               else
-                scope = target.send(:"#{options[:resource].parameterize('_').pluralize}")
+                scope = target.send(:"#{variable_name(options).pluralize}")
               end
             elsif options[:shallow]
-              scope = options[:resource].classify.constantize.scoped
+              scope = class_name(options).constantize.scoped
             else
               raise "Cannot fetch #{options[:resource]} via #{options[:through]}"
             end
           else
-            scope = options[:resource].classify.constantize.scoped
+            scope = class_name(options).constantize.scoped
           end
 
           loaders = {
@@ -40,20 +40,25 @@ module Heimdallr
             },
 
             new_record: -> {
-              controller.instance_variable_set(ivar_name(controller, options),
-                  scope.new(controller.params[options[:resource].split('/').last]))
+              controller.instance_variable_set(
+                ivar_name(controller, options),
+                scope.new(controller.params[params_key_name(options)] || {})
+              )
             },
 
             record: -> {
-              controller.instance_variable_set(ivar_name(controller, options),
-                  scope.find(controller.params[:"#{options[:resource]}_id"] ||
-                             controller.params[:id]))
+              controller.instance_variable_set(
+                ivar_name(controller, options),
+                scope.find([:"#{params_key_name(options)}_id", :id].map{|key| controller.params[key] }.reject(&:blank?)[0])
+              )
             },
 
             related_record: -> {
-              if controller.params[:"#{options[:resource]}_id"]
-                controller.instance_variable_set(ivar_name(controller, options),
-                    scope.find(controller.params[:"#{options[:resource]}_id"]))
+              unless controller.params[:"#{params_key_name(options)}_id"].blank?
+                controller.instance_variable_set(
+                  ivar_name(controller, options),
+                  scope.find(controller.params[:"#{params_key_name(options)}_id"])
+                )
               end
             }
           }
@@ -95,23 +100,23 @@ module Heimdallr
 
       def load_target(controller, options)
         Array.wrap(options[:through]).map do |parent|
-          loaded = controller.instance_variable_get(:"@#{parent}")
+          loaded = controller.instance_variable_get(:"@#{variable_name parent}")
           unless loaded
             load(controller, :resource => parent.to_s, :related => true)
-            loaded = controller.instance_variable_get(:"@#{parent}")
+            loaded = controller.instance_variable_get(:"@#{variable_name parent}")
           end
           if loaded && options[:authorize_chain]
             authorize(controller, :resource => parent.to_s, :related => true)
           end
-          controller.instance_variable_get(:"@#{parent}")
+          controller.instance_variable_get(:"@#{variable_name parent}")
         end.reject(&:nil?).first
       end
 
       def ivar_name(controller, options)
         if action_type(controller.params[:action], options) == :collection
-          :"@#{options[:resource].parameterize('_').pluralize}"
+          :"@#{variable_name(options).pluralize}"
         else
-          :"@#{options[:resource].parameterize('_')}"
+          :"@#{variable_name(options)}"
         end
       end
 
@@ -138,6 +143,30 @@ module Heimdallr
           end
         end
       end
+
+      def variable_name(options)
+        if options.kind_of? Hash
+          options[:resource]
+        else
+          options.to_s
+        end.parameterize('_')
+      end
+
+      def class_name(options)
+        if options.kind_of? Hash
+          options[:resource]
+        else
+          options.to_s
+        end.classify
+      end
+
+      def params_key_name(options)
+        if options.kind_of? Hash
+          options[:resource]
+        else
+          options.to_s
+        end.split('/').last
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heimdallr-resource
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70169121125720 !ruby/object:Gem::Requirement
+  requirement: &70177728312580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169121125720
+  version_requirements: *70177728312580
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70169121125180 !ruby/object:Gem::Requirement
+  requirement: &70177728312140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169121125180
+  version_requirements: *70177728312140
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70169121124440 !ruby/object:Gem::Requirement
+  requirement: &70177728311720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169121124440
+  version_requirements: *70177728311720
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70169121116540 !ruby/object:Gem::Requirement
+  requirement: &70177728311300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169121116540
+  version_requirements: *70177728311300
 - !ruby/object:Gem::Dependency
   name: heimdallr
-  requirement: &70169121115860 !ruby/object:Gem::Requirement
+  requirement: &70177728310880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70169121115860
+  version_requirements: *70177728310880
 description: Heimdallr-Resource provides CanCan-like interface for Heimdallr-secured
   objects.
 email: