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

data/lib/bwapi/client/me.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module BWAPI
   class Client
     # Me module for me endpoint and helper methods
@@ -14,21 +12,14 @@ module BWAPI
       # Get users client name
       #
       # @return [String] Users client name
-      def client_name
+      def user_client_name
         me.client.name
       end
 
       # Get users client id
       #
       # @return [String] Users client id
-      def client_id
-        me.client.id
-      end
-
-      # Get users client id
-      #
-      # @return [String] Users client id
-      def client_id
+      def user_client_name
         me.client.id
       end
 

data/lib/bwapi/client/metrics.rb

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

data/lib/bwapi/client/oauth.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module BWAPI
   class Client
     # OAuth module for oauth/token endpoint
@@ -64,7 +62,6 @@ module BWAPI
       def oauth_request(opts = {})
         creds = post 'oauth/token', opts
         self.access_token  = creds.access_token
-        self.expires_in    = creds.expires_in
         self.refresh_token = creds.refresh_token if application_client?
         creds
       end

data/lib/bwapi/client/ping.rb

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

data/lib/bwapi/client/projects.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'bwapi/client/projects/bulkactions'
 require 'bwapi/client/projects/categories'
 require 'bwapi/client/projects/data'

data/lib/bwapi/client/projects/bulkactions.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'bwapi/client/projects/bulkactions/mentions'
 require 'bwapi/client/projects/bulkactions/author'
 

data/lib/bwapi/client/projects/bulkactions/author.rb

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

data/lib/bwapi/client/projects/bulkactions/mentions.rb

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

data/lib/bwapi/client/projects/categories.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'bwapi/client/projects/categories/copy'
 
 module BWAPI

data/lib/bwapi/client/projects/categories/copy.rb

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

data/lib/bwapi/client/projects/data.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'bwapi/client/projects/data/mentions'
 require 'bwapi/client/projects/data/volume'
 

data/lib/bwapi/client/projects/data/mentions.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'bwapi/client/projects/data/mentions/notes'
 
 module BWAPI

data/lib/bwapi/client/projects/data/mentions/notes.rb

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

data/lib/bwapi/client/projects/data/volume.rb

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

data/lib/bwapi/client/projects/data_download.rb

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

data/lib/bwapi/client/projects/demographics.rb

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

data/lib/bwapi/client/projects/facebook_queries.rb

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

data/lib/bwapi/client/projects/group.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'bwapi/client/projects/group/author_group'
 require 'bwapi/client/projects/group/location_group'
 require 'bwapi/client/projects/group/site_group'

data/lib/bwapi/client/projects/group/author_group.rb

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

data/lib/bwapi/client/projects/group/location_group.rb

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

data/lib/bwapi/client/projects/group/site_group.rb

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

data/lib/bwapi/client/projects/queries.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'bwapi/client/projects/queries/backfill'
 require 'bwapi/client/projects/queries/date_range'
 require 'bwapi/client/projects/queries/mentions'

data/lib/bwapi/client/projects/queries/backfill.rb

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

data/lib/bwapi/client/projects/queries/date_range.rb

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

data/lib/bwapi/client/projects/queries/mentions.rb

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

data/lib/bwapi/client/projects/query_groups.rb

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

data/lib/bwapi/client/projects/rules.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'bwapi/client/projects/rules/backfill'
 require 'bwapi/client/projects/rules/copy'
 

data/lib/bwapi/client/projects/rules/backfill.rb

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

data/lib/bwapi/client/projects/rules/copy.rb

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

data/lib/bwapi/client/projects/sharing.rb

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

data/lib/bwapi/client/projects/signals.rb

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

data/lib/bwapi/client/projects/stream_dashboards.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'bwapi/client/projects/stream_dashboards/streams'
 
 module BWAPI

data/lib/bwapi/client/projects/stream_dashboards/streams.rb

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

data/lib/bwapi/client/projects/summary.rb

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

data/lib/bwapi/client/projects/tags.rb

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

data/lib/bwapi/client/projects/twitter_queries.rb

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

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

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

data/lib/bwapi/client/projects/workflow.rb

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

data/lib/bwapi/client/query_validation.rb

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

data/lib/bwapi/client/sso.rb

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

data/lib/bwapi/client/test_search.rb

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

data/lib/bwapi/client/user.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'bwapi/client/user/notifications'
 
 module BWAPI

data/lib/bwapi/client/user/notifications.rb

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

data/lib/bwapi/configuration.rb

@@ -1,42 +1,32 @@
-# encoding: utf-8
-
-require 'logger'
-require 'faraday'
-
 module BWAPI
   # Configuration module to set default and custom client credentials
   module Configuration
