mailchimp_api_v3 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 463b5715b8ca2923efd8eb8575ca8179929caf6d
-  data.tar.gz: d34a2023fa0fcf9cd1dc0bb9c81b40c4ed1429ad
+  metadata.gz: 4c1376959bbf12d3dd6d2b66f5f62d65c31b497a
+  data.tar.gz: 9ba4d57d1ae8da47f06aea84e01c17afc0e75e6d
 SHA512:
-  metadata.gz: cc6bfd5203a5daa249d6ce42ef1278f9e2d881e2b5a45497a4faa08c943099a05a1c342bc98b3698049eff5188b4715315559a2b1abedc03ba5c969c866f4f37
-  data.tar.gz: b3e97220a895b9505e8730118f07502c090647143da541b1368bfec2ea0f9cb1df08ca8cbe86969194a399b41bf52e568001038258edbd7667a80fef61748f0f
+  metadata.gz: 77b72cce05b1c2fd59f64b8853055a61114b25b15229b4a486320ef2feb52bac86e359c8c4b0678d367fc44f3e95487498bbefed86e7dab0fe188bf7d3aba6cd
+  data.tar.gz: 43fa198702a8dbd22cb0c0e1fd26cf86a4a2874463b49135eda4368f087ce1a4a7f0ceda1e0377c233148d7e7860b20e1faf1acf3d1d0c4ba51a422857be2629

data/lib/mailchimp_api_v3.rb

@@ -1,5 +1,15 @@
 require 'mailchimp_api_v3/version'
+require 'mailchimp_api_v3/collection/paging'
+require 'mailchimp_api_v3/collection'
+require 'mailchimp_api_v3/instance'
+require 'mailchimp_api_v3/exception'
+require 'mailchimp_api_v3/client/remote'
 require 'mailchimp_api_v3/client'
+require 'mailchimp_api_v3/account'
+require 'mailchimp_api_v3/list'
+require 'mailchimp_api_v3/member'
+require 'mailchimp_api_v3/interest_category'
+require 'mailchimp_api_v3/interest'
 
 module Mailchimp
   def self.connect(api_key = nil)

data/lib/mailchimp_api_v3/client.rb

@@ -1,12 +1,5 @@
-require 'mailchimp_api_v3/collection'
-require 'mailchimp_api_v3/instance'
-require 'mailchimp_api_v3/exception'
-require 'mailchimp_api_v3/account'
-require 'mailchimp_api_v3/list'
-require 'mailchimp_api_v3/client/remote'
-
 module Mailchimp
-  class Client
+  class Client < Instance
     include Remote
 
     def account
@@ -14,7 +7,8 @@ module Mailchimp
     end
 
     def lists(filter = {})
-      data = filter.is_a?(String) ? { name: filter.dup } : filter.dup
+      raw_data = filter.respond_to?(:dup) ? filter.dup : filter
+      data = raw_data.is_a?(String) ? { name: raw_data } : raw_data
       lists = Lists.new(self)
       data.empty? ? lists : lists.find_by(data)
     end

data/lib/mailchimp_api_v3/client/remote.rb

@@ -2,7 +2,7 @@ require 'yaml'
 require 'restclient'
 
 module Mailchimp
-  class Client
+  class Client < Instance
     module Remote
       def get(path = '', options = {})
         managed_remote path, :get, options

data/lib/mailchimp_api_v3/collection.rb

@@ -1,6 +1,5 @@
 module Mailchimp
   class Collection < Array
-    require 'mailchimp_api_v3/collection/paging' # Don't require before class inherits from Array
     include Paging
 
     def initialize(client, parent_path = '', options = {})

data/lib/mailchimp_api_v3/collection/paging.rb

@@ -1,5 +1,5 @@
 module Mailchimp
-  class Collection
+  class Collection < Array
     module Paging
       DEFAULT_PAGE_SIZE = 500
 

data/lib/mailchimp_api_v3/interest_category.rb

@@ -1,8 +1,11 @@
 module Mailchimp
   class List
     class InterestCategory < Instance
-      require 'mailchimp_api_v3/interest_category/subclasses'
-      include Subclasses
+      #- VALID_TYPES = %w(checkboxes dropdown radio hidden)
+
+      def interests(options = {})
+        subclass_from Interests, options
+      end
     end
 
     class InterestCategories < Collection

data/lib/mailchimp_api_v3/list.rb

@@ -1,7 +1,17 @@
 module Mailchimp
   class List < Instance
-    require 'mailchimp_api_v3/list/subclasses'
-    include Subclasses
+    def members(options = {})
+      # Turn an email into an id
+      if options.is_a?(String) && (options =~ /\A[^@]+@[^@]+\z/)
+        options = OpenSSL::Digest.digest('MD5', options).unpack('H*').first
+      end
+
+      subclass_from Members, options
+    end
+
+    def interest_categories(options = {})
+      subclass_from InterestCategories, options
+    end
 
     def id_and_name
       "#{id}___#{name}"

data/lib/mailchimp_api_v3/version.rb

@@ -1,3 +1,3 @@
 module Mailchimp
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailchimp_api_v3
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Xenapto
@@ -231,9 +231,7 @@ files:
 - lib/mailchimp_api_v3/instance.rb
 - lib/mailchimp_api_v3/interest.rb
 - lib/mailchimp_api_v3/interest_category.rb
-- lib/mailchimp_api_v3/interest_category/subclasses.rb
 - lib/mailchimp_api_v3/list.rb
-- lib/mailchimp_api_v3/list/subclasses.rb
 - lib/mailchimp_api_v3/member.rb
 - lib/mailchimp_api_v3/version.rb
 - mailchimp_api_v3.gemspec

data/lib/mailchimp_api_v3/interest_category/subclasses.rb

@@ -1,14 +0,0 @@
-require 'mailchimp_api_v3/interest'
-
-module Mailchimp
-  class List
-    class InterestCategory
-      module Subclasses
-        #- VALID_TYPES = %w(checkboxes dropdown radio hidden)
-        def interests(options = {})
-          subclass_from Interests, options
-        end
-      end
-    end
-  end
-end

data/lib/mailchimp_api_v3/list/subclasses.rb

@@ -1,21 +0,0 @@
-require 'mailchimp_api_v3/member'
-require 'mailchimp_api_v3/interest_category'
-
-module Mailchimp
-  class List
-    module Subclasses
-      def members(options = {})
-        # Turn an email into an id
-        if options.is_a?(String) && (options =~ /\A[^@]+@[^@]+\z/)
-          options = OpenSSL::Digest.digest('MD5', options).unpack('H*').first
-        end
-
-        subclass_from Members, options
-      end
-
-      def interest_categories(options = {})
-        subclass_from InterestCategories, options
-      end
-    end
-  end
-end