active_campaign 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f959a6cbb68c5711716a5039eaacce4d89e8858d
-  data.tar.gz: 5661a144faa672e737d400d37c8b46dccebf9249
+SHA256:
+  metadata.gz: 86da02320b2b67aa96ddda701ae0612c6817070e0cfc57678b39c548f3643d19
+  data.tar.gz: 117c5fe9baa8bd9b5b34e117800ea73776671c6e9e341cf3d184f98dffac408d
 SHA512:
-  metadata.gz: 492bfc8ce519fa91f47a2a86776a0d5611cba71405fa0a6d8a381b9cbbf63ae20be3b750f95a54b7409d0ebd1cf752e1b64a75ca789fa04539009b1a48a9dc17
-  data.tar.gz: 77e704860971e8ee2fc591fc3288a8144ce03dfbb501657eaa0e90c03d663fd9daba04afd313576f7b65516a5d7c217274119d67cf29d3d951ec091631f2fafc
+  metadata.gz: 36f4861c214ac22085eab111f9bb8336fe5a863b67e699d8b5ec4aa45d475d36b82dcd0709d803898be90de30be40f057557158d260a9a8008a69d3e69b31630
+  data.tar.gz: 41916f0a0fa99b4b734b5a71fd458d395827c6b8ea67af7bf3af039a3a317c9791cb0beccd05a6701b2fe7f65ac514e216140941e6a87b3ca4397e7ff753dda0

data/.codeclimate.yml

@@ -1,4 +1,26 @@
-languages:
-  Ruby: true
+---
+engines:
+  bundler-audit:
+    enabled: false
+  duplication:
+    enabled: true
+    config:
+      languages:
+        - ruby
+  fixme:
+    enabled: true
+  rubocop:
+    enabled: true
+ratings:
+  paths:
+    - Gemfile.lock
+    - "**.css"
+    - "**.inc"
+    - "**.js"
+    - "**.jsx"
+    - "**.module"
+    - "**.php"
+    - "**.py"
+    - "**.rb"
 exclude_paths:
-  - 'spec/cassettes/**'
+  - spec/

data/.rubocop.yml

@@ -1,25 +1,37 @@
 AllCops:
   Include:
-    - '**/Rakefile'
-    - '**/lib'
-    - '**/bin'
-    - '**/spec'
+    - 'Rakefile'
+    - 'lib/**/*'
+    - 'bin/**/*'
+    - 'spec/**/*'
   Exclude:
     - 'Gemfile.lock'
+    - 'Gemfile'
     - 'gemfiles/**/*'
+    - '**/*.json'
+    - '**/*.yml'
+  TargetRubyVersion: 2.4
 
 Documentation:
   Enabled: false
 
-ParameterLists:
+Metrics/BlockLength:
+  Enabled: true
+  Exclude:
+    - 'spec/**/*_spec.rb'
+
+Metrics/MethodLength:
+  CountComments: false  # count full line comments?
+  Max: 12
+
+Metrics/ParameterLists:
   Enabled: true
   Max: 5
   CountKeywordArgs: false
 
-LineLength:
+Metrics/LineLength:
   Enabled: true
-  Max: 107
+  Max: 120
 
-IfUnlessModifier:
+Style/IfUnlessModifier:
   Enabled: false
-  MaxLineLength: 79

data/.simplecov

@@ -0,0 +1,9 @@
+require 'simplecov-json'
+
+SimpleCov.formatters = [
+  SimpleCov::Formatter::HTMLFormatter,
+  SimpleCov::Formatter::JSONFormatter,
+]
+
+SimpleCov.command_name 'RSpec'
+SimpleCov.start

data/.travis.yml

@@ -1,20 +1,40 @@
-sudo: false
+env:
+  matrix:
+    - COV=false
+  global:
+    - CC_TEST_REPORTER_ID=8ba417e8bf62f355529f4f11b42114f99e073459a7424e79845d64ab95e52b76
+    - GIT_COMMITTED_AT=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then git log -1 --pretty=format:%ct; else git log -1 --skip 1 --pretty=format:%ct; fi)
+dist: trusty
+sudo: required
 language: ruby
 cache: bundler
+
 before_install:
   - rvm get head
   - gem update --system
   - gem install bundler
-
-language: ruby
-
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+install:
+  - bundle install -j8 -r3
+before_script:
+  - ./cc-test-reporter before-build
+script:
+  - if [[ "${COV}" = "true" ]]; then bundle exec rubocop; fi;
+  - bundle exec rspec spec
+after_script:
+  - if [[ "${COV}" = "true" ]]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi;
 rvm:
-  - jruby-19mode
-  - rbx-3
-  - 2.1.8
-  - 2.2.4
-  - 2.3.1
+  - jruby-9.1.8.0
+env: COV=false
+
+matrix:
+  fast_finish: true
+  include:
+    - rvm: 2.5.1
+      env: COV=true
 
