disco_app 0.15.0 → 0.16.1.pre.sidekiq.pre.6.pre.release

data/db/migrate/20150525000000_create_shops_if_not_existent.rb

@@ -6,105 +6,105 @@ class CreateShopsIfNotExistent < ActiveRecord::Migration[5.1]
   def change
     return if table_exists? :disco_app_shops
 
-    create_table "disco_app_app_settings", force: :cascade do |t|
-      t.datetime "created_at", null: false
-      t.datetime "updated_at", null: false
+    create_table :disco_app_app_settings, force: :cascade do |t|
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
     end
 
-    create_table "disco_app_application_charges", force: :cascade do |t|
-      t.integer  "shop_id",          limit: 8
-      t.integer  "subscription_id",  limit: 8
-      t.integer  "status",                     default: 0
-      t.datetime "created_at",                             null: false
-      t.datetime "updated_at",                             null: false
-      t.integer  "shopify_id",       limit: 8
-      t.string   "confirmation_url"
+    create_table :disco_app_application_charges, force: :cascade do |t|
+      t.integer :shop_id, limit: 8
+      t.integer :subscription_id, limit: 8
+      t.integer :status, default: 0
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.integer :shopify_id, limit: 8
+      t.string :confirmation_url
     end
 
-    create_table "disco_app_plan_codes", force: :cascade do |t|
-      t.integer  "plan_id",           limit: 8
-      t.string   "code"
-      t.integer  "trial_period_days"
-      t.integer  "amount"
-      t.datetime "created_at",                              null: false
-      t.datetime "updated_at",                              null: false
-      t.integer  "status",                      default: 0
+    create_table :disco_app_plan_codes, force: :cascade do |t|
+      t.integer :plan_id, limit: 8
+      t.string :code
+      t.integer :trial_period_days
+      t.integer :amount
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.integer :status, default: 0
     end
 
-    create_table "disco_app_plans", force: :cascade do |t|
-      t.integer  "status",            default: 0
-      t.string   "name"
-      t.integer  "plan_type",         default: 0
-      t.integer  "trial_period_days"
-      t.datetime "created_at",                        null: false
-      t.datetime "updated_at",                        null: false
-      t.integer  "amount",            default: 0
-      t.string   "currency",          default: "USD"
-      t.integer  "interval",          default: 0
-      t.integer  "interval_count",    default: 1
+    create_table :disco_app_plans, force: :cascade do |t|
+      t.integer :status, default: 0
+      t.string :name
+      t.integer :plan_type, default: 0
+      t.integer :trial_period_days
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.integer :amount, default: 0
+      t.string :currency, default: 'USD'
+      t.integer :interval, default: 0
+      t.integer :interval_count, default: 1
     end
 
-    create_table "disco_app_recurring_application_charges", force: :cascade do |t|
-      t.integer  "shop_id",          limit: 8
-      t.integer  "subscription_id",  limit: 8
-      t.integer  "status",                     default: 0
-      t.datetime "created_at",                             null: false
-      t.datetime "updated_at",                             null: false
-      t.integer  "shopify_id",       limit: 8
-      t.string   "confirmation_url"
+    create_table :disco_app_recurring_application_charges, force: :cascade do |t|
+      t.integer :shop_id, limit: 8
+      t.integer :subscription_id, limit: 8
+      t.integer :status, default: 0
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.integer :shopify_id, limit: 8
+      t.string :confirmation_url
     end
 
-    create_table "disco_app_sessions", force: :cascade do |t|
-      t.string   "session_id", null: false
-      t.text     "data"
-      t.datetime "created_at", null: false
-      t.datetime "updated_at", null: false
-      t.integer  "shop_id"
+    create_table :disco_app_sessions, force: :cascade do |t|
+      t.string :session_id, null: false
+      t.text :data
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.integer :shop_id
     end
 
-    add_index "disco_app_sessions", ["session_id"], name: "index_disco_app_sessions_on_session_id", unique: true, using: :btree
-    add_index "disco_app_sessions", ["updated_at"], name: "index_disco_app_sessions_on_updated_at", using: :btree
+    add_index :disco_app_sessions, [:session_id], name: 'index_disco_app_sessions_on_session_id', unique: true, using: :btree
+    add_index :disco_app_sessions, [:updated_at], name: 'index_disco_app_sessions_on_updated_at', using: :btree
 
-    create_table "disco_app_shops", force: :cascade do |t|
-      t.string   "shopify_domain",              null: false
-      t.string   "shopify_token",               null: false
-      t.datetime "created_at",                  null: false
-      t.datetime "updated_at",                  null: false
-      t.integer  "status",         default: 0
-      t.string   "domain"
-      t.string   "plan_name"
-      t.string   "name"
-      t.jsonb    "data",           default: {}
+    create_table :disco_app_shops, force: :cascade do |t|
+      t.string :shopify_domain, null: false
+      t.string :shopify_token, null: false
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.integer :status, default: 0
+      t.string :domain
+      t.string :plan_name
+      t.string :name
+      t.jsonb :data, default: {}
     end
 
