disco_app 0.13.7 → 0.13.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 5983b34e8629a83463ee62e1f91048a02c2e3828d15e4fe25bc692d82ea91ea4
-  data.tar.gz: 96b93719faed53ed578a03a7fc7c0352bae2fac7d79051708e8910863c8f10e8
+SHA1:
+  metadata.gz: b29aa5921476d4679bdc2970acca04fd5154546d
+  data.tar.gz: a96ca331508793b163ccd51aea3f004e3c0b184e
 SHA512:
-  metadata.gz: 51ebc9ca906a78457968f99343b2c4baa2ead374ed8534cdbeeef2a25af93b9559a0d556a658697d3c40e960d1671df1f09506888026e2d003cb0aef57b5b846
-  data.tar.gz: ded7d2a2698176ec21f44fbd77def3e147c26ae1220301368ae4140122b1674a3a9a8ba51ae962424e3bec020a3d1019dad89d9dc662f5fb148928e102514cab
+  metadata.gz: 644536c5a1e97b133a6bd2be912bf3e83d548badd234c0a3be643dec4261d09ddee227327b8ea7dd9dc82c7de804475bc5397943c64ccb877f8b7c40694aa1d3
+  data.tar.gz: 5f28bda6c0f07e5b4072f2a6c8271be8f1247b548d2a41f4e241e44ab53277a994daaf2350e435f1dc1ae6e78a68c21b0c6342229512c01db78414a67e8d01c8

data/app/controllers/disco_app/concerns/authenticated_controller.rb

@@ -4,6 +4,7 @@ module DiscoApp::Concerns::AuthenticatedController
 
   included do
     before_action :auto_login
+    before_action :check_shop_whitelist
     before_action :login_again_if_different_shop
     before_action :shopify_shop
     before_action :check_installed
@@ -68,4 +69,11 @@ module DiscoApp::Concerns::AuthenticatedController
       DiscoApp::RequestValidationService.hmac_valid?(request.query_string, ShopifyApp.configuration.secret)
     end
 
+    def check_shop_whitelist
+      if shop_session
+        if ENV['WHITELISTED_DOMAINS'].present? && !ENV['WHITELISTED_DOMAINS'].include?(shop_session.url)
+          redirect_to_login
+        end
+      end
+    end
 end

data/app/models/disco_app/application_charge.rb

@@ -3,7 +3,13 @@ class DiscoApp::ApplicationCharge < ActiveRecord::Base
   belongs_to :shop
   belongs_to :subscription
 
-  enum status: [:pending, :accepted, :declined, :expired, :active]
+  enum status: {
+    pending: 0,
+    accepted: 1,
+    declined: 2,
+    expired: 3,
+    active: 4,
+  }
 
   scope :active, -> { where status: statuses[:active] }
 

data/app/models/disco_app/concerns/plan.rb

@@ -9,9 +9,18 @@ module DiscoApp::Concerns::Plan
 
     accepts_nested_attributes_for :plan_codes, allow_destroy: true
 
-    enum status: [:available, :unavailable]
-    enum plan_type: [:recurring, :one_time]
-    enum interval: [:month, :year]
+    enum status: {
+      available: 0,
+      unavailable: 1
+    }
+    enum plan_type: {
+      recurring: 0,
+      one_time: 1
+    }
+    enum interval: {
+      month: 0,
+      year: 1
+    }
 
     scope :available, -> { where status: statuses[:available] }
 

data/app/models/disco_app/concerns/plan_code.rb

@@ -5,7 +5,10 @@ module DiscoApp::Concerns::PlanCode
 
     belongs_to :plan
 
-    enum status: [:available, :unavailable]
+    enum status: {
+      available: 0,
+      unavailable: 1
+    }
 
     validates_presence_of :code
     validates_presence_of :amount

data/app/models/disco_app/concerns/shop.rb

@@ -16,7 +16,15 @@ module DiscoApp::Concerns::Shop
     has_many :sessions, class_name: 'DiscoApp::Session', dependent: :destroy
 
     # Define possible installation statuses as an enum.
-    enum status: [:never_installed, :awaiting_install, :installing, :installed, :awaiting_uninstall, :uninstalling, :uninstalled]
+    enum status: {
+      never_installed: 0,
+      awaiting_install: 1,
+      installing: 2,
+      installed: 3,
+      awaiting_uninstall: 4,
+      uninstalling: 5,
+      uninstalled: 6
+    }
 
     # Define some useful scopes.
     scope :status, -> (status) { where status: status }

data/app/models/disco_app/concerns/subscription.rb

@@ -10,8 +10,15 @@ module DiscoApp::Concerns::Subscription
     has_many :one_time_charges, class_name: 'DiscoApp::ApplicationCharge', dependent: :destroy
     has_many :recurring_charges, class_name: 'DiscoApp::RecurringApplicationCharge', dependent: :destroy
 
-    enum status: [:trial, :active, :cancelled]
-    enum subscription_type: [:recurring, :one_time]
+    enum status: {
+      trial: 0,
+      active: 1,
+      cancelled: 2
+    }
+    enum subscription_type: {
+      recurring: 0,
+      one_time: 1
+    }
 
     scope :current, -> { where status: [statuses[:trial], statuses[:active]] }
 

data/app/models/disco_app/recurring_application_charge.rb

@@ -3,7 +3,14 @@ class DiscoApp::RecurringApplicationCharge < ActiveRecord::Base
   belongs_to :shop
   belongs_to :subscription
 
-  enum status: [:pending, :accepted, :declined, :active, :cancelled, :expired]
+  enum status: {
+    pending: 0,
+    accepted: 1,
+    declined: 2,
+    active: 3,
+    cancelled: 4,
+    expired: 5
+  }
 
   scope :active, -> { where status: statuses[:active] }
 

data/lib/disco_app/version.rb

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = '0.13.7'
+  VERSION = '0.13.8'
 end

data/lib/generators/disco_app/disco_app_generator.rb

@@ -223,7 +223,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.4.1'\n"
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disco_app
 version: !ruby/object:Gem::Version
-  version: 0.13.7
+  version: 0.13.8
 platform: ruby
 authors:
 - Gavin Ballard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2018-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -853,161 +853,161 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Rails engine for Shopify applications.
 test_files:
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/public/422.html
-- test/dummy/public/404.html
-- test/dummy/bin/rake
-- test/dummy/bin/rails
-- test/dummy/bin/setup
-- test/dummy/bin/bundle
-- test/dummy/Rakefile
-- test/dummy/config.ru
-- test/dummy/app/assets/stylesheets/application.scss
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/jobs/products_create_job.rb
-- test/dummy/app/jobs/products_update_job.rb
+- test/clients/disco_app/api_client_test.rb
+- test/dummy/app/models/disco_app/shop.rb
+- test/dummy/app/models/product.rb
+- test/dummy/app/models/js_configuration.rb
+- test/dummy/app/models/widget_configuration.rb
+- test/dummy/app/models/cart.rb
 - test/dummy/app/jobs/disco_app/app_installed_job.rb
 - test/dummy/app/jobs/disco_app/app_uninstalled_job.rb
 - test/dummy/app/jobs/products_delete_job.rb
+- test/dummy/app/jobs/products_update_job.rb
+- test/dummy/app/jobs/products_create_job.rb
 - test/dummy/app/jobs/carts_update_job.rb
-- test/dummy/app/controllers/home_controller.rb
-- test/dummy/app/controllers/disco_app/admin/shops_controller.rb
+- test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/carrier_request_controller.rb
+- test/dummy/app/controllers/disco_app/admin/shops_controller.rb
 - test/dummy/app/controllers/proxy_controller.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/models/disco_app/shop.rb
-- test/dummy/app/models/product.rb
-- test/dummy/app/models/widget_configuration.rb
-- test/dummy/app/models/js_configuration.rb
-- test/dummy/app/models/cart.rb
-- test/dummy/app/views/assets/script_tag.js.erb
-- test/dummy/app/views/assets/widget.scss.erb
-- test/dummy/app/views/assets/test.js.erb
-- test/dummy/app/views/assets/widget.js.erb
+- test/dummy/app/controllers/home_controller.rb
 - test/dummy/app/views/snippets/widget.liquid.erb
 - test/dummy/app/views/home/index.html.erb
