disco_app 0.14.4 → 0.17.0

data/lib/generators/disco_app/react/templates/root/babel.config.js

@@ -0,0 +1,72 @@
+module.exports = api => {
+  const validEnv = ['development', 'test', 'production'];
+  const currentEnv = api.env();
+  const isDevelopmentEnv = api.env('development');
+  const isProductionEnv = api.env('production');
+  const isTestEnv = api.env('test');
+
+  if (!validEnv.includes(currentEnv)) {
+    throw new Error(
+      `${'Please specify a valid `NODE_ENV` or ' +
+      '`BABEL_ENV` environment variables. Valid values are "development", ' +
+      '"test", and "production". Instead, received: '}${JSON.stringify(
+        currentEnv
+      )}.`
+    );
+  }
+
+  return {
+    presets: [
+      isTestEnv && [
+        '@babel/preset-env',
+        {
+          modules: 'commonjs',
+          targets: {
+            node: 'current'
+          }
+        }
+      ],
+      (isProductionEnv || isDevelopmentEnv) && [
+        '@babel/preset-env',
+        {
+          forceAllTransforms: true,
+          useBuiltIns: 'entry',
+          modules: false,
+          exclude: ['transform-typeof-symbol']
+        }
+      ],
+      '@babel/preset-react'
+    ].filter(Boolean),
+    plugins: [
+      'babel-plugin-macros',
+      '@babel/plugin-syntax-dynamic-import',
+      isTestEnv && 'babel-plugin-dynamic-import-node',
+      '@babel/plugin-transform-destructuring',
+      [
+        '@babel/plugin-proposal-class-properties',
+        {
+          loose: true
+        }
+      ],
+      [
+        '@babel/plugin-proposal-object-rest-spread',
+        {
+          useBuiltIns: true
+        }
+      ],
+      [
+        '@babel/plugin-transform-runtime',
+        {
+          helpers: false,
+          regenerator: true
+        }
+      ],
+      [
+        '@babel/plugin-transform-regenerator',
+        {
+          async: false
+        }
+      ]
+    ].filter(Boolean)
+  };
+};

data/lib/generators/disco_app/react/templates/root/package.json.tt

@@ -0,0 +1,84 @@
+{
+  "name": "<%= Rails.application.class.parent_name.underscore.dasherize %>",
+  "private": true,
+  "scripts": {
+    "lint": "eslint app/webpack -c .eslintrc --ext js,jsx",
+    "test": "jest",
+    "test-watch": "jest --watch"
+  },
+  "jest": {
+    "moduleDirectories": [
+      "app/webpack/javascripts",
+      "node_modules"
+    ],
+    "roots": [
+      "app/webpack/javascripts"
+    ],
+    "setupFilesAfterEnv": [
+      "<rootDir>spec/javascripts/setupTests.js"
+    ],
+    "testPathIgnorePatterns": [
+      "/config/",
+      "/node_modules/",
+      "/vendor/"
+    ],
+    "transform": {
+      "^.+\\.jsx?$": "babel-jest"
+    }
+  },
+  "dependencies": {
+    "@babel/core": "^7.3.4",
+    "@babel/plugin-proposal-class-properties": "^7.3.4",
+    "@babel/plugin-proposal-object-rest-spread": "^7.3.4",
+    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
+    "@babel/plugin-transform-destructuring": "^7.3.2",
+    "@babel/plugin-transform-regenerator": "^7.3.4",
+    "@babel/plugin-transform-runtime": "^7.3.4",
+    "@babel/preset-env": "^7.3.4",
+    "@babel/preset-react": "^7.0.0",
+    "@rails/webpacker": "^4.0.2",
+    "@shopify/app-bridge": "^1.2.0-0",
+    "@shopify/polaris": "^3.10.0",
+    "axios": "^0.18.0",
+    "babel-plugin-dynamic-import-node": "^2.2.0",
+    "babel-plugin-macros": "^2.5.0",
+    "bugsnag-js": "^4.7.3",
+    "bugsnag-react": "^1.1.1",
+    "kitsu-core": "^7.0.0",
+    "lodash": "^4.17.11",
+    "luxon": "^1.11.4",
+    "numeral": "^2.0.6",
+    "pluralize": "^7.0.0",
+    "postcss-flexbugs-fixes": "^4.1.0",
+    "postcss-import": "^12.0.1",
+    "postcss-preset-env": "^6.6.0",
+    "prop-types": "^15.7.2",
+    "qs": "^6.6.0",
+    "query-string": "^6.4.0",
+    "react": "^16.8.4",
+    "react-dom": "^16.6.3",
+    "react-router-dom": "^4.3.1",
+    "react-router-prop-types": "^1.0.4",
+    "regenerator": "^0.13.3",
+    "url-parse": "^1.4.4"
+  },
+  "devDependencies": {
+    "babel-eslint": "^10.0.1",
+    "babel-jest": "^24.8.0",
+    "enzyme": "^3.10.0",
+    "enzyme-adapter-react-16": "^1.14.0",
+    "eslint": "^5.15.3",
+    "eslint-config-airbnb": "^17.1.0",
+    "eslint-config-prettier": "^4.1.0",
+    "eslint-plugin-import": "^2.16.0",
+    "eslint-plugin-jest": "^22.6.4",
+    "eslint-plugin-jsx-a11y": "^6.2.1",
+    "eslint-plugin-prettier": "^3.0.1",
+    "eslint-plugin-react": "^7.12.4",
+    "jest": "^24.8.0",
+    "jest-enzyme": "^7.0.2",
+    "prettier": "^1.16.4",
+    "react-test-renderer": "^16.8.6",
+    "webpack-dev-server": "^3.2.1"
+  }
+}