-    add_index "disco_app_shops", ["shopify_domain"], name: "index_disco_app_shops_on_shopify_domain", unique: true, using: :btree
+    add_index :disco_app_shops, [:shopify_domain], name: 'index_disco_app_shops_on_shopify_domain', unique: true, using: :btree
 
-    create_table "disco_app_subscriptions", force: :cascade do |t|
-      t.integer  "shop_id"
-      t.integer  "plan_id"
-      t.integer  "status"
-      t.integer  "subscription_type"
-      t.datetime "created_at",                              null: false
-      t.datetime "updated_at",                              null: false
-      t.datetime "trial_start_at"
-      t.datetime "trial_end_at"
-      t.datetime "cancelled_at"
-      t.integer  "amount",                      default: 0
-      t.integer  "plan_code_id",      limit: 8
-      t.string   "source"
-      t.integer  "trial_period_days"
+    create_table :disco_app_subscriptions, force: :cascade do |t|
+      t.integer :shop_id
+      t.integer :plan_id
+      t.integer :status
+      t.integer :subscription_type
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.datetime :trial_start_at
+      t.datetime :trial_end_at
+      t.datetime :cancelled_at
+      t.integer :amount, default: 0
+      t.integer :plan_code_id, limit: 8
+      t.string :source
+      t.integer :trial_period_days
     end
 
-    add_index "disco_app_subscriptions", ["plan_id"], name: "index_disco_app_subscriptions_on_plan_id", using: :btree
-    add_index "disco_app_subscriptions", ["shop_id"], name: "index_disco_app_subscriptions_on_shop_id", using: :btree
+    add_index :disco_app_subscriptions, [:plan_id], name: 'index_disco_app_subscriptions_on_plan_id', using: :btree
+    add_index :disco_app_subscriptions, [:shop_id], name: 'index_disco_app_subscriptions_on_shop_id', using: :btree
 
-    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_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"
-    add_foreign_key "disco_app_sessions", "disco_app_shops", column: "shop_id", on_delete: :cascade
-    add_foreign_key "disco_app_subscriptions", "disco_app_plan_codes", column: "plan_code_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_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
+    add_foreign_key :disco_app_sessions, :disco_app_shops, column: :shop_id, on_delete: :cascade
+    add_foreign_key :disco_app_subscriptions, :disco_app_plan_codes, column: :plan_code_id
   end
 
 end

data/db/migrate/20170315062548_create_disco_app_sources.rb

@@ -1,4 +1,5 @@
 class CreateDiscoAppSources < ActiveRecord::Migration[5.1]
+
   def change
     create_table :disco_app_sources do |t|
       t.string :source, null: true
@@ -7,4 +8,5 @@ class CreateDiscoAppSources < ActiveRecord::Migration[5.1]
     end
     add_index :disco_app_sources, :source
   end
+
 end

data/db/migrate/20170315062629_add_sources_to_shop_subscriptions.rb

@@ -1,4 +1,5 @@
 class AddSourcesToShopSubscriptions < ActiveRecord::Migration[5.1]
+
   def change
     add_column :disco_app_subscriptions, :source_id, :integer, limit: 8, index: true
     add_foreign_key :disco_app_subscriptions, :disco_app_sources, column: :source_id
@@ -11,4 +12,5 @@ class AddSourcesToShopSubscriptions < ActiveRecord::Migration[5.1]
 
     remove_column :disco_app_subscriptions, :source
   end
+
 end

data/db/migrate/20170327214540_create_disco_app_users.rb

@@ -1,13 +1,14 @@
 class CreateDiscoAppUsers < ActiveRecord::Migration[5.1]
+
   def change
     create_table :disco_app_users do |t|
       t.integer :shop_id, limit: 8
       t.string :first_name
       t.string :last_name
       t.string :email
-
       t.timestamps null: false
     end
     add_index :disco_app_users, :shop_id, unique: true
   end
+
 end

data/db/migrate/20170606160751_fix_disco_app_users_index.rb

@@ -1,6 +1,8 @@
 class FixDiscoAppUsersIndex < ActiveRecord::Migration[5.1]
+
   def change
     remove_index :disco_app_users, :shop_id
     add_index :disco_app_users, [:id, :shop_id], unique: true
   end
+
 end

data/db/migrate/20181229100327_create_flow_actions_and_triggers.rb

