cannikin-postal 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/postal/mailing.rb

@@ -79,7 +79,7 @@ module Postal
       @html_section_encoding = args[:html_section_encoding] 
       @is_html_section_encoded = args[:is_html_section_encoded] 
       @is_text_section_encoded = args[:is_text_section_encoded]
-      @list_name = args[:list_name]
+      @list_name = args[:list_name] || Postal.options[:list_name]
       @recency_number_of_mailings = args[:recency_number_of_mailings]
       @recency_which = args[:recency_which]
       @reply_to = args[:reply_to]

data/lib/postal/member.rb

@@ -3,30 +3,51 @@ module Postal
     
     class << self
       
-      def find_by_filter(args)
-        return Postal.driver.selectMembers(args)
+      def find_by_filter(*args)
+        unless args.find { |arg| arg.match(/ListName/) }
+          args << "ListName=#{Postal.options[:list_name]}"
+        end
+        if members = Postal.driver.selectMembers(args)
+          members.collect do |member|
+            demographics = {}
+            member.demographics.each do |demo|
+              demographics.merge!({ demo.name.to_sym => demo.value })
+            end
+            Member.new(:email => member.emailAddress, :name => member.fullName, :id => member.memberID, :list_name => member.listName, :demographics => demographics)
+          end
+        else
+          return nil
+        end
       end
       
       
       # Will NOT let you delete the entire list's members (only pass a ListName) Returns the number of members that were deleted, or nil if none were
-      def destroy(args)
-        raise Postal::WouldDeleteAllMembers, 'Not passing any parameters (other than ListName) to this method will delete ALL members of a list. If you really want to delete all members of this list, use destroy! instead.' if args.to_a.size == 1 && args.to_a.first.match(/ListName/)
+      def destroy(*args)
+        unless args.find { |arg| arg.match(/ListName/) }
+          args << "ListName=#{Postal.options[:list_name]}"
+        end
+        # raise Postal::WouldDeleteAllMembers, 'Not passing any parameters (other than ListName) to this method will delete ALL members of a list. If you really want to delete all members of this list, use destroy! instead.' if args.to_a.size == 1 && args.to_a.first.match(/ListName/)
         return Postal.driver.deleteMembers(args)
       end
       
       
       # WILL let you delete an entire list's members (only pass a ListName). Returns the number of members that were deleted, or nil if none were
-      def destroy!(args)
-        return Postal.driver.deleteMembers(args)
-      end
+      # def destroy!(*args)
+      #   return Postal.driver.deleteMembers(args)
+      # end
       
       
       protected
       
         def find_by_email(args,options)
-          list_name = args.last
-          member_id = 0
+          if args.size == 1
+            list_name = Postal.options[:list_name]
+          else
+            list_name = args.last
+          end
           email = args.first
+          member_id = 0
+
           begin
             return Postal.driver.getMemberID(Postal::Lmapi::SimpleMemberStruct.new(list_name,member_id,email))
           rescue SOAP::FaultError
@@ -55,17 +76,19 @@ module Postal
       
     end
     
-    DEFAULT_ATTRIBUTES = { :id => nil, :email => nil, :name => nil, :list_name => nil, :demographics => nil }
+    DEFAULT_ATTRIBUTES = { :id => nil, :email => nil, :name => nil, :list_name => nil, :demographics => {} }
     
     attr_accessor :id, :email, :name, :list_name, :demographics
     
+    
     # Create a new member instance
-    def initialize(email,name,list_name,demographics={})
-      @id = nil
-      @email = email
-      @name = name
-      @list_name = list_name
-      @demographics = demographics
+    def initialize(attributes={})
+      attributes = DEFAULT_ATTRIBUTES.merge(attributes)
+      @id = attributes[:id]
+      @email = attributes[:email]
+      @name = attributes[:name]
+      @list_name = attributes[:list_name] || Postal.options[:list_name]
+      @demographics = attributes[:demographics]
     end
     
     

data/postal.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{postal}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob Cameron"]

data/test/lyris_sample.yml

@@ -1,7 +1,8 @@
 # This is the Lyris config for your tests.  This runs your test against a real Lyris implementation, so make sure
 # you're using a test list that won't mind having tons of users added and subtracted on a regular basis.
 #
-#   valid_email => when testing mailings, this is where they will be sent to
+#   email_in_list => when testing mailings, this is where they will be sent to (this user is on your list)
+#   email_not_in_list => another test email, but this email address isn't in your list
 #   from: => used as the From: for those test mailings
 
 config:
@@ -9,6 +10,7 @@ config:
   password: company123
   wsdl: http://mail.company.com:82/?wsdl
   list_name: company-sample
-  valid_email: me@company.com
+  email_in_list: me@company.com
+  email_not_in_list: other@somewhere.com
   from: The Company <noreply@company.com>
   

data/test/mailing_test.rb

@@ -9,9 +9,18 @@ class MailingTest < Test::Unit::TestCase
   end
   
   def test_can_send_valid_mailing
