disco_app 0.14.4 → 0.17.0

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
 
@@ -16,17 +20,17 @@ module DiscoApp
 
     # Set the below to create real Shopify charges.
     attr_accessor :real_charges
-    alias_method  :real_charges?, :real_charges
+    alias real_charges? real_charges
 
     # Optional configuration, usually useful for development environments.
     attr_accessor :skip_proxy_verification
-    alias_method  :skip_proxy_verification?, :skip_proxy_verification
+    alias skip_proxy_verification? skip_proxy_verification
     attr_accessor :skip_webhook_verification
-    alias_method  :skip_webhook_verification?, :skip_webhook_verification
+    alias skip_webhook_verification? skip_webhook_verification
     attr_accessor :skip_carrier_request_verification
-    alias_method  :skip_carrier_request_verification?, :skip_carrier_request_verification
+    alias skip_carrier_request_verification? skip_carrier_request_verification
     attr_accessor :skip_oauth
-    alias_method  :skip_oauth?, :skip_oauth
+    alias skip_oauth? skip_oauth
 
   end
 

data/lib/disco_app/constants.rb

@@ -1,4 +1,6 @@
 module DiscoApp
-  SOURCE_COOKIE_KEY = '_disco_app_source'
-  CODE_COOKIE_KEY = '_disco_app_code'
+
+  SOURCE_COOKIE_KEY = '_disco_app_source'.freeze
+  CODE_COOKIE_KEY = '_disco_app_code'.freeze
+
 end

data/lib/disco_app/engine.rb

@@ -19,7 +19,7 @@ module DiscoApp
 
     # Ensure our frame assets are included for precompilation.
     initializer 'disco_app.assets.precompile' do |app|
-      app.config.assets.precompile += %w(disco_app/icon.svg disco_app/admin.css disco_app/frame.css disco_app/frame.js)
+      app.config.assets.precompile += %w[disco_app/icon.svg disco_app/admin.css disco_app/frame.css disco_app/frame.js]
     end
 
   end

data/lib/disco_app/session.rb

@@ -7,6 +7,7 @@ module DiscoApp
 
       def set_shop_id!
         return false unless loaded?
+
         write_attribute(:shop_id, data[:shopify] || data['shopify'])
       end
 

data/lib/disco_app/support/file_fixtures.rb

@@ -11,7 +11,8 @@ module DiscoApp::Test
     def json_fixture(path, dir: 'json', parse: true)
       filename = Rails.root.join('test', 'fixtures', dir, "#{path}.json")
       return File.read(filename) unless parse
-      HashWithIndifferentAccess.new(ActiveSupport::JSON.decode(File.read(filename)))
+
+      HashWithIndifferentAccess.new(JSON.parse(File.read(filename)))
     end
 
     # Webhook fixtures are special-case JSON fixtures.

data/lib/disco_app/version.rb

@@ -1,3 +1,5 @@
 module DiscoApp
-  VERSION = '0.14.4'
+
+  VERSION = '0.17.0'.freeze
+
 end

data/lib/generators/disco_app/install/USAGE

@@ -0,0 +1,5 @@
+Description:
+  Generate a new Shopify application.
+
+Example:
+  rails generate disco_app:install

data/lib/generators/disco_app/install/install_generator.rb

