rightsignature 0.1.8 → 1.0.0

data/lib/rightsignature/connection/oauth_connection.rb

@@ -1,63 +1,73 @@
 module RightSignature
   class OauthConnection
+    attr_reader :request_token
+    attr_reader :consumer_key, :consumer_secret, :oauth_access_token, :oauth_access_secret
 
-    class << self
-      attr_reader :request_token
-      
-      def oauth_consumer
-        check_credentials unless RightSignature::configuration[:consumer_key] && RightSignature::configuration[:consumer_secret]
-        @oauth_consumer ||= OAuth::Consumer.new(
-          RightSignature::configuration[:consumer_key],
-          RightSignature::configuration[:consumer_secret],
-          {
-           :site              => "https://rightsignature.com",
-           :scheme            => :header,
-           :http_method        => :post,
-           :authorize_path    =>'/oauth/authorize', 
-           :access_token_path =>'/oauth/access_token', 
-           :request_token_path=>'/oauth/request_token'
-          }
-        )
-      end
-      
-      def access_token
-        check_credentials
-        @access_token = OAuth::AccessToken.new(oauth_consumer,  RightSignature::configuration[:access_token],  RightSignature::configuration[:access_secret])
-      end
-      
-      def access_token
-        check_credentials
-        @access_token ||= OAuth::AccessToken.new(oauth_consumer, RightSignature::configuration[:access_token],  RightSignature::configuration[:access_secret])
-      end
-      
-      def set_access_token(access_token, access_secret)
-        RightSignature::configuration[:access_token] = access_token
-        RightSignature::configuration[:access_secret] = access_secret
-        @access_token = OAuth::AccessToken.new(oauth_consumer, RightSignature::configuration[:access_token],  RightSignature::configuration[:access_secret])
-      end
-      
-      def new_request_token
-        @request_token = RightSignature::OauthConnection.oauth_consumer.get_request_token
-      end
-      
-      def generate_access_token(oauth_verifier)
-        raise "Please set request token with new_request_token" unless @request_token
-        @access_token = @request_token.get_access_token(:oauth_verifier =>  oauth_verifier)
-      end
-      
-      def request(method, *options)
-        options.last ||= {}
-        options.last["Accept"] ||= "*/*"
-        options.last["content-type"] ||= "application/xml"
+    def initialize(credentials={})
+      @consumer_key = credentials[:consumer_key]
+      @consumer_secret = credentials[:consumer_secret]
+      @oauth_access_token = credentials[:access_token]
+      @oauth_access_secret = credentials[:access_secret]
+    end
+    
+    def oauth_consumer
+      check_credentials unless @consumer_key && @consumer_secret
+      @oauth_consumer ||= OAuth::Consumer.new(
+        @consumer_key,
+        @consumer_secret,
+        {
+         :site              => "https://rightsignature.com",
+         :scheme            => :header,
+         :http_method        => :post,
+         :authorize_path    =>'/oauth/authorize', 
+         :access_token_path =>'/oauth/access_token', 
+         :request_token_path=>'/oauth/request_token'
+        }
+      )
+    end
+    
+    def access_token
+      check_credentials
+      @access_token ||= OAuth::AccessToken.new(oauth_consumer,  @oauth_access_token,  @oauth_access_secret)
+    end
+        
+    def set_access_token(access_token, access_secret)
+      @oauth_access_token = access_token
+      @oauth_access_secret = access_secret
+      @access_token = OAuth::AccessToken.new(oauth_consumer, @oauth_access_token, @oauth_access_secret)
+    end
+    
+    def new_request_token
+      @request_token = oauth_consumer.get_request_token
+    end
+    
+    def generate_access_token(oauth_verifier)
+      raise "Please set request token with new_request_token" unless @request_token
+      @access_token = @request_token.get_access_token(:oauth_verifier =>  oauth_verifier)
+      @oauth_access_token = @access_token.token
+      @oauth_access_secret = @access_token.secret
+      @access_token
+    end
+    
+    def request(method, *options)
+      options.last ||= {}
+      options.last["Accept"] ||= "*/*"
+      options.last["content-type"] ||= "application/xml"
 