@@ -0,0 +1,32 @@
+class CreateFlowActionsAndTriggers < ActiveRecord::Migration[5.2]
+
+  def change
+    create_table :disco_app_flow_actions do |t|
+      t.integer :shop_id, limit: 8
+      t.string :action_id
+      t.string :action_run_id
+      t.jsonb :properties, default: {}
+      t.integer :status, default: 0
+      t.datetime :processed_at, null: true
+      t.jsonb :processing_errors, default: []
+      t.timestamps null: false
+    end
+
+    create_table :disco_app_flow_triggers do |t|
+      t.integer :shop_id, limit: 8
+      t.string :title
+      t.string :resource_name
+      t.string :resource_url
+      t.jsonb :properties, default: {}
+      t.integer :status, default: 0
+      t.datetime :processed_at, null: true
+      t.jsonb :processing_errors, default: []
+      t.timestamps null: false
+    end
+
+    add_foreign_key :disco_app_flow_actions, :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_index :disco_app_flow_actions, :action_run_id, unique: true
+  end
+
+end

data/lib/disco_app/configuration.rb

@@ -8,6 +8,10 @@ module DiscoApp
     # Set the list of Shopify webhook topics to register.
     attr_accessor :webhook_topics
 
+    # Set Flow configuration
+    attr_accessor :flow_actions
+    attr_accessor :flow_triggers
+
     # Set the below if using an application proxy.
     attr_accessor :app_proxy_prefix
 

data/lib/disco_app/version.rb

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = '0.15.0'
+  VERSION = '0.16.1-sidekiq-6-release'
 end

data/lib/generators/disco_app/disco_app_generator.rb

@@ -31,6 +31,7 @@ class DiscoAppGenerator < Rails::Generators::Base
 
     # Add gem requirements.
     gem 'active_link_to'
+    gem 'activeresource'
     gem 'acts_as_singleton'
     gem 'classnames-rails'
     gem 'newrelic_rpm'
@@ -40,13 +41,12 @@ class DiscoAppGenerator < Rails::Generators::Base
     gem 'premailer-rails'
     gem 'react-rails'
     gem 'render_anywhere'
-    gem 'rollbar'
+    gem 'appsignal'
     gem 'shopify_app'
     gem 'sidekiq'
-    gem 'activeresource'
 
-    # Indicate which gems should only be used in production.
-    gem_group :production do
+    # Indicate which gems should only be used in staging and production.
+    gem_group :staging, :production do
       gem 'mailgun_rails'
       gem 'rails_12factor'
     end
@@ -54,9 +54,9 @@ class DiscoAppGenerator < Rails::Generators::Base
     # Indicate which gems should only be used in development and test.
     gem_group :development, :test do
       gem 'dotenv-rails'
+      gem 'mechanize'
       gem 'minitest-reporters'
       gem 'webmock'
-      gem 'mechanize'
     end
   end
 
@@ -65,6 +65,10 @@ class DiscoAppGenerator < Rails::Generators::Base
     template 'config/database.yml.tt'
   end
 
+  def update_cable_config
+    template 'config/cable.yml.tt'
+  end
+
   # Run bundle install to add our new gems before running tasks.
   def bundle_install
     Bundler.with_clean_env do
@@ -72,6 +76,10 @@ class DiscoAppGenerator < Rails::Generators::Base
     end
   end
 
+  def support_staging_environment
+    copy_file 'config/environments/staging.rb', 'config/environments/staging.rb'
+  end
+
   # Make any required adjustments to the application configuration.
   def configure_application
     # The force_ssl flag is commented by default for production.
@@ -109,15 +117,23 @@ class DiscoAppGenerator < Rails::Generators::Base
     application "config.active_job.queue_adapter = :sidekiq\n", env: :production
     application "# Use Sidekiq as the active job backend", env: :production
 
+    # Set Sidekiq as the queue adapter in staging.
+    application "config.active_job.queue_adapter = :sidekiq\n", env: :staging
+    application "# Use Sidekiq as the active job backend", env: :staging
+
     # Ensure the application configuration uses the DEFAULT_HOST environment
     # variable to set up support for reverse routing absolute URLS (needed when
     # generating Webhook URLs for example).
     application "routes.default_url_options[:host] = ENV['DEFAULT_HOST']\n"
     application "# Set the default host for absolute URL routing purposes"
 
-    # Configure React in development and production.
+    # Configure React in development, staging, and production.
     application "config.react.variant = :development", env: :development
     application "# Use development variant of React in development.", env: :development
+
+    application "config.react.variant = :production", env: :staging
+    application "# Use production variant of React in staging.", env: :staging
+
     application "config.react.variant = :production", env: :production
     application "# Use production variant of React in production.", env: :production
 
@@ -137,13 +153,13 @@ class DiscoAppGenerator < Rails::Generators::Base
         end
     CONFIG
     application configuration, env: :production