data/lib/generators/disco_app/react/templates/root/postcss.config.js

@@ -0,0 +1,14 @@
+module.exports = {
+  plugins: {
+    'postcss-import': {},
+    'postcss-flexbugs-fixes': {},
+    'postcss-preset-env': [
+      {
+        autoprefixer: {
+          flexbox: 'no-2009'
+        },
+        stage: 3
+      }
+    ]
+  }
+};

data/lib/tasks/api.rake

@@ -1,10 +1,8 @@
 namespace :api do
-
   desc 'Send all subscription information to the Disco API'
   task send_subscriptions: :environment do
     DiscoApp::Shop.find_each do |shop|
       DiscoApp::SendSubscriptionJob.perform_later(shop)
     end
   end
-
 end

data/lib/tasks/carrier_service.rake

@@ -1,10 +1,8 @@
 namespace :carrier_service do
-
   desc 'Synchronise carrier service across all installed shops.'
   task sync: :environment do
     DiscoApp::Shop.installed.has_active_shopify_plan.each do |shop|
       DiscoApp::SynchroniseCarrierServiceJob.perform_later(shop)
     end
   end
-
 end

data/lib/tasks/database.rake

@@ -1,5 +1,5 @@
 namespace :database do
-  desc "update postgres sequence numbers in case database has been migrated"
+  desc 'update postgres sequence numbers in case database has been migrated'
   task update_sequences: :environment do
     ActiveRecord::Base.connection.tables.each do |t|
       ActiveRecord::Base.connection.reset_pk_sequence!(t)

data/lib/tasks/sessions.rake

@@ -1,9 +1,7 @@
 namespace :sessions do
-
   desc 'Clean out any stale sessions.'
   task clean: [:environment, 'db:load_config'] do
     threshold = (ENV['SESSIONS_CLEAN_THRESHOLD_DAYS'] || 30).to_i.days.ago
     ActiveRecord::Base.connection.execute("DELETE FROM #{ActiveRecord::SessionStore::Session.table_name} WHERE updated_at < '#{threshold}'")
   end
-
 end

data/lib/tasks/shops.rake

@@ -1,10 +1,8 @@
 namespace :shops do
-
   desc 'Synchronise shop data across all installed shops.'
   task sync: :environment do
     DiscoApp::Shop.installed.has_active_shopify_plan.each do |shop|
       DiscoApp::ShopUpdateJob.perform_later(shop)
     end
   end
-
 end

data/lib/tasks/users.rake

@@ -1,10 +1,8 @@
 namespace :users do
-
   desc 'Synchronise user data accross all installed shops'
   task sync: :environment do
     DiscoApp::Shop.installed.has_active_shopify_plan.shopify_plus.each do |shop|
       DiscoApp::SynchroniseUsersJob.perform_later(shop)
     end
   end
