active_campaign 0.1.14 → 0.1.15

data/lib/active_campaign/client/messages.rb

@@ -1,20 +1,68 @@
+# frozen_string_literal: true
+
 module ActiveCampaign
   class Client
     module Messages
-      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
-
-      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.
-      def self.included(base)
-        base.class_exec do
-          define_api_calls(:message, GET_METHODS, POST_METHODS)
-        end
+      #
+      # POST methods
+      #
+      def message_add(options = {})
+        post __method__, options
+      end
+
+      def message_edit(options = {})
+        post __method__, options
+      end
+
+      def message_template_edit(options = {})
+        post __method__, options
+      end
+
+      #
+      # GET methods
+      #
+      def message_delete_list(options = {})
+        get(__method__, options)
+      end
+
+      def message_delete(options = {})
+        get(__method__, options)
+      end
+
+      def message_list(options = {})
+        get(__method__, options)
+      end
+
+      def message_template_add(options = {})
+        get(__method__, options)
+      end
+
+      def message_template_delete_list(options = {})
+        get(__method__, options)
+      end
+
+      def message_template_delete(options = {})
+        get(__method__, options)
+      end
+
+      def message_template_export(options = {})
+        get(__method__, options)
+      end
+
+      def message_template_import(options = {})
+        get(__method__, options)
+      end
+
+      def message_template_list(options = {})
+        get(__method__, options)
+      end
+
+      def message_template_view(options = {})
+        get(__method__, options)
+      end
+
+      def message_view(options = {})
+        get(__method__, options)
       end
     end
   end

data/lib/active_campaign/client/tracks.rb

@@ -1,17 +1,54 @@
+# frozen_string_literal: true
+
 module ActiveCampaign
   class Client
     module Tracks
-      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.
-      def self.included(base)
-        base.class_exec do
-          define_api_calls(:track, GET_METHODS, POST_METHODS, DELETE_METHODS, PUT_METHODS)
-        end
+      #
+      # POST methods
+      #
+
+      def track_event_status_edit(options = {})
+        post __method__, options
+      end
+
+      def track_site_status_edit(options = {})
+        post __method__, options
+      end
+
+      def track_event_add(options = {})
+        post __method__, options
+      end
+
+      #
+      # PUT methods
+      #
+
+      def track_site_whitelist_add(options = {})
+        put __method__, options
+      end
+
+      #
+      # GET methods
+      #
+
+      def track_event_list(options = {})
+        get __method__, options
+      end
+
+      def track_site_list(options = {})
+        get __method__, options
+      end
+
+      #
+      # DELETE methods
+      #
+
+      def track_event_delete(options = {})
+        delete __method__, options
+      end
+
+      def track_site_whitelist_delete(options = {})
+        delete __method__, options
       end
     end
   end

data/lib/active_campaign/client/users.rb

@@ -1,15 +1,50 @@
+# frozen_string_literal: true
+
 module ActiveCampaign
   class Client
     module Users
-      GET_METHODS ||= %w(delete delete_list list me view view_email view_username).freeze
-      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.
-      def self.included(base)
-        base.class_exec do
-          define_api_calls(:user, GET_METHODS, POST_METHODS)
-        end
+      #
+      # POST methods
+      #
+
+      def user_add(options = {})
+        post __method__, options
+      end
+
+      def user_edit(options = {})
+        post __method__, options
+      end
+
+      #
+      # GET methods
+      #
+
+      def user_delete(options = {})
+        get __method__, options
+      end
+
+      def user_delete_list(options = {})
+        get __method__, options
+      end
+
+      def user_list(options = {})
+        get __method__, options
+      end
+
+      def user_me(options = {})
+        get __method__, options
+      end
+
+      def user_view(options = {})
+        get __method__, options
+      end
+
+      def user_view_email(options = {})
+        get __method__, options
+      end
+
+      def user_view_username(options = {})
+        get __method__, options
       end
     end
   end

data/lib/active_campaign/configuration.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module ActiveCampaign
   class Configuration
-    API_ENDPOINT ||= 'https://subdomain.activehosted.com/admin/api.php'.freeze
-    USER_AGENT   ||= "ActiveCampaign Ruby Gem #{ActiveCampaign::VERSION}".freeze
-    API_OUTPUT   ||= 'json'.freeze
+    API_ENDPOINT ||= 'https://subdomain.activehosted.com/admin/api.php'
+    USER_AGENT   ||= "ActiveCampaign Ruby Gem #{ActiveCampaign::VERSION}"
+    API_OUTPUT   ||= 'json'
 
     attr_accessor :api_key, :api_endpoint, :api_output, :user_agent,
                   :log, :logger, :log_level, :mash, :debug
