bwapi 12.0.0 → 12.1.0.pre.646

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: c0e1c528f756c598534502379525910c18edaa87
-  data.tar.gz: 807b8c09e48fdfd7b9eed27eeb6713b19f804a73
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWE4YmU1MTRhZjNjYjBlZDdmNmVmNGFiOGExNTBmYzJjZjkwYmEyMw==
+  data.tar.gz: !binary |-
+    ZGQ0MzJiZTc3NDE5ZGQ3ZmM4MjgzNTZkNGMwOGI0YzYwMWFhNmI2NA==
 SHA512:
-  metadata.gz: 2441dd52a8037e9f6f432591dec12e160d6bb64ab17ed701e0a8b9e959b6b4685bdaa4c6fc3975a3a164752b030a1e16ec17373e4fe5d87dd040777188685209
-  data.tar.gz: 9961ca6a6e7cb336ac6b7b3c0d1ebfd669b9db3b88b973e152d7716eeb9717f99323b534718e996ddef48eac1273910c27e72c1e5740c89641549a2f74ce0bb7
+  metadata.gz: !binary |-
+    MjVjZTNkOWQwZWM4N2Y2MGFmODMyNGJlZmU2OTZhNmVmMjc5NzNkYjMxOTVi
+    YTI0YzM1ZGE5ZDZmY2RiNWIzZDM4YmU5ZjkzYzdmNTczZDYxY2EyOTcxN2Nk
+    OWE2NTcwMmY3M2I5NWMwOGQ2Mzc0MGJjYzNhMDllYmVhOTQwOTY=
+  data.tar.gz: !binary |-
+    MTU2ZDllOTNmOTQ2NmRlMjVhODM5MzdiMzExMjQ1MTEwOWU4YTFmODZlOTM4
+    MDNmOTU3YmQyMWNhMmE4NjQ3OTZjNDBhMmRiNWJmNzAxNWJhYjFjYzgxMThk
+    YTQ4YjgxNGI2NDA5MWZkNDE1MGQ4OTFhZmQxODZlYzVhNjU2MjM=

data/.travis.yml

@@ -2,10 +2,15 @@ language: ruby
 cache: bundler
 rvm:
 - ruby-head
+- 2.2.0
 - 2.1.0
 - 2.0.0
 - 1.9.3
 
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+
 script:
   - bundle exec rspec
   - bundle exec rubocop

data/lib/bwapi/client.rb

@@ -24,7 +24,9 @@ require 'bwapi/client/public'
 require 'bwapi/client/query_validation'
 require 'bwapi/client/sso'
 require 'bwapi/client/test_search'
+require 'bwapi/client/usage_summary'
 require 'bwapi/client/user'
+
 require 'faraday'
 
 module BWAPI
@@ -56,6 +58,7 @@ module BWAPI
     include BWAPI::Client::QueryValidation
     include BWAPI::Client::SSO
     include BWAPI::Client::TestSearch
+    include BWAPI::Client::UsageSummary
     include BWAPI::Client::User
 
     # Initializes Client

data/lib/bwapi/client/admin/reseller.rb

@@ -16,20 +16,6 @@ module BWAPI
         def reseller_client_mention_usage_report(client_id, opts = {})
           get "/admin/reseller/requestMentionUsageReport/#{client_id}", opts
         end
-
-        # Requests reseller usage summaries
-        #
-        # TODO: Add parameters documentation
-        def reseller_usage_summary
-          get '/admin/reseller/usageSummary'
-        end
-
-        # Requests reseller usage summaries for a specific client
-        #
-        # TODO: Add parameters documentation
-        def reseller_client_usage_summary(client_id)
-          get "/admin/reseller/usageSummary/#{client_id}"
-        end
       end
     end
   end

data/lib/bwapi/client/usage_summary.rb

@@ -0,0 +1,20 @@
+module BWAPI
+  class Client
+    # UsageSummary module for usageSummary endpoints
+    module UsageSummary
+      # Requests reseller usage summaries
+      #
+      # TODO: Add parameters documentation
+      def reseller_usage_summary(opts = {})
+        get 'reseller/usageSummary', opts
+      end
+
+      # Requests reseller usage summaries for a specific client
+      #
+      # TODO: Add parameters documentation
+      def reseller_client_usage_summary(client_id)
+        get "reseller/usageSummary/#{client_id}"
+      end
+    end
+  end
+end