-
 end

data/lib/tasks/webhooks.rake

@@ -1,10 +1,8 @@
 namespace :webhooks do
-
   desc 'Synchronise webhooks across all installed shops.'
   task sync: :environment do
     DiscoApp::Shop.installed.has_active_shopify_plan.each do |shop|
       DiscoApp::SynchroniseWebhooksJob.perform_later(shop)
     end
   end
-
 end

data/test/clients/disco_app/api_client_test.rb

@@ -4,9 +4,9 @@ class ApiClientTest < ActiveSupport::TestCase
 
   def setup
     @shop = disco_app_shops(:widget_store)
-    stub_request(:post, "https://api.discolabs.com/v1/app_subscriptions.json").
-        with(body: api_fixture('subscriptions/valid_request').to_json).
-        to_return(status: 200, body: api_fixture('subscriptions/valid_request').to_json)
+    stub_request(:post, 'https://api.discolabs.com/v1/app_subscriptions.json')
+      .with(body: api_fixture('subscriptions/valid_request').to_json)
+      .to_return(status: 200, body: api_fixture('subscriptions/valid_request').to_json)
   end
 
   def teardown

data/test/controllers/disco_app/admin/shops_controller_test.rb

@@ -1,6 +1,7 @@
 require 'test_helper'
 
 class DiscoApp::Admin::ShopsControllerTest < ActionController::TestCase
+
   include ActiveJob::TestHelper
 
   def setup

data/test/controllers/disco_app/charges_controller_test.rb

@@ -1,6 +1,7 @@
 require 'test_helper'
 
 class DiscoApp::ChargesControllerTest < ActionController::TestCase
+
   include ActiveJob::TestHelper
   include DiscoApp::Test::ShopifyAPI
 
@@ -43,15 +44,13 @@ class DiscoApp::ChargesControllerTest < ActionController::TestCase
   end
 
   test 'user with unpaid current subscription can create new charge and is redirected to confirmation url' do
