Upgrade extension to support rails 6

.circleci/config.yml

@@ -0,0 +1,35 @@
+version: 2.1
+
+orbs:
+  # Always take the latest version of the orb, this allows us to
+  # run specs against Solidus supported versions only without the need
+  # to change this configuration every time a Solidus version is released
+  # or goes EOL.
+  solidusio_extensions: solidusio/extensions@volatile
+
+jobs:
+  run-specs-with-postgres:
+    executor: solidusio_extensions/postgres
+    steps:
+      - solidusio_extensions/run-tests
+  run-specs-with-mysql:
+    executor: solidusio_extensions/mysql
+    steps:
+      - solidusio_extensions/run-tests
+
+workflows:
+  "Run specs on supported Solidus versions":
+    jobs:
+      - run-specs-with-postgres
+      - run-specs-with-mysql
+  "Weekly run specs against master":
+    triggers:
+      - schedule:
+          cron: "0 0 * * 4" # every Thursday
+          filters:
+            branches:
+              only:
+                - master
+    jobs:
+      - run-specs-with-postgres
+      - run-specs-with-mysql

.gitignore

@@ -16,3 +16,4 @@ pkg
 *.swp
 spec/dummy
 spec/vcr_cassettes
+spec/examples.txt

.rspec

@@ -1 +1,2 @@
---format progress
+--color
+-r spec_helper

Gemfile

@@ -1,8 +1,40 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
 
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-gem "solidus", github: "solidusio/solidus", branch: branch
-gem "solidus_auth_devise", github: "solidusio/solidus_auth_devise", branch: branch
+gem 'solidus', github: 'solidusio/solidus', 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', '>0.a'
+
+# Provides basic authentication functionality for testing parts of your engine
+gem 'solidus_auth_devise'
+
+# gem 'solidus_reports', github: 'solidusio-contrib/solidus_reports'
+
+case ENV['DB']
+when 'mysql'
+  gem 'mysql2'
+when 'postgresql'
+  gem 'pg'
+else
+  gem 'sqlite3'
+end
+
+group :development, :test do
+  gem 'pry-rails'
+  gem 'byebug'
+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'

README.md

@@ -1,54 +1,50 @@
-# Solidus Marketplace
+# SolidusMarketplace
 
-# NOTE: This gem is currently a work-in-progress. 
-Contributors are welcome to help us get this gem to a viable MVP.
-We suggest installing [ZenHub](http://zenhub.com) in order to view/manage open issues. 
-This will give you a new tab in Github called "Boards", which provides a Kanban-style view of the project's issues.
-
-# Overview
+[![Build Status](https://travis-ci.org/jtapia/solidus_marketplace.svg?branch=master)](https://travis-ci.org/jtapia/solidus_marketplace)
 
 This is marketplace implementation for solidus.
 
 Basic functionality:
-* Links products to one or more suppliers
-* Once an order is placed: 
-  * A shipment is created for the product's supplier
-  * The shipment is then sent to the store owner for fulfillment and to the supplier for visibility (via Email by default). 
-  * The store owner fulfills orders. The supplier can view their shipments (read-only for now).
-
-Installation
-------------
-Here's how to install solidus_marketplace into your existing spree site AFTER you've installed Spree:
-
-Add the following to your Gemfile:
+- Links products to one or more suppliers
+- Once an order is placed:
+  - A shipment is created for the product's supplier
+  - The shipment is then sent to the store owner for fulfillment and to the supplier for visibility (via Email by default).
+  - The store owner fulfills orders. The supplier can view their shipments (read-only for now).
 
-    gem 'solidus_marketplace'
+## Installation
 
-Make your bundle happy:
+Add this line to your application's Gemfile:
 
-    bundle install
-
-Now run the generator:
+```ruby
+gem 'solidus_marketplace', github: 'jtapia/solidus_marketplace'
+```
 
-    rails g solidus_marketplace:install
+Then run the following:
 
-(Optional) Run the generator for solidus_gateway to enable the use of Stripe or other payment providers
-included with that extension:
+```console
+$ bundle install
+$ bundle exec rails g solidus_marketplace:install
+```
 
-    rails g solidus_gateway:install
+(Optional) If you want to be able to see the reports, please add this line to your `Gemfile`:
 
-Then migrate your database if you did not run during installation generator:
+```ruby
+gem 'solidus_reports', github: 'solidusio-contrib/solidus_reports'
+```
 
-    bundle exec rake db:migrate
+(Optional) If you want to use Stripe or other payment providers, please add this line to your `Gemfile`:
 
-And reboot your server:
+```ruby
+gem 'solidus_gateway'
+```
 
-    rails s
+and run
 
-You should be up and running now!
+```ruby
+rails g solidus_gateway:install
+```
 
-Sample Data
------------
+## Sample Data
 
 If you'd like to generate sample data, use the included rake tasks:
 
@@ -59,65 +55,25 @@ rake spree_sample:suppliers          # Create sample suppliers and randomly link
 rake spree_sample:marketplace_orders # Create sample marketplace orders
 ```
 
-This will include a new role (supplier_admin) and 2 new users in addition to the default '[email protected]' user provided by solidus.
+This will include a new role (supplier_admin) and 2 new users in addition to the default `[email protected]` user provided by solidus.
 
 Those users have the following email/password/roles
 
-* [email protected] / test123 / admin
-* [email protected] / test123 / supplier_admin
-
-Demo
-----
+- [email protected] / test123 / admin
+- [email protected] / test123 / supplier_admin
 
-You can easily use the spec/dummy app as a demo of solidus_marketplace. Just `cd` to where you develop and run:
+## Testing
 
-```shell
-git clone git://github.com/boomerdigital/solidus_marketplace.git
-cd solidus_marketplace
-bundle install
-bundle exec rake test_app
-cd spec/dummy
-rake db:migrate db:seed spree_sample:load spree_sample:suppliers spree_sample:marketplace_orders
-rails s
-```
-
-Testing
--------
-
-Be sure to bundle your dependencies and then create a dummy test app for the specs to run against.
-
-```shell
-brew install geckodriver
+Run the following to automatically build a dummy app and run the tests:
 
-bundle
-bundle exec rake test_app
-bundle exec rspec spec
+```console
+$ bundle exec rake
 ```
 
-Todo
-----
-
-* See open issues here: [open issues](https://github.com/boomerdigital/solidus_marketplace/issues)
-
-Contributing
-------------
-
-In the spirit of [free software](http://www.fsf.org/licensing/essays/free-sw.html), **everyone** is encouraged to help improve this project.
-
-Here are some ways *you* can contribute:
+## Contributing
 
-* by using prerelease versions
-* by reporting [bugs](https://github.com/boomerdigital/solidus_marketplace/issues)
-* by suggesting new features
-* by [translating to a new language](https://github.com/boomerdigital/solidus_marketplace/tree/master/config/locales)
-* by writing or editing documentation
-* by writing specifications
-* by writing code (*no patch is too small*: fix typos, add comments, clean up inconsistent whitespace)
-* by refactoring code
-* by resolving [issues](https://github.com/boomerdigital/solidus_marketplace/issues)
-* by reviewing patches
+Bug reports and pull requests are welcome on GitHub at https://github.com/solidusio-contrib/solidus_abandoned_carts.
 
-Donating
---------
+## License
 
-Copyright (c) 2016-2017 Boomer Digital, released under the [New BSD License](https://github.com/boomerdigital/solidus_marketplace/tree/master/LICENSE).
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

Rakefile

@@ -1,15 +1,23 @@
+# frozen_string_literal: true
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
-require 'spree/testing_support/common_rake'
+require 'spree/testing_support/extension_rake'
 
 RSpec::Core::RakeTask.new
 
-task :default => [:spec]
+task :default do
+  if Dir["spec/dummy"].empty?
+    Rake::Task[:test_app].invoke
+    Dir.chdir("../../")
+  end
+  Rake::Task[:spec].invoke
+end
 
 desc 'Generates a dummy app for testing'
 task :test_app do
   ENV['LIB_NAME'] = 'solidus_marketplace'
-  Rake::Task['common:test_app'].invoke 'Spree::User'
+  Rake::Task['extension:test_app'].invoke
 end

app/assets/javascripts/spree/backend/solidus_marketplace_routes.js

@@ -1 +1 @@
-Spree.routes.suppliers_search = Spree.pathFor('api/suppliers')
+suppliers_search = Spree.pathFor('api/suppliers')

app/assets/javascripts/spree/backend/suppliers_autocomplete.js

@@ -2,52 +2,52 @@ $.fn.supplierAutocomplete = function () {
   'use strict';
 
   this.select2({
-      placeholder: Spree.translations.supplier_placeholder,
-      multiple: true,
-      initSelection: function (element, callback) {
-        var ids = element.val(),
-            count = ids.split(",").length;
+    placeholder: Spree.translations.supplier_placeholder,
+    multiple: true,
+    initSelection: function (element, callback) {
+      var ids = element.val(),
+          count = ids.split(",").length;
 
-        Spree.ajax({
-          type: "GET",
-          url: Spree.routes.suppliers_search,
-          data: {
-            ids: ids,
-            per_page: count
-          },
-          success: function (data) {
-            callback(data['suppliers']);
-          }
-        });
-      },
-      ajax: {
-        url: Spree.routes.suppliers_search,
-        datatype: 'json',
-        data: function (term, page) {
-          return {
-            per_page: 50,
-            page: page,
-            q: {
-              name_cont: term
-            },
-            token: Spree.api_key
-          };
+      Spree.ajax({
+        type: "GET",
+        url: suppliers_search,
+        data: {
+          ids: ids,
+          per_page: count
         },
-        results: function (data, page) {
-          var more = page < data.pages;
-          return {
-            results: data['suppliers'],
-            more: more
-          };
+        success: function (data) {
+          callback(data['suppliers']);
         }
+      });
+    },
+    ajax: {
+      url: suppliers_search,
+      datatype: 'json',
+      data: function (term, page) {
+        return {
+          per_page: 50,
+          page: page,
+          q: {
+            name_cont: term
+          },
+          token: Spree.api_key
+        };
       },
-      formatResult: function (supplier, container, query, escapeMarkup) {
-        return escapeMarkup(supplier.name);
-      },
-      formatSelection: function (supplier, container, escapeMarkup) {
-        return escapeMarkup(supplier.name);
+      results: function (data, page) {
+        var more = page < data.pages;
+        return {
+          results: data['suppliers'],
+          more: more
+        };
       }
-    });
+    },
+    formatResult: function (supplier, container, query, escapeMarkup) {
+      return escapeMarkup(supplier.name);
+    },
+    formatSelection: function (supplier, container, escapeMarkup) {
+      return escapeMarkup(supplier.name);
+    }
+  });
 };
 
 $(document).ready(function () {