disco_app 0.14.4 → 0.17.0

data/app/controllers/disco_app/install_controller.rb

@@ -1,4 +1,5 @@
 class DiscoApp::InstallController < ApplicationController
+
   include DiscoApp::Concerns::AuthenticatedController
 
   skip_before_action :check_current_subscription
@@ -12,16 +13,12 @@ class DiscoApp::InstallController < ApplicationController
 
   # Display an "installing" page.
   def installing
-    if @shop.installed?
-      redirect_to main_app.root_path
-    end
+    redirect_to main_app.root_path if @shop.installed?
   end
 
   # Display an "uninstalling" page. Should be almost never used.
   def uninstalling
-    if @shop.uninstalled?
-      redirect_to main_app.root_path
-    end
+    redirect_to main_app.root_path if @shop.uninstalled?
   end
 
 end

data/app/controllers/disco_app/subscriptions_controller.rb

@@ -1,4 +1,5 @@
 class DiscoApp::SubscriptionsController < ApplicationController
+
   include DiscoApp::Concerns::AuthenticatedController
 
   skip_before_action :check_current_subscription
@@ -10,13 +11,20 @@ class DiscoApp::SubscriptionsController < ApplicationController
   def create
     # Get the selected plan. If it's not available or couldn't be found,
     # redirect back to the plan selection page.
-    if(plan = DiscoApp::Plan.available.find_by_id(subscription_params[:plan])).nil?
-      redirect_to action: :new and return
-    end
+    plan = DiscoApp::Plan.available.find_by(id: subscription_params[:plan])
+
+    redirect_to(action: :new) && return unless plan
 
     # Subscribe the current shop to the selected plan. Pass along any cookied
     # plan code and source code.
-    if(subscription = DiscoApp::SubscriptionService.subscribe(@shop, plan, cookies[DiscoApp::CODE_COOKIE_KEY], cookies[DiscoApp::SOURCE_COOKIE_KEY])).nil?
+    subscription = DiscoApp::SubscriptionService.subscribe(
+      @shop,
+      plan,
+      cookies[DiscoApp::CODE_COOKIE_KEY],
+      cookies[DiscoApp::SOURCE_COOKIE_KEY]
+    )
+
+    if subscription.nil?
       redirect_to action: :new
     else
       redirect_to main_app.root_path

data/app/controllers/disco_app/user_sessions_controller.rb

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

data/app/controllers/disco_app/webhooks_controller.rb

@@ -1,47 +1,5 @@
-module DiscoApp
-  class WebhooksController < ActionController::Base
+class DiscoApp::WebhooksController < ActionController::Base
 
-    before_action :verify_webhook
-    protect_from_forgery with: :null_session
+  include DiscoApp::Concerns::WebhooksController
 
-    def process_webhook
-      # Get the topic and domain for this webhook.
-      topic = request.headers['HTTP_X_SHOPIFY_TOPIC']
-      shopify_domain = request.headers['HTTP_X_SHOPIFY_SHOP_DOMAIN']
-
-      # Ensure a domain was provided in the headers.
-      unless shopify_domain
-        head :bad_request
-      end
-
-      # Try to find a matching background job task for the given topic using class name.
-      job_class = DiscoApp::WebhookService.find_job_class(topic)
-
-      # Return bad request if we couldn't match a job class.
-      unless job_class.present?
-        head :bad_request
-      end
-
-      # Decode the body data and enqueue the appropriate job.
-      data = ActiveSupport::JSON::decode(request.body.read).with_indifferent_access
-      job_class.perform_later(shopify_domain, data)
-
-      render body: nil
-    end
-
-    private
-
-      def verify_webhook
-        unless webhook_is_valid?
-          head :unauthorized
-        end
-        request.body.rewind
-      end
-
-      def webhook_is_valid?
-        return true if Rails.env.development? and DiscoApp.configuration.skip_webhook_verification?
-        DiscoApp::WebhookService.is_valid_hmac?(request.body.read.to_s, ShopifyApp.configuration.secret, request.headers['HTTP_X_SHOPIFY_HMAC_SHA256'])
-      end
-
-  end
 end

data/app/controllers/sessions_controller.rb

@@ -1,4 +1,5 @@
 class SessionsController < ActionController::Base
+
   include ShopifyApp::SessionsConcern
 
   def referral
@@ -18,14 +19,14 @@ class SessionsController < ActionController::Base
     # mode. Skipping OAuth still requires a shop with Shopify domain specified
     # by the `shop` parameter to be present in the local database.
     def authenticate
-      if Rails.env.development? and DiscoApp.configuration.skip_oauth?
-        shop = DiscoApp::Shop.find_by_shopify_domain!(sanitized_shop_name)
+      if Rails.env.development? && DiscoApp.configuration.skip_oauth?
+        shop = DiscoApp::Shop.find_by!(shopify_domain: sanitized_shop_name)
 
         sess = ShopifyAPI::Session.new(shop.shopify_domain, shop.shopify_token)
         session[:shopify] = ShopifyApp::SessionRepository.store(sess)
         session[:shopify_domain] = sanitized_shop_name
 
-        redirect_to disco_app.frame_path and return
+        redirect_to(disco_app.frame_path) && return
       end
       super
     end

data/app/helpers/disco_app/application_helper.rb

@@ -18,7 +18,7 @@ module DiscoApp::ApplicationHelper
       title: options.delete(:modal_title),
       width: options.delete(:modal_width),
       height: options.delete(:modal_height),
-      buttons: options.delete(:modal_buttons),
+      buttons: options.delete(:modal_buttons)
     }
     options[:onclick] = "ShopifyApp.Modal.open(#{modal_options.to_json}); return false;"
     options[:onclick].gsub!(/"function(.*?)"/, 'function\1')
@@ -32,14 +32,14 @@ module DiscoApp::ApplicationHelper
     react_component(name, args, options)
   end
 
-  # Provide link to dynamically add a new nested fields association 
-  def link_to_add_fields(name, f, association)
-    new_object = f.object.send(association).klass.new
+  # Provide link to dynamically add a new nested fields association
+  def link_to_add_fields(name, form, association)
+    new_object = form.object.send(association).klass.new
     id = new_object.object_id
-    fields = f.fields_for(association, new_object, child_index: id) do |builder|
-      render(association.to_s.singularize + "_fields", f: builder)
+    fields = form.fields_for(association, new_object, child_index: id) do |builder|
+      render(association.to_s.singularize + '_fields', f: builder)
     end
-    link_to(name, '#', class: "add_fields", data: {id: id, fields: fields.gsub("\n", "")})
+    link_to(name, '#', class: 'add_fields', data: { id: id, fields: fields.delete("\n") })
   end
 
   # Return the props required to instantiate a React ModelForm component for the

data/app/jobs/disco_app/app_installed_job.rb

@@ -1,3 +1,5 @@
 class DiscoApp::AppInstalledJob < DiscoApp::ShopJob
+
   include DiscoApp::Concerns::AppInstalledJob
+
 end

data/app/jobs/disco_app/app_uninstalled_job.rb

@@ -1,3 +1,5 @@
 class DiscoApp::AppUninstalledJob < DiscoApp::ShopJob
+
   include DiscoApp::Concerns::AppUninstalledJob
+
 end

data/app/jobs/disco_app/concerns/app_installed_job.rb

@@ -1,4 +1,5 @@
 module DiscoApp::Concerns::AppInstalledJob
+
   extend ActiveSupport::Concern
 
   included do
@@ -21,9 +22,7 @@ module DiscoApp::Concerns::AppInstalledJob
 
     @shop.reload
 
-    if default_plan.present?
-      DiscoApp::SubscriptionService.subscribe(@shop, default_plan, plan_code, source)
-    end
+    DiscoApp::SubscriptionService.subscribe(@shop, default_plan, plan_code, source) if default_plan.present?
   end
 
   # Provide an overridable hook for applications to examine the @shop object

data/app/jobs/disco_app/concerns/app_uninstalled_job.rb

@@ -1,4 +1,5 @@
 module DiscoApp::Concerns::AppUninstalledJob
+
   extend ActiveSupport::Concern
 
   included do
@@ -12,7 +13,7 @@ module DiscoApp::Concerns::AppUninstalledJob
   # - Mark any recurring application charges as cancelled.
   # - Remove any stored sessions for the shop.
   #
-  def perform(_shop, shop_data)
+  def perform(_shop, _shop_data)
     DiscoApp::ChargesService.cancel_recurring_charges(@shop)
     DiscoApp::SendSubscriptionJob.perform_later(@shop)
     @shop.sessions.delete_all

data/app/jobs/disco_app/concerns/render_asset_group_job.rb

@@ -1,4 +1,5 @@
 module DiscoApp::Concerns::RenderAssetGroupJob
+
   extend ActiveSupport::Concern
 
   def perform(_shop, instance, asset_group)

data/app/jobs/disco_app/concerns/shop_update_job.rb

@@ -1,13 +1,20 @@
 module DiscoApp::Concerns::ShopUpdateJob
+
   extend ActiveSupport::Concern
 
   # Perform an update of the current shop's information.
   def perform(_shop, shop_data = nil)
     # If we weren't provided with shop data (eg from a webhook), fetch it.
-    shop_data ||= ActiveSupport::JSON::decode(ShopifyAPI::Shop.current.to_json)
+    shop_data ||= JSON.parse(ShopifyAPI::Shop.current.to_json)
 
     # Update attributes stored directly on the Shop model, along with the data hash itself.
-    @shop.update(shop_data.with_indifferent_access.slice(*DiscoApp::Shop.column_names).except(:id, :created_at).merge(data: shop_data))
+    @shop.update(
+      shop_data
+        .with_indifferent_access
+        .slice(*DiscoApp::Shop.column_names)
+        .except(:id, :created_at)
+        .merge(data: shop_data)
+    )
   end
 
 end

data/app/jobs/disco_app/concerns/subscription_changed_job.rb

@@ -1,7 +1,8 @@
 module DiscoApp::Concerns::SubscriptionChangedJob
+
   extend ActiveSupport::Concern
 
-  def perform(_shop, subscription)
+  def perform(_shop, _subscription)
     DiscoApp::SendSubscriptionJob.perform_later(@shop)
   end
 

data/app/jobs/disco_app/concerns/synchronise_carrier_service_job.rb

@@ -1,10 +1,11 @@
 module DiscoApp::Concerns::SynchroniseCarrierServiceJob
+
   extend ActiveSupport::Concern
 
   # Ensure that any carrier service required by our app is registered.
   def perform(_shop)
     # Don't proceed unless we have a name and callback url.
-    return unless carrier_service_name and callback_url
+    return unless carrier_service_name && callback_url
 
     # Registered the carrier service if it hasn't been registered yet.
     unless current_carrier_service_names.include?(carrier_service_name)
@@ -19,11 +20,11 @@ module DiscoApp::Concerns::SynchroniseCarrierServiceJob
     # Ensure any existing carrier services (with the correct name) are active
     # and have a current callback URL.
     current_carrier_services.each do |carrier_service|
-      if carrier_service.name == carrier_service_name
-        carrier_service.callback_url = callback_url
-        carrier_service.active = true
-        carrier_service.save
-      end
+      next unless carrier_service.name == carrier_service_name
+
+      carrier_service.callback_url = callback_url
+      carrier_service.active = true
+      carrier_service.save
     end
   end
 
@@ -49,7 +50,7 @@ module DiscoApp::Concerns::SynchroniseCarrierServiceJob
 
     # Return a list of currently registered carrier services.
     def current_carrier_services
-      @current_carrier_service ||= ShopifyAPI::CarrierService.find(:all)
+      @current_carrier_services ||= ShopifyAPI::CarrierService.find(:all)
     end
 
 end

data/app/jobs/disco_app/concerns/synchronise_resources_job.rb

@@ -1,4 +1,5 @@
 module DiscoApp::Concerns::SynchroniseResourcesJob
+
   extend ActiveSupport::Concern
 
   def perform(_shop, class_name, params)

data/app/jobs/disco_app/concerns/synchronise_users_job.rb

@@ -1,14 +1,17 @@
 module DiscoApp::Concerns::SynchroniseUsersJob
+
   extend ActiveSupport::Concern
 
   def perform(_shop)
     begin
-      users = @shop.with_api_context {
+      users = @shop.with_api_context do
         ShopifyAPI::User.all
-      }
+      end
     rescue ActiveResource::UnauthorizedAccess => e
-      Rollbar.error(e) and return
+      Appsignal.set_error(e)
+      return
     end
+
     users.each { |user| DiscoApp::User.create_user(user, @shop) }
   end
 

data/app/jobs/disco_app/concerns/synchronise_webhooks_job.rb

@@ -1,7 +1,8 @@
 module DiscoApp::Concerns::SynchroniseWebhooksJob
+
   extend ActiveSupport::Concern
 
-  COMMON_WEBHOOKS = [:'app/uninstalled', :'shop/update']
+  COMMON_WEBHOOKS = [:'app/uninstalled', :'shop/update'].freeze
 
   # Ensure the webhooks registered with our shop are the same as those listed
   # in our application configuration.
@@ -12,16 +13,14 @@ module DiscoApp::Concerns::SynchroniseWebhooksJob
         ShopifyAPI::Webhook.create(
           topic: topic,
           address: webhooks_url,
-          format: 'json',
+          format: 'json'
         )
       end
     end
 
     # Remove any extraneous topics.
     current_webhooks.each do |webhook|
