so_paid 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDBjM2UyM2M5NTQzMzg3OTRjOWVjZGNhMmE1MGU3YjZjODFlZjFiNw==
+    NTQ1MjljMjAwYzgzNGM2NTg1NjkyYzlhY2EwNTZkMDRlYzk0ZTBmMw==
   data.tar.gz: !binary |-
-    ZGZhNzQ2YWE3MjZiMzhmNjM4NzI2M2U2ZTZmNjBhYTZlM2NjZGZkZg==
+    NjNmOGViNWIyM2VhZDQxYjczZTdjNzg0NTUwZjllYjJiNjAyZTU4Yg==
 SHA512:
   metadata.gz: !binary |-
-    MTI2MzIwNmYwMjcxOTZiOTYyNWI3ZDVlYmI0ZWQ4MTFlNmY3MzRkZmJjODNk
-    ZGYyMGQ5ZDNkOGFjNDk4YmZhMzQzODFiMjI3OGUwNTk4YTQzMmM4MDY2YzU3
-    NGM3NDA0NjA0MzE3Mzc1MDA1YzAxNTY2MDAyYTE4ZTYwNDc3MGU=
+    ZjZlZmVkNWI4YTUzM2E3MmRkYTQ3Yzc1NWZhOTFjYzQ3ODYxMmZmODYyZDZj
+    NjU1Y2UxNGIwOWRhNTExMzA2MTk0ZDIxN2JlODkzNTZjNDA3NjlkZTA5YWI5
+    MzFiZWQ5OTk5OWFhMzVlY2E3OWUyZWYwOWEyNDhlMTRjZDEwMTU=
   data.tar.gz: !binary |-
-    NDg1ZmJkNmE3OGViNDFkMzNjMGQ5NDUwOGFiMWNkZWE1NGFlYjI3OTg4YjBj
-    MmE5NGU2MWQ5NjI2MTQ5NzNlZGMyZDM3MGU0YjJjMmFjMTM3MjFmY2M3YzQx
-    MDc0Yjk0OTRmMjkxZTI2NTFjMDJjN2IxMzViMGU4NmQxYzQ0YTk=
+    ZDczNGRhODkxMDJkNTJhZjQzMjUzNmEzOWZmYjZjODFmNmM0ZTM2MWJlZDFm
+    YjBiODJkNjMyNjAzMGJhZWJiZDdjOTRjMTY4ZWM2NTYyZTRhZjQyNmNmY2Fj
+    YTU5NGJmMGZjYzI1ZTkzODNlMDQ5Zjg4OTJiNDA2NTcxYzI2ZDU=

data/examples/app/controllers/payments_controller.rb

@@ -23,7 +23,7 @@ class PaymentsController < ApplicationController
     if @order.save
       # specific payment vendor, ex: cybersource...
       #...or not if you only have one defined in config
-      #ex: @payment_vendor = SoPaid.vendor(:cybersource).new(@order, {override_defaults_hash}, {override_config_defaults_hash})
+      #ex: @payment_vendor = SoPaid.vendor(:cybersource).new(@order, {override_order_defaults_hash}, {override_config_defaults_hash})
       @payment_vendor = SoPaid.vendor.new(@order)
     else
       flash[:error] = "Please fix all errors with your account and your order. If you are having trouble making a purchase, contact the administrator."

data/examples/app/views/confirm.html.erb

@@ -1,4 +1,4 @@
-<form  action="<%=@payment_vendor.hop_url(current_user)%>" method="post" >
+<form  action="<%=@payment_vendor.hop_url%>" method="post" >
   <% @payment_vendor.generate_params.each_pair do |key, value| %>
     <input type="hidden" name="<%=key%>" value="<%=value%>" >
   <%end%>

data/examples/config/initializers/pay_me.rb

@@ -64,6 +64,11 @@ SoPaid.configure do |config|
                             # config options
                             # if mode 
                             :config_options=>{
+                              :use_post_url=>:iframe #:webmobile
+                              # the purpose of the test_user_email
+                              # is to trump the test_mode set here
+                              # essentially forcing test_mode to true
+                              # for that user only
                               :test_user_email=>"payment_tester@gmail.com",
                               :test_mode=>false
                             }

data/lib/so_paid/cybersource.rb

@@ -5,9 +5,17 @@ module SoPaid
 
   
     @@pv_defaults = {
-      :live=>{
-      },
       :test=>{
+        :post_urls=>{
+          :webmobile=>"https://testsecureacceptance.cybersource.com/pay",
+          :iframe=>"https://testsecureacceptance.cybersource.com/embedded/pay" 
+        }
+      },
+      :live=>{
+        :post_urls=>{
+          :webmobile=>"https://secureacceptance.cybersource.com/pay",
+          :iframe=>"https://secureacceptance.cybersource.com/embedded/pay" 
+        }
       },
       :secret_key=>"",
       :profile_id=>"",
@@ -39,8 +47,7 @@ module SoPaid
     
     @@config_defaults = {
       # optional for gem
-      :test_mode=>false,
-      :test_user_email=>"payment_tester@gmail.com"
+      :use_post_url=>:iframe
     }
 
 
@@ -61,27 +68,20 @@ module SoPaid
     end
 
 
-    def hop_url(user_email)
-      # test mode true or specific test email gets access to test page
-      if test? or @config_options[:test_user_email] == @current_user_email
-        test_hop_url
-      else
-        live_hop_url
-      end
+    def hop_url(use_post_url=nil)
+      # test/live url has already been determined by test_mode or user_email
+      @merged_pv_opts[:post_urls][ use_post_url.presence || @config_options[:use_post_url]]
     end
 
 
     private
 
-
-
-
-
     def set_pv_fields
+      @pv_order_params = {}
       if live?
-        @pv_order_params = @pv_options[:live].presence || @pv_options
+        pv_opts = @pv_options[:live].presence || @pv_options
       else
-        @pv_order_params = @pv_options[:test].presence || @pv_options
+        pv_opts = @pv_options[:test].presence || @pv_options
       end
 
       # we just set them above and are done with them
@@ -89,7 +89,13 @@ module SoPaid
       @pv_options.delete(:test)
       # merge pv_order_params on top of pv_options which is
       # the combination of the class defaults and the configuration file defaults
-      @pv_order_params = merge_defaults(nil, @pv_order_params, @pv_options)
+      @merged_pv_opts = merge_defaults(pv_opts, @pv_options)
+      order_keys = @merged_pv_opts[:signed_field_names] + @merged_pv_opts[:unsigned_field_names]
+      
+      order_keys.each do |o_key|
+        @pv_order_params[o_key] = @merged_pv_opts[o_key]
+      end
+
     end
 
 
@@ -117,30 +123,22 @@ module SoPaid
 
     def sign_params
       data = []
-      @pv_options[:signed_field_names].each do |key|
+      @pv_order_params[:signed_field_names].each do |key|
         data << key.to_s + "=" + @pv_order_params[key].to_s
       end
-      @pv_options[:signed_field_names] = @pv_options[:signed_field_names].join(",")
+      @pv_order_params[:signed_field_names] = @pv_order_params[:signed_field_names].join(",")
       data = data.join(",")
 
-      encode_hop(data, @pv_order_params[:secret_key])
+      encode_hop(data, @merged_pv_opts[:secret_key])
     end
 
 
     def test?
-      @config_options[:test_mode]
+      @config_options[:test_mode] or (@config_options[:test_user_email].present? and @config_options[:test_user_email] == @current_user_email)
     end
 
     def live?
       !test?
     end
-
-    def test_hop_url
-      "https://testsecureacceptance.cybersource.com/pay"
-    end
-
-    def live_hop_url
-      "https://secureacceptance.cybersource.com/pay"
-    end
   end
 end

data/lib/so_paid/hop.rb

@@ -24,8 +24,8 @@ module SoPaid
 
 
     def self.payment_options(pv_options={}, config_options={})
-      @@pv_defaults = self.merge_defaults([:live, :test], pv_options, @@pv_defaults)  
-      @@config_defaults = self.merge_defaults(nil, config_options, @@config_defaults)
+      @@pv_defaults = self.merge_defaults(pv_options, @@pv_defaults)  
+      @@config_defaults = self.merge_defaults(config_options, @@config_defaults)
 
       return self
     end
@@ -33,11 +33,13 @@ module SoPaid
 
     def initialize(order, pv_options={}, config_options={})
       @pv_order_params = {}.with_indifferent_access
-      @pv_options = self.merge_defaults([:live, :test], pv_options, @@pv_defaults)  
-      @config_options = self.merge_defaults(nil, config_options, @@config_defaults)
+      @pv_options = self.merge_defaults(pv_options, @@pv_defaults)  
+      @config_options = self.merge_defaults(config_options, @@config_defaults)
 
       @order = order
       @current_user_email = @config_options[:current_user_email] || @config_options[:current_user].try(:email) || (@order.user.try(:email) if @order.respond_to?(:user))
+      generate_params
+      return self
     end
 
 
@@ -61,142 +63,29 @@ module SoPaid
       verify_signature(message[:signed_field_names], message[:signature])
     end
 
-    def merge_defaults(modes=[], opts={}, default_opts={})
-        SoPaid::Hop.merge_defaults(modes, opts, default_opts)
+    def merge_defaults(opts={}, default_opts={})
+        SoPaid::Hop.merge_defaults(opts, default_opts)
     end
 
 
-    def self.merge_defaults(modes=[], opts={}, default_opts={})
-      modes ||= []
-      new_opts = opts.clone.with_indifferent_access
-      new_default_opts = default_opts.clone.with_indifferent_access
-      modes.each do |mode|
-        new_default_opts[mode] ||= {}
-        new_opts_mode = new_opts[mode].is_a?(Hash) ? new_opts[mode] : {}
-        new_opts_mode.each_pair do |key, value|
-          if value.is_a?(Array)
-            new_default_opts[mode][key] = ((new_default_opts[mode][key] || []) + value).uniq
-          else
-            new_default_opts[mode][key] = value
+
+    def self.merge_defaults(main_hash, defaults_hash)
+        target = main_hash.dup
+        (defaults_hash.keys + main_hash.keys).uniq.each do |key|
+          if defaults_hash[key].is_a? Hash and main_hash[key].is_a? Hash
+            target[key] = merge_defaults(target[key], defaults_hash[key])
+            next
+          end
+          #target[key] = hash[key]
+          # if the defaults_hash value is an array, make sure just to
+          # append new uniq values, not overwrite default
+          target.update(defaults_hash) do |key, tv, dv|
+            ntv = tv.is_a?(Array) ? tv.clone : tv
+            dv.is_a?(Array) ? (dv.clone << ntv ).flatten.uniq : ntv
           end
         end
-        new_opts.delete(mode)
-      end
-
-      # if mode was not provided via configuration file,
-      # this defaults to the opposite/non-provided mode,
-      # or uses the defaults set up in this file
-      new_opts.each_pair do |key, value|
-        if value.is_a?(Array)
-          new_default_opts[key] = ((new_default_opts[key] || []) + value).uniq
-        else
-          new_default_opts[key] = value
-        end
-      end
-
-      return new_default_opts
-    end
-
-    
-    # def get_microtime
-    #   t = Time.now
-    #   sprintf("%d%03d", t.to_i, t.usec / 1000)
-    # end
-    
-    # def encode_hop(data, key)
-    #   Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::SHA1.new, key, data)).chomp.gsub(/\n/,'')
-    # end
-
-
-    # def insert_signature3(amount="0.00",currency="usd",orderPage_transactionType='sale')
-    #   profile_id = get_profile_id
-    #   timestamp = get_microtime
-    #   data = profile_id + amount + currency + timestamp + orderPage_transactionType
-    #   pub = get_secret_key
-    #   serial_number = get_serial_number
-    #   pub_digest = encode_hop(data,pub)
-      
-    #   sig = "<input type='hidden' name='orderPage_transactionType' value='#{orderPage_transactionType}'>\n"
-    #   sig <<  "<input type='hidden' name='amount' value='#{amount}'>\n"
-    #   sig << "<input type='hidden' name='currency' value='#{currency}'>\n"
-    #   sig << "<input type='hidden' name='orderPage_timestamp' value='#{timestamp}'>\n"
-    #   sig << "<input type='hidden' name='merchantID' value='#{profile_id}'>\n"
-    #   sig << "<input type='hidden' name='orderPage_signaturePublic' value='#{pub_digest}'>\n"
-    #   sig << "<input type='hidden' name='orderPage_version' value='4'>\n"
-    #   sig << "<input type='hidden' name='orderPage_serialNumber' value='#{serial_number}'>\n"
-    #   sig
-    # end
-    
-
-
-    # def insert_map_signature(assoc_array)
-    #   assoc_array['mechantID'] = get_profile_id
-    #   assoc_array['orderPage_timestamp'] = get_microtime
-    #   assoc_array['orderPage_version'] = "4"
-    #   assoc_array['orderPage_serialNumber'] = getSerialNumber
-      
-    #   fields = []
-    #   values = ''
-    #   inputs = ''
-    #   assoc_array.each do |key,value|
-    #     fields << key
-    #     values << value
-    #     inputs << '<input type="hidden" name="'+key+'" value="'+value+'">'+"\n"
-    #   end
-      
-    #   pub = get_secret_key
-    #   pub_digest = hop_hash(values,pub)
-    #   inputs << '<input type="hidden" name="orderPage_signaturePublic" value="'+pub_digest+'">'+"\n"
-    #   inputs << '<input type="hidden" name="orderPage_signedFields" value="'+fields+'">'+"\n"
-    #   inputs
-    # end
-
-    # def insert_signature(amount="0.00",currency="usd")
-    #   merchant_id = get_merchant_id
-    #   timestamp = get_microtime
-    #   data = merchant_id + amt + curr + timestamp
-    #   serial_number = get_serial_number
-    #   pub_digest = hop_hash(data, get_shared_secret)
-      
-    #   sig =  "<input type='hidden' name='amount' value='#{amount}'>\n"
-    #   sig << "<input type='hidden' name='currency' value='#{currency}'>\n"
-    #   sig << "<input type='hidden' name='orderPage_timestamp' value='#{timestamp}'>\n"
-    #   sig << "<input type='hidden' name='merchantID' value='#{merchant_id}'>\n"
-    #   sig << "<input type='hidden' name='orderPage_signaturePublic' value='#{sig_hash}'>\n"
-    #   sig << "<input type='hidden' name='orderPage_version' value='4'>\n"
-    #   sig << "<input type='hidden' name='orderPage_serialNumber' value='#{serial_number}'>\n"
-    #   sig
-    # end
-
-
-    # def insert_subscription_signature(subscription_amount="0.00",
-    #                                       subscription_start_date="00000000",
-    #                                       subscription_frequency=nil,
-    #                                       subscription_number_of_payments="0",
-    #                                       subscription_automatic_renew="true"
-    #                                       )
-    #   if subscription_frequency.nil? then return end
-      
-    #   data = subscription_amount + subscription_start_date + subscription_frequency + subscription_number_of_payments + subscription_automatic_renew
-    #   pub = get_shared_secret
-    #   pub_digest = hop_hash(data, pub)
-    #   sign = '<input type="hidden" name="recurringSubscriptionInfo_amount" value="' + subscriptionAmount + '">' + "\n"
-    #   sig << '<input type="hidden" name="recurringSubscriptionInfo_numberOfPayments" value="' + subscriptionNumberOfPayments + '">' + "\n"
-    #   sig << '<input type="hidden" name="recurringSubscriptionInfo_frequency" value="' + subscriptionFrequency + '">' + "\n"
-    #   sig << '<input type="hidden" name="recurringSubscriptionInfo_automaticRenew" value="' + subscriptionAutomaticRenew + '">' + "\n"
-    #   sig << '<input type="hidden" name="recurringSubscriptionInfo_startDate" value="' + subscriptionStartDate + '">' + "\n"
-    #   sig << '<input type="hidden" name="recurringSubscriptionInfo_signaturePublic" value="' + pub_digest + '">' + "\n"
-    #   sig
-    # end
-    
-    # def insert_subscription_id_signature(subscription_id)
-    #   if subscription_id.nil? then return end
-      
-    #   pub_digest = hop_hash(subscription_id, get_shared_secret)
-    #   str = '<input type="hidden" name="paySubscriptionCreateReply_subscriptionID" value="' + subscription_id + '">' + "\n"
-    #   str << '<input type="hidden" name="paySubscriptionCreateReply_subscriptionIDPublicSignature" value="' + pub_digest + '">' + "\n"
-    #   str
-    # end
+        target
+     end
 
         
   end

data/lib/so_paid/version.rb

@@ -1,3 +1,3 @@
 module SoPaid
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: so_paid
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - mkralla11
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler