wepay-rails 2.2.9 → 2.5.0

data/lib/generators/wepay_rails/install/templates/wepay.yml

@@ -2,11 +2,12 @@ production:
   client_id: <your client id from wepay>
   client_secret: <your client secret from wepay>
   account_id: <your account id from wepay>
-  access_token: <your access token that you recieved when you went to http://your.domain.com/wepay/authorize>
+  access_token: <your access token that you received when you went to http://your.domain.com/wepay/authorize>
   root_callback_uri: "http://www.example.com"
   after_checkout_redirect_uri: "http://www.example.com/purchase/finalize"
   scope: [refund_payments,collect_payments,view_balance,view_user]
-  wepay_api_uri: "https://www.wepay.com/v2"
+  wepay_ui_endpoint: "https://www.wepay.com/v2"
+  wepay_api_endpoint: "https://wepayapi.com/v2"
   fee_payer: Payee
   checkout_type: GOODS
   charge_tax: false
@@ -19,11 +20,12 @@ development:
   client_id: <your client id from wepay>
   client_secret: <your client secret from wepay>
   account_id: <your account id from wepay>
-  access_token: <your access token that you recieved when you went to http://your.domain.com/wepay/authorize>
+  access_token: <your access token that you received when you went to http://your.domain.com/wepay/authorize>
   root_callback_uri: "http://www.example.com"
   after_checkout_redirect_uri: "http://www.example.com/purchase/finalize"
   scope: [refund_payments,collect_payments,view_balance,view_user]
-  wepay_api_uri: "https://stage.wepay.com/v2"
+  wepay_ui_endpoint: "https://stage.wepay.com/v2"
+  wepay_api_endpoint: "https://stage.wepayapi.com/v2"
   fee_payer: Payee
   checkout_type: GOODS
   charge_tax: false
@@ -36,11 +38,12 @@ test:
   client_id: <your client id from wepay>
   client_secret: <your client secret from wepay>
   account_id: <your account id from wepay>
-  access_token: <your access token that you recieved when you went to http://your.domain.com/wepay/authorize>
+  access_token: <your access token that you received when you went to http://your.domain.com/wepay/authorize>
   root_callback_uri: "http://www.example.com"
   after_checkout_redirect_uri: "http://www.example.com/purchase/finalize"
   scope: [refund_payments,collect_payments,view_balance,view_user]
-  wepay_api_uri: "https://stage.wepay.com/v2"
+  wepay_ui_endpoint: "https://stage.wepay.com/v2"
+  wepay_api_endpoint: "https://stage.wepayapi.com/v2"
   fee_payer: Payee
   checkout_type: GOODS
   charge_tax: false
@@ -48,5 +51,4 @@ test:
   auto_capture: true
   require_shipping: false
   shipping_fee: 0
-  charge_tax: false
-
+  charge_tax: false

data/lib/helpers/controller_helpers.rb

@@ -51,6 +51,8 @@ module WepayRails
             :security_token => response[:security_token],
             :checkout_uri   => response[:checkout_uri]
         })
+        
+        params.delete_if {|k,v| !WepayCheckoutRecord.attribute_names.include? k.to_s}
 
         WepayCheckoutRecord.create(params)
       end

data/lib/wepay-rails.rb

@@ -1,124 +1,158 @@
-require 'active_record'
-require 'helpers/controller_helpers'
-require 'api/account_methods'
-require 'api/checkout_methods'
-require 'httparty'
-module WepayRails
-  class Configuration
-    @@settings = nil
-
-    def self.init_conf(settings)
-      @@settings = settings
-    end
-
-    def self.settings
-      @@settings
-    end
-  end
-
-  class Engine < Rails::Engine
-    # Initializers
-    initializer "WepayRails.initialize_wepay_rails" do |app|
-      yml = Rails.root.join('config', 'wepay.yml').to_s
-      if File.exists?(yml)
-        settings = YAML.load_file(yml)[Rails.env].symbolize_keys
-        Configuration.init_conf(settings)
-      end
-    end
-  end
-
-  module Exceptions
-    class AccessTokenError < StandardError; end
-    class ExpiredTokenError < StandardError; end
-    class InitializeCheckoutError < StandardError; end
-    class AuthorizationError < StandardError; end
-    class WepayCheckoutError < StandardError; end
-  end
-
-  module Payments
-    class Gateway
-      include HTTParty
-
-      base_uri @base_uri
-
-      attr_accessor :access_token
-      attr_accessor :account_id
-
-      # Pass in the wepay access token that we got after the oauth handshake
-      # and use it for ongoing comunique with Wepay.
-      # This also relies heavily on there being a wepay.yml file in your
-      # rails config directory - it must look like this:
-      def initialize(*args)
-        @wepay_config = WepayRails::Configuration.settings
-        @access_token = args.first || @wepay_config[:access_token]
-        @base_uri     = @wepay_config[:wepay_api_uri] || "https://www.wepay.com/v2"
-      end
-
-      # Fetch the access token from wepay for the auth code
-      def get_access_token(auth_code, redirect_uri)
-
-        params = {
-          :client_id     => @wepay_config[:client_id],
-          :client_secret => @wepay_config[:client_secret],
-          :redirect_uri  => redirect_uri,
-          :code          => auth_code
-        }
-
-        response = self.class.post("#{@base_uri}/oauth2/token", {:body => params})
-        json = JSON.parse(response.body)
-
-        if json.has_key?("error")
-          if json.has_key?("error_description")
-            if ['invalid code parameter','the code has expired','this access_token has been revoked'].include?(json['error_description'])
-              raise WepayRails::Exceptions::ExpiredTokenError.new("Token either expired, revoked or invalid: #{json["error_description"]}")
-            end
-            raise WepayRails::Exceptions::AccessTokenError.new(json["error_description"])
-          end
-        end
-
-        raise WepayRails::Exceptions::AccessTokenError.new("A problem occurred trying to get the access token: #{json.inspect}") unless json.has_key?("access_token")
-
-        @account_id   = json["user_id"]
-        @access_token = json["access_token"]
-      end
-
-      # Get the auth code url that will be used to fetch the auth code for the customer
-      # arguments are the redirect_uri and an array of permissions that your application needs
-      # ex. ['manage_accounts','collect_payments','view_balance','view_user']
-      def auth_code_url(redirect_uri, params = {})
-        params[:client_id]    ||= @wepay_config[:client_id]
-        params[:scope]        ||= @wepay_config[:scope].join(',')
-        params[:redirect_uri]   = redirect_uri
-
-        query = params.map do |k, v|
-          "#{k.to_s}=#{v}"
-        end.join('&')
-
-        "#{@base_uri}/oauth2/authorize?#{query}"
-      end
-
-      def wepay_auth_header
-        unless @access_token
-          raise WepayRails::Exceptions::AccessTokenError.new("No access token available")
-        end
-        {'Authorization' => "Bearer: #{@access_token}"}
-      end
-
-      def configuration
-        @wepay_config
-      end
-
-      def call_api(api_path, params={})
-        response = self.class.post("#{@base_uri}#{api_path}", {:headers => wepay_auth_header}.merge!({:body => params}))
-        JSON.parse(response.body)
-      end
-
-      include WepayRails::Api::AccountMethods
-      include WepayRails::Api::CheckoutMethods
-    end
-
-    include WepayRails::Exceptions
-    include WepayRails::Helpers::ControllerHelpers
-  end
-
-end
+require 'active_record'
+require 'helpers/controller_helpers'
+require 'api/account_methods'
+require 'api/checkout_methods'
+require 'httparty'
+
+module WepayRails
+  class Configuration
+    @@settings = nil
+
+    def self.init_conf(settings)
+      @@settings = settings
+    end
+
+    def self.settings
+      @@settings
+    end
+  end
+
+  class Engine < Rails::Engine
+    # Initializers
+    initializer "WepayRails.initialize_wepay_rails" do |app|
+      yml = Rails.root.join('config', 'wepay.yml').to_s
+      if File.exists?(yml)
+        settings = YAML.load_file(yml)[Rails.env].symbolize_keys
+      elsif File.exists?(yml+".erb")
+        settings = YAML::load(ERB.new(IO.read(yml+".erb")).result)[Rails.env].symbolize_keys
+      end
+      Configuration.init_conf(settings)
+    end
+  end
+  
+  class << self
+    def routes(rails_router)
+      rails_router.instance_exec do
+        namespace :wepay do
+          resources :ipn
+          resources :authorize
+          resources :checkout
+        end
+      end
+    end
+  end
+
+  module Exceptions
+    class AccessTokenError < StandardError; end
+    class ExpiredTokenError < StandardError; end
+    class InitializeCheckoutError < StandardError; end
+    class AuthorizationError < StandardError; end
+    class WepayCheckoutError < StandardError; end
+    class WepayApiError < StandardError; end
+  end
+
+  module Payments
+    class Gateway
+      include HTTParty
+      base_uri @base_uri
+      default_timeout 30000
+
+      attr_accessor :access_token
+      attr_accessor :account_id
+
+      # Pass in the wepay access token that we got after the oauth handshake
+      # and use it for ongoing communique with Wepay.
+      # This also relies heavily on there being a wepay.yml file in your
+      # rails config directory - it must look like this:
+      def initialize(*args)
+        @wepay_config = WepayRails::Configuration.settings || {:scope => []}
+        @access_token = args.first || @wepay_config[:access_token]
+        @account_id   = args.first || @wepay_config[:account_id]
+        @ui_endpoint  = @wepay_config[:wepay_ui_endpoint] || "https://www.wepay.com/v2"
+        @api_endpoint = @wepay_config[:wepay_api_endpoint] || "https://wepayapi.com/v2"
+      end
+
+      # Get the auth code url that will be used to fetch the auth code for the customer
+      # arguments are the redirect_uri and an array of permissions that your application needs
+      # ex. ['manage_accounts','collect_payments','view_balance','view_user']
+      def auth_code_url(redirect_uri, params = {})
+        params[:client_id]    ||= @wepay_config[:client_id]
+        params[:scope]        ||= @wepay_config[:scope].join(',')
+        params[:redirect_uri]   = redirect_uri
+        query = params.map { |k, v| "#{k.to_s}=#{v}" }.join('&')
+
+        "#{@ui_endpoint}/oauth2/authorize?#{query}"
+      end
+
+      def wepay_auth_header
+        @access_token.blank? ? {'User-Agent' => "WepayRails"}
+                             : {'User-Agent' => "WepayRails", 'Authorization' => "Bearer: #{@access_token}"}
+      end
+
+      def configuration
+        @wepay_config
+      end
+
+      def raise_if_response_error(json)
+        if json.has_key?(:error) && json.has_key?(:error_description)
+          if ['invalid code parameter','the code has expired','this access_token has been revoked', 'a valid access_token is required'].include?(json[:error_description])
+            raise WepayRails::Exceptions::ExpiredTokenError.new("Token either expired, revoked or invalid: #{json[:error_description]}")
+          else
+            raise WepayRails::Exceptions::WepayApiError.new(json[:error_description])
+          end
+        end
+      end
+
+      def symbolize_response(response)
+        json = JSON.parse(response)
+        if json.kind_of? Hash
+          json.symbolize_keys! and raise_if_response_error(json)
+        elsif json.kind_of? Array
+          json.each{|h| h.symbolize_keys!}
+        end
+        json
+      end
+
+      def call_api(api_path, params={}, timeout=30000)
+        begin
+          self.class.default_timeout(timeout)
+          response = self.class.post("#{@api_endpoint}#{api_path}", {:headers => wepay_auth_header, :body => params})
+          json = symbolize_response(response.body)
+        rescue Errno, JSON::ParserError => e
+          raise WepayRails::Exceptions::WepayApiError.new("The request to WePay timed out.  This might mean you sent an invalid request or WePay is having issues.")
+        rescue => e
+          raise e if e.class.to_s =~ /WepayRails/
+          raise WepayRails::Exceptions::WepayApiError.new("There was an error while trying to connect with WePay - #{e.inspect}")
+        end
+        if response.success?
+          return json
+        elsif response.code == 401
+          raise WepayRails::Exceptions::ExpiredTokenError.new("Token either expired, revoked or invalid: #{json.inspect}.")
+        else
+          raise WepayRails::Exceptions::WepayApiError.new("The API request failed with error code ##{response.code}: #{json.inspect}.")
+        end
+      end
+
+      # Fetch the access token from wepay for the auth code
+      def get_access_token(auth_code, redirect_uri)
+        params = {
+          :client_id     => @wepay_config[:client_id],
+          :client_secret => @wepay_config[:client_secret],
+          :redirect_uri  => redirect_uri,
+          :code          => auth_code
+        }
+        json = call_api("/oauth2/token", params)
+        raise WepayRails::Exceptions::AccessTokenError.new("A problem occurred trying to get the access token: #{json.inspect}") unless json.has_key?(:access_token)
+        @account_id   = json[:user_id]
+        @access_token = json[:access_token]
+      end
+
+      include WepayRails::Api::AccountMethods
+      include WepayRails::Api::CheckoutMethods
+    end
+
+    include WepayRails::Exceptions
+    include WepayRails::Helpers::ControllerHelpers
+  end
+
+end

data/test/helper.rb

@@ -1,18 +1,102 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'wepay-rails'
-
-class Test::Unit::TestCase
-end
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'rails/all'
+require 'rails/test_help'
+require 'thor'
+require 'webmock/minitest'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'wepay-rails'
+
+module WepayRails
+  class TestsHelper < Thor
+    include Thor::Actions
+    source_root File.expand_path(File.dirname(__FILE__))
+
+    no_tasks do
+      def create_wepay_config_file(erb=false, defaults=false)
+        copy_file "../lib/generators/wepay_rails/install/templates/wepay.yml", "../config/wepay.yml#{'.erb' if erb}", verbose: false, force: true
+        gsub_file "../config/wepay.yml.erb", "<your access token that you received when you went to http://your.domain.com/wepay/authorize>", "<%= 'abc' * 3 %>", verbose: false if erb
+        add_config_defaults(erb) if defaults
+      end
+
+      def add_config_defaults(erb=false, client_id="168738", client_secret="8d701ad2ac")
+        gsub_file "../config/wepay.yml#{'.erb' if erb}", "<your client id from wepay>", client_id, verbose: false
+        gsub_file "../config/wepay.yml#{'.erb' if erb}", "<your client secret from wepay>", client_secret, verbose: false
+      end
+
+      def delete_wepay_config_file
+        remove_file "../config/wepay.yml", verbose: false
+        remove_file "../config/wepay.yml.erb", verbose: false
+      end
+    end
+  end
+end
+
+class ActiveSupport::TestCase
+  TEST_ACCESS_TOKEN = "1c69cebd40ababb0447700377dd7751bb645e874edac140f1ba0c35ad6e98c97"
+
+  def wepay_gateway(token=TEST_ACCESS_TOKEN)
+    @wepay_gateway ||= WepayRails::Payments::Gateway.new(token)
+  end
+
+  def helper
+    @helper ||= WepayRails::TestsHelper.new
+  end
+
+  def create_wepay_config_file(erb=false, defaults=false)
+    helper.create_wepay_config_file(erb, defaults)
+  end
+
+  def delete_wepay_config_file
+    helper.delete_wepay_config_file
+  end
+
+  def initialize_wepay_config
+    yml = "../config/wepay.yml"
+    if File.exists?(yml)
+      settings = YAML.load_file(yml)[Rails.env].symbolize_keys
+    elsif File.exists?(yml+".erb")
+      settings = YAML::load(ERB.new(IO.read(yml+".erb")).result)[Rails.env].symbolize_keys
+    end
+    WepayRails::Configuration.init_conf(settings)
+  end
+
+  # Stubs for API calls
+  # Uncomment the next line to allow live API calls
+  # WebMock.allow_net_connect!(:net_http_connect_on_start => true)
+
+  def sample_account_response(options={})
+	{ "account_id" => "12345",
+	  "name" => "Example Account",
+	  "description" => "This is just an example WePay account.",
+	  "account_uri" => "https://stage.wepay.com/account/12345" }.merge(options).to_json
+  end
+
+  def sample_find_response(options={})
+	[{ "account_id" => "12345",
+	   "name" => "Custom Reference ID",
+	   "description" => "This is just an example WePay account.",
+	   "reference_id" => "wepayrailstestaccount123",
+	   "account_uri" => "https://stage.wepay.com/account/12345" }.merge(options)].to_json
+  end
+
+  def sample_balance_response(options={})
+	{ "pending_balance" => "500",
+	  "available_balance" => "500",
+	  "currency" => "USD" }.merge(options).to_json
+  end
+
+  def sample_checkout_response(options={})
+	{ "checkout_id" => "6789",
+	  "checkout_uri" => "http://stage.wepay.com/api/checkout/6789" }.merge(options).to_json
+  end
+end