3scale_client 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f639b2cd5fc3a94a43a71e46d25764a6069bcf3
-  data.tar.gz: e78be7244735a016e216f68de2df731fd0da658f
+  metadata.gz: 881aa442d660c091dadbbd20b2446d506343cf38
+  data.tar.gz: 0a8d027ad84fda9f5f24a486124d2a003c3aa5ab
 SHA512:
-  metadata.gz: 7a425a24452f22fbb738d07bccacaf3169db5ea0235839a3fb3bba7cb0c35c43a792dfece492ef989b4a8e681feff6975e7163e220c4ad04cc5ebb1a565a6486
-  data.tar.gz: ae3cd7543511cbd604ff4dbf930181c3e1dfbc34463b89a189bd933da4eac56a9d7c46fb677eecc7b14eb25de79a0c58761ef4ca6e3b9f30066ce9db37f68f6c
+  metadata.gz: a2c751900a737e62312b0fd9dd530a6ac45a494eb46bf95e51fa8daed741f275a2e5c789b1b6477f79306490f9670d3c4f8ece97e21fdb28d9d0d23dcbfba26f
+  data.tar.gz: 99fbf6a2bf089e96ba7df746e56a53b5543fe76b237eee230c151a5ca16327931d4b346632e47801a54b0f4898f413866515395a7c9d0d7f5939c60b39b0144f

data/.travis.yml

@@ -2,17 +2,26 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-- 1.9.3
 - 2.0.0
 - 2.1
 - 2.2
 - 2.3.0
 - jruby
+gemfile:
+  - Gemfile
+  - gemfiles/rack_1.gemfile
 matrix:
-  include:
+  exclude:
+  - rvm: 2.0.0
+    gemfile: Gemfile
+  - rvm: 2.1
+    gemfile: Gemfile
+  - rvm: 2.2
+    gemfile: Gemfile
   - rvm: jruby
-    env: JRUBY_OPTS="--2.0"
+    gemfile: Gemfile
 env:
   global:
     - TEST_3SCALE_APP_IDS=4d4b20b9 TEST_3SCALE_APP_KEYS=ecce202ecc2eb8dc7a499c34a34d5987
     - secure: VSElS0KvnufcZKStV7kj6xHFEiWvQkpxk1IEuhKq5JqywniN/6ScaNUFxbBKrOUrqhzXIRUCteBP2wvYRjlNhLFZSnYskzh7dLkOp/WV+WK6KjrdflTiF6UTxW4pBSsg6YDJ/wWJlmwsPVty1pRvOE3ru6uco+dTWCCLn4BvWqc=
+    - JRUBY_OPTS="--2.0"

data/3scale_client.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.0'
+
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rdoc"
@@ -26,5 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "net-http-persistent"
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'rack'
+  spec.add_development_dependency 'appraisal'
   spec.add_dependency 'nokogiri'
 end

data/Appraisals

@@ -0,0 +1,3 @@
+appraise "rack-1" do
+  gem "rack", ['>= 1.0', '< 2.0']
+end

data/CHANGELOG.md

@@ -1,6 +1,21 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [2.8.0] - 2016-09-06
+This version drops support for Ruby versions < 2.0.
+
+### Added
+- Added support for reporting to services other than the default one.
+  `ThreeScale::Client#report` now accepts an optional `service_id`.
+  There has been a change in the params that the method accepts. This
+  change is backwards compatible but a deprecation warning is shown
+  when calling the method using the old params.
+- The two authorize calls `ThreeScale::Client#Authorize` and
+  `ThreeScale::Client#oauth_authorize` now accept an optional predicted
+  usage parameter.  
+- It is now possible to specify a port different that the default
+  one for the API service management endpoint.
+
 ## [2.7.0] - 2016-08-26
 ### Added
 - Added support for 'user_key' authentication mode in 'report' method

data/README.md

