signatory 0.0.6 → 0.0.7

data/.gitignore

@@ -3,3 +3,4 @@ pkg/*
 *.gem
 .bundle
 *.swp
+*.rbc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    signatory (0.0.6)
+    signatory (0.0.7)
       activeresource (>= 2.3.9)
       bundler (>= 1.0.0)
       oauth (= 0.4.3)
@@ -9,24 +9,29 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activeresource (2.3.9)
-      activesupport (= 2.3.9)
-    activesupport (2.3.9)
-    addressable (2.2.1)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activeresource (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+    activesupport (3.0.5)
+    addressable (2.2.4)
+    builder (2.1.2)
     crack (0.1.8)
     diff-lcs (1.1.2)
+    i18n (0.5.0)
     oauth (0.4.3)
     rake (0.8.7)
-    rspec (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-      rspec-mocks (= 2.0.0.beta.22)
-    rspec-core (2.0.0.beta.22)
-    rspec-expectations (2.0.0.beta.22)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
     webmock (1.3.5)
       addressable (>= 2.1.1)
       crack (>= 0.1.7)
@@ -35,10 +40,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activeresource (>= 2.3.9)
   bundler (>= 1.0.0)
-  oauth (= 0.4.3)
   rake
-  rspec (= 2.0.0.beta.22)
+  rspec (= 2.5.0)
   signatory!
   webmock (= 1.3.5)

data/README.rdoc

@@ -1,11 +1,15 @@
 = signatory
 
-* http://github.com/profounder/signatory
+* http://github.com/rgarver/signatory
+
+formerly profounder/signatory
 
 == DESCRIPTION:
 
 A library to simplify interactions with the RightSignature API.  One of the primary goals of this library is to make the workflow clear to developers for using some of the more interesting features of the RightSignature system, eg: templates, document merges, and embedded signature frames.
 
+Now requires the 1.1 or 1.2 api versions.  Handles the double URL escaping on documents and templates.
+
 == FEATURES/PROBLEMS:
 
 * FIX (list of features or problems)
@@ -58,13 +62,22 @@ A library to simplify interactions with the RightSignature API.  One of the prim
     ... begin oauth workflow ...
   end
 
+If you need some debugging output (I have) try this:
+  Signatory::Document.connection.send(:http).consumer.http.set_debug_output($stderr)
+
 == REQUIREMENTS:
 
-* FIX (list of requirements)
+Depends on the gems `oauth` and `activeresource`
 
 == INSTALL:
 
-* FIX (sudo gem install, anything else)
+From the command line:
+
+  gem install signatory
+
+From `bundler`:
+
+  gem 'signatory'
 
 == THANKS:
 
@@ -74,7 +87,7 @@ Special thanks to Cary Dunn at RightSignature for putting together a sample Rail
 
 (The MIT License)
 
-Copyright (c) 2010 Ryan Garver
+Copyright (c) 2012 Ryan Garver
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -93,4 +106,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/signatory.rb

@@ -25,6 +25,7 @@ require 'signatory/api/connection'
 require 'signatory/api/base'
 require 'signatory/credentials'
 require 'signatory/document'
+require 'signatory/document_package'
 require 'signatory/template'
 require 'signatory/role'
 require 'signatory/merge_field'

data/lib/signatory/api/base.rb

@@ -8,6 +8,30 @@ module Signatory
       end
 
       class << self
+        def escape_url_attrs(*attrs)
+          attrs.each do |attr|
+            define_method attr do
+              if Signatory.credentials.api_version == '1.0' || attributes[attr].blank?
+                attributes[attr]
+              else
+                CGI::unescape(attributes[attr])
+              end
+            end
+          end
+        end
+
+        def has_many(sym)
+          self.write_inheritable_attribute(:__has_many, (read_inheritable_attribute(:__has_many)||[])+[sym])
+        end
+
+        def instantiate_record(record, opts={})
+          (self.read_inheritable_attribute(:__has_many)||[]).each do |sym|
+            record[sym.to_s] = [record[sym.to_s].try(:[],sym.to_s.singularize)].flatten.compact unless record[sym.to_s].is_a?(Array)
+          end
+
+          super(record, opts)
+        end
+
         def instantiate_collection(collection, opts)
           if collection.has_key?(formatted_collection_name)
             collection = collection[formatted_collection_name]

data/lib/signatory/credentials.rb

@@ -1,9 +1,10 @@
 module Signatory
   class Credentials
-    attr_accessor :key, :secret, :access_token, :access_secret
+    attr_accessor :key, :secret, :access_token, :access_secret, :api_version
 
-    def initialize(key, secret, access_token, access_secret)
-      @key, @secret, @access_token, @access_secret = key, secret, access_token, access_secret
+    def initialize(key, secret, access_token, access_secret, api_version='1.2')
+      $stderr.puts "Deprecation Warning: Signatory is now compatible with RightSignature API version 1.2, you have chosen #{api_version}.  Please upgrade." if api_version != '1.2'
+      @key, @secret, @access_token, @access_secret, @api_version = key, secret, access_token, access_secret, api_version
     end
 
     def self.load(source)
@@ -13,7 +14,7 @@ module Signatory
         source.inject({}){ |acc, (k, v)| acc[k.to_s] = v; acc}
       end
 
-      new(h['key'], h['secret'], h['access_token'], h['access_secret'])
+      new(h['key'], h['secret'], h['access_token'], h['access_secret'], h['api_version']||'1.2')
     end
 
     def token
@@ -32,4 +33,4 @@ module Signatory
       )
     end
   end
-end
+end

data/lib/signatory/document.rb

@@ -1,5 +1,7 @@
 module Signatory
   class Document < API::Base
+    has_many :recipients
+    escape_url_attrs :signed_pdf_url, :pdf_url, :original_url, :thumbnail_url
 
     def extend_expiration
       connection.post("#{self.class.site}documents/#{id}/extend_expiration")
@@ -11,11 +13,9 @@ module Signatory
 
     private
     def self.instantiate_record(record, opts = {})
-      record['recipients'] = [record['recipients']['recipient']].flatten unless record['recipients'].nil? || record['recipients'].is_a?(Array)
-
-      doc = super(record, opts)
-      doc.recipients.each {|r| r.document = doc } if doc.respond_to?(:recipients)
-      doc
+      super(record, opts).tap do |doc|
+        doc.recipients.each {|r| r.document = doc }
+      end
     end
   end
-end
+end

data/lib/signatory/document_package.rb

@@ -0,0 +1,46 @@
+module Signatory
+  class DocumentPackage < API::Base
+    self.element_name = "template"
+    has_many :roles
+    has_many :merge_fields
+    def self.all; raise NoMethodError; end
+    def self.find; raise NoMethodError; end
+
+    def prefill_and_send(merge_fields, roles, opts={})
+      attributes.merge!({
+        'merge_fields' => merge_fields,
+        'roles' => roles,
+        'action' => 'send'
+      })
+      if opts[:document_data].present?
+        attributes.merge!({
+          'document_data' => {
+            'type' => 'base64',
+            'filename' => 'document.pdf',
+            'value' => Base64.encode64(opts[:document_data])
+          }
+        })
+      end
+
+      doc = connection.format.decode(connection.post("/api/templates.xml", self.to_xml).body)
+      Document.find(doc['guid'])
+    end
+
+    def to_xml(opts = {})
+      super(opts.merge(:dasherize => false, :skip_types => true, :except => [:pages, :_type, :redirect_token, :content_type, :size, :tags])) do |b|
+        b.tag!(:tags) do
+          tags.split(" ").each do |tag|
+            b.tag!(:tag) { b.value tag}
+          end
+        end unless attributes['tags'].blank?
+      end
+    end
+
+    private
+    def self.instantiate_record(record, opts = {})
+      record['_type'] = record.delete('type') if record.has_key?('type')
+
+      super(record, opts)
+    end
+  end
+end

data/lib/signatory/merge_field.rb

@@ -14,7 +14,7 @@ module Signatory
       options[:indent] ||= 2
       xml = options[:builder] ||= ::Builder::XmlMarkup.new(:indent => options[:indent])
       xml.tag!('merge_field', identifier) do
-        if attributes['value'].nil?
+        if attributes.has_key?(:page)
           xml.page page
           xml.name name
           xml.id id
@@ -25,4 +25,4 @@ module Signatory
       end
     end
   end
-end
+end

data/lib/signatory/template.rb

@@ -1,8 +1,14 @@
+# Template.prepackage -> creates a send/redirect-able Template
+# Documents are "sent" 
 module Signatory
   class Template < API::Base
+    has_many :roles
+    has_many :merge_fields
+    escape_url_attrs :thumbnail_url
+
     def prepackage
       record = connection.format.decode(post(:prepackage).body)
-      Template.instantiate_record(record)
+      DocumentPackage.send(:instantiate_record, record)
     end
 
     def build_document(merge_fields, roles)
@@ -10,17 +16,6 @@ module Signatory
       doc_pkg.prefill_and_send(merge_fields, roles)
     end
 
-    def prefill_and_send(merge_fields, roles)
-      attributes.merge!({
-        'merge_fields' => merge_fields,
-        'roles' => roles,
-        'action' => 'send'
-      })
-
-      doc = connection.format.decode(connection.post("/api/templates.xml", self.to_xml).body)
-      Document.find(doc['guid'])
-    end
-
     def to_xml(opts = {})
       super(opts.merge(:dasherize => false, :skip_types => true, :except => [:pages, :_type, :redirect_token, :content_type, :size, :tags])) do |b|
         b.tag!(:tags) do
@@ -34,8 +29,6 @@ module Signatory
     private
     def self.instantiate_record(record, opts = {})
       record['_type'] = record.delete('type') if record.has_key?('type')
-      record['roles'] = [record['roles']['role']].flatten unless record['roles'].nil? || record['roles'].is_a?(Array)
-      record['merge_fields'] = [record['merge_fields']['merge_field']].flatten unless record['merge_fields'].nil? || record['merge_fields'].is_a?(Array)
 
       super(record, opts)
     end

data/lib/signatory/version.rb

@@ -1,3 +1,3 @@
 module Signatory
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/signatory.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version     = Signatory::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ryan Garver"]
-  s.email       = ["ryan@profounder.com"]
+  s.email       = ["ragarver@gmail.com"]
   s.homepage    = "http://rubygems.org/gems/signatory"
   s.summary     = "API wrapper for RightSignature"
   s.description = "Signatory provides a simple wrapper around the RightSignature API."
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "signatory"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
-  s.add_development_dependency "rspec", "= 2.0.0.beta.22"
+  s.add_development_dependency "rspec", "= 2.5.0"
   s.add_development_dependency "webmock", "= 1.3.5"
 
   s.add_dependency "bundler", ">= 1.0.0"

data/spec/document_package_spec.rb

@@ -0,0 +1,61 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe Signatory::DocumentPackage do
+  describe "not findable" do # DocumentsSessions are temporary and not searchable
+    it "No method for .all" do
+      lambda do
+        Signatory::DocumentPackage.all
+      end.should raise_error(NoMethodError)
+    end
+
+    it "No method for .find" do
+      lambda do
+        Signatory::DocumentPackage.find
+      end.should raise_error(NoMethodError)
+    end
+  end
+
+  describe ".signing_parties" do
+    it "returns all of the roles that must sign"
+  end
+
+  describe ".sender" do
+    it "returns the role who sent the document"
+  end
+
+  describe ".prefill_and_send" do
+    let(:roles) {[Signatory::Role.new(:name => "Ryan Garver", :role_name => 'Issuer'), Signatory::Role.new(:name => "Cary Dunn", :role_name => 'Investor')]}
+    let(:merge_fields) {[Signatory::MergeField.new(:name => 'Company Name', :value => 'ABC Corp')]}
+
+    it "returns the sent document" do
+      doc_pkg = Signatory::DocumentPackage.new(:guid => 'templid')
+
+      id, subject = rand.to_s, "Subject #{rand}"
+      stub_template_send('templid', id, :roles => roles, :merge_fields => merge_fields)
+      stub_document(id, :subject => subject)
+      doc = doc_pkg.prefill_and_send(merge_fields, roles)
+      doc.guid.should == id
+      doc.subject.should == subject
+    end
+
+    it "can do a PDF swap" do
+      stub_template('123')
+      stub_prepackage('123', '321')
+      doc_pkg = Signatory::Template.find('123').prepackage
+      file = "Lorem ipsum"
+
+      stub_template_send('321', '111', :roles => roles, 
+                         :merge_fields => merge_fields, 
+                         :match => {
+                           'document_data' => {
+                             'type' => 'base64',
+                             'filename' => 'document.pdf',
+                             'value' => Base64.encode64(file)
+                           }
+                        })
+      stub_document(111, :subject => 'blah')
+
+      doc = doc_pkg.prefill_and_send(merge_fields, roles, :document_data => file)
+    end
+  end
+end

data/spec/document_spec.rb

@@ -60,4 +60,18 @@ describe Signatory::Document do
       @doc.expired?.should be_false
     end
   end
-end
+
+  describe "#signed_pdf_url" do
+    it "should return a valid url" do
+      stub_document("XXXX")
+      doc = Signatory::Document.find("XXXX")
+      doc.signed_pdf_url.should =~ /^https:\/\//
+    end
+
+    it "should return blank when it's blank" do
+      stub_document("XXXX", :signed_pdf_url => '')
+      doc = Signatory::Document.find("XXXX")
+      doc.signed_pdf_url.should be_nil
+    end
+  end
+end

data/spec/fixtures/document.xml.erb

@@ -1,6 +1,6 @@
 <document>
   <completed-at>2009-11-01T13:14:28-08:00</completed-at>
-  <thumbnail-url>https://thumbnail.png</thumbnail-url>
+  <thumbnail-url>https%3A%2F%2Fthumbnail.png</thumbnail-url>
   <message>Please sign the document.</message>
   <form-fields>
     <form-field>
@@ -12,11 +12,11 @@
     </form-field>
   </form-fields>
   <state>signed</state>
-  <pdf-url>https://pdfurl.pdf</pdf-url>
+  <pdf-url>https%3A%2F%2Fpdfurl.pdf</pdf-url>
   <deleted-at nil="true"></deleted-at>
   <created-at>2009-11-01T12:29:36-08:00</created-at>
   <is-public>false</is-public>
-  <signed-pdf-url>https://signedpdf.pdf</signed-pdf-url>
+  <signed-pdf-url><%= options[:signed_pdf_url] || "https%3A%2F%2Fsignedpdf.pdf" %></signed-pdf-url>
   <original-filename>Application.pdf</original-filename>
   <size>231740</size>
   <recipients>
@@ -45,7 +45,8 @@
   <guid><%= options[:guid] || 'ABCXYZ' %></guid>
   <callback-location nil="true"></callback-location>
   <processing-state>done-processing</processing-state>
-  <original-url>https://originaldoc.doc</original-url>
+  <original-url>https%3A%2F%2Foriginaldoc.doc</original-url>
   <content-type>package</content-type>
   <expires-on><%= options[:expires_on] && options[:expires_on].iso8601 ||  '2009-11-06T16:00:00-08:00' %></expires-on>
-</document>
+  <is-trashed>false</is-trashed>
+</document>

data/spec/fixtures/documents.xml.erb

@@ -1,23 +1,14 @@
 <page>
   <total-documents><%= options[:total_documents] %></total-documents>
   <current-page>1</current-page>
-  <total-pages>1</total-pages>
   <per-page>10</per-page>
+  <total-pages>1</total-pages>
   <documents>
     <% options[:total_documents].times do |i| %>
       <% document = options[:documents][i] %>
       <document>
-        <completed-at nil="true"></completed-at>
-        <thumbnail-url>http://thumbnailurl.png</thumbnail-url>
-        <message>Please sign this document.</message>
-        <state>pending</state>
-        <pdf-url>http://pdfurl.pdf</pdf-url>
-        <deleted-at nil="true"></deleted-at>
-        <created-at>2009-11-04T10:15:14-08:00</created-at>
-        <is-public>false</is-public>
-        <signed-pdf-url>http://signedpdfurl.pdf</signed-pdf-url>
-        <original-filename>Application.pdf</original-filename>
-        <size>47351</size>
+        <guid><%= document.nil? ? 'ABCXYZ' : document[:guid] %></guid>
+        <subject><%= document.nil? ? "Employment Application" : document[:subject] %></subject>
         <recipients>
           <recipient>
             <state>pending</state>
@@ -36,8 +27,18 @@
             <name>Maria Montes</name>
           </recipient>
         </recipients>
-        <subject><%= document.nil? ? "Employment Application" : document[:subject] %></subject>
-        <guid><%= document.nil? ? 'ABCXYZ' : document[:guid] %></guid>
+        <is-public>false</is-public>
+        <tags>sendfromapi,tag2,user_id:1234</tags>
+        <completed-at nil="true"></completed-at>
+        <thumbnail-url>http://thumbnailurl.png</thumbnail-url>
+        <message>Please sign this document.</message>
+        <state>pending</state>
+        <pdf-url>http://pdfurl.pdf</pdf-url>
+        <deleted-at nil="true"></deleted-at>
+        <created-at>2009-11-04T10:15:14-08:00</created-at>
+        <signed-pdf-url>http://signedpdfurl.pdf</signed-pdf-url>
+        <original-filename>Application.pdf</original-filename>
+        <size>47351</size>
         <callback-location>http://callbacklocation.com/gateway</callback-location>
         <processing-state>done-processing</processing-state>
         <original-url>http://pdfurl.pdf</original-url>
@@ -46,4 +47,4 @@
       </document>
     <% end %>
   </documents>
-</page>
+</page>

data/spec/fixtures/template.xml.erb

@@ -1,32 +1,43 @@
 <template>
   <thumbnail-url>https://thumbnail.png</thumbnail-url>
-  <merge-fields>
-    <merge-field>
-      <page>1</page>
-      <name>Employee Name</name>
-      <id><%= options[:guid] || "a_951_5c0634d166d44916b9e0b3" %></id>
-    </merge-field>
-  </merge-fields>
+  <% unless options[:no_merge_fields] %>
+    <merge-fields>
+      <merge-field>
+        <page>1</page>
+        <name>Employee Name</name>
+        <id><%= options[:guid] || "a_951_5c0634d166d44916b9e0b3" %></id>
+      </merge-field>
+      <% if options[:one_merge_field] %>
+        <merge-field>
+          <page>1</page>
+          <name>Employee Title</name>
+          <id><%= options[:guid] || "a_951_5c0634d166d44916b9e0b3" %></id>
+        </merge-field>
+      <% end %>
+    </merge-fields>
+  <% end %>
   <message>Please sign this document.</message>
   <created-at>2009-10-28T19:03:26-07:00</created-at>
-  <roles>
-    <role>
-      <must-sign>false</must-sign>
-      <document-role-id>cc_A</document-role-id>
-      <role>Document Sender</role>
-      <is-sender>true</is-sender>
-    </role>
-    <role>
-      <must-sign>true</must-sign>
-      <document-role-id>cc_B</document-role-id>
-      <role>Employer</role>
-      <is-sender>false</is-sender>
-    </role>
-  </roles>
+  <% unless options[:no_roles] %>
+    <roles>
+      <role>
+        <must-sign>false</must-sign>
+        <document-role-id>cc_A</document-role-id>
+        <role>Document Sender</role>
+        <is-sender>true</is-sender>
+      </role>
+      <role>
+        <must-sign>true</must-sign>
+        <document-role-id>cc_B</document-role-id>
+        <role>Employer</role>
+        <is-sender>false</is-sender>
+      </role>
+    </roles>
+  <% end %>
   <size>3524</size>
   <subject><%= options[:subject] || "Employment Application Template" %></subject>
   <guid><%= options[:guid] || "a_951_5c0634d166d44916b9e0b3" %></guid>
   <processing-state>done-processing</processing-state>
   <content-type>pdf</content-type>
   <filename>Application.pdf</filename>
-</template>
+</template>

data/spec/helpers/right_signature_stub.rb

@@ -49,6 +49,7 @@ module RightSignatureStub
 
     stub_request(:post, "https://rightsignature.com/api/templates.xml").with do |req|
       sent = Hash.from_xml(req.body)['template']
+      deep_match(sent, options[:match]) if options[:match].present?
 
       sent['guid'] == id &&
       sent['action'] == 'send' &&
@@ -78,4 +79,15 @@ module RightSignatureStub
   def fixture(name)
     File.read(File.join(File.dirname(__FILE__), '..', 'fixtures', name))
   end
-end
+
+  def deep_match(source, matching)
+    matching.each do |k, v|
+      source.should have_key(k)
+      if v.is_a?(String)
+        source[k].should include(v)
+      elsif v.is_a?(Hash)
+        deep_match(source[k], v)
+      end
+    end
+  end
+end

data/spec/template_spec.rb

@@ -38,7 +38,7 @@ describe Signatory::Template do
   describe ".build_document" do
     it "returns a new document" do
       temp = Signatory::Template.new(:guid => 'xxxyyy', :subject => 'Blah blah')
-      doc_pkg = Signatory::Template.new(:guid => 'abcabc', :type => 'DocumentPackage')
+      doc_pkg = Signatory::DocumentPackage.new(:guid => 'abcabc', :type => 'DocumentPackage')
       doc = Signatory::Document.new
       
       roles = [{:name => "Ryan Garver"}, {:name => "Cary Dunn"}]
@@ -52,28 +52,22 @@ describe Signatory::Template do
     end
   end
   
-  context "type = DocumentPackage" do
-    describe ".signing_parties" do
-      it "returns all of the roles that must sign"
-    end
+  describe "#merge_fields" do
+    it "returns empty array when there are none" do
+      stub_template('123', :no_merge_fields => true)
+      templ = Signatory::Template.find('123')
 
-    describe ".sender" do
-      it "returns the role who sent the document"
+      templ.merge_fields.should be_a(Array)
+      templ.merge_fields.should be_empty
     end
 
-    describe ".prefill_and_send" do
-      it "returns the sent document" do
-        doc_pkg = Signatory::Template.new(:guid => 'templid')
-        roles = [Signatory::Role.new(:name => "Ryan Garver", :role_name => 'Issuer'), Signatory::Role.new(:name => "Cary Dunn", :role_name => 'Investor')]
-        merge_fields = [Signatory::MergeField.new(:name => 'Company Name', :value => 'ABC Corp')]
+    it "returns array with one merge field when there is one" do
+      stub_template('123', :one_merge_field => true)
+      templ = Signatory::Template.find('123')
 
-        id, subject = rand.to_s, "Subject #{rand}"
-        stub_template_send('templid', id, :roles => roles, :merge_fields => merge_fields)
-        stub_document(id, :subject => subject)
-        doc = doc_pkg.prefill_and_send(merge_fields, roles)
-        doc.guid.should == id
-        doc.subject.should == subject
-      end
+      templ.merge_fields.should be_a(Array)
+      templ.merge_fields.should_not be_empty
+      templ.merge_fields[0].should be_a(Signatory::MergeField)
     end
   end
-end
+end

metadata

@@ -1,124 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: signatory
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
+version: !ruby/object:Gem::Version
+  version: 0.0.7
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ryan Garver
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-26 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-17 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70134095110220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70134095110220
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70134095109760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 22
-        version: 2.0.0.beta.22
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 2.5.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70134095109760
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70134095109300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 5
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.3.5
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70134095109300
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70134095108840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: oauth
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70134095108840
+- !ruby/object:Gem::Dependency
+  name: oauth
+  requirement: &70134095108380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 3
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.4.3
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: activeresource
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70134095108380
+- !ruby/object:Gem::Dependency
+  name: activeresource
+  requirement: &70134095138880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.9
   type: :runtime
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *70134095138880
 description: Signatory provides a simple wrapper around the RightSignature API.
-email: 
-- ryan@profounder.com
+email:
+- ragarver@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -131,6 +96,7 @@ files:
 - lib/signatory/api/connection.rb
 - lib/signatory/credentials.rb
 - lib/signatory/document.rb
+- lib/signatory/document_package.rb
 - lib/signatory/legacy_active_resource_hacks.rb
 - lib/signatory/merge_field.rb
 - lib/signatory/recipient.rb
@@ -140,6 +106,7 @@ files:
 - lib/signatory/version.rb
 - signatory.gemspec
 - spec/credentials_spec.rb
+- spec/document_package_spec.rb
 - spec/document_spec.rb
 - spec/fixtures/document.xml.erb
 - spec/fixtures/documents.xml.erb
@@ -154,39 +121,28 @@ files:
 - spec/signatory_spec.rb
 - spec/spec_helper.rb
 - spec/template_spec.rb
-has_rdoc: true
 homepage: http://rubygems.org/gems/signatory
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: signatory
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: API wrapper for RightSignature
 test_files: []
-