3scale_client 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eafe101dd72cc961938abaf17d09052111b9d15c
-  data.tar.gz: 129167bf9d3634b14419156acf1e63a331dc3999
+  metadata.gz: 593092ff29ce5dffe0c5d1394c0f879d04b5c0b9
+  data.tar.gz: 93907838adc4147c174bb648748fa9e2469db24a
 SHA512:
-  metadata.gz: c2ab554edee66aa884bac24b9b26ab9a34f40d486f3c38662dc8aaa2e26a309190807120043a11edc32472d98d60b08edf852b739c3ad98fc4f0e447118bceca
-  data.tar.gz: 7f244c5699e88b858e94d9cb416180ebca0c29d0b4622bca6b658387a529e43efb22ceb71430a525ba8a2399fc70f71f1be6a57478a10f774e725702b6fb2229
+  metadata.gz: ef225fb8331fcdac33b2b63ba27d93c760e3b621316b06169795e7dc8866fd401ae01f25cfe77175b4197badba6aac166d768e8d55ed5ddd5c9c5dc782ae36eb
+  data.tar.gz: ae2145f23b2edc3bc9ff1e177a130190b8b10daa7cb762f2d3b623dac2f74d0888a917757ad541e9f27196b3524c950a9f154af72c53c9d54a7351a91fa33a3e

data/CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 ### Fixed
 ### Added
 
+## [2.6.1] - 2016-01-04
+### Fixed
+- Fixed double escaping of post parameters (https://github.com/3scale/3scale_ws_api_for_ruby/pull/24)
+
 ## [2.6.0] - 2015-12-28
 
 ### Added

data/lib/3scale/client.rb

@@ -268,24 +268,24 @@ module ThreeScale
       result = {}
 
       transactions.each_with_index do |transaction, index|
-        append_encoded_value(result, index, [:app_id],    transaction[:app_id])
-        append_encoded_value(result, index, [:timestamp], transaction[:timestamp])
-        append_encoded_value(result, index, [:client_ip], transaction[:client_ip])
+        append_value(result, index, [:app_id],    transaction[:app_id])
+        append_value(result, index, [:timestamp], transaction[:timestamp])
+        append_value(result, index, [:client_ip], transaction[:client_ip])
 
         transaction[:usage].each do |name, value|
-          append_encoded_value(result, index, [:usage, name], value)
+          append_value(result, index, [:usage, name], value)
         end
 
         transaction.fetch(:log, {}).each do |name, value|
-          append_encoded_value(result, index, [:log, name], value)
+          append_value(result, index, [:log, name], value)
         end
       end
 
       result
     end
 
-    def append_encoded_value(result, index, names, value)
-      result["transactions[#{index}][#{names.join('][')}]"] = CGI.escape(value.to_s) if value
+    def append_value(result, index, names, value)
+      result["transactions[#{index}][#{names.join('][')}]"] = value if value
     end
 
     def build_report_response

data/lib/3scale/client/version.rb

@@ -1,5 +1,5 @@
 module ThreeScale
   class Client
-    VERSION = '2.6.0'
+    VERSION = '2.6.1'
   end
 end

data/test/client_test.rb

@@ -335,25 +335,21 @@ class ThreeScale::ClientTest < MiniTest::Test
   end
 
   def test_report_encodes_transactions
-    http_response = stub
-    Net::HTTPSuccess.stubs(:===).with(http_response).returns(true)
-
     payload = {
       'transactions[0][app_id]'      => 'foo',
-      'transactions[0][timestamp]'   => CGI.escape('2010-04-27 15:42:17 0200'),
+      'transactions[0][timestamp]'   => '2010-04-27 15:42:17 0200',
       'transactions[0][usage][hits]' => '1',
       'transactions[0][log][request]'  => 'foo',
       'transactions[0][log][response]' => 'bar',
       'transactions[0][log][code]'   => '200',
       'transactions[1][app_id]'      => 'bar',
-      'transactions[1][timestamp]'   => CGI.escape('2010-04-27 15:55:12 0200'),
+      'transactions[1][timestamp]'   => Time.local(2010, 4, 27, 15, 00).to_s,
       'transactions[1][usage][hits]' => '1',
       'provider_key'                 => '1234abcd'
     }
 
-    @client.http.expects(:post)
-    .with('/transactions.xml', payload)
-    .returns(http_response)
+    FakeWeb.register_uri(:post, "http://#{@host}/transactions.xml",
+                         :status => ['200', 'OK'])
 
     @client.report({:app_id    => 'foo',
                     :usage     => {'hits' => 1},
@@ -367,7 +363,11 @@ class ThreeScale::ClientTest < MiniTest::Test
 
                    {:app_id    => 'bar',
                     :usage     => {'hits' => 1},
-                    :timestamp => '2010-04-27 15:55:12 0200'})
+                    :timestamp => Time.local(2010, 4, 27, 15, 00)})
+
+    request = FakeWeb.last_request
+
+    assert_equal URI.encode_www_form(payload), request.body
   end
 
   def test_failed_report

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: 3scale_client
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Michal Cichra
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Client for 3scale Web Service Management System API