-        self.access_token.__send__(method, *options)
-      end
-      
-    private
-      def check_credentials
-        raise "Please set load_configuration with #{RightSignature::oauth_keys.join(', ')}" unless RightSignature::has_oauth_credentials?
-      end
+      self.access_token.__send__(method, *options)
     end
+    
+  private
+    def check_credentials
+      raise "Please set #{RightSignature::Connection.oauth_keys.join(', ')}" unless has_oauth_credentials?
+    end
+
+    def has_oauth_credentials?
+      [@consumer_key, @consumer_secret, @oauth_access_token, @oauth_access_secret].each do |cred| 
+        return false if cred.nil? || cred.match(/^\s*$/)
+      end
 
+      true
+    end
   end
 end

data/lib/rightsignature/connection/token_connection.rb

@@ -3,19 +3,24 @@ module RightSignature
     include HTTParty
     base_uri 'https://rightsignature.com'
     format :xml
+    
+    attr_reader :api_token
 
-    class <<self
-      def request(method, url, options)
-        raise "Please set load_configuration with #{RightSignature::api_token_keys.join(', ')}" unless RightSignature::has_api_token?
-        
-        options[:headers] ||= {}
-        options[:headers]['api-token'] = RightSignature::configuration[:api_token]
-        options[:headers]["Accept"] ||= "*/*"
-        options[:headers]["content-type"] ||= "application/xml"
-        __send__(method, url, options)
-      end
-      
+    def initialize(api_token)
+      @api_token = api_token
     end
+    
 
+    def request(method, url, options)
+      raise "Please set api_token" if @api_token.nil? || @api_token.empty?
+      
+      options[:headers] ||= {}
+      options[:headers]['api-token'] = @api_token
+      options[:headers]["Accept"] ||= "*/*"
+      options[:headers]["content-type"] ||= "application/xml"
+      __send__(method, url, options)
+    end
+    
   end
+
 end

data/lib/rightsignature/document.rb

@@ -1,234 +1,231 @@
 module RightSignature
-  class Document
-    extend RightSignature::Helpers
+  module Document
+    include RightSignature::Helpers
 
-    class << self
-      
-      def list(options={})
-        options[:tags] = TagsHelper.mixed_array_to_string_array(options[:tags]) if options[:tags]
-        options[:state] = options[:state].join(',') if options[:state] && options[:state].is_a?(Array)
-        RightSignature::Connection.get "/api/documents.xml", options
-      end
-      
-      def details(guid)
-        RightSignature::Connection.get "/api/documents/#{guid}.xml"
-      end
-      
-      def batch_details(guids)
-        RightSignature::Connection.get "/api/documents/#{guids.join(',')}/batch_details.xml"
-      end
-      
-      def send_reminder(guid)
-        RightSignature::Connection.post "/api/documents/#{guid}/send_reminders.xml", {}
-      end
-      
-      def trash(guid)
-        RightSignature::Connection.post "/api/documents/#{guid}/trash.xml", {}
-      end
+    def documents_list(options={})
+      options[:tags] = TagsHelper.mixed_array_to_string_array(options[:tags]) if options[:tags]
+      options[:state] = options[:state].join(',') if options[:state] && options[:state].is_a?(Array)
+      get "/api/documents.xml", options
+    end
+    
+    def document_details(guid)
+      get "/api/documents/#{guid}.xml"
+    end
+    
+    def documents_batch_details(guids)
+      get "/api/documents/#{guids.join(',')}/batch_details.xml"
+    end
+    
+    def send_reminder(guid)
+      post "/api/documents/#{guid}/send_reminders.xml", {}
+    end
+    
+    def trash_document(guid)
+      post "/api/documents/#{guid}/trash.xml", {}
+    end
 
