disco_app 0.15.2 → 0.18.1

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/babel.config.js

@@ -0,0 +1,72 @@
+module.exports = function(api) {
+  var validEnv = ['development', 'test', 'production']
+  var currentEnv = api.env()
+  var isDevelopmentEnv = api.env('development')
+  var isProductionEnv = api.env('production')
+  var 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 && [
+        require('@babel/preset-env').default,
+        {
+          targets: {
+            node: 'current'
+          }
+        }
+      ],
+      (isProductionEnv || isDevelopmentEnv) && [
+        require('@babel/preset-env').default,
+        {
+          forceAllTransforms: true,
+          useBuiltIns: 'entry',
+          corejs: 3,
+          modules: false,
+          exclude: ['transform-typeof-symbol']
+        }
+      ]
+    ].filter(Boolean),
+    plugins: [
+      require('babel-plugin-macros'),
+      require('@babel/plugin-syntax-dynamic-import').default,
+      isTestEnv && require('babel-plugin-dynamic-import-node'),
+      require('@babel/plugin-transform-destructuring').default,
+      [
+        require('@babel/plugin-proposal-class-properties').default,
+        {
+          loose: true
+        }
+      ],
+      [
+        require('@babel/plugin-proposal-object-rest-spread').default,
+        {
+          useBuiltIns: true
+        }
+      ],
+      [
+        require('@babel/plugin-transform-runtime').default,
+        {
+          helpers: false,
+          regenerator: true,
+          corejs: false
+        }
+      ],
+      [
+        require('@babel/plugin-transform-regenerator').default,
+        {
+          async: false
+        }
+      ]
+    ].filter(Boolean)
+  }
+}

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/bin/webpack

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
+ENV["NODE_ENV"]  ||= "development"
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+require "webpacker"
+require "webpacker/webpack_runner"
+
+APP_ROOT = File.expand_path("..", __dir__)
+Dir.chdir(APP_ROOT) do
+  Webpacker::WebpackRunner.run(ARGV)
+end

data/test/dummy/bin/webpack-dev-server

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
+ENV["NODE_ENV"]  ||= "development"
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+require "webpacker"
+require "webpacker/dev_server_runner"
+
+APP_ROOT = File.expand_path("..", __dir__)
+Dir.chdir(APP_ROOT) do
+  Webpacker::DevServerRunner.run(ARGV)
+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!

data/test/dummy/config/environments/staging.rb

@@ -0,0 +1,85 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # Use Sidekiq as the active job backend
+  config.active_job.queue_adapter = :sidekiq
+
+  # Allow real charges in staging with an ENV variable
+  config.x.shopify_charges_real = ENV['SHOPIFY_CHARGES_REAL'] == 'true'
+
+  # Code is not reloaded between requests.
+  config.cache_classes = true
+
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like
+  # NGINX, varnish or squid.
+  # config.action_dispatch.rack_cache = true
+
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
+
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  config.assets.css_compressor = :sass
+
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
+  config.assets.compile = false
+
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
+
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
+
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  config.force_ssl = true
+
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
+  config.log_level = :debug
+
+  # Prepend all log lines with the following tags.
+  # config.log_tags = [ :subdomain, :uuid ]
+
+  # Use a different logger for distributed setups.
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+
+  # Use a different cache store in staging.
+  # config.cache_store = :mem_cache_store
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
+
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation cannot be found).
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners.
+  config.active_support.deprecation = :notify
+
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
+end

data/test/dummy/config/initializers/disco_app.rb

@@ -6,7 +6,14 @@ DiscoApp.configure do |config|
 
   # Set a list of webhook topics to listen for.
   # See https://help.shopify.com/api/reference/webhook.
-  config.webhook_topics = [:'orders/create', :'orders/paid', :'carts/create', :'carts/update']
+  config.webhook_topics = %i[orders/create orders/paid carts/create carts/update]
+
+  # By default, webhooks request all fields to be provided in the payload.
+  # You can override this behaviour by providing an entry in this hash with the
+  # key set to a webhook topic and the value set to an array of fields.
+  config.webhook_fields = {
+    'orders/paid': [:id]
+  }
 
   # Set the below if using an application proxy.
   config.app_proxy_prefix = ENV['SHOPIFY_APP_PROXY_PREFIX']

data/test/dummy/config/initializers/omniauth.rb

@@ -1,7 +1,6 @@
 Rails.application.config.middleware.use OmniAuth::Builder do
   provider :shopify,
