disco_app 0.14.4 → 0.17.0

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

@@ -2,6 +2,7 @@ require 'render_anywhere'
 require 'uglifier'
 
 module DiscoApp::Concerns::RendersAssets
+
   extend ActiveSupport::Concern
 
   included do
@@ -10,7 +11,6 @@ module DiscoApp::Concerns::RendersAssets
   end
 
   class_methods do
-
     # Ruby "macro" that allows the definition of a number of Shopify assets that
     # should be rendered and uploaded when certain attributes on the including
     # class change. This assumes that the including class (1) is an ActiveRecord
@@ -67,10 +67,9 @@ module DiscoApp::Concerns::RendersAssets
         assets: nil,
         triggered_by: nil,
         script_tags: nil,
-        minify: Rails.env.production?
+        minify: Rails.env.production? || Rails.env.staging?
       }
     end
-
   end
 
   # Callback, triggered after a model save. Iterates through each asset group
@@ -78,9 +77,7 @@ module DiscoApp::Concerns::RendersAssets
   # attributes are found in the asset group's triggered_by list.
   def queue_render_asset_group_job
     renderable_asset_groups.each do |asset_group, options|
-      unless (previous_changes.keys & options[:triggered_by]).empty?
-        DiscoApp::RenderAssetGroupJob.perform_later(shop, self, asset_group.to_s)
-      end
+      DiscoApp::RenderAssetGroupJob.perform_later(shop, self, asset_group.to_s) unless (previous_changes.keys & options[:triggered_by]).empty?
     end
   end
 
@@ -97,26 +94,22 @@ module DiscoApp::Concerns::RendersAssets
 
     options[:assets].each do |asset|
       # Create/replace the asset via the Shopify API.
-      shopify_asset = shop.with_api_context {
+      shopify_asset = shop.with_api_context do
         ShopifyAPI::Asset.create(
           key: asset,
           value: render_asset_group_asset(asset, public_urls, options)
         )
-      }
+      end
 
       # Store the public URL to this asset, so that we're able to use it in
       # subsequent template renders. Adds a .css suffix to .scss assets, so that
       # we use the Shopify-compiled version of any SCSS stylesheets.
-      if shopify_asset.public_url.present?
-        public_urls[asset] = shopify_asset.public_url.gsub(/\.scss\?/, '.scss.css?')
-      end
+      public_urls[asset] = shopify_asset.public_url.gsub(/\.scss\?/, '.scss.css?') if shopify_asset.public_url.present?
     end
 
     # If we specified the creation of any script tags based on newly rendered
     # assets, do that now.
-    unless options[:script_tags].empty?
-      render_asset_script_tags(options, public_urls)
-    end
+    render_asset_script_tags(options, public_urls) unless options[:script_tags].empty?
   end
 
   private
@@ -141,7 +134,7 @@ module DiscoApp::Concerns::RendersAssets
 
     # Return true if the given asset should be minified with Uglifier.
     def should_be_minified?(asset, options)
-      asset.to_s.end_with?('.js') and options[:minify]
+      asset.to_s.end_with?('.js') && options[:minify]
     end
 
     def render_asset_renderer
@@ -157,9 +150,12 @@ module DiscoApp::Concerns::RendersAssets
       # Iterate each script tag for which we have a known public URL and create
       # or update the corresponding script tag resource.
       public_urls.slice(*options[:script_tags]).each do |asset, public_url|
-        script_tag = current_script_tags.find(lambda { ShopifyAPI::ScriptTag.new(event: 'onload') }) { |script_tag| script_tag.src.include?("#{asset}?") }
-        script_tag.src = public_url
-        shop.with_api_context { script_tag.save }
+        generate_new_script_tag = -> { ShopifyAPI::ScriptTag.new(event: 'onload') }
+
+        current_script_tags
+          .find(generate_new_script_tag) { |script_tag| script_tag.src.include?("#{asset}?") }
+          .tap { |script_tag| script_tag.src = public_url }
+          .yield_self { |script_tag| shop.with_api_context { script_tag.save } }
       end
     end
 

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

@@ -1,4 +1,5 @@
 module DiscoApp::Concerns::Shop
+
   extend ActiveSupport::Concern
 
   included do
@@ -6,15 +7,19 @@ module DiscoApp::Concerns::Shop
     include ActionView::Helpers::DateHelper
 
     # Define relationships to plans and subscriptions.
