viva-resource_controller 0.6.5 → 0.6.5.1

data/lib/resource_controller/helpers/urls.rb

@@ -45,54 +45,59 @@ module ResourceController
           symbol = type.blank? ? nil : type.gsub(/_/, '').to_sym
       
           define_method("#{type}object_url") do |*alternate_object|
-            smart_url *object_url_options(symbol, alternate_object.first)
+            smart_url *object_url_options(symbol, alternate_object.first).push(extract_params(*alternate_object))
           end
       
           define_method("#{type}object_path") do |*alternate_object|
-            smart_path *object_url_options(symbol, alternate_object.first)
+            smart_path *object_url_options(symbol, alternate_object.first).push(extract_params(*alternate_object))
           end
       
           define_method("hash_for_#{type}object_url") do |*alternate_object|
-            hash_for_smart_url *object_url_options(symbol, alternate_object.first)
+            hash_for_smart_url *object_url_options(symbol, alternate_object.first).push(extract_params(*alternate_object))
           end
       
           define_method("hash_for_#{type}object_path") do |*alternate_object|
-            hash_for_smart_path *object_url_options(symbol, alternate_object.first)
+            hash_for_smart_path *object_url_options(symbol, alternate_object.first).push(extract_params(*alternate_object))
           end
         end
     
-        def new_object_url
-          smart_url *new_object_url_options
+        def new_object_url(*args)
+          smart_url *new_object_url_options.push(extract_params(*args))
         end
     
-        def new_object_path
-          smart_path *new_object_url_options
+        def new_object_path(*args)
+          smart_path *new_object_url_options.push(extract_params(*args))
         end
     
-        def hash_for_new_object_url
-          hash_for_smart_url *new_object_url_options
+        def hash_for_new_object_url(*args)
+          hash_for_smart_url *new_object_url_options.push(extract_params(*args))
         end
     
-        def hash_for_new_object_path
-          hash_for_smart_path *new_object_url_options
+        def hash_for_new_object_path(*args)
+          hash_for_smart_path *new_object_url_options.push(extract_params(*args))
         end
     
-        def collection_url
-          smart_url *collection_url_options
+        def collection_url(*args)
+          smart_url *collection_url_options.push(extract_params(*args))
         end
     
-        def collection_path
-          smart_path *collection_url_options
+        def collection_path(*args)
+          smart_path *collection_url_options.push(extract_params(*args))
         end
     
-        def hash_for_collection_url
-          hash_for_smart_url *collection_url_options
+        def hash_for_collection_url(*args)
+          hash_for_smart_url *collection_url_options.push(extract_params(*args))
         end
     
-        def hash_for_collection_path
-          hash_for_smart_path *collection_url_options
+        def hash_for_collection_path(*args)
+          hash_for_smart_path *collection_url_options.push(extract_params(*args))
         end
     
+        def extract_params(*args)
+          params = {}
+          params.merge!(args.last) if args.last.is_a?(Hash)
+        end
+        
         # Used internally to provide the options to smart_url from Urligence.
         #
         def collection_url_options

data/lib/urligence.rb

@@ -1,23 +1,30 @@
 module Urligence
   def smart_url(*objects)
-    urligence(*objects.push(:url))
+    urligence *attach_params(:nil, :url, *objects)
   end
   
   def smart_path(*objects)
-    urligence(*objects.push(:path))
+    urligence *attach_params(nil, :path, *objects)
   end
   
   def hash_for_smart_url(*objects)
-    urligence(*objects.unshift(:hash_for).push(:url).push({:type => :hash}))
+    urligence *attach_params(:hash_for, :url, *objects)
   end
   
   def hash_for_smart_path(*objects)
-    urligence(*objects.unshift(:hash_for).push(:path).push({:type => :hash}))
+    urligence *attach_params(:hash_for, :path, *objects)
+  end
+  
+  # Attaches prefix and suffix and appends params 
+  def attach_params(prefix, suffix, *objects)
+    params = objects.pop if objects.last.is_a?(Hash)
+    objects.unshift(prefix).push(suffix).push(params)
   end
   
   def urligence(*objects)
-    config = {}
-    config.merge!(objects.pop) if objects.last.is_a?(Hash)
+    only_hash = objects.first == :hash_for
+    params = {}
+    params.merge!(objects.pop) if objects.last.is_a?(Hash)
     
     objects.reject! { |object| object.nil? }
     
@@ -31,10 +38,9 @@ module Urligence
       end
     end
     
-    unless config[:type] == :hash
-      send url_fragments.join("_"), *objects.flatten.select { |obj| !obj.is_a? Symbol }
+    unless only_hash
+      send url_fragments.join("_"), *objects.flatten.select { |obj| !obj.is_a? Symbol }.push(params)
     else
-      params = {}
       unparsed_params = objects.select { |obj| !obj.is_a? Symbol }
       unparsed_params.each_with_index do |obj, i|
         unless i == (unparsed_params.length-1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: viva-resource_controller
 version: !ruby/object:Gem::Version 
-  version: 0.6.5
+  version: 0.6.5.1
 platform: ruby
 authors: 
 - James Golick
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-31 00:00:00 -07:00
+date: 2009-10-01 00:00:00 -07:00
 default_executable: 
 dependencies: []