acts_as_icontact 0.2.4 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/acts_as_icontact.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_icontact}
-  s.version = "0.2.4"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stephen Eley"]
-  s.date = %q{2009-07-29}
+  s.date = %q{2009-08-01}
   s.default_executable = %q{icontact}
   s.description = %q{ActsAsIcontact connects Ruby applications with the iContact e-mail marketing service using the iContact API v2.0.  Building on the RestClient gem, it offers two significant feature sets:
 
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
      "lib/acts_as_icontact/exceptions.rb",
      "lib/acts_as_icontact/rails.rb",
      "lib/acts_as_icontact/rails/callbacks.rb",
+     "lib/acts_as_icontact/rails/lists.rb",
      "lib/acts_as_icontact/rails/macro.rb",
      "lib/acts_as_icontact/rails/mappings.rb",
      "lib/acts_as_icontact/resource.rb",

data/lib/acts_as_icontact/rails.rb

@@ -16,6 +16,7 @@ end
 if defined?(::ActiveRecord)
   module ::ActiveRecord
     class Base
+      extend ActsAsIcontact::Rails::ClassMethods::Lists
       extend ActsAsIcontact::Rails::ClassMethods::Mappings
       extend ActsAsIcontact::Rails::ClassMethods::Macro
     end

data/lib/acts_as_icontact/rails/callbacks.rb

@@ -5,15 +5,10 @@ module ActsAsIcontact
       protected
       # Called after a new record has been saved.  Creates a new contact in iContact.
       def icontact_after_create
+        logger.debug "ActsAsIcontact creating contact for Rails ID: #{id}"
         c = ActsAsIcontact::Contact.new
-        self.class.icontact_mappings.each do |rails, iContact|
-          if (value = self.send(rails))
-            ic = (iContact.to_s + '=').to_sym   # Blah. This feels like it should be easier.
-            c.send(ic, value)
-          end
-        end
-        if c.save
-          # Update with iContact fields returned
+        update_contact_from_rails_fields(c)
+        if attempt_contact_save(c)
           @icontact_in_progress = true
           self.class.icontact_mappings.each do |rails, iContact|
             unless (value = c.send(iContact)).blank?
@@ -22,20 +17,21 @@ module ActsAsIcontact
             end
           end
           self.save
+          # Subscribe the contact to any lists
+          self.class.icontact_default_lists.each do |list|
+            c.subscribe(list)
+          end
           @icontact_in_progress = false  # Very primitive loop prevention
         end
       end
 
+      # Called after an existing record has been updated.  Updates an existing contact in iContact if one
+      # can be found; otherwise creates a new one.
       def icontact_after_update
         unless @icontact_in_progress # Avoid callback loops
-          c = find_contact_by_identity
-          self.class.icontact_mappings.each do |rails, iContact|
-            if (value = self.send(rails))
-              ic = (iContact.to_s + '=').to_sym   # Blah. This feels like it should be easier.
-              c.send(ic, value)
-            end
-          end
-          c.save
+          c = find_contact_by_identity or ActsAsIcontact::Contact.new
+          update_contact_from_rails_fields(c)
+          attempt_contact_save(c)
           # No need to update the record this time; iContact field changes don't have side effects
         end
       end
@@ -54,6 +50,31 @@ module ActsAsIcontact
         nil
       end
       
+      def update_contact_from_rails_fields(contact)
+        self.class.icontact_mappings.each do |rails, iContact|
+          if (value = self.send(rails))
+            ic = (iContact.to_s + '=').to_sym   # Blah. This feels like it should be easier.
+            contact.send(ic, value)
+          end
+        end
+      end
+      
+      def attempt_contact_save(contact)
+        if self.class.icontact_exception_on_failure
+          contact.save!
+          logger.info "ActsAsIcontact contact created. Rails ID: #{id}; iContact ID: #{contact.id}"
+          true
+        else
+          if contact.save
+            logger.info "ActsAsIcontact contact created. Rails ID: #{id}; iContact ID: #{contact.id}"
+            true
+          else
+            logger.warn "ActsAsIcontact contact creation failed! iContact says: #{contact.error}"
+            false
+          end
+        end
+      end
+        
     end
   end
 end

data/lib/acts_as_icontact/rails/lists.rb

@@ -0,0 +1,25 @@
+module ActsAsIcontact
+  module Rails
+    module ClassMethods
+      module Lists
+        
+        # The lists that each new contact will be subscribed to upon creation.  Set by the :list and :lists 
+        # options to acts_as_icontact.
+        def icontact_default_lists
+          @icontact_default_lists
+        end
+        
+        protected
+        
+        # Builds an array of any lists in the :list or :lists parameter.
+        def set_default_lists(list, lists)
+          # Combines :list and :lists parameters into one array
+          @icontact_default_lists = []
+          @icontact_default_lists << list if list
+          @icontact_default_lists += lists if lists
+        end
+
+      end
+    end
+  end
+end

data/lib/acts_as_icontact/rails/macro.rb

@@ -6,23 +6,30 @@ module ActsAsIcontact
         # The core macro for ActsAsIcontact's Rails integration.  Establishes callbacks to keep Rails models in
         # sync with iContact.  See the README for more on what it does.
         def acts_as_icontact(options = {})
+          logger.info "Initializing ActsAsIcontact module..."
+
           # Fail on exceptions?
           @icontact_exception_on_failure = options.delete(:exception_on_failure) || false
+          logger.info "ActsAsIcontact #{'NOT ' unless @icontact_exception_on_failure}returning exceptions on failure."
           
-          # Combines :list and :lists parameters into one array
-          @icontact_default_lists = []
-          @icontact_default_lists << options.delete(:list) if options.has_key?(:list)
-          @icontact_default_lists += options.delete(:lists) if options.has_key?(:lists)
+          # Set up lists for autosubscribe
+          set_default_lists(options.delete(:list), options.delete(:lists))
+          logger.info "ActsAsIcontact autosubscribe lists: #{icontact_default_lists.join}" unless icontact_default_lists.empty?
           
           # Set up field mappings
           set_mappings(options)
+          logger.info "ActsAsIcontact field mappings: #{icontact_mappings}"
           
           # If we haven't flaked out so far, we must be doing okay.  Make magic happen.
           include ActsAsIcontact::Rails::Callbacks
           after_create :icontact_after_create
           after_update :icontact_after_update
+          logger.info "ActsAsIcontact callbacks created.  Have Fun."
+        end
+        
+        def icontact_exception_on_failure
+          @icontact_exception_on_failure
         end
-
       end
     end
   end

data/lib/acts_as_icontact/resource.rb

@@ -71,7 +71,7 @@ module ActsAsIcontact
       end
       parsed = JSON.parse(response)
       if parsed[result_type].empty?
-        @errors = parsed["warnings"]
+        @errors = parsed["warnings"] || []
         false
       else
         @properties = (new_record? ? parsed[result_type].first : parsed[result_type])

data/spec/rails_spec.rb

@@ -11,6 +11,7 @@ describe "Rails integration" do
   before(:all) do
     ActiveRecord::Base.establish_connection :adapter => :nulldb,
                                             :schema => File.dirname(__FILE__) + '/examples/schema.rb'
+    
   end
   
   before(:each) do
@@ -40,11 +41,16 @@ describe "Rails integration" do
         def self.name
           "Person"
         end
+        
       end
       
     end
     
     @class = @module.module_eval("Person")
+    # Stub out the logger
+    @class.stubs(:logger).returns(stub('Logger', :info => true, :warn => true, :error => true, :debug => true))
+    @class.any_instance.stubs(:logger).returns(stub('Logger', :info => true, :warn => true, :error => true, :debug => true))
+
   end
 
   it "allows the acts_as_icontact macro method" do

data/spec/rails_spec/callbacks_spec.rb

@@ -17,6 +17,11 @@ share_as :Callbacks do
         @person.save
         @person.icontact_id.should == 333444
       end
+      
+      it "subscribes the Person to any lists" do
+        ActsAsIcontact::Contact.any_instance.expects(:subscribe).with("First Test").returns(true)
+        @person.save
+      end
     end
     
     context "for update" do

data/spec/support/spec_fakeweb.rb

@@ -59,4 +59,4 @@ FakeWeb.register_uri(:get, "#{ic}/subscriptions?limit=500&listId=444444", :body
 FakeWeb.register_uri(:get, "#{ic}/subscriptions?limit=1&contactId=333444", :body => %q<{"subscriptions":[{"status":"normal","addDate":"2009-07-27T15:36:37-04:00","contactId":333444,"listId":444444, "subscriptionId":"444444_333333","confirmationMessageId":555666}]}>)
 FakeWeb.register_uri(:get, "#{ic}/subscriptions?limit=500&contactId=333444", :body => %q<{"subscriptions":[{"status":"normal","addDate":"2009-07-27T15:36:37-04:00","contactId":333444,"listId":444444, "subscriptionId":"444444_333444","confirmationMessageId":555666}]}>)
 FakeWeb.register_uri(:get, "#{ic}/subscriptions?limit=500&contactId=333333", :body => %q<{"subscriptions":[{"status":"normal","addDate":"2009-07-27T15:36:37-04:00","contactId":333333,"listId":444444, "subscriptionId":"444444_333333","confirmationMessageId":555666}]}>)
-
+FakeWeb.register_uri(:post, "#{ic}/subscriptions", :body => %q<{"subscriptions":[{"status":"normal","addDate":"2009-07-27T15:36:37-04:00","contactId":333333,"listId":444444, "subscriptionId":"444444_333333","confirmationMessageId":555666}]}>)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_icontact
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - Stephen Eley
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-29 00:00:00 -04:00
+date: 2009-08-01 00:00:00 -04:00
 default_executable: icontact
 dependencies: []
 
@@ -42,6 +42,7 @@ files:
 - lib/acts_as_icontact/exceptions.rb
 - lib/acts_as_icontact/rails.rb
 - lib/acts_as_icontact/rails/callbacks.rb
+- lib/acts_as_icontact/rails/lists.rb
 - lib/acts_as_icontact/rails/macro.rb
 - lib/acts_as_icontact/rails/mappings.rb
 - lib/acts_as_icontact/resource.rb