wepay-rails 2.2.9 → 2.5.0

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3

data/Gemfile

@@ -1,14 +1,17 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
-gem 'httparty'
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
-end
+source "http://rubygems.org"
+# Add dependencies required to use your gem here.
+# Example:
+#   gem "activesupport", ">= 2.3.5"
+gem 'httparty'
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem "rails", "3.1.0"
+  gem 'turn', '0.8.2', :require => false
+  gem 'thor'
+  gem "bundler"
+  gem "jeweler", "~> 1.6.4"
+  gem "rcov", ">= 0"
+  gem "webmock"
+end

data/Gemfile.lock

@@ -1,24 +1,116 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    crack (0.1.8)
-    git (1.2.5)
-    httparty (0.7.8)
-      crack (= 0.1.8)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    rake (0.9.2)
-    rcov (0.9.9)
-    shoulda (2.11.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0.0)
-  httparty
-  jeweler (~> 1.6.4)
-  rcov
-  shoulda
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.0)
+      actionpack (= 3.1.0)
+      mail (~> 2.3.0)
+    actionpack (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.0.3)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.0)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
+    addressable (2.3.2)
+    ansi (1.4.2)
+    arel (2.2.3)
+    bcrypt-ruby (3.0.1)
+    bcrypt-ruby (3.0.1-x86-mingw32)
+    builder (3.0.0)
+    crack (0.3.1)
+    erubis (2.7.0)
+    git (1.2.5)
+    hike (1.2.1)
+    httparty (0.9.0)
+      multi_json (~> 1.0)
+      multi_xml
+    i18n (0.6.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    json (1.7.3)
+    mail (2.3.3)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.18)
+    multi_json (1.3.5)
+    multi_xml (0.5.1)
+    polyglot (0.3.3)
+    rack (1.3.6)
+    rack-cache (1.0.3)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.0)
+      actionmailer (= 3.1.0)
+      actionpack (= 3.1.0)
+      activerecord (= 3.1.0)
+      activeresource (= 3.1.0)
+      activesupport (= 3.1.0)
+      bundler (~> 1.0)
+      railties (= 3.1.0)
+    railties (3.1.0)
+      actionpack (= 3.1.0)
+      activesupport (= 3.1.0)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2)
+    rcov (0.9.9)
+    rdoc (3.12)
+      json (~> 1.4)
+    sprockets (2.0.4)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    turn (0.8.2)
+      ansi (>= 1.2.2)
+    tzinfo (0.3.33)
+    webmock (1.8.9)
+      addressable (>= 2.2.7)
+      crack (>= 0.1.7)
+
+PLATFORMS
+  ruby
+  x86-mingw32
+
+DEPENDENCIES
+  bundler
+  httparty
+  jeweler (~> 1.6.4)
+  rails (= 3.1.0)
+  rcov
+  thor
+  turn (= 0.8.2)
+  webmock

data/README.rdoc

