postal 0.1.5 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.2

data/lib/postal.rb

@@ -8,6 +8,7 @@ require 'postal/lmapi/lmapi.rb'
 require 'postal/lmapi/lmapi_driver.rb'
 require 'postal/lmapi/lmapi_mapping_registry.rb'
 require 'postal/base'
+require 'postal/content'
 require 'postal/list'
 require 'postal/member'
 require 'postal/mailing'
@@ -20,14 +21,15 @@ module Postal
   class CouldNotSendMailing < StandardError; end;
   class WouldDeleteAllMembers < StandardError; end;
   
-  VERSION = '0.1.5'
+  VERSION = '0.2.2'
   LOGGER = Logger.new(STDOUT)
   
   DEFAULT_OPTIONS = { :debug => false }
   
   @options = {  :wsdl => nil, 
                 :username => nil, 
-                :password => nil }
+                :password => nil,
+                :proxy => nil }
   @driver = nil
   
   attr_accessor :options
@@ -37,6 +39,7 @@ module Postal
     unless @driver
       @driver = Postal::Lmapi::Soap.new(@options[:wsdl])
       @driver.options['protocol.http.basic_auth'] << [@options[:wsdl], @options[:username], @options[:password]]
+      @driver.options['protocol.http.proxy'] = @options[:proxy]
     end
     return @driver
   end

data/lib/postal/content.rb

@@ -0,0 +1,82 @@
+module Postal
+  class Content
+    
+    class << self
+      
+      def find_by_filter(*args)
+        unless args.find { |arg| arg.match(/ListName/) }
+          args << "ListName=#{Postal.options[:list_name]}"
+        end
+        if soap_contents = Postal.driver.selectContent(args)
+          contents = soap_contents.collect do |content|
+            puts content.inspect
+            Content.new(:content_id => content.contentID,
+                        :date_created => content.dateCreated, 
+                        :description => content.description, 
+                        :doc_parts => content.docParts, 
+                        :doc_type => content.docType,
+                        :header_from => content.headerFrom,
+                        :header_to => content.headerTo,
+                        :is_read_only => content.isReadOnly,
+                        :is_template => content.isTemplate,
+                        :list_name => content.listName,
+                        :native_title => content.nativeTitle,
+                        :site_name => content.siteName,
+                        :title => content.title)
+          end
+          if contents.size == 1
+            return contents.first
+          else
+            return contents
+          end
+        else
+          return nil
+        end
+      end
+      
+      
+      # really just an alias for find_by_filter but with no options
+      def find_all
+        find_by_filter
+      end
+      
+    
+    end
+    
+    DEFAULT_ATTRIBUTES = {:content_id => nil,
+                          :date_created => nil,
+                          :description => nil,
+                          :doc_parts => nil,
+                          :doc_type => nil,
+                          :header_from => nil,
+                          :header_to => nil,
+                          :is_read_only => nil,
+                          :is_template => nil,
+                          :list_name => nil,
+                          :native_title => nil,
+                          :site_name => nil,
+                          :title => nil}
+    
+    attr_accessor :content_id ,:date_created ,:description ,:doc_parts ,:doc_type ,:header_from ,:header_to ,:is_read_only ,:is_template ,:list_name ,:native_title ,:site_name ,:title
+    
+    
+    # Create a new member instance
+    def initialize(attributes={})
+      attributes = DEFAULT_ATTRIBUTES.merge(attributes)
+      @content_id = attributes[:content_id]
+      @date_created = attributes[:date_created]
+      @description = attributes[:description]
+      @doc_parts = attributes[:doc_parts]
+      @doc_type = attributes[:doc_type]
+      @header_from = attributes[:header_from]
+      @header_to = attributes[:header_to]
+      @is_read_only = attributes[:is_read_only]
+      @is_template = attributes[:is_template]
+      @list_name = attributes[:list_name]
+      @native_title = attributes[:native_title]
+      @site_name = attributes[:site_name]
+      @title = attributes[:title]
+    end
+    
+  end
+end

data/lib/postal/lmapi/lmapi.rb