-- test/dummy/db/migrate/20161105054746_create_carts.rb
-- test/dummy/db/migrate/20160530160739_create_asset_models.rb
-- test/dummy/db/migrate/20160307182229_create_products.rb
-- test/dummy/db/schema.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/disco_app.rb
-- test/dummy/config/initializers/shopify_app.rb
-- test/dummy/config/initializers/shopify_session_repository.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/omniauth.rb
-- test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/app/views/assets/widget.scss.erb
+- test/dummy/app/views/assets/widget.js.erb
+- test/dummy/app/views/assets/test.js.erb
+- test/dummy/app/views/assets/script_tag.js.erb
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/assets/stylesheets/application.scss
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/bin/rake
+- test/dummy/bin/setup
+- test/dummy/bin/bundle
+- test/dummy/bin/rails
 - test/dummy/config/secrets.yml
 - test/dummy/config/routes.rb
-- test/dummy/config/database.codeship.yml
+- test/dummy/config/locales/en.yml
 - test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
 - test/dummy/config/environments/development.rb
+- test/dummy/config/environments/test.rb
 - test/dummy/config/environment.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
 - test/dummy/config/application.rb
+- test/dummy/config/database.yml
+- test/dummy/config/database.codeship.yml
+- test/dummy/config/boot.rb
+- test/dummy/config/initializers/shopify_app.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/shopify_session_repository.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/initializers/assets.rb
+- test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/disco_app.rb
+- test/dummy/config/initializers/omniauth.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config.ru
+- test/dummy/Rakefile
+- test/dummy/public/favicon.ico
+- test/dummy/public/422.html
+- test/dummy/public/500.html
+- test/dummy/public/404.html
+- test/dummy/db/schema.rb
+- test/dummy/db/migrate/20161105054746_create_carts.rb
+- test/dummy/db/migrate/20160530160739_create_asset_models.rb
+- test/dummy/db/migrate/20160307182229_create_products.rb
+- test/integration/synchronises_test.rb
+- test/models/disco_app/session_test.rb
+- test/models/disco_app/renders_assets_test.rb
+- test/models/disco_app/has_metafields_test.rb
+- test/models/disco_app/plan_test.rb
+- test/models/disco_app/shop_test.rb
+- test/models/disco_app/can_be_liquified_test.rb
+- test/models/disco_app/subscription_test.rb
+- test/disco_app_test.rb
+- test/support/test_shopify_api.rb
+- test/support/test_file_fixtures.rb
+- test/fixtures/products.yml
+- test/fixtures/disco_app/application_charges.yml
+- test/fixtures/disco_app/shops.yml
+- test/fixtures/disco_app/plan_codes.yml
+- test/fixtures/disco_app/subscriptions.yml
+- test/fixtures/disco_app/sources.yml
+- test/fixtures/disco_app/recurring_application_charges.yml
+- test/fixtures/disco_app/plans.yml
+- test/fixtures/widget_configurations.yml
 - test/fixtures/liquid/model.liquid
-- test/fixtures/api/subscriptions/valid_request.json
-- test/fixtures/api/widget_store/users.json
 - test/fixtures/api/widget_store/carrier_services.json
-- test/fixtures/api/widget_store/assets/create_test_js_response.json
-- test/fixtures/api/widget_store/assets/create_widget_js_response.json
-- test/fixtures/api/widget_store/assets/create_test_js_request.json
-- test/fixtures/api/widget_store/assets/update_script_tag_request.json
-- test/fixtures/api/widget_store/assets/create_script_tag_response.json
-- test/fixtures/api/widget_store/assets/create_script_tag_js_response.json
-- test/fixtures/api/widget_store/assets/create_widget_scss_request.json
-- test/fixtures/api/widget_store/assets/update_script_tag_response.json
-- test/fixtures/api/widget_store/assets/create_widget_liquid_request.json
-- test/fixtures/api/widget_store/assets/create_script_tag_js_request.json
-- test/fixtures/api/widget_store/assets/create_script_tag_request.json
-- test/fixtures/api/widget_store/assets/get_script_tags_preexisting_response.json
-- test/fixtures/api/widget_store/assets/create_widget_scss_response.json
-- test/fixtures/api/widget_store/assets/create_widget_liquid_response.json
-- test/fixtures/api/widget_store/assets/get_script_tags_preexisting_request.json
-- test/fixtures/api/widget_store/assets/get_script_tags_empty_response.json
-- test/fixtures/api/widget_store/assets/get_script_tags_empty_request.json
-- test/fixtures/api/widget_store/assets/create_widget_js_request.json
+- test/fixtures/api/widget_store/webhooks.json
 - test/fixtures/api/widget_store/products/write_metafields_single_namespace_response.json
-- test/fixtures/api/widget_store/products/write_metafields_multiple_namespaces_request.json
 - test/fixtures/api/widget_store/products/write_metafields_multiple_namespaces_response.json
 - test/fixtures/api/widget_store/products/write_metafields_single_namespace_request.json
-- test/fixtures/api/widget_store/webhooks.json
-- test/fixtures/api/widget_store/charges/create_application_charge_response.json
-- test/fixtures/api/widget_store/charges/create_second_recurring_application_charge_response.json
-- test/fixtures/api/widget_store/charges/activate_application_charge_response.json
-- test/fixtures/api/widget_store/charges/create_application_charge_request.json
-- test/fixtures/api/widget_store/charges/create_recurring_application_charge_response.json
-- test/fixtures/api/widget_store/charges/get_pending_recurring_application_charge_response.json
-- test/fixtures/api/widget_store/charges/get_declined_recurring_application_charge_response.json
+- test/fixtures/api/widget_store/products/write_metafields_multiple_namespaces_request.json
+- test/fixtures/api/widget_store/charges/activate_recurring_application_charge_request.json
+- test/fixtures/api/widget_store/charges/activate_application_charge_request.json
 - test/fixtures/api/widget_store/charges/get_pending_application_charge_response.json
 - test/fixtures/api/widget_store/charges/activate_recurring_application_charge_response.json
-- test/fixtures/api/widget_store/charges/get_accepted_recurring_application_charge_response.json
-- test/fixtures/api/widget_store/charges/activate_recurring_application_charge_request.json
-- test/fixtures/api/widget_store/charges/get_accepted_application_charge_response.json
+- test/fixtures/api/widget_store/charges/create_application_charge_request.json
+- test/fixtures/api/widget_store/charges/create_application_charge_response.json
+- test/fixtures/api/widget_store/charges/activate_application_charge_response.json
 - test/fixtures/api/widget_store/charges/create_recurring_application_charge_request.json
 - test/fixtures/api/widget_store/charges/get_declined_application_charge_response.json
+- test/fixtures/api/widget_store/charges/get_declined_recurring_application_charge_response.json
+- test/fixtures/api/widget_store/charges/get_pending_recurring_application_charge_response.json
+- test/fixtures/api/widget_store/charges/get_accepted_recurring_application_charge_response.json
 - test/fixtures/api/widget_store/charges/create_second_recurring_application_charge_request.json
-- test/fixtures/api/widget_store/charges/activate_application_charge_request.json
-- test/fixtures/api/widget_store/carrier_services_create.json
+- test/fixtures/api/widget_store/charges/create_second_recurring_application_charge_response.json
+- test/fixtures/api/widget_store/charges/get_accepted_application_charge_response.json
+- test/fixtures/api/widget_store/charges/create_recurring_application_charge_response.json
+- test/fixtures/api/widget_store/users.json
 - test/fixtures/api/widget_store/shop.json