-      def extend_expiration(guid)
-        RightSignature::Connection.post "/api/documents/#{guid}/extend_expiration.xml", {}
-      end
-      
-      # This will REPLACE the tags on a document
-      # tags are an array of 'tag_name' or {'tag_name' => 'value'}
-      # Hash style:
-      # {:name => value}
-      def update_tags(guid, tags)
-        RightSignature::Connection.post "/api/documents/#{guid}/update_tags.xml", { :tags => TagsHelper.array_to_xml_hash(tags) }
-      end
-      
-      # Creates a document from a raw data
-      # * file: file binary. Ex. File.read('myfile.pdf')
-      # * filename: original filename
-      # * subject: subject of the document that'll appear in email
-      # * recipients: Recipients of the document, should be an array of hashes with :name, :email, and :role ('cc' or 'signer'). 
-      #     An optional :is_sender (true/false) is used to referrence the API User and won't need to supply :name and :email
-      #     Ex. CC to support@rightsignature.com, with sender and john@rightsignature.com as a signer
-      #     [
-      #       {:name => "RightSignature", :email => "support@rightsignature.com", :role => 'cc'},
-      #       {:name => "John Bellingham", :email => "john@rightsignature.com", :role => 'signer'},
-      #       {'is_sender' => true, :role => 'signer'},
-      #     ]
-      # * options: other optional values
-      #     - description: document description that'll appear in the email
-      #     - action: 'send' or 'redirect'. Redirect will return a token that will allow another person to send the document under API user's account
-      #     - expires_in: number of days before expiring the document. API only allows 2,5,15, or 30.
-      #     - tags: document tags, an array of string or hashes 'single_tag' (for simple tag) or {'tag_name' => 'tag_value'} (for tuples pairs)
-      #         Ex. ['sent_from_api', {"user_id" => "32"}]
-      #     - callback_url: A URI encoded URL that specifies the location for API to POST a callback notification to when the document has been created and signed. 
-      #         Ex. "http://yoursite/callback"
-      #     - use_text_tags: Document has special Text Tags that RightSignature parse. true or false.
-      #         More info: https://rightsignature.com/apidocs/text_tags
-      def send_document_from_data(file_data, filename, subject, recipients, options={})
-        send_document(subject, recipients, {:type => "base64", :filename => filename, :value => Base64::encode64(file_data)}, options)
-      end
+    def extend_document_expiration(guid)
+      post "/api/documents/#{guid}/extend_expiration.xml", {}
+    end
+    
+    # This will REPLACE the tags on a document
+    # tags are an array of 'tag_name' or {'tag_name' => 'value'}
+    # Hash style:
+    # {:name => value}
+    def update_document_tags(guid, tags)
+      post "/api/documents/#{guid}/update_tags.xml", { :tags => TagsHelper.array_to_xml_hash(tags) }
+    end
+    
+    # Creates a document from a raw data
+    # * file: file binary. Ex. File.read('myfile.pdf')
+    # * filename: original filename
+    # * subject: subject of the document that'll appear in email
+    # * recipients: Recipients of the document, should be an array of hashes with :name, :email, and :role ('cc' or 'signer'). 
+    #     An optional :is_sender (true/false) is used to referrence the API User and won't need to supply :name and :email
+    #     Ex. CC to support@rightsignature.com, with sender and john@rightsignature.com as a signer
+    #     [
+    #       {:name => "RightSignature", :email => "support@rightsignature.com", :role => 'cc'},
+    #       {:name => "John Bellingham", :email => "john@rightsignature.com", :role => 'signer'},
+    #       {'is_sender' => true, :role => 'signer'},
+    #     ]
+    # * options: other optional values
+    #     - description: document description that'll appear in the email
+    #     - action: 'send' or 'redirect'. Redirect will return a token that will allow another person to send the document under API user's account
+    #     - expires_in: number of days before expiring the document. API only allows 2,5,15, or 30.
+    #     - tags: document tags, an array of string or hashes 'single_tag' (for simple tag) or {'tag_name' => 'tag_value'} (for tuples pairs)
+    #         Ex. ['sent_from_api', {"user_id" => "32"}]
+    #     - callback_url: A URI encoded URL that specifies the location for API to POST a callback notification to when the document has been created and signed. 
+    #         Ex. "http://yoursite/callback"
+    #     - use_text_tags: Document has special Text Tags that RightSignature parse. true or false.
+    #         More info: https://rightsignature.com/apidocs/text_tags
+    def send_document_from_data(file_data, filename, subject, recipients, options={})
+      send_document(subject, recipients, {:type => "base64", :filename => filename, :value => Base64::encode64(file_data)}, options)
+    end
+    
+    # Creates a document from a File or path to file
+    # * file: Path to file or File object
+    # * subject: subject of the document that'll appear in email
+    # * recipients: Recipients of the document, should be an array of hashes with :name, :email, and :role ('cc' or 'signer'). 
+    #     An optional :is_sender (true/false) is used to referrence the API User and won't need to supply :name and :email
+    #     Ex. CC to support@rightsignature.com, with sender and john@rightsignature.com as a signer
+    #     [
+    #       {:name => "RightSignature", :email => "support@rightsignature.com", :role => 'cc'},
+    #       {:name => "John Bellingham", :email => "john@rightsignature.com", :role => 'signer'},
+    #       {'is_sender' => true, :role => 'signer'},
+    #     ]
+    # * options: other optional values
+    #     - description: document description that'll appear in the email
+    #     - action: 'send' or 'redirect'. Redirect will return a token that will allow another person to send the document under API user's account
+    #     - expires_in: number of days before expiring the document. API only allows 2,5,15, or 30.
+    #     - tags: document tags, an array of string or hashes 'single_tag' (for simple tag) or {'tag_name' => 'tag_value'} (for tuples pairs)
+    #         Ex. ['sent_from_api', {"user_id" => "32"}]
+    #     - callback_url: A URI encoded URL that specifies the location for API to POST a callback notification to when the document has been created and signed. 
+    #         Ex. "http://yoursite/callback"
+    #     - use_text_tags: Document has special Text Tags that RightSignature parse. true or false.
+    #         More info: https://rightsignature.com/apidocs/text_tags
+    def send_document_from_file(file, subject, recipients, options={})
+      send_document(subject, recipients, {:type => "base64", :filename => File.basename(file), :value => Base64::encode64(File.read(file)) }, options)
+    end
+    
+    # Creates a document from URL
+    # * url: URL to file
+    # * subject: subject of the document that'll appear in email
+    # * recipients: Recipients of the document, should be an array of hashes with :name, :email, and :role ('cc' or 'signer'). 
+    #     An optional :is_sender (true/false) is used to referrence the API User and won't need to supply :name and :email
+    #     Ex. CC to support@rightsignature.com, with sender and john@rightsignature.com as a signer
+    #     [
+    #       {:name => "RightSignature", :email => "support@rightsignature.com", :role => 'cc'},
+    #       {:name => "John Bellingham", :email => "john@rightsignature.com", :role => 'signer'},
+    #       {'is_sender' => true, :role => 'signer'},
+    #     ]
+    # * options: other optional values
+    #     - description: document description that'll appear in the email
+    #     - action: 'send' or 'redirect'. Redirect will return a token that will allow another person to send the document under API user's account
+    #     - expires_in: number of days before expiring the document. API only allows 2,5,15, or 30.
+    #     - tags: document tags, an array of string or hashes 'single_tag' (for simple tag) or {'tag_name' => 'tag_value'} (for tuples pairs)
+    #         Ex. ['sent_from_api', {"user_id" => "32"}]
+    #     - callback_url: A URI encoded URL that specifies the location for API to POST a callback notification to when the document has been created and signed. 
+    #         Ex. "http://yoursite/callback"
+    #     - use_text_tags: Document has special Text Tags that RightSignature parse. true or false.
+    #         More info: https://rightsignature.com/apidocs/text_tags
+    def send_document_from_url(url, subject, recipients, options={})
+      send_document(subject, recipients, {:type => "url", :filename => File.basename(url), :value => url }, options)
+    end
+    
+    # Creates a document from a base64 encoded file or publicly available URL
+    # * document_data: hash of document source :type ('base64' or 'url'), :filename to be used, :value of source (url or base64 encoded binary)
+    # * subject: subject of the document that'll appear in email
+    # * recipients: Recipients of the document, should be an array of hashes with :name, :email, and :role ('cc' or 'signer'). 
+    #     An optional :is_sender (true/false) is used to referrence the API User and won't need to supply :name and :email
+    #     Ex. CC to support@rightsignature.com, with sender and john@rightsignature.com as a signer
+    #     [
+    #       {:name => "RightSignature", :email => "support@rightsignature.com", :role => 'cc'},
+    #       {:name => "John Bellingham", :email => "john@rightsignature.com", :role => 'signer'},
+    #       {'is_sender' => true, :role => 'signer'},
+    #     ]
+    # * options: other optional values
+    #     - description: document description that'll appear in the email
+    #     - action: 'send' or 'redirect'. Redirect will return a token that will allow another person to send the document under API user's account
+    #     - expires_in: number of days before expiring the document. API only allows 2,5,15, or 30.
+    #     - tags: document tags, an array of string or hashes 'single_tag' (for simple tag) or {'tag_name' => 'tag_value'} (for tuples pairs)
+    #         Ex. ['sent_from_api', {"user_id" => "32"}]
+    #     - callback_url: A URI encoded URL that specifies the location for API to POST a callback notification to when the document has been created and signed. 
+    #         Ex. "http://yoursite/callback"
+    #     - use_text_tags: Document has special Text Tags that RightSignature parse. true or false.
+    #         More info: https://rightsignature.com/apidocs/text_tags
+    # Ex. 
+    # recipients = [
+    #   {:name => "RightSignature", :email => "support@rightsignature.com", :role => 'cc'},
+    #   {:name => "John Bellingham", :email => "john@rightsignature.com", :role => 'signer'},
+    #   {'is_sender' => true, :role => 'signer'},
+    # ]
+    # document_data = {:type => 'base64', :filename => "originalfile.pdf", :value => Base64.encode64(File.read('myfile.pdf','r'))}
+    # options = {
+    #   :tags => ['sent_from_api', 'user_id' => '12345'],
+    #   :expires_in => '5 days',
+    #   :action => "redirect",
+    #   'callback_location' => "http://example.com/doc_callback",
+    #   'use_text_tags' => false
+    # }
+    # RightSignature::send_document( "My Subject", recipients, document_data, options)
+    # 
+    def send_document(subject, recipients, document_data, options={})
+      document_hash = {:document => {
+        :subject => subject,
+        :action => "send",
+        :document_data => document_data
+      }}
       
-      # Creates a document from a File or path to file
-      # * file: Path to file or File object
-      # * subject: subject of the document that'll appear in email
-      # * recipients: Recipients of the document, should be an array of hashes with :name, :email, and :role ('cc' or 'signer'). 
-      #     An optional :is_sender (true/false) is used to referrence the API User and won't need to supply :name and :email
-      #     Ex. CC to support@rightsignature.com, with sender and john@rightsignature.com as a signer
-      #     [
-      #       {:name => "RightSignature", :email => "support@rightsignature.com", :role => 'cc'},
-      #       {:name => "John Bellingham", :email => "john@rightsignature.com", :role => 'signer'},
-      #       {'is_sender' => true, :role => 'signer'},
-      #     ]
-      # * options: other optional values
-      #     - description: document description that'll appear in the email
-      #     - action: 'send' or 'redirect'. Redirect will return a token that will allow another person to send the document under API user's account
-      #     - expires_in: number of days before expiring the document. API only allows 2,5,15, or 30.
-      #     - tags: document tags, an array of string or hashes 'single_tag' (for simple tag) or {'tag_name' => 'tag_value'} (for tuples pairs)
-      #         Ex. ['sent_from_api', {"user_id" => "32"}]
-      #     - callback_url: A URI encoded URL that specifies the location for API to POST a callback notification to when the document has been created and signed. 
-      #         Ex. "http://yoursite/callback"
-      #     - use_text_tags: Document has special Text Tags that RightSignature parse. true or false.
-      #         More info: https://rightsignature.com/apidocs/text_tags
-      def send_document_from_file(file, subject, recipients, options={})
-        send_document(subject, recipients, {:type => "base64", :filename => File.basename(file), :value => Base64::encode64(File.read(file)) }, options)
+      document_hash[:document][:recipients] = []
+      recipients.each do |recipient_hash|
+        document_hash[:document][:recipients] << { :recipient => recipient_hash}
       end
       