-    ShopifyApp.configuration.api_key,
-    ShopifyApp.configuration.secret,
-
-    :scope => ShopifyApp.configuration.scope
+           ShopifyApp.configuration.api_key,
+           ShopifyApp.configuration.secret,
+           scope: ShopifyApp.configuration.scope
 end

data/test/dummy/config/initializers/session_store.rb

@@ -1,2 +1,2 @@
 # Use an ActiveRecord-based session store.
-Rails.application.config.session_store :active_record_store, :key => '_disco_app_session'
+Rails.application.config.session_store :active_record_store, key: '_disco_app_session'

data/test/dummy/config/initializers/shopify_app.rb

@@ -3,4 +3,5 @@ ShopifyApp.configure do |config|
   config.secret = ENV['SHOPIFY_APP_SECRET']
   config.scope = ENV['SHOPIFY_APP_SCOPE']
   config.embedded_app = true
+  config.api_version = ENV.fetch('SHOPIFY_APP_API_VERSION', '2019-10')
 end

data/test/dummy/config/routes.rb

@@ -1,5 +1,4 @@
 Rails.application.routes.draw do
-
   root to: 'home#index'
 
   get '/proxy', to: 'proxy#index'
@@ -7,5 +6,4 @@ Rails.application.routes.draw do
 
   mount ShopifyApp::Engine, at: '/'
   mount DiscoApp::Engine, at: '/'
-
 end

data/test/dummy/config/secrets.yml

@@ -18,5 +18,8 @@ test:
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.
+staging:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
+
 production:
   secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>

data/test/dummy/config/webpack/development.js

@@ -0,0 +1,5 @@
+process.env.NODE_ENV = process.env.NODE_ENV || 'development'
+
+const environment = require('./environment')
+
+module.exports = environment.toWebpackConfig()

data/test/dummy/config/webpack/environment.js

@@ -0,0 +1,3 @@
+const { environment } = require('@rails/webpacker')
+
+module.exports = environment

data/test/dummy/config/webpack/production.js

@@ -0,0 +1,5 @@
+process.env.NODE_ENV = process.env.NODE_ENV || 'production'
+
+const environment = require('./environment')
+
+module.exports = environment.toWebpackConfig()

data/test/dummy/config/webpack/test.js

@@ -0,0 +1,5 @@
+process.env.NODE_ENV = process.env.NODE_ENV || 'development'
+
+const environment = require('./environment')
+
+module.exports = environment.toWebpackConfig()

data/test/dummy/config/webpacker.yml

@@ -0,0 +1,95 @@
+# Note: You must restart bin/webpack-dev-server for changes to take effect
+
+default: &default
+  source_path: app/javascript
+  source_entry_path: packs
+  public_root_path: public
+  public_output_path: packs
+  cache_path: tmp/cache/webpacker
+  check_yarn_integrity: false
+  webpack_compile_output: false
+
+  # Additional paths webpack should lookup modules
+  # ['app/assets', 'engine/foo/app/assets']
+  resolved_paths: []
+
+  # Reload manifest.json on all requests so we reload latest compiled packs
+  cache_manifest: false
+
+  # Extract and emit a css file
+  extract_css: false
+
+  static_assets_extensions:
+    - .jpg
+    - .jpeg
+    - .png
+    - .gif
+    - .tiff
+    - .ico
+    - .svg
+    - .eot
+    - .otf
+    - .ttf
+    - .woff
+    - .woff2
+
+  extensions:
+    - .mjs
+    - .js
+    - .sass
+    - .scss
+    - .css
+    - .module.sass
+    - .module.scss
+    - .module.css
+    - .png
+    - .svg
+    - .gif
+    - .jpeg
+    - .jpg
+
+development:
+  <<: *default
+  compile: true
+
+  # Verifies that correct packages and versions are installed by inspecting package.json, yarn.lock, and node_modules
+  check_yarn_integrity: true
+
+  # Reference: https://webpack.js.org/configuration/dev-server/
+  dev_server:
+    https: false
+    host: localhost
+    port: 3035
+    public: localhost:3035
+    hmr: false
+    # Inline should be set to true if using HMR
+    inline: true
+    overlay: true
+    compress: true
+    disable_host_check: true
+    use_local_ip: false
+    quiet: false
+    headers:
+      'Access-Control-Allow-Origin': '*'
+    watch_options:
+      ignored: '**/node_modules/**'
+
+
+test:
+  <<: *default
+  compile: true
+
+  # Compile test packs to a separate directory
+  public_output_path: packs-test
+
+production:
+  <<: *default
+
+  # Production depends on precompilation of packs prior to booting for performance.
+  compile: false
+
+  # Extract and emit a css file
+  extract_css: true
+
+  # Cache manifest.json for performance
+  cache_manifest: true

