postful 0.2.0 → 0.3.1

data/lib/postful/simple_document.rb

@@ -0,0 +1,38 @@
+require File.join(File.dirname(__FILE__), 'document')
+
+module Postful
+  class SimpleDocument < Document
+    
+    attr_accessor :format
+    attr_accessor :content
+    attr_accessor :attachment_name
+    attr_accessor :url
+    
+    def build_request(builder)
+      builder.document do
+        builder.type format
+        builder.attachment attachment_name if attachment_name
+        builder.url url if url
+      end
+    end
+
+    def requires_upload?
+      true if !url
+    end
+    
+    def upload
+      if requires_upload?
+        headers = { 
+            'Content-Type' => 'application/octet-stream',
+            'Content-Length' => content.size.to_s
+        }              
+        response = post_request_on_path('/service/upload', content, @email, @password, headers)
+        if response.is_a?(Net::HTTPOK) && response.body =~ /<id>(.*)<\/id>/        
+          self.attachment_name = $1 
+        else
+          # raise stuff
+        end
+      end
+    end     
+  end
+end

data/lib/postful/template_document.rb

@@ -0,0 +1,66 @@
+require File.join(File.dirname(__FILE__), 'document')
+require File.join(File.dirname(__FILE__), 'section')
+
+module Postful
+  class TemplateDocument < Document    
+    def build_request(builder)
+      builder.document do
+        builder.template do 
+          builder.source source
+          builder.name name
+        end
+        builder.sections do 
+          sections.each do |section|
+            section.build_request(builder)
+          end
+        end if sections.any?
+        builder.properties do 
+          properties.each_pair do |key, value|
+            builder.property do
+              builder.key key
+              builder.value value
+            end
+          end
+        end if properties.keys.any?
+      end
+    end
+
+    def initialize(name, email, password)
+      super(email, password)
+      @name = name
+      @source = 'gallery'      
+      @sections = []
+      @properties = {}
+    end
+
+    attr_accessor :source
+    attr_accessor :name
+    attr :sections
+    attr :properties
+    
+    def add_property(key, value)
+      @properties[key] = value
+    end
+
+    alias_method :property, :add_property
+    
+    def add_section(name, &block)
+      returning Section.new(name, @email, @password) do |section|
+        section.instance_exec(&block) if block
+        sections << section
+      end
+    end
+    
+    alias_method :section, :add_section
+    
+    def requires_upload?
+      !(sections.find { |section| section.requires_upload? }).nil?
+    end
+    
+    def do_upload
+      sections.each do |section|
+        section.do_upload if section.requires_upload?
+      end
+    end    
+  end
+end

data/lib/postful/util.rb

@@ -1,8 +1,25 @@
 module Postful
-  module Util #:nodoc:
-    HOST = 'www.postful.com'
-    PORT = 443
+  HOST = 'www.postful.com'
+  PORT = 443
+
+  def self.host=(host)
+    @host = host
+  end
+  
+  def self.host
+    @host || HOST
+  end
 
+  def self.port=(port)
+    @port = port
+  end
+  
+  def self.port
+    @port || PORT
+  end
+  
+  module Util #:nodoc:
+    
     protected
     
     def build_error_message_from_response(response)
@@ -13,27 +30,27 @@ module Postful
       end
       errors.join("\n")
     end
-
+    
     def authorization_header(email, password)
       'Basic ' + ["#{email}:#{password}"].pack('m').delete("\r\n")
     end
     
     def process_standard_responses(response)
       case response.code
-        when "500" then
-          raise Postful::InternalServerError
-        when "401" then
-          raise Postful::AuthorizationException
-        when "404" then
-          raise Postful::NotFoundException
-        else
-          raise Postful::UnknownResponseException, response.code
+      when "500" then
+        raise Postful::InternalServerError
+      when "401" then
+        raise Postful::AuthorizationException
+      when "404" then
+        raise Postful::NotFoundException
+      else
+        raise Postful::UnknownResponseException, response.code
       end      
     end
     
     def delete_request_on_path(path, email, password)
-      http = Net::HTTP.new(HOST, PORT)
-      http.use_ssl = true if PORT == 443
+      http = Net::HTTP.new(Postful.host, Postful.port)
+      http.use_ssl = true if Postful.port == 443
       silence_warnings do
         http.start() {|http|
           request = Net::HTTP::Delete.new(path)
@@ -42,10 +59,10 @@ module Postful
         }      
       end            
     end
-
+    
     def get_request_on_path(path, email, password)