data/lib/bwapi/configuration.rb

@@ -2,7 +2,8 @@ module BWAPI
   # Configuration module
   module Configuration
     attr_accessor :access_token, :access_token_expiry, :adapter, :api_endpoint, :client_id, :debug,
-                  :grant_type, :logger, :performance, :refresh_token, :user_agent, :username, :verify_ssl
+                  :grant_type, :logger, :open_timeout, :performance, :refresh_token, :timeout,
+                  :user_agent, :username, :verify_ssl
 
     attr_writer :client_secret, :password
 
@@ -20,9 +21,11 @@ module BWAPI
           :debug,
           :grant_type,
           :logger,
+          :open_timeout,
           :password,
           :performance,
           :refresh_token,
+          :timeout,
           :user_agent,
           :username,
           :verify_ssl

data/lib/bwapi/connection.rb

@@ -25,6 +25,8 @@ module BWAPI
       opts[:headers][:authorization] = "bearer #{@access_token}" if @access_token
       opts[:builder]                 = middleware
       opts[:ssl]                     = { verify: @verify_ssl }
+      opts[:request][:timeout]       = @timeout
+      opts[:request][:open_timeout]  = @open_timeout
       opts[:url]                     = @api_endpoint
       opts
     end

data/lib/bwapi/default.rb

@@ -69,6 +69,10 @@ module BWAPI
         nil
       end
 
+      def open_timeout
+        ENV['OPEN_TIMEOUT'] || 30
+      end
+
       def password
         ENV['BWAPI_PASSWORD']
       end
@@ -81,6 +85,10 @@ module BWAPI
         ENV['BWAPI_REFRESH_TOKEN']
       end
 
+      def timeout
+        ENV['TIMEOUT'] || 60
+      end
+
       def user_agent
         ENV['BWAPI_USER_AGENT'] || USER_AGENT
       end

data/lib/bwapi/version.rb

@@ -1,4 +1,4 @@
 # BWAPI Version
 module BWAPI
-  VERSION = '12.0.0'
+  VERSION = '12.1.0'
 end

data/spec/bwapi/configuration_spec.rb

@@ -240,9 +240,11 @@ describe BWAPI::Configuration do
         :debug,
         :grant_type,
         :logger,
+        :open_timeout,
         :password,
         :performance,
         :refresh_token,
+        :timeout,
         :user_agent,
         :username,
         :verify_ssl
@@ -262,8 +264,10 @@ describe BWAPI::Configuration do
         c.debug = true
         c.grant_type = 'test-grant'
         c.logger = Logger.new(STDOUT)
+        c.open_timeout = 60
         c.password = 'password123'
         c.refresh_token = '1234-5678-9010-1112'
+        c.timeout = 120
         c.user_agent = 'Test User Agent'
         c.username = 'testing@brandwatch.com'
         c.verify_ssl = true
@@ -305,7 +309,11 @@ describe BWAPI::Configuration do
     end
 
     it 'should set the configured logger' do
-      expect(bwapi.logger).to be_an_instance_of Logger
+      expect(bwapi.logger).to be_an_instance_of(Logger)
+    end
+
+    it 'should set the configured open timeout' do
+      expect(bwapi.open_timeout).to eql(60)
     end
 
     it 'should set the configured password' do
@@ -316,6 +324,10 @@ describe BWAPI::Configuration do
       expect(bwapi.refresh_token).to eql('1234-5678-9010-1112')
     end
 
+    it 'should set the configured timeout' do
+      expect(bwapi.timeout).to eql(120)
+    end
+
     it 'should set the configured user agent' do
       expect(bwapi.user_agent).to eql('Test User Agent')
     end
@@ -372,6 +384,10 @@ describe BWAPI::Configuration do
       expect(bwapi.logger).to eql(nil)
     end
 
+    it 'should reset the open timeout' do
+      expect(bwapi.open_timeout).to eql(30)
+    end
+
     it 'should reset the password value' do
       expect(bwapi.instance_variable_get(:@password)).to eql(nil)
     end
@@ -384,8 +400,12 @@ describe BWAPI::Configuration do
       expect(bwapi.refresh_token).to eql(nil)
     end
 
+    it 'should reset the timeout' do
+      expect(bwapi.timeout).to eql(60)
+    end
+
     it 'should reset the user_agent value' do
