bwapi 9.0.0.pre.349 → 9.0.0.pre.364

data/spec/bwapi_spec.rb

@@ -1,11 +1,9 @@
-# encoding: utf-8
-
 require 'helper'
 
 describe BWAPI do
   describe 'when called' do
     it 'should be an instance of Module' do
-      BWAPI.should be_an_instance_of Module
+      expect(BWAPI).to be_an_instance_of Module
     end
   end
 

data/spec/helper.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'simplecov'
 require 'coveralls'
 
@@ -12,8 +10,7 @@ SimpleCov.start
 require 'bwapi'
 
 RSpec.configure do |config|
-  config.color_enabled  = true
-  config.formatter      = :documentation
+  config.color = true
 end
 
 def fixture_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bwapi
 version: !ruby/object:Gem::Version
-  version: 9.0.0.pre.349
+  version: 9.0.0.pre.364
 platform: ruby
 authors:
 - Jonathan Chrisp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,76 +16,62 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.0.0
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.0.0
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.24.1
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.24.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.24.1
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
-  name: colored
+  name: allotment
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.1.0
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.1.0
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
@@ -105,45 +91,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 0.9.1
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 0.9.1
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
-  name: netrc
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 3.2.0
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 3.2.0
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 3.2.0
 description: A Ruby wrapper for the Brandwatch API
 email: jonathan@brandwatch.com
 executables:
@@ -161,7 +147,6 @@ files:
 - bin/bwapi
 - bwapi.gemspec
 - lib/bwapi.rb
-- lib/bwapi/authentication.rb
 - lib/bwapi/client.rb
 - lib/bwapi/client/admin.rb
 - lib/bwapi/client/admin/become.rb
@@ -236,14 +221,16 @@ files:
 - lib/bwapi/client/user/notifications.rb
 - lib/bwapi/configuration.rb
 - lib/bwapi/connection.rb
+- lib/bwapi/default.rb
 - lib/bwapi/error.rb
+- lib/bwapi/performance.rb
 - lib/bwapi/request.rb
+- lib/bwapi/response/error.rb
+- lib/bwapi/response/logger.rb
+- lib/bwapi/response/performance.rb
 - lib/bwapi/version.rb
-- lib/faraday/response/brandwatch_error.rb
-- spec/bwapi/authentication_spec.rb
 - spec/bwapi/client_spec.rb
 - spec/bwapi_spec.rb
-- spec/fixtures/.netrc
 - spec/helper.rb
 homepage: https://github.com/jonathanchrisp/bwapi
 licenses:
@@ -265,13 +252,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Brandwatch API Wrapper
 test_files:
-- spec/bwapi/authentication_spec.rb
 - spec/bwapi/client_spec.rb
 - spec/bwapi_spec.rb
-- spec/fixtures/.netrc
 - spec/helper.rb

data/lib/bwapi/authentication.rb

@@ -1,48 +0,0 @@
-# encoding: utf-8
-
-require 'colored'
-
-module BWAPI
-  # Authentication module helper methods
-  module Authentication
-    # Check if user is authenicated
-    #
-    # @return [Boolean] Authenticated status
-    def authenticated?
-      access_token ? true : false
-    end
-
-    # Check if user is a brandwatch-application-client type
-    #
-    # @return [Boolean] Application client status
-    def application_client?
-      client_id == 'brandwatch-application-client' ? true : false
-    end
-
-    # Check if user is a brandwatch-api-client type
-    #
-    # @return [Boolean] Application client status
-    def api_client?
-      client_id == 'brandwatch-api-client' ? true : false
-    end
-
-    # Set username and password via netrc
-    #
-    # @param netrc [Boolean] Netrc status
-    def netrc_credentials(netrc = false)
-      return unless netrc
-
-      require 'netrc'
-      file = Netrc.read netrc_file
-
-      # Get credentials using host
-      netrc_host = URI.parse(api_endpoint).host
-      creds = file[netrc_host]
-      fail 'You are missing your .netrc file or the host provided has no credentials!'.red.underline if creds.nil?
-      self.username = creds.shift
-      self.password = creds.shift
-    rescue LoadError
-      raise 'Please install netrc gem for .netrc support'.red.underline
-    end
-  end
-end

data/lib/faraday/response/brandwatch_error.rb

@@ -1,25 +0,0 @@
-# encoding: utf-8
-
-require 'faraday'
-
-# Brandwatch response middleware to handle errors
-class BrandwatchError < Faraday::Response::Middleware
-  ERROR_MAP = {
-    400 => BWAPI::BadRequest,
-    401 => BWAPI::Unauthorized,
-    403 => BWAPI::Forbidden,
-    404 => BWAPI::NotFound,
-    406 => BWAPI::NotAcceptable,
-    422 => BWAPI::UnprocessableEntity,
-    429 => BWAPI::TooManyRequests,
-    500 => BWAPI::InternalServerError,
-    501 => BWAPI::NotImplemented,
-    502 => BWAPI::BadGateway,
-    503 => BWAPI::ServiceUnavailable
-  }
-
-  def on_complete(response)
-    key = response[:status].to_i
-    fail ERROR_MAP[key].new(response) if ERROR_MAP.key? key
-  end
-end

data/spec/bwapi/authentication_spec.rb

@@ -1,57 +0,0 @@
-# encoding: utf-8
-
-require 'helper'
-
-describe BWAPI::Authentication do
-  before do
-    BWAPI.reset
-  end
-
-  describe '.authenticated?' do
-    it 'returns true when authenticated' do
-      expect(BWAPI::Client.new.authenticated?).to eql(false)
-    end
-
-    it 'returns false when not authenticated' do
-      bw = BWAPI::Client.new access_token: 'abcdef-ghijkl-123456-789012'
-      expect(bw.authenticated?).to eql(true)
-    end
-  end
-
-  describe '.application_client?' do
-    it 'returns true when client is a brandwatch-application-client' do
-      bw = BWAPI::Client.new client_id: 'brandwatch-application-client'
-      expect(bw.application_client?).to eql(true)
-    end
-
-    it 'returns false when a client is not a brandwatch-application-client' do
-      expect(BWAPI::Client.new.application_client?).to eql(false)
-    end
-  end
-
-  describe '.api_client?' do
-    it 'returns true when client is a brandwatch-api-client' do
-      bw = BWAPI::Client.new client_id: 'brandwatch-api-client'
-      expect(bw.api_client?).to eql(true)
-    end
-
-    it 'returns false when a client is not a brandwatch-api-client' do
-      bw = BWAPI::Client.new client_id: 'brandwatch-application-client'
-      expect(bw.api_client?).to eql(false)
-    end
-  end
-
-  describe '.netrc_credentials' do
-    it 'returns nil when netrc is false' do
-      bw = BWAPI::Client.new
-      expect(bw.netrc_credentials).to eql(nil)
-    end
-
-    it 'returns credentials when netrc is true' do
-      bw = BWAPI::Client.new netrc: true, netrc_file: File.join(fixture_path, '.netrc')
-      bw.netrc_credentials
-      expect(bw.username).to eql('testuser@brandwatch.com')
-      expect(bw.password).to eql('password')
-    end
-  end
-end

data/spec/fixtures/.netrc

@@ -1,3 +0,0 @@
-machine newapi.brandwatch.com
-  login testuser@brandwatch.com
-  password password