active_campaign 0.0.12 → 0.1.1

data/lib/active_campaign/response/parse_json.rb

@@ -0,0 +1,83 @@
+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

@@ -0,0 +1,24 @@
+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
+}

data/lib/active_campaign/version.rb

@@ -1,3 +1,3 @@
 module ActiveCampaign
-  VERSION = "0.0.12"
+  VERSION = "0.1.1"
 end

data/spec/active_campaign_spec.rb

@@ -3,18 +3,18 @@ require 'helper'
 describe ActiveCampaign do
 
   after do
-    ActiveCampaign.reset
+    ActiveCampaign.setup
   end
 
   describe ".respond_to?" do
     it "is true if method exists" do
-      expect(ActiveCampaign.respond_to?(:new, true)).to eq(true)
+      expect(ActiveCampaign.respond_to?(:client, true)).to eq(true)
     end
   end
 
   describe ".new" do
     it "is a ActiveCampaign::Client" do
-      expect(ActiveCampaign.new).to be_a ActiveCampaign::Client
+      expect(ActiveCampaign.client).to be_a ActiveCampaign::Client
     end
   end
 

data/spec/helper.rb

@@ -106,6 +106,6 @@ def initialize_active_campaign
     config.api_endpoint = "https://yourdomain.activehosted.com/"
     config.api_key      = "YOURAPIKEY"
     config.api_output   = "json"
-    config.log_requests = true
+    config.debug        = true
   end
 end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: active_campaign
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.1.1
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httpclient
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: hashie
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.8.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.8.8
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -53,49 +39,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: uri_template
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -109,47 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '2.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '2.14'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: A simple ruby wrapper for the ActiveCampaign API
 email:
 - mikael@zoolutions.se
@@ -159,6 +103,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .ruby-version
 - .travis.yml
 - Gemfile
 - LICENSE.txt
@@ -167,20 +112,23 @@ 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
 - lib/active_campaign/client/lists.rb
 - lib/active_campaign/client/messages.rb
-- lib/active_campaign/configuration.rb
-- lib/active_campaign/connection.rb
+- lib/active_campaign/configurable.rb
+- lib/active_campaign/default.rb
 - lib/active_campaign/error.rb
-- lib/active_campaign/param_validation.rb
-- lib/active_campaign/request.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
-- lib/faraday/response/body_logger.rb
-- lib/faraday/response/json_normalizer.rb
-- lib/faraday/response/raise_active_campaign_error.rb
 - spec/active_campaign_spec.rb
 - spec/client/contacts_spec.rb
 - spec/client/lists_spec.rb

data/lib/active_campaign/configuration.rb

@@ -1,74 +0,0 @@
-require 'faraday'
-require 'active_campaign/version'
-
-module ActiveCampaign
-  module Configuration
-    VALID_OPTIONS_KEYS = [
-      :api_url,
-      :api_key,
-      :api_output,
-      :api_path,
-      :api_action,
-      :list_id,
-      :faraday_config_block,
-      :api_version,
-      :api_endpoint,
-      :proxy,
-      :user_agent,
-      :request_host,
-      :auto_traversal,
-      :adapter,
-      :log_requests,
-      :per_page].freeze
-
-    DEFAULT_ADAPTER        = Faraday.default_adapter
-    DEFAULT_API_VERSION    = 3
-    TEST_URL               = "https://yourdomain.activehosted.com"
-    DEFAULT_API_ENDPOINT   = ENV["ACTIVECAMPAIGN_API_ENDPOINT"] || TEST_URL
-    DEFAULT_API_PATH       = ENV["ACTIVECAMPAIGN_API_PATH"] || "admin/api.php"
-    DEFAULT_API_OUTPUT     = ENV["ACTIVECAMPAIGN_API_OUTPUT"] || "json"
-    DEFAULT_USER_AGENT     = "ActiveCampaign Ruby Gem #{VERSION}".freeze
-    DEFAULT_AUTO_TRAVERSAL = false
-
-    attr_accessor(*VALID_OPTIONS_KEYS)
-
-    def self.extended(base)
-      base.reset
-    end
-
-    def configure
-      yield self
-    end
-
-    def options
-      VALID_OPTIONS_KEYS.inject({}){|o,k| o.merge!(k => send(k)) }
-    end
-
-    def api_endpoint=(value)
-      @api_endpoint = File.join(value, "")
-    end
-
-    def api_key=(value)
-      @api_key = value.chomp
-    end
-
-    def faraday_config(&block)
-      @faraday_config_block = block
-    end
-
-    def reset
-      self.adapter         = DEFAULT_ADAPTER
-      self.api_version     = DEFAULT_API_VERSION
-      self.api_endpoint    = DEFAULT_API_ENDPOINT
-      self.api_path        = DEFAULT_API_PATH
-      self.api_output      = DEFAULT_API_OUTPUT
-      self.list_id         = nil
-      self.proxy           = nil
-      # self.url_params      = {}
-      self.request_host    = nil
-      self.user_agent      = DEFAULT_USER_AGENT
-      self.auto_traversal  = DEFAULT_AUTO_TRAVERSAL
-      self.log_requests    = false
-    end
-  end
-end

data/lib/active_campaign/connection.rb

@@ -1,52 +0,0 @@
-require 'faraday_middleware'
-require 'faraday/response/raise_active_campaign_error'
-require 'faraday/response/body_logger'
-require 'faraday/response/json_normalizer'
-
-module ActiveCampaign
-
-  # @private
-  module Connection
-    private
-
-    def connection(options={})
-      options = {
-        force_urlencoded: true,
-        raw:              false
-      }.merge(options)
-
-      if !proxy.nil?
-        options.merge!(proxy: proxy)
-      end
-
-      # TODO: Don't build on every request
-      connection = Faraday.new(options) do |conn|
-
-        if options[:force_urlencoded]
-          conn.request :url_encoded
-        else
-          conn.request :json
-        end
-
-
-        conn.use Faraday::Response::RaiseActiveCampaignError
-        conn.use FaradayMiddleware::FollowRedirects
-        if api_output == 'json'
-          conn.response :mashify, content_type: /\bjson$/
-          conn.response :json_normalizer
-          conn.response :json, content_type: /\bjson$/
-        end
-        faraday_config_block.call(conn) if faraday_config_block
-        if log_requests
-          conn.response :body_logger
-          conn.use :instrumentation
-        end
-
-        conn.adapter *adapter
-      end
-
-      connection.headers[:user_agent] = user_agent
-      connection
-    end
-  end
-end