active_campaign 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59b2ebc1c3ce763d95f2a26ad53c2a54ffd5dda3
-  data.tar.gz: 988cceabefff6ebfedec608efb5cd78ab30a798e
+  metadata.gz: f959a6cbb68c5711716a5039eaacce4d89e8858d
+  data.tar.gz: 5661a144faa672e737d400d37c8b46dccebf9249
 SHA512:
-  metadata.gz: 7f6ce075309cef38218ecf1c0537a2a5fbf4d10275d794f65accfe3ed295b0dcf03dd29107fe2ebf27bb4b42562dfee6b8b742d7e83095f7811d7a97c1bd6a31
-  data.tar.gz: 2efbfed1749f1b37da4599c8a94d88deeeb2c84a76b7294ed67c904123111270c596162a717d324bc103d36617050ed92c742d83ceed125576f45a4fd2d63a2e
+  metadata.gz: 492bfc8ce519fa91f47a2a86776a0d5611cba71405fa0a6d8a381b9cbbf63ae20be3b750f95a54b7409d0ebd1cf752e1b64a75ca789fa04539009b1a48a9dc17
+  data.tar.gz: 77e704860971e8ee2fc591fc3288a8144ce03dfbb501657eaa0e90c03d663fd9daba04afd313576f7b65516a5d7c217274119d67cf29d3d951ec091631f2fafc

data/.rubocop.yml

@@ -1,6 +1,12 @@
-# AllCops:
-  # Include:
-  # Exclude:
+AllCops:
+  Include:
+    - '**/Rakefile'
+    - '**/lib'
+    - '**/bin'
+    - '**/spec'
+  Exclude:
+    - 'Gemfile.lock'
+    - 'gemfiles/**/*'
 
 Documentation:
   Enabled: false

data/.travis.yml

@@ -1,12 +1,20 @@
-bundler_args: --without development
+sudo: false
+language: ruby
+cache: bundler
+before_install:
+  - rvm get head
+  - gem update --system
+  - gem install bundler
 
 language: ruby
 
 rvm:
   - jruby-19mode
-  - rbx-2.1.1
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.6
-  - 2.2.2
+  - rbx-3
+  - 2.1.8
+  - 2.2.4
+  - 2.3.1
+
+addons:
+  code_climate:
+    repo_token: e199bdc9d2cf5ceaa7e46425f118470e43880940098f815a4c972a923102b12b

data/Gemfile

@@ -5,12 +5,13 @@ gem 'rubysl', '~> 2', platform: :rbx
 
 group :test do
   gem 'pry'
-  gem 'simplecov', '>= 0.9.4'
+  gem 'simplecov'
+  gem 'simplecov-json'
   gem 'rubinius-coverage', platform: :rbx
   gem 'codeclimate-test-reporter', require: false
   gem 'coveralls', require: false
   gem 'rb-fsevent'
-  gem 'rspec', '~> 3.2.0'
+  gem 'rspec', '>= 3.2'
   gem 'vcr'
   gem 'webmock'
   gem 'rubocop'

data/README.md