@@ -15,11 +17,10 @@ module ActiveCampaign
       @log = false
       @logger = nil
       @log_level = :info
-      @mash = false
       @debug = false
     end
 
-    def to_h # rubocop:disable MethodLength
+    def to_h
       {
         api_key: api_key,
         api_endpoint: api_endpoint,
@@ -28,7 +29,6 @@ module ActiveCampaign
         log: log,
         logger: logger,
         log_level: log_level,
-        mash: mash,
         debug: debug
       }
     end
@@ -40,16 +40,41 @@ module ActiveCampaign
       self
     end
 
-    def <=>(other) # rubocop:disable AbcSize, CyclomaticComplexity, PerceivedComplexity
+    def ==(other)
+      other.is_a?(ActiveCampaign::Configuration) &&
+        all_api_info_equal &&
+        user_agent == other.user_agent &&
+        all_log_info_equal &&
+        debug == other.debug
+    end
+    alias eql? ==
+
+    def hash
+      [
+        api_key,
+        api_endpoint,
+        api_output,
+        user_agent,
+        log,
+        logger,
+        log_level,
+        debug,
+        ActiveCampaign::Configuration
+      ].hash
+    end
+
+    private
+
+    def all_api_info_equal
       api_key == other.api_key &&
         api_endpoint == other.api_endpoint &&
-        api_output == other.api_output &&
-        user_agent == other.user_agent &&
-        log == other.log &&
+        api_output == other.api_output
+    end
+
+    def all_log_info_equal
+      log == other.log &&
         logger == other.logger &&
-        log_level == other.log_level &&
-        mash == other.mash &&
-        debug == other.debug
+        log_level == other.log_level
     end
   end
 end

data/lib/active_campaign/core_ext.rb

@@ -1,11 +1,14 @@
+# frozen_string_literal: true
+
 class Hash
+  # unless respo?(:to_query)
   def to_query(namespace = nil)
     collect do |key, value|
       unless (value.is_a?(Hash) || value.is_a?(Array)) && value.empty?
         value.to_query(namespace ? "#{namespace}[#{key}]" : key)
       end
     end.compact.sort! * '&'
-  end # unless respo?(:to_query)
+  end
 end
 
 class Array
@@ -13,6 +16,7 @@ class Array
     collect(&:to_param).join '/'
   end
 
+  # unless respo?(:to_query)
   def to_query(key)
     prefix = "#{key}[]"
 
@@ -21,13 +25,14 @@ class Array
     else
       collect { |value| value.to_query(prefix) }.join '&'
     end
-  end # unless defined?(:to_query)
+  end
 end
 
 class Object
+  # unless respo?(:to_query)
   def to_query(key)
     "#{CGI.escape(key.to_param)}=#{CGI.escape(to_param.to_s)}"
-  end # unless defined?(:to_query)
+  end
 
   def to_param
     to_s

data/lib/active_campaign/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveCampaign
-  VERSION = '0.1.14'.freeze
+  VERSION = '0.1.15'
 end

data/spec/lib/active_campaign/client/contacts_spec.rb

@@ -1,4 +1,5 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ActiveCampaign::Client::Contacts, :vcr do

data/spec/lib/active_campaign/client/lists_spec.rb

@@ -1,4 +1,5 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ActiveCampaign::Client::Lists, :vcr do

data/spec/lib/active_campaign/client_spec.rb

@@ -1,6 +1,14 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module ActiveCampaign
   describe Client do
+    describe '.new' do
+      subject(:client) { described_class.new(api_key: 'testing') }
+      let(:client_two) { described_class.new(api_key: 'somekey') }
+
+      it { is_expected.not_to eq(client_two) }
+    end
   end
 end

data/spec/lib/active_campaign_spec.rb

@@ -1,18 +1,22 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ActiveCampaign do
   # rubocop:disable LineLength
