RubyGems - disco_app - Versions diffs - 0.15.2 → 0.18.1 - Mend

disco_app 0.15.2 → 0.18.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (310) hide show

data/app/views/layouts/embedded_app.html.erb CHANGED Viewed

@@ -8,13 +8,13 @@
     // Initialise the Shopify App.
     ShopifyApp.init({
       "apiKey": "<%= ShopifyApp.configuration.api_key %>",
-      "shopOrigin": "<%= "https://#{ @shop_session.url }" if @shop_session %>",
+      "shopOrigin": "<%= "https://#{ @shop_session.domain }" if @shop_session %>",
       "debug": <%= Rails.env.development? ? 'true' : 'false' %>
     });
   </script>
   <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
+  <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload', 'data-turbolinks-eval': false %>
   <%= csrf_meta_tags %>
   <%= yield :extra_head %>
@@ -43,8 +43,6 @@
   </script>
   <% end %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true, 'data-turbolinks-eval' => false %>
   <%= render 'disco_app/shared/icons' %>
 </body>
 </html>

data/app/views/layouts/embedded_app_modal.html.erb CHANGED Viewed

@@ -7,15 +7,14 @@
     // Initialise the Shopify App.
     ShopifyApp.init({
       "apiKey": "<%= ShopifyApp.configuration.api_key %>",
-      "shopOrigin": "<%= "https://#{ @shop_session.url }" if @shop_session %>",
+      "shopOrigin": "<%= "https://#{ @shop_session.domain }" if @shop_session %>",
       "debug": <%= Rails.env.development? ? 'true' : 'false' %>,
       "forceRedirect": false
     });
   </script>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
   <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
+  <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
   <%= csrf_meta_tags %>
   <%= yield :extra_head %>

data/app/views/shopify_app/sessions/new.html.erb CHANGED Viewed

@@ -3,8 +3,8 @@
 <head>
   <title>Install <%= DiscoApp.configuration.app_name %></title>
-  <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
+  <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+  <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
   <%= csrf_meta_tags %>
   <%= yield :extra_head %>
@@ -36,7 +36,5 @@
       </section>
     </div>
   <% end %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
 </body>
 </html>

data/config/routes.rb CHANGED Viewed

@@ -1,7 +1,6 @@
 require 'sidekiq/web'
 DiscoApp::Engine.routes.draw do
   get 'ref', to: '/sessions#referral'
   get '/auth/failure', to: '/sessions#failure'
@@ -9,6 +8,16 @@ DiscoApp::Engine.routes.draw do
     post 'webhooks' => :process_webhook, as: :webhooks
   end
+  namespace :flow do
+    controller :actions do
+      post 'actions/:id' => :create_flow_action, as: :flow_actions
+    end
+    controller :trigger_usage do
+      post 'trigger_usage' => :update_trigger_usage, as: :flow_trigger_usage
+    end
+  end
   resources :user_sessions, only: [:new, :create, :destroy]
   get 'auth/shopify_user/callback' => 'user_sessions#callback'
@@ -46,7 +55,7 @@ DiscoApp::Engine.routes.draw do
   end
   # Make the Sidekiq Web UI accessible using the same credentials as the admin.
-  if Rails.env.production?
+  if Rails.env.production? || Rails.env.staging?
     Sidekiq::Web.use Rack::Auth::Basic do |username, password|
       [
         ENV['ADMIN_APP_USERNAME'].present?,
@@ -64,5 +73,4 @@ DiscoApp::Engine.routes.draw do
       get 'frame' => :frame, as: :frame
     end
   end
 end

data/db/migrate/20150525000000_create_shops_if_not_existent.rb CHANGED Viewed

@@ -6,105 +6,105 @@ class CreateShopsIfNotExistent < ActiveRecord::Migration[5.1]
   def change
     return if table_exists? :disco_app_shops
-    create_table "disco_app_app_settings", force: :cascade do |t|
-      t.datetime "created_at", null: false
-      t.datetime "updated_at", null: false
+    create_table :disco_app_app_settings, force: :cascade do |t|
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
     end
-    create_table "disco_app_application_charges", force: :cascade do |t|
-      t.integer  "shop_id",          limit: 8
-      t.integer  "subscription_id",  limit: 8
-      t.integer  "status",                     default: 0
-      t.datetime "created_at",                             null: false
-      t.datetime "updated_at",                             null: false
-      t.integer  "shopify_id",       limit: 8
-      t.string   "confirmation_url"
+    create_table :disco_app_application_charges, force: :cascade do |t|
+      t.integer :shop_id, limit: 8
+      t.integer :subscription_id, limit: 8
+      t.integer :status, default: 0
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.integer :shopify_id, limit: 8
+      t.string :confirmation_url
     end
-    create_table "disco_app_plan_codes", force: :cascade do |t|
-      t.integer  "plan_id",           limit: 8
-      t.string   "code"
-      t.integer  "trial_period_days"
-      t.integer  "amount"
-      t.datetime "created_at",                              null: false
-      t.datetime "updated_at",                              null: false
-      t.integer  "status",                      default: 0
+    create_table :disco_app_plan_codes, force: :cascade do |t|
+      t.integer :plan_id, limit: 8
+      t.string :code
+      t.integer :trial_period_days
+      t.integer :amount
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.integer :status, default: 0
     end
-    create_table "disco_app_plans", force: :cascade do |t|
-      t.integer  "status",            default: 0
-      t.string   "name"
-      t.integer  "plan_type",         default: 0
-      t.integer  "trial_period_days"
-      t.datetime "created_at",                        null: false
-      t.datetime "updated_at",                        null: false
-      t.integer  "amount",            default: 0
-      t.string   "currency",          default: "USD"
-      t.integer  "interval",          default: 0
-      t.integer  "interval_count",    default: 1
+    create_table :disco_app_plans, force: :cascade do |t|
+      t.integer :status, default: 0
+      t.string :name
+      t.integer :plan_type, default: 0
+      t.integer :trial_period_days
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.integer :amount, default: 0
+      t.string :currency, default: 'USD'
+      t.integer :interval, default: 0
+      t.integer :interval_count, default: 1
     end
-    create_table "disco_app_recurring_application_charges", force: :cascade do |t|
-      t.integer  "shop_id",          limit: 8
-      t.integer  "subscription_id",  limit: 8
-      t.integer  "status",                     default: 0
-      t.datetime "created_at",                             null: false
-      t.datetime "updated_at",                             null: false
-      t.integer  "shopify_id",       limit: 8
-      t.string   "confirmation_url"
+    create_table :disco_app_recurring_application_charges, force: :cascade do |t|
+      t.integer :shop_id, limit: 8
+      t.integer :subscription_id, limit: 8
+      t.integer :status, default: 0
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.integer :shopify_id, limit: 8
+      t.string :confirmation_url
     end
-    create_table "disco_app_sessions", force: :cascade do |t|
-      t.string   "session_id", null: false
-      t.text     "data"
-      t.datetime "created_at", null: false
-      t.datetime "updated_at", null: false
-      t.integer  "shop_id"
+    create_table :disco_app_sessions, force: :cascade do |t|
+      t.string :session_id, null: false
+      t.text :data
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.integer :shop_id
     end
-    add_index "disco_app_sessions", ["session_id"], name: "index_disco_app_sessions_on_session_id", unique: true, using: :btree
-    add_index "disco_app_sessions", ["updated_at"], name: "index_disco_app_sessions_on_updated_at", using: :btree
+    add_index :disco_app_sessions, [:session_id], name: 'index_disco_app_sessions_on_session_id', unique: true, using: :btree
+    add_index :disco_app_sessions, [:updated_at], name: 'index_disco_app_sessions_on_updated_at', using: :btree
-    create_table "disco_app_shops", force: :cascade do |t|
-      t.string   "shopify_domain",              null: false
-      t.string   "shopify_token",               null: false
-      t.datetime "created_at",                  null: false
-      t.datetime "updated_at",                  null: false
-      t.integer  "status",         default: 0
-      t.string   "domain"
-      t.string   "plan_name"
-      t.string   "name"
-      t.jsonb    "data",           default: {}
+    create_table :disco_app_shops, force: :cascade do |t|
+      t.string :shopify_domain, null: false
+      t.string :shopify_token, null: false
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.integer :status, default: 0
+      t.string :domain
+      t.string :plan_name
+      t.string :name
+      t.jsonb :data, default: {}
     end
-    add_index "disco_app_shops", ["shopify_domain"], name: "index_disco_app_shops_on_shopify_domain", unique: true, using: :btree
+    add_index :disco_app_shops, [:shopify_domain], name: 'index_disco_app_shops_on_shopify_domain', unique: true, using: :btree
-    create_table "disco_app_subscriptions", force: :cascade do |t|
-      t.integer  "shop_id"
-      t.integer  "plan_id"
-      t.integer  "status"
-      t.integer  "subscription_type"
-      t.datetime "created_at",                              null: false
-      t.datetime "updated_at",                              null: false
-      t.datetime "trial_start_at"
-      t.datetime "trial_end_at"
-      t.datetime "cancelled_at"
-      t.integer  "amount",                      default: 0
-      t.integer  "plan_code_id",      limit: 8
-      t.string   "source"
-      t.integer  "trial_period_days"
+    create_table :disco_app_subscriptions, force: :cascade do |t|
+      t.integer :shop_id
+      t.integer :plan_id
+      t.integer :status
+      t.integer :subscription_type
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.datetime :trial_start_at
+      t.datetime :trial_end_at
+      t.datetime :cancelled_at
+      t.integer :amount, default: 0
+      t.integer :plan_code_id, limit: 8
+      t.string :source
+      t.integer :trial_period_days
     end
-    add_index "disco_app_subscriptions", ["plan_id"], name: "index_disco_app_subscriptions_on_plan_id", using: :btree
-    add_index "disco_app_subscriptions", ["shop_id"], name: "index_disco_app_subscriptions_on_shop_id", using: :btree
+    add_index :disco_app_subscriptions, [:plan_id], name: 'index_disco_app_subscriptions_on_plan_id', using: :btree
+    add_index :disco_app_subscriptions, [:shop_id], name: 'index_disco_app_subscriptions_on_shop_id', using: :btree
-    add_foreign_key "disco_app_application_charges", "disco_app_shops", column: "shop_id"
-    add_foreign_key "disco_app_application_charges", "disco_app_subscriptions", column: "subscription_id"
-    add_foreign_key "disco_app_plan_codes", "disco_app_plans", column: "plan_id"
-    add_foreign_key "disco_app_recurring_application_charges", "disco_app_shops", column: "shop_id"
-    add_foreign_key "disco_app_recurring_application_charges", "disco_app_subscriptions", column: "subscription_id"
-    add_foreign_key "disco_app_sessions", "disco_app_shops", column: "shop_id", on_delete: :cascade
-    add_foreign_key "disco_app_subscriptions", "disco_app_plan_codes", column: "plan_code_id"
+    add_foreign_key :disco_app_application_charges, :disco_app_shops, column: :shop_id
+    add_foreign_key :disco_app_application_charges, :disco_app_subscriptions, column: :subscription_id
+    add_foreign_key :disco_app_plan_codes, :disco_app_plans, column: :plan_id
+    add_foreign_key :disco_app_recurring_application_charges, :disco_app_shops, column: :shop_id
+    add_foreign_key :disco_app_recurring_application_charges, :disco_app_subscriptions, column: :subscription_id
+    add_foreign_key :disco_app_sessions, :disco_app_shops, column: :shop_id, on_delete: :cascade
+    add_foreign_key :disco_app_subscriptions, :disco_app_plan_codes, column: :plan_code_id
   end
 end

data/db/migrate/20170315062548_create_disco_app_sources.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 class CreateDiscoAppSources < ActiveRecord::Migration[5.1]
   def change
     create_table :disco_app_sources do |t|
       t.string :source, null: true
@@ -7,4 +8,5 @@ class CreateDiscoAppSources < ActiveRecord::Migration[5.1]
     end
     add_index :disco_app_sources, :source
   end
 end

data/db/migrate/20170315062629_add_sources_to_shop_subscriptions.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 class AddSourcesToShopSubscriptions < ActiveRecord::Migration[5.1]
   def change
     add_column :disco_app_subscriptions, :source_id, :integer, limit: 8, index: true
     add_foreign_key :disco_app_subscriptions, :disco_app_sources, column: :source_id
@@ -9,6 +10,7 @@ class AddSourcesToShopSubscriptions < ActiveRecord::Migration[5.1]
       end
     end
-    remove_column :disco_app_subscriptions, :source
+    remove_column :disco_app_subscriptions, :source, :string
   end
 end

data/db/migrate/20170327214540_create_disco_app_users.rb CHANGED Viewed

@@ -1,13 +1,14 @@
 class CreateDiscoAppUsers < ActiveRecord::Migration[5.1]
   def change
     create_table :disco_app_users do |t|
       t.integer :shop_id, limit: 8
       t.string :first_name
       t.string :last_name
       t.string :email
       t.timestamps null: false
     end
     add_index :disco_app_users, :shop_id, unique: true
   end
 end

data/db/migrate/20170606160751_fix_disco_app_users_index.rb CHANGED Viewed

@@ -1,6 +1,8 @@
 class FixDiscoAppUsersIndex < ActiveRecord::Migration[5.1]
   def change
     remove_index :disco_app_users, :shop_id
     add_index :disco_app_users, [:id, :shop_id], unique: true
   end
 end

data/db/migrate/20181229100327_create_flow_actions_and_triggers.rb ADDED Viewed

@@ -0,0 +1,32 @@
+class CreateFlowActionsAndTriggers < ActiveRecord::Migration[5.2]
+  def change
+    create_table :disco_app_flow_actions do |t|
+      t.integer :shop_id, limit: 8
+      t.string :action_id
+      t.string :action_run_id
+      t.jsonb :properties, default: {}
+      t.integer :status, default: 0
+      t.datetime :processed_at, null: true
+      t.jsonb :processing_errors, default: []
+      t.timestamps null: false
+    end
+    create_table :disco_app_flow_triggers do |t|
+      t.integer :shop_id, limit: 8
+      t.string :title
+      t.string :resource_name
+      t.string :resource_url
+      t.jsonb :properties, default: {}
+      t.integer :status, default: 0
+      t.datetime :processed_at, null: true
+      t.jsonb :processing_errors, default: []
+      t.timestamps null: false
+    end
+    add_foreign_key :disco_app_flow_actions, :disco_app_shops, column: :shop_id, on_delete: :cascade
+    add_foreign_key :disco_app_flow_triggers, :disco_app_shops, column: :shop_id, on_delete: :cascade
+    add_index :disco_app_flow_actions, :action_run_id, unique: true
+  end
+end

data/db/migrate/20200405000000_create_flow_trigger_usages.rb ADDED Viewed

@@ -0,0 +1,16 @@
+class CreateFlowTriggerUsages < ActiveRecord::Migration[5.2]
+  def change
+    create_table :disco_app_flow_trigger_usages do |t|
+      t.integer :shop_id, limit: 8
+      t.string :flow_trigger_definition_id
+      t.boolean :has_enabled_flow, default: true
+      t.datetime :timestamp, null: true
+      t.timestamps null: false
+    end
+    add_foreign_key :disco_app_flow_trigger_usages, :disco_app_shops, column: :shop_id, on_delete: :cascade
+    add_index :disco_app_flow_trigger_usages, [:shop_id, :flow_trigger_definition_id], unique: true, name: :index_disco_app_flow_actions_on_shop_id_and_trigger_id
+  end
+end

data/lib/disco_app/configuration.rb CHANGED Viewed

@@ -8,6 +8,13 @@ module DiscoApp
     # Set the list of Shopify webhook topics to register.
     attr_accessor :webhook_topics
+    # Define the list of fields to receive for each webhook topic.
+    attr_accessor :webhook_fields
+    # Set Flow configuration
+    attr_accessor :flow_actions
+    attr_accessor :flow_triggers
     # Set the below if using an application proxy.
     attr_accessor :app_proxy_prefix
@@ -16,17 +23,17 @@ module DiscoApp
     # Set the below to create real Shopify charges.
     attr_accessor :real_charges
-    alias_method  :real_charges?, :real_charges
+    alias real_charges? real_charges
     # Optional configuration, usually useful for development environments.
     attr_accessor :skip_proxy_verification
-    alias_method  :skip_proxy_verification?, :skip_proxy_verification
+    alias skip_proxy_verification? skip_proxy_verification
     attr_accessor :skip_webhook_verification
-    alias_method  :skip_webhook_verification?, :skip_webhook_verification
+    alias skip_webhook_verification? skip_webhook_verification
     attr_accessor :skip_carrier_request_verification
-    alias_method  :skip_carrier_request_verification?, :skip_carrier_request_verification
+    alias skip_carrier_request_verification? skip_carrier_request_verification
     attr_accessor :skip_oauth
-    alias_method  :skip_oauth?, :skip_oauth
+    alias skip_oauth? skip_oauth
   end

data/lib/disco_app/constants.rb CHANGED Viewed

@@ -1,4 +1,6 @@
 module DiscoApp
-  SOURCE_COOKIE_KEY = '_disco_app_source'
-  CODE_COOKIE_KEY = '_disco_app_code'
+  SOURCE_COOKIE_KEY = '_disco_app_source'.freeze
+  CODE_COOKIE_KEY = '_disco_app_code'.freeze
 end

data/lib/disco_app/engine.rb CHANGED Viewed

@@ -19,7 +19,7 @@ module DiscoApp
     # Ensure our frame assets are included for precompilation.
     initializer 'disco_app.assets.precompile' do |app|
-      app.config.assets.precompile += %w(disco_app/icon.svg disco_app/admin.css disco_app/frame.css disco_app/frame.js)
+      app.config.assets.precompile += %w[disco_app/icon.svg disco_app/admin.css disco_app/frame.css disco_app/frame.js]
     end
   end

data/lib/disco_app/session.rb CHANGED Viewed

@@ -7,6 +7,7 @@ module DiscoApp
       def set_shop_id!
         return false unless loaded?
         write_attribute(:shop_id, data[:shopify] || data['shopify'])
       end

data/lib/disco_app/support/file_fixtures.rb CHANGED Viewed

@@ -11,7 +11,8 @@ module DiscoApp::Test
     def json_fixture(path, dir: 'json', parse: true)
       filename = Rails.root.join('test', 'fixtures', dir, "#{path}.json")
       return File.read(filename) unless parse
-      HashWithIndifferentAccess.new(ActiveSupport::JSON.decode(File.read(filename)))
+      HashWithIndifferentAccess.new(JSON.parse(File.read(filename)))
     end
     # Webhook fixtures are special-case JSON fixtures.

data/lib/disco_app/version.rb CHANGED Viewed

@@ -1,3 +1,5 @@
 module DiscoApp
-  VERSION = '0.15.2'
+  VERSION = '0.18.1'.freeze
 end

data/lib/generators/disco_app/install/USAGE ADDED Viewed

@@ -0,0 +1,5 @@
+Description:
+  Generate a new Shopify application.
+Example:
+  rails generate disco_app:install