constant_contact 1.3.2 → 1.3.3

data/lib/constant_contact/activity.rb

@@ -2,7 +2,7 @@
 module ConstantContact
   class Activity < Base
     self.format = ActiveResource::Formats::HtmlEncodedFormat
-    attr_accessor :contacts, :lists, :activity_type
+    attr_accessor :contacts, :lists, :activity_type, :raw_data # Data is a reserved word in Rails
 
     def self.parse_id(url)
       url.to_s.split('/').last
@@ -29,16 +29,19 @@ module ConstantContact
     protected
     def encoded_data
       result = "&data="
-      result += CGI.escape("Email Address,First Name,Last Name\n")
-      contact_strings = []
-      self.contacts.each do |contact|
-        contact_strings << "#{contact.email_address}, #{contact.first_name}, #{contact.last_name}"        
-      end      
-      result += CGI.escape(contact_strings.join("\n"))        
+      if self.raw_data.nil?
+        result += CGI.escape("Email Address,First Name,Last Name\n")
+        contact_strings = []
+        self.contacts.each do |contact|
+          contact_strings << "#{contact.email_address}, #{contact.first_name}, #{contact.last_name}"        
+        end      
+        result += CGI.escape(contact_strings.join("\n"))
+      else
+        result += CGI.escape(self.raw_data)
+      end
       return result
     end
     
-    
     def encoded_lists
       result = ""
       self.lists.each do |list|

data/lib/constant_contact/version.rb

@@ -1,3 +1,3 @@
 module ConstantContact
-  VERSION = '1.3.2'.freeze
+  VERSION = '1.3.3'.freeze
 end

data/test/constant_contact/activity_test.rb

@@ -3,38 +3,60 @@ require File.dirname(__FILE__) + '/../test_helper'
 class Activity < Test::Unit::TestCase
   
   context 'encode' do
-    setup do 
-      @contacts = []
-      3.times do |n|
-        @contacts << ConstantContact::Contact.new(:first_name => "Fred#{n}",
-                                                  :last_name => "Test#{n}",
-                                                  :email_address => "email#{n}@gmail.com")
-      end        
-      @activity = ConstantContact::Activity.new(:activity_type => "SV_ADD")
-      @activity.contacts = @contacts
-      @list = ConstantContact::List.new
-      @list.stubs(:id).returns('http://api.constantcontact.com/ws/customers/joesflowers/lists/2')
-      @activity.lists = [@list]
+    context 'with raw data' do
+      setup do
+        @data = "Email Address,Custom Field1\nemail1@domain.com,custom1\nemail2@domain.com,custom2"
+        @list = ConstantContact::List.new
+        @list.stubs(:id).returns('http://api.constantcontact.com/ws/customers/freerobby/lists/3')
+        @activity = ConstantContact::Activity.new(
+          :activity_type => "SV_ADD"
+        )
+        @activity.raw_data = @data
+        @activity.lists = [@list]
+      end
+      should 'use raw data, bypassing contact parsing' do
+        assert_match(CGI.escape(@data), @activity.encode)
+      end
+      should 'include activity type' do
+        assert_match('activityType=SV_ADD', @activity.encode)
+      end
+      should 'include list' do
+        assert_match(CGI.escape(@list.id), @activity.encode)
+      end
     end
-    
-    should 'include activity type' do
-      assert_match(/activityType=SV_ADD/, @activity.encode)
-    end
-    
-    should 'include contacts data' do
-      assert_match(/\&data\=Email\+Address\%2CFirst\+Name\%2CLast\+Name\%0A/, @activity.encode)
-      assert_match(/email0\%40gmail\.com\%2C\+Fred0\%2C\+Test0\%0A/, @activity.encode)
-    end
-    
-    should 'include lists' do
-      assert_match(/Test2\&lists\=http\%3A\%2F\%2Fapi\.constantcontact\.com\%2Fws\%2Fcustomers\%2Fjoesflowers\%2Flists\%2F2/, @activity.encode)
+    context 'with contact data' do
+      setup do 
+        @contacts = []
+        3.times do |n|
+          @contacts << ConstantContact::Contact.new(:first_name => "Fred#{n}",
+                                                    :last_name => "Test#{n}",
+                                                    :email_address => "email#{n}@gmail.com")
+        end        
+        @activity = ConstantContact::Activity.new(:activity_type => "SV_ADD")
+        @activity.contacts = @contacts
+        @list = ConstantContact::List.new
+        @list.stubs(:id).returns('http://api.constantcontact.com/ws/customers/joesflowers/lists/2')
+        @activity.lists = [@list]
+      end
+
+      should 'include activity type' do
+        assert_match(/activityType=SV_ADD/, @activity.encode)
+      end
+
+      should 'include contacts data' do
+        assert_match(/\&data\=Email\+Address\%2CFirst\+Name\%2CLast\+Name\%0A/, @activity.encode)
+        assert_match(/email0\%40gmail\.com\%2C\+Fred0\%2C\+Test0\%0A/, @activity.encode)
+      end
+
+      should 'include lists' do
+        assert_match(/Test2\&lists\=http\%3A\%2F\%2Fapi\.constantcontact\.com\%2Fws\%2Fcustomers\%2Fjoesflowers\%2Flists\%2F2/, @activity.encode)
+      end
     end
-    
   end
   
   context 'format' do 
     should 'be html encoded' do 
-      assert_equal ActiveResource::Formats[:html_encoded], ConstantContact::Activity.format
+      assert_equal ActiveResource::Formats[:html_encoded], ConstantContact::Activity.connection.format
     end
   end
   

data/test/test_helper.rb

@@ -2,7 +2,6 @@ require 'rubygems'
 require 'active_support/test_case'
 require 'test/unit'
 require 'shoulda'
-require 'matchy'
 require 'mocha'
 require 'fakeweb'
 
@@ -16,7 +15,7 @@ class Test::Unit::TestCase
 end
 
 def fixture_file(filename)
-  return '' if filename == ''
+  return '' if filename.blank?
   file_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/' + filename)
   File.read(file_path)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: constant_contact
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - Tim Case
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-30 00:00:00 -05:00
+date: 2011-01-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,7 +80,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: matchy
+  name: mocha
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -94,7 +94,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: fakeweb
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -107,20 +107,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id007
 description: This is a very ActiveResource-like ruby wrapper to the Constant Contact API.
 email: 
 executables: []