rightsignature 1.0.6 → 1.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2Q2MTU5ZGRiMjIwMGYyNTk1NWQzZjhhNWZhMDlkZjQxYWFiOTgzYw==
+    ZjMzYzk2MDBiZTUwMjcyMzMxNzhkNzUwZjI1ZTI5YTQyMjI5NDYwMQ==
   data.tar.gz: !binary |-
-    NWU3Y2UxOTE1MzAyYjY5Yzc0MmU5NTk4ZmYxNTg0ZjcwMWUxNWZhMA==
+    YTFlYzIzMDcyNzMyMWNmNDM1NjNjZmUwMzQwMjFlZTM1ODJlM2FlNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MGYwM2RmZjFhMDcyMjM5ZDhkMTg2OGY3MzA5OTE1YTY5ODU4N2UyODYxNjU3
-    NWFjOWFkZTk1ZWUwM2YxM2I5YTdiODZjMTZlMjMwZTZlOTc4YmUyYmQ4Yjky
-    ZjQ4MDJiNjkxZDlmNjQxMmQ5ZjljZjc0NzcyYTJjNzU0NzlmNjU=
+    OWVkYTM5OGI2YjBiYjAyYjFlMjczZTA2OTI0MGE0NzZmMDEzZWI0NTM3MDIw
+    YzM5ZWE1NjdhODFjOGM1MDg4NmNjYmI1NzY3ZDUwOWVkNWQ1YjE1MDMzYWYx
+    MDJhNGM4NThlYmUxZjc4YjRhNjI3NDBmYTA3MzBmNTc4MmQ5NTQ=
   data.tar.gz: !binary |-
-    MmFiMTAzMGMwY2M4M2FjZDIyMzM1OTA5NzE3NGE5Yzg4YjFhN2QwYTlmNzYw
-    ZjVjZTllM2EwMGEyMjc3ZTQ2ZWE0YjMyODAzNzI0NGQ5MGExMWU3M2Y4M2Qw
-    NWMwYTQyZDhkMTI1ZTdlNTgzMjY3ZWY0YTBlMWE3YjcyM2E2MGM=
+    Y2Y5MGJkZmM3YzIxZWZmMjVlZjNkZjUwOTRkNzY1MmNkZTAzZGQ0ZGEzMzhm
+    NmNjN2U1NjZlMWNhN2YwOTU3YTBjNGNmYzY4MDIxMDczOTYyY2U0YmRiNmYz
+    YjY5YzIyOGFjNDY5Y2QzZGQyMGI2ZWMzODdhZWE4NzFjYmY1Njg=

data/CONTRIBUTING.md