-addons:
-  code_climate:
-    repo_token: e199bdc9d2cf5ceaa7e46425f118470e43880940098f815a4c972a923102b12b
+notifications:
+  email:
+    recipients:
+      - mikael@zoolutions.se

data/Changelog.md

@@ -1,7 +1,17 @@
-# 0.1.12
+## 0.1.14
+
+- #10 bugs fixes
+- the http method of list_field_add and list_field_edit should be POST
+- Fix method_missing for ActiveCampaign module (#27)
+- Add Tags client prototype (#17)
+- Add automation_contact_remove post method (#25)
+
+## 0.1.13
+
 - Allow ActiveCampaign::Client.new to accept a Hash
 
-# 0.1.11
+## 0.1.11
+
 - Adds Deals
 - Adds Forms
 - Adds Groups
@@ -9,7 +19,8 @@
 - Adds Tracks
 - Adds Campaigns
 
-# 0.1.10
+## 0.1.10
+
 - Added tagging of lists and contacts
 - Internally: Upgraded gems and RSpec syntax
 - Internally: Added rubocop

data/Gemfile

@@ -1,21 +1,4 @@
-source 'https://rubygems.org'
-
-gem 'rake'
-gem 'rubysl', '~> 2', platform: :rbx
-
-group :test do
-  gem 'pry'
-  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'
-  gem 'vcr'
-  gem 'webmock'
-  gem 'rubocop'
-  gem 'fuubar'
-end
+# frozen_string_literal: true
 
+source 'https://rubygems.org'
 gemspec

data/README.md

@@ -1,4 +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/mhenrixon/active_campaign/badge.svg)](https://coveralls.io/r/mhenrixon/active_campaign) [![Code Climate](https://codeclimate.com/repos/525d012ec7f3a335f101a3d6/badges/74d14b105bf9f769f10f/gpa.png)](https://codeclimate.com/repos/525d012ec7f3a335f101a3d6/feed)
+[![Build Status](https://travis-ci.org/mhenrixon/active_campaign.svg?branch=master)](https://travis-ci.org/mhenrixon/active_campaign)[![Code Climate](https://codeclimate.com/github/mhenrixon/active_campaign/badges/gpa.svg)](https://codeclimate.com/github/mhenrixon/active_campaign)[![Test Coverage](https://codeclimate.com/github/mhenrixon/active_campaign/badges/coverage.svg)](https://codeclimate.com/github/mhenrixon/active_campaign/coverage)
 # Active::Campaign::Ruby
 
 A simple wrapper for the ActiveCampaign API. Since their API seems to be
@@ -27,12 +27,12 @@ Read their [API documentation](http://www.activecampaign.com/api/overview.php)fo
 ```ruby
 # To setup the client
 client = ::ActiveCampaign::Client.new(
-        api_endpoint: 'YOUR-ENDPOINT', # e.g. 'https://yourendpoint.api-us1.com'
+        api_endpoint: 'YOUR-ENDPOINT', # e.g. 'https://yourendpoint.api-us1.com/admin/api.php'
         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_endpoint = 'YOUR-ENDPOINT', # e.g. 'https://yourendpoint.api-us1.com/admin/api.php'
   config.api_key = 'YOUR-API-KEY' # e.g. 'a4e60a1ba200595d5cc37ede5732545184165e'
 end
 
@@ -111,6 +111,16 @@ All responses are wrapped under `results` so
 }
 ```
 
+For using tags_list action do the following
+
+```ruby
+ActiveCampaign.get('tags_list')
+```
+The response of method is an array of tags
+
+```ruby
+[{"id":1,"name":"test_tag","count":1}]
+```
 
 ## Contributing
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
@@ -5,10 +7,10 @@ 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.options = %w[--display-cop-names]
   task.fail_on_error = true
 end
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: [:style, :spec]
+task default: %i[style spec]

data/active_campaign.gemspec

@@ -1,4 +1,6 @@
 # coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'active_campaign/version'
@@ -10,7 +12,7 @@ Gem::Specification.new do |spec|
   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.homepage      = 'https://github.com/mhenrixon/active_campaign'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
@@ -18,6 +20,17 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'httpi'
-  spec.add_dependency 'multi_json'
+  spec.add_dependency 'httpi', '>= 1.0', '< 3.0'
+  spec.add_dependency 'multi_json', '>= 1.0', '< 2'
+  spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0'
+  spec.add_development_dependency 'fuubar', '~> 2.0'
+  spec.add_development_dependency 'gem-release', '~> 1.0'
+  spec.add_development_dependency 'pry', '~> 0.10'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rspec', '~> 3.5'
+  spec.add_development_dependency 'rubocop', '~> 0.48'
+  spec.add_development_dependency 'webmock', '~> 3.0'
+  spec.add_development_dependency 'simplecov', '~> 0.13'
+  spec.add_development_dependency 'simplecov-json', '~> 0.2'
+  spec.add_development_dependency 'vcr', '~> 3.0'
 end

data/lib/active_campaign.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_campaign/version'
 require 'active_campaign/client'
 require 'active_campaign/configuration'
@@ -10,11 +12,7 @@ module ActiveCampaign
   #
   # @return [ActiveCampaign::Client] API wrapper
   def client
-    unless defined?(@client) && @client.same_options?(config)
-      @client = ActiveCampaign::Client.new(config)
-    end
-
-    @client
+    ActiveCampaign::Client.new
   end
 
   # @private
@@ -22,11 +20,6 @@ module ActiveCampaign
     client.respond_to?(method_name, include_private)
   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
@@ -39,10 +32,15 @@ module ActiveCampaign
     @config = Configuration.new
   end
 
-  private
-
-  def method_missing(method_name, *args, &block)
-    return super unless client.respond_to?(method_name)
-    client.send(method_name, *args, &block)
+  class << self
+    # rubocop:disable Style/MissingRespondToMissing
+    def method_missing(method_name, *args, &block)
+      if client.respond_to?(method_name)
+        client.send(method_name, *args, &block)
+      else
+        super
+      end
+    end
+    # rubocop:enable Style/MissingRespondToMissing
   end
 end

data/lib/active_campaign/client.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 require 'httpi'
-require 'active_campaign/method_creator'
 
 require 'active_campaign/client/campaigns'
 require 'active_campaign/client/contacts'
@@ -13,8 +14,6 @@ require 'active_campaign/client/users'
 
 module ActiveCampaign
   class Client
-    include Comparable
-    extend ActiveCampaign::MethodCreator
     extend Forwardable
 
     include ActiveCampaign::Client::Campaigns
@@ -27,19 +26,12 @@ module ActiveCampaign
     include ActiveCampaign::Client::Tracks
     include ActiveCampaign::Client::Users
 
-    def_delegators :@config, :api_key, :api_output, :api_endpoint,
-                   :user_agent, :log, :log_level, :logger, :mash, :debug
+    attr_reader :config
+    def_delegators :config, :api_key, :api_output, :api_endpoint,
+                   :user_agent, :log, :log_level, :logger, :debug
 
     def initialize(options = {})
-      @config ||= ActiveCampaign.config.merge(options)
-    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?(other_config)
-      @config.to_h.sort == other_config.to_h.sort
+      @config = ActiveCampaign.config.dup.merge(options)
     end
 
     # Make a HTTP GET request
@@ -51,15 +43,6 @@ 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}
@@ -69,6 +52,17 @@ module ActiveCampaign
       request :post, api_method, options
     end
 
+    def hash
+      [config.hash, Client].hash
+    end
+
+    def ==(other)
+      other.is_a?(ActiveCampaign::Client) &&
+        hash == other.hash
+    end
+
+    alias eql? ==
+
     private
 
     def request(method, api_method, data)
@@ -79,10 +73,17 @@ module ActiveCampaign
       normalize(response)
     end
 
+    def request_headers
+      {
+        'User-Agent' => user_agent,
+        'Content-Type' => 'application/x-www-form-urlencoded'
+      }
+    end
+
     def create_request(method, api_method, options = {})
       req = HTTPI::Request.new(
         url: File.join(api_endpoint),
-        headers: { 'User-Agent' => user_agent },
+        headers: request_headers,
         query: query(method, api_method, options),
         body: body(method, api_method, options)
       )
@@ -92,20 +93,20 @@ module ActiveCampaign
     end
 
     def query(method, api_method, options = {})
-      q = options.delete(:query) { Hash.new }
+      q = options.delete(:query) { {} }
       q.merge!(api_key: api_key,
                api_action: api_method.to_s,
                api_output: api_output)
 
-      q.merge!(options) if method == :get
+      return q unless method == :get
 
-      q
+      q.merge(options)
     end
 
     def body(method, _api_method, options = {})
       return nil unless method == :post
 
-      fields = options.delete(:fields) { Hash.new }
+      fields = options.delete(:fields) { {} }
       options[:field] = fields.inject({}) do |hash, (k, v)|
         hash.merge("%#{k}%,0" => v)
       end
@@ -114,6 +115,8 @@ module ActiveCampaign
     end
 
     def normalize(response)
+      return response if response.is_a? Array
+
       keys, values = keys_values(response)
       if keys.all? { |key| numeric?(key) }
         response['results'] = values
@@ -133,7 +136,7 @@ module ActiveCampaign
     end
 
     def results(response)
-      response.reject { |k, _v| %w(result_code result_message result_output).include?(k) }
+      response.reject { |k, _v| %w[result_code result_message result_output].include?(k) }
     end
   end
 end