disco_app 0.13.6.pre.puma.pre.3 → 0.14.0

data/lib/generators/disco_app/disco_app_generator.rb

@@ -6,10 +6,12 @@ class DiscoAppGenerator < Rails::Generators::Base
   #
   #  - .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.
+  #  - Default simple Procfile for Heroku;
+  #  - .editorconfig to help enforce 2-space tabs, newlines and truncated whitespace for editors that support it.
+  #  - README template
   #
   def copy_root_files
-    %w(.env .env.local .gitignore .rubocop.yml .codeclimate.yml Procfile CHECKS).each do |file|
+    %w(.editorconfig .env .env.local .gitignore .rubocop.yml .codeclimate.yml Procfile CHECKS README.md).each do |file|
       copy_file "root/#{file}", file
     end
   end
@@ -27,28 +29,25 @@ class DiscoAppGenerator < Rails::Generators::Base
     gsub_file 'Gemfile', /^# Use sqlite3 as the database for Active Record\ngem 'sqlite3'/m, ''
 
     # Add gem requirements.
-    gem 'shopify_app'
-    gem 'pg'
-    gem 'sidekiq'
-    gem 'rollbar'
-    gem 'newrelic_rpm'
-    gem 'react-rails'
-    gem 'classnames-rails'
-    gem 'premailer-rails'
-    gem 'rails-bigint-pk'
-    gem 'acts_as_singleton'
     gem 'active_link_to'
+    gem 'acts_as_singleton'
+    gem 'classnames-rails'
+    gem 'newrelic_rpm'
     gem 'nokogiri'
     gem 'oj'
+    gem 'pg'
+    gem 'premailer-rails'
+    gem 'react-rails'
     gem 'render_anywhere'
-
-    # Specify the threadsafe version of ActiveResource.
-    gem 'activeresource', git: 'https://github.com/shopify/activeresource.git', tag: '4.2-threadsafe'
+    gem 'rollbar'
+    gem 'shopify_app'
+    gem 'sidekiq'
+    gem 'activeresource'
 
     # Indicate which gems should only be used in production.
     gem_group :production do
-      gem 'rails_12factor'
       gem 'mailgun_rails'
+      gem 'rails_12factor'
     end
 
     # Indicate which gems should only be used in development and test.
@@ -56,6 +55,7 @@ class DiscoAppGenerator < Rails::Generators::Base
       gem 'dotenv-rails'
       gem 'minitest-reporters'
       gem 'webmock'
+      gem 'mechanize'
     end
   end
 
@@ -163,7 +163,6 @@ class DiscoAppGenerator < Rails::Generators::Base
   def run_generators
     generate 'shopify_app:install'
     generate 'shopify_app:home_controller'
-    generate 'bigint_pk:install'
     generate 'react:install'
   end
 
@@ -221,7 +220,7 @@ class DiscoAppGenerator < Rails::Generators::Base
   # 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.3.3'\n"
+    prepend_to_file 'Gemfile', "ruby '2.5.0'\n"
   end
 
   private

data/lib/generators/disco_app/templates/initializers/shopify_session_repository.rb

@@ -1,7 +1,8 @@
 if Rails.configuration.cache_classes
   ShopifyApp::SessionRepository.storage = DiscoApp::SessionStorage
 else
-  ActionDispatch::Reloader.to_prepare do
+  reloader = defined?(ActiveSupport::Reloader) ? ActiveSupport::Reloader : ActionDispatch::Reloader
+  reloader.to_prepare do
     ShopifyApp::SessionRepository.storage = DiscoApp::SessionStorage
   end
 end

data/lib/generators/disco_app/templates/root/README.md

