disco_app 0.15.2 → 0.18.1

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

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

@@ -1,16 +1,14 @@
-require 'render_anywhere'
 require 'uglifier'
 
 module DiscoApp::Concerns::RendersAssets
+
   extend ActiveSupport::Concern
 
   included do
-    include RenderAnywhere
     after_commit :queue_render_asset_group_job
   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 +65,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 +75,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 +92,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,11 +132,11 @@ 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
-      @render_asset_renderer ||= self.class.const_get('RenderingController').new
+      @render_asset_renderer ||= self.class.const_get('ApplicationController').new
     end
 
     # Render any script tags defined by the :script_tags options that we have
@@ -157,9 +148,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,20 +1,26 @@
 module DiscoApp::Concerns::Shop
+
   extend ActiveSupport::Concern
 
   included do
-    include ShopifyApp::Shop
+    include ShopifyApp::SessionStorage
     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
+    has_many :flow_trigger_usages, class_name: 'DiscoApp::Flow::TriggerUsage', dependent: :destroy
+
     # Define possible installation statuses as an enum.
     enum status: {
       never_installed: 0,
@@ -27,7 +33,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) }
@@ -70,12 +76,12 @@ module DiscoApp::Concerns::Shop
 
     # Return the absolute URL to the shop's admin.
     def admin_url
-      "https://#{shopify_domain}/admin"
+      "https://#{shopify_domain}/admin/api/#{api_version}"
     end
 
-    # Convenience method to get the email of the shop's admin, to display in Rollbar.
-    def email
-      data[:email]
+    # Return the absolutely URL to the shop's admin.
+    def shopify_url
+      "https://#{shopify_domain}"
     end
 
     def installed_duration
@@ -85,11 +91,7 @@ module DiscoApp::Concerns::Shop
     # Return the shop's configured timezone. If none can be parsed from the
     # shop's "data" hash, return the default Rails zone (which should be UTC).
     def time_zone
-      @time_zone ||= begin
-        Time.find_zone!(data[:timezone].to_s.gsub(/^\(.+\)\s/, ''))
-      rescue ArgumentError
-        Time.zone
-      end
+      @time_zone ||= Time.find_zone!(data[:iana_timezone]) || Time.zone
     end
 
     # Return the shop's configured locale as a symbol. If none exists for some
@@ -100,7 +102,7 @@ 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.
@@ -108,6 +110,10 @@ module DiscoApp::Concerns::Shop
       read_attribute(:data).with_indifferent_access
     end
 
+    def api_version
+      ShopifyApp.configuration.api_version
+    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,28 @@
+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,
+            skipped: 3
+          }
+
+          def properties
+            read_attribute(:properties).with_indifferent_access
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module DiscoApp
+  module Flow
+    module Concerns
+      module TriggerUsage
+
+        extend ActiveSupport::Concern
+
+        included do
+          belongs_to :shop
+
+          self.table_name = :disco_app_flow_trigger_usages
+        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/flow/trigger_usage.rb

@@ -0,0 +1,9 @@
+module DiscoApp
+  module Flow
+    class TriggerUsage < ApplicationRecord
+
+      include DiscoApp::Flow::Concerns::TriggerUsage
+
+    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,6 +1,7 @@
 module DiscoApp
   class SessionStorage
-    def self.store(session)
+
+    def self.store(session, *args)
       shop = Shop.find_or_initialize_by(shopify_domain: session.url)
       shop.shopify_token = session.token
       shop.save!
@@ -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)
+      ShopifyAPI::Session.new(domain: shop.shopify_domain, token: shop.shopify_token, api_version: shop.api_version)
     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