-      http = Net::HTTP.new(HOST, PORT)
-      http.use_ssl = true if PORT == 443
+      http = Net::HTTP.new(Postful.host, Postful.port)
+      http.use_ssl = true if Postful.port == 443
       silence_warnings do
         http.start() {|http|
           request = Net::HTTP::Get.new(path)
@@ -56,17 +73,49 @@ module Postful
     end
     
     def post_request_on_path(path, post, email, password, headers = {})
-      http = Net::HTTP.new(HOST, PORT)
-      http.use_ssl = true if PORT == 443
+      http = Net::HTTP.new(Postful.host, Postful.port)
+      http.use_ssl = true if Postful.port == 443
       headers.merge!({ 'Authorization' => authorization_header(email, password) })                    
       silence_warnings { http.post(path, post, headers) }               
     end    
-
+    
     def silence_warnings
       old_verbose, $VERBOSE = $VERBOSE, nil
       yield
     ensure
       $VERBOSE = old_verbose
     end      
-  end  
+    
+    def returning(value)
+      yield(value)
+      value
+    end
+    
+    unless defined? instance_exec # 1.9
+      module InstanceExecMethods #:nodoc:
+      end
+      include InstanceExecMethods
+      
+      # Evaluate the block with the given arguments within the context of
+      # this object, so self is set to the method receiver.
+      #
+      # From Mauricio's http://eigenclass.org/hiki/bounded+space+instance_exec
+      def instance_exec(*args, &block)
+        begin
+          old_critical, Thread.critical = Thread.critical, true
+          n = 0
+          n += 1 while respond_to?(method_name = "__instance_exec#{n}")
+          InstanceExecMethods.module_eval { define_method(method_name, &block) }
+        ensure
+          Thread.critical = old_critical
+        end
+        
+        begin
+          send(method_name, *args)
+        ensure
+          InstanceExecMethods.module_eval { remove_method(method_name) } rescue nil
+        end
+      end
+    end  
+  end    
 end

data/test/test_base.rb

@@ -8,6 +8,66 @@ class TestBase < Test::Unit::TestCase
     @base = Postful::Base.new('email', 'password')
   end
   
+  def test_sections
+    assert_equal [], @base.sections
+  end
+  
+  def test_add_document
+    document = @base.add_document 'Template #1'
+    assert document.is_a?(Postful::TemplateDocument)
+    assert_equal 'Template #1', document.name
+  end
+
+  def test_document_property
+    document = @base.document 'Template #1' do
+      property 'foo', 'bar'
+    end
+    @request = @base.send(:build_request)
+    assert_equal 'foo', fetch_tag('mail/documents/document/properties/property/key')
+    assert_equal 'bar', fetch_tag('mail/documents/document/properties/property/value')
+  end
+
+  def test_document_section
+    document = @base.document 'Template #1' do
+      section 'some_name' do
+        text 'Laszlo Jamf'
+      end
+    end
+    @request = @base.send(:build_request)
+    assert_equal 'Laszlo Jamf', fetch_tag('mail/documents/document/sections/section/text')
+    assert_equal 'some_name', fetch_tag('mail/documents/document/sections/section/name')
+    assert_equal false, document.sections.first.requires_upload?
+  end
+
+  def test_document_image_section
+    document = @base.document 'Template #1' do
+      section 'some_name' do
+        filename __FILE__
+      end
+    end
+    section = document.sections.first
+    assert_equal true, section.requires_upload?        
+    name = register_upload
+    section.do_upload
+    assert_equal name, section.instance_variable_get("@attachment")
+  end
+
+  def test_image_upload
+    document = @base.document 'Template #1' do
+      section 'some_name' do
+        filename __FILE__
+      end
+    end
+    @base.add_address :name => 'John Doe', :address => '123 Main St', :city => 'Anytown', :state => 'AZ', :postal_code => '10000'
+    section = document.sections.first
+    assert_equal true, section.requires_upload?        
+    assert_equal true, document.requires_upload?
+    name = register_upload
+    register_201
+    @base.mail!
+    assert_equal name, section.instance_variable_get("@attachment")
+  end
+
   def test_tags
     @base.tag1 = 'tag 1'
     @base.tag2 = 'tag 2'
@@ -122,6 +182,17 @@ class TestBase < Test::Unit::TestCase
     end         
   end
 
+  def register_201
+    FakeWeb.register_uri('https://www.postful.com/service/mail', :string => fixture('201.xml'), :status => '201')    
+  end
+  
+  def register_upload
+    s = "290797321.waltershandy.2"
+    FakeWeb.register_uri('https://www.postful.com/service/upload', 
+      :string => %(<?xml version="1.0" encoding="UTF-8"?><upload><id>#{s}</id></upload>))    
+    s
+  end
+
   def fetch_tag(tag)
     @document ||= begin
       REXML::Document.new @request

data/test/test_letter.rb

@@ -7,6 +7,12 @@ class TestLetter < Test::Unit::TestCase
     @letter = Postful::Letter.new('email', 'password')
   end
   
+  def test_simple_document_from_url
+    document = @letter.add_html_document_from_url 'http://www.google.com'
+    xml = @letter.send(:build_request)    
+    assert_equal %(<mail><documents><document><type>html</type><url>http://www.google.com</url></document></documents><addressees></addressees></mail>), xml
+  end
+  
   def test_build_request_document
     document = @letter.add_html_document '<b>Hello, world!</b>'
     document.attachment_name = 'porcupine'

data/test/test_postcard.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require 'fake_web'
-require 'lib/postful/postcard'
+require File.dirname(__FILE__) + '/../lib/postful/postcard'
 
 class TestPostcard < Test::Unit::TestCase
   include Postful
@@ -26,6 +26,18 @@ class TestPostcard < Test::Unit::TestCase
     @postcard.back_image = 'data'
     assert_equal Postcard::IMAGES, @postcard.send(:choose_template)
   end
+
+  def test_no_exceptions
+    @valid_postcard.front_image = 'data'
+    @valid_postcard.back_image = 'data'
+    @valid_postcard.send :instance_exec do 
+      build_sections
+      upload_attachments
+      build_template_document
+      upload_assets
+      build_request      
+    end
+  end
   
   def test_adding_no_border_chooses_fill
     @postcard.front_image = 'data'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: postful
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Postful, Inc
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-12 00:00:00 -07:00
+date: 2009-01-29 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,11 +32,15 @@ extra_rdoc_files: []
 
 files: 
 - lib/postful/base.rb
+- lib/postful/document.rb
 - lib/postful/instance_exec_module.rb
 - lib/postful/letter.rb
 - lib/postful/order.rb
 - lib/postful/postcard.rb
+- lib/postful/section.rb
 - lib/postful/service.rb
+- lib/postful/simple_document.rb
+- lib/postful/template_document.rb
 - lib/postful/util.rb
 - lib/postful.rb
 - test/suite.rb
@@ -48,54 +52,92 @@ files:
 - doc/classes/Postful/AuthorizationException.html
 - doc/classes/Postful/Base.html
 - doc/classes/Postful/Base.src
-- doc/classes/Postful/Base.src/M000001.html
-- doc/classes/Postful/Base.src/M000002.html
-- doc/classes/Postful/Base.src/M000003.html
 - doc/classes/Postful/Base.src/M000004.html
 - doc/classes/Postful/Base.src/M000005.html
-- doc/classes/Postful/Base.src/M000006.html
+- doc/classes/Postful/Base.src/M000007.html
+- doc/classes/Postful/Base.src/M000008.html
+- doc/classes/Postful/Base.src/M000009.html
+- doc/classes/Postful/Base.src/M000010.html
+- doc/classes/Postful/Base.src/M000011.html
+- doc/classes/Postful/Base.src/M000012.html
+- doc/classes/Postful/Document.html
+- doc/classes/Postful/Document.src
+- doc/classes/Postful/Document.src/M000026.html
+- doc/classes/Postful/Document.src/M000027.html
+- doc/classes/Postful/Document.src/M000028.html
 - doc/classes/Postful/InternalServerError.html
 - doc/classes/Postful/Letter.html
 - doc/classes/Postful/Letter.src
-- doc/classes/Postful/Letter.src/M000018.html
-- doc/classes/Postful/Letter.src/M000019.html
-- doc/classes/Postful/Letter.src/M000020.html
-- doc/classes/Postful/Letter.src/M000021.html
-- doc/classes/Postful/Letter.src/M000022.html
-- doc/classes/Postful/Letter.src/M000023.html
-- doc/classes/Postful/Letter.src/M000024.html
-- doc/classes/Postful/Letter.src/M000025.html
-- doc/classes/Postful/Letter.src/M000026.html
-- doc/classes/Postful/Letter.src/M000027.html
-- doc/classes/Postful/Letter.src/M000028.html
-- doc/classes/Postful/Letter.src/M000029.html
+- doc/classes/Postful/Letter.src/M000041.html
+- doc/classes/Postful/Letter.src/M000042.html
+- doc/classes/Postful/Letter.src/M000043.html
+- doc/classes/Postful/Letter.src/M000044.html
+- doc/classes/Postful/Letter.src/M000045.html
+- doc/classes/Postful/Letter.src/M000046.html
+- doc/classes/Postful/Letter.src/M000047.html
+- doc/classes/Postful/Letter.src/M000048.html
+- doc/classes/Postful/Letter.src/M000049.html
+- doc/classes/Postful/Letter.src/M000050.html
+- doc/classes/Postful/Letter.src/M000051.html
+- doc/classes/Postful/Letter.src/M000052.html
+- doc/classes/Postful/Letter.src/M000053.html
+- doc/classes/Postful/Letter.src/M000054.html
+- doc/classes/Postful/Letter.src/M000055.html
+- doc/classes/Postful/Letter.src/M000056.html
+- doc/classes/Postful/Letter.src/M000057.html
+- doc/classes/Postful/Letter.src/M000058.html
 - doc/classes/Postful/NotFoundException.html
 - doc/classes/Postful/Order.html
 - doc/classes/Postful/Order.src
-- doc/classes/Postful/Order.src/M000007.html
-- doc/classes/Postful/Order.src/M000008.html
-- doc/classes/Postful/Order.src/M000009.html
-- doc/classes/Postful/Order.src/M000010.html
+- doc/classes/Postful/Order.src/M000013.html
+- doc/classes/Postful/Order.src/M000014.html
+- doc/classes/Postful/Order.src/M000015.html
+- doc/classes/Postful/Order.src/M000016.html
 - doc/classes/Postful/Postcard.html
 - doc/classes/Postful/Postcard.src
-- doc/classes/Postful/Postcard.src/M000011.html
-- doc/classes/Postful/Postcard.src/M000012.html
-- doc/classes/Postful/Postcard.src/M000013.html
+- doc/classes/Postful/Postcard.src/M000023.html
+- doc/classes/Postful/Postcard.src/M000024.html
+- doc/classes/Postful/Postcard.src/M000025.html
+- doc/classes/Postful/Section.html
+- doc/classes/Postful/Section.src
+- doc/classes/Postful/Section.src/M000017.html
+- doc/classes/Postful/Section.src/M000018.html
+- doc/classes/Postful/Section.src/M000019.html
+- doc/classes/Postful/Section.src/M000020.html
+- doc/classes/Postful/Section.src/M000021.html
+- doc/classes/Postful/Section.src/M000022.html
 - doc/classes/Postful/Service.html
 - doc/classes/Postful/Service.src
-- doc/classes/Postful/Service.src/M000014.html
-- doc/classes/Postful/Service.src/M000015.html
-- doc/classes/Postful/Service.src/M000016.html
-- doc/classes/Postful/Service.src/M000017.html
+- doc/classes/Postful/Service.src/M000037.html
+- doc/classes/Postful/Service.src/M000038.html
+- doc/classes/Postful/Service.src/M000039.html
+- doc/classes/Postful/Service.src/M000040.html
+- doc/classes/Postful/SimpleDocument.html
+- doc/classes/Postful/SimpleDocument.src
+- doc/classes/Postful/SimpleDocument.src/M000001.html
+- doc/classes/Postful/SimpleDocument.src/M000002.html
+- doc/classes/Postful/SimpleDocument.src/M000003.html
+- doc/classes/Postful/TemplateDocument.html
+- doc/classes/Postful/TemplateDocument.src
+- doc/classes/Postful/TemplateDocument.src/M000029.html
+- doc/classes/Postful/TemplateDocument.src/M000030.html
+- doc/classes/Postful/TemplateDocument.src/M000031.html
+- doc/classes/Postful/TemplateDocument.src/M000033.html
+- doc/classes/Postful/TemplateDocument.src/M000035.html
+- doc/classes/Postful/TemplateDocument.src/M000036.html
 - doc/classes/Postful/UnknownResponseException.html
 - doc/classes/Postful/ValidationException.html
 - doc/created.rid
 - doc/files/lib/postful/base_rb.html
+- doc/files/lib/postful/document_rb.html
 - doc/files/lib/postful/instance_exec_module_rb.html
 - doc/files/lib/postful/letter_rb.html
 - doc/files/lib/postful/order_rb.html
 - doc/files/lib/postful/postcard_rb.html
+- doc/files/lib/postful/section_rb.html
 - doc/files/lib/postful/service_rb.html
+- doc/files/lib/postful/simple_document_rb.html
+- doc/files/lib/postful/template_document_rb.html
 - doc/files/lib/postful/util_rb.html
 - doc/files/lib/postful_rb.html
 - doc/files/MIT-LICENSE.html