kelredd-resourceful 0.7.23 → 0.7.24

data/lib/resourceful/extensions.rb

@@ -134,12 +134,33 @@ module Resourceful
       #  # => "?id=thomas_hardy"
       #  {:id => 23423, :since => Time.now}.to_http_query_str
       #  # => "?since=Thu,%2021%20Jun%202007%2012:10:05%20-0500&id=23423"
+      #  {:id => [1,2]}.to_http_query_str
+      #  # => "?id[]=1&id[]=2"
+      #  {:poo => {:foo => 1, :bar => 2}}.to_http_query_str
+      #  # => "?poo[bar]=2&poo[foo]=1"
+      #  {:poo => {:foo => 1, :bar => {:bar1 => 1, :bar2 => "nasty"}}}.to_http_query_str
+      #  "?poo[bar][bar1]=1&poo[bar][bar2]=nasty&poo[foo]=1"
       unless {}.respond_to?(:to_http_query_str) 
         def to_http_query_str(opts = {})
-          require 'cgi' unless defined?(CGI) && defined?(CGI::escape)
+          require 'cgi' unless defined?(::CGI) && defined?(::CGI::escape)
           opts[:prepend] ||= '?'
           opts[:append] ||= ''
-          self.empty? ? '' : "#{opts[:prepend]}#{self.collect{|key, val| "#{key.to_s}=#{CGI.escape(val.to_s)}"}.join('&')}#{opts[:append]}"
+          opts[:key_ns] ||= nil
+          opt_strings = self.collect do |key, val|
+            key_s = opts[:key_ns] ? "#{opts[:key_ns]}[#{key.to_s}]" : key.to_s
+            if val.kind_of?(::Array)
+              val.collect{|i| "#{key_s}[]=#{::CGI.escape(i.to_s)}"}.join('&')
+            elsif val.kind_of?(::Hash)
+              val.to_http_query_str({
+                :prepend => '',
+                :key_ns => key_s,
+                :append => ''
+              })
+            else
+              "#{key_s}=#{::CGI.escape(val.to_s)}"
+            end
+          end 
+          self.empty? ? '' : "#{opts[:prepend]}#{opt_strings.join('&')}#{opts[:append]}"
         end
       end
       

data/lib/resourceful/model/eager_load.rb

@@ -16,7 +16,7 @@ module Resourceful
         assoc_data = get_association_data(klass, clean_association_name)
         assoc_klass = klass.ancestors.include?(Resourceful::Model::Base) ? klass.get_namespaced_klass(assoc_data[:class_name]) : assoc_data[:class_name].resourceful_constantize
         fk_values = collection.inject([]) {|vals, item| vals << item.send(assoc_data[:foreign_key_method])}
-        fk_results = assoc_klass.send(assoc_data[:find_method_name], :all, {assoc_data[:foreign_key_name] => fk_values.join(',')}, true)
+        fk_results = assoc_klass.send(assoc_data[:find_method_name], :all, {assoc_data[:foreign_key_name] => fk_values}, true)
         collection.each do |item|
           item_results = fk_results.reject{|result| result.send(assoc_data[:foreign_key_name]) != item.send(assoc_data[:foreign_key_method])}
           item.instance_variable_set("@#{clean_association_name}", [:belongs_to, :has_one].include?(assoc_data[:type]) ? item_results.first : item_results)

data/lib/resourceful/version.rb

@@ -3,7 +3,7 @@ module Resourceful
     
     MAJOR = 0
     MINOR = 7
-    TINY  = 23
+    TINY  = 24
     
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kelredd-resourceful
 version: !ruby/object:Gem::Version 
-  version: 0.7.23
+  version: 0.7.24
 platform: ruby
 authors: 
 - Kelly Redding