-      # Creates a document from URL
-      # * url: URL to file
-      # * subject: subject of the document that'll appear in email
-      # * recipients: Recipients of the document, should be an array of hashes with :name, :email, and :role ('cc' or 'signer'). 
-      #     An optional :is_sender (true/false) is used to referrence the API User and won't need to supply :name and :email
-      #     Ex. CC to support@rightsignature.com, with sender and john@rightsignature.com as a signer
-      #     [
-      #       {:name => "RightSignature", :email => "support@rightsignature.com", :role => 'cc'},
-      #       {:name => "John Bellingham", :email => "john@rightsignature.com", :role => 'signer'},
-      #       {'is_sender' => true, :role => 'signer'},
-      #     ]
-      # * options: other optional values
-      #     - description: document description that'll appear in the email
-      #     - action: 'send' or 'redirect'. Redirect will return a token that will allow another person to send the document under API user's account
-      #     - expires_in: number of days before expiring the document. API only allows 2,5,15, or 30.
-      #     - tags: document tags, an array of string or hashes 'single_tag' (for simple tag) or {'tag_name' => 'tag_value'} (for tuples pairs)
-      #         Ex. ['sent_from_api', {"user_id" => "32"}]
-      #     - callback_url: A URI encoded URL that specifies the location for API to POST a callback notification to when the document has been created and signed. 
-      #         Ex. "http://yoursite/callback"
-      #     - use_text_tags: Document has special Text Tags that RightSignature parse. true or false.
-      #         More info: https://rightsignature.com/apidocs/text_tags
-      def send_document_from_url(url, subject, recipients, options={})
-        send_document(subject, recipients, {:type => "url", :filename => File.basename(url), :value => url }, options)
-      end
+      document_hash[:document].merge!(options)
+      post "/api/documents.xml", document_hash
+    end
+    
+    # Prefills a document from a base64 encoded file or publicly available URL and returns a url that allows someone to send as the API User
+    # * document_data: hash of document source :type ('base64' or 'url'), :filename to be used, :value of source (url or base64 encoded binary)
+    # * subject: subject of the document that'll appear in email
+    # * recipients: Recipients of the document, should be an array of hashes with :name, :email, and :role ('cc' or 'signer'). 
+    #     An optional :is_sender (true/false) is used to referrence the API User and won't need to supply :name and :email
+    #     Ex. CC to support@rightsignature.com, with sender and john@rightsignature.com as a signer
+    #     [
+    #       {:name => "RightSignature", :email => "support@rightsignature.com", :role => 'cc'},
+    #       {:name => "John Bellingham", :email => "john@rightsignature.com", :role => 'signer'},
+    #       {'is_sender' => true, :role => 'signer'},
+    #     ]
+    # * options: other optional values
+    #     - description: document description that'll appear in the email
+    #     - action: 'send' or 'redirect'. Redirect will return a token that will allow another person to send the document under API user's account
+    #     - expires_in: number of days before expiring the document. API only allows 2,5,15, or 30.
+    #     - tags: document tags, an array of string or hashes 'single_tag' (for simple tag) or {'tag_name' => 'tag_value'} (for tuples pairs)
+    #         Ex. ['sent_from_api', {"user_id" => "32"}]
+    #     - callback_url: A URI encoded URL that specifies the location for API to POST a callback notification to when the document has been created and signed. 
+    #         Ex. "http://yoursite/callback"
+    #     - use_text_tags: Document has special Text Tags that RightSignature parse. true or false.
+    #         More info: https://rightsignature.com/apidocs/text_tags
+    # Ex. 
+    # recipients = [
+    #   {:name => "RightSignature", :email => "support@rightsignature.com", :role => 'cc'},
+    #   {:name => "John Bellingham", :email => "john@rightsignature.com", :role => 'signer'},
+    #   {'is_sender' => true, :role => 'signer'},
+    # ]
+    # document_data = {:type => 'base64', :filename => "originalfile.pdf", :value => Base64.encode64(File.read('myfile.pdf','r'))}
+    # options = {
+    #   :tags => ['sent_from_api', 'user_id' => '12345'],
+    #   :expires_in => '5 days',
+    #   :action => "redirect",
+    #   'callback_location' => "http://example.com/doc_callback",
+    #   'use_text_tags' => false
+    # }
+    # RightSignature::generate_document_redirect_url( "My Subject", recipients, document_data, options)
+    #
+    def generate_document_redirect_url(subject, recipients, document_data, options={})
+      options[:action] = "redirect"
+      response = send_document(subject, recipients, document_data, options)
       