@@ -197,19 +197,30 @@ response.redirect_url
 
 ### Report
 
-To report usage, use the +report+ method. You can report multiple transaction at the same time:
+To report usage, use the +report+ method. You can report multiple transactions at the same time:
 
 ```ruby
-response = client.report({:app_id => "first app id",  :usage => {'hits' => 1}},
-                         {:app_id => "second app id", :usage => {'hits' => 1}})
+response = client.report(
+  :transactions => [{:app_id => "first app id",  :usage => {'hits' => 1}},
+                    {:app_id => "second app id", :usage => {'hits' => 1}}])
+```
+
+To specify a service other than the default one:
+```ruby
+response = client.report(
+  :transactions => [{:app_id => "first app id",  :usage => {'hits' => 1}},
+                    {:app_id => "second app id", :usage => {'hits' => 1}}],
+  :service_id => 'service_123')
 ```
 
 The :app_id and :usage parameters are required. Additionaly, you can specify a timestamp
-of transaction:
+of a transaction:
 
 ```ruby
-response = client.report({:app_id => "app id", :usage => {'hits' => 1},
-                          :timestamp => Time.local(2010, 4, 28, 12, 36)})
+response = client.report(
+  :transactions => [{:app_id => "app id",
+                     :usage => {'hits' => 1},
+                     :timestamp => Time.local(2010, 4, 28, 12, 36)}])
 ```
 
 The timestamp can be either a Time object (from ruby's standard library) or something that

data/VERSION

@@ -1 +1 @@
-2.7.0
+2.8.0

data/gemfiles/rack_1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rack", [">= 1.0", "< 2.0"]
+
+gemspec :path => "../"

data/lib/3scale/client.rb

@@ -41,6 +41,12 @@ module ThreeScale
   class Client
     DEFAULT_HOST = 'su1.3scale.net'
 
+    DEPRECATION_MSG_OLD_REPORT = 'warning: def report(*transactions) is '\
+      'deprecated. In next versions, the signature of the report method is '\
+      'going to be: '\
+      'def report(transactions: [], service_id: nil).'.freeze
+    private_constant :DEPRECATION_MSG_OLD_REPORT
+
     def initialize(options)
       if options[:provider_key].nil? || options[:provider_key] =~ /^\s*$/
         raise ArgumentError, 'missing :provider_key'
@@ -69,12 +75,7 @@ module ThreeScale
       end
 
       options_usage ||= {:hits => 1}
-      usage = []
-      options_usage.each_pair do |metric, value|
-        escaped_metric = CGI.escape "[usage][#{metric}]"
-        usage << "#{escaped_metric}=#{CGI.escape(value.to_s)}"
-      end
-      path += "&#{usage.join('&')}"
+      path += "&#{usage_query_params(options_usage)}"
 
       if options_log
         log = []
@@ -101,21 +102,23 @@ module ThreeScale
     #
     # == Parameters
     #
-    # The parameters the transactions to report. Each transaction is a hash with
-    # these elements:
-    #
-    #   app_id::    ID of the application to report the transaction for. This parameter is
-    #               required.
-    #   usage::     Hash of usage values. The keys are metric names and values are
-    #               correspoding numeric values. Example: {'hits' => 1, 'transfer' => 1024}.
-    #               This parameter is required.
-    #   timestamp:: Timestamp of the transaction. This can be either a object of the
-    #               ruby's Time class, or a string in the "YYYY-MM-DD HH:MM:SS" format
-    #               (if the time is in the UTC), or a string in
-    #               the "YYYY-MM-DD HH:MM:SS ZZZZZ" format, where the ZZZZZ is the time offset
-    #               from the UTC. For example, "US Pacific Time" has offset -0800, "Tokyo"
-    #               has offset +0900. This parameter is optional, and if not provided, equals
-    #               to the current time.
+    # Hash with two fields:
+    #
+    #   transactions:: It is required. It is an enumerable. Each element is a hash with the fields:
+    #         app_id:    ID of the application to report the transaction for. This parameter is
+    #                    required.
+    #         usage:     Hash of usage values. The keys are metric names and values are
+    #                    corresponding numeric values. Example: {'hits' => 1, 'transfer' => 1024}.
+    #                    This parameter is required.
+    #         timestamp: Timestamp of the transaction. This can be either a object of the
+    #                    ruby's Time class, or a string in the "YYYY-MM-DD HH:MM:SS" format
+    #                    (if the time is in the UTC), or a string in
+    #                    the "YYYY-MM-DD HH:MM:SS ZZZZZ" format, where the ZZZZZ is the time offset
+    #                    from the UTC. For example, "US Pacific Time" has offset -0800, "Tokyo"
+    #                    has offset +0900. This parameter is optional, and if not provided, equals
+    #                    to the current time.
+    #   service_id::   ID of the service. It is optional. When not specified, the transactions
+    #                  are reported to the default service.
     #
     # == Return
     #
@@ -127,20 +130,39 @@ module ThreeScale
     #
     # == Examples
     #
-    #   # Report two transactions of two applications.
-    #   client.report({:app_id => 'foo', :usage => {'hits' => 1}},
-    #                 {:app_id => 'bar', :usage => {'hits' => 1}})
+    #    Report two transactions of two applications. Using the default service.
+    #    client.report(transactions: [{:app_id => 'foo', :usage => {'hits' => 1}},
+    #                                 {:app_id => 'bar', :usage => {'hits' => 1}}])
+    #
+    #    Report one transaction with timestamp. Using the default service.
+    #    client.report(transactions: [{:app_id    => 'foo',
+    #                                  :timestamp => Time.local(2010, 4, 27, 15, 14),
+    #                                  :usage     => {'hits' => 1}])
+    #
+    #    Report a transaction specifying the service.
+    #    client.report(transactions: [{:app_id => 'foo', :usage => {'hits' => 1}}],
+    #                  service_id: 'a_service_id')
     #
-    #   # Report one transaction with timestamp.
-    #   client.report({:app_id    => 'foo',
-    #                  :timestamp => Time.local(2010, 4, 27, 15, 14),
-    #                  :usage     => {'hits' => 1})
+    # == Note
     #
-    def report(*transactions)
-      raise ArgumentError, 'no transactions to report' if transactions.empty?
+    # The signature of this method is a bit complicated because we decided to
+    # keep backwards compatibility with a previous version of the method:
+    # def report(*transactions)
+    def report(*reports, transactions: [], service_id: nil, **rest)
+      if (!transactions || transactions.empty?) && rest.empty?
+        raise ArgumentError, 'no transactions to report'
+      end
+
+      transactions = transactions.concat(reports)
+
+      unless rest.empty?
+        warn(DEPRECATION_MSG_OLD_REPORT)
+        transactions.concat([rest])
+      end
 
       payload = encode_transactions(transactions)
       payload['provider_key'] = CGI.escape(provider_key)
+      payload['service_id'] = CGI.escape(service_id.to_s) if service_id
 
       http_response = @http.post('/transactions.xml', payload)
 
@@ -164,6 +186,9 @@ module ThreeScale
     #   app_key::    secret key assigned to the application. Required only if application has
     #                a key defined.
     #   service_id:: id of the service (required if you have more than one service)
+    #   usage::      predicted usage. It is optional. It is a hash where the keys are metrics
+    #                and the values their predicted usage.
+    #                Example: {'hits' => 1, 'my_metric' => 100}
     #
     # == Return
     #
@@ -207,6 +232,9 @@ module ThreeScale
     #
     #   app_id::  id of the application to authorize. This is required.
     #   service_id:: id of the service (required if you have more than one service)
+    #   usage::      predicted usage. It is optional. It is a hash where the keys are metrics
+    #                and the values their predicted usage.
+    #                Example: {'hits' => 1, 'my_metric' => 100}
     #
     # == Return
     #
@@ -247,14 +275,14 @@ module ThreeScale
 
     private
 
-    OAUTH_PARAMS = [:app_id, :app_key, :service_id, :redirect_url]
-    ALL_PARAMS = [:user_key, :app_id, :app_key, :service_id, :redirect_url]
+    OAUTH_PARAMS = [:app_id, :app_key, :service_id, :redirect_url, :usage]
+    ALL_PARAMS = [:user_key, :app_id, :app_key, :service_id, :redirect_url, :usage]
     REPORT_PARAMS = [:user_key, :app_id, :service_id, :timestamp]
 
     def options_to_params(options, allowed_keys)
       params = { :provider_key  => provider_key }
 
-      allowed_keys.each do |key|
+      (allowed_keys - [:usage]).each do |key|
         params[key] = options[key] if options.has_key?(key)
       end
 
@@ -262,7 +290,14 @@ module ThreeScale
         "#{key}=#{CGI.escape(value.to_s)}"
       end
 
-      '?' + tuples.join('&')
+      res = '?' + tuples.join('&')
+
+      # Usage is a hash. The format is a bit different
+      if allowed_keys.include?(:usage) && options.has_key?(:usage)
+        res << "&#{usage_query_params(options[:usage])}"
+      end
+
+      res
     end
 
     def encode_transactions(transactions)
@@ -285,6 +320,10 @@ module ThreeScale
       result
     end
 
+    def usage_query_params(usage)
+      URI.encode_www_form(usage.map { |metric, value| ["[usage][#{metric}]", value ] })
+    end
+
     def append_value(result, index, names, value)
       result["transactions[#{index}][#{names.join('][')}]"] = value if value
     end

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

@@ -18,11 +18,12 @@ module ThreeScale
         @secure = !!options[:secure]
         @host = options.fetch(:host)
         @persistent = options[:persistent]
+        @port = options[:port] || (@secure ? 443 : 80)
 
         backend_class = @persistent ? self.class.persistent_backend : NetHttp or raise PersistenceNotAvailable
         backend_class.prepare
 
-        @http = backend_class.new(@host)
+        @http = backend_class.new(@host, @port)
         @http.ssl! if @secure
       end
 
@@ -33,8 +34,9 @@ module ThreeScale
         def self.prepare
         end
 
-        def initialize(host)
+        def initialize(host, port)
           @host = host
+          @port = port
         end
 
         def get_request(path)
@@ -65,7 +67,7 @@ module ThreeScale
           require 'net/http/persistent'
         end
 
-        def initialize(host)
+        def initialize(host, port)
           super
           @http = ::Net::HTTP::Persistent.new
           @protocol = 'http'
@@ -87,7 +89,7 @@ module ThreeScale
         end
 
         def full_uri(path)
-          URI.join "#{@protocol}://#{@host}", path
+          URI.join "#{@protocol}://#{@host}:#{@port}", path
         end
       end
 
@@ -95,13 +97,13 @@ module ThreeScale
         extend Forwardable
         def_delegators :@http, :use_ssl?, :active?
 
-        def initialize(host)
+        def initialize(host, port)
           super
-          @http = Net::HTTP.new(@host, 80)
+          @http = Net::HTTP.new(@host, port)
         end
 
         def ssl!
-          @http = Net::HTTP.new(@host, 443)
+          @http = Net::HTTP.new(@host, @port)
           @http.use_ssl = true
         end
 

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

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

data/test/client_test.rb

@@ -212,6 +212,51 @@ class ThreeScale::ClientTest < MiniTest::Test
     end
   end
 
+  def test_authorize_with_usage_within_limits
+    url = "http://#{@host}/transactions/authorize.xml?provider_key=1234abcd"\
+          "&app_id=foo&%5Busage%5D%5Bmetric1%5D=1&%5Busage%5D%5Bmetric2%5D=2"
+
+    body = '<status>
+              <authorized>true</authorized>
+              <plan>Ultimate</plan>
+            </status>'
+
+    FakeWeb.register_uri(:get, url, :status => ['200', 'OK'], :body => body)
+
+    response = @client.authorize(:app_id => 'foo',
+                                 :usage => { 'metric1' => 1, 'metric2' => 2 })
+
+    assert response.success?
+  end
+
+  def test_authorize_with_usage_and_limits_exceeded
+    url = "http://#{@host}/transactions/authorize.xml?provider_key=1234abcd"\
+          "&app_id=foo&%5Busage%5D%5Bhits%5D=1"
+
+    body = '<status>
+              <authorized>false</authorized>
+              <reason>usage limits are exceeded</reason>
+
+              <plan>Ultimate</plan>
+
+              <usage_reports>
+                <usage_report metric="hits" period="day" exceeded="true">
+                  <period_start>2010-04-26 00:00:00 +0000</period_start>
+                  <period_end>2010-04-27 00:00:00 +0000</period_end>
+                  <current_value>10</current_value>
+                  <max_value>5</max_value>
+                </usage_report>
+              </usage_reports>
+            </status>'
+
+    FakeWeb.register_uri(:get, url, :status => ['409'], :body => body)
+
+    response = @client.authorize(:app_id => 'foo', :usage => { 'hits' => 1 })
+
+    assert !response.success?
+    assert_equal 'usage limits are exceeded', response.error_message
+  end
+
   def test_successful_oauth_authorize
     body = '<status>
               <authorized>true</authorized>
@@ -317,19 +362,74 @@ class ThreeScale::ClientTest < MiniTest::Test
     end
   end
 
+  def test_oauth_authorize_with_usage_within_limits
+    url = "http://#{@host}/transactions/oauth_authorize.xml"\
+          "?provider_key=1234abcd&app_id=foo&%5Busage%5D%5Bmetric1%5D=1"\
+          "&%5Busage%5D%5Bmetric2%5D=2"
+
+    body = '<status>
+              <authorized>true</authorized>
+              <plan>Ultimate</plan>
+            </status>'
+
+    FakeWeb.register_uri(:get, url, :status => ['200', 'OK'], :body => body)
+
+    response = @client.oauth_authorize(
+        :app_id => 'foo', :usage => { 'metric1' => 1, 'metric2' => 2 })
+
+    assert response.success?
+  end
+
+  def test_oauth_authorize_with_usage_and_limits_exceeded
+    url = "http://#{@host}/transactions/oauth_authorize.xml"\
+          "?provider_key=1234abcd&app_id=foo&%5Busage%5D%5Bhits%5D=1"
+
+    body = '<status>
+              <authorized>false</authorized>
+              <reason>usage limits are exceeded</reason>
+
+              <plan>Ultimate</plan>
+
+              <usage_reports>
+                <usage_report metric="hits" period="day" exceeded="true">
+                  <period_start>2010-04-26 00:00:00 +0000</period_start>
+                  <period_end>2010-04-27 00:00:00 +0000</period_end>
+                  <current_value>10</current_value>
+                  <max_value>5</max_value>
+                </usage_report>
+              </usage_reports>
+            </status>'
+
+    FakeWeb.register_uri(:get, url, :status => ['409'], :body => body)
+
+    response = @client.oauth_authorize(:app_id => 'foo',
+                                       :usage => { 'hits' => 1 })
+
+    assert !response.success?
+    assert_equal 'usage limits are exceeded', response.error_message
+  end
+
   def test_report_raises_an_exception_if_no_transactions_given
     assert_raises ArgumentError do
       @client.report
     end
+
+    [nil, []].each do |invalid_transactions|
+      assert_raises ArgumentError do
+        @client.report(transactions: invalid_transactions)
+      end
+    end
   end
 
   def test_successful_report
     FakeWeb.register_uri(:post, "http://#{@host}/transactions.xml",
                          :status => ['200', 'OK'])
 
-    response = @client.report({:app_id    => 'foo',
-                               :timestamp => Time.local(2010, 4, 27, 15, 00),
-                               :usage     => {'hits' => 1}})
+    transactions = [{ :app_id    => 'foo',
+                      :timestamp => Time.local(2010, 4, 27, 15, 00),
+                      :usage     => {'hits' => 1 } }]
+
+    response = @client.report(transactions: transactions)
 
     assert response.success?
   end
@@ -351,19 +451,20 @@ class ThreeScale::ClientTest < MiniTest::Test
     FakeWeb.register_uri(:post, "http://#{@host}/transactions.xml",
                          :status => ['200', 'OK'])
 
-    @client.report({:app_id    => 'foo',
-                    :usage     => {'hits' => 1},
-                    :timestamp => '2010-04-27 15:42:17 0200',
-                    :log       => {
-                      'request'  => 'foo',
-                      'response' => 'bar',
-                      'code'     => 200,
-                    }
-                   },
-
-                   {:app_id    => 'bar',
-                    :usage     => {'hits' => 1},
-                    :timestamp => Time.local(2010, 4, 27, 15, 00)})
+    transactions = [{ :app_id    => 'foo',
+                      :usage     => { 'hits' => 1 },
+                      :timestamp => '2010-04-27 15:42:17 0200',
+                      :log       => {
+                          'request'  => 'foo',
+                          'response' => 'bar',
+                          'code'     => 200
+                      }
+                    },
+                    { :app_id    => 'bar',
+                      :usage     => { 'hits' => 1 },
+                      :timestamp => Time.local(2010, 4, 27, 15, 00) }]
+
+    @client.report(transactions: transactions)
 
     request = FakeWeb.last_request
 
@@ -381,12 +482,74 @@ class ThreeScale::ClientTest < MiniTest::Test
     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'})
+    transactions = [{ :user_key  => 'foo',
+                      :usage     => { 'hits' => 1 },
+                      :timestamp => '2016-07-18 15:42:17 0200' }]
+
+    @client.report(transactions: transactions)
+
+    request = FakeWeb.last_request
+
+    assert_equal URI.encode_www_form(payload), request.body
+  end
+
+  def test_report_with_service_id
+    FakeWeb.register_uri(:post, "http://#{@host}/transactions.xml",
+                         :status => ['200', 'OK'])
+
+    transactions = [{ :app_id    => 'an_app_id',
+                      :usage     => { 'hits' => 1 },
+                      :timestamp => '2016-07-18 15:42:17 0200' }]
+
+    @client.report(transactions: transactions, service_id: 'a_service_id')
+
+    request = FakeWeb.last_request
+
+    payload = {
+        'transactions[0][app_id]'      => 'an_app_id',
+        'transactions[0][timestamp]'   => '2016-07-18 15:42:17 0200',
+        'transactions[0][usage][hits]' => '1',
+        'provider_key'                 => '1234abcd',
+        'service_id'                   => 'a_service_id'
+    }
+
+    assert_equal URI.encode_www_form(payload), request.body
+  end
+
+  # We changed the signature of the report method but we keep the compatibility
+  # with the old one: def report(*transactions).This tests only checks that
+  # backwards compatibility.
+  def test_report_compatibility_with_old_report_format
+    FakeWeb.register_uri(:post, "http://#{@host}/transactions.xml",
+                         :status => ['200', 'OK'])
+
+    transactions = [{ :app_id    => 'app_id_1',
+                      :usage     => { 'hits' => 1 },
+                      :timestamp => '2016-07-18 15:42:17 0200' },
+                    { :app_id    => 'app_id_2',
+                      :usage     => { 'hits' => 2 },
+                      :timestamp => '2016-07-19 15:42:17 0200' },
+                    { :app_id    => 'app_id_3',
+                      :usage     => { 'hits' => 3 },
+                      :timestamp => '2016-07-20 15:42:17 0200' }]
+
+    @client.report(*transactions)
 
     request = FakeWeb.last_request
 
+    payload = {
+        'transactions[0][app_id]'      => 'app_id_1',
+        'transactions[0][timestamp]'   => '2016-07-18 15:42:17 0200',
+        'transactions[0][usage][hits]' => '1',
+        'transactions[1][app_id]'      => 'app_id_2',
+        'transactions[1][timestamp]'   => '2016-07-19 15:42:17 0200',
+        'transactions[1][usage][hits]' => '2',
+        'transactions[2][app_id]'      => 'app_id_3',
+        'transactions[2][timestamp]'   => '2016-07-20 15:42:17 0200',
+        'transactions[2][usage][hits]' => '3',
+        'provider_key'                 => '1234abcd'
+    }
+
     assert_equal URI.encode_www_form(payload), request.body
   end
 
@@ -398,7 +561,8 @@ class ThreeScale::ClientTest < MiniTest::Test
                          :body   => error_body)
 
     client   = ThreeScale::Client.new(:provider_key => 'foo')