@@ -0,0 +1,287 @@
+module DiscoApp
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+
+      source_root File.expand_path('templates', __dir__)
+
+      # Copy a number of template files to the top-level directory of our application:
+      #
+      #  - .env and .env.local for settings environment variables in development with dotenv-rails;
+      #  - Slightly customised version of the default Rails .gitignore;
+      #  - Default simple Procfile for Heroku;
+      #  - .editorconfig to help enforce 2-space tabs, newlines and truncated whitespace for editors that support it.
+      #  - README/PULL REQUEST template
+      #
+      def copy_root_files
+        %w[.editorconfig .env .env.local .gitignore .rubocop.yml Procfile CHECKS README.md].each do |file|
+          copy_file "root/#{file}", file
+        end
+        directory 'root/.github'
+      end
+
+      # Remove a number of root files.
+      def remove_root_files
+        %w[README.rdoc].each do |file|
+          remove_file file
+        end
+      end
+
+      # Configure the application's Gemfile.
+      def configure_gemfile
+        # Remove sqlite.
+        gsub_file 'Gemfile', /^# Use sqlite3 as the database for Active Record\ngem 'sqlite3'/m, ''
+
+        # Add gem requirements.
+        gem 'active_link_to'
+        gem 'activeresource'
+        gem 'acts_as_singleton'
+        gem 'appsignal'
+        gem 'classnames-rails'
+        gem 'nokogiri'
+        gem 'oj'
+        gem 'pg'
+        gem 'premailer-rails'
+        gem 'react-rails'
+        gem 'render_anywhere'
+        gem 'shopify_app'
+        gem 'sidekiq'
+        gem 'timber', '~> 3.0'
+        gem 'timber-rails', '~> 1.0'
+
+        # Indicate which gems should only be used in production.
+        gem_group :production do
+          gem 'mailgun_rails'
+          gem 'rails_12factor'
+        end
+
+        # Indicate which gems should only be used in development.
+        gem_group :production do
+          gem 'rb-readline'
+        end
+
+        gem_group :development do
+          gem 'rubocop'
+          gem 'rubocop-performance'
+          gem 'rubocop-rails'
+        end
+
+        # Indicate which gems should only be used in development and test.
+        gem_group :development, :test do
+          gem 'coveralls'
+          gem 'dotenv-rails'
+          gem 'factory_bot_rails'
+          gem 'faker'
+          gem 'mechanize'
+          gem 'rspec-rails'
+          gem 'vcr'
+          gem 'webmock'
+        end
+
+        gem_group :test do
+          gem 'database_cleaner'
+          gem 'shoulda-matchers'
+        end
+      end
+
+      # copy template for pg configuration
+      def update_database_config
+        template 'config/database.yml.tt'
+      end
+
+      # Run bundle install to add our new gems before running tasks.
+      def bundle_install
+        Bundler.with_clean_env do
+          run 'bundle install'
+        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.
+        # Uncomment to ensure config.force_ssl = true in production.
+        uncomment_lines 'config/environments/production.rb', /force_ssl/
+
+        # Set time zone to UTC
+        application "config.time_zone = 'UTC'"
+        application '# Ensure UTC is the default timezone'
+
+        # Set server side rendereing for components.js
+        application <<~CONFIG
+          # Enable server side react rendering
+          config.react.server_renderer_options = {
+            # files to load for prerendering
+            files: ['components.js']
+          }
+        CONFIG
+
+        # Set defaults for various charge attributes.
+        application "config.x.shopify_charges_default_trial_days = 14\n"
+        application 'config.x.shopify_charges_default_price = 10.00'
+        application 'config.x.shopify_charges_default_type = :recurring'
+        application '# Set defaults for charges created by the application'
+
+        # Set the "real charges" config variable to false explicitly by default.
+        # Only in production do we read from the environment variable and
+        # potentially have it become true.
+        application "config.x.shopify_charges_real = false\n"
+        application '# Explicitly prevent real charges being created by default'
+        application "config.x.shopify_charges_real = ENV['SHOPIFY_CHARGES_REAL'] == 'true'\n", env: :production
+        application '# Allow real charges in production with an ENV variable', env: :production
+
+        # Configure session storage.
+        application "ActiveRecord::SessionStore::Session.table_name = 'disco_app_sessions'"
+        application 'ActionDispatch::Session::ActiveRecordStore.session_class = DiscoApp::Session'
+        application '# Configure custom session storage'
+
+        # Set Sidekiq as the queue adapter in production.
+        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, 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
+
+        # Configure Factory Bot as the Rails testing fixture replacement
+        application <<~CONFIG
+          config.generators do |g|
+            g.test_framework :rspec, fixtures: true, view_specs: false, helper_specs: false, routing_specs: false
+            g.fixture_replacement :factory_bot, dir: 'spec/factories'
+          end
+        CONFIG
+
+        # Copy over the default puma configuration.
+        copy_file 'config/puma.rb', 'config/puma.rb'
+
+        # Mail configuration
+        configuration = <<-CONFIG.strip_heredoc
+
+            # 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
+        CONFIG
+        application configuration, env: :production
+        application configuration, env: :staging
+
+        # Monitoring configuration
+        copy_file 'config/appsignal.yml', 'config/appsignal.yml'
+      end
+
+      # Add entries to .env and .env.local
+      def add_env_variables
+        configuration = <<-CONFIG.strip_heredoc
+
+          MAILGUN_API_KEY=
+          MAILGUN_API_DOMAIN=
+        CONFIG
+        append_to_file '.env', configuration
+        append_to_file '.env.local', configuration
+      end
+
+      # Set up routes.
+      def setup_routes
+        route "mount DiscoApp::Engine, at: '/'"
+      end
+
+      # Run generators.
+      def run_generators
+        generate 'shopify_app:install'
+        generate 'shopify_app:home_controller'
+        generate 'react:install'
+      end
+
+      def configure_rspec
+        directory 'spec'
+        copy_file 'root/.rspec', '.rspec'
+      end
+
+      # Copy template files to the appropriate location. In some cases, we'll be
+      # overwriting or removing existing files or those created by ShopifyApp.
+      def copy_and_remove_files
+        # Copy initializers
+        copy_file 'initializers/shopify_app.rb', 'config/initializers/shopify_app.rb'
+        copy_file 'initializers/disco_app.rb', 'config/initializers/disco_app.rb'
+        copy_file 'initializers/shopify_session_repository.rb', 'config/initializers/shopify_session_repository.rb'
+        copy_file 'initializers/session_store.rb', 'config/initializers/session_store.rb'
+        copy_file 'initializers/timber.rb', 'config/initializers/timber.rb'
+
+        # Copy default home controller and view
+        copy_file 'controllers/home_controller.rb', 'app/controllers/home_controller.rb'
+        copy_file 'views/home/index.html.erb', 'app/views/home/index.html.erb'
+
+        # Copy assets
+        copy_file 'assets/javascripts/application.js', 'app/assets/javascripts/application.js'
+        copy_file 'assets/javascripts/components.js', 'app/assets/javascripts/components.js'
+        copy_file 'assets/stylesheets/application.scss', 'app/assets/stylesheets/application.scss'
+
+        # Remove application.css
+        remove_file 'app/assets/stylesheets/application.css'
+
+        # Remove the layout files created by ShopifyApp
+        remove_file 'app/views/layouts/application.html.erb'
+        remove_file 'app/views/layouts/embedded_app.html.erb'
+
+        # Remove the test directory generated by rails new
+        remove_dir 'test'
+      end
+
+      # Copy engine migrations over.
+      def install_migrations
+        rake 'disco_app:install:migrations'
+      end
+
+      # Create PG database
+      def create_database
+        rake 'db:create'
+      end
+
+      # Run migrations.
+      def migrate
+        rake 'db:migrate'
+      end
+
+      # Lock down the application to a specific Ruby version:
+      #
+      #  - Via .ruby-version file for rbenv in development;
+      #  - Via a Gemfile line in production.
+      #
+      # This should be the last operation, to allow all other operations to run in the initial Ruby version.
+      def set_ruby_version
+        copy_file 'root/.ruby-version', '.ruby-version'
+        prepend_to_file 'Gemfile', "ruby '2.5.0'\n"
+      end
+
+      private
+
+        # This method of finding the component.js manifest taken from the
+        # install generator in react-rails.
+        # See https://github.com/reactjs/react-rails/blob/3f0af13fa755d6e95969c17728d0354c234f3a37/lib/generators/react/install_generator.rb#L53-L55
+        def components
+          Pathname.new(destination_root).join('app/assets/javascripts', 'components.js')
+        end
+
+    end
+  end
+end

data/lib/generators/disco_app/install/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/install/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 → install/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/install/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 → install/templates}/controllers/home_controller.rb

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

data/lib/generators/disco_app/install/templates/initializers/session_store.rb

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

data/lib/generators/disco_app/install/templates/initializers/timber.rb

@@ -0,0 +1,6 @@
+if Rails.env.production?
+  http_device = Timber::LogDevices::HTTP.new('YOUR_API_KEY', 'YOUR_SOURCE_ID')
+  Rails.logger = Timber::Logger.new(http_device)
+else
+  Rails.logger = Timber::Logger.new(STDOUT)
+end

data/lib/generators/disco_app/{templates → install/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/lib/generators/disco_app/{templates → install/templates}/root/.env.local

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

data/lib/generators/disco_app/install/templates/root/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+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. 
+
+Highlight any interesting design decisions that you may have taken.
+
+### Notes
+* A bulleted list of any secondary information that you feel would be useful to the reviewer.
+* Gotchas, new dependencies, unusual data migrations, etc., would all live here.
+
+### Checklist
+
+- [ ] Updated README and any other relevant documentation.
+- [ ] Tested changes locally.
+- [ ] Updated test suite and made sure that it all passes.
+- [ ] Ensured that Rubocop and friends are happy.
+- [ ] Checked that this PR is referencing the correct base.

data/lib/generators/disco_app/{templates → install/templates}/root/.gitignore

@@ -15,11 +15,19 @@ pickle-email-*.html
 .byebug_history
 .DS_Store
 .disco_app
+/public/packs
+/public/packs-test
+/node_modules
+yarn-debug.log*
+.yarn-integrity
 
 ## Environment normalisation:
 /.bundle
 /vendor/bundle
+/vendor/ruby
 /.env.local
+.envrc
+.pryrc
 
 # these should all be checked in to normalise the environment:
 # Gemfile.lock, .ruby-version, .ruby-gemset
@@ -37,3 +45,5 @@ bower.json
 
 # Editors
 .idea
+.vscode
+TAGS

data/lib/generators/disco_app/install/templates/root/.rspec

@@ -0,0 +1 @@
+--require spec_helper