@@ -48,6 +48,16 @@ module Postal
         @from = from
         @additionalHeaders = additionalHeaders
       end
+      
+      # This lets us initialize a new MailingStruct by passing in a SimpleMailingStruct
+      # mail = Postal::Lmapi::MailingStruct.new(content)
+      def [](method)
+        begin
+          self.send(method)
+        rescue
+          return nil
+        end
+      end
     end
 
     # {http://tempuri.org/ns1.xsd}MessageStruct

data/lib/postal/lmapi/lmapi_driver.rb

@@ -655,7 +655,7 @@ module Postal
         ]
       ]
 
-      def initialize(endpoint_url = nil)
+      def initialize(endpoint_url = nil, proxy = nil)
         endpoint_url ||= DefaultEndpointUrl
         super(endpoint_url, nil)
         self.mapping_registry = MappingRegistry::EncodedRegistry

data/lib/postal/mailing.rb

@@ -3,6 +3,11 @@ module Postal
     
     class << self
       
+      def import(content_id)
+        mail = Postal.driver.importContent(content_id)
+        return mail
+      end
+      
     end
     
     
@@ -32,7 +37,8 @@ module Postal
                           :title => nil,
                           :to => nil,
                           :track_opens => nil,
-                          :rewrite_date_when_sent => nil }
+                          :rewrite_date_when_sent => nil,
+                          :mailing => nil }
     
     attr_accessor :additional_headers, 
                   :attachments, 
@@ -60,71 +66,65 @@ module Postal
                   :title,
                   :to,
                   :track_opens,
-                  :rewrite_date_when_sent
+                  :rewrite_date_when_sent,
+                  :mailing
     
     # Create a new mailing ready to send
     def initialize(args={})
       args = DEFAULT_ATTRIBUTES.merge(args)
-      @to = args[:to] 
-      @additional_headers = args[:additional_headers] 
-      @attachments = args[:attachments] 
-      @bypass_moderation = args[:bypass_moderation] 
-      @campaign = args[:campaign] 
-      @char_set_id = args[:char_set_id] 
-      @detect_html = args[:detect_html] 
-      @dont_attempt_after_date = args[:dont_attempt_after_date] 
-      @enable_recovery = args[:enable_recovery] 
-      @from = args[:from] 
-      @html_message = args[:html_message] 
-      @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] || Postal.options[:list_name]
-      @recency_number_of_mailings = args[:recency_number_of_mailings]
-      @recency_which = args[:recency_which]
-      @reply_to = args[:reply_to]
-      @resend_after_days = args[:resend_after_days]
-      @sample_size = args[:sample_size]
-      @scheduled_mailing_date = args[:scheduled_mailing_date]
-      @subject = args[:subject]
-      @text_message = args[:text_message]
-      @text_section_encoding = args[:text_section_encoding]
-      @title = args[:title]
-      @to = args[:to]
-      @track_opens = args[:track_opens]
-      @rewrite_date_when_sent = args[:rewrite_date_when_sent]
+      @to = args[:to] 
+      
+      if args[:mailing].nil?
+        @additional_headers = args[:additional_headers] 
+        @attachments = args[:attachments] 
+        @bypass_moderation = args[:bypass_moderation] 
+        @campaign = args[:campaign] 
+        @char_set_id = args[:char_set_id] 
+        @detect_html = args[:detect_html] 
+        @dont_attempt_after_date = args[:dont_attempt_after_date] 
+        @enable_recovery = args[:enable_recovery] 
+        @from = args[:from] 
+        @html_message = args[:html_message] 
+        @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]
+        @recency_number_of_mailings = args[:recency_number_of_mailings]
+        @recency_which = args[:recency_which]
+        @reply_to = args[:reply_to]
+        @resend_after_days = args[:resend_after_days]
+        @sample_size = args[:sample_size]
+        @scheduled_mailing_date = args[:scheduled_mailing_date]
+        @subject = args[:subject]
+        @text_message = args[:text_message]
+        @text_section_encoding = args[:text_section_encoding]
+        @title = args[:title]
+        @to = args[:to]
+        @track_opens = args[:track_opens]
+        @rewrite_date_when_sent = args[:rewrite_date_when_sent]
+        @mailing = args[:mailing]
+      else
+        @subject = args[:mailing].subject
+        @is_html_section_encoded = args[:mailing].isHtmlSectionEncoded
+        @html_section_encoding = args[:mailing].htmlSectionEncoding
+        @html_message = args[:mailing].htmlMessage
+        @char_set_id = args[:mailing].charSetID
+        @is_text_section_encoded = args[:mailing].isTextSectionEncoded
+        @text_section_encoding = args[:mailing].textSectionEncoding
+        @title = args[:mailing].title
+        @text_message = args[:mailing].textMessage
+        @attachments = args[:mailing].attachments
+        @from = args[:mailing].from
+        @additional_headers = args[:mailing].additionalHeaders
+        @mailing = args[:mailing]
+      end
     end
     
     
     # Send the mailing
     def send
       if valid?