-    mail = Postal::Mailing.new( :to => @config['valid_email'], 
+    mail = Postal::Mailing.new( :to => @config['email_in_list'], 
                                 :html_message => "<p>Test from Postal at #{Time.now.to_s}</p>", 
-                                :text_message => 'Test from Postal at #{Time.now.to_s}', 
+                                :text_message => 'Test test from Postal at #{Time.now.to_s}', 
+                                :from => @config['from'],
+                                :subject => 'postal_test.rb')
+    assert mail.valid?
+    assert mail.send
+    
+    # with explicit list_name
+    mail = Postal::Mailing.new( :to => @config['email_in_list'], 
+                                :html_message => "<p>Test from Postal at #{Time.now.to_s}</p>", 
+                                :text_message => 'Test test from Postal at #{Time.now.to_s}', 
                                 :from => @config['from'],
                                 :list_name => @config['list_name'],
                                 :subject => 'postal_test.rb')
@@ -19,23 +28,29 @@ class MailingTest < Test::Unit::TestCase
     assert mail.send
   end
   
+  def test_can_send_email_to_address_not_in_list
+    mail = Postal::Mailing.new( :to => @config['email_not_in_list'], 
+                                :html_message => "<p>Test from Postal at #{Time.now.to_s}</p>", 
+                                :text_message => 'Text test from Postal at #{Time.now.to_s}', 
+                                :from => @config['from'],
+                                :subject => 'postal_test.rb')
+    assert mail.send
+  end
+  
   def test_can_send_mailing_after_making_valid
-    mail = Postal::Mailing.new( :to => @config['valid_email'], 
+    mail = Postal::Mailing.new( :to => @config['email_in_list'], 
                                 :html_message => "<p>Test from Postal at #{Time.now.to_s}</p>", 
-                                :text_message => 'Test from Postal at #{Time.now.to_s}', 
                                 :from => @config['from'] )
     assert !mail.valid?
     mail.list_name = @config['list_name']
     assert !mail.valid?
     mail.subject = 'postal_test.rb'
     assert mail.valid?
-    assert mail.send
   end
   
   def test_cannot_send_invalid_mailing
     mail = Postal::Mailing.new( :to => @config['valid_email'], 
                                 :html_message => "<p>Test from Postal at #{Time.now.to_s}</p>", 
-                                :text_message => 'Test from Postal at #{Time.now.to_s}', 
                                 :from => @config['from'] )
     assert !mail.valid?
     assert !mail.send

data/test/member_test.rb

@@ -14,54 +14,74 @@ class MemberTest < Test::Unit::TestCase
   
   # members
   def test_can_create_member
-    assert Postal::Member.new("john.doe#{rand(1000000)}@anonymous.com", "John Doe", @config['list_name']).save
-    assert Postal::Member.new("john.doe#{rand(1000000)}@anonymous.com", "John Doe", @config['list_name']).save!
-    assert Postal::Member.new("john.doe#{rand(1000000)}@anonymous.com", '', @config['list_name']).save              # create member with no name
-    assert Postal::Member.new("john.doe#{rand(1000000)}@anonymous.com", '', @config['list_name']).save!             # create member with no name
+    assert Postal::Member.new(:email => "john.doe#{rand(1000000)}@anonymous.com", :name => "John Doe").save
+    assert Postal::Member.new(:email => "john.doe#{rand(1000000)}@anonymous.com", :name => "John Doe").save!
+    assert Postal::Member.new(:email => "john.doe#{rand(1000000)}@anonymous.com").save              # create member with no name
+    assert Postal::Member.new(:email => "john.doe#{rand(1000000)}@anonymous.com").save!             # create member with no name
+  end
+  
+  def test_can_create_member_with_explicit_list
+    assert Postal::Member.new(:email => "john.doe#{rand(1000000)}@anonymous.com", :name => "John Doe", :list_name => @config['list_name']).save
   end
 
   def test_duplicate_member_cannot_be_saved
-    new_member = Postal::Member.new("john.doe#{rand(1000000)}@anonymous.com","Original",@config['list_name'])
+    new_member = Postal::Member.new(:email => "john.doe#{rand(1000000)}@anonymous.com", :name => "Original")
     new_member.save
-    repeat_member = Postal::Member.new(new_member.email,"Duplicate",@config['list_name'])
+    repeat_member = Postal::Member.new(:email => new_member.email, :name => "Duplicate")
     assert !repeat_member.save
     assert_raises(Postal::CouldNotCreateMember) { repeat_member.save! }
   end
   
   def test_create_user_in_one_step
-    assert Postal::Member.create("john.doe#{rand(1000000)}@anonymous.com","John Doe", @config['list_name'])
-    assert Postal::Member.create!("john.doe#{rand(1000000)}@anonymous.com","John Doe", @config['list_name'])
+    assert Postal::Member.create(:email => "john.doe#{rand(1000000)}@anonymous.com", :name => "John Doe")
+    assert Postal::Member.create!(:email => "john.doe#{rand(1000000)}@anonymous.com", :name => "John Doe")
   end
   
   def test_can_update_user_demographics_after_creation
-    new_member = Postal::Member.create("john.doe#{rand(1000000)}@anonymous.com","John Doe", @config['list_name'])
+    new_member = Postal::Member.create(:email => "john.doe#{rand(1000000)}@anonymous.com", :name => "John Doe")
     assert new_member.update_attributes(:field_0 => 'Baseball')
   end
   
   def test_can_create_user_and_demographics_at_creation
-    assert Postal::Member.create("john.doe#{rand(1000000)}@anonymous.com","John Doe", @config['list_name'], :field_0 => 'Baseball', :field_1 => 'Male')
+    assert Postal::Member.create(:email => "john.doe#{rand(1000000)}@anonymous.com", :name => "John Doe", :field_0 => 'Baseball', :field_1 => 'Male')
   end
   
   def test_can_find_member_by_id
-    new_member = Postal::Member.create("john.doe#{rand(1000000)}@anonymous.com","John Doe", @config['list_name'])
-    assert Postal::Member.find(new_member.id, @config['list_name'])
+    new_member = Postal::Member.create(:email => "john.doe#{rand(1000000)}@anonymous.com", :name => "John Doe")
+    assert Postal::Member.find(new_member.id)
+    assert Postal::Member.find(new_member.id, @config['list_name'])   # with explicit list_name
   end
   
   def test_can_find_member_by_email
-    new_member = Postal::Member.create("john.doe#{rand(1000000)}@anonymous.com","John Doe", @config['list_name'])
-    assert Postal::Member.find(new_member.email, @config['list_name'])
+    new_member = Postal::Member.create(:email => "john.doe#{rand(1000000)}@anonymous.com", :name => "John Doe")
+    assert Postal::Member.find(new_member.email)
+    assert Postal::Member.find(new_member.email, @config['list_name'])    # with explicit list_name
   end
   
   def test_can_find_member_by_filters
-    Postal::Member.create("john.doe#{rand(1000000)}@anonymous.com","John Doe", @config['list_name'])
-    assert Postal::Member.find_by_filter(["ListName=#{@config['list_name']}",'EmailAddress like john.doe%'])
+    Postal::Member.create(:email => "john.doe#{rand(1000000)}@anonymous.com", :name => "John Doe")
+    assert Postal::Member.find_by_filter('EmailAddress like john.doe%')
+    assert Postal::Member.find_by_filter("ListName=#{@config['list_name']}",'EmailAddress like john.doe%')  # with explicit list_name
   end
   
   def test_can_delete_member
-    new_member = Postal::Member.create("john.doe-delete@anonymous.com","John Doe", @config['list_name'])
-    assert Postal::Member.find(new_member.email, @config['list_name'])
-    Postal::Member.destroy(["ListName=#{@config['list_name']}","EmailAddress like john.doe-delete%"])
-    assert !Postal::Member.find(new_member.email, @config['list_name'])
+    new_member = Postal::Member.create(:email => "john.doe-delete@anonymous.com", :name => "John Doe")
+    assert Postal::Member.find(new_member.email)
+    Postal::Member.destroy("EmailAddress like john.doe-delete%")
+    assert !Postal::Member.find(new_member.email)
+    
+    # explicit list_name
+    new_member = Postal::Member.create(:email => "john.doe-delete@anonymous.com", :name => "John Doe")
+    assert Postal::Member.find(new_member.email)
+    Postal::Member.destroy("ListName=#{@config['list_name']}","EmailAddress like john.doe-delete%")
+    assert !Postal::Member.find(new_member.email)
   end
-
+  
+  def test_can_create_find_and_update_member
+    Postal::Member.create(:email => "john.doe#{rand(1000000)}@anonymous.com", :name => "John Doe")
+    assert member = Postal::Member.find_by_filter('EmailAddress like john.doe%')
+    assert member.first.update_attributes(:field_0 => 'Baseball')
+    assert_equal Postal::Member.find_by_filter('EmailAddress like john.doe%').first.demographics[:field_0], 'Baseball'
+  end
+  
 end

data/test/test_helper.rb

@@ -13,10 +13,11 @@ class Test::Unit::TestCase
     Postal.options[:wsdl] = @config['wsdl']
     Postal.options[:username] = @config['username']
     Postal.options[:password] = @config['password']
+    Postal.options[:list_name] = @config['list_name']
   end
   
   def delete_test_members
-    Postal::Member.destroy(["ListName=#{@config['list_name']}",'EmailAddress like john.doe%'])
+    Postal::Member.destroy('EmailAddress like john.doe%')
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cannikin-postal
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Rob Cameron
@@ -47,6 +47,7 @@ files:
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/cannikin/postal
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -67,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Gem for talking to the Lyris API