active_campaign 0.1.9 → 0.1.10

data/spec/client_spec.rb

@@ -2,6 +2,5 @@ require 'spec_helper'
 
 module ActiveCampaign
   describe Client do
-
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,54 +1,21 @@
-require 'simplecov'
-require 'coveralls'
-require 'pry'
-require "codeclimate-test-reporter"
-formatters =  [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter]
-
-if ENV['CODECLIMATE_REPO_TOKEN']
-  formatters << CodeClimate::TestReporter::Formatter
-  CodeClimate::TestReporter.start
-end
+require_relative 'support/coverage'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[*formatters]
-SimpleCov.start
-
-require "active_campaign"
+require 'pry'
 require 'rspec'
-require 'webmock/rspec'
-
-WebMock.disable_net_connect!(:allow => ['coveralls.io', 'codeclimate.com'])
+require 'active_campaign'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.filter_run focus: true
-  config.order = "random"
+  config.order = 'random'
   config.run_all_when_everything_filtered = true
   config.expect_with :rspec do |c|
     c.syntax = :expect
   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.filter_sensitive_data('<API_ENDPOINT>') do
-    ENV['ACTIVE_CAMPAIGN_API_ENDPOINT']
+  config.before(:suite) do
+    HTTPI.log = false
+    HTTPI.log_level = :fatal
   end
-
-  c.default_cassette_options = {
-    serialize_with: :json,
-
-    preserve_exact_body_bytes: true,
-    decode_compressed_response: true,
-    record: ENV['CI'] ? :none : :once
-  }
-  c.cassette_library_dir = 'spec/cassettes'
-  c.hook_into :webmock
-  c.ignore_hosts 'codeclimate.com'
 end
 
 def test_api_endpoint
@@ -61,14 +28,8 @@ end
 
 def initialize_new_client
   before do
-    @client = ActiveCampaign::Client.new(
-      mash: true,
-      debug: true,
-      api_endpoint: test_api_endpoint,
-      api_key: test_api_key,
-      log_level: :debug,
-      log: true
-    )
+    initialize_active_campaign
+    @client = ActiveCampaign::Client.new
   end
 end
 
@@ -76,10 +37,10 @@ def initialize_active_campaign
   ActiveCampaign.configure do |config|
     config.api_endpoint = test_api_endpoint
     config.api_key      = test_api_key
-    config.api_output   = "json"
-    config.debug        = true
-    config.log_level    = :debug
-    config.log          = true
+    config.api_output   = 'json'
+    config.debug        = false
+    config.log_level    = :fatal
+    config.log          = false
     config.mash         = true
   end
-end
+end

data/spec/support/coverage.rb

@@ -0,0 +1,12 @@
+require 'simplecov'
+require 'coveralls'
+require 'codeclimate-test-reporter'
+formatters =  [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter]
+
+if ENV['CODECLIMATE_REPO_TOKEN']
+  formatters << CodeClimate::TestReporter::Formatter
+  CodeClimate::TestReporter.start
+end
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[*formatters]
+SimpleCov.start

data/spec/support/vcr.rb

@@ -0,0 +1,27 @@
+require 'vcr'
+VCR.configure do |c|
+  c.configure_rspec_metadata!
+  c.default_cassette_options = {
+    match_requests_on: [
+      :method,
+      VCR.request_matchers.uri_without_param(
+        :timestamp, :body_md5, :auth_signature, :auth_timestamp, :auth_key
+      )
+    ],
+    serialize_with: :json,
+    preserve_exact_body_bytes: true,
+    decode_compressed_response: true,
+    record: ENV['RECORD_VCR'] || ENV['CI'] ? :none : :once
+  }
+  c.ignore_localhost = true
+  c.cassette_library_dir = 'spec/cassettes'
+  c.hook_into :webmock
+  c.ignore_hosts 'codeclimate.com'
+  c.filter_sensitive_data('<API_KEY>') do
+    ENV['ACTIVE_CAMPAIGN_API_KEY']
+  end
+
+  c.filter_sensitive_data('<API_ENDPOINT>') do
+    ENV['ACTIVE_CAMPAIGN_API_ENDPOINT']
+  end
+end

data/spec/support/webmock.rb

@@ -0,0 +1,2 @@
+require 'webmock/rspec'
+WebMock.disable_net_connect!(allow: ['coveralls.io', 'codeclimate.com'])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_campaign
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpi
@@ -38,6 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  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: multi_json
+  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'
 description: A simple ruby wrapper for the ActiveCampaign API
 email:
 - mikael@zoolutions.se
@@ -45,9 +73,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
@@ -55,15 +85,14 @@ files:
 - README.md
 - Rakefile
 - active_campaign.gemspec
+- circle.yml
 - lib/active_campaign.rb
-- lib/active_campaign/.DS_Store
 - 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/configurable.rb