+    application configuration, env: :staging
 
     # Monitoring configuration
-    copy_file 'initializers/rollbar.rb', 'config/initializers/rollbar.rb'
+    copy_file 'config/appsignal.yml', 'config/appsignal.yml'
     copy_file 'config/newrelic.yml', 'config/newrelic.yml'
   end
 
-
   # Add entries to .env and .env.local
   def add_env_variables
     configuration = <<-CONFIG.strip_heredoc

data/lib/generators/disco_app/templates/config/appsignal.yml

@@ -0,0 +1,12 @@
+default: &defaults
+  name: <%= ENV['SHOPIFY_APP_NAME'] || 'Unknown App' %>
+  push_api_key: <%= ENV['APPSIGNAL_PUSH_API_KEY'] %>
+  development:
+    <<: *defaults
+    active: false
+  staging:
+    <<: *defaults
+    active: true
+  production:
+    <<: *defaults
+    active: true

data/lib/generators/disco_app/templates/config/cable.yml.tt

@@ -0,0 +1,11 @@
+development:
+  adapter: async
+
+test:
+  adapter: async
+
+staging:
+  adapter: async
+
+production:
+  adapter: async

data/lib/generators/disco_app/templates/config/database.yml.tt

@@ -4,18 +4,21 @@ default: &default
   pool: 5
   timeout: 5000
   prepared_statements: false
- 
+
 development:
   <<: *default
   host: localhost
   port: 5432
   database: <%= Rails.application.class.parent_name.downcase %>
- 
+
 test:
   <<: *default
   host: localhost
   port: 5432
   database: <%= Rails.application.class.parent_name.downcase %>_test
- 
+
+staging:
+  <<: *default
+
 production:
   <<: *default

data/lib/generators/disco_app/templates/config/environments/staging.rb

@@ -0,0 +1,108 @@
+Rails.application.configure do
+  # Configure ActionMailer to use MailGun
+  if ENV['MAILGUN_API_KEY']
+    config.action_mailer.delivery_method = :mailgun
+    config.action_mailer.mailgun_settings = {
+      api_key: ENV['MAILGUN_API_KEY'],
+      domain: ENV['MAILGUN_API_DOMAIN']
+    }
+  end
+
+  # Use production variant of React in staging.
+  config.react.variant = :production
+  # Use Sidekiq as the active job backend
+  config.active_job.queue_adapter = :sidekiq
+
+  # Allow real charges in production with an ENV variable
+  config.x.shopify_charges_real = false
+
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # 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
+
+  # Attempt to read encrypted secrets from `config/secrets.yml.enc`.
+  # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or
+  # `config/secrets.yml.key`.
+  config.read_encrypted_secrets = true
+
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.public_file_server.enabled = 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
+
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
+
+  # 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
+
+  # Mount Action Cable outside main process or domain
+  # config.action_cable.mount_path = nil
+  # config.action_cable.url = 'wss://example.com/cable'
+  # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
+
+  # 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 = [:request_id]
+
+  # Use a different cache store in staging.
+  # config.cache_store = :mem_cache_store
+
+  # Use a real queuing backend for Active Job (and separate queues per environment)
+  # config.active_job.queue_adapter     = :resque
+  # config.active_job.queue_name_prefix = "example_app_#{Rails.env}"
+  config.action_mailer.perform_caching = false
+
+  # 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
+
+  # Use a different logger for distributed setups.
+  # require 'syslog/logger'
+  # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
+
+  if ENV['RAILS_LOG_TO_STDOUT'].present?
+    logger = ActiveSupport::Logger.new(STDOUT)
+    logger.formatter = config.log_formatter
+    config.logger = ActiveSupport::TaggedLogging.new(logger)
+  end
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
+end

data/lib/generators/disco_app/templates/config/newrelic.yml

@@ -22,5 +22,8 @@ test:
   <<: *default_settings
   monitor_mode: false
 
+staging:
+  <<: *default_settings
+
 production:
   <<: *default_settings

data/lib/generators/disco_app/templates/controllers/home_controller.rb

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

data/lib/generators/disco_app/templates/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/lib/generators/disco_app/templates/root/.env

@@ -18,3 +18,6 @@ REDIS_PROVIDER=
 DISCO_API_URL=
 
 WHITELISTED_DOMAINS=
+
+# You can find this listed in 1Password
+APPSIGNAL_PUSH_API_KEY=

data/{.github → lib/generators/disco_app/templates/root/.github}/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-Forecast: [C-XXX](https://app.forecast.it/project/P-X/workflow/C-XXX)
+Jira: [XXX-1](https://discodev.atlassian.net/browse/XXX-1)
 
 ### Description
 A brief overview of the work done. Be sure to provide some context to the issue/feature, so that the reviewer can jump right on in and review your sweet, sweet code.