-      unless expected_topics.include?(webhook.topic.to_sym)
-        ShopifyAPI::Webhook.delete(webhook.id)
-      end
+      ShopifyAPI::Webhook.delete(webhook.id) unless expected_topics.include?(webhook.topic.to_sym)
     end
 
     # Ensure webhook addresses are current.

data/app/jobs/disco_app/flow/process_action_job.rb

@@ -0,0 +1,11 @@
+module DiscoApp
+  module Flow
+    class ProcessActionJob < DiscoApp::ShopJob
+
+      def perform(_shop, action)
+        ProcessAction.call(action: action)
+      end
+
+    end
+  end
+end

data/app/jobs/disco_app/flow/process_trigger_job.rb

@@ -0,0 +1,11 @@
+module DiscoApp
+  module Flow
+    class ProcessTriggerJob < DiscoApp::ShopJob
+
+      def perform(_shop, trigger)
+        ProcessTrigger.call(trigger: trigger)
+      end
+
+    end
+  end
+end

data/app/jobs/disco_app/render_asset_group_job.rb

@@ -1,3 +1,5 @@
 class DiscoApp::RenderAssetGroupJob < DiscoApp::ShopJob
+
   include DiscoApp::Concerns::RenderAssetGroupJob
+
 end

data/app/jobs/disco_app/shop_job.rb

@@ -1,10 +1,10 @@
+require 'appsignal'
+
 # The base class for all jobs that should be performed in the context of a
 # particular Shop's API session. The first argument to any job inheriting from
 # this class must be the domain of the relevant store, so that the appropriate
 # Shop model can be fetched and the temporary API session created.
 
-require 'rollbar'
-
 class DiscoApp::ShopJob < ApplicationJob
 
   queue_as :default
@@ -18,17 +18,17 @@ class DiscoApp::ShopJob < ApplicationJob
   private
 
     def find_shop(job)
-      @shop ||= job.arguments.first.is_a?(DiscoApp::Shop) ? job.arguments.first : DiscoApp::Shop.find_by!(shopify_domain: job.arguments.first)
-    end
+      return @shop if @shop
 
-    def shop_context(job, block)
-      Rollbar.scoped(rollbar_scope) do
-        @shop.with_api_context { block.call(job.arguments) }
-      end
+      @shop = job.arguments.first.is_a?(DiscoApp::Shop) ? job.arguments.first : DiscoApp::Shop.find_by!(shopify_domain: job.arguments.first)
     end
 
-    def rollbar_scope
-      { person: { id: @shop.id, username: @shop.shopify_domain } }
+    def shop_context(job, block)
+      Appsignal.tag_request(
+        shop_id: @shop.id,
+        shopify_domain: @shop.shopify_domain
+      )
+      @shop.with_api_context { block.call(job.arguments) }
     end
 
 end

data/app/jobs/disco_app/shop_update_job.rb

@@ -1,3 +1,5 @@
 class DiscoApp::ShopUpdateJob < DiscoApp::ShopJob
+
   include DiscoApp::Concerns::ShopUpdateJob
+
 end

data/app/jobs/disco_app/subscription_changed_job.rb

@@ -1,3 +1,5 @@
 class DiscoApp::SubscriptionChangedJob < DiscoApp::ShopJob
+
   include DiscoApp::Concerns::SubscriptionChangedJob
+
 end

data/app/jobs/disco_app/synchronise_carrier_service_job.rb

@@ -1,3 +1,5 @@
 class DiscoApp::SynchroniseCarrierServiceJob < DiscoApp::ShopJob
+
   include DiscoApp::Concerns::SynchroniseCarrierServiceJob
+
 end

data/app/jobs/disco_app/synchronise_resources_job.rb

@@ -1,3 +1,5 @@
 class DiscoApp::SynchroniseResourcesJob < DiscoApp::ShopJob
+
   include DiscoApp::Concerns::SynchroniseResourcesJob
+
 end

data/app/jobs/disco_app/synchronise_users_job.rb

@@ -1,3 +1,5 @@
 class DiscoApp::SynchroniseUsersJob < DiscoApp::ShopJob
+
   include DiscoApp::Concerns::SynchroniseUsersJob
+
 end

data/app/jobs/disco_app/synchronise_webhooks_job.rb

@@ -1,3 +1,5 @@
 class DiscoApp::SynchroniseWebhooksJob < DiscoApp::ShopJob
+
   include DiscoApp::Concerns::SynchroniseWebhooksJob