-    has_many :subscriptions
+    has_many :subscriptions, dependent: :restrict_with_exception
     has_many :plans, through: :subscriptions
 
     # Define relationship to users.
-    has_many :users
+    has_many :users, dependent: :restrict_with_exception
 
     # Define relationship to sessions.
     has_many :sessions, class_name: 'DiscoApp::Session', dependent: :destroy
 
+    # Define relationship to Flow actions and triggers.
+    has_many :flow_actions, class_name: 'DiscoApp::Flow::Action', dependent: :destroy
+    has_many :flow_triggers, class_name: 'DiscoApp::Flow::Trigger', dependent: :destroy
+
     # Define possible installation statuses as an enum.
     enum status: {
       never_installed: 0,
@@ -27,7 +32,7 @@ module DiscoApp::Concerns::Shop
     }
 
     # Define some useful scopes.
-    scope :status, -> (status) { where status: status }
+    scope :status, ->(status) { where status: status }
     scope :installed, -> { where status: statuses[:installed] }
     scope :has_active_shopify_plan, -> { where.not(plan_name: [:cancelled, :frozen, :fraudulent]) }
     scope :shopify_plus, -> { where(plan_name: :shopify_plus) }
@@ -73,11 +78,6 @@ module DiscoApp::Concerns::Shop
       "https://#{shopify_domain}/admin"
     end
 
-    # Convenience method to get the email of the shop's admin, to display in Rollbar.
-    def email
-      data[:email]
-    end
-
     def installed_duration
       distance_of_time_in_words_to_now(created_at.time)
     end
@@ -87,8 +87,8 @@ module DiscoApp::Concerns::Shop
     def time_zone
       @time_zone ||= begin
         Time.find_zone!(data[:timezone].to_s.gsub(/^\(.+\)\s/, ''))
-      rescue ArgumentError
-        Time.zone
+                     rescue ArgumentError
+                       Time.zone
       end
     end
 
@@ -100,14 +100,13 @@ module DiscoApp::Concerns::Shop
 
     # Return an instance of the Disco API client.
     def disco_api_client
-      @api_client ||= DiscoApp::ApiClient.new(self, ENV['DISCO_API_URL'])
+      @disco_api_client ||= DiscoApp::ApiClient.new(self, ENV['DISCO_API_URL'])
     end
 
     # Override the "read" data attribute to allow indifferent access.
     def data
       read_attribute(:data).with_indifferent_access
     end
-
   end
 
 end

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

@@ -1,14 +1,13 @@
 module DiscoApp::Concerns::Source
+
   extend ActiveSupport::Concern
 
   included do
-
-    has_many :subscriptions
+    has_many :subscriptions, dependent: :restrict_with_exception
     has_many :shops, through: :subscriptions
 
     validates_presence_of :source
     validates_presence_of :name
-
   end
 
 end

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

@@ -1,8 +1,8 @@
 module DiscoApp::Concerns::Subscription
+
   extend ActiveSupport::Concern
 
   included do
-
     belongs_to :shop
     belongs_to :plan
     belongs_to :plan_code, optional: true
@@ -23,12 +23,11 @@ module DiscoApp::Concerns::Subscription
     scope :current, -> { where status: [statuses[:trial], statuses[:active]] }
 
     after_commit :cancel_charge
-
   end
 
   # Only require an active charge if the amount to be charged is > 0.
   def requires_active_charge?
-    amount > 0
+    amount.positive?
   end
 
   # Convenience method to check if this subscription has an active charge.
@@ -67,6 +66,7 @@ module DiscoApp::Concerns::Subscription
     def cancel_charge
       return if (previous_changes.keys & ['amount', 'trial_period_days']).empty?
       return unless active_charge?
+
       active_charge.cancelled!
     end
 

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

@@ -1,31 +1,29 @@
 module DiscoApp::Concerns::Synchronises
+
   extend ActiveSupport::Concern
 
   class_methods do
-
     # Define the number of resources per page to fetch.
     SYNCHRONISES_PAGE_LIMIT = 250
 
-    def should_synchronise?(shop, data)
+    def should_synchronise?(_shop, _data)
       true
     end
 
-    def synchronise_by(shop, data)
+    def synchronise_by(_shop, data)
       { id: data[:id] }
     end
 
     def synchronise(shop, data)