-        mail = Postal::Lmapi::MailingStruct.new(:additionalHeaders => @additional_headers, 
-                                                :attachments => @attachments, 
-                                                :bypassModeration => @bypass_moderation, 
-                                                :campaign => @campaign, 
-                                                :charSetID => @char_set_id, 
-                                                :detectHtml => @detect_html, 
-                                                :dontAttemptAfterDate => @dont_attempt_after_date, 
-                                                :enableRecovery => @enable_recovery, 
-                                                :from => @from, 
-                                                :htmlMessage => @html_message, 
-                                                :htmlSectionEncoding => @html_section_encoding, 
-                                                :isHtmlSectionEncoded => @is_html_section_encoded, 
-                                                :isTextSectionEncoded => @is_text_section_encoded,
-                                                :listName => @list_name,
-                                                :recencyNumberOfMailings => @recency_number_of_mailings,
-                                                :recencyWhich => @recency_which,
-                                                :replyTo => @reply_to,
-                                                :resendAfterDays => @resend_after_days,
-                                                :sampleSize => @sample_size,
-                                                :scheduledMailingDate => @scheduled_mailing_date,
-                                                :subject => @subject,
-                                                :textMessage => @text_message,
-                                                :textSectionEncoding => @text_section_encoding,
-                                                :title => @title,
-                                                :trackOpens => @track_opens,
-                                                :rewriteDateWhenSent => @rewrite_date_when_sent )
         
         # are we sending to a list of email addresses or member ids
         case @to.to_a.first
@@ -135,9 +135,44 @@ module Postal
           emails = []
           member_ids = @to.to_a
         end
-
-        return Postal.driver.sendMailingDirect(emails,member_ids,mail)
-      else
+        
+        if @mailing.nil?
+          mail = Postal::Lmapi::MailingStruct.new(:additionalHeaders => @additional_headers, 
+                                                  :attachments => @attachments, 
+                                                  :bypassModeration => @bypass_moderation, 
+                                                  :campaign => @campaign, 
+                                                  :charSetID => @char_set_id, 
+                                                  :detectHtml => @detect_html, 
+                                                  :dontAttemptAfterDate => @dont_attempt_after_date, 
+                                                  :enableRecovery => @enable_recovery, 
+                                                  :from => @from, 
+                                                  :htmlMessage => @html_message, 
+                                                  :htmlSectionEncoding => @html_section_encoding, 
+                                                  :isHtmlSectionEncoded => @is_html_section_encoded, 
+                                                  :isTextSectionEncoded => @is_text_section_encoded,
+                                                  :listName => @list_name,
+                                                  :recencyNumberOfMailings => @recency_number_of_mailings,
+                                                  :recencyWhich => @recency_which,
+                                                  :replyTo => @reply_to,
+                                                  :resendAfterDays => @resend_after_days,
+                                                  :sampleSize => @sample_size,
+                                                  :scheduledMailingDate => @scheduled_mailing_date,
+                                                  :subject => @subject,
+                                                  :textMessage => @text_message,
+                                                  :textSectionEncoding => @text_section_encoding,
+                                                  :title => @title,
+                                                  # :to => @to,
+                                                  :trackOpens => @track_opens,
+                                                  :rewriteDateWhenSent => @rewrite_date_when_sent )
+        
+          return Postal.driver.sendMailingDirect(emails,member_ids,mail)
+        else
+          mail = Postal::Lmapi::MailingStruct.new(@mailing)
+          mail.listName = @list_name || Postal.options[:list_name]
+          return Postal.driver.sendMailingDirect(emails,member_ids,mail)
+        end
+        
+      else  # mail wasn't valid
         return false
       end
     end