-- test/fixtures/assets/test.js
-- test/fixtures/assets/test.min.js
-- test/fixtures/widget_configurations.yml
-- test/fixtures/js_configurations.yml
-- test/fixtures/disco_app/sources.yml
-- test/fixtures/disco_app/plan_codes.yml
-- test/fixtures/disco_app/shops.yml
-- test/fixtures/disco_app/application_charges.yml
-- test/fixtures/disco_app/subscriptions.yml
-- test/fixtures/disco_app/plans.yml
-- test/fixtures/disco_app/recurring_application_charges.yml
-- test/fixtures/carts.yml
+- test/fixtures/api/widget_store/carrier_services_create.json
+- test/fixtures/api/widget_store/assets/create_widget_liquid_request.json
+- test/fixtures/api/widget_store/assets/create_test_js_response.json
+- test/fixtures/api/widget_store/assets/create_widget_js_request.json
+- test/fixtures/api/widget_store/assets/update_script_tag_response.json
+- test/fixtures/api/widget_store/assets/create_script_tag_js_response.json
+- test/fixtures/api/widget_store/assets/create_script_tag_response.json
+- test/fixtures/api/widget_store/assets/create_widget_scss_request.json
+- test/fixtures/api/widget_store/assets/get_script_tags_preexisting_response.json
+- test/fixtures/api/widget_store/assets/create_widget_liquid_response.json
+- test/fixtures/api/widget_store/assets/get_script_tags_preexisting_request.json
+- test/fixtures/api/widget_store/assets/create_widget_scss_response.json
+- test/fixtures/api/widget_store/assets/create_script_tag_request.json
+- test/fixtures/api/widget_store/assets/create_widget_js_response.json
+- test/fixtures/api/widget_store/assets/get_script_tags_empty_request.json
+- test/fixtures/api/widget_store/assets/update_script_tag_request.json
+- test/fixtures/api/widget_store/assets/create_script_tag_js_request.json
+- test/fixtures/api/widget_store/assets/create_test_js_request.json
+- test/fixtures/api/widget_store/assets/get_script_tags_empty_response.json
+- test/fixtures/api/subscriptions/valid_request.json
+- test/fixtures/webhooks/product_deleted.json
 - test/fixtures/webhooks/cart_updated.json
-- test/fixtures/webhooks/app_uninstalled.json
 - test/fixtures/webhooks/product_updated.json
 - test/fixtures/webhooks/product_created.json
-- test/fixtures/webhooks/product_deleted.json
-- test/fixtures/products.yml
-- test/support/test_file_fixtures.rb
-- test/support/test_shopify_api.rb
+- test/fixtures/webhooks/app_uninstalled.json
+- test/fixtures/assets/test.js
+- test/fixtures/assets/test.min.js
+- test/fixtures/carts.yml
+- test/fixtures/js_configurations.yml
 - test/test_helper.rb
-- test/disco_app_test.rb
+- test/jobs/disco_app/synchronise_users_job_test.rb
+- test/jobs/disco_app/synchronise_webhooks_job_test.rb
 - test/jobs/disco_app/app_uninstalled_job_test.rb
 - test/jobs/disco_app/synchronise_carrier_service_job_test.rb
-- test/jobs/disco_app/synchronise_users_job_test.rb
 - test/jobs/disco_app/send_subscription_job_test.rb
-- test/jobs/disco_app/synchronise_webhooks_job_test.rb
 - test/jobs/disco_app/app_installed_job_test.rb
+- test/controllers/proxy_controller_test.rb
 - test/controllers/disco_app/install_controller_test.rb
-- test/controllers/disco_app/webhooks_controller_test.rb
+- test/controllers/disco_app/charges_controller_test.rb
 - test/controllers/disco_app/admin/shops_controller_test.rb
 - test/controllers/disco_app/subscriptions_controller_test.rb
-- test/controllers/disco_app/charges_controller_test.rb
-- test/controllers/proxy_controller_test.rb
+- test/controllers/disco_app/webhooks_controller_test.rb
 - test/controllers/home_controller_test.rb
-- test/integration/synchronises_test.rb
-- test/clients/disco_app/api_client_test.rb
-- test/models/disco_app/plan_test.rb
-- test/models/disco_app/has_metafields_test.rb
-- test/models/disco_app/shop_test.rb
-- test/models/disco_app/session_test.rb
-- test/models/disco_app/subscription_test.rb
-- test/models/disco_app/can_be_liquified_test.rb
-- test/models/disco_app/renders_assets_test.rb
-- test/services/disco_app/charges_service_test.rb
 - test/services/disco_app/subscription_service_test.rb
+- test/services/disco_app/charges_service_test.rb