-      expect(bwapi.user_agent).to eql('BWAPI Ruby Gem 12.0.0')
+      expect(bwapi.user_agent).to eql('BWAPI Ruby Gem 12.1.0')
     end
 
     it 'should reset the username value' do
@@ -440,6 +460,10 @@ describe BWAPI::Configuration do
       expect(bwapi.logger).to eql(nil)
     end
 
+    it 'should reset the open timeout' do
+      expect(bwapi.open_timeout).to eql(nil)
+    end
+
     it 'should reset the password value' do
       expect(bwapi.instance_variable_get(:@password)).to eql(nil)
     end
@@ -452,6 +476,10 @@ describe BWAPI::Configuration do
       expect(bwapi.refresh_token).to eql(nil)
     end
 
+    it 'should reset the timeout' do
+      expect(bwapi.open_timeout).to eql(nil)
+    end
+
     it 'should reset the user_agent value' do
       expect(bwapi.user_agent).to eql(nil)
     end
@@ -478,7 +506,7 @@ describe BWAPI::Configuration do
         client_secret: nil,
         connection_options: {
           headers: {
-            user_agent: 'BWAPI Ruby Gem 12.0.0'
+            user_agent: 'BWAPI Ruby Gem 12.1.0'
           },
           request: {
             params_encoder: Faraday::FlatParamsEncoder
@@ -487,10 +515,12 @@ describe BWAPI::Configuration do
         debug: false,
         grant_type: 'api-password',
         logger: nil,
+        open_timeout: 30,
         password: nil,
         performance: {},
         refresh_token: nil,
-        user_agent: 'BWAPI Ruby Gem 12.0.0',
+        timeout: 60,
+        user_agent: 'BWAPI Ruby Gem 12.1.0',
         username: nil,
         verify_ssl: false
       )

data/spec/bwapi/default_spec.rb

@@ -34,7 +34,7 @@ describe BWAPI::Default do
         client_secret: nil,
         connection_options: {
           headers: {
-            user_agent: 'BWAPI Ruby Gem 12.0.0'
+            user_agent: 'BWAPI Ruby Gem 12.1.0'
           },
           request: {
             params_encoder: Faraday::FlatParamsEncoder
@@ -43,10 +43,12 @@ describe BWAPI::Default do
         debug: false,
         grant_type: 'api-password',
         logger: nil,
+        open_timeout: 30,
         password: nil,
         performance: {},
         refresh_token: nil,
-        user_agent: 'BWAPI Ruby Gem 12.0.0',
+        timeout: 60,
+        user_agent: 'BWAPI Ruby Gem 12.1.0',
         username: nil,
         verify_ssl: false
       )
@@ -128,7 +130,7 @@ describe BWAPI::Default do
     it 'should return the default hash values' do
       expect(BWAPI::Default.connection_options).to eql(
         headers: {
-          user_agent: 'BWAPI Ruby Gem 12.0.0'
+          user_agent: 'BWAPI Ruby Gem 12.1.0'
         },
         request: {
           params_encoder: Faraday::FlatParamsEncoder

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: bwapi
 version: !ruby/object:Gem::Version
-  version: 12.0.0
+  version: 12.1.0.pre.646
 platform: ruby
 authors:
 - Jonathan Chrisp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.24'
 - !ruby/object:Gem::Dependency
   name: allotment
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware-parse_csv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware-parse_oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.11'
 description: A Ruby wrapper for the Brandwatch API
@@ -129,10 +129,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".gitignore"
-- ".rubocop.yml"
-- ".travis.yml"
+- .editorconfig
+- .gitignore
+- .rubocop.yml
+- .travis.yml
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -269,6 +269,7 @@ files:
 - lib/bwapi/client/query_validation.rb
 - lib/bwapi/client/sso.rb
 - lib/bwapi/client/test_search.rb
+- lib/bwapi/client/usage_summary.rb
 - lib/bwapi/client/user.rb
 - lib/bwapi/client/user/facebook.rb
 - lib/bwapi/client/user/instagram_credentials.rb
@@ -300,17 +301,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Brandwatch API Wrapper
@@ -320,4 +321,3 @@ test_files:
 - spec/bwapi/default_spec.rb
 - spec/bwapi_spec.rb
 - spec/helper.rb
-has_rdoc: