active_campaign 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b53439d6a5d5498289c5e34017767cdaee91edae
-  data.tar.gz: dd9aa787e9b3e2cf75ac084b84e1222cc3384f61
+  metadata.gz: 773816e174638b5fa75102b031ac13ed726e9112
+  data.tar.gz: 005d17ce9301bcadb204018be4154fb9990916ab
 SHA512:
-  metadata.gz: 0be8d353d7a2f4615e96a2f09b44ff59dda01a1d26ff0b0f8a76b6c3cacd4aefbf18eef927a55feffce43d0ab700174e3f435a326260968aa72a45311a2acb45
-  data.tar.gz: e0fd6a9567d57fb1498e8417ff3a6bc9008306b80835cc06b62bf210fdcc4b729aa02416018b0253aa0c64d7ecb58dfc8e696c8f80eec8acd2a63d1ff65579fa
+  metadata.gz: 4facfd3b06ece6db14864a65124cb96e8fe73bd670544bdef32ff0f07982de5ce37ef6d78f48a6b37f83e6f8d11d4817d9b729f0e2c3aa6f09fe659a79c5ccde
+  data.tar.gz: 640e94884732f0f66605c9777b29b1356d16d3178d4d699f7b6b572f2c4ba9a42ebf78a3a02da071cbce0afaae14003960d5bae35cbad8331764f212dc3aa913

data/.gitignore

@@ -18,4 +18,5 @@ tmp
 
 .DS_Store
 .idea
-/.ruby-version
+/.ruby-version
+.watsonrc

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p247
+2.1.0

data/Gemfile

@@ -16,8 +16,8 @@ group :test do
   gem 'coveralls', require: false
   gem 'rb-fsevent', '~> 0.9'
   gem 'rspec', '~> 2.14.0'
-  gem 'vcr', '~> 2.6.0'
-  gem 'webmock', '~> 1.13.0'
+  gem 'vcr', '~> 2.8.0'
+  gem 'webmock', '~> 1.15.0'
 end
 
 gemspec

data/lib/active_campaign/client.rb

@@ -57,10 +57,12 @@ module ActiveCampaign
 
 
       def create_request(method, api_method, options = {})
-        request = HTTPI::Request.new :url => File.join(api_endpoint, api_path)
-        request.headers = {"User-Agent" => user_agent}
-        request.query = query(method, api_method, options)
-        request.body  = body(method, api_method, options)
+        request = HTTPI::Request.new url: File.join(api_endpoint, api_path)
+
+        request.headers              = { "User-Agent" => user_agent }
+        request.auth.ssl.verify_mode = :none
+        request.query                = query(method, api_method, options)
+        request.body                 = body(method, api_method, options)
 
         request
       end

data/lib/active_campaign/error.rb

@@ -42,19 +42,21 @@ module ActiveCampaign
     private
 
     def data
-      @data ||=
-        if (body = @response[:body]) && !body.empty?
-          if body.is_a?(String) &&
-            @response[:response_headers] &&
-            @response[:response_headers][:content_type] =~ /json/
-
-            Sawyer::Agent.serializer.decode(body)
-          else
-            body
-          end
-        else
-          nil
-        end
+      @data ||= parse_body
+    end
+
+    def parse_body
+      body = @response[:body]
+
+      if body.present? && body.is_a?(String)
+        return Sawyer::Agent.serializer.decode(body) if is_json?
+      end
+
+      body
+    end
+
+    def is_json?
+      @response[:response_headers] && @response[:response_headers][:content_type] =~ /json/
     end
 
     def response_message
@@ -94,41 +96,41 @@ module ActiveCampaign
     end
   end
 
-  # Raised when GitHub returns a 400 HTTP status code
+  # Raised when ActiveCampaign returns a 400 HTTP status code
   class BadRequest < Error; end
 
-  # Raised when GitHub returns a 401 HTTP status code
+  # Raised when ActiveCampaign returns a 401 HTTP status code
   class Unauthorized < Error; end
 
-  # Raised when GitHub returns a 403 HTTP status code
+  # Raised when ActiveCampaign returns a 403 HTTP status code
   class Forbidden < Error; end
 
-  # Raised when GitHub returns a 403 HTTP status code
+  # Raised when ActiveCampaign returns a 403 HTTP status code
   # and body matches 'rate limit exceeded'
   class TooManyRequests < Forbidden; end
 
-  # Raised when GitHub returns a 403 HTTP status code
+  # Raised when ActiveCampaign returns a 403 HTTP status code
   # and body matches 'login attempts exceeded'
   class TooManyLoginAttempts < Forbidden; end
 
-  # Raised when GitHub returns a 404 HTTP status code
+  # Raised when ActiveCampaign returns a 404 HTTP status code
   class NotFound < Error; end
 
-  # Raised when GitHub returns a 406 HTTP status code
+  # Raised when ActiveCampaign returns a 406 HTTP status code
   class NotAcceptable < Error; end
 
-  # Raised when GitHub returns a 422 HTTP status code
+  # Raised when ActiveCampaign returns a 422 HTTP status code
   class UnprocessableEntity < Error; end
 
-  # Raised when GitHub returns a 500 HTTP status code
+  # Raised when ActiveCampaign returns a 500 HTTP status code
   class InternalServerError < Error; end
 
-  # Raised when GitHub returns a 501 HTTP status code
+  # Raised when ActiveCampaign returns a 501 HTTP status code
   class NotImplemented < Error; end
 
-  # Raised when GitHub returns a 502 HTTP status code
+  # Raised when ActiveCampaign returns a 502 HTTP status code
   class BadGateway < Error; end
 
-  # Raised when GitHub returns a 503 HTTP status code
+  # Raised when ActiveCampaign returns a 503 HTTP status code
   class ServiceUnavailable < Error; end
 end

data/lib/active_campaign/version.rb

@@ -1,3 +1,3 @@
 module ActiveCampaign
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/spec/spec_helper.rb

@@ -41,7 +41,7 @@ VCR.configure do |c|
 
   c.default_cassette_options = {
     serialize_with: :json,
-    # TODO: Track down UTF-8 issue and remove
+
     preserve_exact_body_bytes: true,
     decode_compressed_response: true,
     record: ENV['CI'] ? :none : :once
@@ -61,14 +61,14 @@ end
 
 def initialize_new_client
   before do
-    @client = ActiveCampaign::Client.new({
+    @client = ActiveCampaign::Client.new(
       mash: true,
       debug: true,
       api_endpoint: test_api_endpoint,
       api_key: test_api_key,
       log_level: :debug,
       log: true
-    })
+    )
   end
 end
 

metadata

@@ -1,22 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: active_campaign
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   name: httpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -24,13 +18,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -38,6 +32,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple ruby wrapper for the ActiveCampaign API
 email:
 - mikael@zoolutions.se
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: See http://www.activecampaign.com/api/overview.php for more information