-- lib/active_campaign/default.rb
+- lib/active_campaign/configuration.rb
 - lib/active_campaign/error.rb
 - lib/active_campaign/version.rb
 - spec/active_campaign_spec.rb
@@ -78,6 +107,9 @@ files:
 - spec/fixtures/contact_view.json
 - spec/fixtures/list_view.json
 - spec/spec_helper.rb
+- spec/support/coverage.rb
+- spec/support/vcr.rb
+- spec/support/webmock.rb
 homepage: ''
 licenses:
 - MIT
@@ -98,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: See http://www.activecampaign.com/api/overview.php for more information
@@ -115,4 +147,7 @@ test_files:
 - spec/fixtures/contact_view.json
 - spec/fixtures/list_view.json
 - spec/spec_helper.rb
+- spec/support/coverage.rb
+- spec/support/vcr.rb
+- spec/support/webmock.rb
 has_rdoc: 

data/lib/active_campaign/configurable.rb

@@ -1,66 +0,0 @@
-module ActiveCampaign
-
-  # Configuration options for {Client}, defaulting to values
-  # in {Default}
-  module Configurable
-
-    CONFIG_KEYS = [
-      :api_key,
-      :api_path,
-      :api_output,
-      :api_endpoint,
-      :user_agent,
-      :log,
-      :log_level,
-      :logger,
-      :mash,
-    ]
-
-    attr_accessor(*CONFIG_KEYS)
-
-    class << self
-
-      # List of configurable keys for {ActiveCampaign::Client}
-      # @return [Array] of option keys
-      def keys
-        @keys ||= CONFIG_KEYS
-      end
-    end
-
-    # Set configuration options using a block
-    def configure
-      yield self
-    end
-
-    # Reset configuration options to default values
-    def reset!
-      ActiveCampaign::Configurable.keys.each do |key|
-        instance_variable_set(:"@#{key}", ActiveCampaign::Default.options[key])
-      end
-
-      HTTPI.logger    = self.logger if self.logger
-      HTTPI.log       = self.log
-      HTTPI.log_level = self.log_level
-
-      self
-    end
-    alias setup reset!
-
-    def api_endpoint
-      File.join(@api_endpoint, "")
-    end
-
-    # Base URL for generated web URLs
-    #
-    # @return [String] Default: https://www.activecampaign.com/
-    def web_endpoint
-      File.join(@web_endpoint, "")
-    end
-
-    private
-
-      def options
-        Hash[ActiveCampaign::Configurable.keys.map{|key| [key, instance_variable_get(:"@#{key}")]}]
-      end
-  end
-end

data/lib/active_campaign/default.rb

@@ -1,81 +0,0 @@
-require 'active_campaign/version'
-
-module ActiveCampaign
-
-  # Default configuration options for {Client}
-  module Default
-
-    # Default API endpoint
-    API_ENDPOINT = "https://subdomain.activehosted.com".freeze
-
-    API_PATH = "admin/api.php".freeze
-
-    # Default User Agent header string
-    USER_AGENT   = "ActiveCampaign Ruby Gem #{ActiveCampaign::VERSION}".freeze
-
-    # Default media type
-    API_OUTPUT   = "json"
-
-    # Default WEB endpoint
-    WEB_ENDPOINT = "http://www.activecampaign.com/".freeze
-
-    class << self
-
-      # Configuration options
-      # @return [Hash]
-      def options
-        Hash[ActiveCampaign::Configurable.keys.map{|key| [key, send(key)]}]
-      end
-
-      # Default API endpoint from ENV or {API_ENDPOINT}
-      # @return [String]
-      def api_endpoint
-        ENV['ACTIVE_CAMPAIGN_API_ENDPOINT'] || "#{API_ENDPOINT}/#{api_path}"
-      end
-
-      # Default API endpoint from ENV or {API_ENDPOINT}
-      # @return [String]
-      def api_path
-        API_PATH
-      end
-
-      # Default GitHub username for Basic Auth from ENV
-      # @return [String]
-      def api_key
-        ENV['ACTIVE_CAMPAIGN_API_KEY']
-      end
-
-      def log
-        false
-      end
-
-      def logger
-        nil
-      end
-
-      def log_level
-        :warn
-      end
-
-      def debug
-        false
-      end
-
-      def mash
-        false
-      end
-
-      # Default media api_output from ENV or {API_OUTPUT}
-      # @return [String]
-      def api_output
-        ENV['ACTIVE_CAMPAIGN_API_OUTPUT'] || API_OUTPUT
-      end
-
-      # Default User-Agent header string from ENV or {USER_AGENT}
-      # @return [String]
-      def user_agent
-        ENV['ACTIVE_CAMPAIGN_USER_AGENT'] || USER_AGENT
-      end
-    end
-  end
-end