+
 end

data/app/models/application_record.rb

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

data/app/models/disco_app/app_settings.rb

@@ -1,3 +1,5 @@
 class DiscoApp::AppSettings < ApplicationRecord
+
   include DiscoApp::Concerns::AppSettings
+
 end

data/app/models/disco_app/application_charge.rb

@@ -8,7 +8,7 @@ class DiscoApp::ApplicationCharge < ApplicationRecord
     accepted: 1,
     declined: 2,
     expired: 3,
-    active: 4,
+    active: 4
   }
 
   scope :active, -> { where status: statuses[:active] }

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

@@ -1,7 +1,9 @@
 module DiscoApp::Concerns::AppSettings
+
   extend ActiveSupport::Concern
 
   included do
     acts_as_singleton
   end
+
 end

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

@@ -1,10 +1,11 @@
 module DiscoApp::Concerns::CanBeLiquified
+
   extend ActiveSupport::Concern
 
-  SPLIT_ARRAY_SEPARATOR = '@!@'
+  SPLIT_ARRAY_SEPARATOR = '@!@'.freeze
+  NIL_VALUE = 'nil'.freeze
 
   included do
-
     # Return this model as a hash for use with `to_liquid`. Returns `as_json` by default but is provided here as a hook
     # for potential overrides.
     def as_liquid
@@ -26,21 +27,35 @@ module DiscoApp::Concerns::CanBeLiquified
 
       # Return given value as a string expression that will be evaluated in Liquid to result in the correct value type.
       def as_liquid_value(key, value)
-        if value.is_a? Numeric or (!!value == value)
-          return value.to_s
-        end
-        if value.nil?
-          return 'nil'
-        end
-        if value.is_a? Array
-          return "'#{value.map { |e| (e.is_a? String) ? CGI::escapeHTML(e) : e }.join(SPLIT_ARRAY_SEPARATOR)}' | split: '#{SPLIT_ARRAY_SEPARATOR}'"
-        end
-        if value.is_a? String and key.end_with? '_html'
-          return "'#{value.to_s.gsub("'", "'")}'"
+        html_string = ->(val) { val.is_a?(String) && key.end_with?('_html') }
+
+        case value
+        when Numeric, TrueClass, FalseClass
+          value.to_s
+        when NilClass
+          NIL_VALUE
+        when Array
+          as_liquid_array_value(value)
+        when html_string
+          as_liquid_html_value(value)
+        else
+          "'#{CGI.escapeHTML(value.to_s)}'"
         end
-        "'#{CGI::escapeHTML(value.to_s)}'"
       end
 
+      def as_liquid_array_value(value)
+        split_array = value.map do |element|
+          CGI.escapeHTML(element) if element.is_a? String
+
+          element
+        end.join(SPLIT_ARRAY_SEPARATOR)
+
+        "'#{split_array}' | split: '#{SPLIT_ARRAY_SEPARATOR}'"
+      end
+
+      def as_liquid_html_value(value)
+        "'#{value.to_s.gsub("'", ''')}'"
+      end
   end
 
 end

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

@@ -1,8 +1,8 @@
 module DiscoApp::Concerns::HasMetafields
+
   extend ActiveSupport::Concern
 
   included do
-
     # Write multiple metafields for this object in a single call.
     #
     # Expects an argument in a nested hash structure with :namespace => :key =>
@@ -42,7 +42,6 @@ module DiscoApp::Concerns::HasMetafields
         end
       end.flatten
     end
-
   end
 
 end

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

@@ -1,9 +1,9 @@
 module DiscoApp::Concerns::Plan
+
   extend ActiveSupport::Concern
 
   included do
-
-    has_many :subscriptions
+    has_many :subscriptions, dependent: :restrict_with_exception
     has_many :shops, through: :subscriptions
     has_many :plan_codes, dependent: :destroy
 
@@ -25,11 +25,10 @@ module DiscoApp::Concerns::Plan
     scope :available, -> { where status: statuses[:available] }
 
     validates_presence_of :name
-
   end
 
   def has_trial?
-    trial_period_days.present? and trial_period_days > 0
+    trial_period_days.present? && trial_period_days.positive?
   end
 
 end

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

@@ -1,8 +1,8 @@
 module DiscoApp::Concerns::PlanCode
+
   extend ActiveSupport::Concern
 
   included do
-
     belongs_to :plan
 
     enum status: {
@@ -12,7 +12,6 @@ module DiscoApp::Concerns::PlanCode
 
     validates_presence_of :code
     validates_presence_of :amount
-
   end
 
 end