-      # Creates a document from a base64 encoded file or publicly available URL
-      # * document_data: hash of document source :type ('base64' or 'url'), :filename to be used, :value of source (url or base64 encoded binary)
-      # * subject: subject of the document that'll appear in email
-      # * recipients: Recipients of the document, should be an array of hashes with :name, :email, and :role ('cc' or 'signer'). 
-      #     An optional :is_sender (true/false) is used to referrence the API User and won't need to supply :name and :email
-      #     Ex. CC to support@rightsignature.com, with sender and john@rightsignature.com as a signer
-      #     [
-      #       {:name => "RightSignature", :email => "support@rightsignature.com", :role => 'cc'},
-      #       {:name => "John Bellingham", :email => "john@rightsignature.com", :role => 'signer'},
-      #       {'is_sender' => true, :role => 'signer'},
-      #     ]
-      # * options: other optional values
-      #     - description: document description that'll appear in the email
-      #     - action: 'send' or 'redirect'. Redirect will return a token that will allow another person to send the document under API user's account
-      #     - expires_in: number of days before expiring the document. API only allows 2,5,15, or 30.
-      #     - tags: document tags, an array of string or hashes 'single_tag' (for simple tag) or {'tag_name' => 'tag_value'} (for tuples pairs)
-      #         Ex. ['sent_from_api', {"user_id" => "32"}]
-      #     - callback_url: A URI encoded URL that specifies the location for API to POST a callback notification to when the document has been created and signed. 
-      #         Ex. "http://yoursite/callback"
-      #     - use_text_tags: Document has special Text Tags that RightSignature parse. true or false.
-      #         More info: https://rightsignature.com/apidocs/text_tags
-      # Ex. 
-      # recipients = [
-      #   {:name => "RightSignature", :email => "support@rightsignature.com", :role => 'cc'},
-      #   {:name => "John Bellingham", :email => "john@rightsignature.com", :role => 'signer'},
-      #   {'is_sender' => true, :role => 'signer'},
-      # ]
-      # document_data = {:type => 'base64', :filename => "originalfile.pdf", :value => Base64.encode64(File.read('myfile.pdf','r'))}
-      # options = {
-      #   :tags => ['sent_from_api', 'user_id' => '12345'],
-      #   :expires_in => '5 days',
-      #   :action => "redirect",
-      #   'callback_location' => "http://example.com/doc_callback",
-      #   'use_text_tags' => false
-      # }
-      # RightSignature::send_document( "My Subject", recipients, document_data, options)
-      # 
-      def send_document(subject, recipients, document_data, options={})
-        document_hash = {:document => {
-          :subject => subject,
-          :action => "send",
-          :document_data => document_data
-        }}
-        
-        document_hash[:document][:recipients] = []
-        recipients.each do |recipient_hash|
-          document_hash[:document][:recipients] << { :recipient => recipient_hash}
-        end
-        
-        document_hash[:document].merge!(options)
-        RightSignature::Connection.post "/api/documents.xml", document_hash
-      end
+      "#{site}/builder/new?rt=#{response['document']['redirect_token']}"
+    end
+    
+    def get_document_signer_links_for(guid, redirect_location = nil)
+      params = {}
+      params[:redirect_location] = URI.encode(redirect_location) if redirect_location
+      response = get "/api/documents/#{guid}/signer_links.xml", params
       
