flexpay 0.1.0 → 0.2.1

data/lib/flexpay.rb

@@ -11,6 +11,7 @@ require 'flexpay/api_module'
 
 require 'flexpay/cobranding_api/v2009_01_09'
 require 'flexpay/fps_api/v2008_09_17'
+require 'flexpay/simple_pay_api/v2009_04_17'
 
 require 'flexpay/util'
 require 'flexpay/exceptions'
@@ -22,28 +23,34 @@ module Flexpay
     API_SANDBOX_ENDPOINT = 'https://fps.sandbox.amazonaws.com/'.freeze
     PIPELINE_URL = 'https://authorize.payments.amazon.com/cobranded-ui/actions/start'.freeze
     PIPELINE_SANDBOX_URL = 'https://authorize.payments-sandbox.amazon.com/cobranded-ui/actions/start'.freeze
-    API_VERSION = Date.new(2008, 9, 17).to_s.freeze
+    SIMPLEPAY_ENDPOINT = 'https://authorize.payments.amazon.com/pba/paypipeline'.freeze
+    SIMPLEPAY_SANDBOX_ENDPOINT = "https://authorize.payments-sandbox.amazon.com/pba/paypipeline".freeze
     SIGNATURE_VERSION = 2.freeze
 
     attr_reader :access_key
     attr_reader :secret_key
     attr_reader :fps_url
     attr_reader :pipeline_url
+    attr_reader :simplepay_url
     attr_reader :cobranding_version
     attr_reader :fps_version
+    attr_reader :simple_pay_version
 
     def initialize(params)
       @access_key = params[:access_key]
       @secret_key = params[:secret_key]
       @cobranding_version = params[:cobranding_version] || "2009-01-09"
       @fps_version = params[:fps_version] || "2008-09-17"
+      @simple_pay_version = params[:simple_pay_version] || "2009-04-17"
       
       if params[:sandbox].nil? or params[:sandbox] == true
         @pipeline_url = PIPELINE_SANDBOX_URL
         @fps_url = API_SANDBOX_ENDPOINT
+        @simplepay_url = SIMPLEPAY_SANDBOX_ENDPOINT
       else
         @pipeline_url = PIPELINE_URL
         @fps_url = API_ENDPOINT
+        @simplepay_url = SIMPLEPAY_ENDPOINT
       end
 
     end
@@ -53,6 +60,11 @@ module Flexpay
       supply_defaults_for_pipeline_and_return(obj)
     end
     
+    def get_recipient_token
+      obj = cobranding_constant_lookup(:RecipientToken).new
+      supply_defaults_for_pipeline_and_return(obj)
+    end
+    
     def get_verify_signature
       obj = fps_constant_lookup(:VerifySignature).new
       supply_defaults_for_fps_and_return(obj)
@@ -63,10 +75,15 @@ module Flexpay
       supply_defaults_for_fps_and_return(obj)
     end
     
-    # def version
-    #   raise APINotConfigured if @version.nil? || @version.empty?
-    #   @version
-    # end
+    def get_subscription_button
+      obj = simple_pay_constant_lookup(:SubscriptionButton).new
+      supply_defaults_for_simple_pay_and_return(obj)
+    end
+    
+    def get_cancel_subscription_and_refund
+      obj = fps_constant_lookup(:CancelSubscriptionAndRefund).new
+      supply_defaults_for_fps_and_return(obj)
+    end
     
     def access_key
       raise APINotConfigured if @access_key.nil? || @access_key.empty?
@@ -88,6 +105,10 @@ module Flexpay
       Flexpay::FpsAPI.const_get("V#{@fps_version.gsub(/-/,'_')}".to_sym).specific_class(sym)
     end
     
+    def simple_pay_constant_lookup(sym)
+      Flexpay::SimplePayAPI.const_get("V#{@simple_pay_version.gsub(/-/,'_')}".to_sym).specific_class(sym)
+    end
+    
     def supply_defaults_for_pipeline_and_return(obj)
       obj.access_key = @access_key
       obj.secret_key = @secret_key
@@ -103,5 +124,12 @@ module Flexpay
       obj
     end
     
+    def supply_defaults_for_simple_pay_and_return(obj)
+      obj.access_key = @access_key
+      obj.secret_key = @secret_key
+      obj.endpoint = @simplepay_url
+      obj
+    end
+    
   end
 end

data/lib/flexpay/cobranding_api/v2009_01_09/pipelines.rb

@@ -13,6 +13,26 @@ module Flexpay
           self.version = "2009-01-09"
         end
       
+      end
+    end
+  end
+end
+
+module Flexpay
+  module CobrandingAPI
+    module V2009_01_09
+      class RecipientToken
+        include Flexpay::CobrandingAPI::V2009_01_09
+        include Flexpay::AmazonFPSRequest
+      
+        required_parameters "pipelineName","callerReference", "returnURL", "version", "callerKey",
+             "maxFixedFee", "maxVariableFee", "paymentMethod", "recipientPaysFee"
+      
+        def initialize
+          self.pipelineName = "Recipient"
+          self.version = "2009-01-09"
+        end
+      
       end
     end
   end

