constant_contact 1.2.1 → 1.2.2

data/lib/constant_contact.rb

@@ -1,7 +1,6 @@
 directory = File.expand_path(File.dirname(__FILE__))
 
 require 'active_resource'
-require 'action_pack'
 require 'builder'
 require 'cgi' unless defined?(CGI) && defined?(CGI::escape)
 require File.join(directory, 'constant_contact', 'formats')

data/lib/constant_contact/formats/atom_format.rb

@@ -17,40 +17,47 @@ module ActiveResource
       end
 
       def decode(xml)
-        if xml =~ /\<atom\:/ 
-          xml.gsub!( /\<atom\:/, '<' )
-          xml.gsub!( /\<\/atom\:/, '</' )
+        xml.gsub!( /\<(\/?)atom\:/, '<\1' ) # the "events" feeds have "atom:" in front of tags, for some reason
+        doc = REXML::Document.new(xml)
+        return [] if no_content?(doc)
+        result = Hash.from_xml(from_atom_data(doc))
+
+        if is_collection?(doc)
+          list = result['records']
+
+          next_link = REXML::XPath.first(doc, "/feed/link[@rel='next']")
+          if next_link
+            next_path = next_link.attribute('href').value
+            next_page = ::ConstantContact::Base.connection.get(next_path)
+            list.concat(next_page)
+          end
+
+          list
+        else
+          result.values.first
         end
-        return [] if no_content?(xml)
-        result = Hash.from_xml(from_atom_data(xml))
-        is_collection?(xml) ? result['records'] : result.values.first
       end
       
 
       private
       
-      def from_atom_data(xml)
-        if is_collection?(xml)
-          result = content_from_collection(xml)
+      def from_atom_data(doc)
+        if is_collection?(doc)
+          content_from_collection(doc)
         else
-          result = content_from_single_record(xml)
+          content_from_single_record(doc)
         end
-        result.delete('xmlns')
-        return result
       end
       
-      def no_content?(xml)
-        doc = REXML::Document.new(xml)
+      def no_content?(doc)
         REXML::XPath.match(doc,'//content').size == 0
       end
       
-      def is_collection?(xml)
-        doc = REXML::Document.new(xml)
+      def is_collection?(doc)
         REXML::XPath.match(doc,'//content').size > 1
       end
 
-      def content_from_single_record(xml)
-        doc = REXML::Document.new(xml)
+      def content_from_single_record(doc)
         str = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
         REXML::XPath.each(doc, '//content') do |e|
           content = e.children[1]
@@ -59,19 +66,17 @@ module ActiveResource
         str
       end
       
-      def content_from_collection(xml)
-        doc = REXML::Document.new(xml)
+      def content_from_collection(doc)
         str = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><records type=\"array\">"
         REXML::XPath.each(doc, '//content') do |e|
           content = e.children[1]
           str << content.to_s
         end
-        str << "</records>" 
+        str << "</records>"
         str
       end
       
-      def content_from_member(xml)
-        doc = REXML::Document.new(xml)
+      def content_from_member(doc)
         str = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
         REXML::XPath.each(doc, '//content') do |e|
          content = e.children[1].children

data/lib/constant_contact/version.rb

@@ -1,3 +1,3 @@
 module ConstantContact
-  Version = '1.2.1'.freeze
+  Version = '1.2.2'.freeze
 end

data/test/constant_contact/activity_test.rb

@@ -34,7 +34,7 @@ class Activity < Test::Unit::TestCase
   
   context 'format' do 
     should 'be html encoded' do 
-      assert_equal ActiveResource::Formats[:html_encoded], ConstantContact::Activity.connection.format
+      assert_equal ActiveResource::Formats[:html_encoded], ConstantContact::Activity.format
     end
   end
   

data/test/constant_contact/fifty_test.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class FiftyTest < Test::Unit::TestCase
+
+  context 'find more than 50' do
+    setup do
+      ConstantContact::Base.api_key = "fc2113f8-9336-4886-9b04-61aa5092d428"
+#      ConstantContact::Base.user = "dtjohnsospam"
+#      ConstantContact::Base.password = "qwerty7"
+      ConstantContact::Base.user = "ChiefExperts"
+      ConstantContact::Base.password = "danbcr1234"
+    end
+
+    should 'return more than 50 members of list' do
+      FakeWeb.allow_net_connect = true
+#      lists = ConstantContact::List.find(:all, :params => { :list_id => 3 })
+#      lists.each do |list|
+#        next unless list.respond_to? :SortOrder
+        members = ConstantContact::Member.find(:all, :params => { :list_id => 3 })
+      assert members.size > 50
+#        assert_equal list.contact_count.to_i, members.size
+#      end
+    end
+
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: constant_contact
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Tim Case
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-29 00:00:00 -04:00
+date: 2010-11-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,34 +36,34 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: actionpack
+  name: builder
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 1
+        - 2
+        version: 2.1.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: builder
+  name: activesupport
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
-  type: :runtime
+        - 0
+        version: "0"
+  type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: shoulda
@@ -152,10 +152,13 @@ files:
 - lib/constant_contact/member.rb
 - lib/constant_contact/version.rb
 - lib/constant_contact.rb
+- MIT-LICENSE
+- README.md
 - test/constant_contact/activity_test.rb
 - test/constant_contact/atom_format_test.rb
 - test/constant_contact/base_test.rb
 - test/constant_contact/contact_test.rb
+- test/constant_contact/fifty_test.rb
 - test/constant_contact/list_test.rb
 - test/constant_contact/member_test.rb
 - test/constant_contact_test.rb
@@ -172,8 +175,6 @@ files:
 - test/fixtures/single_contact_by_id.xml
 - test/fixtures/single_contact_by_id_with_no_contactlists.xml
 - test/test_helper.rb
-- MIT-LICENSE
-- README.md
 has_rdoc: true
 homepage: http://github.com/idris/constant_contact
 licenses: []
@@ -210,5 +211,25 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: ActiveResource wrapper for the Constant Contact API.
-test_files: []
-
+test_files: 
+- test/constant_contact/activity_test.rb
+- test/constant_contact/atom_format_test.rb
+- test/constant_contact/base_test.rb
+- test/constant_contact/contact_test.rb
+- test/constant_contact/fifty_test.rb
+- test/constant_contact/list_test.rb
+- test/constant_contact/member_test.rb
+- test/constant_contact_test.rb
+- test/fixtures/all_contacts.xml
+- test/fixtures/contactlistscollection.xml
+- test/fixtures/contactlistsindividuallist.xml
+- test/fixtures/memberscollection.xml
+- test/fixtures/multiple_contacts_by_emails.xml
+- test/fixtures/new_list.xml
+- test/fixtures/nocontent.xml
+- test/fixtures/senteventscollection.xml
+- test/fixtures/service_document.xml
+- test/fixtures/single_contact_by_email.xml
+- test/fixtures/single_contact_by_id.xml
+- test/fixtures/single_contact_by_id_with_no_contactlists.xml
+- test/test_helper.rb