data/lib/postal/member.rb

@@ -8,16 +8,7 @@ module Postal
           args << "ListName=#{Postal.options[:list_name]}"
         end
         if soap_members = Postal.driver.selectMembers(args)
-          members = soap_members.collect do |member|
-            demographics = {}
-            member.demographics.each { |demo| demographics.merge!({ demo.name.to_sym => demo.value }) }
-            Member.new(:email => member.emailAddress, :name => member.fullName, :id => member.memberID, :list_name => member.listName, :demographics => demographics)
-          end
-          if members.size == 1
-            return members.first
-          else
-            return members
-          end
+          return parse_members(soap_members)
         else
           return nil
         end
@@ -52,7 +43,8 @@ module Postal
           member_id = 0
 
           begin
-            return Postal.driver.getMemberID(Postal::Lmapi::SimpleMemberStruct.new(list_name,member_id,email))
+            return find_by_filter("EmailAddress=#{email}")
+            # return Postal.driver.getMemberID(Postal::Lmapi::SimpleMemberStruct.new(list_name,member_id,email))
           rescue SOAP::FaultError
             return nil
           end
@@ -61,7 +53,8 @@ module Postal
       
         def find_by_id(args,options)
           member_id = args.first
-          return Postal.driver.getEmailFromMemberID(member_id)
+          return find_by_filter("MemberID=#{member_id}")
+          # return Postal.driver.getEmailFromMemberID(member_id)
         end
         
       
@@ -77,6 +70,19 @@ module Postal
           end
         end
       
+        def parse_members(raw)
+          members = raw.collect do |member|
+            demographics = {}
+            member.demographics.each { |demo| demographics.merge!({ demo.name.to_sym => demo.value }) }
+            Member.new(:email => member.emailAddress, :name => member.fullName, :id => member.memberID, :list_name => member.listName, :demographics => demographics)
+          end
+          if members.size == 1
+            return members.first
+          else
+            return members
+          end
+        end
+        
     end
     
     DEFAULT_ATTRIBUTES = { :id => nil, :email => nil, :name => nil, :list_name => nil, :demographics => {} }

data/postal.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{postal}
-  s.version = "0.1.5"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob Cameron"]
-  s.date = %q{2009-10-29}
+  s.date = %q{2009-11-19}
   s.description = %q{Lyris is an enterprise email service. Postal makes it easy for Ruby to talk to Lyris's API.}
   s.email = %q{cannikinn@gmail.com}
   s.extra_rdoc_files = [
@@ -22,6 +25,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "lib/postal.rb",
      "lib/postal/base.rb",
+     "lib/postal/content.rb",
      "lib/postal/list.rb",
      "lib/postal/lmapi/lmapi.rb",
      "lib/postal/lmapi/lmapi_driver.rb",
@@ -29,6 +33,7 @@ Gem::Specification.new do |s|
      "lib/postal/mailing.rb",
      "lib/postal/member.rb",
      "postal.gemspec",
+     "test/content_test.rb",
      "test/list_test.rb",
      "test/lmapiClient.rb",
      "test/lyris_sample.yml",
@@ -43,7 +48,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Gem for talking to the Lyris API}
   s.test_files = [
-    "test/list_test.rb",
+    "test/content_test.rb",
+     "test/list_test.rb",
      "test/lmapiClient.rb",
      "test/mailing_test.rb",
      "test/member_test.rb",
@@ -64,3 +70,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<soap4r>, [">= 1.5.8"])
   end
 end
+

data/test/content_test.rb

@@ -0,0 +1,22 @@
+require 'test_helper'
+
+class ContentTest < Test::Unit::TestCase
+  
+  @config = nil
+
+  def setup
+    load_config
+    Postal.options[:list_name] = 'active-casting'
+    Postal.options[:proxy] = "http://localhost:8888/"
+  end
+  
+  def test_selecting_all_content
+    content = Postal::Content.find_all
+    assert_not_nil content
+  end
+  
+  def test_finding_content_by_filter
+    assert_not_nil content = Postal::Content.find_by_filter()
+  end
+  
+end

data/test/mailing_test.rb

@@ -6,6 +6,7 @@ class MailingTest < Test::Unit::TestCase
 
   def setup
     load_config
+    Postal.options[:proxy] = "http://localhost:8888/"
   end
   
   def test_can_send_valid_mailing
@@ -49,7 +50,7 @@ class MailingTest < Test::Unit::TestCase
   end
   
   def test_cannot_send_invalid_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>", 
                                 :from => @config['from'] )
     assert !mail.valid?
