spree_affirm 0.2.22 → 0.2.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 153e47d647bb78a846fd510c6159b9481d95a734
-  data.tar.gz: 91930c356c9b1464fcadea6f792308d17cab4043
+SHA256:
+  metadata.gz: 65cad531f525308a5dc67e738afc77b388e2a611e15890ea215e9854772f1c45
+  data.tar.gz: ac0b662dddaf01d3bc79041001bf2809212a54f5a68b41f31827f10a2e748f70
 SHA512:
-  metadata.gz: 23120efffeaa8e5b7e9feb01308aae629236a3339728b79ed136325ca9fae365014f3e910b5567107e8ea13d6f780587353ce5c7037349b1cf63b3aa29e93733
-  data.tar.gz: 5834541f7179d62e0151aa3eeeddc52764da026f2fe0b7def043d11f74f24163c90130491a7e83d61c9f3cd8596316b4ea6f0fc3fcb7981bdd4d577174b9702b
+  metadata.gz: 5545ba5abc61022425b0831401417630cfc0a62a0bef664a240a2824babd4e380852c91f37dd7c53c012c0b41713716491e149203d81489764ea04c0041c05d3
+  data.tar.gz: 220c681e146b9861c7aed937b7c834a76e7727688671faee3c90656d5a21f09a1fcc9ed1620c1c0cc099c723866aea60162ee25406f6d6b3c557190e8ad69c97

data/Gemfile

@@ -1,13 +1,13 @@
 source 'https://rubygems.org'
 
-gem 'spree', github: 'spree/spree', branch: '2-3-stable'
-gem 'spree_gateway', github: 'spree/spree_gateway', branch: '2-3-stable'
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-3-stable'
+gem 'spree', github: 'spree/spree', tag: 'v0.2.25'
+gem 'spree_gateway', github: 'spree/spree_gateway', tag: 'v0.2.25'
+gem 'spree_auth_devise', github: 'spree/spree_auth_devise', tag: 'v0.2.25'
 
 group :test do
   gem 'coffee-rails'
   gem 'sass-rails', '~> 4.0.3'
-  gem 'money', '6.0.1'
+  gem 'money', '6.5.1'
   gem 'rspec-rails', '~> 2.10'
   gem 'shoulda-matchers', '2.2.0'
   gem 'simplecov', :require => false

data/LICENSE

@@ -1,26 +1,29 @@
-Copyright (c) 2014 [name of plugin creator]
+BSD 3-Clause License
+
+Copyright (c) 2019, Affirm
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
 
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name Spree nor the names of its contributors may be used to
-      endorse or promote products derived from this software without specific
-      prior written permission.
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -18,6 +18,10 @@ Installation
 
 4. Restart your server
 
+Documentation
+------------------
+https://docs.affirm.com/Spree
+
 ## Contributing
 
 1. Fork it
@@ -37,11 +41,11 @@ bundle exec rake test_app
 bundle exec rspec spec
 ```
 
-When testing your applications integration with this extension you may use it's factories.
+When testing your applications integration with this extension you may use its factories.
 Simply add this require statement to your spec_helper:
 
 ```ruby
 require 'spree_affirm/factories'
 ```
 
-Copyright (c) 2014 [name of extension creator], released under the New BSD License
+Copyright (c) 2019 Affirm, released under the New BSD License

data/app/controllers/spree/affirm_controller.rb

@@ -24,31 +24,7 @@ module Spree
         payment_method: payment_method
       )
 
-      # check if data needs to be updated
-      unless _affirm_checkout.valid?
-
-        _affirm_checkout.errors.each do |field, error|
-          case field
-          when :billing_address
-            # FIXME(brian): pass the phone number to the |order| in a better place
-            phone = order.bill_address.phone
-            order.bill_address = generate_spree_address(_affirm_checkout.details['billing'])
-            order.bill_address.phone = phone
-
-          when :shipping_address
-            # FIXME(brian): pass the phone number to the |order| in a better place
-            phone = order.shipping_address.phone
-            order.ship_address = generate_spree_address(_affirm_checkout.details['shipping'])
-            order.ship_address.phone = phone
-
-          when :billing_email
-            order.email = _affirm_checkout.details["billing"]["email"]
-
-          end
-        end
-
-        order.save
-      end
+      order.save
 
       _affirm_checkout.save
 
@@ -59,7 +35,7 @@ module Spree
       })
 
       # transition to confirm or complete
-      while order.next; end
+      order.next
 
       if order.completed?
         session[:order_id] = nil
@@ -88,40 +64,5 @@ module Spree
     def completion_route(order)
       spree.order_path(order)
     end
-
-    def generate_spree_address(affirm_address)
-      # find the state and country in spree
-      _state    = Spree::State.find_by_abbr(affirm_address["address"]["region1_code"]) or
-                  Spree::State.find_by_name(affirm_address["address"]["region1_code"])
-      _country  = Spree::Country.find_by_iso3(affirm_address["address"]["country_code"]) or
-                  Spree::Country.find_by_iso(affirm_address["address"]["country_code"])
-
-      # try to get the name from first and last
-      _firstname = affirm_address["name"]["first"] if affirm_address["name"]["first"].present?
-      _lastname  = affirm_address["name"]["last"]  if affirm_address["name"]["last"].present?
-
-      # fall back to using the full name if available
-      if _firstname.nil? and _lastname.nil? and affirm_address["name"]["full"].present?
-        _name_parts = affirm_address["name"]["full"].split " "
-        _lastname   = _name_parts.pop
-        _firstname  = _name_parts.join " "
-      end
-
-      # create new address
-      _spree_address = Spree::Address.new(
-        city:       affirm_address["address"]["city"],
-        phone:      affirm_address["phone_number"],
-        zipcode:    affirm_address["address"]["postal_code"],
-        address1:   affirm_address["address"]["street1"],
-        address2:   affirm_address["address"]["street2"],
-        state:      _state,
-        country:    _country,
-        lastname:   _lastname,
-        firstname:  _firstname
-      )
-
-      _spree_address.save
-      _spree_address
-    end
   end
 end

data/app/models/spree/affirm_checkout.rb

@@ -3,8 +3,6 @@ module Spree
     belongs_to :payment_method
     belongs_to :order
 
-    validate :validate_checkout_matches_order
-
     scope :with_payment_profile, -> { all }
 
     def name
@@ -15,71 +13,6 @@ module Spree
       @details ||= payment_method.provider.get_checkout token
     end
 
-    def validate_checkout_matches_order
-      return if self.id
-
-      check_valid_products
-      check_matching_shipping_address
-      check_matching_billing_address
-      check_matching_billing_email
-      check_matching_product_key
-    end
-
-    def check_valid_products
-      # ensure the number of line items matches
-      if details["items"].size != order.line_items.size
-        errors.add :line_items, "Order size mismatch"
-      end
-
-      # iterate through the line items of the checkout
-      order.line_items.each do |line_item|
-
-        # check that the line item sku exists in the affirm checkout
-        if !(_item = details["items"][line_item.variant.sku])
-          errors.add :line_items, "Line Item not in checkout details"
-
-        # check quantity & price
-        elsif _item["qty"].to_i   != line_item.quantity.to_i
-          errors.add :line_items, "Quantity mismatch"
-
-        elsif _item["unit_price"].to_i != (line_item.price*100).to_i
-          errors.add :line_items, "Price mismatch"
-
-        end
-      end
-
-      # all products match
-      true
-    end
-
-    def check_matching_billing_address
-      # ensure we have a standardized address format
-      details['billing']['address'] = normalize_affirm_address details['billing']['address']
-
-      # validate address
-      check_address_match details["billing"], order.bill_address, :billing_address
-    end
-
-    def check_matching_shipping_address
-      # ensure we have a standardized address format
-      details['shipping']['address'] = normalize_affirm_address details['shipping']['address']
-
-      # validate address
-      check_address_match details["shipping"], order.ship_address, :shipping_address
-    end
-
-    def check_matching_billing_email
-      if details["billing"]["email"].present? and details["billing"]["email"].casecmp(order.email) != 0
-        errors.add :billing_email, "Billing email mismatch"
-      end
-    end
-
-    def check_matching_product_key
-      if details["config"]["financial_product_key"] != payment_method.preferred_product_key
-        errors.add :financial_product_key, "Product key mismatch"
-      end
-    end
-
     def actions
       %w{capture void credit}
     end
@@ -101,47 +34,5 @@ module Spree
       return false unless payment.order.payment_state == 'credit_owed'
       payment.credit_allowed > 0
     end
-
-    private
-
-
-    def normalize_affirm_address(affirm_address_details)
-      Affirm::AddressValidator.normalize_affirm_address(affirm_address_details)
-    end
-
-    def check_address_match(affirm_address, spree_address, field)
-      # mapping from affirm address keys to spree address values
-      _key_mapping = {
-        city:         spree_address.city,
-        street1:      spree_address.address1,
-        street2:      spree_address.address2,
-        postal_code:  spree_address.zipcode,
-        region1_code: spree_address.state.abbr
-
-      # check that each value from affirm matches the spree address
-      }.each do |affirm_key, spree_val|
-        if affirm_address["address"][affirm_key.to_s].present? and
-           affirm_address["address"][affirm_key.to_s] != spree_val
-
-          errors.add field, "#{affirm_key.to_s} mismatch"
-        end
-      end
-
-      # test affirm names with first and last
-      if affirm_address["name"]["first"].present? and affirm_address["name"]["last"].present? and
-        (affirm_address["name"]["first"].casecmp(spree_address.firstname) != 0 or
-         affirm_address["name"]["last"].casecmp(spree_address.lastname) != 0)
-
-        errors.add field, "First/Last name mismatch"
-
-      # test affirm names with full name
-      elsif affirm_address["name"]["full"].present? and
-          !(affirm_address["name"]["full"].downcase.include?(spree_address.firstname.downcase) and
-            affirm_address["name"]["full"].downcase.include?(spree_address.lastname.downcase))
-
-        errors.add field, "Full name mismatch"
-      end
-    end
-
   end
 end

data/app/models/spree/gateway/affirm.rb

@@ -2,8 +2,8 @@ module Spree
   class Gateway::Affirm < Gateway
     preference :api_key, :string
     preference :secret_key, :string
-    preference :server, :string, default: 'www.affirm.com'
-    preference :product_key, :string
+    preference :test_mode, :boolean, default: true
+    preference :server, :string, default: 'sandbox.affirm.com'
 
     def provider_class
       ActiveMerchant::Billing::Affirm
@@ -36,22 +36,15 @@ module Spree
     def cancel(charge_ari)
       _payment = Spree::Payment.valid.where(
         response_code: charge_ari,
-        source_type:   "#{payment_source_class}"
+        source_type:   payment_source_class.to_s
       ).first
 
       return if _payment.nil?
 
       if _payment.pending?
         _payment.void_transaction!
-
-      elsif _payment.completed? and _payment.can_credit?
-
-        # create adjustment
-        _payment.order.adjustments.create label: "Refund - Canceled Order", amount: -_payment.credit_allowed.to_f
-        _payment.order.update!
-
-        _payment.credit!
-
+      elsif _payment.completed? && _payment.can_credit?
+        provider.refund(_payment.credit_allowed.to_money.cents, charge_ari)
       end
     end
   end

data/app/views/spree/checkout/payment/_affirm.html.erb

@@ -1,7 +1,3 @@
-<div class="affirm-learn-more-section">
-  <%= render partial: 'spree/checkout/affirm/learn_more' %>
-</div>
-
 <script>
 (function(){
   /* only include this setup once */
@@ -12,7 +8,7 @@
     \*****************************************************/
     var _affirm_config = {
       public_api_key: "<%= payment_method.preferred_api_key %>",
-      script: "https://<%= payment_method.preferred_server %>/js/v2/affirm.js"
+      script: "https://<%= payment_method.preferences[:test_mode] ? 'cdn1-sandbox.affirm.com' : 'cdn1.affirm.com' %>/js/v2/affirm.js"
     };
     (function(l,g,m,e,a,f,b){var d,c=l[m]||{},h=document.createElement(f),n=document.getElementsByTagName(f)[0],k=function(a,b,c){return function(){a[b]._.push([c,arguments])}};c[e]=k(c,e,"set");d=c[e];c[a]={};c[a]._=[];d._=[];c[a][b]=k(c,a,b);a=0;for(b="set add save post open empty reset on off trigger ready setProduct".split(" ");a<b.length;a++)d[b[a]]=k(c,e,b[a]);a=0;for(b=["get","token","url","items"];a<b.length;a++)d[b[a]]=function(){};h.async=!0;h.src=g[f];n.parentNode.insertBefore(h,n);delete g[f];d(g);l[m]=c})(window,_affirm_config,"affirm","checkout","ui","script","ready");
 
@@ -23,9 +19,9 @@
       total:                <%= (@order.total * 100).to_i %>,
       currency:             "USD",
       tax_amount:           <%= (@order.additional_tax_total * 100).to_i %>,
-      checkout_id:          "<%= @order.number %>",
+      order_id:             "<%= @order.number %>",
       discount_code:        "<%= @order.coupon_code %>",
-      shipping_type:        "<%= @order.shipments.first.shipping_method.name if @order.shipments %>",
+      shipping_type:        "<%= @order.shipments.first.shipping_method.name if @order.shipments.exists? %>",
       shipping_amount:      <%= (@order.shipment_total * 100).to_i %>,
 
       shipping: {
@@ -58,10 +54,14 @@
       },
 
 
+      metadata: {
+            "platform_type": "Spree Commerce",
+            "platform_version": "<%= Spree.version %>",
+            "platform_affirm": "<%= Spree::Gateway::Affirm.version %>",
+          },
+
       meta: {
         source: {
-          client_name: "spree_affirm",
-          version: "<%= Spree::Gateway::Affirm.version %>",
           data: {
             <% if spree_current_user %>
               order_count: "<%= spree_current_user.orders.complete.count %>",
@@ -73,7 +73,6 @@
 
             <% end %>
             is_logged_in: <%= !!spree_current_user %>,
-            spree_version: "<%= Spree.version %>"
           }
         }
       },
@@ -123,28 +122,28 @@
     affirm.ui.ready(function(){
       $(function() {
 
+        /*****************************************************\
+            change the payment method name
+        \*****************************************************/
+
+        $( ".payment-option" ).each(function() {
+          
+          if($( this )[0].innerText === "Affirm"){
+
+           $( this )[0].lastChild.data = "Affirm Monthly Payments";
+          }
+        });
+
         /*****************************************************\
             setup loading and cancel events for the form
         \*****************************************************/
+
         affirm.checkout.on("cancel", function(){
           $("#checkout_form_payment input.disabled")
             .attr("disabled", false)
             .removeClass("disabled");
         });
 
-        var button_text = $("#checkout_form_payment input").val();
-
-        $("#checkout_form_payment input[type='submit']").on("loading", function(){
-          button_text = $(this).val();
-          $(this).val("Loading...");
-        })
-
-        .on("done_loading", function(){
-          $(this).val(button_text);
-        });
-
-
-
         /*****************************************************\
             handle continue button clicks with .open()
         \*****************************************************/
@@ -152,14 +151,12 @@
           var checkedPaymentMethod = $('div[data-hook="checkout_payment_step"] input[type="radio"]:checked').val();
 
           if (window.AffirmPaymentMethods[checkedPaymentMethod]) {
+
             var $submit_button = $(this).find("input[type='submit']");
 
             // update with checkout method details
             affirm.checkout(window.AffirmPaymentMethods[checkedPaymentMethod]);
 
-            // show the loading message
-            $submit_button.trigger("loading");
-
             // submit the checkout
             affirm.checkout.open({
               target: $submit_button
@@ -170,6 +167,15 @@
           }
         });
       });
+
+      /*****************************************************\
+          remove the payment source empty box from UI
+      \*****************************************************/
+      $(document).on('click', '#checkout_form_payment'
+        , function (event) {
+          if($('div[data-hook="checkout_payment_step"] input[type="radio"]:checked')[0].parentNode.outerText === "Affirm Monthly Payments") $('.payment-sources').hide();
+        }
+      )
     });
 
     window.AffirmPaymentMethods = {};
@@ -182,9 +188,8 @@
       clicked
   \*****************************************************/
   window.AffirmPaymentMethods["<%= payment_method.id %>"] = {
-    public_api_key:           "<%= payment_method.preferred_api_key %>",
-    financial_product_key:    "<%= payment_method.preferred_product_key %>"
+    public_api_key:           "<%= payment_method.preferred_api_key %>"
   };
-
 }());
+
 </script>

data/config/locales/en.yml

@@ -12,7 +12,6 @@ en:
         "Quantity mismatch": "Quantity mismatch"
         "Price mismatch": "Price mismatch"
         "Billing email mismatch": "Billing email mismatch"
-        "Product key mismatch": "Product key mismatch"
         "city mismatch": "city mismatch"
         "street1 mismatch": "street1 mismatch"
         "street2 mismatch": "street2 mismatch"
@@ -27,5 +26,4 @@ en:
         billing_address: "billing address"
         shipping_address: "shipping address"
         billing_email: "email"
-        financial_product_key: "Affirm Financial Product"
 

data/lib/spree_affirm/factories/affirm_checkout_factory.rb

@@ -62,8 +62,6 @@ def BASE_CHECKOUT_DETAILS
     "misc_fee_amount"=> 0,
     "shipping_type"=> "Free National UPS",
     "config"=> {
-      "financial_product_key"=> "XXXXXXXXXXXXXXX",
-      "financial_product_type"=> "splitpay",
       "required_billing_fields"=> [
         "name",
         "address",
@@ -82,9 +80,8 @@ FactoryGirl.define do
     association(:order, factory: :order_with_line_items)
 
 
-    ignore do
+    transient do
       stub_details true
-      product_key_mismatch false
       shipping_address_mismatch false
       billing_address_mismatch false
       alternate_billing_address_format false
@@ -101,11 +98,6 @@ FactoryGirl.define do
 
       _details = BASE_CHECKOUT_DETAILS()
 
-      # product keys
-      unless evaluator.product_key_mismatch
-        _details['config']['financial_product_key'] = checkout.payment_method.preferred_product_key
-      end
-
       # case mismatch
       unless evaluator.full_name_case_mismatch
         _details['billing']['name'] = {

data/lib/spree_affirm/version.rb

@@ -1,3 +1,3 @@
 module SpreeAffirm
-  VERSION = "0.2.22"
+  VERSION = "0.2.30"
 end

data/spec/models/spree_affirm_checkout_spec.rb

@@ -180,27 +180,6 @@ describe Spree::AffirmCheckout do
     end
   end
 
-
-  describe "check_matching_product_key" do
-    context "with a matching product key" do
-      it "does not set an error for the financial_product_key" do
-        valid_checkout.check_matching_product_key
-        expect(valid_checkout.errors[:financial_product_key]).to be_empty
-      end
-    end
-
-
-    context "with a mistmatched product key" do
-      it "adds an error for financial_product_key" do
-        _checkout = FactoryGirl.build(:affirm_checkout, product_key_mismatch: true)
-        _checkout.check_matching_product_key
-        expect(_checkout.errors[:financial_product_key]).not_to be_empty
-      end
-    end
-  end
-
-
-
   describe "actions" do
 
     describe "#actions" do

data/spec/models/spree_gateway_affirm_spec.rb

@@ -75,9 +75,6 @@ describe Spree::Gateway::Affirm do
           expect(affirm_payment).to receive(:credit!).and_return false
           _payment_amount = affirm_payment.credit_allowed
           affirm_payment.payment_method.cancel affirm_payment.response_code
-
-          expect(affirm_payment.order.adjustments.count).to be > 0
-          expect(affirm_payment.order.adjustments.last.amount).to eq(-_payment_amount)
         end
       end
 

data/spree_affirm.gemspec

@@ -7,19 +7,19 @@ Gem::Specification.new do |s|
   s.name        = 'spree_affirm'
   s.version     = SpreeAffirm::VERSION
   s.summary     = 'Affirm Spree Payment Gateway'
-  s.description = 'Affirm payment Gateway for spree'
+  s.description = 'Affirm payment Gateway for Spree'
   s.required_ruby_version = '>= 1.9.3'
 
-  s.author    = 'Yu Pan'
-  s.email     = 'yu.pan@affirm.com'
-  s.homepage  = 'http://www.spreecommerce.com'
+  s.author    = 'Affirm'
+  s.email     = 'mts@affirm.com'
+  s.homepage  = 'http://www.affirm.com'
 
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree_core', '>= 2.2.0'
+  s.add_dependency 'spree_core', '~> 2.2', '>= 2.2.0'
 
   s.add_development_dependency 'factory_girl', '~> 4.2'
   s.add_development_dependency 'ffaker', '~> 1.16'

metadata

@@ -1,120 +1,126 @@
 --- !ruby/object:Gem::Specification
 name: spree_affirm
 version: !ruby/object:Gem::Version
-  version: 0.2.22
+  version: 0.2.30
 platform: ruby
 authors:
-- Yu Pan
+- Affirm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-description: Affirm payment Gateway for spree
-email: yu.pan@affirm.com
+description: Affirm payment Gateway for Spree
+email: mts@affirm.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -125,14 +131,12 @@ files:
 - app/assets/stylesheets/spree/backend/spree_affirm.css
 - app/assets/stylesheets/spree/frontend/spree_affirm.css
 - app/controllers/spree/affirm_controller.rb
-- app/models/affirm/address_validator.rb
 - app/models/spree/affirm_checkout.rb
 - app/models/spree/gateway/affirm.rb
 - app/views/spree/admin/log_entries/_affirm.html.erb
 - app/views/spree/admin/log_entries/index.html.erb
 - app/views/spree/admin/payments/source_forms/_affirm.html.erb
 - app/views/spree/admin/payments/source_views/_affirm.html.erb
-- app/views/spree/checkout/affirm/_learn_more.html.erb
 - app/views/spree/checkout/payment/_affirm.html.erb
 - bin/rails
 - config/locales/en.yml
@@ -154,7 +158,7 @@ files:
 - spec/models/spree_gateway_affirm_spec.rb
 - spec/spec_helper.rb
 - spree_affirm.gemspec
-homepage: http://www.spreecommerce.com
+homepage: http://www.affirm.com
 licenses: []
 metadata: {}
 post_install_message: 
@@ -163,18 +167,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - none
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Affirm Spree Payment Gateway

data/app/models/affirm/address_validator.rb

@@ -1,25 +0,0 @@
-module Affirm
-  class AddressValidator
-    def self.normalize_affirm_address(affirm_address_details)
-      _address_mapping = {
-        "city"         => 'city',
-        "street1"      => 'line1',
-        "street2"      => 'line2',
-        "postal_code"  => 'zipcode',
-        "region1_code" => 'state',
-        "country_code" => 'country'
-      }
-
-      _address_mapping.each do |key, mapped_key|
-
-        unless affirm_address_details[key].present?
-          affirm_address_details[key] = affirm_address_details[mapped_key]
-        end
-
-      end
-
-      affirm_address_details
-    end
-
-  end
-end