active_campaign 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 773816e174638b5fa75102b031ac13ed726e9112
-  data.tar.gz: 005d17ce9301bcadb204018be4154fb9990916ab
+  metadata.gz: f49cb05b48c6d485e7aeef4c124e5ffc4a497065
+  data.tar.gz: eb82879f1a6a707ee4ca92a66ef0220b07e60048
 SHA512:
-  metadata.gz: 4facfd3b06ece6db14864a65124cb96e8fe73bd670544bdef32ff0f07982de5ce37ef6d78f48a6b37f83e6f8d11d4817d9b729f0e2c3aa6f09fe659a79c5ccde
-  data.tar.gz: 640e94884732f0f66605c9777b29b1356d16d3178d4d699f7b6b572f2c4ba9a42ebf78a3a02da071cbce0afaae14003960d5bae35cbad8331764f212dc3aa913
+  metadata.gz: 920f478ce29086f94efdd3787be205f81b7b4118bf48ca1cd2d23c3470afaa98f7939b7e9cc02a0aace15097c871116ee780bb7e91c47e9cecedb95c52a4d70c
+  data.tar.gz: 2177d9dc0f1b73e32edf76cbd96a56d4bb2dc3354be9d3c223338d1a06bec2dfacdb137d77dca1e64a4b217f721af4c217db4bc9ef164f2bda2b5fa871e1e74a

data/.codeclimate.yml

@@ -0,0 +1,4 @@
+languages:
+  Ruby: true
+exclude_paths:
+  - 'spec/cassettes/**'

data/.rspec

@@ -1,2 +1,3 @@
+--format Fuubar
 --color
---order random
+--order random

data/.rubocop.yml

@@ -0,0 +1,19 @@
+# AllCops:
+  # Include:
+  # Exclude:
+
+Documentation:
+  Enabled: false
+
+ParameterLists:
+  Enabled: true
+  Max: 5
+  CountKeywordArgs: false
+
+LineLength:
+  Enabled: true
+  Max: 107
+
+IfUnlessModifier:
+  Enabled: false
+  MaxLineLength: 79

data/.travis.yml

@@ -1,14 +1,12 @@
-before_script:
-  - chmod 600 spec/fixtures/.netrc
 bundler_args: --without development
+
 language: ruby
+
 rvm:
-  - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
   - rbx-2.1.1
-  - 1.8.7
   - 1.9.2
   - 1.9.3
-  - 2.0.0
+  - 2.0.0
+  - 2.1.6
+  - 2.2.2

data/Gemfile

@@ -1,23 +1,22 @@
 source 'https://rubygems.org'
 
-gem 'rake'
-gem 'activesupport'
 gem 'rubysl', '~> 2', platform: :rbx
 
 group :development do
-  gem 'awesome_print', require: 'ap'
-  gem 'pry'
+  gem 'pry', platform: :mri
 end
 
 group :test do
-  gem 'simplecov', ">= 0.8.0.pre2"
-  gem "rubinius-coverage", platform: :rbx
-  gem "codeclimate-test-reporter", require: false
+  gem 'simplecov', '>= 0.9.4'
+  gem 'rubinius-coverage', platform: :rbx
+  gem 'codeclimate-test-reporter', require: false
   gem 'coveralls', require: false
-  gem 'rb-fsevent', '~> 0.9'
-  gem 'rspec', '~> 2.14.0'
-  gem 'vcr', '~> 2.8.0'
-  gem 'webmock', '~> 1.15.0'
+  gem 'rb-fsevent'
+  gem 'rspec', '~> 3.2.0'
+  gem 'vcr'
+  gem 'webmock'
+  gem 'rubocop'
+  gem 'fuubar'
 end
 
 gemspec

data/README.md