data/lib/flexpay/fps_api/v2008_09_17.rb

@@ -7,4 +7,5 @@ module Flexpay
 end
 
 require 'flexpay/fps_api/v2008_09_17/verify_signature'
-require 'flexpay/fps_api/v2008_09_17/pay'
+require 'flexpay/fps_api/v2008_09_17/pay'
+require 'flexpay/fps_api/v2008_09_17/cancel_subscription_and_refund'

data/lib/flexpay/fps_api/v2008_09_17/cancel_subscription_and_refund.rb

@@ -0,0 +1,20 @@
+module Flexpay
+  module FpsAPI
+    module V2008_09_17
+      class CancelSubscriptionAndRefund
+        include Flexpay::FpsAPI::V2008_09_17
+        include Flexpay::AmazonFPSRequest
+      
+        required_parameters "CallerReference", "CancelReason", "RefundAmount", "SubscriptionId", "Action", "AWSAccessKeyId", "Timestamp", "Version"
+      
+        response_parameters :RefundTransactionId => "/'CancelSubscriptionAndRefundResponse'/'CancelSubscriptionAndRefundResult'/'RefundTransactionId'"
+      
+        def initialize
+          self.Action = "CancelSubscriptionAndRefund"
+          self.Version = "2008-09-17"
+        end
+      
+      end
+    end
+  end
+end

data/lib/flexpay/request.rb

@@ -51,12 +51,24 @@ module Flexpay
     def go!(signed=true)
       url = generate_url(signed)
       
-      RestClient.log = "stdout"
-      response = RestClient.get url
+      RestClient.log = Logger.new(STDOUT)
+      result = {}
+
+      begin
+        RestClient.log.info url
+        response = RestClient.get url
+      rescue Exception => e
+        result["Exception"] = e
+        result["Response"] = e.response
+        return result
+      end
       
-      doc = Hpricot.XML(response)
+      if response.respond_to?(:body)
+        doc = Hpricot.XML(response.body)
+      else
+        doc = Hpricot.XML(response)
+      end
       
-      result = {}
       self.class.get_response_parameters.each do |k,v|
         result[k] = eval("(doc#{v}).innerHTML")
       end
@@ -91,7 +103,7 @@ module Flexpay
       params = {}
       self.class.get_required_parameters.each do |p|
         val = self.send(p)
-        params[p.gsub('_','.')] = val unless val.nil? || val.empty?
+        params[p.gsub('_','.')] = val unless val.nil? || ( val.respond_to?(:empty) ? val.empty? : false )
       end
       params
     end

data/lib/flexpay/simple_pay_api/v2009_04_17.rb

@@ -0,0 +1,9 @@
+module Flexpay
+  module SimplePayAPI
+    module V2009_04_17
+      include Flexpay::APIModule
+    end
+  end
+end
+
+require 'flexpay/simple_pay_api/v2009_04_17/subscription_button'

data/lib/flexpay/simple_pay_api/v2009_04_17/subscription_button.rb

@@ -0,0 +1,20 @@
+module Flexpay
+  module SimplePayAPI
+    module V2009_04_17
+      
+      ## This is pseudo-versioned.  Amazon intends for a button to be placed on the webpage
+      ## but you can just as easily forward the user programatically.
+      
+      class SubscriptionButton
+        include Flexpay::SimplePayAPI::V2009_04_17
+        include Flexpay::AmazonFPSRequest
+      
+        required_parameters "accessKey", "amount", "description", "recurringFrequency", "returnURL", "immediateReturn"
+      
+        def initialize
+        end
+      
+      end
+    end
+  end
+end

data/lib/flexpay/util.rb

@@ -19,7 +19,7 @@ module Flexpay
     
     ## These are the modified encoding rules proposed by Amazon. Not quite URL encoding
     def self.modified_URL_encoding(string)
-      URI.escape(string).gsub(/\+/, '%20').gsub(/\*/, '%2A').gsub("%7E","~").gsub(/:/,'%3A').gsub(/\//,'%2F')
+      URI.escape(string).gsub(/\+/, '%20').gsub(/\*/, '%2A').gsub("%7E","~").gsub(/:/,'%3A').gsub(/\//,'%2F').gsub(/,/, '%2C')
     end
     
   end

data/spec/units/cancel_subscription_and_refund_spec.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/units_helper'
+
+describe 'CancelSubscriptionAndRefund' do
+  before(:each) do
+  end
+  
+  it "should correctly build a request" do
+    pay = Flexpay::API.new(:access_key => ACCESS_KEY, :secret_key => SECRET_KEY).get_cancel_subscription_and_refund
+    
+    body =<<HEREDOC 
+    <CancelSubscriptionAndRefundResponse 
+      xmlns="http://fps.amazonaws.com/doc/2008-09-17/">
+      <CancelSubscriptionAndRefundResult>
+        <RefundTransactionId>
+          14GKE3B85HCMF1BTSH5C4PD2IHZL95RJ2LM
+        </RefundTransactionId>
+      </CancelSubscriptionAndRefundResult>
+      <ResponseMetadata>
+        <RequestId>bfbc0b1e-3430-4a74-a75e-5292f59107ca:0</RequestId>
+      </ResponseMetadata>
+    </CancelSubscriptionAndRefundResponse>
+HEREDOC
+    
+    RestClient.stub!(:get).and_return(body)
+    
+    pay.CallerReference = Time.now.to_i.to_s
+    pay.CancelReason = "UserRequestOnSite"
+    pay.SubscriptionId = "123"
+    pay.Timestamp = Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ")
+    pay.AWSAccessKeyId = ACCESS_KEY
+    
+    result = pay.go!
+    result.should have_key(:RefundTransactionId)
+  end
+  
+end

data/spec/units/recipient_token_spec.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/units_helper'
+
+describe "Recipient token" do
+  before(:each) do
+  end
+  
+  it "should respond to all required parameters" do
+    pipeline = Flexpay::API.new(:access_key => ACCESS_KEY, :secret_key => SECRET_KEY).get_recipient_token
+    
+    Flexpay::CobrandingAPI::V2009_01_09::RecipientToken::get_required_parameters.each do |p|
+      pipeline.should respond_to(p)
+    end
+  end
+  
+  it "should correctly build a parameter hash" do
+    pipeline = Flexpay::API.new(:access_key => ACCESS_KEY, :secret_key => SECRET_KEY).get_recipient_token
+    
+    pipeline.callerReference = Time.now.to_i.to_s
+    pipeline.returnURL = "http://127.0.0.1:3000"
+    pipeline.callerKey = ACCESS_KEY
+    pipeline.recipientPaysFee = true
+    
+    url = pipeline.generate_url
+    url.should_not be_empty
+  end
+  
+end

data/spec/units/subscription_button_spec.rb

@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/units_helper'
+
+describe 'Subscription button' do
+  before(:each) do
+  end
+  
+  it "should correctly build a request" do
+    subscription = Flexpay::API.new(:access_key => ACCESS_KEY, :secret_key => SECRET_KEY).get_subscription_button
+
+    subscription.accessKey = ACCESS_KEY
+    subscription.amount = "USD 10"
+    subscription.description = "Unit test"
+    subscription.recurringFrequency = "1 month"
+    subscription.returnURL = "http://localhost:3000"
+    subscription.immediateReturn = 1
+    
+    subscription.generate_url.should_not be_empty
+  end
+  
+end

data/spec/units/units_helper.rb

@@ -1,5 +1,6 @@
 ACCESS_KEY = 'foo'
 SECRET_KEY = 'bar'
+
 API_VERSION = "2009-01-09"
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 2
   - 1
-  - 0
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Chris Chandler
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-19 00:00:00 -05:00
+date: 2010-05-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +26,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 8
+        - 1
+        version: 0.8.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -37,8 +39,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 4
+        - 2
+        version: 1.4.2
   type: :runtime
   version_requirements: *id002
 description: 
@@ -56,9 +60,12 @@ files:
 - lib/flexpay/cobranding_api/v2009_01_09/pipelines.rb
 - lib/flexpay/exceptions.rb
 - lib/flexpay/fps_api/v2008_09_17.rb
+- lib/flexpay/fps_api/v2008_09_17/cancel_subscription_and_refund.rb
 - lib/flexpay/fps_api/v2008_09_17/pay.rb
 - lib/flexpay/fps_api/v2008_09_17/verify_signature.rb
 - lib/flexpay/request.rb
+- lib/flexpay/simple_pay_api/v2009_04_17.rb
+- lib/flexpay/simple_pay_api/v2009_04_17/subscription_button.rb
 - lib/flexpay/util.rb
 has_rdoc: true
 homepage: http://github.com/cchandler/flexpay
@@ -92,9 +99,12 @@ specification_version: 3
 summary: An API for using the Amazon Flexible Payment Service (FPS).
 test_files: 
 - spec/units/api_spec.rb
+- spec/units/cancel_subscription_and_refund_spec.rb
 - spec/units/pay_spec.rb
+- spec/units/recipient_token_spec.rb
 - spec/units/recurring_pipeline_spec.rb
 - spec/units/signature_spec.rb
+- spec/units/subscription_button_spec.rb
 - spec/units/verify_signature_spec.rb
 - spec/integrations/integrations_helper.rb
 - spec/spec_helper.rb