solidus_paypal_commerce_platform 0.5.0 → 1.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc92be06606fdc11bd65cb76e0121637054956852853f533dc22a0c04234bf31
-  data.tar.gz: 5e6eb3333ceb6590c711a572cce20a49c88ea313d6547612e1ae490766219454
+  metadata.gz: bd0c77c30a42db324d623a2bd37e7ca2d80d107d06c11e5c9c5829bf06e793cf
+  data.tar.gz: 33336091ab82d3af94df502291cbfbe0be94d8d5c839e3c73082210a8b4813b8
 SHA512:
-  metadata.gz: '079cdd57b4e2dc48a17b79e15711b1182d31de5e12b3aa7087590df33ccd6686197c65c7636d48a57213d4fa28cff0c37cd93117eacba1b99818eafbb0ef13c1'
-  data.tar.gz: a66e1b6cfa262c523ab8b95d47bd975a96080b5772f8a032cae2d9fdc449f5723261409b552da351fa48def0b3a35e3049c9f50bf2224abfbe6f18f4efb2cc8b
+  metadata.gz: 90f698b25df4994cd5037eba1ae264769c1a3667e57f73f415bc38c9d1004bf0e5a4f9404caf57dfba81d65a31340dbe1966d0ef464e673f8ef84b95689ca6b2
+  data.tar.gz: f42016a399a1d7d38d942589df248419f0a5395a62891cda436daa0725c377e4c4518076337a1354553fc9e9a9124424e47f27bfd50f4ebf32ee2863673091dd

data/.circleci/config.yml

@@ -9,33 +9,45 @@ orbs:
   # or goes EOL.
   solidusio_extensions: solidusio/extensions@volatile
 
+commands:
+  test-with-starter-frontend:
+    steps:
+      - checkout
+      - browser-tools/install-chrome
+      - run:
+          name: Install libvips
+          command: sudo apt-get install -y libvips
+      - solidusio_extensions/test-branch:
+          branch: master
+          command: |
+            export FRONTEND=starter
+            sudo gem update --system
+            gem install bundler
+            bin/dummy-app
+            bin/rspec
+      - solidusio_extensions/store-test-results
+
 jobs:
   run-specs-with-postgres:
     executor:
       name: solidusio_extensions/postgres
       ruby_version: '3.1'
     steps:
-      - checkout
-      - browser-tools/install-chrome
-      - solidusio_extensions/run-tests
+      - test-with-starter-frontend
 
   run-specs-with-mysql:
     executor:
       name: solidusio_extensions/mysql
       ruby_version: '3.0'
     steps:
-      - checkout
-      - browser-tools/install-chrome
-      - solidusio_extensions/run-tests
+      - test-with-starter-frontend
 
   run-specs-with-sqlite:
     executor:
       name: solidusio_extensions/sqlite
       ruby_version: '2.7'
     steps:
-      - checkout
-      - browser-tools/install-chrome
-      - solidusio_extensions/run-tests
+      - test-with-starter-frontend
 
   lint-code:
     executor: solidusio_extensions/sqlite-memory

data/.github/stale.yml

@@ -1,17 +1 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: false
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-# Label to use when marking an issue as stale
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It might be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
+_extends: .github

data/.gitignore

@@ -15,6 +15,7 @@ pkg
 spec/dummy
 spec/examples.txt
 /sandbox
+/dummy-app
 .rvmrc
 .ruby-version
 .ruby-gemset

data/.rspec

@@ -1,2 +1 @@
 --color
---require spec_helper

data/.rubocop.yml

@@ -6,6 +6,7 @@ AllCops:
   TargetRubyVersion: '2.7'
   Exclude:
     - sandbox/**/*
+    - dummy-app/**/*
     - spec/dummy/**/*
     - vendor/bundle/**/*
 
@@ -23,10 +24,10 @@ Naming/VariableNumber:
 RSpec/AnyInstance:
   Enabled: false
 
-# Feature specs are not describing any class or module.
+# System specs are not describing any class or module.
 RSpec/DescribeClass:
   Exclude:
-    - spec/features/**/*
+    - spec/system/**/*
 
 # No need to make the code more complex for no real gain.
 RSpec/MessageSpies:

data/CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## [v1.0.0.beta1](https://github.com/solidusio/solidus_paypal_commerce_platform/tree/v1.0.0.beta1) (2022-12-05)
+
+[Full Changelog](https://github.com/solidusio/solidus_paypal_commerce_platform/compare/v0.6.0...v1.0.0.beta1)
+
+**Closed issues:**
+
+- Release 0.6 and attach that version to a different branch [\#169](https://github.com/solidusio/solidus_paypal_commerce_platform/issues/169)
+
+**Merged pull requests:**
+
+- Bugfixes and improvements \(extracted from the SSF support branch\) [\#168](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/168) ([elia](https://github.com/elia))
+- Reorganize the install generator and deprecate `--skip-migrations` [\#167](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/167) ([elia](https://github.com/elia))
+- Setup compatibility with the starter frontend [\#166](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/166) ([elia](https://github.com/elia))
+- Move 'shipping\_preference' preference under PaypalOrder\#to\_json [\#152](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/152) ([retsef](https://github.com/retsef))
+- Truncate the product name to 127 characters [\#139](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/139) ([DanielePalombo](https://github.com/DanielePalombo))
+- Fix issue on international transactions [\#129](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/129) ([jtapia](https://github.com/jtapia))
+
+## [v0.6.0](https://github.com/solidusio/solidus_paypal_commerce_platform/tree/v0.6.0) (2022-11-25)
+
+[Full Changelog](https://github.com/solidusio/solidus_paypal_commerce_platform/compare/v0.5.0...v0.6.0)
+
+**Fixed bugs:**
+
+- Gem does not support Ruby 3.0 [\#145](https://github.com/solidusio/solidus_paypal_commerce_platform/issues/145)
+
+**Closed issues:**
+
+- Invalid string length error [\#135](https://github.com/solidusio/solidus_paypal_commerce_platform/issues/135)
+- PayPal SDK JS Error: Disallowed query param: shipping\_preference [\#133](https://github.com/solidusio/solidus_paypal_commerce_platform/issues/133)
+
 ## [v0.5.0](https://github.com/solidusio/solidus_paypal_commerce_platform/tree/v0.5.0) (2022-10-07)
 
 [Full Changelog](https://github.com/solidusio/solidus_paypal_commerce_platform/compare/v0.4.0...v0.5.0)
@@ -7,8 +37,7 @@
 **Merged pull requests:**
 
 - Update links after moving to @solidusio [\#164](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/164) ([elia](https://github.com/elia))
-- Fix assigning API created orders to the current user [\#163](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/163) ([elia](https://github.com/elia))
-- Require Solidus 3 & Ruby 2.7 [\#163](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/163) ([elia](https://github.com/elia))
+- Assign created orders to users / Require Solidus 3 & Ruby 2.7 [\#163](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/163) ([elia](https://github.com/elia))
 - Fix master, import paypal-checkout-sdk [\#161](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/161) ([cpfergus1](https://github.com/cpfergus1))
 - Update to use forked solidus\_frontend when needed [\#160](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/160) ([waiting-for-dev](https://github.com/waiting-for-dev))
 - Fix paypal\_order name address bug [\#153](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/153) ([RyanofWoods](https://github.com/RyanofWoods))
@@ -108,13 +137,7 @@
 
 ## [v0.2.0](https://github.com/solidusio/solidus_paypal_commerce_platform/tree/v0.2.0) (2020-10-13)
 
-[Full Changelog](https://github.com/solidusio/solidus_paypal_commerce_platform/compare/v0.1.0...v0.2.0)
-
-**Closed issues:**
-
-- README lists two different types of PayPal credentials [\#97](https://github.com/solidusio/solidus_paypal_commerce_platform/issues/97)
-- `paypal_email_confirmed` is not an actual preference [\#96](https://github.com/solidusio/solidus_paypal_commerce_platform/issues/96)
-- Make this extension the default option for Solidus [\#88](https://github.com/solidusio/solidus_paypal_commerce_platform/issues/88)
+[Full Changelog](https://github.com/solidusio/solidus_paypal_commerce_platform/compare/v0.2.0.alpha.1...v0.2.0)
 
 **Merged pull requests:**
 
@@ -126,6 +149,16 @@
 - Add skip migration option to installer [\#94](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/94) ([seand7565](https://github.com/seand7565))
 - Update README to reflect referral fee [\#93](https://github.com/solidusio/solidus_paypal_commerce_platform/pull/93) ([seand7565](https://github.com/seand7565))
 
+## [v0.2.0.alpha.1](https://github.com/solidusio/solidus_paypal_commerce_platform/tree/v0.2.0.alpha.1) (2020-10-07)
+
+[Full Changelog](https://github.com/solidusio/solidus_paypal_commerce_platform/compare/v0.1.0...v0.2.0.alpha.1)
+
+**Closed issues:**
+
+- README lists two different types of PayPal credentials [\#97](https://github.com/solidusio/solidus_paypal_commerce_platform/issues/97)
+- `paypal_email_confirmed` is not an actual preference [\#96](https://github.com/solidusio/solidus_paypal_commerce_platform/issues/96)
+- Make this extension the default option for Solidus [\#88](https://github.com/solidusio/solidus_paypal_commerce_platform/issues/88)
+
 ## [v0.1.0](https://github.com/solidusio/solidus_paypal_commerce_platform/tree/v0.1.0) (2020-09-03)
 
 [Full Changelog](https://github.com/solidusio/solidus_paypal_commerce_platform/compare/v0.0.1...v0.1.0)

data/Gemfile

@@ -1,46 +1,5 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-git_source(:github) { |repo| "https://github.com/#{repo}.git" }
-
-branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-solidus_git, solidus_frontend_git = if (branch == 'master') || (branch >= 'v3.2')
-                                      %w[solidusio/solidus solidusio/solidus_frontend]
-                                    else
-                                      %w[solidusio/solidus] * 2
-                                    end
-gem 'solidus', github: solidus_git, branch: branch
-gem 'solidus_frontend', github: solidus_frontend_git, branch: branch
-
-# Needed to help Bundler figure out how to resolve dependencies,
-# otherwise it takes forever to resolve them.
-# See https://github.com/bundler/bundler/issues/6677
-gem 'rails', ENV.fetch('RAILS_VERSION', '>0.a')
-
-# Provides basic authentication functionality for testing parts of your engine
-gem 'solidus_auth_devise'
-
-case ENV.fetch('DB', nil)
-when 'mysql'
-  gem 'mysql2'
-when 'postgresql'
-  gem 'pg'
-else
-  gem 'sqlite3'
-end
-
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3')
-  # 'net/smtp' is required by 'mail', see:
-  # - https://github.com/ruby/net-protocol/issues/10
-  # - https://stackoverflow.com/a/72474475
-  gem 'net-smtp', require: false
-end
 
 gemspec
-
-# Use a local Gemfile to include development dependencies that might not be
-# relevant for the project or for other contributors, e.g. pry-byebug.
-#
-# We use `send` instead of calling `eval_gemfile` to work around an issue with
-# how Dependabot parses projects: https://github.com/dependabot/dependabot-core/issues/1658.
-send(:eval_gemfile, 'Gemfile-local') if File.exist? 'Gemfile-local'

data/README.md

@@ -31,7 +31,7 @@ Since PayPal is being used as the checkout if the user checks out on the product
 
 A) Turn off cart and product page checkout - configurable on the admin payment method page for PayPal Commerce Platform.
 -OR-
-B) Collect the users phone number seperately
+B) Collect the users phone number separately
 
 and then override the `Spree::Address` method `require_phone?` to return `true`.
 
@@ -93,6 +93,7 @@ end
 The instances of your wizard class should respond to `#name` and `#partial_name`, where `partial_name` will return the path to the partial you'd like to display on the wizard setup section. In our case, we just display a button to direct the user to PayPal.
 
 ## State Guesser
+
 PayPal users can change their shipping address directly on PayPal, which will
 update their address on Solidus as well. However, in some instances, Solidus
 uses the incorrect subregion level for states, which causes validation problems
@@ -101,7 +102,7 @@ with the addresses that PayPal sends to us.
 For instance, if your user lives in Pescara, Italy, then PayPal will return
 "Pescara" as the state. However on older version of Solidus, the region
 "Abruzzo" is used, so the address will not be able to validate. To solve this
-issue, we've implented a class that attempts to guess the state of the user
+issue, we've implemented a class that attempts to guess the state of the user
 using Carmen subregions if the state cannot be initially found. You can, of
 course, implement your own state guesser and set it like this:
 
@@ -121,6 +122,7 @@ With product and cart page checkout, the user is directed to the checkout confir
 PayPals API does not allow for admin-side payments. Instead, backend users taking payments for customers will need to use the PayPal Virtual Terminal to take payments. [More info is available on the PayPal website.](https://www.paypal.com/merchantapps/appcenter/acceptpayments/virtualterminal?locale.x=en_US)
 
 ## Venmo
+
 Venmo is currently available to US merchants and buyers. There are also other [prequisites](https://developer.paypal.com/docs/business/checkout/pay-with-venmo/#eligibility).
 
 If the transaction supports Venmo and it is enabled by the following, then a button should appear for it on checkout payment page. Note, Venmo cannot currently be rendered on the product or cart pages.
@@ -135,6 +137,7 @@ See more about preferences([Configuration](#configuration)) below.
 [_As Venmo is only available in the US, you may want to mock your location for testing_](#mocking-your-buyer-country)
 
 ## Configuration
+
 The easiest way to change the `Payment Method`'s preferences is through admin: `Settings > Payments > "PayPal Commerce Platform" > Edit`.
 
 See more about preferences [here](https://guides.solidus.io/developers/preferences/add-model-preferences.html#access-your-preferences)/
@@ -145,10 +148,10 @@ See more about preferences [here](https://guides.solidus.io/developers/preferenc
 
 First bundle your dependencies, then run `bin/rake`. `bin/rake` will default to building the dummy
 app if it does not exist, then it will run specs. The dummy app can be regenerated by using
-`bin/rake extension:test_app`.
+`bin/dummy-app`.
 
 ```shell
-bundle
+bin/setup
 bin/rake
 ```
 
@@ -158,13 +161,6 @@ To run [Rubocop](https://github.com/bbatsov/rubocop) static code analysis run
 bundle exec rubocop
 ```
 
-When testing your application's integration with this extension you may use its factories.
-Simply add this require statement to your spec_helper:
-
-```ruby
-require 'solidus_paypal_commerce_platform/factories'
-```
-
 ### Running the sandbox
 
 To run this extension in a sandboxed Solidus application, you can run `bin/sandbox`. The path for
@@ -182,6 +178,7 @@ Use Ctrl-C to stop
 ```
 
 ### Mocking your buyer country
+
 PayPal normally looks at your IP geolocation to see where you are located to determine what funding sources are available to you. For example, Venmo is currently only available to US buyers.
 Because of this, you may want to pretend you are from US check that that Venmo is correctly integrated for these customers. To do this, set the payment method's preference of `force_buyer_country` to "US". See more information about preferences above.
 
@@ -216,4 +213,4 @@ By using this extension, you are giving back to Solidus. PayPal will pay a fee t
 
 ## License
 
-Copyright (c) 2020 Nebulab srls, released under the New BSD License
+Copyright (c) 2022 Nebulab srls, released under the New BSD License

data/Rakefile

@@ -3,4 +3,9 @@
 require 'solidus_dev_support/rake_tasks'
 SolidusDevSupport::RakeTasks.install
 
-task default: 'extension:specs'
+task :default do
+  require 'bundler'
+  Bundler.with_unbundled_env do
+    sh 'bin/rspec'
+  end
+end

data/app/models/solidus_paypal_commerce_platform/payment_method.rb

@@ -74,6 +74,8 @@ module SolidusPaypalCommercePlatform
     end
 
     def javascript_sdk_url(order: nil, currency: nil)
+      # Ref: https://developer.paypal.com/sdk/js/configuration/
+
       # Both instance and class respond to checkout_steps.
       step_names = order ? order.checkout_steps : ::Spree::Order.checkout_steps.keys
 
@@ -84,17 +86,16 @@ module SolidusPaypalCommercePlatform
         intent: auto_capture ? "capture" : "authorize",
         commit: commit_immediately ? "false" : "true",
         components: options[:display_credit_messaging] ? "buttons,messages" : "buttons",
-        currency: currency
+        currency: currency,
       }
 
-      parameters[:shipping_preference] = 'NO_SHIPPING' if step_names.exclude? 'delivery'
       parameters['enable-funding'] = 'venmo' if venmo_standalone_enabled?
 
-      if !Rails.env.production? && options[:force_buyer_country].present?
-        parameters['buyer-country'] = options[:force_buyer_country]
+      unless Rails.env.production?
+        parameters['buyer-country'] = options[:force_buyer_country].presence
       end
 
-      "https://www.paypal.com/sdk/js?#{parameters.to_query}"
+      "https://www.paypal.com/sdk/js?#{parameters.compact.to_query}".html_safe # rubocop:disable Rails/OutputSafety
     end
   end
 end

data/app/models/solidus_paypal_commerce_platform/paypal_address.rb

@@ -61,12 +61,16 @@ module SolidusPaypalCommercePlatform
 
     def address_attributes(address, recipient)
       country = ::Spree::Country.find_by(iso: address[:country_code])
+      state = find_state(
+        address[:admin_area_1] || address[:admin_area_2] || address[:state],
+        country,
+      )
 
       attributes = {
         address1: address[:address_line_1],
         address2: address[:address_line_2],
-        state: find_state(address[:admin_area_1] || address[:state], country),
-        state_name: address[:admin_area_1] || address[:state],
+        state_id: state.try(:id),
+        state_name: state.try(:name),
         city: address[:admin_area_2] || address[:city],
         country: country,
         zipcode: address[:postal_code],

data/app/models/solidus_paypal_commerce_platform/paypal_order.rb

@@ -10,14 +10,15 @@ module SolidusPaypalCommercePlatform
       {
         intent: intent,
         purchase_units: purchase_units,
-        payer: (payer if @order.bill_address)
+        payer: (payer if @order.bill_address),
+        application_context: application_context
       }
     end
 
     def to_replace_json
       {
         op: 'replace',
-        path: '/purchase_units/@reference_id==\'default\'',
+        path: "/purchase_units/@reference_id=='default'",
         value: purchase_units(include_shipping_address: false)[0]
       }
     end
@@ -55,10 +56,10 @@ module SolidusPaypalCommercePlatform
     def purchase_units(include_shipping_address: true)
       [
         {
-          amount: amount,
+          amount: price(@order.total).merge(breakdown: breakdown),
           items: line_items,
           shipping: (shipping_info if @order.ship_address && include_shipping_address)
-        }
+        }.compact
       ]
     end
 
@@ -79,21 +80,13 @@ module SolidusPaypalCommercePlatform
     def line_items
       @order.line_items.map{ |line_item|
         {
-          name: line_item.product.name,
+          name: line_item.product.name.truncate(127),
           unit_amount: price(line_item.price),
-          quantity: line_item.quantity
+          quantity: line_item.quantity.to_i.to_s
         }
       }
     end
 
-    def amount
-      {
-        currency_code: @order.currency,
-        value: @order.total,
-        breakdown: breakdown
-      }
-    end
-
     def breakdown
       {
         item_total: price(@order.item_total),
@@ -106,8 +99,22 @@ module SolidusPaypalCommercePlatform
     def price(amount)
       {
         currency_code: @order.currency,
-        value: amount
+        value: ('%.2f' % amount.to_f)
+      }
+    end
+
+    def application_context
+      {
+        shipping_preference: require_shipping? ? 'SET_PROVIDED_ADDRESS' : 'NO_SHIPPING'
       }
     end
+
+    def require_shipping?
+      step_names.include? :delivery
+    end
+
+    def step_names
+      @order ? @order.checkout_steps.map(&:to_sym) : ::Spree::Order.checkout_steps.keys
+    end
   end
 end

data/bin/dummy-app

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+set -e
+
+extension_name="solidus_paypal_commerce_platform"
+
+# Stay away from the bundler env of the containing extension.
+function unbundled {
+  ruby -rbundler -e'b = proc {system *ARGV}; Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&b) : Bundler.with_clean_env(&b)' -- "$@"
+}
+
+# "sqlite" is set by the ORB extension instead of "sqlite3",
+# all other options are already in the format expected by `rails new`.
+test "$DB" = "sqlite" && export DB="sqlite3"
+
+rm -rf ./dummy-app
+unbundled bundle exec rails new dummy-app \
+  --database=${DB:-sqlite3} \
+  --skip-bundle \
+  --skip-git \
+  --skip-keeps \
+  --skip-rc \
+  --skip-spring \
+  --skip-javascript
+
+if [ ! -d "dummy-app" ]; then
+  echo 'dummy-app rails application failed'
+  exit 1
+fi
+
+cd ./dummy-app
+unbundled bundle add solidus --github solidusio/solidus --branch "${BRANCH:-master}" --version '> 0.a'
+unbundled bundle exec rake db:drop db:create
+unbundled bundle exec rails generate solidus:install --auto-accept --payment-method=none --no-seed --no-sample "$@"
+unbundled bundle add $extension_name --path ..
+unbundled bundle exec rails generate $extension_name:install --migrate --specs=all
+

data/bin/rails-dummy-app

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+root = "#{__dir__}/.."
+app_root = "#{root}/dummy-app"
+
+unless File.exist? "#{app_root}/bin/rails"
+  warn 'Creating the dummy-app app...'
+  Dir.chdir root do
+    system "#{root}/bin/dummy-app" or begin
+      warn 'Automatic creation of the dummy-app app failed'
+      exit 1
+    end
+  end
+end
+
+Dir.chdir app_root
+exec "#{app_root}/bin/rails", *ARGV

data/bin/rspec

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -e
+
+bin/rails-dummy-app generate solidus_paypal_commerce_platform:install --force --migrate --specs=all
+
+cd dummy-app/
+rspec "$@"
+exit_status=$?
+cd -
+exit $exit_status

data/bin/sandbox

@@ -29,7 +29,7 @@ extension_name="solidus_paypal_commerce_platform"
 
 # Stay away from the bundler env of the containing extension.
 function unbundled {
-  ruby -rbundler -e'b = proc {system *ARGV}; Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&b) : Bundler.with_clean_env(&b)' -- $@
+  ruby -rbundler -e'b = proc {system *ARGV}; Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&b) : Bundler.with_clean_env(&b)' -- "$@"
 }
 
 rm -rf ./sandbox
@@ -48,35 +48,9 @@ if [ ! -d "sandbox" ]; then
 fi
 
 cd ./sandbox
-cat <<RUBY >> Gemfile
-gem 'solidus', github: 'solidusio/solidus', branch: '$BRANCH'
-gem 'solidus_auth_devise', '>= 2.1.0'
-gem 'rails-i18n'
-gem 'solidus_i18n'
-
-gem '$extension_name', path: '..'
-
-group :test, :development do
-  platforms :mri do
-    gem 'pry-byebug'
-  end
-end
-RUBY
-
-unbundled bundle install --gemfile Gemfile
-
+unbundled bundle add solidus --github solidusio/solidus --branch "${BRANCH:-master}" --version '> 0.a'
 unbundled bundle exec rake db:drop db:create
-
-unbundled bundle exec rails generate solidus:install \
-  --auto-accept \
-  --user_class=Spree::User \
-  --enforce_available_locales=true \
-  --with-authentication=false \
-  --payment-method=none \
-  $@
-
-unbundled bundle exec rails generate solidus:auth:install
-unbundled bundle exec rails generate ${extension_name}:install
+unbundled bundle exec rails generate solidus:install --auto-accept "$@"
 
 echo
 echo "🚀 Sandbox app successfully created for $extension_name!"