@@ -0,0 +1,26 @@
+# App title
+A short overview of what the application is designed to do goes here. Also include the current usage of the app (eg, which clients are using it, how many stores, etc).
+
+## Setup
+See [section 3 and 4 of the Disco App README](https://github.com/discolabs/disco_app#3-setting-up-the-shopify-app) for standard steps on setting up a Disco Rails App.
+
+## Deployment
+See [this Guru card](https://app.getguru.com/#/facts/879686cb-e74a-4814-b45f-06e568d89c10) for the standard steps on deploying an existing DiscoRails App. 
+
+## Installation
+A guide to installing the app onto a new store. 
+
+## Functionality
+A list of the features of the app, and what it achieves (ie, the requirements it meets).
+
+## External systems
+A list of the external systems the application interacts with.
+
+## Data flow
+A description of how data flows through the application, if applicable, or a description of the common processes/functions the app performs.
+
+## Notes
+A section to note anything particularly noteworthy about this app.
+
+## Troubleshooting / FAQ
+Potentially common problems and their solutions.

data/lib/tasks/partner_app.rake

@@ -0,0 +1,26 @@
+require 'yaml'
+
+namespace :generate do
+  desc 'Generate new Shopify app from partner dashboard'
+  task partner_app: :environment do
+    begin
+      config_path = File.join(ENV['HOME'], '.disco_app.yml')
+      config = YAML.load_file(config_path)
+    rescue StandardError
+      abort("Could not load configuration file from #{config_path}, aborting.")
+    end
+
+    if config
+      params = {
+        email: config['params']['PARTNER_EMAIL'].to_s,
+        password: config['params']['PARTNER_PASSWORD'].to_s,
+        organization: config['params']['PARTNER_ORGANIZATION'].to_s,
+        app_name: ENV['SHOPIFY_APP_NAME'],
+        app_url: ENV['DEFAULT_HOST']
+      }
+
+      service = DiscoApp::PartnerAppService.new(params)
+      service.generate_partner_app
+    end
+  end
+end

data/lib/tasks/rollbar.rake

@@ -0,0 +1,24 @@
+require 'yaml'
+
+namespace :generate do
+  desc "Create Rollbar project for current shopify app, and return the ROLLBAR API TOKEN"
+  task rollbar_project: :environment do
+    begin
+      config_path = File.join(ENV['HOME'], '.disco_app.yml')
+      config = YAML.load_file(config_path)
+    rescue StandardError
+      abort("Could not load configuration file from #{config_path}, aborting.")
+    end
+
+    params = {
+      write_account_access_token: config['params']['ROLLBAR_ACCOUNT_ACCESS_TOKEN_WRITE'].to_s,
+      read_account_access_token: config['params']['ROLLBAR_ACCOUNT_ACCESS_TOKEN_READ'].to_s
+    }
+
+    project_access_token = DiscoApp::RollbarClient.new(params).create_project(ENV['APP_NAME'].blank? ? ENV['SHOPIFY_APP_NAME'] : ENV['APP_NAME'])
+    puts '#' * 80
+    puts 'New Rollbar project successfully created!'
+    puts "ROLLBAR_ACCESS_TOKEN = #{project_access_token}"
+    puts '#' * 80
+  end
+end

data/test/controllers/disco_app/charges_controller_test.rb

@@ -21,24 +21,24 @@ class DiscoApp::ChargesControllerTest < ActionController::TestCase
 
   test 'non-logged in user is redirected to the login page' do
     log_out
-    get(:new, subscription_id: @current_subscription)
+    get :new, params: { subscription_id: @current_subscription }
     assert_redirected_to ShopifyApp::Engine.routes.url_helpers.login_path
   end
 
   test 'logged-in, never installed user is redirected to the install page' do
     @shop.never_installed!
-    get(:new, subscription_id: @current_subscription)
+    get :new, params: { subscription_id: @current_subscription }
     assert_redirected_to DiscoApp::Engine.routes.url_helpers.install_path
   end
 
   test 'user with paid-for current subscription can not access page' do
-    get(:new, subscription_id: @current_subscription)
+    get :new, params: { subscription_id: @current_subscription }
     assert_redirected_to Rails.application.routes.url_helpers.root_path
   end
 
   test 'user with unpaid current subscription can access page' do
     @current_subscription.active_charge.destroy
-    get(:new, subscription_id: @current_subscription)
+    get :new, params: { subscription_id: @current_subscription }
     assert_response :ok
   end
 
@@ -47,26 +47,26 @@ class DiscoApp::ChargesControllerTest < ActionController::TestCase
                     "price": "9.99",
                     "trial_days": 14,
                     "return_url": /^https:\/\/test\.example\.com\/subscriptions\/304261385\/charges\/53297050(1|2)\/activate$/,
-                    "test": true 
+                    "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)
 
     @current_subscription.active_charge.destroy
-    post(:create, subscription_id: @current_subscription)
+    post :create, params: { subscription_id: @current_subscription }
     assert_redirected_to 'https://apple.myshopify.com/admin/charges/654381179/confirm_recurring_application_charge?signature=BAhpBHsQASc%3D--b2e90c6e4e94fbae15a464c566a31a1c23e6bffa'
   end
 
   test 'user trying to activate charge for invalid gets not found and hence 404' do
     assert_raises ActiveRecord::RecordNotFound do
-      get(:activate, subscription_id: '123', id: '456', charge_id: '789')
+      get :activate, params: { subscription_id: '123', id: '456', charge_id: '789' }
     end
   end
 
   test 'user trying to activate invalid charge for valid subscription gets redirected to new charge page for that subscription' do
     @current_subscription.active_charge.destroy
-    get(:activate, subscription_id: @current_subscription, id: '456', charge_id: '789')
+    get :activate, params: { subscription_id: @current_subscription, id: '456', charge_id: '789' }
     assert_redirected_to DiscoApp::Engine.routes.url_helpers.new_subscription_charge_path(@current_subscription)
   end
 
@@ -74,7 +74,7 @@ class DiscoApp::ChargesControllerTest < ActionController::TestCase
     stub_api_request(:get, "#{@shop.admin_url}/recurring_application_charges/654381179.json", 'widget_store/charges/get_pending_recurring_application_charge')
 
     @current_subscription.active_charge.destroy
-    get(:activate, subscription_id: @current_subscription, id: @new_charge.id, charge_id: @new_charge.shopify_id)
+    get :activate, params: { subscription_id: @current_subscription, id: @new_charge.id, charge_id: @new_charge.shopify_id }
     assert_redirected_to DiscoApp::Engine.routes.url_helpers.new_subscription_charge_path(@current_subscription)
   end
 
@@ -82,7 +82,7 @@ class DiscoApp::ChargesControllerTest < ActionController::TestCase
     stub_api_request(:get, "#{@shop.admin_url}/recurring_application_charges/654381179.json", 'widget_store/charges/get_declined_recurring_application_charge')
 
     @current_subscription.active_charge.destroy
-    get(:activate, subscription_id: @current_subscription, id: @new_charge.id, charge_id: @new_charge.shopify_id)
+    get :activate, params: { subscription_id: @current_subscription, id: @new_charge.id, charge_id: @new_charge.shopify_id }
     assert_redirected_to DiscoApp::Engine.routes.url_helpers.new_subscription_charge_path(@current_subscription)
   end
 
@@ -91,7 +91,7 @@ class DiscoApp::ChargesControllerTest < ActionController::TestCase
     stub_api_request(:post, "#{@shop.admin_url}/recurring_application_charges/654381179/activate.json", 'widget_store/charges/activate_recurring_application_charge')
 
     @current_subscription.active_charge.destroy
-    get(:activate, subscription_id: @current_subscription, id: @new_charge.id, charge_id: @new_charge.shopify_id)
+    get :activate, params: { subscription_id: @current_subscription, id: @new_charge.id, charge_id: @new_charge.shopify_id }
     assert_equal @new_charge, @current_subscription.active_charge
     assert_redirected_to Rails.application.routes.url_helpers.root_path
   end

data/test/controllers/disco_app/subscriptions_controller_test.rb

@@ -39,27 +39,27 @@ class DiscoApp::SubscriptionsControllerTest < ActionController::TestCase
   end
 
   test 'logged-in, installed user with current subscription can create new subscription' do
-    post(:create, subscription: { plan: disco_app_plans(:premium) })
+    post :create, params: { subscription: { plan: disco_app_plans(:premium) } }
     assert_redirected_to Rails.application.routes.url_helpers.root_path
     assert_equal disco_app_plans(:premium), @shop.current_plan
   end
 
   test 'logged-in, installed user with no subscription can create new subscription for available plan' do
     @current_subscription.destroy
-    post(:create, subscription: { plan: disco_app_plans(:premium) })
+    post :create, params: { subscription: { plan: disco_app_plans(:premium) } }
     assert_redirected_to Rails.application.routes.url_helpers.root_path
     assert_equal disco_app_plans(:premium), @shop.current_plan
   end
 
   test 'logged-in, installed user with current subscription can not create new subscription for unavailable plan' do
-    post(:create, subscription: { plan: disco_app_plans(:cheapo) })
+    post :create, params: { subscription: { plan: disco_app_plans(:cheapo) } }
     assert_redirected_to DiscoApp::Engine.routes.url_helpers.new_subscription_path
     assert_equal @current_subscription, @shop.current_subscription
   end
 
   test 'logged-in, installed user with current subscription can create new subscription with valid cookied plan code' do
     @request.cookies[DiscoApp::CODE_COOKIE_KEY] = 'PODCAST'
-    post(:create, subscription: { plan: disco_app_plans(:premium) })
+    post :create, params: { subscription: { plan: disco_app_plans(:premium) } }
     assert_redirected_to Rails.application.routes.url_helpers.root_path
     assert_equal disco_app_plans(:premium), @shop.current_plan
     assert_equal 8999, @shop.current_subscription.amount

data/test/controllers/disco_app/webhooks_controller_test.rb

@@ -14,7 +14,7 @@ class DiscoApp::WebhooksControllerTest < ActionController::TestCase
 
   test 'webhook request without authentication information returns unauthorized' do
     body = webhook_fixture('app_uninstalled')
-    post(:process_webhook, body)
+    post :process_webhook, body: body
     assert_response :unauthorized
   end
 
@@ -22,7 +22,7 @@ class DiscoApp::WebhooksControllerTest < ActionController::TestCase
     body = webhook_fixture('app_uninstalled')
     @request.headers['HTTP_X_SHOPIFY_TOPIC'] = :'app/uninstalled'
     @request.headers['HTTP_X_SHOPIFY_SHOP_DOMAIN'] = @shop.shopify_domain
-    post(:process_webhook, body)
+    post :process_webhook, body: body
     assert_response :unauthorized
   end
 
@@ -31,7 +31,7 @@ class DiscoApp::WebhooksControllerTest < ActionController::TestCase
     @request.headers['HTTP_X_SHOPIFY_TOPIC'] = :'app/uninstalled'
     @request.headers['HTTP_X_SHOPIFY_SHOP_DOMAIN'] = @shop.shopify_domain
     @request.headers['HTTP_X_SHOPIFY_HMAC_SHA256'] = '0000'
-    post(:process_webhook, body)
+    post :process_webhook, body: body
     assert_response :unauthorized
   end
 
@@ -40,7 +40,7 @@ class DiscoApp::WebhooksControllerTest < ActionController::TestCase
     @request.headers['HTTP_X_SHOPIFY_TOPIC'] = :'app/uninstalled'
     @request.headers['HTTP_X_SHOPIFY_SHOP_DOMAIN'] = @shop.shopify_domain
     @request.headers['HTTP_X_SHOPIFY_HMAC_SHA256'] = DiscoApp::WebhookService.calculated_hmac(body, ShopifyApp.configuration.secret)
-    post(:process_webhook, body)
+    post :process_webhook, body: body
     assert_response :ok
   end
 
@@ -51,7 +51,7 @@ class DiscoApp::WebhooksControllerTest < ActionController::TestCase
     @request.headers['HTTP_X_SHOPIFY_HMAC_SHA256'] = DiscoApp::WebhookService.calculated_hmac(body, ShopifyApp.configuration.secret)
 
     assert_enqueued_with(job: DiscoApp::AppUninstalledJob) do
-      post(:process_webhook, body)
+      post :process_webhook, body: body
     end
   end
 

data/test/controllers/home_controller_test.rb

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

data/test/controllers/proxy_controller_test.rb

@@ -18,18 +18,18 @@ class ProxyControllerTest < ActionController::TestCase
   end
 
   test 'app proxy request with incorrect authentication information returns unauthorized' do
-    get(:index, proxy_params(shop: @shop.shopify_domain).merge(signature: 'invalid_signature'))
+    get :index, params: proxy_params(shop: @shop.shopify_domain).merge(signature: 'invalid_signature')
     assert_response :unauthorized
   end
 
   test 'app proxy request with correct authentication information returns ok and has shop context' do
-    get(:index, proxy_params(shop: @shop.shopify_domain))
+    get :index, params: proxy_params(shop: @shop.shopify_domain)
     assert_response :ok
     assert_equal @shop, assigns(:shop)
   end
 
   test 'app proxy request with correct authentication information but unknown shop returns 404' do
-    get(:index, proxy_params(shop: 'unknown.myshopify.com'))
+    get :index, params: proxy_params(shop: 'unknown.myshopify.com')
     assert_response :not_found
   end
 

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

@@ -2,7 +2,7 @@ class DiscoApp::Admin::ShopsController < DiscoApp::Admin::ApplicationController
   include DiscoApp::Admin::Concerns::ShopsController
 
   def index
-    render text: 'ok'
+    render plain: 'ok'
   end
 
 end

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

@@ -2,7 +2,7 @@ class ProxyController < ActionController::Base
   include DiscoApp::Concerns::AppProxyController
 
   def index
-    render text: 'ok'
+    render plain: 'ok'
   end
 
 end

data/test/dummy/app/jobs/application_job.rb

@@ -0,0 +1,2 @@
+class ApplicationJob < ActiveJob::Base
+end

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

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

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

@@ -1,4 +1,4 @@
-class Cart < ActiveRecord::Base
+class Cart < ApplicationRecord
   include DiscoApp::Concerns::Synchronises
 
   belongs_to :shop, class_name: 'DiscoApp::Shop'

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

@@ -1,6 +1,6 @@
 require 'active_utils'
 
-class DiscoApp::Shop < ActiveRecord::Base
+class DiscoApp::Shop < ApplicationRecord
   include DiscoApp::Concerns::Shop
 
   has_one :js_configuration

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

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

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

@@ -1,4 +1,4 @@
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   include DiscoApp::Concerns::Synchronises
   include DiscoApp::Concerns::HasMetafields
 

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

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

data/test/dummy/config/application.rb

@@ -30,9 +30,6 @@ module Dummy
 
     # Explicitly prevent real charges being created by default
     config.x.shopify_charges_real = false
-
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
   end
 end
 

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

@@ -13,8 +13,8 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static file server for tests with Cache-Control for performance.
-  config.serve_static_files   = true
-  config.static_cache_control = 'public, max-age=3600'
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

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

@@ -1,7 +1,7 @@
 if Rails.configuration.cache_classes
   ShopifyApp::SessionRepository.storage = DiscoApp::SessionStorage
 else
-  ActionDispatch::Reloader.to_prepare do
+  ActiveSupport::Reloader.to_prepare do
     ShopifyApp::SessionRepository.storage = DiscoApp::SessionStorage
   end
 end

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

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

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

@@ -1,5 +1,5 @@
-class CreateAssetModels < ActiveRecord::Migration
-  def change
+class CreateAssetModels < ActiveRecord::Migration[4.2]
+def change
     create_table :js_configurations do |t|
       t.integer :shop_id, limit: 8
       t.string :label, default: 'Default'

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

@@ -1,5 +1,6 @@
-class CreateCarts < ActiveRecord::Migration
-  def change
+class CreateCarts < ActiveRecord::Migration[4.2]
+
+def change
     create_table :carts do |t|
       t.integer :shop_id, limit: 8
       t.string :token