@@ -0,0 +1,26 @@
+Contributing
+------------
+Awesome! Here are some guidelines:
+ * **Contributions will not be accepted without tests.**
+ * If you're creating a small fix or patch to an existing feature, just a simple
+  test will do. Please stay in the confines of the current test suite and use
+  [RSpec](https://github.com/rspec/rspec).
+ * If your contribution changes any behavior, make sure to update the
+  documentation.
+ * Please follow the [GitHub Ruby Styleguide](https://github.com/styleguide/ruby)
+  when modifying Ruby code.
+
+Running the tests
+-----------------
+```
+rspec spec/*_spec.rb
+```
+
+Basic Steps
+-----------
+ * Fork it
+ * Create your feature branch (git checkout -b my-new-feature)
+ * Commit your changes (git commit -am 'Add some feature')
+ * Make sure the tests pass (rspec spec/*_spec.rb)
+ * Push to the branch (git push origin my-new-feature)
+ * Create new [Pull Request](https://help.github.com/articles/using-pull-requests)

data/lib/rightsignature/template.rb

@@ -80,23 +80,20 @@ module RightSignature
     #       :callback_location => "http://yoursite/callback"
     #     })
     def prefill(guid, subject, roles, options={})
+      use_merge_field_ids = options.delete(:use_merge_field_ids)
       xml_hash = {
         :template => {
           :guid => guid,
           :action => "prefill",
           :subject => subject
-        }
+        }.merge(options)
       }
       
       xml_hash[:template][:roles] = RolesHelper.array_to_xml_hash(roles)
       
       # Optional arguments
-      use_merge_field_ids = options.delete(:use_merge_field_ids)
       xml_hash[:template][:merge_fields] = MergeFieldsHelper.array_to_xml_hash(options[:merge_fields], use_merge_field_ids) if options[:merge_fields]
       xml_hash[:template][:tags] = TagsHelper.array_to_xml_hash(options[:tags]) if options[:tags]
-      [:expires_in, :description, :callback_location, :redirect_location, :action, :document_data].each do |other_option|
-        xml_hash[:template][other_option] = options[other_option] if options[other_option]
-      end
 
       post "/api/templates.xml", xml_hash
     end
@@ -208,16 +205,12 @@ module RightSignature
     #       There will be no free-form name entry when adding merge fields to the Template.
     #       Ex. ["Location", "Tax ID", "Company Name"]
     def generate_build_url(options={})
-      xml_hash = {:template => {}}
+      xml_hash = {:template => options}     
       xml_hash[:template][:tags] = TagsHelper.array_to_xml_hash(options[:tags]) if options[:tags]
       
       [:acceptable_merge_field_names, :acceptable_role_names].each do |option|
         xml_hash[:template][option] = array_to_acceptable_names_hash(options[option]) if options[option]
       end
-      
-      [:callback_location, :redirect_location].each do |other_option|
-        xml_hash[:template][other_option] = options[other_option] if options[other_option]
-      end
 
       response = post "/api/templates/generate_build_token.xml", xml_hash
       

data/lib/rightsignature/version.rb

@@ -1,3 +1,3 @@
 module RightSignature
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/spec/template_spec.rb

@@ -174,6 +174,30 @@ describe RightSignature::Template do
         })
         @rs.prefill("MYGUID", "sign me", [], {:expires_in => 15, :description => "Hey, I'm a description", :redirect_location => 'http://example.com/redirectme', :callback_location => "http://example.com/callie", :document_data => {:type => 'base64', :filename => "originalfile.pdf", :value => "mOio90cv"}})
       end
+
+      it "should include extra options" do
+        @rs.should_receive(:post).with('/api/templates.xml', {
+          :template => {
+            :guid => "MYGUID", 
+            :action => "prefill",
+            :subject => "sign me", 
+            :roles => [
+              {:role => {
+                :name => "John Employee", 
+                :email => "john@employee.com", 
+                "@role_id" => "signer_A"
+            }}],
+            :expires_in => 15, 
+            :description => "Hey, I'm a description", 
+            :redirect_location => 'http://example.com/redirectme',
+            :document_data => {:type => 'base64', :filename => "originalfile.pdf", :value => "mOio90cv"},
+            :callback_location => 'http://example.com/callie',
+            :something_else => "else",
+            :merge_fields => [{:merge_field => {:value => "123456", "@merge_field_id" => "123_abc_78"}}]
+          }
+        })
+        @rs.prefill("MYGUID", "sign me", [{"signer_A" => {:name => "John Employee", :email => "john@employee.com"}}], {:expires_in => 15, :description => "Hey, I'm a description", :redirect_location => 'http://example.com/redirectme', :callback_location => "http://example.com/callie", :document_data => {:type => 'base64', :filename => "originalfile.pdf", :value => "mOio90cv"}, :merge_fields => [{"123_abc_78" => "123456"}], :use_merge_field_ids => true, :something_else => "else"})
+      end
     end
 
     it "should POST /api/templates.xml with action of 'send', MYGUID guid, roles, and \"sign me\" subject in template hash" do
@@ -235,6 +259,29 @@ describe RightSignature::Template do
 
         @rs.generate_build_url(:callback_location => "http://example.com/done_signing", :redirect_location => "http://example.com/come_back_here")
       end
+
+      it "should include other extra options in params" do
+        @rs.should_receive(:post).with("/api/templates/generate_build_token.xml", {:template => {
+          :tags => 
+            [
+              {:tag => {:name => "Site"}}
+            ],
+          :acceptable_merge_field_names => 
+            [
+              {:name => "Site ID"}, 
+              {:name => "Starting City"}
+            ],
+          :acceptable_role_names => 
+            [
+              {:name => "Http Party"}
+            ],
+          :callback_location => "http://example.com/done_signing", 
+          :redirect_location => "http://example.com/come_back_here",
+          :extras => "stuff here"
+        }}).and_return({"token"=>{"redirect_token" => "REDIRECT_TOKEN"}})
+
+        @rs.generate_build_url(:tags => ["Site"], :acceptable_merge_field_names => ["Site ID", "Starting City"], :acceptable_role_names => ["Http Party"], :callback_location => "http://example.com/done_signing", :redirect_location => "http://example.com/come_back_here", :extras => "stuff here")
+      end
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rightsignature
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Alex Chee
@@ -104,6 +104,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CONTRIBUTING.md
 - Gemfile
 - README.md
 - Rakefile