@@ -33,7 +33,7 @@ client = ::ActiveCampaign::Client.new(
 # 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'
+  config.api_key = 'YOUR-API-KEY' # e.g. 'a4e60a1ba200595d5cc37ede5732545184165e'
 end
 
 ```

data/active_campaign.gemspec

@@ -19,7 +19,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'httpi'
-  spec.add_dependency 'hashie'
-  spec.add_dependency 'activesupport'
   spec.add_dependency 'multi_json'
 end

data/lib/active_campaign.rb

@@ -1,21 +1,17 @@
-require 'active_support'
-require 'active_support/core_ext'
-require 'active_support/core_ext/module/delegation'
 require 'active_campaign/version'
 require 'active_campaign/client'
 require 'active_campaign/configuration'
+require 'active_campaign/core_ext'
 
 module ActiveCampaign
-  extend Configuration
-
   module_function
 
   # 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)
+    unless defined?(@client) && @client.same_options?(config)
+      @client = ActiveCampaign::Client.new(config)
     end
 
     @client
@@ -24,13 +20,25 @@ module ActiveCampaign
   # @private
   def respond_to_missing?(method_name, include_private = false)
     client.respond_to?(method_name, include_private)
-  end if RUBY_VERSION >= '1.9'
+  end
 
   # @private
   def respond_to?(method_name, include_private = false)
     client.respond_to?(method_name, include_private) || super
   end if RUBY_VERSION < '1.9'
 
+  def config
+    @config ||= Configuration.new
+  end
+
+  def configure
+    yield config if block_given?
+  end
+
+  def reset!
+    @config = Configuration.new
+  end
+
   private
 
   def method_missing(method_name, *args, &block)

data/lib/active_campaign/client.rb

@@ -1,6 +1,4 @@
 require 'httpi'
-require 'hashie'
-
 require 'active_campaign/method_creator'
 
 require 'active_campaign/client/campaigns'
@@ -17,6 +15,7 @@ module ActiveCampaign
   class Client
     include Comparable
     extend ActiveCampaign::MethodCreator
+    extend Forwardable
 
     include ActiveCampaign::Client::Campaigns
     include ActiveCampaign::Client::Contacts
@@ -28,14 +27,11 @@ module ActiveCampaign
     include ActiveCampaign::Client::Tracks
     include ActiveCampaign::Client::Users
 
-    delegate :api_key, :api_output, :api_endpoint, :user_agent, :log, :log_level,
-             :logger, :mash, :debug, to: :config
-
-    attr_accessor :config
+    def_delegators :@config, :api_key, :api_output, :api_endpoint,
+                   :user_agent, :log, :log_level, :logger, :mash, :debug
 
-    def initialize(configuration = nil)
-      self.config = configuration.is_a?(OpenStruct) ? configuration : OpenStruct.new(configuration)
-      self.config ||= ActiveCampaign.configuration
+    def initialize(options = {})
+      @config ||= ActiveCampaign.config.merge(options)
     end
 
     # Compares client options to a Hash of requested options
@@ -43,7 +39,7 @@ module ActiveCampaign
     # @param opts [Hash] Options to compare with current client options
     # @return [Boolean]
     def same_options?(other_config)
-      config.to_h.sort == other_config.to_h.sort
+      @config.to_h.sort == other_config.to_h.sort
     end
 
     # Make a HTTP GET request
@@ -56,12 +52,12 @@ module ActiveCampaign
     end
 
     def hash
-      [config, Client].hash
+      [@config, Client].hash
     end
 
     def <=>(other)
       other.is_a?(ActiveCampaign::Client) &&
-        config.to_h.sort <=> other.config.to_h.sort
+        @config.to_h.sort <=> other.config.to_h.sort
     end
 
     # Make a HTTP POST request
@@ -79,6 +75,7 @@ module ActiveCampaign
       req = create_request method, api_method, data
       response = HTTPI.send(method, req)
       response = JSON.parse(response.body)
+
       normalize(response)
     end
 
@@ -119,12 +116,11 @@ module ActiveCampaign
     def normalize(response)
       keys, values = keys_values(response)
       if keys.all? { |key| numeric?(key) }
-        response[:results] = values
+        response['results'] = values
         keys.each { |key| response.delete(key) }
       end
 
-      return Hashie::Mash.new response if mash
-      ActiveSupport::HashWithIndifferentAccess.new(response)
+      response
     end
 
     def numeric?(string)

data/lib/active_campaign/client/campaigns.rb

@@ -1,21 +1,21 @@
 module ActiveCampaign
   class Client
     module Campaigns
-      GET_METHODS = %w(
+      GET_METHODS ||= %w(
         create delete_list delete list paginator report_bounce_list
         report_bounce_totals report_forward_list report_forward_totals
         report_link_list report_link_totals report_open_list report_open_totals
         report_totals report_unopen_list report_unsubscription_list
         report_unsubscription_totals send status
-      ).freeze unless defined?(GET_METHODS)
-      POST_METHODS = %w(create).freeze unless defined?(POST_METHODS)
-
-      extend ActiveSupport::Concern
+      ).freeze
+      POST_METHODS ||= %w(create).freeze
 
       # TODO: Create proper methods with parameter validation and possible
       #       naming fixes since this is one the worst APIs I have ever worked with.
-      included do
-        define_api_calls(:campaign, GET_METHODS, POST_METHODS)
+      def self.included(base)
+        base.class_exec do
+          define_api_calls(:campaign, GET_METHODS, POST_METHODS)
+        end
       end
     end
   end

data/lib/active_campaign/client/contacts.rb

@@ -1,25 +1,23 @@
-require 'active_support'
-
 module ActiveCampaign
   class Client
     module Contacts
-      GET_METHODS = %w(
+      GET_METHODS ||= %w(
         automation_list delete_list delete list paginator view view_email
         view_hash note_delete
-      ).freeze unless defined?(GET_METHODS)
+      ).freeze
 
-      POST_METHODS = %w(
+      POST_METHODS ||= %w(
         add edit sync tag_add tag_remove
         note_edit note_add
-      ).freeze unless defined?(POST_METHODS)
-
-      extend ActiveSupport::Concern
+      ).freeze
 
       # TODO: Create proper methods with parameter validation and possible naming
       #       fixes since this is one the worst APIs I have ever worked with.
-      included do
-        %w(contact subscriber).each do |name|
-          define_api_calls(name, GET_METHODS, POST_METHODS)
+      def self.included(base)
+        base.class_exec do
+          %w(contact subscriber).each do |name|
+            define_api_calls(name, GET_METHODS, POST_METHODS)
+          end
         end
       end
     end

data/lib/active_campaign/client/deals.rb

@@ -1,20 +1,20 @@
 module ActiveCampaign
   class Client
     module Deals
-      GET_METHODS = %w(get list pipeline_list stage_list).freeze unless defined?(GET_METHODS)
+      GET_METHODS ||= %w(get list pipeline_list stage_list).freeze
 
-      POST_METHODS = %w(
+      POST_METHODS ||= %w(
         add delete edit note_add note_edit pipeline_add pipeline_delete
         pipeline_edit stage_add stage_delete stage_edit task_add task_edit
         tasktype_add tasktype_delete tasktype_edit
-      ).freeze unless defined?(POST_METHODS)
-
-      extend ActiveSupport::Concern
+      ).freeze
 
       # TODO: Create proper methods with parameter validation and possible
       # naming fixes since this is one the worst APIs I have ever worked with.
-      included do
-        define_api_calls(:deal, GET_METHODS, POST_METHODS)
+      def self.included(base)
+        base.class_exec do
+          define_api_calls(:deal, GET_METHODS, POST_METHODS)
+        end
       end
     end
   end

data/lib/active_campaign/client/forms.rb

@@ -1,14 +1,14 @@
 module ActiveCampaign
   class Client
     module Forms
-      GET_METHODS = %w(getforms html).freeze unless defined?(GET_METHODS)
-
-      extend ActiveSupport::Concern
+      GET_METHODS ||= %w(getforms html).freeze
 
       # TODO: Create proper methods with parameter validation and possible
       # naming fixes since this is one the worst APIs I have ever worked with.
-      included do
-        define_api_calls(:form, GET_METHODS)
+      def self.included(base)
+        base.class_exec do
+          define_api_calls(:form, GET_METHODS)
+        end
       end
     end
   end

data/lib/active_campaign/client/groups.rb

@@ -1,18 +1,18 @@
 module ActiveCampaign
   class Client
     module Groups
-      GET_METHODS = %w(
+      GET_METHODS ||= %w(
         delete delete_list list view
-      ).freeze unless defined?(GET_METHODS)
+      ).freeze
 
-      POST_METHODS = %w(add edit) unless defined?(POST_METHODS)
-
-      extend ActiveSupport::Concern
+      POST_METHODS ||= %w(add edit).freeze
 
       # TODO: Create proper methods with parameter validation and possible
       # naming fixes since this is one the worst APIs I have ever worked with.
-      included do
-        define_api_calls(:group, GET_METHODS, POST_METHODS)
+      def self.included(base)
+        base.class_exec do
+          define_api_calls(:group, GET_METHODS, POST_METHODS)
+        end
       end
     end
   end

data/lib/active_campaign/client/lists.rb

@@ -1,17 +1,19 @@
 module ActiveCampaign
   class Client
     module Lists
-      GET_METHODS = %w(
-        delete_list delete field_add field_delete
-        field_edit field_view list paginator view
-      ).freeze unless defined?(GET_METHODS)
-      POST_METHODS = %w(add edit).freeze unless defined?(POST_METHODS)
-      DELETE_METHODS = [].freeze unless defined?(DELETE_METHODS)
+      GET_METHODS ||= %w(
+        delete_list delete field_delete
+        field_view list paginator view
+      ).freeze
+      POST_METHODS ||= %w(
+        add edit field_add field_edit
+      ).freeze
+      DELETE_METHODS ||= [].freeze
 
-      extend ActiveSupport::Concern
-
-      included do
-        define_api_calls(:list, GET_METHODS, POST_METHODS, DELETE_METHODS)
+      def self.included(base)
+        base.class_exec do
+          define_api_calls(:list, GET_METHODS, POST_METHODS, DELETE_METHODS)
+        end
       end
     end
   end

data/lib/active_campaign/client/messages.rb

@@ -1,20 +1,20 @@
 module ActiveCampaign
   class Client
     module Messages
-      GET_METHODS = %w(
+      GET_METHODS ||= %w(
         delete_list delete list template_add template_delete_list
         template_delete template_edit template_export template_import
         template_list template_view view
-      ).freeze unless defined?(GET_METHODS)
+      ).freeze
 
-      POST_METHODS = %w(add edit).freeze unless defined?(POST_METHODS)
-
-      extend ActiveSupport::Concern
+      POST_METHODS ||= %w(add edit).freeze
 
       # TODO: Create proper methods with parameter validation and possible
       # naming fixes since this is one the worst APIs I have ever worked with.
-      included do
-        define_api_calls(:message, GET_METHODS, POST_METHODS)
+      def self.included(base)
+        base.class_exec do
+          define_api_calls(:message, GET_METHODS, POST_METHODS)
+        end
       end
     end
   end

data/lib/active_campaign/client/tracks.rb

@@ -1,21 +1,17 @@
 module ActiveCampaign
   class Client
     module Tracks
-      GET_METHODS = %w(event_list site_list).freeze unless defined?(GET_METHODS)
-      PUT_METHODS = %w(site_whitelist_add).freeze unless defined?(PUT_METHODS)
-      POST_METHODS = %w(
-        event_status_edit site_status_edit event_add
-      ).freeze unless defined?(POST_METHODS)
-      DELETE_METHODS = %w(
-        event_delete site_whitelist_delete
-      ).freeze unless defined?(DELETE_METHODS)
-
-      extend ActiveSupport::Concern
+      GET_METHODS ||= %w(event_list site_list).freeze
+      PUT_METHODS ||= %w(site_whitelist_add).freeze
+      POST_METHODS ||= %w(event_status_edit site_status_edit event_add).freeze
+      DELETE_METHODS ||= %w(event_delete site_whitelist_delete).freeze
 
       # TODO: Create proper methods with parameter validation and possible
       # naming fixes since this is one the worst APIs I have ever worked with.
-      included do
-        define_api_calls(:track, GET_METHODS, POST_METHODS, DELETE_METHODS, PUT_METHODS)
+      def self.included(base)
+        base.class_exec do
+          define_api_calls(:track, GET_METHODS, POST_METHODS, DELETE_METHODS, PUT_METHODS)
+        end
       end
     end
   end