fanforce-base 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c7c06328df60900994a9fbd1ccca3943ebc6cdc
-  data.tar.gz: b33eb607565c95f517c0f46b7bbb633c2132ee9f
+  metadata.gz: 35cb24522fef11bc78e979e89f12426ee56a5d21
+  data.tar.gz: 41ee6031a00df9eea1a228a691e5c399fc38b38d
 SHA512:
-  metadata.gz: 25eb80e3f29ae1f07b84e4af731138351b42f6a006ae2d77e2270ad7984bd8869cb3c7063b8318304fe27fd24556639d6d0064e3f1f10a81debcdf1847e72760
-  data.tar.gz: 09d51992b3356d02037b2afec4ae336a3add9f3f7de0eff6da3d48e9a83b3e5bd9a5cd710c726b19eb8620f10c5e639262d07370d4a1b4cbae97fe5c67892c8c
+  metadata.gz: 4d48e6a7d74d0a2ca6232b59997c907a698693e9ad26623ce3a52d01b5d28d635da5050c445ea15855405b9b333addd306c943970b0a2e87a41d2ce573cfe4f2
+  data.tar.gz: ea901ee15248766f9028c2b4d7d353e6592f346e95b7dd8535bb3d6a5d69d0e1f7252938870455016418fd7546bb1eb4ddc34b8224b4bfcd3053645438f14b05

data/lib/fanforce/base/internal_utils.rb

@@ -19,15 +19,15 @@ module Fanforce::Base::InternalUtils
 
   def self.to_param(obj, namespace=nil)
     if obj.is_a?(Array)
-      collect { |e| to_param(e) }.join '/'
+      obj.collect { |e| to_param(e) }.join '/'
     elsif obj.is_a?(Hash)
       to_query_string(obj, namespace)
     elsif obj.is_a?(NilClass)
-      obj
+      obj.to_s
     elsif obj.is_a?(TrueClass)
-      obj
+      obj.to_s
     elsif obj.is_a?(FalseClass)
-      obj
+      obj.to_s
     elsif obj.is_a?(Object)
       obj.to_s
     end

data/lib/fanforce/base/utils.rb

@@ -78,18 +78,30 @@ module Fanforce::Base::Utils
     end
   end
 
-  def to_query_string(obj, namespace=nil)
-    return '' if is_blank?(obj)
-    if obj.is_a?(Array)
-      obj.collect { |value| to_query_string(value, "#{namespace}[]") }.join '&'
-    elsif obj.is_a?(Hash)
-      obj.collect { |key, value| to_query_string(value, namespace ? "#{namespace}[#{key}]" : key) }.sort * '&'
-    elsif obj.is_a?(Object)
-      "#{CGI.escape(Fanforce::Base::InternalUtils.to_param(namespace))}=#{CGI.escape(Fanforce::Base::InternalUtils.to_param(obj).to_s)}"
-    else
-      raise "Argument must be an object, hash, or array; instead it was a #{obj.class}"
+  # Lifted from Rack::Utils.build_nested_query
+  #
+  def build_nested_query(value, prefix = nil)
+    case value
+      when Array
+        value.map { |v|
+          build_nested_query(v, "#{prefix}[]")
+        }.join("&")
+      when Hash
+        value.map { |k, v|
+          build_nested_query(v, prefix ? "#{prefix}[#{escape(k)}]" : escape(k))
+        }.reject(&:empty?).join('&')
+      when nil
+        prefix
+      else
+        raise ArgumentError, "value must be a Hash" if prefix.nil?
+        "#{prefix}=#{escape(value)}"
     end
   end
+  alias_method :to_query_string, :build_nested_query
+
+  def escape(s)
+    CGI.escape(Fanforce::Base::InternalUtils.to_param(s))
+  end
 
   def curl_command(method, url, req_params)
     case method.to_s.downcase.to_sym

data/lib/fanforce/base/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class Base
-    VERSION = '1.2.3'
+    VERSION = '1.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-base
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Caleb Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-30 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack