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

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWRhMzBhM2FkNzExZTMwZjIwMjcwYzc3ZDNiODZmYTFiNWZjOTQ1ZQ==
+    YjJlMmJiYWUwMDE3ZjlhNmRmMDE5NGZmZWVlYWZiYmQ3MjQ3Y2YwYg==
   data.tar.gz: !binary |-
-    MmU1MWMwNjE0OTEwMDUxYjZjYmMwYTg3ODQ0ODE1MTQwNGZiMTZmYQ==
+    YTIzMjA0ZWU3NmYxYjgxY2FlMjg5ZTc2ODg3MGVkNTgzYzYxZGJiYQ==
 SHA512:
   metadata.gz: !binary |-
-    MmE0YmQ1N2FkMTMxN2EzYmY0ZWI4OTE5YjA4YTc2YWJkNjA1OTZhMjgyNjE1
-    NzViZmNlMWVhNjRkNjhmYmU2OWY5YTE3NDU0MzkwMDQyMTdlY2NiZmY4MDUz
-    OTIxMTE0NDNhYjBmNzA3NGMyM2RmZDU2ZGFkYzIzN2M5NTJjNWI=
+    NmIyNGY1YzEzNTg2NmY5MGVjMDczNTg0ODlkNGU0MzZlYjdmOTBkZDliYzcx
+    MDk1ZTU3NjMyMmVmMDNhNjdlMjY2MDYwY2MyYTM3YjMyYmI4NTRkMzFmN2E4
+    NTEzMzE4MzcyYWE2MWI5MDc2YTg1ZTU2ZGU2MzZjZWQyOWFlZDI=
   data.tar.gz: !binary |-
-    M2MzZmE5ZDQ0NTJiMjIyNDM2ODExNzQ4ZDBkM2IxZGI5N2M4MDgwYTIyZmIx
-    NmRkOTNiMjYwMjk3NzcwNGIwMDFmOGQyZjFmMmFiMjVmODVhYjRiNzUxYWUy
-    OTg3ZjJkOWUxY2FhNmNhN2QxYjQyMmQ4NTQzMDk2NmZlMTk3MjY=
+    ZDZlMTc5YTA5MDRiZjIwYmEwZjJmM2M0M2ZlZmI3NThkOTVhMjdiM2QwNzM2
+    YTEyM2IxNTEwOTczYWFjYTc4NWE5NzY0NTE4N2FmMTI1Y2NlYzNhNjIxOWJi
+    ZGRlNmQ4N2UwYmNhNWZhZjBhZGU0NTNmYTNhY2U0NjI1YzMxMGM=

data/.gitignore

@@ -20,4 +20,4 @@ bwapi.log
 # YARD artifacts
 .yardoc
 _yardoc
-doc/
+doc/

data/.rubocop.yml

@@ -15,3 +15,6 @@ AccessorMethodName:
 
 RaiseArgs:
   Enabled: false
+
+Encoding:
+  EnforcedStyle: when_needed

data/.travis.yml

@@ -11,9 +11,6 @@ matrix:
   allow_failures:
     - rvm: ruby-head
 
-before_script:
-  - chmod 600 spec/fixtures/.netrc
-
 script:
   - bundle exec rspec
   - bundle exec rubocop

data/Gemfile

@@ -1,6 +1,6 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
-gem "coveralls", "~> 0.7.0", require: false
+gem 'coveralls', '~> 0.7.0', require: false
 gem 'simplecov'
 
-gemspec
+gemspec

data/README.md

@@ -1,4 +1,3 @@
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/jonathanchrisp/bwapi/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
 [![Gem Version](https://badge.fury.io/rb/bwapi.png)](http://badge.fury.io/rb/bwapi)
 [![Build Status](https://travis-ci.org/jonathanchrisp/bwapi.png?branch=master)](https://travis-ci.org/jonathanchrisp/bwapi)
 [![Dependency Status](https://gemnasium.com/jonathanchrisp/bwapi.png)](https://gemnasium.com/jonathanchrisp/bwapi)

data/bin/bwapi

@@ -1,3 +1,2 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
 require 'bwapi'

data/bwapi.gemspec

@@ -1,12 +1,10 @@
-# encoding: utf-8
-
 require File.dirname(__FILE__) + '/lib/bwapi/version'
 
 Gem::Specification.new do |s|
   s.name        = 'bwapi'
   s.version     = BWAPI::VERSION
   s.version     = BWAPI::VERSION + ".pre.#{ENV['TRAVIS_BUILD_NUMBER']}" if ENV['TRAVIS']
-  s.date        = '2014-05-28'
+  s.date        = '2014-08-04'
   s.summary     = 'Brandwatch API Wrapper'
   s.description = 'A Ruby wrapper for the Brandwatch API'
   s.author      = 'Jonathan Chrisp'
@@ -15,14 +13,13 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://github.com/jonathanchrisp/bwapi'
   s.required_ruby_version = '>= 1.9.2'
 
-  s.add_development_dependency 'rspec', '~> 2.14.1', '>= 2.14.1'
-  s.add_development_dependency 'rubocop', '~> 0.21.0', '>= 0.21.0'
+  s.add_development_dependency 'rspec', '~> 3.0.0', '>= 3.0.0'
+  s.add_development_dependency 'rubocop', '~> 0.24.1', '>= 0.24.1'
 
-  s.add_runtime_dependency 'colored', '~> 1.2'
+  s.add_runtime_dependency 'allotment', '~> 1.1.0', '>= 1.1.0'
   s.add_runtime_dependency 'faraday', '~> 0.9.0', '>= 0.9.0'
-  s.add_runtime_dependency 'faraday_middleware', '~> 0.9.0', '>= 0.9.0'
-  s.add_runtime_dependency 'hashie', '~> 2.1.1', '>= 2.1.1'
-  s.add_runtime_dependency 'netrc', '~> 0.7.7', '>= 0.7.7'
+  s.add_runtime_dependency 'faraday_middleware', '~> 0.9.1', '>= 0.9.1'
+  s.add_runtime_dependency 'hashie', '~> 3.2.0', '>= 3.2.0'
 
   s.files         = `git ls-files`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }

data/lib/bwapi.rb

@@ -1,29 +1,31 @@
-# encoding: utf-8
-
-require 'bwapi/version'
-require 'bwapi/configuration'
-require 'bwapi/error'
 require 'bwapi/client'
+require 'bwapi/default'
 
-# BWAPI namespace module
+# Ruby wrapper for the Brandwatch API
 module BWAPI
-  extend Configuration
   class << self
+    include BWAPI::Configuration
+
     # Alias for BWAPI::Client.new
     #
     # @return [BWAPI::Client]
     def new(opts = {})
-      BWAPI::Client.new opts
+      BWAPI::Client.new(opts)
     end
 
-    # Delegate to BWAPI::Client.new
-    def method_missing(method, *args, &block)
-      return super unless new.respond_to? method
-      new.send method, *args, &block
+    # Check BWAPI::Client.new responds
+    def respond_to?(method_name, include_private = false)
+      new.respond_to?(method_name, include_private) || super
     end
 
-    def respond_to?(method, include_private = false)
-      new.respond_to?(method, include_private) || super(method, include_private)
+    private
+
+    # Delegate to BWAPI::Client.new
+    def method_missing(method_name, *args, &block)
+      return super unless client.respond_to?(method_name)
+      new.send(method_name, *args, &block)
     end
   end
 end
+
+BWAPI.reset

data/lib/bwapi/client.rb

@@ -1,8 +1,7 @@
-# encoding: utf-8
-
-require 'bwapi/authentication'
+require 'bwapi/configuration'
 require 'bwapi/connection'
 require 'bwapi/request'
+require 'bwapi/performance'
 
 require 'bwapi/client/admin'
 require 'bwapi/client/brandwatch'
@@ -22,25 +21,15 @@ require 'bwapi/client/projects'
 require 'bwapi/client/query_validation'
 require 'bwapi/client/test_search'
 require 'bwapi/client/user'
+require 'faraday'
 
 module BWAPI
   # Client class to create BWAPI instances
   class Client
-    attr_accessor(*Configuration::OPTION_KEYS)
-
-    def initialize(opts = {})
-      opts = BWAPI.options.merge(opts)
-      Configuration::OPTION_KEYS.each { |k| send("#{k}=", opts[k]) }
-      netrc_credentials opts[:netrc]
-    end
-
-    def destroy
-      Configuration::OPTION_KEYS.each { |k| send("#{k}=", nil) }
-    end
-
-    include BWAPI::Authentication
+    include BWAPI::Configuration
     include BWAPI::Connection
     include BWAPI::Request
+    include BWAPI::Performance
 
     include BWAPI::Client::Admin
     include BWAPI::Client::Brandwatch
@@ -60,5 +49,65 @@ module BWAPI
     include BWAPI::Client::QueryValidation
     include BWAPI::Client::TestSearch
     include BWAPI::Client::User
+
+    # Initializes Client
+    #
+    # @params options [Hash] the configuration options
+    def initialize(options = {})
+      BWAPI::Configuration.keys.each do |key|
+        instance_variable_set(:"@#{key}", options[key] || BWAPI.instance_variable_get(:"@#{key}"))
+      end
+    end
+
+    # 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
+
+    def access_token=(value)
+      reset_connection
+      @access_token = value
+    end
+
+    def api_endpoint=(value)
+      reset_connection
+      @api_endpoint = value
+    end
+
+    def connection_options=(value)
+      reset_connection
+      @connection_options = value
+    end
+
+    def debug=(value)
+      reset_connection
+      @debug = value
+    end
+
+    def logger=(value)
+      reset_connection
+      @logger = value
+    end
+
+    def verify_ssl=(value)
+      reset_connection
+      @verify_ssl = value
+    end
   end
 end

data/lib/bwapi/client/admin.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'bwapi/client/admin/become'
 require 'bwapi/client/admin/search'
 require 'bwapi/client/admin/sub_clients'

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module BWAPI
   class Client
     module Admin

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module BWAPI
   class Client
     module Admin

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module BWAPI
   class Client
     module Admin

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'bwapi/client/admin/users/sharing'
 
 module BWAPI

data/lib/bwapi/client/admin/users/sharing.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module BWAPI
   class Client
     module Admin

data/lib/bwapi/client/brandwatch.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'bwapi/client/brandwatch/become'
 require 'bwapi/client/brandwatch/client_modules'
 

data/lib/bwapi/client/brandwatch/become.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module BWAPI
   class Client
     module Brandwatch

data/lib/bwapi/client/brandwatch/client_modules.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module BWAPI
   class Client
     module Brandwatch

data/lib/bwapi/client/client.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module BWAPI
   class Client
     # Client module for client endpoints

data/lib/bwapi/client/command_center.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'bwapi/client/command_center/client'
 require 'bwapi/client/command_center/displays'
 require 'bwapi/client/command_center/scene_types'

data/lib/bwapi/client/command_center/client.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module BWAPI
   class Client
     module CommandCenter

data/lib/bwapi/client/command_center/displays.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'bwapi/client/command_center/displays/events'
 require 'bwapi/client/command_center/displays/messages'
 require 'bwapi/client/command_center/displays/scenes'

data/lib/bwapi/client/command_center/displays/events.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module BWAPI
   class Client
     module CommandCenter

data/lib/bwapi/client/command_center/displays/messages.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module BWAPI
   class Client
     module CommandCenter

data/lib/bwapi/client/command_center/displays/scenes.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module BWAPI
   class Client
     module CommandCenter

data/lib/bwapi/client/command_center/displays/screens.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module BWAPI
   class Client
     module CommandCenter

data/lib/bwapi/client/command_center/displays/users.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'bwapi/client/command_center/displays/users/access'
 
 module BWAPI

data/lib/bwapi/client/command_center/displays/users/access.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module BWAPI
   class Client
     module CommandCenter

data/lib/bwapi/client/command_center/scene_types.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module BWAPI
   class Client
     module CommandCenter

data/lib/bwapi/client/command_center/themes.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module BWAPI
   class Client
     module CommandCenter

data/lib/bwapi/client/command_center/users.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'bwapi/client/command_center/users/access'
 
 module BWAPI

data/lib/bwapi/client/command_center/users/access.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module BWAPI
   class Client
     module CommandCenter

data/lib/bwapi/client/error_codes.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module BWAPI
   class Client
     # ErrorCodes module for errorCodes endpoint

data/lib/bwapi/client/filters.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module BWAPI
   class Client
     # Filters module for filters endpoint

data/lib/bwapi/client/languages.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module BWAPI
   class Client
     # Languages module for languages endpoints

data/lib/bwapi/client/locations.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module BWAPI
   class Client
     # Location module for locations endpoints

data/lib/bwapi/client/logout.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module BWAPI
   class Client
     # Logout module for logout endpoint
@@ -12,7 +10,6 @@ module BWAPI
       ensure
         self.access_token   = nil
         self.refresh_token  = nil
-        self.expires_in     = nil
       end
     end
   end