-    response = client.report({:app_id => 'abc', :usage => {'hits' => 1}})
+    transactions = [{ :app_id => 'abc', :usage => { 'hits' => 1 } }]
+    response = client.report(transactions: transactions)
 
     assert !response.success?
     assert_equal 'provider_key_invalid',          response.error_code
@@ -410,8 +574,10 @@ class ThreeScale::ClientTest < MiniTest::Test
                          :status => ['500', 'Internal Server Error'],
                          :body   => 'OMG! WTF!')
 
+    transactions = [{ :app_id => 'foo', :usage => { 'hits' => 1 } }]
+
     assert_raises ThreeScale::ServerError do
-      @client.report({:app_id => 'foo', :usage => {'hits' => 1}})
+      @client.report(transactions: transactions)
     end
   end
 
@@ -439,7 +605,8 @@ class ThreeScale::ClientTest < MiniTest::Test
                          :status => ['200', 'OK'],
                          :body   => success_body)
     client = ThreeScale::Client.new(:provider_key => 'foo')
-    response = client.report({:app_id => 'abc', :usage => {'hits' => 1}})
+    transactions = [{ :app_id => 'abc', :usage => { 'hits' => 1 } }]
+    client.report(transactions: transactions)
 
     request = FakeWeb.last_request
     assert_equal "plugin-ruby-v#{version}", request["X-3scale-User-Agent"]

data/test/remote_test.rb

@@ -87,7 +87,7 @@ if ENV['TEST_3SCALE_PROVIDER_KEY'] &&
          :log => {:request => "a/a", :response => "b/b", :code => 200 }}
       end
 
-      response = @client.report(*transactions)
+      response = @client.report(transactions: transactions)
       assert response.success?
     end
 
@@ -97,7 +97,7 @@ if ENV['TEST_3SCALE_PROVIDER_KEY'] &&
       end
 
       client   = ThreeScale::Client.new(:provider_key => 'invalid-key')
-      response = client.report(*transactions)
+      response = client.report(transactions: transactions)
       assert !response.success?
       assert_equal 'provider_key_invalid',                  response.error_code
       assert_equal 'provider key "invalid-key" is invalid', response.error_message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: 3scale_client
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Michal Cichra
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,6 +126,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -152,12 +166,14 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - 3scale_client.gemspec
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENCE
 - README.md
 - Rakefile
 - VERSION
+- gemfiles/rack_1.gemfile
 - lib/3scale/authorize_response.rb
 - lib/3scale/client.rb
 - lib/3scale/client/http_client.rb
@@ -182,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -190,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Client for 3scale Web Service Management System API