-    res = { "recurring_application_charge": { "name": "Basic",
-                    "price": "9.99",
-                    "trial_days": 14,
-                    "return_url": /^https:\/\/test\.example\.com\/subscriptions\/304261385\/charges\/53297050(1|2)\/activate$/,
-                    "test": true
-      } }
+    res = { "recurring_application_charge": { "name": 'Basic',
+                                              "price": '9.99',
+                                              "trial_days": 14,
+                                              "return_url": %r{^https://test\.example\.com/subscriptions/304261385/charges/53297050(1|2)/activate$},
+                                              "test": true } }
     stub_request(:post, "#{@shop.admin_url}/recurring_application_charges.json")
-      .with(body: res
-    ).to_return(status: 201, body:api_fixture("widget_store/charges/create_second_recurring_application_charge_response").to_json)
+      .with(body: res).to_return(status: 201, body: api_fixture('widget_store/charges/create_second_recurring_application_charge_response').to_json)
 
     @current_subscription.active_charge.destroy
     post :create, params: { subscription_id: @current_subscription }

data/test/controllers/disco_app/install_controller_test.rb

@@ -1,6 +1,7 @@
 require 'test_helper'
 
 class DiscoApp::InstallControllerTest < ActionController::TestCase
+
   include ActiveJob::TestHelper
 
   def setup
@@ -23,7 +24,7 @@ class DiscoApp::InstallControllerTest < ActionController::TestCase
 
   test 'logged-in and installed user is redirected to installing url for install/uninstalling actions' do
     @shop.installed!
-    [:install, :uninstalling].each do |action|
+    [:install, :uninstalling].each do |_action|
       get(:install)
       assert_redirected_to :installing
     end

data/test/controllers/disco_app/subscriptions_controller_test.rb

@@ -1,6 +1,7 @@
 require 'test_helper'
 
 class DiscoApp::SubscriptionsControllerTest < ActionController::TestCase
+
   include ActiveJob::TestHelper
 
   def setup

data/test/controllers/disco_app/webhooks_controller_test.rb

@@ -1,6 +1,7 @@
 require 'test_helper'
 
 class DiscoApp::WebhooksControllerTest < ActionController::TestCase
+
   include ActiveJob::TestHelper
 
   def setup

data/test/controllers/home_controller_test.rb

@@ -94,7 +94,7 @@ class HomeControllerTest < ActionController::TestCase
     Timecop.freeze('2017-03-08 12:44:58 +1100') do
       hmac = 'eb49ba93a8daf8a11a04c66129faf98de1cd40f082b0ae78e79a2dfbbefb438d'
       get :index, params: { hmac: hmac, shop: 'widgets-dev.myshopify.com', timestamp: Time.now.to_i }
-      assert_response  :success
+      assert_response :success
     end
   end
 

data/test/disco_app_test.rb

@@ -1,7 +1,9 @@
 require 'test_helper'
 
 class DiscoAppTest < ActiveSupport::TestCase
-  test "truth" do
+
+  test 'truth' do
     assert_kind_of Module, DiscoApp
   end
+
 end

data/test/dummy/Rakefile

@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require File.expand_path('config/application', __dir__)
 
 Rails.application.load_tasks

data/test/dummy/app/controllers/application_controller.rb

@@ -1,6 +1,8 @@
 class ApplicationController < ActionController::Base
+
   include ShopifyApp::LoginProtection
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
+
 end

data/test/dummy/app/controllers/carrier_request_controller.rb

@@ -1,4 +1,5 @@
 class CarrierRequestController < ActionController::Base
+
   include DiscoApp::Concerns::CarrierRequestController
 
   def rates

data/test/dummy/app/controllers/disco_app/admin/shops_controller.rb

@@ -1,4 +1,5 @@
 class DiscoApp::Admin::ShopsController < DiscoApp::Admin::ApplicationController
+
   include DiscoApp::Admin::Concerns::ShopsController
 
   def index

data/test/dummy/app/controllers/home_controller.rb

@@ -1,4 +1,5 @@
 class HomeController < ApplicationController
+
   include DiscoApp::Concerns::AuthenticatedController
 
   def index

data/test/dummy/app/controllers/proxy_controller.rb

@@ -1,4 +1,5 @@
 class ProxyController < ActionController::Base
+
   include DiscoApp::Concerns::AppProxyController
 
   def index

data/test/dummy/app/jobs/disco_app/app_installed_job.rb

@@ -1,4 +1,5 @@
 class DiscoApp::AppInstalledJob < DiscoApp::ShopJob
+
   include DiscoApp::Concerns::AppInstalledJob
 
   DEVELOPMENT_PLAN_ID = 1
@@ -7,9 +8,7 @@ class DiscoApp::AppInstalledJob < DiscoApp::ShopJob
   # on their status.
   def default_plan
     @default_plan ||= begin
-      if @shop.plan_name === 'affiliate'
-        DiscoApp::Plan.find(DEVELOPMENT_PLAN_ID)
-      end
+      DiscoApp::Plan.find(DEVELOPMENT_PLAN_ID) if @shop.plan_name === 'affiliate'
     end
   end
 

data/test/dummy/app/jobs/disco_app/app_uninstalled_job.rb

@@ -1,4 +1,5 @@
 class DiscoApp::AppUninstalledJob < DiscoApp::ShopJob
+
   include DiscoApp::Concerns::AppUninstalledJob
 
   # Extend the perform method to change the country name of the shop to

data/test/dummy/app/models/application_record.rb

@@ -1,3 +1,5 @@
 class ApplicationRecord < ActiveRecord::Base
+
   self.abstract_class = true
+
 end

data/test/dummy/app/models/cart.rb

@@ -1,13 +1,14 @@
 class Cart < ApplicationRecord
-  include DiscoApp::Concerns::Synchronises
 
-  belongs_to :shop, class_name: 'DiscoApp::Shop'
+  include DiscoApp::Concerns::Synchronises
 
   SHOPIFY_API_CLASS = ShopifyAPI::Cart
 
+  belongs_to :shop, class_name: 'DiscoApp::Shop'
+
   before_save :set_token
 
-  def self.synchronise_by(shop, data)
+  def self.synchronise_by(_shop, data)
     { token: data[:token] }
   end
 

data/test/dummy/app/models/disco_app/shop.rb

@@ -1,6 +1,7 @@
 require 'active_utils'
 
 class DiscoApp::Shop < ApplicationRecord
+
   include DiscoApp::Concerns::Shop
 
   has_one :js_configuration
@@ -10,11 +11,9 @@ class DiscoApp::Shop < ApplicationRecord
 
   # Extend the Shop model to return the Shop's country as an ActiveUtils country.
   def country
-    begin
-      ActiveUtils::Country.find(data[:country_name])
-    rescue ActiveUtils::InvalidCountryCodeError
-      nil
-    end
+    ActiveUtils::Country.find(data[:country_name])
+  rescue ActiveUtils::InvalidCountryCodeError
+    nil
   end
 
 end

data/test/dummy/app/models/js_configuration.rb

@@ -1,4 +1,5 @@
 class JsConfiguration < ApplicationRecord
+
   include DiscoApp::Concerns::RendersAssets
 
   belongs_to :shop, class_name: 'DiscoApp::Shop'

data/test/dummy/app/models/product.rb

@@ -1,9 +1,10 @@
 class Product < ApplicationRecord
+
   include DiscoApp::Concerns::Synchronises
+
   include DiscoApp::Concerns::HasMetafields
+  SHOPIFY_API_CLASS = ShopifyAPI::Product
 
   belongs_to :shop, class_name: 'DiscoApp::Shop'
 
-  SHOPIFY_API_CLASS = ShopifyAPI::Product
-
 end

data/test/dummy/app/models/widget_configuration.rb

@@ -1,4 +1,5 @@
 class WidgetConfiguration < ApplicationRecord
+
   include DiscoApp::Concerns::RendersAssets
 
   belongs_to :shop, class_name: 'DiscoApp::Shop'

data/test/dummy/bin/bundle

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 load Gem.bin_path('bundler', 'bundle')

data/test/dummy/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/test/dummy/bin/setup

@@ -2,15 +2,15 @@
 require 'pathname'
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+APP_ROOT = Pathname.new File.expand_path('..', __dir__)
 
 Dir.chdir APP_ROOT do
   # This script is a starting point to setup your application.
   # Add necessary setup steps to this file:
 
-  puts "== Installing dependencies =="
-  system "gem install bundler --conservative"
-  system "bundle check || bundle install"
+  puts '== Installing dependencies =='
+  system 'gem install bundler --conservative'
+  system 'bundle check || bundle install'
 
   # puts "\n== Copying sample files =="
   # unless File.exist?("config/database.yml")
@@ -18,12 +18,12 @@ Dir.chdir APP_ROOT do
   # end
 
   puts "\n== Preparing database =="
-  system "bin/rake db:setup"
+  system 'bin/rake db:setup'
 
   puts "\n== Removing old logs and tempfiles =="
-  system "rm -f log/*"
-  system "rm -rf tmp/cache"
+  system 'rm -f log/*'
+  system 'rm -rf tmp/cache'
 
   puts "\n== Restarting application server =="
-  system "touch tmp/restart.txt"
+  system 'touch tmp/restart.txt'
 end

data/test/dummy/config/application.rb

@@ -1,12 +1,13 @@
-require File.expand_path('../boot', __FILE__)
+require File.expand_path('boot', __dir__)
 
 require 'rails/all'
 
 Bundler.require(*Rails.groups)
-require "disco_app"
+require 'disco_app'
 
 module Dummy
   class Application < Rails::Application
+
     config.action_dispatch.default_headers['P3P'] = 'CP="Not used"'
     config.action_dispatch.default_headers.delete('X-Frame-Options')
     # Settings in config/environments/* take precedence over those specified here.
@@ -30,6 +31,6 @@ module Dummy
 
     # Explicitly prevent real charges being created by default
     config.x.shopify_charges_real = false
+
   end
 end
-

data/test/dummy/config/boot.rb

@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__)
 
 require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../../lib', __dir__)

data/test/dummy/config/database.yml

@@ -17,5 +17,8 @@ test:
   port: 5432
   database: disco_app_test
 
+staging:
+  <<: *default
+
 production:
   <<: *default

data/test/dummy/config/environment.rb

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require File.expand_path('application', __dir__)
 
 # Initialize the Rails application.
 Rails.application.initialize!