bwapi 9.0.0.pre.379 → 9.0.0.pre.385

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzhmYWNiZWZlZWI5NTlkMjQ1N2Y2YzIxYzlkOWMxZDM2NWMxZTExZA==
+    MTU0NTM5NzlkOWNmZWM1NGQ1ZTMyNjRjZjczOTI0NWFhMTI4NGIzZg==
   data.tar.gz: !binary |-
-    N2I1MDliODM1ZjBhYjAzNDFkMTdlMzJiNTk3YTkwYTVlMmNmOTRmMA==
+    NWI0NDUyMjRmMjQ0YWEyZjc5YzYyM2M2N2QwNTA1MWEyMDMxN2QwZg==
 SHA512:
   metadata.gz: !binary |-
-    YzQ3NzcyZDRmYTY3ZDEwYTVhNzE3NmViNDc4YWZhYThjNzNmMzU5ZmMxMzNk
-    YzYxYzc4OGMyMjcxYzdhN2FjYzhlOWJiNzE0MDY0NTQ3MTg5MDNkYTY5ODVk
-    NGQ4NTMyMDk2YjlkY2VlOGEyZjk4MzBjOWU3MTNkYjIxZmIzMzg=
+    NjFiODYzOTJiODNmYjVjMWQ0ZDQ1NGZkYTZlZGQ2ZmMxODlkNWFiYThkMGFh
+    Y2QwOTlmY2VlN2U3NmIxOWMyMTFkYmMyNGYxMzRjNjE2NjZlNTNjNGZiNWQ4
+    YWQ0Mzg5ZTgyMDgzZjQzYmZmZTBkN2U5YTgyNWI3OGEzNTA2NjY=
   data.tar.gz: !binary |-
-    ZmYzNjE2ZDU5Zjk1OTQwYWI3ZjhmMTMxNTc2ODBhZjMzYWMzZjVkMzk1OTY2
-    NjU4ZmE3YTJjMWUzZjhjYzQ2NmY2MzRhOTE3ODU2Mjk5YTZhZDVlMWY1Y2Uw
-    YjUwMDFmOTMxNzM3ODZkY2M0NmIxN2MzM2NmYTMyZDBjOGY1OGI=
+    NTRjYTg2YzA5YzI2NTMyMGU3NGY2OTE0NjJhOGQzYjcwOTlmYzExZTA5Mzlk
+    NWFjMWM2ZWEwZTdhZWFhYTZmMTBlMDYxMDc5Njk0NzVhYTIzOWIxMWNlMDIw
+    MGVkZGNiYjRkNGMyNDVhMzFkMDE0MjNlOGI2MjliZmU0YTI3NTM=

data/bwapi.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
   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.1', '>= 0.9.1'
-  s.add_runtime_dependency 'hashie', '~> 3.2.0', '>= 3.2.0'
+  s.add_runtime_dependency 'faraday_middleware-parse_oj', '~> 0.3.0', '>= 0.3.0'
+  s.add_runtime_dependency 'oj', '~> 2.10.0', '>= 2.10.0'
 
   s.files         = `git ls-files`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }

data/lib/bwapi/client/oauth.rb

@@ -60,10 +60,10 @@ module BWAPI
       #
       # @param opts [Hash] options hash of parameters
       def oauth_request(opts = {})
-        creds = post 'oauth/token', opts
-        self.access_token  = creds.access_token
-        self.refresh_token = creds.refresh_token if application_client?
-        creds
+        response = post('oauth/token', opts)
+        self.access_token  = response['access_token']
+        self.refresh_token = response['refresh_token'] if application_client?
+        response
       end
     end
   end

data/lib/bwapi/connection.rb

@@ -2,6 +2,7 @@ require 'bwapi/response/error'
 require 'bwapi/response/logger'
 require 'bwapi/response/performance'
 require 'faraday_middleware'
+require 'faraday_middleware/parse_oj'
 
 module BWAPI
   # Connection module
@@ -31,14 +32,12 @@ module BWAPI
       RACK_BUILDER_CLASS.new do |builder|
         builder.request :json
 
-        builder.use BWAPI::Response::Performance, self if debug
-        builder.use BWAPI::Response::Error
-        builder.use BWAPI::Response::Logger, self if debug
+        builder.response :performance, self if debug
+        builder.response :error
+        builder.response :logger, self if debug
 
-        builder.response :mashify
+        builder.response :oj
         builder.response :follow_redirects
-        builder.response :json, content_type: /\bjson$/
-
         builder.adapter Faraday.default_adapter
       end
     end

data/lib/bwapi/response/error.rb

@@ -26,3 +26,5 @@ module BWAPI
     end
   end
 end
+
+Faraday::Response.register_middleware error: BWAPI::Response::Error

data/lib/bwapi/response/logger.rb

@@ -33,3 +33,5 @@ module BWAPI
     end
   end
 end
+
+Faraday::Response.register_middleware logger: BWAPI::Response::Logger

data/lib/bwapi/response/performance.rb

@@ -29,3 +29,5 @@ module BWAPI
     end
   end
 end
+
+Faraday::Response.register_middleware performance: BWAPI::Response::Performance

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bwapi
 version: !ruby/object:Gem::Version
-  version: 9.0.0.pre.379
+  version: 9.0.0.pre.385
 platform: ruby
 authors:
 - Jonathan Chrisp
@@ -111,25 +111,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.1
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: faraday_middleware-parse_oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 0.3.0
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 0.3.0
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.10.0
 description: A Ruby wrapper for the Brandwatch API
 email: jonathan@brandwatch.com
 executables: