solidus_paypal_commerce_platform 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6b42e62ea794f6f98a382e3944a86f1b03130eef00a43691d731396b424b1a6
-  data.tar.gz: ed073fde27a260b13e256619efa1e0382bbe9e682d0a02312716b064acbec74c
+  metadata.gz: aae67f5e5c8af750b1f887d988b383dfa5ea5f9eb4fea2e3e3560a9179b63842
+  data.tar.gz: 0ad40e286a533be1433f73b83c3ed012f7887c5d3eae5ffa036298a8c465930c
 SHA512:
-  metadata.gz: f65d2f2afb76c41ce0210766d7b38d5535caad5c14fb69e949fc48d0e64c0c80eae602e4e720b0e69db78484d316ab7af51f8850231e461c4067d302a953d523
-  data.tar.gz: 04edef6d25e8e3421dacb99ff25ed2c9eda8c280430d7c7ad7dd61380e64fe907384545deb282da748dae3be745f6b02b832ca225c5494c4ffbaca20634b6ca4
+  metadata.gz: a773acc2923435a1765a8c7e2fa6508ef54011455fe4694df163b8a403a8446a8ee6b400c4fea8a1a0c56496db1b1e6fdbf662e83ad114076e9ea33cabe424e0
+  data.tar.gz: 61b973cfb34095b9913d0aded13a6510af224718c8a7094117c54e158c249b1f232e0ac3d26c116e4efadb873e3baf758f692302d12eb149822cfb8e056ea317

data/.rubocop.yml

@@ -43,6 +43,10 @@ RSpec/VerifiedDoubles:
   # Sometimes you really need an "anything" double
   IgnoreSymbolicNames: true
 
+Rspec/Naming/VariableNumber:
+  # PayPal uses snake_case, we use normal_case ¯\_(ツ)_/¯
+  Enabled: false
+
 Style/FrozenStringLiteralComment:
   Exclude:
     - spec/**/*

data/CHANGELOG.md

@@ -1,13 +1,29 @@
 # Changelog
 
+## [v0.3.0](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/tree/v0.3.0) (2021-03-16)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/compare/v0.2.2...v0.3.0)
+
+**Closed issues:**
+
+- Prepare Solidus Paypal Commerce Platform for Solidus 3.0 [\#115](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/115)
+
+**Merged pull requests:**
+
+- Use new factories loading method [\#118](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/118) ([kennyadsl](https://github.com/kennyadsl))
+- Update extension for Solidus 3.0 [\#117](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/117) ([seand7565](https://github.com/seand7565))
+
 ## [v0.2.2](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/tree/v0.2.2) (2020-11-20)
 
 [Full Changelog](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/compare/v0.2.1...v0.2.2)
 
-**Closed issues:**
+**Implemented enhancements:**
 
 - Make the PayPal messaging component a bit more modular [\#112](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/112)
 - Implement and QA Paypal credit solutions [\#99](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/99)
+
+**Closed issues:**
+
 - Simulated Address Info in Live Order [\#104](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/issues/104)
 
 **Merged pull requests:**
@@ -59,7 +75,6 @@
 **Merged pull requests:**
 
 - Temporarily switch from apparition to cuprite [\#92](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/92) ([elia](https://github.com/elia))
-- Update links after moving the repo to solidusio-contrib [\#91](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/91) ([elia](https://github.com/elia))
 - Add a configurable state\_guesser class to guess states [\#90](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/90) ([seand7565](https://github.com/seand7565))
 - Add better error handling to button\_actions.js [\#89](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/89) ([seand7565](https://github.com/seand7565))
 
@@ -113,6 +128,7 @@
 
 **Merged pull requests:**
 
+- Update links after moving the repo to solidusio-contrib [\#91](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/91) ([elia](https://github.com/elia))
 - Use live partner ids [\#85](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/85) ([elia](https://github.com/elia))
 - Update README to account for checkouts without a confirmation step [\#84](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/84) ([seand7565](https://github.com/seand7565))
 - Replace order simulator with something simpler [\#82](https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/pull/82) ([seand7565](https://github.com/seand7565))

data/app/models/solidus_paypal_commerce_platform/paypal_address.rb

@@ -19,7 +19,7 @@ module SolidusPaypalCommercePlatform
     end
 
     def update(paypal_address)
-      formatted_address = format_address(paypal_address)
+      formatted_address = address_attributes(paypal_address[:updated_address], paypal_address[:recipient])
       new_address = @order.ship_address.dup || ::Spree::Address.new
       new_address.assign_attributes(formatted_address)
 
@@ -51,36 +51,35 @@ module SolidusPaypalCommercePlatform
     end
 
     def format_simulated_address(paypal_address)
-      country = ::Spree::Country.find_by(iso: paypal_address[:country_code])
-      # Also adds fake information for a few fields, so validations can run
+      # Adds fake information for a few fields, so validations can run
+      paypal_address[:address_line_1] = "123 Fake St."
+
       ::Spree::Address.new(
-        city: paypal_address[:city],
-        state: find_state(paypal_address[:state], country),
-        state_name: paypal_address[:state],
-        zipcode: paypal_address[:postal_code],
-        country: country,
-        address1: "123 Fake St.",
-        phone: "123456789",
-        firstname: "Fake"
+        address_attributes(paypal_address, { name: { given_name: "Fake" } })
       )
     end
 
-    def format_address(paypal_address)
-      address = paypal_address[:updated_address]
-      recipient = paypal_address[:recipient]
+    def address_attributes(address, recipient)
       country = ::Spree::Country.find_by(iso: address[:country_code])
 
-      {
+      attributes = {
         address1: address[:address_line_1],
         address2: address[:address_line_2],
-        state: find_state(address[:admin_area_1], country),
-        state_name: address[:admin_area_1],
-        city: address[:admin_area_2],
+        state: find_state(address[:admin_area_1] || address[:state], country),
+        state_name: address[:admin_area_1] || address[:state],
+        city: address[:admin_area_2] || address[:city],
         country: country,
         zipcode: address[:postal_code],
-        firstname: recipient[:name][:given_name],
-        lastname: recipient[:name][:surname]
       }
+
+      if SolidusSupport.combined_first_and_last_name_in_address?
+        attributes[:name] = "#{recipient[:name][:given_name]} #{recipient[:name][:surname]}"
+      else
+        attributes[:firstname] = recipient[:name][:given_name]
+        attributes[:lastname] = recipient[:name][:surname]
+      end
+
+      attributes
     end
   end
 end

data/lib/solidus_paypal_commerce_platform/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusPaypalCommercePlatform
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

data/solidus_paypal_commerce_platform.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'deface', '~> 1.5'
   spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 3']
-  spec.add_dependency 'solidus_support', [">= 0.5.1", "< 1"]
+  spec.add_dependency 'solidus_support', [">= 0.8.0", "< 1"]
   spec.add_dependency 'solidus_webhooks', '~> 0.2'
 
   spec.add_dependency 'paypal-checkout-sdk'

data/spec/models/solidus_paypal_commerce_platform/paypal_address_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 RSpec.describe SolidusPaypalCommercePlatform::PaypalAddress, type: :model do
   let(:order) { create(:order) }
   let(:original_address) { create(:address) }
-  let(:address) { create(:address) }
+  let(:address) { create(:address, name_attributes) }
   let(:params) {
     {
       updated_address: {
@@ -16,8 +16,8 @@ RSpec.describe SolidusPaypalCommercePlatform::PaypalAddress, type: :model do
       },
       recipient: {
         name: {
-          given_name: address.firstname,
-          surname: address.lastname
+          given_name: "Alexander",
+          surname: "Hamilton"
         }
       }
     }
@@ -37,8 +37,12 @@ RSpec.describe SolidusPaypalCommercePlatform::PaypalAddress, type: :model do
       expect(subject.address2).to eq address.address2
       expect(subject.zipcode).to eq address.zipcode
       expect(subject.country).to eq address.country
-      expect(subject.firstname).to eq address.firstname
-      expect(subject.lastname).to eq address.lastname
+      if SolidusSupport.combined_first_and_last_name_in_address?
+        expect(subject.name).to eq address.name
+      else
+        expect(subject.firstname).to eq address.firstname
+        expect(subject.lastname).to eq address.lastname
+      end
       expect(subject.phone).to eq original_address.phone
     end
 
@@ -52,4 +56,12 @@ RSpec.describe SolidusPaypalCommercePlatform::PaypalAddress, type: :model do
       end
     end
   end
+
+  def name_attributes
+    if SolidusSupport.combined_first_and_last_name_in_address?
+      { name: "Alexander Hamilton" }
+    else
+      { firstname: "Alexander", lastname: "Hamilton" }
+    end
+  end
 end

data/spec/requests/solidus_paypal_commerce_platform/orders_controller_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe SolidusPaypalCommercePlatform::OrdersController, type: :request d
 
         get solidus_paypal_commerce_platform.verify_total_path, params: params
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_http_status(:ok)
       end
     end
 
@@ -29,7 +29,7 @@ RSpec.describe SolidusPaypalCommercePlatform::OrdersController, type: :request d
 
         get solidus_paypal_commerce_platform.verify_total_path, params: params
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_http_status(:bad_request)
       end
     end
   end

data/spec/requests/solidus_paypal_commerce_platform/wizard_controller_spec.rb

@@ -38,7 +38,7 @@ RSpec.describe SolidusPaypalCommercePlatform::WizardController, type: :request d
 
       expect(payment_method.preferred_client_id).to eq("CLIENT-ID")
       expect(payment_method.preferred_client_secret).to eq("CLIENT-SECRET")
-      expect(response).to have_http_status(201)
+      expect(response).to have_http_status(:created)
     end
   end
 end

data/spec/spec_helper.rb

@@ -20,7 +20,7 @@ require 'spree/testing_support/order_walkthrough'
 Dir["#{__dir__}/support/**/*.rb"].sort.each { |f| require f }
 
 # Requires factories defined in lib/solidus_paypal_commerce_platform/testing_support/factories.rb
-require 'solidus_paypal_commerce_platform/testing_support/factories'
+SolidusDevSupport::TestingSupport::Factories.load_for(SolidusPaypalCommercePlatform::Engine)
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_paypal_commerce_platform
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Sean Denny
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.8.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1'
@@ -61,7 +61,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.8.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1'