@@ -2,14 +2,16 @@
 
 Wepay-Rails allows your rails app to accept payments with Wepay (http://www.wepay.com).
 
+{<img src="https://secure.travis-ci.org/adamthedeveloper/wepay-rails.png?branch=master" alt="Build Status" />}[http://travis-ci.org/adamthedeveloper/wepay-rails]
+
 = Features
 
 * Built in IPN that listens to push notifications from wepay and updates saved checkout records for you
 * Allows you to fetch your access token easily through a web interface
 * Built in API tools to allow you to make all wepay-api calls easily
-* Built in ability to send your customers to wepay to make payments and handles their trip back for you
+* Built in ability to send your customers to wepay to make payments and handles their trip back for you OR use iFrame for checkouts (see Wiki https://github.com/adamthedeveloper/wepay-rails/wiki/Using-the-wepay-iframe)
 * Saves the current state of every checkout
-* Authorize many users to accept payments dynamically (see Wiki)
+* Authorize many users to accept payments dynamically (see Wiki https://github.com/adamthedeveloper/wepay-rails/wiki/Authorize-Many-Users-Dynamically)
 * Configurable
 
 = Installation

data/Rakefile

@@ -42,8 +42,8 @@ end
 
 task :default => :test
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'

data/VERSION

@@ -1 +1 @@
-2.2.9
+2.5.0

data/app/controllers/wepay/checkout_controller.rb

@@ -3,8 +3,12 @@ class Wepay::CheckoutController < Wepay::ApplicationController
     record = WepayCheckoutRecord.find_by_checkout_id_and_security_token(params[:checkout_id],params[:security_token])
 
     if record.present?
-      wepay_gateway = WepayRails::Payments::Gateway.new
+      wepay_gateway = WepayRails::Payments::Gateway.new( record.access_token )
       checkout = wepay_gateway.lookup_checkout(record.checkout_id)
+      
+      # remove unnecessary attributes
+      checkout.delete_if {|k,v| !record.attributes.include? k.to_s}
+      
       record.update_attributes(checkout)
       redirect_to "#{wepay_gateway.configuration[:after_checkout_redirect_uri]}?checkout_id=#{params[:checkout_id]}"
     else

data/app/controllers/wepay/ipn_controller.rb

@@ -6,6 +6,10 @@ class Wepay::IpnController < Wepay::ApplicationController
     if record.present?
       wepay_gateway = WepayRails::Payments::Gateway.new
       checkout = wepay_gateway.lookup_checkout(record.checkout_id)
+      
+      # remove unnecessary attributes
+      checkout.delete_if {|k,v| !record.attributes.include? k.to_s}
+      
       record.update_attributes(checkout)
       render :text => "ok"
     else

data/build

@@ -0,0 +1 @@
+Thu Jun 7 08:31:25 PDT 2012

data/lib/api/account_methods.rb

@@ -9,12 +9,12 @@ module WepayRails
         self.call_api("/account", {:account_id => account_id})
       end
 
-      def find_account(args)
-        self.call_api("/account/find", args)
+      def find_account(params={})
+        self.call_api("/account/find", params)
       end
 
-      def modify_account(args)
-        self.call_api("/account/modify", args)
+      def modify_account(account_id, params={})
+        self.call_api("/account/modify", params.merge({:account_id => account_id}))
       end
 
       def delete_account(account_id)

data/lib/api/checkout_methods.rb

@@ -1,88 +1,98 @@
-require 'digest/sha2'
-module WepayRails
-  module Api
-    module CheckoutMethods
-      # Many of the settings you pass in here are already factored in from
-      # the wepay.yml file and only need to be overridden if you insist on doing
-      # so when this method is called. The following list of key values are pulled
-      # in for you from your wepay.yml file:
-      #
-      # Note: @wepay_config is your wepay.yml as a Hash
-      # :callback_uri     => @wepay_config[:ipn_callback_uri],
-      # :redirect_uri     => @wepay_config[:checkout_redirect_uri],
-      # :fee_payer        => @wepay_config[:fee_payer],
-      # :type             => @wepay_config[:checkout_type],
-      # :charge_tax       => @wepay_config[:charge_tax] ? 1 : 0,
-      # :app_fee          => @wepay_config[:app_fee],
-      # :auto_capture     => @wepay_config[:auto_capture] ? 1 : 0,
-      # :require_shipping => @wepay_config[:require_shipping] ? 1 : 0,
-      # :shipping_fee     => @wepay_config[:shipping_fee],
-      # :charge_tax       => @wepay_config[:charge_tax],
-      # :account_id       => wepay_user['account_id'] # wepay-rails goes and gets this for you, but you can override it if you want to.
-      #
-      #
-      # params hash key values possibilities are:
-      # Parameter:	Required:	Description:
-      # :account_id	Yes	The unique ID of the account you want to create a checkout for.
-      # :short_description	Yes	A short description of what is being paid for.
-      # :long_description	No	A long description of what is being paid for.
-      # :type	Yes	The the checkout type (one of the following: GOODS, SERVICE, DONATION, or PERSONAL)
-      # :reference_id	No	The unique reference id of the checkout (set by the application in /checkout/create
-      # :amount	Yes	The amount that the payer will pay.
-      # :app_fee	No	The amount that the application will receive in fees.
-      # :fee_payer	  No	Who will pay the fees (WePay's fees and any app fees). Set to "Payer" to charge fees to the person paying (Payer will pay amount + fees, payee will receive amount). Set to "Payee" to charge fees to the person receiving money (Payer will pay amount, Payee will receive amount - fees). Defaults to "Payer".
-      # :redirect_uri 	No	The uri the payer will be redirected to after paying.
-      # :callback_uri	  No	The uri that will receive any Instant Payment Notifications sent. Needs to be a full uri (ex https://www.wepay.com )
-      # :auto_capture	No	A boolean value (0 or 1). Default is 1. If set to 0 then the payment will not automatically be released to the account and will be held by WePay in payment state 'reserved'. To release funds to the account you must call /checkout/capture
-      # :require_shipping	No	A boolean value (0 or 1). If set to 1 then the payer will be asked to enter a shipping address when they pay. After payment you can retrieve this shipping address by calling /checkout
-      # :shipping_fee	No	The amount that you want to charge for shipping.
-      # :charge_tax	No	A boolean value (0 or 1). If set to 1 and the account has a relevant tax entry (see /account/set_tax), then tax will be charged.
-      def perform_checkout(parms)
-        security_token = Digest::SHA2.hexdigest("#{rand(4)}#{Time.now.to_i}")
-        defaults = {
-            :callback_uri     => ipn_callback_uri(security_token),
-            :redirect_uri     => checkout_redirect_uri(security_token),
-            :fee_payer        => @wepay_config[:fee_payer],
-            :type             => @wepay_config[:checkout_type],
-            :charge_tax       => @wepay_config[:charge_tax] ? 1 : 0,
-            :app_fee          => @wepay_config[:app_fee],
-            :auto_capture     => @wepay_config[:auto_capture] ? 1 : 0,
-            :require_shipping => @wepay_config[:require_shipping] ? 1 : 0,
-            :shipping_fee     => @wepay_config[:shipping_fee],
-            :account_id       => @wepay_config[:account_id]
-        }.merge(parms)
-
-        resp = self.call_api("/checkout/create", defaults).symbolize_keys!
-        resp.merge({:security_token => security_token})
-      end
-
-      def lookup_checkout(checkout_id)
-        co = self.call_api("/checkout", {:checkout_id => checkout_id})
-        co.delete("type")
-        co
-      end
-
-      def ipn_callback_uri(security_token)
-        uri = if @wepay_config[:ipn_callback_uri].present?
-                @wepay_config[:ipn_callback_uri]
-              else
-                "#{@wepay_config[:root_callback_uri]}/wepay/ipn"
-              end
-        apply_security_token(uri, security_token)
-      end
-
-      def checkout_redirect_uri(security_token)
-        uri = if @wepay_config[:ipn_callback_uri].present?
-                @wepay_config[:checkout_redirect_uri]
-              else
-                "#{@wepay_config[:root_callback_uri]}/wepay/checkout"
-              end
-        apply_security_token(uri, security_token)
-      end
-
-      def apply_security_token(uri, security_token)
-        uri += (uri =~ /\?/ ? '&' : '?') + "security_token=#{security_token}"
-      end
-    end
-  end
-end
+require 'digest/sha2'
+module WepayRails
+  module Api
+    module CheckoutMethods
+      # Many of the settings you pass in here are already factored in from
+      # the wepay.yml file and only need to be overridden if you insist on doing
+      # so when this method is called. The following list of key values are pulled
+      # in for you from your wepay.yml file:
+      #
+      # Note: @wepay_config is your wepay.yml as a Hash
+      # :callback_uri     => @wepay_config[:ipn_callback_uri],
+      # :redirect_uri     => @wepay_config[:checkout_redirect_uri],
+      # :fee_payer        => @wepay_config[:fee_payer],
+      # :type             => @wepay_config[:checkout_type],
+      # :charge_tax       => @wepay_config[:charge_tax] ? 1 : 0,
+      # :app_fee          => @wepay_config[:app_fee],
+      # :auto_capture     => @wepay_config[:auto_capture] ? 1 : 0,
+      # :require_shipping => @wepay_config[:require_shipping] ? 1 : 0,
+      # :shipping_fee     => @wepay_config[:shipping_fee],
+      # :charge_tax       => @wepay_config[:charge_tax],
+      # :account_id       => wepay_user['account_id'] # wepay-rails goes and gets this for you, but you can override it if you want to.
+      #
+      #
+      # params hash key values possibilities are:
+      # Parameter:	Required:	Description:
+      # :account_id	Yes	The unique ID of the account you want to create a checkout for.
+      # :short_description	Yes	A short description of what is being paid for.
+      # :long_description	No	A long description of what is being paid for.
+      # :type	Yes	The the checkout type (one of the following: GOODS, SERVICE, DONATION, or PERSONAL)
+      # :reference_id	No	The unique reference id of the checkout (set by the application in /checkout/create
+      # :amount	Yes	The amount that the payer will pay.
+      # :app_fee	No	The amount that the application will receive in fees.
+      # :fee_payer	  No	Who will pay the fees (WePay's fees and any app fees). Set to "Payer" to charge fees to the person paying (Payer will pay amount + fees, payee will receive amount). Set to "Payee" to charge fees to the person receiving money (Payer will pay amount, Payee will receive amount - fees). Defaults to "Payer".
+      # :redirect_uri 	No	The uri the payer will be redirected to after paying.
+      # :callback_uri	  No	The uri that will receive any Instant Payment Notifications sent. Needs to be a full uri (ex https://www.wepay.com )
+      # :auto_capture	No	A boolean value (0 or 1). Default is 1. If set to 0 then the payment will not automatically be released to the account and will be held by WePay in payment state 'reserved'. To release funds to the account you must call /checkout/capture
+      # :require_shipping	No	A boolean value (0 or 1). If set to 1 then the payer will be asked to enter a shipping address when they pay. After payment you can retrieve this shipping address by calling /checkout
+      # :shipping_fee	No	The amount that you want to charge for shipping.
+      # :charge_tax	No	A boolean value (0 or 1). If set to 1 and the account has a relevant tax entry (see /account/set_tax), then tax will be charged.
+      def perform_checkout(params)
+        security_token = Digest::SHA2.hexdigest("#{Rails.env.production? ? rand(4) : 1}#{Time.now.to_i}") # Make less random during tests
+        
+        # add the security token to any urls that were passed in from the app
+        if params[:callback_uri]
+          params[:callback_uri] = apply_security_token( params[:callback_uri], security_token )
+        end
+        
+        if params[:redirect_uri]
+          params[:redirect_uri] = apply_security_token( params[:redirect_uri], security_token )
+        end
+        
+        defaults = {
+            :callback_uri     => ipn_callback_uri(security_token),
+            :redirect_uri     => checkout_redirect_uri(security_token),
+            :fee_payer        => @wepay_config[:fee_payer],
+            :type             => @wepay_config[:checkout_type],
+            :charge_tax       => @wepay_config[:charge_tax] ? 1 : 0,
+            :app_fee          => @wepay_config[:app_fee],
+            :auto_capture     => @wepay_config[:auto_capture] ? 1 : 0,
+            :require_shipping => @wepay_config[:require_shipping] ? 1 : 0,
+            :shipping_fee     => @wepay_config[:shipping_fee],
+            :account_id       => @wepay_config[:account_id]
+        }.merge(params)
+
+        resp = self.call_api("/checkout/create", defaults)
+        resp.merge({:security_token => security_token})
+      end
+
+      def lookup_checkout(checkout_id)
+        co = self.call_api("/checkout", {:checkout_id => checkout_id})
+        co.delete(:type)
+        co
+      end
+
+      def ipn_callback_uri(security_token)
+        uri = if @wepay_config[:ipn_callback_uri].present?
+                @wepay_config[:ipn_callback_uri]
+              else
+                "#{@wepay_config[:root_callback_uri]}/wepay/ipn"
+              end
+        apply_security_token(uri, security_token)
+      end
+
+      def checkout_redirect_uri(security_token)
+        uri = if @wepay_config[:ipn_callback_uri].present?
+                @wepay_config[:checkout_redirect_uri]
+              else
+                "#{@wepay_config[:root_callback_uri]}/wepay/checkout"
+              end
+        apply_security_token(uri, security_token)
+      end
+
+      def apply_security_token(uri, security_token)
+        uri += (uri =~ /\?/ ? '&' : '?') + "security_token=#{security_token}"
+      end
+    end
+  end
+end

data/lib/generators/wepay_rails/install/install_generator.rb

@@ -14,6 +14,10 @@ module WepayRails
         end
         @prev_migration_nr.to_s
       end
+      
+      def setup_routes
+        route "WepayRails.routes(self)"
+      end
 
       def copy_migrations
         migration_template "create_wepay_checkout_records.rb", "db/migrate/create_wepay_checkout_records.rb"