@@ -57,4 +58,17 @@ class MailingTest < Test::Unit::TestCase
     assert_raises(Postal::CouldNotSendMailing) { mail.send! }
   end
   
+  def test_can_import_content
+    assert mail = Postal::Mailing.import(@config['content_id'])
+    assert_equal @config['content_subject'], mail.subject
+  end
+  
+  def test_can_send_mailing_from_import
+    content = Postal::Mailing.import(@config['content_id'])
+    mailing = Postal::Mailing.new(:to => @config['email_in_list'],
+                                  :mailing => content)
+    assert mailing.valid?
+    assert mailing.send!
+  end
+  
 end

data/test/member_test.rb

@@ -40,6 +40,7 @@ class MemberTest < Test::Unit::TestCase
   def test_can_update_user_demographics_after_creation
     new_member = Postal::Member.create(:email => "john.doe#{rand(1000000)}@anonymous.com", :name => "John Doe")
     assert new_member.update_attributes(:field_0 => 'Baseball')
+    assert updated_user = Postal::Member.find(new_member.email)
   end
   
   def test_can_create_user_and_demographics_at_creation
@@ -79,11 +80,18 @@ class MemberTest < Test::Unit::TestCase
     assert !Postal::Member.find(new_member.email)
   end
   
-  def test_can_create_find_and_update_member
+  def test_can_create_find_and_update_member_by_filter
     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.update_attributes(:field_0 => 'Baseball')
     assert_equal Postal::Member.find_by_filter('EmailAddress like john.doe%').demographics[:field_0], 'Baseball'
   end
   
+  def test_can_create_find_and_update_member_by_id
+    new_member = Postal::Member.create(:email => "john.doe#{rand(1000000)}@anonymous.com", :name => "John Doe")
+    assert member = Postal::Member.find(new_member.id)
+    assert member.update_attributes(:field_0 => 'Baseball')
+    assert_equal Postal::Member.find(new_member.email).demographics[:field_0], 'Baseball'
+  end
+  
 end

data/test/postal_suite.rb

@@ -2,3 +2,4 @@ require 'test/unit'
 require 'list_test'
 require 'member_test'
 require 'mailing_test'
+require 'content_test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: postal
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.2.2
 platform: ruby
 authors: 
 - Rob Cameron
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 -07:00
+date: 2009-11-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,6 +40,7 @@ files:
 - VERSION
 - lib/postal.rb
 - lib/postal/base.rb
+- lib/postal/content.rb
 - lib/postal/list.rb
 - lib/postal/lmapi/lmapi.rb
 - lib/postal/lmapi/lmapi_driver.rb
@@ -47,6 +48,7 @@ files:
 - lib/postal/mailing.rb
 - lib/postal/member.rb
 - postal.gemspec
+- test/content_test.rb
 - test/list_test.rb
 - test/lmapiClient.rb
 - test/lyris_sample.yml
@@ -83,6 +85,7 @@ signing_key:
 specification_version: 3
 summary: Gem for talking to the Lyris API
 test_files: 
+- test/content_test.rb
 - test/list_test.rb
 - test/lmapiClient.rb
 - test/mailing_test.rb