-      # Prefills a document from a base64 encoded file or publicly available URL and returns a url that allows someone to send as the API User
-      # * document_data: hash of document source :type ('base64' or 'url'), :filename to be used, :value of source (url or base64 encoded binary)
-      # * subject: subject of the document that'll appear in email
-      # * recipients: Recipients of the document, should be an array of hashes with :name, :email, and :role ('cc' or 'signer'). 
-      #     An optional :is_sender (true/false) is used to referrence the API User and won't need to supply :name and :email
-      #     Ex. CC to support@rightsignature.com, with sender and john@rightsignature.com as a signer
-      #     [
-      #       {:name => "RightSignature", :email => "support@rightsignature.com", :role => 'cc'},
-      #       {:name => "John Bellingham", :email => "john@rightsignature.com", :role => 'signer'},
-      #       {'is_sender' => true, :role => 'signer'},
-      #     ]
-      # * options: other optional values
-      #     - description: document description that'll appear in the email
-      #     - action: 'send' or 'redirect'. Redirect will return a token that will allow another person to send the document under API user's account
-      #     - expires_in: number of days before expiring the document. API only allows 2,5,15, or 30.
-      #     - tags: document tags, an array of string or hashes 'single_tag' (for simple tag) or {'tag_name' => 'tag_value'} (for tuples pairs)
-      #         Ex. ['sent_from_api', {"user_id" => "32"}]
-      #     - callback_url: A URI encoded URL that specifies the location for API to POST a callback notification to when the document has been created and signed. 
-      #         Ex. "http://yoursite/callback"
-      #     - use_text_tags: Document has special Text Tags that RightSignature parse. true or false.
-      #         More info: https://rightsignature.com/apidocs/text_tags
-      # Ex. 
-      # recipients = [
-      #   {:name => "RightSignature", :email => "support@rightsignature.com", :role => 'cc'},
-      #   {:name => "John Bellingham", :email => "john@rightsignature.com", :role => 'signer'},
-      #   {'is_sender' => true, :role => 'signer'},
-      # ]
-      # document_data = {:type => 'base64', :filename => "originalfile.pdf", :value => Base64.encode64(File.read('myfile.pdf','r'))}
-      # options = {
-      #   :tags => ['sent_from_api', 'user_id' => '12345'],
-      #   :expires_in => '5 days',
-      #   :action => "redirect",
-      #   'callback_location' => "http://example.com/doc_callback",
-      #   'use_text_tags' => false
-      # }
-      # RightSignature::generate_document_redirect_url( "My Subject", recipients, document_data, options)
-      #
-      def generate_document_redirect_url(subject, recipients, document_data, options={})
-        options[:action] = "redirect"
-        response = send_document(subject, recipients, document_data, options)
-        
-        "#{RightSignature::Connection.site}/builder/new?rt=#{response['document']['redirect_token']}"
-      end
+      signer_links = []
       