-      if data.is_a?(ShopifyAPI::Base)
-        data = ActiveSupport::JSON.decode(data.to_json)
-      end
+      data = JSON.parse(data.to_json) if data.is_a?(ShopifyAPI::Base)
       data = data.with_indifferent_access
 
       return unless should_synchronise?(shop, data)
 
       begin
-        instance = self.find_or_create_by!(self.synchronise_by(shop, data)) do |instance|
-          instance.shop = shop
-          instance.data = data
+        instance = find_or_create_by!(synchronise_by(shop, data)) do |new_instance|
+          new_instance.shop = shop
+          new_instance.data = data
         end
       rescue ActiveRecord::RecordNotUnique, PG::UniqueViolation
         retry
@@ -36,7 +34,7 @@ module DiscoApp::Concerns::Synchronises
       instance
     end
 
-    def should_synchronise_deletion?(shop, data)
+    def should_synchronise_deletion?(_shop, _data)
       true
     end
 
@@ -45,26 +43,23 @@ module DiscoApp::Concerns::Synchronises
 
       return unless should_synchronise_deletion?(shop, data)
 
-      self.where(shop: shop, id: data[:id]).destroy_all
+      where(shop: shop, id: data[:id]).destroy_all
     end
 
     def synchronise_all(shop, params = {})
       resource_count = shop.with_api_context { self::SHOPIFY_API_CLASS.count(params) }
 
       (1..(resource_count / SYNCHRONISES_PAGE_LIMIT.to_f).ceil).each do |page|
-        DiscoApp::SynchroniseResourcesJob.perform_later(shop, self.name, params.merge(page: page, limit: SYNCHRONISES_PAGE_LIMIT))
+        DiscoApp::SynchroniseResourcesJob.perform_later(shop, name, params.merge(page: page, limit: SYNCHRONISES_PAGE_LIMIT))
       end
     end
-
   end
 
   included do
-
     # Override the "read" data attribute to allow indifferent access.
     def data
       read_attribute(:data).with_indifferent_access
     end
-
   end
 
 end

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

@@ -1,4 +1,5 @@
 module DiscoApp::Concerns::Taggable
+
   extend ActiveSupport::Concern
 
   def tags

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

@@ -1,11 +1,12 @@
 module DiscoApp::Concerns::User
+
   extend ActiveSupport::Concern
 
   included do
     belongs_to :shop
 
     def self.create_user(shopify_user, shop)
-      user = self.find_or_create_by!(id: shopify_user.id, shop: shop)
+      user = find_or_create_by!(id: shopify_user.id, shop: shop)
       user.update(
         first_name: shopify_user.first_name || '',
         last_name: shopify_user.last_name || '',
@@ -15,6 +16,6 @@ module DiscoApp::Concerns::User
     rescue ActiveRecord::RecordNotUnique, PG::UniqueViolation
       retry
     end
-
   end
+
 end

data/app/models/disco_app/flow/action.rb

@@ -0,0 +1,9 @@
+module DiscoApp
+  module Flow
+    class Action < ApplicationRecord
+
+      include DiscoApp::Flow::Concerns::Action
+
+    end
+  end
+end

data/app/models/disco_app/flow/concerns/action.rb

@@ -0,0 +1,27 @@
+module DiscoApp
+  module Flow
+    module Concerns
+      module Action
+
+        extend ActiveSupport::Concern
+
+        included do
+          belongs_to :shop
+
+          self.table_name = :disco_app_flow_actions
+
+          enum status: {
+            pending: 0,
+            succeeded: 1,
+            failed: 2
+          }
+
+          def properties
+            read_attribute(:properties).with_indifferent_access
+          end
+        end
+
+      end
+    end
+  end
+end

data/app/models/disco_app/flow/concerns/trigger.rb

@@ -0,0 +1,27 @@
+module DiscoApp
+  module Flow
+    module Concerns
+      module Trigger
+
+        extend ActiveSupport::Concern
+
+        included do
+          belongs_to :shop
+
+          self.table_name = :disco_app_flow_triggers
+
+          enum status: {
+            pending: 0,
+            succeeded: 1,
+            failed: 2
+          }
+
+          def properties
+            read_attribute(:properties).with_indifferent_access
+          end
+        end
+
+      end
+    end
+  end
+end

data/app/models/disco_app/flow/trigger.rb

@@ -0,0 +1,9 @@
+module DiscoApp
+  module Flow
+    class Trigger < ApplicationRecord
+
+      include DiscoApp::Flow::Concerns::Trigger
+
+    end
+  end
+end

data/app/models/disco_app/plan.rb

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

data/app/models/disco_app/plan_code.rb

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

data/app/models/disco_app/session_storage.rb

@@ -1,5 +1,6 @@
 module DiscoApp
   class SessionStorage
+
     def self.store(session)
       shop = Shop.find_or_initialize_by(shopify_domain: session.url)
       shop.shopify_token = session.token
@@ -9,10 +10,12 @@ module DiscoApp
 
     def self.retrieve(id)
       return unless id
+
       shop = Shop.find(id)
       ShopifyAPI::Session.new(shop.shopify_domain, shop.shopify_token)
     rescue ActiveRecord::RecordNotFound
       nil
     end
+
   end
 end

data/app/models/disco_app/shop.rb

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

data/app/models/disco_app/source.rb

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

data/app/models/disco_app/subscription.rb

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

data/app/models/disco_app/user.rb

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

data/app/resources/disco_app/admin/resources/concerns/shop_resource.rb

@@ -1,10 +1,10 @@
 require 'jsonapi/resource'
 
 module DiscoApp::Admin::Resources::Concerns::ShopResource
+
   extend ActiveSupport::Concern
 
   included do
-
     attributes :domain, :status, :created_at
     attributes :email, :country_name, :currency, :plan_display_name
     attributes :current_subscription_id, :current_subscription_display_amount, :current_subscription_display_plan, :current_subscription_display_plan_code, :current_subscription_source
@@ -15,33 +15,33 @@ module DiscoApp::Admin::Resources::Concerns::ShopResource
     filters :query, :status
 
     # Adjust the base records method to ensure only models for the authenticated domain are retrieved.
-    def self.records(options = {})
+    def self.records(_options = {})
       records = DiscoApp::Shop.order(created_at: :desc)
       records
     end
 
     # Apply filters.
-    def self.apply_filter(records, filter, value, options)
+    def self.apply_filter(records, filter, value, _options)
       return records if value.blank?
 
       # Perform appropriate filtering.
       case filter
-        when :query
-          return records.where('name LIKE ? OR shopify_domain LIKE ? OR domain LIKE ?', "%#{value.first}%", "%#{value.first}%", "%#{value.first}%")
-        when :status
-          return records.where(status: value.map { |v| DiscoApp::Shop.statuses[v.to_sym] } )
-        else
-          return super(records, filter, value)
+      when :query
+        return records.where('name LIKE ? OR shopify_domain LIKE ? OR domain LIKE ?', "%#{value.first}%", "%#{value.first}%", "%#{value.first}%")
+      when :status
+        return records.where(status: value.map { |v| DiscoApp::Shop.statuses[v.to_sym] })
+      else
+        return super(records, filter, value)
       end
     end
 
     # Don't allow the update of any fields via the API.
-    def self.updatable_fields(context)
+    def self.updatable_fields(_context)
       []
     end
 
     # Don't allow the creation of any fields via the API.
-    def self.creatable_fields(context)
+    def self.creatable_fields(_context)
       []
     end
 
@@ -62,9 +62,7 @@ module DiscoApp::Admin::Resources::Concerns::ShopResource
     end
 
     def current_subscription_id
-      if @model.current_subscription?
-        @model.current_subscription.id
-      end
+      @model.current_subscription.id if @model.current_subscription?
     end
 
     def current_subscription_display_amount
@@ -94,7 +92,6 @@ module DiscoApp::Admin::Resources::Concerns::ShopResource
         '-'
       end
     end
-
   end
 
 end

data/app/resources/disco_app/admin/resources/shop_resource.rb

@@ -1,4 +1,5 @@
 class DiscoApp::Admin::Resources::ShopResource < JSONAPI::Resource
+
   include DiscoApp::Admin::Resources::Concerns::ShopResource
 
 end

data/app/services/disco_app/carrier_request_service.rb

@@ -2,13 +2,13 @@ class DiscoApp::CarrierRequestService
 
   # Return true iff the provided hmac_to_verify matches that calculated from the
   # given data and secret.
-  def self.is_valid_hmac?(body, secret, hmac_to_verify)
-    ActiveSupport::SecurityUtils.secure_compare(self.calculated_hmac(body, secret), hmac_to_verify.to_s)
+  def self.valid_hmac?(body, secret, hmac_to_verify)
+    ActiveSupport::SecurityUtils.secure_compare(calculated_hmac(body, secret), hmac_to_verify.to_s)
   end
 
   # Calculate the HMAC for the given data and secret.
   def self.calculated_hmac(body, secret)
-    digest  = OpenSSL::Digest.new('sha256')
+    digest = OpenSSL::Digest.new('sha256')
     Base64.encode64(OpenSSL::HMAC.digest(digest, secret, body)).strip
   end
 

data/app/services/disco_app/charges_service.rb

@@ -6,24 +6,22 @@ class DiscoApp::ChargesService
     # Create the charge object locally first.
     charge = subscription.charge_class.create!(
       shop: shop,
-      subscription: subscription,
+      subscription: subscription
     )
 
     # Create the charge object on Shopify.
-    shopify_charge = shop.with_api_context {
+    shopify_charge = shop.with_api_context do
       subscription.shopify_charge_class.create(
         name: subscription.plan.name,
-        price: '%.2f' % (subscription.amount.to_f / 100.0),
+        price: format('%.2f', (subscription.amount.to_f / 100.0)),
         trial_days: subscription.plan.has_trial? ? subscription.trial_period_days : nil,
         return_url: charge.activate_url,
         test: !DiscoApp.configuration.real_charges?
       )
-    }
+    end
 
     # If we couldn't create the charge on Shopify, return nil.
-    if shopify_charge.nil?
-      return nil
-    end
+    return nil if shopify_charge.nil?
 
     # Update the local record of the charge from Shopify's created charge, then
     # return it.
@@ -37,45 +35,39 @@ class DiscoApp::ChargesService
   # Attempt to activate the given Shopify charge for the given Shop using the
   # Shopify API. Returns true on successful activation, false otherwise.
   def self.activate(shop, charge)
-    begin
-      # Start by fetching the Shopify charge to check that it was accepted.
-      shopify_charge = shop.with_api_context {
-        charge.subscription.shopify_charge_class.find(charge.shopify_id)
-      }
+    # Start by fetching the Shopify charge to check that it was accepted.
+    shopify_charge = shop.with_api_context do
+      charge.subscription.shopify_charge_class.find(charge.shopify_id)
+    end
 
-      # Update the status of the local charge based on the Shopify charge.
-      charge.send("#{shopify_charge.status}!") if charge.respond_to? "#{shopify_charge.status}!"
+    # Update the status of the local charge based on the Shopify charge.
+    charge.send("#{shopify_charge.status}!") if charge.respond_to? "#{shopify_charge.status}!"
 
-      # If the charge wasn't accepted, fail and return.
-      return false unless charge.accepted?
+    # If the charge wasn't accepted, fail and return.
+    return false unless charge.accepted?
 
-      # If the charge was indeed accepted, activate it via Shopify.
-      charge.shop.with_api_context {
-        shopify_charge.activate
-      }
+    # If the charge was indeed accepted, activate it via Shopify.
+    charge.shop.with_api_context do
+      shopify_charge.activate
+    end
 
-      # If the charge was recurring, make sure that all other local recurring
-      # charges are marked inactive.
-      if charge.recurring?
-        self.cancel_recurring_charges(shop, charge)
-      end
+    # If the charge was recurring, make sure that all other local recurring
+    # charges are marked inactive.
+    cancel_recurring_charges(shop, charge) if charge.recurring?
 
-      charge.active!
+    charge.active!
 
-      true
-    rescue
-      false
-    end
+    true
+  rescue StandardError
+    false
   end
 
   # Cancel all recurring charges for the given shop. If the optional charge
   # parameter is given, it will be excluded from the cancellation.
   def self.cancel_recurring_charges(shop, charge = nil)
     charges = DiscoApp::RecurringApplicationCharge.where(shop: shop)
-    if charge.present?
-      charges = charges.where.not(id: charge)
-    end
-    charges.update_all(status: DiscoApp::RecurringApplicationCharge.statuses[:cancelled])
+    charges = charges.where.not(id: charge) if charge.present?
+    charges.update_all(status: DiscoApp::RecurringApplicationCharge.statuses[:cancelled]) # rubocop:disable Rails/SkipsModelValidations
   end
 
 end