@@ -24,6 +24,21 @@ Or install it yourself as:
 
 Read their [API documentation](http://www.activecampaign.com/api/overview.php)for how to use this gem.
 
+```ruby
+# To setup the client
+client = ::ActiveCampaign::Client.new(
+        api_endpoint: 'YOUR-ENDPOINT', # e.g. 'https://yourendpoint.api-us1.com'
+        api_key: 'YOUR-API-KEY') # e.g. 'a4e60a1ba200595d5cc37ede5732545184165e'
+
+# or configure globally for all clients
+::ActiveCampaign.configure do |config|
+  config.api_endpoint = 'YOUR-ENDPOINT', # e.g. 'https://yourendpoint.api-us1.com'
+  config.api_key = 'YOUR-API-KEY') # e.g. 'a4e60a1ba200595d5cc37ede5732545184165e'
+end
+
+```
+
+
 ```ruby
 # To fetch all lists
 ActiveCampaign.list_list ids: 'all'
@@ -34,12 +49,12 @@ ActiveCampaign.list_list ids: 'all'
 # you have to resort to some really ugly hacks. Due to the form serialization # type of API (read not a object oriented REST API) you need to translate
 # something pretty into something horrific when it comes to the parameters.
 ActiveCampaign.contact_sync({
-                                    "id" => user.active_campaign_contact_id,
-                                 "email" => user.email,
-                            "first_name" => user.first,
-                             "last_name" => user.last,
-    "p[#{user.active_campaign_list_id}]" => user.active_campaign_list_id,
-"status[#{user.active_campaign_list_id}" => user.receive_emails ? 1 : 2
+                                     "id" => user.active_campaign_contact_id,
+                                  "email" => user.email,
+                             "first_name" => user.first,
+                              "last_name" => user.last,
+     "p[#{user.active_campaign_list_id}]" => user.active_campaign_list_id,
+"status[#{user.active_campaign_list_id}]" => user.receive_emails ? 1 : 2
 })
 
 # Another example of syncing a contact:

data/Rakefile

@@ -1 +1,14 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
+
+desc 'Run RuboCop on the lib directory'
+RuboCop::RakeTask.new(:style) do |task|
+  task.formatters = ['fuubar']
+  task.options = %w(--display-cop-names)
+  task.fail_on_error = true
+end
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: [:style, :spec]

data/active_campaign.gemspec

@@ -4,20 +4,22 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'active_campaign/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "active_campaign"
+  spec.name          = 'active_campaign'
   spec.version       = ActiveCampaign::VERSION
-  spec.authors       = ["Mikael Henriksson"]
-  spec.email         = ["mikael@zoolutions.se"]
-  spec.description   = %q{A simple ruby wrapper for the ActiveCampaign API}
-  spec.summary       = %q{See http://www.activecampaign.com/api/overview.php for more information}
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.authors       = ['Mikael Henriksson']
+  spec.email         = ['mikael@zoolutions.se']
+  spec.description   = 'A simple ruby wrapper for the ActiveCampaign API'
+  spec.summary       = 'See http://www.activecampaign.com/api/overview.php for more information'
+  spec.homepage      = ''
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "httpi"
-  spec.add_dependency "hashie"
+  spec.add_dependency 'httpi'
+  spec.add_dependency 'hashie'
+  spec.add_dependency 'activesupport'
+  spec.add_dependency 'multi_json'
 end

data/circle.yml

@@ -0,0 +1,16 @@
+machine:
+  ruby:
+    version: 2.2.2
+
+dependencies:
+  bundler:
+    without: [production, staging, benchmarking]
+  cache_directories:
+    - vendor/bundle_java
+    - vendor/bundle
+  override:
+    - rvm-exec 2.2.2 bundle install
+
+test:
+  override:
+    - rvm-exec 2.2.2 bundle exec rspec

data/lib/active_campaign.rb

@@ -1,41 +1,39 @@
-# require 'active_support/core_ext'
+require 'active_support'
+require 'active_support/core_ext'
+require 'active_support/core_ext/module/delegation'
 require 'active_campaign/client'
-require 'active_campaign/default'
+require 'active_campaign/configuration'
 
 module ActiveCampaign
+  extend Configuration
 
-  class << self
+  module_function
 
-    include ActiveCampaign::Configurable
-
-    # API client based on configured options {Configurable}
-    #
-    # @return [ActiveCampaign::Client] API wrapper
-    def client
-      unless defined?(@client) && @client.same_options?(options)
-        @client = ActiveCampaign::Client.new(options)
-      end
-
-      @client
+  # API client based on configured options {Configurable}
+  #
+  # @return [ActiveCampaign::Client] API wrapper
+  def client
+    unless defined?(@client) && @client.same_options?(configuration)
+      @client = ActiveCampaign::Client.new(configuration)
     end
 
-    # @private
-    def respond_to_missing?(method_name, include_private=false)
-      client.respond_to?(method_name, include_private)
-    end if RUBY_VERSION >= "1.9"
+    @client
+  end
+
+  # @private
+  def respond_to_missing?(method_name, include_private = false)
+    client.respond_to?(method_name, include_private)
+  end if RUBY_VERSION >= '1.9'
 
-    # @private
-    def respond_to?(method_name, include_private=false)
-      client.respond_to?(method_name, include_private) || super
-    end if RUBY_VERSION < "1.9"
+  # @private
+  def respond_to?(method_name, include_private = false)
+    client.respond_to?(method_name, include_private) || super
+  end if RUBY_VERSION < '1.9'
 
   private
 
-    def method_missing(method_name, *args, &block)
-      return super unless client.respond_to?(method_name)
-      client.send(method_name, *args, &block)
-    end
+  def method_missing(method_name, *args, &block)
+    return super unless client.respond_to?(method_name)
+    client.send(method_name, *args, &block)
   end
-
-  ActiveCampaign.setup
 end

data/lib/active_campaign/client.rb

@@ -1,33 +1,36 @@
-require 'active_campaign/configurable'
+require 'httpi'
+require 'hashie'
+
 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 Comparable
     include ActiveCampaign::Client::Contacts
     include ActiveCampaign::Client::Lists
     include ActiveCampaign::Client::Campaigns
 
-    def initialize(options = {})
-      ActiveCampaign::Configurable.keys.each do |key|
-        instance_variable_set(:"@#{key}", options[key] ||
-          ActiveCampaign.instance_variable_get(:"@#{key}"))
-      end
+    delegate :api_key, :api_output, :api_endpoint, :user_agent, :log, :log_level,
+             :logger, :mash, :debug, to: :config
+
+    attr_accessor :config
+
+    def initialize(configuration = nil)
+      self.config = configuration
+      self.config ||= ActiveCampaign.configuration
     end
 
     # Compares client options to a Hash of requested options
     #
     # @param opts [Hash] Options to compare with current client options
     # @return [Boolean]
-    def same_options?(opts)
-      opts.hash == options.hash
+    def same_options?(other_config)
+      config.to_h.sort == other_config.to_h.sort
     end
 
-      # Make a HTTP GET request
+    # Make a HTTP GET request
     #
     # @param url [String] The path, relative to {#api_endpoint}
     # @param options [Hash] Query and header params for request
@@ -36,6 +39,15 @@ module ActiveCampaign
       request :get, api_method, options
     end
 
+    def hash
+      [config, Client].hash
+    end
+
+    def <=>(other)
+      other.is_a?(ActiveCampaign::Client) &&
+        config.to_h.sort <=> other.config.to_h.sort
+    end
+
     # Make a HTTP POST request
     #
     # @param url [String] The path, relative to {#api_endpoint}
@@ -47,81 +59,69 @@ module ActiveCampaign
 
     private
 
-      def request(method, api_method, data)
-        req = create_request method, api_method, data
-
-        response = HTTPI.send(method, req)
-        response = JSON.parse(response.body)
-        normalize(response)
-      end
-
+    def request(method, api_method, data)
+      req = create_request method, api_method, data
+      response = HTTPI.send(method, req)
+      response = JSON.parse(response.body)
+      normalize(response)
+    end
 
-      def create_request(method, api_method, options = {})
-        request = HTTPI::Request.new url: File.join(api_endpoint, api_path)
+    def create_request(method, api_method, options = {})
+      req = HTTPI::Request.new(
+        url: File.join(api_endpoint),
+        headers: { 'User-Agent' => user_agent },
+        query: query(method, api_method, options),
+        body: body(method, api_method, options)
+      )
+      req.auth.ssl.verify_mode = :none
+      req.auth.ssl.ssl_version = :TLSv1
+      req
+    end
 
-        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)
+    def query(method, api_method, options = {})
+      q = options.delete(:query) { Hash.new }
+      q.merge!(api_key: api_key,
+               api_action: api_method.to_s,
+               api_output: api_output)
 
-        request
-      end
+      q.merge!(options) if method == :get
 
-      def query(method, api_method, options = {})
-        q = options.delete(:query) { Hash.new }
-        q.merge!({
-          :api_key => api_key,
-          :api_action => api_method.to_s,
-          :api_output => api_output
-        })
+      q
+    end
 
-        if method == :get
-          q.merge!(options)
-        end
+    def body(method, _api_method, options = {})
+      return nil unless method == :post
 
-        q
+      fields = options.delete(:fields) { Hash.new }
+      options[:field] = fields.inject({}) do |hash, (k, v)|
+        hash.merge("%#{k}%,0" => v)
       end
 
-      def body(method, api_method, options = {})
-        return nil unless method == :post
-
-        fields = options.delete(:fields){ Hash.new }
-        options[:field] = fields.inject({}) do |hash, (k,v)|
-          hash.merge("%#{k}%,0" => v)
-        end
+      options.to_query
+    end
 
-        options.to_query
+    def normalize(response)
+      keys, values = keys_values(response)
+      if keys.all? { |key| numeric?(key) }
+        response[:results] = values
+        keys.each { |key| response.delete(key) }
       end
 
-      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
-
-        if mash
-          Hashie::Mash.new response
-        else
-          ActiveSupport::HashWithIndifferentAccess.new(response)
-        end
-
-      end
+      return Hashie::Mash.new response if mash
+      ActiveSupport::HashWithIndifferentAccess.new(response)
+    end
 
-      def is_numeric?(string)
-        string.to_s.match(/\A[+-]?\d+\Z/) == nil ? false : true
-      end
+    def 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 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
+    def results(response)
+      response.reject { |k, _v| %w(result_code result_message result_output).include?(k) }
+    end
   end
-end
+end