3scale_client 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 593092ff29ce5dffe0c5d1394c0f879d04b5c0b9
-  data.tar.gz: 93907838adc4147c174bb648748fa9e2469db24a
+  metadata.gz: 8f639b2cd5fc3a94a43a71e46d25764a6069bcf3
+  data.tar.gz: e78be7244735a016e216f68de2df731fd0da658f
 SHA512:
-  metadata.gz: ef225fb8331fcdac33b2b63ba27d93c760e3b621316b06169795e7dc8866fd401ae01f25cfe77175b4197badba6aac166d768e8d55ed5ddd5c9c5dc782ae36eb
-  data.tar.gz: ae2145f23b2edc3bc9ff1e177a130190b8b10daa7cb762f2d3b623dac2f74d0888a917757ad541e9f27196b3524c950a9f154af72c53c9d54a7351a91fa33a3e
+  metadata.gz: 7a425a24452f22fbb738d07bccacaf3169db5ea0235839a3fb3bba7cb0c35c43a792dfece492ef989b4a8e681feff6975e7163e220c4ad04cc5ebb1a565a6486
+  data.tar.gz: ae3cd7543511cbd604ff4dbf930181c3e1dfbc34463b89a189bd933da4eac56a9d7c46fb677eecc7b14eb25de79a0c58761ef4ca6e3b9f30066ce9db37f68f6c

data/.travis.yml

@@ -6,6 +6,7 @@ rvm:
 - 2.0.0
 - 2.1
 - 2.2
+- 2.3.0
 - jruby
 matrix:
   include:

data/CHANGELOG.md

@@ -1,9 +1,9 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [Unreleased][unreleased]
-### Fixed
+## [2.7.0] - 2016-08-26
 ### Added
+- Added support for 'user_key' authentication mode in 'report' method
 
 ## [2.6.1] - 2016-01-04
 ### Fixed

data/VERSION

@@ -1 +1 @@
-2.6.0
+2.7.0

data/lib/3scale/client.rb

@@ -249,6 +249,7 @@ module ThreeScale
 
     OAUTH_PARAMS = [:app_id, :app_key, :service_id, :redirect_url]
     ALL_PARAMS = [:user_key, :app_id, :app_key, :service_id, :redirect_url]
+    REPORT_PARAMS = [:user_key, :app_id, :service_id, :timestamp]
 
     def options_to_params(options, allowed_keys)
       params = { :provider_key  => provider_key }
@@ -268,9 +269,9 @@ module ThreeScale
       result = {}
 
       transactions.each_with_index do |transaction, index|
-        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])
+        REPORT_PARAMS.each do |param|
+          append_value(result, index, [param],  transaction[param])
+        end
 
         transaction[:usage].each do |name, value|
           append_value(result, index, [:usage, name], value)

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

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

data/test/client_test.rb

@@ -370,6 +370,26 @@ class ThreeScale::ClientTest < MiniTest::Test
     assert_equal URI.encode_www_form(payload), request.body
   end
 
+  def test_report_supports_user_key
+    payload = {
+      'transactions[0][user_key]'    => 'foo',
+      'transactions[0][timestamp]'   => '2016-07-18 15:42:17 0200',
+      'transactions[0][usage][hits]' => '1',
+      'provider_key'                 => '1234abcd'
+    }
+
+    FakeWeb.register_uri(:post, "http://#{@host}/transactions.xml",
+                         :status => ['200', 'OK'])
+
+    @client.report({:user_key    => 'foo',
+                    :usage     => {'hits' => 1},
+                    :timestamp => '2016-07-18 15:42:17 0200'})
+
+    request = FakeWeb.last_request
+
+    assert_equal URI.encode_www_form(payload), request.body
+  end
+
   def test_failed_report
     error_body = '<error code="provider_key_invalid">provider key "foo" is invalid</error>'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: 3scale_client
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Michal Cichra
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-08-26 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.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Client for 3scale Web Service Management System API