-  API_CALLS = %w(
-    campaign_create campaign_delete campaign_delete_list campaign_list campaign_paginator campaign_report_bounce_list campaign_report_bounce_totals campaign_report_forward_list campaign_report_forward_totals campaign_report_link_list campaign_report_link_totals campaign_report_open_list campaign_report_open_totals campaign_report_totals campaign_report_unopen_list campaign_report_unsubscription_list campaign_report_unsubscription_totals campaign_send campaign_status
-    contact_add contact_automation_list contact_delete contact_delete_list contact_edit contact_list contact_note_add contact_note_delete contact_note_edit contact_paginator contact_sync contact_tag_add contact_tag_remove contact_view contact_view_email contact_view_hash
-    deal_add deal_delete deal_edit deal_get deal_list deal_note_add deal_note_edit deal_pipeline_add deal_pipeline_delete deal_pipeline_edit deal_pipeline_list deal_stage_add deal_stage_delete deal_stage_edit deal_stage_list deal_task_add deal_task_edit deal_tasktype_add deal_tasktype_delete deal_tasktype_edit
-    form_getforms form_html
-    group_add group_delete group_delete_list group_edit group_list group_view
-    list_add list_delete list_delete_list list_edit list_field_add list_field_delete list_field_edit list_field_view list_list list_paginator list_view
-    message_add message_delete message_delete_list message_edit message_list message_template_add message_template_delete message_template_delete_list message_template_edit message_template_export message_template_import message_template_list message_template_view message_view
-    user_add user_delete user_delete_list user_edit user_list user_me user_view user_view_email user_view_username
-    track_event_delete track_event_list track_event_status_edit track_site_list track_site_status_edit track_site_whitelist_add track_site_whitelist_delete track_event_add
-  ).freeze unless defined?(API_CALLS)
+  unless defined?(API_CALLS)
+    API_CALLS = %w[
+      campaign_create campaign_delete campaign_delete_list campaign_list campaign_paginator campaign_report_bounce_list campaign_report_bounce_totals campaign_report_forward_list campaign_report_forward_totals campaign_report_link_list campaign_report_link_totals campaign_report_open_list campaign_report_open_totals campaign_report_totals campaign_report_unopen_list campaign_report_unsubscription_list campaign_report_unsubscription_totals campaign_send campaign_status
+      contact_add contact_automation_list contact_delete contact_delete_list contact_edit contact_list contact_note_add contact_note_delete contact_note_edit contact_paginator contact_sync contact_tag_add contact_tag_remove contact_view contact_view_email contact_view_hash
+      deal_add deal_delete deal_edit deal_get deal_list deal_note_add deal_note_edit deal_pipeline_add deal_pipeline_delete deal_pipeline_edit deal_pipeline_list deal_stage_add deal_stage_delete deal_stage_edit deal_stage_list deal_task_add deal_task_edit deal_tasktype_add deal_tasktype_delete deal_tasktype_edit
+      form_getforms form_html
+      group_add group_delete group_delete_list group_edit group_list group_view
+      list_add list_delete list_delete_list list_edit list_field_add list_field_delete list_field_edit list_field_view list_list list_paginator list_view
+      message_add message_delete message_delete_list message_edit message_list message_template_add message_template_delete message_template_delete_list message_template_edit message_template_export message_template_import message_template_list message_template_view message_view
+      user_add user_delete user_delete_list user_edit user_list user_me user_view user_view_email user_view_username
+      track_event_delete track_event_list track_event_status_edit track_site_list track_site_status_edit track_site_whitelist_add track_site_whitelist_delete track_event_add
+    ].freeze
+  end
   # rubocop:enable LineLength
 
   before do
@@ -37,15 +41,6 @@ describe ActiveCampaign do
     it 'caches the client when the same options are passed' do
       expect(ActiveCampaign.client).to eq ActiveCampaign.client
     end
-
-    it 'returns a fresh client when options are not the same' do
-      client = ActiveCampaign.client
-      ActiveCampaign.config.api_key = 'somekey'
-      client_two = ActiveCampaign.client
-      client_three = ActiveCampaign.client
-      expect(client_three).to eql client_two
-      expect(client).to_not eql client_two
-    end
   end
 
   describe '.configure' do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'simplecov'
 
 require 'pry'
@@ -6,8 +8,8 @@ require 'active_campaign'
 require_relative 'support/webmock'
 require_relative 'support/vcr'
 
-TEST_API_ENDPOINT ||= 'https://zoolutions.api-us1.com/admin/api.php'.freeze
-TEST_API_KEY ||= '1b85f597c38b74fc842a04efe00f10d547a839487dcb05e2c639e92c450d53a366d96f84'.freeze
+TEST_API_ENDPOINT ||= 'https://zoolutions.api-us1.com/admin/api.php'
+TEST_API_KEY ||= '1b85f597c38b74fc842a04efe00f10d547a839487dcb05e2c639e92c450d53a366d96f84'
 
 RSpec.configure do |config|
   config.filter_run focus: true
@@ -24,7 +26,7 @@ RSpec.configure do |config|
   end
 end
 
-def initialize_new_client # rubocop:disable MethodLength
+def initialize_new_client
   before do
     @client = ActiveCampaign::Client.new(
       api_endpoint: TEST_API_ENDPOINT,
@@ -32,8 +34,7 @@ def initialize_new_client # rubocop:disable MethodLength
       api_output: 'json',
       debug: false,
       log_level: :fatal,
-      log: false,
-      mash: false
+      log: false
     )
   end
 end