data/test/dummy/db/migrate/20160307182229_create_products.rb

@@ -1,5 +1,6 @@
 class CreateProducts < ActiveRecord::Migration[4.2]
-def change
+
+  def change
     create_table :products do |t|
       t.integer :shop_id, limit: 8
       t.jsonb :data
@@ -8,4 +9,5 @@ def change
     end
     add_foreign_key :products, :disco_app_shops, column: :shop_id
   end
+
 end

data/test/dummy/db/migrate/20160530160739_create_asset_models.rb

@@ -1,5 +1,6 @@
 class CreateAssetModels < ActiveRecord::Migration[4.2]
-def change
+
+  def change
     create_table :js_configurations do |t|
       t.integer :shop_id, limit: 8
       t.string :label, default: 'Default'
@@ -16,4 +17,5 @@ def change
     add_foreign_key :js_configurations, :disco_app_shops, column: :shop_id
     add_foreign_key :widget_configurations, :disco_app_shops, column: :shop_id
   end
+
 end

data/test/dummy/db/migrate/20161105054746_create_carts.rb

@@ -1,6 +1,6 @@
 class CreateCarts < ActiveRecord::Migration[4.2]
 
-def change
+  def change
     create_table :carts do |t|
       t.integer :shop_id, limit: 8
       t.string :token
@@ -11,4 +11,5 @@ def change
     add_foreign_key :carts, :disco_app_shops, column: :shop_id
     add_index :carts, :token, unique: true
   end
+
 end

data/test/dummy/db/schema.rb

@@ -2,15 +2,15 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `rails
+# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170606160751) do
+ActiveRecord::Schema.define(version: 2020_04_05_000000) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -39,6 +39,42 @@ ActiveRecord::Schema.define(version: 20170606160751) do
     t.string "confirmation_url"
   end
 
+  create_table "disco_app_flow_actions", force: :cascade do |t|
+    t.bigint "shop_id"
+    t.string "action_id"
+    t.string "action_run_id"
+    t.jsonb "properties", default: {}
+    t.integer "status", default: 0
+    t.datetime "processed_at"
+    t.jsonb "processing_errors", default: []
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["action_run_id"], name: "index_disco_app_flow_actions_on_action_run_id", unique: true
+  end
+
+  create_table "disco_app_flow_trigger_usages", force: :cascade do |t|
+    t.bigint "shop_id"
+    t.string "flow_trigger_definition_id"
+    t.boolean "has_enabled_flow", default: true
+    t.datetime "timestamp"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["shop_id", "flow_trigger_definition_id"], name: "index_disco_app_flow_actions_on_shop_id_and_trigger_id", unique: true
+  end
+
+  create_table "disco_app_flow_triggers", force: :cascade do |t|
+    t.bigint "shop_id"
+    t.string "title"
+    t.string "resource_name"
+    t.string "resource_url"
+    t.jsonb "properties", default: {}
+    t.integer "status", default: 0
+    t.datetime "processed_at"
+    t.jsonb "processing_errors", default: []
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "disco_app_plan_codes", force: :cascade do |t|
     t.bigint "plan_id"
     t.string "code"
@@ -154,6 +190,9 @@ ActiveRecord::Schema.define(version: 20170606160751) do
   add_foreign_key "carts", "disco_app_shops", column: "shop_id"
   add_foreign_key "disco_app_application_charges", "disco_app_shops", column: "shop_id"
   add_foreign_key "disco_app_application_charges", "disco_app_subscriptions", column: "subscription_id"
+  add_foreign_key "disco_app_flow_actions", "disco_app_shops", column: "shop_id", on_delete: :cascade
+  add_foreign_key "disco_app_flow_trigger_usages", "disco_app_shops", column: "shop_id", on_delete: :cascade
+  add_foreign_key "disco_app_flow_triggers", "disco_app_shops", column: "shop_id", on_delete: :cascade
   add_foreign_key "disco_app_plan_codes", "disco_app_plans", column: "plan_id"
   add_foreign_key "disco_app_recurring_application_charges", "disco_app_shops", column: "shop_id"
   add_foreign_key "disco_app_recurring_application_charges", "disco_app_subscriptions", column: "subscription_id"

data/test/dummy/package.json

@@ -0,0 +1,8 @@
+{
+  "dependencies": {
+    "@rails/webpacker": "^4.0.7"
+  },
+  "devDependencies": {
+    "webpack-dev-server": "^3.9.0"
+  }
+}

data/test/dummy/postcss.config.js

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