-      def get_signer_links_for(guid, redirect_location = nil)
-        params = {}
-        params[:redirect_location] = URI.encode(redirect_location) if redirect_location
-        response = RightSignature::Connection.get "/api/documents/#{guid}/signer_links.xml", params
-        
-        signer_links = []
-        
-        if response["document"]["signer_links"]["signer_link"].is_a? Array
-          response["document"]["signer_links"]["signer_link"].each do |signer_link|
-            signer_links << {"name" => signer_link["name"], "url" => "#{RightSignature::Connection.site}/signatures/embedded?rt=#{signer_link["signer_token"]}"}
-          end
-        else
-          signer_link = response["document"]["signer_links"]["signer_link"]
-          signer_links << {"name" => signer_link["name"], "url" => "#{RightSignature::Connection.site}/signatures/embedded?rt=#{signer_link["signer_token"]}"}
+      if response["document"]["signer_links"]["signer_link"].is_a? Array
+        response["document"]["signer_links"]["signer_link"].each do |signer_link|
+          signer_links << {"name" => signer_link["name"], "url" => "#{site}/signatures/embedded?rt=#{signer_link["signer_token"]}"}
         end
-        signer_links
+      else
+        signer_link = response["document"]["signer_links"]["signer_link"]
+        signer_links << {"name" => signer_link["name"], "url" => "#{site}/signatures/embedded?rt=#{signer_link["signer_token"]}"}
       end
-      
+      signer_links
     end
+    
   end
 end