loquor 1.12.0 → 1.13.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDMwODdkODY4NWMwY2ViZjkzOGE4MTczNTU1MGYwYjFiOTMwNmI2Mg==
+    ZmMxOWUyZWYyZjNmODFjOWY1OTUzYWFkNjE2MWEwNzMxZjdkMjQxNQ==
   data.tar.gz: !binary |-
-    YTczMjQwNDQ1ZTdiZThkOTE2YWYyNWEzNTIyZDA3Zjc4ZTZiNDgxNA==
+    MTQwODIzNjdlOTI4OTZmNGY2NmMwYjk0NjM3ZWVmNWNhMDk5NjE3Zg==
 SHA512:
   metadata.gz: !binary |-
-    ODdmZDYyYTJlY2MwMGMzN2YxZjNmZTlkMjQ4OWMxNTI2ZWNhODI4NzI4MDQ3
-    MjlmMTdhNGIyNmU5YTZiMTZjMjNiNThkYzBkYTkzYTliN2RiNTkxNzQ1NmJi
-    ZjZkNmEyZmI3NTczZWUwMDBmYjViOWY0YjRjMWU4OGUwNTE0YmU=
+    YTNiZDk5NGFlOGY4MjVkYWQ1Y2U1NGE4ZTc2MzYyYmVhNzA0NWNmNTE3YTRj
+    NjI1ZjgyZGE4ZmIyMWI4NTQ0ODBjYzliMmMyZmJjMDQ1ZDkyMmQ5MDA1OTlk
+    NzA4MWJjOTc2Mzg4ZmVjZGQ4N2FkOTBjY2IyYjNlYTQ2ZWFjYzg=
   data.tar.gz: !binary |-
-    ZGMyOTNhOWFkZjNlYTU1ODY4NzgyYTZkYTc4YzU5ODk1MjA1Y2Q3MjRiNGU4
-    ZTU3MjIwNWZkNDk1MWQ5ZDQyZWRlYWViZTVjNDA3YWRmOWQ1NGYwNWQyM2Ji
-    ZDA0ZWY5ZTRlMmVkZjJiMTRkYzczZTg0MDBjMTFmMzEzYTkxYzE=
+    YjRhYjJkMTJmYTc4ODI1ZWU5YjNhODcxNTJlOWU4NDU1OTVhNDVjY2Q5YzJh
+    M2U4M2ZmYjg1Y2EyM2Y3MWU3N2E2MmE2NjM2MjFjZjYzZTc1NGFiYmVjZWQ0
+    YzVlNGM4ODM5YzI5MmRmN2RiNzI5NDUyMzBiYmNhYTJhNDY5NjY=

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.13.0 / 2014-05-19
+* [BUGFIX] Ensure proper encoding of query params
+
 # 1.12.0 / 2014-05-06
 * [FEATURE] Retry support for HTTP 503 status
 

data/lib/loquor/api_calls/index.rb

@@ -90,22 +90,22 @@ module Loquor
     def add_criteria(query_string, key, value)
       substitute_value = Loquor.config.substitute_values[value]
       if !substitute_value.nil?
-        query_string << "#{key}=#{URI.encode(substitute_value)}"
+        query_string << "#{key}=#{URI.encode_www_form_component(substitute_value)}"
       else
         case value
         when String, Symbol, Numeric, Date, Time, DateTime
-          query_string << "#{key}=#{URI.encode(value.to_s)}"
+          query_string << "#{key}=#{URI.encode_www_form_component(value.to_s)}"
         when Array
           if value.empty?
               query_string << "#{key}[]="
           else
             value.each do |v|
-              query_string << "#{key}[]=#{URI.encode(v.to_s)}"
+              query_string << "#{key}[]=#{URI.encode_www_form_component(v.to_s)}"
             end
           end
         when Hash
           value.each do |k,v|
-            query_string << "#{key}[#{k}]=#{URI.encode(v.to_s)}"
+            query_string << "#{key}[#{k}]=#{URI.encode_www_form_component(v.to_s)}"
           end
         else
           raise LoquorError.new("Filter values must be strings, arrays, date, time, datetime or single-depth hashes.")

data/lib/loquor/version.rb

@@ -1,3 +1,3 @@
 module Loquor
-  VERSION = "1.12.0"
+  VERSION = "1.13.0"
 end

data/test/api_calls/index_test.rb

@@ -82,7 +82,7 @@ module Loquor
 
     def test_where_gets_correct_url_with_criteria
       searcher = ApiCall::Index.new(resource).where(name: 'Star Wars')
-      assert searcher.send(:generate_url).include? "?name=Star%20Wars"
+      assert searcher.send(:generate_url).include? "?name=Star+Wars"
     end
 
     def test_where_gets_correct_url_with_symbol
@@ -90,6 +90,11 @@ module Loquor
       assert searcher.send(:generate_url).include? "?name=star"
     end
 
+    def test_generated_url_encodes_correctly
+      searcher = ApiCall::Index.new(resource).where(url: "http://www.example.com/resource.html?foo=bar&_foo=baz&content=Stuff%3A+that%2Fshould+%28be+escaped%29")
+      assert searcher.send(:generate_url).include? "?url=http%3A%2F%2Fwww.example.com%2Fresource.html%3Ffoo%3Dbar%26_foo%3Dbaz%26content%3DStuff%253A%2Bthat%252Fshould%2B%2528be%2Bescaped%2529"
+    end
+
     def test_where_gets_correct_url_with_date
       searcher = ApiCall::Index.new(resource).where(name: Date.new(1969,5,10))
       assert searcher.send(:generate_url).include? "?name=1969-05-10"
@@ -97,12 +102,12 @@ module Loquor
 
     def test_where_gets_correct_url_with_time
       searcher = ApiCall::Index.new(resource).where(name: Time.new(1969,5,10,13,10))
-      assert searcher.send(:generate_url).include? "?name=1969-05-10%2013:10:00"
+      assert searcher.send(:generate_url).include? "?name=1969-05-10+13%3A10%3A00"
     end
 
     def test_where_gets_correct_url_with_date_time
       searcher = ApiCall::Index.new(resource).where(name: DateTime.new(1969,5,10,13,10))
-      assert searcher.send(:generate_url).include? "?name=1969-05-10T13:10:00"
+      assert searcher.send(:generate_url).include? "?name=1969-05-10T13%3A10%3A00%2B00%3A00"
     end
 
     def test_where_gets_correct_url_with_number
@@ -150,7 +155,7 @@ module Loquor
       searcher = ApiCall::Index.new(resource).where(criteria)
       searcher.stubs(path: "foobar")
       url = searcher.send(:generate_url)
-      assert url.include?("thing=:__true__")
+      assert url.include?("thing=%3A__true__")
     end
 
     def test_that_iterating_calls_results

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loquor
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Jeremy Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filum