-    OPTION_KEYS = [
-      :api_endpoint,
-      :user_agent,
-      :adapter,
-      :username,
-      :password,
-      :grant_type,
-      :access_token,
-      :refresh_token,
-      :expires_in,
-      :client_id,
-      :client_secret,
-      :verify_ssl,
-      :netrc,
-      :netrc_file,
-      :debug,
-      :log
-    ].freeze
-
-    DEFAULT_ADAPTER       = Faraday.default_adapter
-    DEFAULT_API_ENDPOINT  = ENV['BWAPI_API_ENDPOINT'] || 'https://newapi.brandwatch.com/'
-    DEFAULT_CLIENT_ID     = 'brandwatch-api-client'
-    DEFAULT_USER_AGENT    = "BWAPI Ruby Gem #{BWAPI::VERSION}".freeze
-    DEFAULT_NETRC_FILE    = File.join(ENV['HOME'], '.netrc')
-    DEFAULT_LOGGER_FILE   = Logger.new("#{Dir.pwd}/bwapi.log")
-
-    attr_accessor(*OPTION_KEYS)
-
-    # Extend hook
-    def self.extended(base)
-      base.reset
+    attr_accessor :access_token, :adapter, :api_endpoint, :client_id, :debug, :grant_type,
+                  :logger, :performance, :refresh_token, :user_agent, :username, :verify_ssl
+
+    attr_writer :client_secret, :password
+
+    class << self
+      # Configuration keys
+      def keys
+        @keys ||= [
+          :access_token,
+          :adapter,
+          :api_endpoint,
+          :client_id,
+          :client_secret,
+          :connection_options,
+          :debug,
+          :grant_type,
+          :logger,
+          :password,
+          :performance,
+          :refresh_token,
+          :user_agent,
+          :username,
+          :verify_ssl
+        ]
+      end
     end
 
     # Set configuration options using a block
@@ -44,28 +34,22 @@ module BWAPI
       yield self
     end
 
-    # Convert option_keys to hash and return
-    def options
-      OPTION_KEYS.reduce({}) { |a, e| a.merge!(e => send(e)) }
+    def reset
+      BWAPI::Configuration.keys.each { |key| instance_variable_set(:"@#{key}", BWAPI::Default.options[key]) }
+      self
     end
 
-    # Reset the configuration options
-    def reset
-      self.adapter             = DEFAULT_ADAPTER
-      self.user_agent          = DEFAULT_USER_AGENT
-      self.api_endpoint        = DEFAULT_API_ENDPOINT
-      self.username            = nil
-      self.password            = nil
-      self.grant_type          = nil
-      self.access_token        = nil
-      self.refresh_token       = nil
-      self.client_id           = DEFAULT_CLIENT_ID
-      self.client_secret       = nil
-      self.verify_ssl          = true
-      self.netrc               = false
-      self.netrc_file          = DEFAULT_NETRC_FILE
-      self.debug               = false
-      self.log                 = DEFAULT_LOGGER_FILE
+    def destroy
+      BWAPI::Configuration.keys.each { |key| instance_variable_set(:"@#{key}", nil) }
+      self
+    end
+
+    private
+
+    attr_reader :client_secret, :password
+
+    def options
+      Hash[BWAPI::Configuration.keys.map { |key| [key, instance_variable_get(:"@#{key}")] }]
     end
   end
 end

data/lib/bwapi/connection.rb

@@ -1,27 +1,45 @@
-# encoding: utf-8
-
+require 'bwapi/response/error'
+require 'bwapi/response/logger'
+require 'bwapi/response/performance'
 require 'faraday_middleware'
-require 'faraday/response/brandwatch_error'
 
 module BWAPI
-  # Connection module to handle requests
+  # Configuration module to set default and custom client credentials
   module Connection
+    RACK_BUILDER_CLASS = defined?(Faraday::RackBuilder) ? Faraday::RackBuilder : Faraday::Builder
+
     private
 
-    # Create a connection to send request
-    def connection(opts = {})
-      connection = Faraday.new(opts) do |c|
-        c.request :json
+    def connection
+      @connection ||= Faraday.new(faraday_options)
+    end
+
+    def reset_connection
+      @connection = nil
+    end
+
+    def faraday_options
+      opts                           = @connection_options
+      opts[:headers][:authorization] = "bearer #{@access_token}" if @access_token
+      opts[:builder]                 = middleware
+      opts[:ssl]                     = { verify: @verify_ssl }
+      opts[:url]                     = @api_endpoint
+      opts
+    end
+
+    def middleware
+      RACK_BUILDER_CLASS.new do |builder|
+        builder.use FaradayMiddleware::Mashify
 
-        c.use BrandwatchError
+        builder.use BWAPI::Response::Performance, self if debug
+        builder.use BWAPI::Response::Error
+        builder.use BWAPI::Response::Logger, self if debug
 
-        c.response :mashify
-        c.response :follow_redirects
-        c.response :json, content_type: /\bjson$/
+        builder.use FaradayMiddleware::FollowRedirects
+        builder.use FaradayMiddleware::ParseJson, content_type: /\bjson$/
 
-        c.adapter adapter
+        builder.adapter Faraday.default_adapter
       end
-      connection
     end
   end
 end