hominid 2.0.0 → 2.0.1

data/README.textile

@@ -4,7 +4,7 @@ Hominid is a Ruby gem that provides a wrapper for interacting with the "Mailchim
 
 h2. Installation
 
-<pre><code>sudo gem install hominid, :version => '>= 2.0.0', :source => "http://gemcutter.org"</code></pre>
+<pre><code>sudo gem install hominid, :version => '>= 2.0.1', :source => "http://gemcutter.org"</code></pre>
 
 Hominid is hosted at "Gemcutter":http://gemcutter.org. Be sure that you have the Gemcutter gem installed if you are having trouble installing Hominid:
 
@@ -108,7 +108,7 @@ h2. Syncing Your Application
 
 If you are integrating an application with Mailchimp, Hominid will provide a way for your app to connect with your Mailchimp account. However, it does not provide a way for Mailchimp to connect to your application, which is why Mailchimp has implemented "web hooks":http://www.mailchimp.com/api/webhooks/.
 
-The _Hominid::Webhook class helps with receiving <tt>POST</tt> data from a Mailchimp webhook:
+The _Hominid::Webhook_ class helps with receiving <tt>POST</tt> data from a Mailchimp webhook:
 
 <pre><code>hook = Hominid::Webhook.new(params)
 case hook.event

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/hominid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hominid}
-  s.version = "2.0.0"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Getting", "Michael Str\303\274der"]
-  s.date = %q{2009-10-30}
+  s.date = %q{2009-11-11}
   s.description = %q{Hominid is a Ruby gem that provides a wrapper for interacting with the Mailchimp email marketing service API.}
   s.email = %q{brian@terra-firma-design.com}
   s.extra_rdoc_files = [

data/hominid.yml.tpl

@@ -6,7 +6,7 @@ development:
   api_key: 
   send_goodbye: false
   send_notify: false
-  double_opt: false
+  double_opt_in: false
 
 test:
   username:
@@ -14,7 +14,7 @@ test:
   api_key: 
   send_goodbye: false
   send_notify: false
-  double_opt: false
+  double_opt_in: false
 
 production:
   username:
@@ -22,4 +22,4 @@ production:
   api_key: 
   send_goodbye: false
   send_notify: false
-  double_opt: false
+  double_opt_in: false

data/lib/hominid/base.rb

@@ -14,9 +14,14 @@ module Hominid
                   :double_opt_in      => false,
                   :update_existing    => true,
                   :replace_interests  => true,
-                  :merge_tags         => {}}
+                  :merge_tags         => {},
+                  :secure             => false}
       @config = defaults.merge(config).freeze
-      @chimpApi = XMLRPC::Client.new2("http://#{api_endpoint}.api.mailchimp.com/#{MAILCHIMP_API_VERSION}/")
+      if config[:secure]
+        @chimpApi = XMLRPC::Client.new2("https://#{api_endpoint}.api.mailchimp.com/#{MAILCHIMP_API_VERSION}/")
+      else
+        @chimpApi = XMLRPC::Client.new2("http://#{api_endpoint}.api.mailchimp.com/#{MAILCHIMP_API_VERSION}/")
+      end
     end
 
     # Security related methods
@@ -67,7 +72,7 @@ module Hominid
       when 233, 215
         raise NotSubscribed.new(error)
       else
-        raise HominidError.new(error)
+        raise APIError.new(error)
       end
     rescue RuntimeError => error
       if error.message =~ /Wrong type NilClass\. Not allowed!/

data/lib/hominid/campaign.rb

@@ -49,7 +49,7 @@ module Hominid
 
     def self.find_by_web_id(web_id)
       # Find campaigns by web_id
-      all.find { |campaign| campaign.attributes['web_id'] =~ /#{web_id}/ }
+      all.find { |campaign| campaign.attributes['web_id'] == web_id.to_i }
     end
 
     def self.find_by_id(id)
@@ -116,7 +116,7 @@ module Hominid
       #     :category_name = (string)  the category name for the category id
       #     :qty           = (double)  the quantity of items ordered
       #     :cost          = (double)  the cost of a single item (i.e., not the extended cost of the line)
-      order.merge(:campaign_id => @campaign_id)
+      order = order.merge(:campaign_id => @campaign_id)
       call("campaignEcommAddOrder", order)
     end
 

data/lib/hominid/helper.rb

@@ -5,22 +5,22 @@ module Hominid
     # Helper methods
     # --------------------------------
     
-    def self.account_details
+    def self.account_details(options = {})
       # Get details for this account.
-      new.call("getAccountDetails")
+      new(options).call("getAccountDetails")
     end
     
-    def self.convert_css_to_inline(html, strip_css = false)
+    def self.convert_css_to_inline(html, strip_css = false, options = {})
       # Convert CSS styles to inline styles and (optionally) remove original styles
       new.call("inlineCss", html, strip_css)
     end
     
-    def self.create_folder(name)
+    def self.create_folder(name, options = {})
       # Create a new folder to file campaigns in
-      new.call("createFolder", name)
+      new(options).call("createFolder", name)
     end
     
-    def self.generate_text(type, content)
+    def self.generate_text(type, content, options = {})
       # Have HTML content auto-converted to a text-only format.
       # The options for text type are:
       #   'html'      => Expects a string of HTML(default).
@@ -28,17 +28,17 @@ module Hominid
       #   'url'       => Expects a valid and public URL.
       #   'cid'       => Expects a campaign ID.
       #   'tid'       => Expects a template ID.
-      new.call("generateText", type, content)
+      new(options).call("generateText", type, content)
     end
     
-    def self.html_to_text(content)
+    def self.html_to_text(content, options = {})
       # Convert HTML content to text
-      new.call("generateText", 'html', content)
+      new(options).call("generateText", 'html', content)
     end
     
-    def self.ping
+    def self.ping(options = {})
       # Ping the Mailchimp API
-      new.call("ping")
+      new(options).call("ping")
     end
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hominid
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - Brian Getting
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-30 00:00:00 -07:00
+date: 2009-11-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency