bwapi 7.0.2.pre.289 → 7.0.3.pre.296

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTc0MjRmNTg4YzU3MTZmOWYxYWM2NTUxOTc5MTMwM2Y3OWI5ZjM0YQ==
+    ZDJkZmMxNWZlNjc0YWU5YWIzY2ZmYzQ0NTMzODAzOWY4YWNkNWViYQ==
   data.tar.gz: !binary |-
-    YThhYTgzNzZmNTg0MWI0MDkzNzA3MzU5NTk1NTI4MGIyMjkwYTMwZQ==
+    MmFiNzE5ZGY5N2EzODQ4OWU1YjA5MDcxM2Q4ODY5NTYxY2RmYWYyYQ==
 SHA512:
   metadata.gz: !binary |-
-    OTFlNjA4ZDAwZWY4MjAwNzY0MzcwZmRhOTQ4NDFlN2VhZGUwNmJkZmUwYTAx
-    ZGU1NDAxNmQzNmM0NDdmMGFlMjdmOWQwYzYyYTM4OGNlYzRhMDc3NzE1NWE3
-    ZmZjNDEyMjYzYTk3MDg4ZjkzZmMzZWU5YmZkMGZjZjM2MTcxZDQ=
+    Y2U1N2Y1ZjFmZDJhN2Q0N2MxZjEzMmMzNzg0NWFkNDNiNTgxZDRhZmI2ODRi
+    YjliNzVmMjVlNzJjNGJmNjdhOWE4ODE5NDM3MTJiZTk4MTQ3MjgwZDM3MDJj
+    MzQ3NjRlYWM5ZjNmMWY4YTJlMTMwYjkxZDAzMTM0MDkyOTg1MzI=
   data.tar.gz: !binary |-
-    MzNkMTdmZGU5MzlkNzQ4NDRlOGI3M2I3YjM5ZGFjMjI4ZjY3ZjUzZWFjNzU4
-    NjI2Njg3YjUzYWUwYTIzZTZiZjJkZDNhY2I2MDIyY2RkZmMwODAwZTVkMjNk
-    N2I4N2Q4NDczMmE1NzgxMGFmYzBiMGMwZmMxZjM2Yjc4NDc0ZWY=
+    Mjc4MWQ3NDY3OTE3NzM2YmEzZWM4M2FkMzhmOGQxNTU5NGFjMGEyMzQ2ODYw
+    ZmI2ZjViZmVlMGY2MTQyZmU1YTQxZjU3YWVjOGI5MjBiYjY2ZDA4NTUzZWYz
+    YjJiNDc5NGJjYTJjZGM3NzVkODAzMWJjMDc2NjM2ZTU1ZWE3OWU=

data/bwapi.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
   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 'multi_json', '~> 1.9.0', '>= 1.9.0'
   s.add_runtime_dependency 'netrc', '~> 0.7.7', '>= 0.7.7'
 
   s.files         = `git ls-files`.split("\n")

data/lib/bwapi/connection.rb

@@ -11,10 +11,14 @@ module BWAPI
     # Create a connection to send request
     def connection(opts = {})
       connection = Faraday.new(opts) do |c|
-        c.use FaradayMiddleware::FollowRedirects
+        c.request :json
+
         c.use BrandwatchError
-        c.use FaradayMiddleware::Mashify
-        c.use FaradayMiddleware::ParseJson, content_type: /\bjson$/
+
+        c.response :mashify
+        c.response :follow_redirects
+        c.response :json, content_type: /\bjson$/
+
         c.adapter adapter
       end
       connection.headers[:user_agent] = user_agent

data/lib/bwapi/request.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'multi_json'
-
 module BWAPI
   # Request module to handle all requests to API
   module Request
@@ -83,7 +81,7 @@ module BWAPI
             request.url path, opts
           else
             request.path = path
-            request.body = MultiJson.dump(opts) unless opts.empty?
+            request.body = opts
           end
         end
       end
@@ -92,7 +90,7 @@ module BWAPI
         log.info "Connection options: #{connection_options}"
         log.info "Sending request type: #{method}"
         log.info "Request path: #{path}"
-        log.info "Request url: #{api_endpoint} / #{path}"
+        log.info "Request url: #{api_endpoint}/#{path}"
         log.info "Request parameters: #{opts.to_json}" unless opts.nil?
         log.info "Response body: #{response.env[:body].to_json}" unless response.env[:body].nil?
       end

data/lib/bwapi/version.rb

@@ -2,5 +2,5 @@
 
 # BWAPI Version
 module BWAPI
-  VERSION = '7.0.2'
+  VERSION = '7.0.3'
 end

data/lib/faraday/response/brandwatch_error.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 require 'faraday'
-require 'multi_json'
 
 # Brandwatch response middleware to handle errors
 class BrandwatchError < Faraday::Response::Middleware

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bwapi
 version: !ruby/object:Gem::Version
-  version: 7.0.2.pre.289
+  version: 7.0.3.pre.296
 platform: ruby
 authors:
 - Jonathan Chrisp
@@ -124,26 +124,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.1
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.9.0
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.9.0
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement