active_campaign 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84a934cf5dafa4193d0f9bfe8669c5f4de3353c3
-  data.tar.gz: b2187ee064e4afc645073252f3d21eab2366177e
+  metadata.gz: 51738f35b3fdb61fa2e068ddcca2735c3e1a24ca
+  data.tar.gz: 335f4331bdb56d952ea512b73c95b9ca83de8524
 SHA512:
-  metadata.gz: 434fef3c9cd60d40e7e21a34fc3f06717e901ea009c0f6ad3c747ed310efac78e567c13756a0823b0987dc48aa4d023f8ebfb7d490e4d87a7841e548192da123
-  data.tar.gz: 3881c3aad507b4421a4d37cfabb7a980d624387de80fe0bc3194b2e5743076e690df2ae38455b9c62badef033297fe709967fc85e6ac4274c71b39cab12257bd
+  metadata.gz: 672b2039bb992045ac56ba02113b9eeb17dcc534a0dc7a88af8325e660b2b62816b6939945955e3557ec98461c40c2ef58269b9bc06c7d10ee0c9bfff51b6544
+  data.tar.gz: dba4079c479ee6bb751754421b5e07eed513f2b2e0791b3c2216444bea323050ba2657eeae8fe4fb3ac03655d8dc441ddfa22f8d1c488fbf92bb8ce8c1f7e6f7

data/.coveralls.yml

@@ -0,0 +1 @@
+repo_token: 9QHPyeb961SRsyxDttIHmzVNhXvP1RJKr

data/Gemfile

@@ -2,28 +2,23 @@ source 'https://rubygems.org'
 
 gem 'jruby-openssl', :platforms => :jruby
 gem 'rake'
+gem 'activesupport'
 
 group :development do
   gem 'awesome_print', :require => 'ap'
-  gem 'guard-rspec', '~> 2.5.1'
-  gem 'hirb-unicode'
   gem 'pry'
-  gem 'redcarpet'
-  gem 'wirb'
-  gem 'wirble'
-  gem 'yard'
 end
 
 group :test do
+  gem "codeclimate-test-reporter", :require => false
   gem 'coveralls', :require => false
   gem 'json', '~> 1.7', :platforms => [:ruby_18, :jruby]
-  gem 'netrc', '~> 0.7.7'
   gem 'rb-fsevent', '~> 0.9'
-  gem 'rspec', '~> 2.13.0'
+  gem 'rspec', '~> 2.14.0'
   gem 'simplecov', :require => false
   gem 'test-queue', '~> 0.1.3'
-  gem 'vcr', '~> 2.4.0'
-  gem 'webmock', '~> 1.9.0'
+  gem 'vcr', '~> 2.6.0'
+  gem 'webmock', '~> 1.14.0'
 end
 
 gemspec

data/README.md

@@ -1,3 +1,4 @@
+[![Circle CI](https://circleci.com/gh/RushPlay/active_campaign.png?circle-token=908def2d4311fcbe28d2caabccaa703e2835cf37)](https://circleci.com/gh/RushPlay/active_campaign/tree/master)[![Coverage Status](https://coveralls.io/repos/RushPlay/active_campaign/badge.png?branch=master)](https://coveralls.io/r/RushPlay/active_campaign?branch=master) [![Code Climate](https://codeclimate.com/repos/525d012ec7f3a335f101a3d6/badges/74d14b105bf9f769f10f/gpa.png)](https://codeclimate.com/repos/525d012ec7f3a335f101a3d6/feed)
 # Active::Campaign::Ruby
 
 A simple wrapper for the ActiveCampaign API. Since their API seems to be

data/active_campaign.gemspec

@@ -18,10 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "faraday", ">= 0.8.8"
-  spec.add_dependency "activesupport", ">= 4.0.0"
-  spec.add_dependency "uri_template"
+  spec.add_dependency "httpi"
   spec.add_dependency "hashie"
-  spec.add_dependency "oj"
-  spec.add_development_dependency 'bundler', '~> 1.0'
 end

data/lib/active_campaign/client/contacts.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext'
 module ActiveCampaign
   class Client
     module Contacts

data/lib/active_campaign/client.rb

@@ -1,30 +1,28 @@
-require 'faraday'
-require 'uri_template'
-require 'active_campaign/arguments'
-require 'active_campaign/authentication'
 require 'active_campaign/configurable'
 require 'active_campaign/client/contacts'
 require 'active_campaign/client/lists'
 require 'active_campaign/client/campaigns'
+require 'httpi'
+require 'hashie'
 
 module ActiveCampaign
   class Client
     include ActiveCampaign::Configurable
-    include ActiveCampaign::Authentication
     include ActiveCampaign::Client::Contacts
     include ActiveCampaign::Client::Lists
     include ActiveCampaign::Client::Campaigns
 
-    NO_BODY = Set.new([:get, :head])
-    # Header keys that can be passed in options hash to {#get},{#head}
-    CONVENIENCE_HEADERS = Set.new [:accept]
-
     def initialize(options = {})
-      # Use options passed in, but fall back to module defaults
       ActiveCampaign::Configurable.keys.each do |key|
         instance_variable_set(:"@#{key}", options[key] ||
           ActiveCampaign.instance_variable_get(:"@#{key}"))
       end
+
+      unless debug
+        HTTPI.log       = false
+        HTTPI.log_level = :info
+        HTTPI.logger = Rails.logger
+      end
     end
 
     # Compares client options to a Hash of requested options
@@ -35,32 +33,13 @@ module ActiveCampaign
       opts.hash == options.hash
     end
 
-    # Text representation of the client, masking tokens and passwords
-    #
-    # @return [String]
-    def inspect
-      inspected = super
-
-      # mask password
-      inspected = inspected.gsub! @password, "*******" if @password
-      # Only show last 4 of token, secret
-      if @access_token
-        inspected = inspected.gsub! @access_token, "#{'*'*36}#{@access_token[36..-1]}"
-      end
-      if @client_secret
-        inspected = inspected.gsub! @client_secret, "#{'*'*36}#{@client_secret[36..-1]}"
-      end
-
-      inspected
-    end
-
       # Make a HTTP GET request
     #
     # @param url [String] The path, relative to {#api_endpoint}
     # @param options [Hash] Query and header params for request
     # @return [Sawyer::Resource]
     def get(api_method, options = {})
-      request :get, api_method, parse_query_and_convenience_headers(options)
+      request :get, api_method, options
     end
 
     # Make a HTTP POST request
@@ -72,143 +51,59 @@ module ActiveCampaign
       request :post, api_method, options
     end
 
-    # Make a HTTP PUT request
-    #
-    # @param url [String] The path, relative to {#api_endpoint}
-    # @param options [Hash] Body and header params for request
-    # @return [Sawyer::Resource]
-    def put(api_method, options = {})
-      request :put, api_method, options
-    end
-
-    # Make a HTTP PATCH request
-    #
-    # @param url [String] The path, relative to {#api_endpoint}
-    # @param options [Hash] Body and header params for request
-    # @return [Sawyer::Resource]
-    def patch(api_method, options = {})
-      request :patch, api_method, options
-    end
-
-    # Make a HTTP DELETE request
-    #
-    # @param url [String] The path, relative to {#api_endpoint}
-    # @param options [Hash] Query and header params for request
-    # @return [Sawyer::Resource]
-    def delete(api_method, options = {})
-      request :delete, api_method, options
-    end
-
-    # Make a HTTP HEAD request
-    #
-    # @param url [String] The path, relative to {#api_endpoint}
-    # @param options [Hash] Query and header params for request
-    # @return [Sawyer::Resource]
-    def head(api_method, options = {})
-      request :head, api_method, parse_query_and_convenience_headers(options)
-    end
-
-    # Response for last HTTP request
-    #
-    # @return [Sawyer::Response]
-    def last_response
-      @last_response
-    end
-
     private
 
       def request(method, api_method, data)
-        options = {}
-        options[:query]   = data.delete(:query) || {}
-        options[:headers] = data.delete(:headers) || {}
-
-        options[:query].merge!({
-          api_key: api_key,
-          api_action: api_method.to_s,
-          api_output: api_output
-        })
-
-        if accept = data.delete(:accept)
-          options[:headers][:accept] = accept
-        end
-
-        @last_response = response = process_request(
-          method, URI.encode(api_path), data, options
-        )
-
-        response
+        req = create_request method, api_method, data
+        response = HTTPI.send(method, req)
+        response = JSON.parse(response.body)
+        normalize(response)
       end
 
-      def connection
-        @conn ||= Faraday.new do |builder|
-
-          builder.request  :url_encoded
 
-          builder.response :mashify
-          builder.response :json_normalizer
-          builder.response :parse_json #, content_type: /\bjson$/
+      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 = {
+          :api_key => api_key,
+          :api_action => api_method.to_s,
+          :api_output => api_output
+        }.merge(options.delete(:query))
 
-          if debug
-            builder.use :debugger
-            builder.use :instrumentation
-          end
+        request.body = options.to_query if method == :post
 
-          builder.adapter  Faraday.default_adapter
-          builder.url_prefix = api_endpoint
-        end
-        # @conn.url_prefix api_endpoint
-        @conn
+        request
       end
 
+      def normalize(response)
+        keys, values = keys_values(response)
 
-      def process_request(method, url, data = {}, options = {})
-        if NO_BODY.include?(method)
-          options ||= data
-          data      = nil
+        if keys.all?{|key| is_numeric?(key) }
+          response[:results] = values
+          keys.each do |key|
+            response.delete(key)
+          end
         end
-        options ||= {}
-        url = expand_url(url, options[:uri])
 
-        res = connection.send method, url do |req|
-          req.body = data if data
-          if params = options[:query]
-            req.params.update params
-          end
-          if headers = options[:headers]
-            req.headers.update headers
-          end
+        if mash
+          Hashie::Mash.new response
+        else
+          ActiveSupport::HashWithIndifferentAccess.new(response)
         end
-        res.body
-      end
 
-      # Executes the request, checking if it was successful
-      #
-      # @return [Boolean] True on success, false otherwise
-      def boolean_from_response(method, path, options = {})
-        request(method, path, options)
-        @last_response.status == 204
-      rescue ActiveCampaign::NotFound
-        false
       end
 
-      def parse_query_and_convenience_headers(options)
-        headers = options.fetch(:headers, {})
-        CONVENIENCE_HEADERS.each do |h|
-          if header = options.delete(h)
-            headers[h] = header
-          end
-        end
-        query = options.delete(:query)
-        opts = {:query => options}
-        opts[:query].merge!(query) if query && query.is_a?(Hash)
-        opts[:headers] = headers unless headers.empty?
+      def is_numeric?(string)
+        string.to_s.match(/\A[+-]?\d+\Z/) == nil ? false : true
+      end
 
-        opts
+      def keys_values(response)
+        results = results(response)
+        [results.keys, results.values]
       end
-      def expand_url(url, options = nil)
-        tpl = url.respond_to?(:expand) ? url : URITemplate.new(url.to_s)
-        expand = tpl.method(:expand)
-        options ? expand.call(options) : expand.call
+
+      def results(response)
+        response.reject{|k,v| %w(result_code result_message result_output).include?(k) }
       end
   end
 end

data/lib/active_campaign/configurable.rb

@@ -4,49 +4,24 @@ module ActiveCampaign
   # in {Default}
   module Configurable
 
-    # @!attribute connection_options
-    #   @see https://github.com/lostisland/faraday
-    #   @return [Hash] Configure connection options for Faraday
-    # @!attribute middleware
-    #   @see https://github.com/lostisland/faraday
-    #   @return [Faraday::Builder] Configure middleware for Faraday
-    # @!attribute per_page
-    #   @return [String] Configure page size for paginated results. API default: 30
-    # @!attribute user_agent
-    #   @return [String] Configure User-Agent header for requests.
-    # @!attribute web_endpoint
-    #   @return [String] Base URL for web URLs. default: https://github.com/
-
-    attr_accessor :api_url, :api_key, :api_output, :api_path, :api_action,
-      :list_id, :api_endpoint, :proxy, :user_agent,
-      :debug, :per_page, :connection_options,
-      :api_endpoint, :auto_paginate,
-      :default_media_type, :connection_options,
-      :middleware, :user_agent, :web_endpoint
-
-    attr_writer :client_secret, :password
+    CONFIG_KEYS = [
+      :api_key,
+      :api_path,
+      :api_output,
+      :api_endpoint,
+      :user_agent,
+      :debug,
+      :mash,
+    ]
+
+    attr_accessor(*CONFIG_KEYS)
 
     class << self
 
       # List of configurable keys for {ActiveCampaign::Client}
       # @return [Array] of option keys
       def keys
-        @keys ||= [
-          :api_key,
-          :api_path,
-          :api_output,
-          :api_endpoint,
-          :user_agent,
-          :debug,
-          :per_page,
-          :connection_options,
-          :auto_paginate,
-          :default_media_type,
-          :connection_options,
-          :middleware,
-          :user_agent,
-          :web_endpoint
-        ]
+        @keys ||= CONFIG_KEYS
       end
     end
 

data/lib/active_campaign/default.rb

@@ -1,10 +1,4 @@
 require 'active_campaign/version'
-require 'active_campaign/response/raise_error'
-require 'active_campaign/response/debugger'
-require 'active_campaign/response/json_normalizer'
-require 'active_campaign/response/mashify'
-require 'active_campaign/response/instrumentation'
-require 'active_campaign/response/parse_json'
 
 module ActiveCampaign
 
@@ -19,26 +13,12 @@ module ActiveCampaign
     # Default User Agent header string
     USER_AGENT   = "ActiveCampaign Ruby Gem #{ActiveCampaign::VERSION}".freeze
 
-    # Default media type
-    MEDIA_TYPE   = "text/html"
-
     # Default media type
     API_OUTPUT   = "json"
 
     # Default WEB endpoint
     WEB_ENDPOINT = "http://www.activecampaign.com/".freeze
 
-    # Default Faraday middleware stack
-    MIDDLEWARE = Faraday::Builder.new do |builder|
-      builder.request  :url_encoded
-      builder.response :mashify
-      builder.response :json_normalizer
-      builder.response :parse_json
-      builder.use      :debugger
-      builder.use      :instrumentation
-      builder.adapter  Faraday.default_adapter
-    end
-
     class << self
 
       # Configuration options
@@ -59,29 +39,6 @@ module ActiveCampaign
         API_PATH
       end
 
-      # Default pagination preference from ENV
-      # @return [String]
-      def auto_paginate
-        ENV['ACTIVE_CAMPAIGN_AUTO_PAGINATE']
-      end
-
-      # Default options for Faraday::Connection
-      # @return [Hash]
-      def connection_options
-        {
-          :headers => {
-            :accept => default_media_type,
-            :user_agent => user_agent
-          }
-        }
-      end
-
-      # Default media type from ENV or {MEDIA_TYPE}
-      # @return [String]
-      def default_media_type
-        ENV['ACTIVE_CAMPAIGN_DEFAULT_MEDIA_TYPE'] || MEDIA_TYPE
-      end
-
       # Default GitHub username for Basic Auth from ENV
       # @return [String]
       def api_key
@@ -92,11 +49,8 @@ module ActiveCampaign
         false
       end
 
-      # Default middleware stack for Faraday::Connection
-      # from {MIDDLEWARE}
-      # @return [String]
-      def middleware
-        MIDDLEWARE
+      def mash
+        false
       end
 
       # Default media api_output from ENV or {API_OUTPUT}
@@ -105,31 +59,11 @@ module ActiveCampaign
         ENV['ACTIVE_CAMPAIGN_API_OUTPUT'] || API_OUTPUT
       end
 
-      # Default pagination page size from ENV
-      # @return [Fixnum] Page size
-      def per_page
-        page_size = ENV['ACTIVE_CAMPAIGN_PER_PAGE']
-
-        page_size.to_i if page_size
-      end
-
-      # Default proxy server URI for Faraday connection from ENV
-      # @return [String]
-      def proxy
-        ENV['ACTIVE_CAMPAIGN_PROXY']
-      end
-
       # Default User-Agent header string from ENV or {USER_AGENT}
       # @return [String]
       def user_agent
         ENV['ACTIVE_CAMPAIGN_USER_AGENT'] || USER_AGENT
       end
-
-      # Default web endpoint from ENV or {WEB_ENDPOINT}
-      # @return [String]
-      def web_endpoint
-        ENV['ACTIVE_CAMPAIGN_WEB_ENDPOINT'] || WEB_ENDPOINT
-      end
     end
   end
 end

data/lib/active_campaign/version.rb

@@ -1,3 +1,3 @@
 module ActiveCampaign
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/active_campaign.rb

@@ -1,10 +1,11 @@
-require 'active_support/core_ext'
+# require 'active_support/core_ext'
 require 'active_campaign/client'
 require 'active_campaign/default'
 
 module ActiveCampaign
 
   class << self
+
     include ActiveCampaign::Configurable
 
     # API client based on configured options {Configurable}

data/spec/active_campaign_spec.rb

@@ -1,32 +1,47 @@
-require 'helper'
+require 'spec_helper'
 
 describe ActiveCampaign do
+  before do
+    ActiveCampaign.reset!
+  end
 
   after do
-    ActiveCampaign.setup
+    ActiveCampaign.reset!
   end
 
-  describe ".respond_to?" do
-    it "is true if method exists" do
-      expect(ActiveCampaign.respond_to?(:client, true)).to eq(true)
+  it 'sets defaults' do
+    ActiveCampaign::Configurable.keys.each do |key|
+      expect(ActiveCampaign.instance_variable_get(:"@#{key}")).to eq ActiveCampaign::Default.send(key)
     end
   end
 
-  describe ".new" do
-    it "is a ActiveCampaign::Client" do
-      expect(ActiveCampaign.client).to be_a ActiveCampaign::Client
+  describe '.client' do
+    it 'creates an ActiveCampaign::Client' do
+      expect(ActiveCampaign.client).to be_kind_of ActiveCampaign::Client
     end
-  end
 
-  describe ".delegate" do
-    it "delegates missing methods to ActiveCampaign::Client" do
-      initialize_active_campaign
+    it 'caches the client when the same options are passed' do
+      expect(ActiveCampaign.client).to eq ActiveCampaign.client
+    end
 
-      stub_get("contact_view", email: "mikael@zoolutions.se").
-        to_return json_response('contact_view.json')
-      contact = ActiveCampaign.contact_view(email: "mikael@zoolutions.se")
-      expect(contact.email).to eq('mikael@zoolutions.se')
+    it 'returns a fresh client when options are not the same' do
+      client = ActiveCampaign.client
+      ActiveCampaign.api_key = 'somekey'
+      client_two = ActiveCampaign.client
+      client_three = ActiveCampaign.client
+      expect(client).to_not eq client_two
+      expect(client_three).to eq client_two
     end
+  end
 
+  describe '.configure' do
+    ActiveCampaign::Configurable.keys.each do |key|
+      it "sets the #{key.to_s.gsub('_', ' ')}" do
+        ActiveCampaign.configure do |config|
+          config.send("#{key}=", key)
+        end
+        expect(ActiveCampaign.instance_variable_get(:"@#{key}")).to eq key
+      end
+    end
   end
 end

data/spec/client/contacts_spec.rb

@@ -1,14 +1,11 @@
 # -*- encoding: utf-8 -*-
-require 'helper'
+require 'spec_helper'
 
-# need this to filter the data
-require 'json'
-require 'date'
 describe ActiveCampaign::Client::Contacts do
 
   initialize_new_client
 
-  it "syncs a contact" do
+  pending "syncs a contact" do
     params = {
       id: 1,
       email: 'mhenrixon@me.com',

data/spec/client/lists_spec.rb

@@ -1,9 +1,6 @@
 # -*- encoding: utf-8 -*-
-require 'helper'
+require 'spec_helper'
 
-# need this to filter the data
-require 'json'
-require 'date'
 describe ActiveCampaign::Client::Lists do
 
   initialize_new_client

data/spec/client_spec.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 module ActiveCampaign
   describe Client do

data/spec/{helper.rb → spec_helper.rb}

@@ -1,17 +1,21 @@
-# require 'simplecov'
-# require 'coveralls'
+require 'simplecov'
+require 'coveralls'
+require "codeclimate-test-reporter"
+formatters =  [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter]
 
-# SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-#   SimpleCov::Formatter::HTMLFormatter,
-#   Coveralls::SimpleCov::Formatter
-# ]
-# SimpleCov.start
+if ENV['CODECLIMATE_REPO_TOKEN']
+  formatters << CodeClimate::TestReporter::Formatter
+  CodeClimate::TestReporter.start
+end
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[*formatters]
+SimpleCov.start
 
 require "active_campaign"
 require 'rspec'
 require 'webmock/rspec'
 
-WebMock.disable_net_connect!(:allow => 'coveralls.io')
+WebMock.disable_net_connect!(:allow => ['coveralls.io', 'codeclimate.com'])
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
@@ -23,6 +27,25 @@ RSpec.configure do |config|
   end
 end
 
+require 'vcr'
+VCR.configure do |c|
+  c.configure_rspec_metadata!
+  c.filter_sensitive_data('<API_KEY>') do
+      ENV['ACTIVE_CAMPAIGN_API_KEY']
+  end
+
+  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['TRAVIS'] ? :none : :once
+  }
+  c.cassette_library_dir = 'spec/cassettes'
+  c.hook_into :webmock
+  c.ignore_hosts 'codeclimate.com'
+end
+
 def a_delete(url, options = {})
   a_request(:delete, active_campaign_url(url, options))
 end
@@ -97,7 +120,7 @@ end
 def initialize_new_client
   before do
     initialize_active_campaign
-    @client = ActiveCampaign::Client.new
+    @client = ActiveCampaign::Client.new mash: true, debug: true
   end
 end
 
@@ -107,5 +130,6 @@ def initialize_active_campaign
     config.api_key      = "YOURAPIKEY"
     config.api_output   = "json"
     config.debug        = true
+    config.mash         = true
   end
 end

metadata

@@ -1,99 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: active_campaign
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-24 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: httpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.8
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: uri_template
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   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:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: oj
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: A simple ruby wrapper for the ActiveCampaign API
 email:
 - mikael@zoolutions.se
@@ -101,10 +45,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-version
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -112,8 +57,6 @@ files:
 - active_campaign.gemspec
 - lib/active_campaign.rb
 - lib/active_campaign/.DS_Store
-- lib/active_campaign/arguments.rb
-- lib/active_campaign/authentication.rb
 - lib/active_campaign/client.rb
 - lib/active_campaign/client/campaigns.rb
 - lib/active_campaign/client/contacts.rb
@@ -122,12 +65,6 @@ files:
 - lib/active_campaign/configurable.rb
 - lib/active_campaign/default.rb
 - lib/active_campaign/error.rb
-- lib/active_campaign/response/debugger.rb
-- lib/active_campaign/response/instrumentation.rb
-- lib/active_campaign/response/json_normalizer.rb
-- lib/active_campaign/response/mashify.rb
-- lib/active_campaign/response/parse_json.rb
-- lib/active_campaign/response/raise_error.rb
 - lib/active_campaign/version.rb
 - spec/active_campaign_spec.rb
 - spec/client/contacts_spec.rb
@@ -136,7 +73,7 @@ files:
 - spec/fixtures/contact_sync.json
 - spec/fixtures/contact_view.json
 - spec/fixtures/list_view.json
-- spec/helper.rb
+- spec/spec_helper.rb
 homepage: ''
 licenses:
 - MIT
@@ -147,17 +84,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.1.3
 signing_key: 
 specification_version: 4
 summary: See http://www.activecampaign.com/api/overview.php for more information
@@ -169,5 +106,5 @@ test_files:
 - spec/fixtures/contact_sync.json
 - spec/fixtures/contact_view.json
 - spec/fixtures/list_view.json
-- spec/helper.rb
+- spec/spec_helper.rb
 has_rdoc: 

data/lib/active_campaign/arguments.rb

@@ -1,14 +0,0 @@
-module ActiveCampaign
-
-  # Extracts options from method arguments
-  # @private
-  class Arguments < Array
-    attr_reader :options
-
-    def initialize(args)
-      @options = args.last.is_a?(::Hash) ? args.pop : {}
-      super(args)
-    end
-
-  end
-end

data/lib/active_campaign/authentication.rb

@@ -1,68 +0,0 @@
-module ActiveCampaign
-
-  # Authentication methods for {ActiveCampaign::Client}
-  module Authentication
-
-    # Indicates if the client was supplied  Basic Auth
-    # username and password
-    #
-    # @see http://developer.github.com/v3/#authentication
-    # @return [Boolean]
-    def basic_authenticated?
-      @login && @password
-    end
-
-    # Indicates if the client was supplied an OAuth
-    # access token
-    #
-    # @see http://developer.github.com/v3/#authentication
-    # @return [Boolean]
-    def token_authenticated?
-      !!@access_token
-    end
-
-    # Indicates if the client was supplied an OAuth
-    # access token or Basic Auth username and password
-    #
-    # @see http://developer.github.com/v3/#authentication
-    # @return [Boolean]
-    def user_authenticated?
-      basic_authenticated? || token_authenticated?
-    end
-
-    # Indicates if the client has OAuth Application
-    # client_id and secret credentials to make anonymous
-    # requests at a higher rate limit
-    #
-    # @see http://developer.github.com/v3/#unauthenticated-rate-limited-requests
-    # @return Boolean
-    def application_authenticated?
-      !!application_authentication
-    end
-
-    private
-
-    def application_authentication
-      if @client_id && @client_secret
-        {
-          :client_id     => @client_id,
-          :client_secret => @client_secret
-        }
-      end
-    end
-
-    def login_from_netrc
-      return unless netrc?
-
-      require 'netrc'
-      info = Netrc.read netrc_file
-      netrc_host = URI.parse(api_endpoint).host
-      creds = info[netrc_host]
-      self.login = creds.shift
-      self.password = creds.shift
-    rescue LoadError
-      warn "Please install netrc gem for .netrc support"
-    end
-
-  end
-end

data/lib/active_campaign/response/debugger.rb

@@ -1,42 +0,0 @@
-require 'faraday'
-require 'forwardable'
-
-module ActiveCampaign
-  module Response
-    class Debugger < Faraday::Response::Middleware
-      extend Forwardable
-
-      def initialize(app, logger = nil)
-        super(app)
-        @logger = logger || begin
-          require 'logger'
-          ::Logger.new(STDOUT)
-        end
-      end
-
-      def_delegators :@logger, :debug, :info, :warn, :error, :fatal
-
-      def call(env)
-        info("#{env[:method]} #{env[:url].to_s}")
-        debug('request') { dump_headers(env[:request_headers])  + "\nbody: #{env[:body]}" }
-        super
-      end
-
-      def on_complete(env)
-        info('Status') { env[:status].to_s }
-        debug('response-head') { dump_headers env[:response_headers] }
-        debug('response-body') { env[:body] }
-      end
-
-      private
-
-      def dump_headers(headers)
-        headers.map { |k, v| "#{k}: #{v.inspect}" }.join("\n")
-      end
-    end
-  end
-end
-
-Faraday.register_middleware :middleware, debugger: lambda {
-  ActiveCampaign::Response::Debugger
-}

data/lib/active_campaign/response/instrumentation.rb

@@ -1,33 +0,0 @@
-module ActiveCampaign
-  module Response
-    # Public: Instruments requests using Active Support.
-    #
-    # Measures time spent only for synchronous requests.
-    #
-    # Examples
-    #
-    #   ActiveSupport::Notifications.subscribe('request.faraday') do |name, starts, ends, _, env|
-    #     url = env[:url]
-    #     http_method = env[:method].to_s.upcase
-    #     duration = ends - starts
-    #     $stderr.puts '[%s] %s %s (%.3f s)' % [url.host, http_method, url.request_uri, duration]
-    #   end
-    class Instrumentation < Faraday::Middleware
-      dependency 'active_support/notifications'
-
-      def initialize(app, options = {})
-        super(app)
-        @name = options.fetch(:name, 'request.faraday')
-      end
-
-      def call(env)
-        ActiveSupport::Notifications.instrument(@name, env) do
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
-Faraday.register_middleware :middleware, instrumentation: lambda {
-  ActiveCampaign::Response::Instrumentation
-}

data/lib/active_campaign/response/json_normalizer.rb

@@ -1,49 +0,0 @@
-require 'faraday'
-require 'faraday/response'
-
-module ActiveCampaign
-  module Response
-    class JsonNormalizer < Faraday::Response::Middleware
-      def initialize(app, logger = nil)
-        super(app)
-      end
-
-      def call(environment)
-        @app.call(environment).on_complete do |env|
-          if env[:body].is_a?(Hash)
-            env[:body] = normalize(env[:body])
-          end
-        end
-      end
-
-      private
-
-        def normalize(response)
-          keys, values = keys_values(response)
-
-          if keys.all?{|key| is_numeric?(key) }
-            response[:results] = values
-            keys.each do |key|
-              response.delete(key)
-            end
-          end
-
-          response
-        end
-
-        def is_numeric?(string)
-          string.to_s.match(/\A[+-]?\d+\Z/) == nil ? false : true
-        end
-
-        def keys_values(response)
-          results = results(response)
-          [results.keys, results.values]
-        end
-
-        def results(response)
-          response.reject{|k,v| %w(result_code result_message result_output).include?(k) }
-        end
-    end
-  end
-end
-Faraday.register_middleware :response, json_normalizer: lambda { ActiveCampaign::Response::JsonNormalizer }

data/lib/active_campaign/response/mashify.rb

@@ -1,40 +0,0 @@
-require 'faraday'
-
-module ActiveCampaign
-  module Response
-
-    # Public: Converts parsed response bodies to a Hashie::Mash if they were of
-    # Hash or Array type.
-    class Mashify < Faraday::Response::Middleware
-      attr_accessor :mash_class
-
-      class << self
-        attr_accessor :mash_class
-      end
-
-      dependency do
-        require 'hashie/mash'
-        self.mash_class = ::Hashie::Mash
-      end
-
-      def initialize(app = nil, options = {})
-        super(app)
-        self.mash_class = options[:mash_class] || self.class.mash_class
-      end
-
-      def parse(body)
-        case body
-        when Hash
-          mash_class.new(body)
-        when Array
-          body.map { |item| parse(item) }
-        else
-          body
-        end
-      end
-    end
-  end
-end
-Faraday.register_middleware :response, mashify: lambda {
-  ActiveCampaign::Response::Mashify
-}

data/lib/active_campaign/response/parse_json.rb

@@ -1,83 +0,0 @@
-module ActiveCampaign
-  module Response
-    # Public: Parse response bodies as Oj.
-    class ParseJson < Faraday::Response::Middleware
-      CONTENT_TYPE = 'Content-Type'.freeze
-      MIME_TYPE = 'application/json'.freeze
-      BRACKETS = %w- [ { -
-      WHITESPACE = [ " ", "\n", "\r", "\t" ]
-
-      dependency do
-        require 'oj' unless defined?(::Oj)
-      end
-
-      def parser
-        lambda { |body|
-          ::Oj.load body unless body.strip.empty?
-        }
-      end
-
-      def initialize(app = nil, options = {})
-        super(app)
-        @options = options
-        @content_types = Array(options[:content_type])
-      end
-
-      def call(environment)
-
-
-        @app.call(environment).on_complete do |env|
-          process_response(env)
-        end
-      end
-
-      def process_response(env)
-        old_type = env[:response_headers][CONTENT_TYPE].to_s
-        new_type = MIME_TYPE.dup
-        new_type << ';' << old_type.split(';', 2).last if old_type.index(';')
-        env[:response_headers][CONTENT_TYPE] = new_type
-
-        env[:raw_body] = env[:body] if preserve_raw?(env)
-        env[:body] = parse(env[:body])
-      end
-
-      def parse(body)
-        parser.call(body)
-      end
-
-      def response_type(env)
-        type = env[:response_headers][CONTENT_TYPE].to_s
-        type = type.split(';', 2).first if type.index(';')
-        type
-      end
-
-      def process_response_type?(type)
-        @content_types.empty? or @content_types.any? { |pattern|
-          pattern.is_a?(Regexp) ? type =~ pattern : type == pattern
-        }
-      end
-
-      def parse_response?(env)
-        env[:body].respond_to?(:to_str) &&
-        BRACKETS.include?(first_char(env[:body]))
-      end
-
-      def preserve_raw?(env)
-        env[:request].fetch(:preserve_raw, @options[:preserve_raw])
-      end
-
-      def first_char(body)
-        idx = -1
-        begin
-          char = body[idx += 1]
-          char = char.chr if char
-        end while char and WHITESPACE.include? char
-        char
-      end
-
-    end
-  end
-end
-Faraday.register_middleware :response, parse_json: lambda {
-  ActiveCampaign::Response::ParseJson
-}

data/lib/active_campaign/response/raise_error.rb

@@ -1,24 +0,0 @@
-require 'faraday'
-require 'active_campaign/error'
-
-module ActiveCampaign
-  # Faraday response middleware
-  module Response
-
-    # This class raises an ActiveCampaign-flavored exception based
-    # HTTP status codes returned by the API
-    class RaiseError < Faraday::Response::Middleware
-
-      private
-
-      def on_complete(response)
-        if error = ActiveCampaign::Error.from_response(response)
-          raise error
-        end
-      end
-    end
-  end
-end
-Faraday.register_middleware :response, raise_error: lambda {
-  ActiveCampaign::Response::RaiseError
-}