disco_app 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e11c5ff7beaece5d87fda19c4d06bcc08ded718b71ce4050a5380c15e638be0
-  data.tar.gz: 7a1ceffb9b2c33f6dffe4a31b6877cbab52946cd3d37ad4396270c397dd99805
+  metadata.gz: 7b67b4667e899a379d0cc4152f228bfe7a80bef4aa6b35c26f54ee76c20c967f
+  data.tar.gz: d421b6283198d07e8ddc9a902e71a13320745e84f8fd5b3dbc981e6e88b70062
 SHA512:
-  metadata.gz: 6da76ea6fd5ac63a77fe4acaf4552946416841228994d4cf6b431a094180aa63d6d07a1ef586c71c44eeca0cfc38a4da30d6f0ed1a5b62c54b28b109fcdb485f
-  data.tar.gz: 1a96f567be81a5bc6189bb43bb98fd34181009459b2ec085ded5ad820ea662fa7a3780a40e3103a480debe70b74914d224e20cc90a21df3a5c5e949a74801ba4
+  metadata.gz: b713f8e47aefe3614a2016bad8046d91fdee669fa5635f3768d167d9c6768622af51ec5f6cb711040f7d712dc2cdac2e9f879f4d752956c008444de52ad326ec
+  data.tar.gz: df1e8549d1e7474f137bc7d6a483f7e06450f26273181bdb4724b79003d6a3f51e19b4b29c6d0736f2f390e9d2c8dcd922d5b7e1785717166e70f6e152b4ebdd

data/app/controllers/disco_app/install_controller.rb

@@ -6,7 +6,7 @@ class DiscoApp::InstallController < ApplicationController
 
   # Start the installation process for the current shop, then redirect to the installing screen.
   def install
-    DiscoApp::AppInstalledJob.perform_later(@shop.shopify_domain, cookies[DiscoApp::CODE_COOKIE_KEY], cookies[DiscoApp::SOURCE_COOKIE_KEY])
+    DiscoApp::AppInstalledJob.perform_later(@shop, cookies[DiscoApp::CODE_COOKIE_KEY], cookies[DiscoApp::SOURCE_COOKIE_KEY])
     redirect_to action: :installing
   end
 

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

@@ -14,10 +14,10 @@ module DiscoApp::Concerns::AppInstalledJob
   # - Perform initial update of shop information.
   # - Subscribe to default plan, if any exists.
   #
-  def perform(shopify_domain, plan_code = nil, source = nil)
-    DiscoApp::SynchroniseWebhooksJob.perform_now(shopify_domain)
-    DiscoApp::SynchroniseCarrierServiceJob.perform_now(shopify_domain)
-    DiscoApp::ShopUpdateJob.perform_now(shopify_domain)
+  def perform(shop, plan_code = nil, source = nil)
+    DiscoApp::SynchroniseWebhooksJob.perform_now(@shop)
+    DiscoApp::SynchroniseCarrierServiceJob.perform_now(@shop)
+    DiscoApp::ShopUpdateJob.perform_now(@shop)
 
     @shop.reload
 

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

@@ -0,0 +1,8 @@
+module DiscoApp::Concerns::RenderAssetGroupJob
+  extend ActiveSupport::Concern
+
+  def perform(shop, instance, asset_group)
+    instance.render_asset_group(asset_group.to_sym)
+  end
+
+end

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

@@ -2,7 +2,7 @@ module DiscoApp::Concerns::ShopUpdateJob
   extend ActiveSupport::Concern
 
   # Perform an update of the current shop's information.
-  def perform(shopify_domain, shop_data = nil)
+  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)
 

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

@@ -1,7 +1,7 @@
 module DiscoApp::Concerns::SubscriptionChangedJob
   extend ActiveSupport::Concern
 
-  def perform(shopify_domain, subscription)
+  def perform(shop, subscription)
   end
 
 end

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

@@ -2,7 +2,7 @@ module DiscoApp::Concerns::SynchroniseCarrierServiceJob
   extend ActiveSupport::Concern
 
   # Ensure that any carrier service required by our app is registered.
-  def perform(shopify_domain)
+  def perform(shop)
     # Don't proceed unless we have a name and callback url.
     return unless carrier_service_name and callback_url
 

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

@@ -3,7 +3,7 @@ module DiscoApp::Concerns::SynchroniseWebhooksJob
 
   # Ensure the webhooks registered with our shop are the same as those listed
   # in our application configuration.
-  def perform(shopify_domain)
+  def perform(shop)
     # Get the full list of expected webhook topics.
     expected_topics = [:'app/uninstalled', :'shop/update'] + topics
 

data/app/jobs/disco_app/render_asset_group_job.rb

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

data/app/jobs/disco_app/shop_job.rb

@@ -15,7 +15,7 @@ class DiscoApp::ShopJob < ActiveJob::Base
   private
 
     def find_shop(job)
-      @shop ||= DiscoApp::Shop.find_by!(shopify_domain: job.arguments.first)
+      @shop ||= job.arguments.first.is_a?(DiscoApp::Shop) ? job.arguments.first : DiscoApp::Shop.find_by!(shopify_domain: job.arguments.first)
     end
 
     def shop_context(job, block)

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

@@ -0,0 +1,148 @@
+require 'render_anywhere'
+
+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
+    # model that supports an `after_commit` callback; and (2) that the model has
+    # a `shop` method (or attribute) that references the DiscoApp::Shop instance
+    # associated with the current model.
+    #
+    # Options
+    #
+    #   assets:           Required. A list of asset templates to be rendered and
+    #                     uploaded to Shopify. The order of assets matters only
+    #                     in that subsequent asset templates will have access to
+    #                     the public CDN url of earlier-rendered assets through
+    #                     a "@public_urls" context variable.
+    #
+    #   triggered_by:     Optional. A list of attributes that should trigger the
+    #                     re-rendering and upload of the assets defined by the
+    #                     `assets` option, provided as a list of string. If
+    #                     empty or nil, nothing will be triggered.
+    #
+    #   script_tags:      Optional. A list of assets that should have script
+    #                     tags created or updated after being rendered to the
+    #                     storefront.
+    #
+    #   compress:         Optional. Whether Javascript and SCSS assets should be
+    #                     compressed after being rendered. Defaults to true in
+    #                     production environments, false otherwise.
+    #
+    def renders_assets(*asset_groups)
+      options = asset_groups.last.is_a?(Hash) ? asset_groups.pop : {}
+      options = renders_assets_default_options.merge(options)
+
+      # Ensure assets, triggered by and script tag options are arrays.
+      options[:assets] = options[:assets] ? Array(options[:assets]).map(&:to_sym) : []
+      options[:triggered_by] = options[:triggered_by] ? Array(options[:triggered_by]).map(&:to_s) : []
+      options[:script_tags] = options[:script_tags] ? Array(options[:script_tags]).map(&:to_sym) : []
+
+      asset_groups.each do |asset_group|
+        renderable_asset_groups[asset_group.to_sym] = options
+      end
+    end
+
+    # Return a list of renderable asset groups, along with their options.
+    def renderable_asset_groups
+      @renderable_asset_groups ||= {}
+    end
+
+    # Return the default options for the `renders_assets` macro.
+    def renders_assets_default_options
+      {
+        assets: nil,
+        triggered_by: nil,
+        compress: Rails.env.production?
+      }
+    end
+
+  end
+
+  # Callback, triggered after a model save. Iterates through each asset group
+  # defined on the model and queues a render job if any of the changed
+  # 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
+    end
+  end
+
+  # Copies the class-level hash of assets with symbol asset name as keys and
+  # their corresponding options as values to the instance.
+  def renderable_asset_groups
+    @renderable_asset_groups ||= self.class.renderable_asset_groups.dup
+  end
+
+  # Render the specified asset group and upload the result to Shopify.
+  def render_asset_group(asset_group)
+    options = renderable_asset_groups[asset_group]
+    public_urls = {}
+
+    options[:assets].each do |asset|
+      # Create/replace the asset via the Shopify API.
+      shopify_asset = shop.temp {
+        ShopifyAPI::Asset.create(
+          key: "assets/#{asset}",
+          value: render_asset_group_asset(asset, public_urls)
+        )
+      }
+
+      # 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.
+      public_urls[asset] = shopify_asset.public_url.gsub(/\.scss\?/, '.scss.css?')
+    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
+  end
+
+  private
+
+    # Render an individual asset within an asset group.
+    def render_asset_group_asset(asset, public_urls)
+      render_asset_renderer.render_to_string(
+        template: "assets/#{asset}",
+        layout: nil,
+        locals: {
+          :"@#{self.class.name.underscore}" => self,
+          :@public_urls => public_urls
+        }
+      )
+    end
+
+    def render_asset_renderer
+      @render_asset_renderer ||= self.class.const_get('RenderingController').new
+    end
+
+    # Render any script tags defined by the :script_tags options that we have
+    # a public URL for.
+    def render_asset_script_tags(options, public_urls)
+      # Fetch the current set of script tags for the store.
+      current_script_tags = shop.temp { ShopifyAPI::ScriptTag.find(:all) }
+
+      # 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.temp { script_tag.save }
+      end
+    end
+
+end

data/app/services/disco_app/subscription_service.rb

@@ -37,7 +37,7 @@ class DiscoApp::SubscriptionService
     )
 
     # Enqueue the subscription changed background job.
-    DiscoApp::SubscriptionChangedJob.perform_later(shop.shopify_domain, new_subscription)
+    DiscoApp::SubscriptionChangedJob.perform_later(shop, new_subscription)
 
     # Return the new subscription.
     new_subscription

data/lib/disco_app/version.rb

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end

data/lib/generators/disco_app/disco_app_generator.rb

@@ -38,10 +38,9 @@ class DiscoAppGenerator < Rails::Generators::Base
     gem 'react-rails', '~> 1.6.0'
     gem 'classnames-rails', '~> 2.1.5'
     gem 'active_link_to', '~> 1.0.2'
-    # Add premailer gem to Gemfile.
     gem 'premailer-rails', '~> 1.8.2'
-    # Add explicit dependency on Nokogiri
     gem 'nokogiri', '~> 1.6.7.2'
+    gem 'render_anywhere', '~> 0.0.12', require: false
 
     # Add gems for development and testing only.
     gem_group :development, :test do

data/lib/tasks/carrier_service.rake

@@ -3,7 +3,7 @@ namespace :carrier_service do
   desc 'Synchronise carrier service across all installed shops.'
   task sync: :environment do
     DiscoApp::Shop.installed.has_active_shopify_plan.each do |shop|
-      DiscoApp::SynchroniseCarrierServiceJob.perform_later(shop.shopify_domain)
+      DiscoApp::SynchroniseCarrierServiceJob.perform_later(shop)
     end
   end
 

data/lib/tasks/shops.rake

@@ -3,7 +3,7 @@ namespace :shops do
   desc 'Synchronise shop data across all installed shops.'
   task sync: :environment do
     DiscoApp::Shop.installed.has_active_shopify_plan.each do |shop|
-      DiscoApp::ShopUpdateJob.perform_later(shop.shopify_domain)
+      DiscoApp::ShopUpdateJob.perform_later(shop)
     end
   end
 

data/lib/tasks/webhooks.rake

@@ -3,7 +3,7 @@ namespace :webhooks do
   desc 'Synchronise webhooks across all installed shops.'
   task sync: :environment do
     DiscoApp::Shop.installed.has_active_shopify_plan.each do |shop|
-      DiscoApp::SynchroniseWebhooksJob.perform_later(shop.shopify_domain)
+      DiscoApp::SynchroniseWebhooksJob.perform_later(shop)
     end
   end
 

data/test/dummy/app/jobs/products_create_job.rb

@@ -1,6 +1,6 @@
 class ProductsCreateJob < DiscoApp::ShopJob
 
-  def perform(shopify_domain, product_data)
+  def perform(shop, product_data)
     Product.synchronise(@shop, product_data)
   end
 

data/test/dummy/app/jobs/products_delete_job.rb

@@ -1,6 +1,6 @@
 class ProductsDeleteJob < DiscoApp::ShopJob
 
-  def perform(shopify_domain, product_data)
+  def perform(shop, product_data)
     Product.synchronise_deletion(@shop, product_data)
   end
 

data/test/dummy/app/jobs/products_update_job.rb

@@ -1,6 +1,6 @@
 class ProductsUpdateJob < DiscoApp::ShopJob
 
-  def perform(shopify_domain, product_data)
+  def perform(shop, product_data)
     Product.synchronise(@shop, product_data)
   end
 

data/test/dummy/app/models/js_configuration.rb

@@ -0,0 +1,8 @@
+class JsConfiguration < ActiveRecord::Base
+  include DiscoApp::Concerns::RendersAssets
+
+  belongs_to :shop, class_name: 'DiscoApp::Shop'
+
+  renders_assets :js_assets, assets: 'test.js', triggered_by: 'locale'
+
+end

data/test/dummy/app/models/widget_configuration.rb

@@ -0,0 +1,10 @@
+class WidgetConfiguration < ActiveRecord::Base
+  include DiscoApp::Concerns::RendersAssets
+
+  belongs_to :shop, class_name: 'DiscoApp::Shop'
+
+  renders_assets :widget_assets, assets: ['widget.scss', 'widget.js'], triggered_by: ['locale', 'background_color']
+  renders_assets :liquid_assets, assets: 'widget.liquid', triggered_by: ['locale']
+  renders_assets :script_tag_assets, assets: 'script_tag.js', script_tags: 'script_tag.js'
+
+end

data/test/dummy/app/views/assets/script_tag.js.erb

@@ -0,0 +1 @@
+(function() { console.log('Script Tag!') });

data/test/dummy/app/views/assets/test.js.erb

@@ -0,0 +1 @@
+var locale = '<%= @js_configuration.locale %>';

data/test/dummy/app/views/assets/widget.js.erb

@@ -0,0 +1,2 @@
+var locale = '<%= @widget_configuration.locale %>';
+var cssUrl = '<%= @public_urls[:'widget.scss'] %>';

data/test/dummy/app/views/assets/widget.scss.erb

@@ -0,0 +1,3 @@
+#widget {
+  background-color: <%= @widget_configuration.background_color %>;
+}

data/test/dummy/db/migrate/20160530160739_create_asset_models.rb

@@ -0,0 +1,19 @@
+class CreateAssetModels < ActiveRecord::Migration
+  def change
+    create_table :js_configurations do |t|
+      t.integer :shop_id, limit: 8
+      t.string :label, default: 'Default'
+      t.string :locale, default: 'en'
+    end
+
+    create_table :widget_configurations do |t|
+      t.integer :shop_id, limit: 8
+      t.string :label, default: 'Default'
+      t.string :locale, default: 'en'
+      t.string :background_color, default: '#FFFFFF'
+    end
+
+    add_foreign_key :js_configurations, :disco_app_shops, column: :shop_id
+    add_foreign_key :widget_configurations, :disco_app_shops, column: :shop_id
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160521135510) do
+ActiveRecord::Schema.define(version: 20160530160739) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -108,6 +108,12 @@ ActiveRecord::Schema.define(version: 20160521135510) do
   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
 
+  create_table "js_configurations", force: :cascade do |t|
+    t.integer "shop_id", limit: 8
+    t.string  "label",             default: "Default"
+    t.string  "locale",            default: "en"
+  end
+
   create_table "products", force: :cascade do |t|
     t.integer  "shop_id",    limit: 8
     t.jsonb    "data"
@@ -115,6 +121,13 @@ ActiveRecord::Schema.define(version: 20160521135510) do
     t.datetime "updated_at",           null: false
   end
 
+  create_table "widget_configurations", force: :cascade do |t|
+    t.integer "shop_id",          limit: 8
+    t.string  "label",                      default: "Default"
+    t.string  "locale",                     default: "en"
+    t.string  "background_color",           default: "#FFFFFF"
+  end
+
   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"
@@ -122,5 +135,7 @@ ActiveRecord::Schema.define(version: 20160521135510) do
   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 "js_configurations", "disco_app_shops", column: "shop_id"
   add_foreign_key "products", "disco_app_shops", column: "shop_id"
+  add_foreign_key "widget_configurations", "disco_app_shops", column: "shop_id"
 end

data/test/fixtures/api/widget_store/assets/create_script_tag_js_request.json

@@ -0,0 +1,6 @@
+{
+  "asset":{
+    "key":"assets/script_tag.js",
+    "value":"(function() { console.log('Script Tag!') });\n"
+  }
+}

data/test/fixtures/api/widget_store/assets/create_script_tag_js_response.json

@@ -0,0 +1,12 @@
+{
+  "asset": {
+    "key": "assets/script_tag.js",
+    "public_url": "https://cdn.shopify.com/s/files/1/1308/2083/t/1/assets/script_tag.js?8557426387360348643",
+    "created_at": "2016-05-31T10:58:51-04:00",
+    "updated_at": "2016-05-31T10:58:51-04:00",
+    "content_type": "application/javascript",
+    "size": 45,
+    "theme_id": 106913286,
+    "warnings": []
+  }
+}

data/test/fixtures/api/widget_store/assets/create_script_tag_request.json

@@ -0,0 +1,6 @@
+{
+  "script_tag":{
+    "event":"onload",
+    "src":"https://cdn.shopify.com/s/files/1/1308/2083/t/1/assets/script_tag.js?8557426387360348643"
+  }
+}

data/test/fixtures/api/widget_store/assets/create_script_tag_response.json

@@ -0,0 +1,10 @@
+{
+  "script_tag": {
+    "id": 38138886,
+    "src": "https://cdn.shopify.com/s/files/1/1308/2083/t/1/assets/script_tag.js?8557426387360348643",
+    "event": "onload",
+    "created_at": "2016-05-31T11:09:17-04:00",
+    "updated_at": "2016-05-31T11:09:17-04:00",
+    "display_scope": "all"
+  }
+}

data/test/fixtures/api/widget_store/assets/create_test_js_request.json

@@ -0,0 +1,6 @@
+{
+  "asset":{
+    "key":"assets/test.js",
+    "value":"var locale = 'sv';\n"
+  }
+}

data/test/fixtures/api/widget_store/assets/create_test_js_response.json

@@ -0,0 +1,12 @@
+{
+  "asset": {
+    "key": "assets/test.js",
+    "public_url": "https://cdn.shopify.com/s/files/1/1308/2083/t/1/assets/test.js?8565972447222863489",
+    "created_at": "2016-05-31T08:22:07-04:00",
+    "updated_at": "2016-05-31T08:22:07-04:00",
+    "content_type": "application/javascript",
+    "size": 19,
+    "theme_id": 106913286,
+    "warnings": []
+  }
+}

data/test/fixtures/api/widget_store/assets/create_widget_js_request.json

@@ -0,0 +1,6 @@
+{
+  "asset":{
+    "key":"assets/widget.js",
+    "value":"var locale = 'sv';\nvar cssUrl = 'https://cdn.shopify.com/s/files/1/1308/2083/t/1/assets/widget.scss.css?12368054146898033463';\n"
+  }
+}

data/test/fixtures/api/widget_store/assets/create_widget_js_response.json

@@ -0,0 +1,12 @@
+{
+  "asset": {
+    "key": "assets/widget.js",
+    "public_url": "https://cdn.shopify.com/s/files/1/1308/2083/t/1/assets/widget.js?14127703044459766029",
+    "created_at": "2016-05-31T10:15:25-04:00",
+    "updated_at": "2016-05-31T10:15:25-04:00",
+    "content_type": "application/javascript",
+    "size": 123,
+    "theme_id": 106913286,
+    "warnings": []
+  }
+}

data/test/fixtures/api/widget_store/assets/create_widget_scss_request.json

@@ -0,0 +1,6 @@
+{
+  "asset":{
+    "key":"assets/widget.scss",
+    "value":"#widget {\n  background-color: #006AA7;\n}\n"
+  }
+}

data/test/fixtures/api/widget_store/assets/create_widget_scss_response.json

@@ -0,0 +1,12 @@
+{
+  "asset": {
+    "key": "assets/widget.scss",
+    "public_url": "https://cdn.shopify.com/s/files/1/1308/2083/t/1/assets/widget.scss?12368054146898033463",
+    "created_at": "2016-05-31T08:40:24-04:00",
+    "updated_at": "2016-05-31T08:40:24-04:00",
+    "content_type": "text/css",
+    "size": 41,
+    "theme_id": 106913286,
+    "warnings": []
+  }
+}

data/test/fixtures/api/widget_store/assets/get_script_tags_empty_request.json

@@ -0,0 +1 @@
+{}

data/test/fixtures/api/widget_store/assets/get_script_tags_empty_response.json

@@ -0,0 +1 @@
+[]

data/test/fixtures/api/widget_store/assets/get_script_tags_preexisting_request.json

@@ -0,0 +1 @@
+{}

data/test/fixtures/api/widget_store/assets/get_script_tags_preexisting_response.json

@@ -0,0 +1,12 @@
+{
+  "script_tags": [
+    {
+      "id": 38138886,
+      "src": "https://cdn.shopify.com/s/files/1/1308/2083/t/1/assets/script_tag.js?8557426387360348000",
+      "event": "onload",
+      "created_at": "2016-05-31T11:09:17-04:00",
+      "updated_at": "2016-05-31T11:09:17-04:00",
+      "display_scope": "all"
+    }
+  ]
+}

data/test/fixtures/api/widget_store/assets/update_script_tag_request.json

@@ -0,0 +1,10 @@
+{
+  "script_tag":{
+    "id":38138886,
+    "src":"https://cdn.shopify.com/s/files/1/1308/2083/t/1/assets/script_tag.js?8557426387360348643",
+    "event":"onload",
+    "created_at":"2016-05-31T11:09:17-04:00",
+    "updated_at":"2016-05-31T11:09:17-04:00",
+    "display_scope":"all"
+  }
+}

data/test/fixtures/api/widget_store/assets/update_script_tag_response.json

@@ -0,0 +1,10 @@
+{
+  "script_tag": {
+    "id": 38138886,
+    "src": "https://cdn.shopify.com/s/files/1/1308/2083/t/1/assets/script_tag.js?8557426387360348643",
+    "event": "onload",
+    "created_at": "2016-05-31T11:09:17-04:00",
+    "updated_at": "2016-05-31T11:09:17-04:00",
+    "display_scope": "all"
+  }
+}

data/test/fixtures/assets/test.js

@@ -0,0 +1 @@
+var locale = 'sv';

data/test/fixtures/js_configurations.yml

@@ -0,0 +1,3 @@
+js_swedish:
+  shop: widget_store
+  locale: sv

data/test/fixtures/widget_configurations.yml

@@ -0,0 +1,4 @@
+widget_swedish:
+  shop: widget_store
+  locale: sv
+  background_color: '#006AA7'

data/test/jobs/disco_app/app_installed_job_test.rb

@@ -20,7 +20,7 @@ class DiscoApp::AppInstalledJobTest < ActionController::TestCase
   test 'app installed job performs shop update job' do
     # Assert the main install job can be enqueued and performed.
     perform_enqueued_jobs do
-      DiscoApp::AppInstalledJob.perform_later(@shop.shopify_domain)
+      DiscoApp::AppInstalledJob.perform_later(@shop)
     end
 
     # Assert the update shop job was performed.
@@ -32,7 +32,7 @@ class DiscoApp::AppInstalledJobTest < ActionController::TestCase
     @shop.current_subscription.destroy
 
     perform_enqueued_jobs do
-      DiscoApp::AppInstalledJob.perform_later(@shop.shopify_domain)
+      DiscoApp::AppInstalledJob.perform_later(@shop)
     end
 
     # Assert the shop was subscribed to the development plan.
@@ -43,7 +43,7 @@ class DiscoApp::AppInstalledJobTest < ActionController::TestCase
     @shop.current_subscription.destroy
 
     perform_enqueued_jobs do
-      DiscoApp::AppInstalledJob.perform_later(@shop.shopify_domain, 'PODCAST', 'smpodcast')
+      DiscoApp::AppInstalledJob.perform_later(@shop, 'PODCAST', 'smpodcast')
     end
 
     # Assert the shop was subscribed to the development plan.

data/test/jobs/disco_app/app_uninstalled_job_test.rb

@@ -7,7 +7,7 @@ class DiscoApp::AppUninstalledJobTest < ActionController::TestCase
     @shop = disco_app_shops(:widget_store)
 
     perform_enqueued_jobs do
-      DiscoApp::AppUninstalledJob.perform_later(@shop.shopify_domain, {})
+      DiscoApp::AppUninstalledJob.perform_later(@shop, {})
     end
   end
 

data/test/models/disco_app/renders_assets_test.rb

@@ -0,0 +1,100 @@
+require 'test_helper'
+
+class DiscoApp::RendersAssetsTest < ActiveSupport::TestCase
+  include ActiveJob::TestHelper
+  include DiscoApp::Test::ShopifyAPI
+
+  def setup
+    @shop = disco_app_shops(:widget_store)
+    @js_configuration = js_configurations(:js_swedish)
+    @widget_configuration = widget_configurations(:widget_swedish)
+  end
+
+  def teardown
+    @shop = nil
+    @js_configuration = nil
+    @widget_configuration = nil
+  end
+
+  ##
+  # Test queueing behaviour.
+  ##
+
+  test 'rendering of javascript asset group queued when locale changed' do
+    assert_enqueued_with(job: DiscoApp::RenderAssetGroupJob) do
+      @js_configuration.update(locale: :no)
+    end
+  end
+
+  test 'rendering of javascript asset group not queued when label changed' do
+    assert_no_enqueued_jobs do
+      @js_configuration.update(label: 'Sample')
+    end
+  end
+
+  test 'rendering of widget asset group queued when locale changed' do
+    assert_enqueued_with(job: DiscoApp::RenderAssetGroupJob, args: [@widget_configuration.shop, @widget_configuration, 'widget_assets']) do
+      @widget_configuration.update(locale: :no)
+    end
+  end
+
+  test 'rendering of liquid asset group queued when locale changed' do
+    assert_enqueued_with(job: DiscoApp::RenderAssetGroupJob, args: [@widget_configuration.shop, @widget_configuration, 'liquid_assets']) do
+      @widget_configuration.update(locale: :no)
+    end
+  end
+
+  test 'rendering of widget asset group queued when background color changed' do
+    assert_enqueued_with(job: DiscoApp::RenderAssetGroupJob, args: [@widget_configuration.shop, @widget_configuration, 'widget_assets']) do
+      @widget_configuration.update(background_color: '#FF0000')
+    end
+  end
+
+  test 'rendering of liquid asset group not queued when background color changed' do
+    assert_enqueued_jobs 1 do
+      @widget_configuration.update(background_color: '#FF0000')
+    end
+  end
+
+  ##
+  # Test rendering behaviour.
+  ##
+
+  test 'individual js asset renders correctly' do
+    assert_equal asset_fixture('test.js'), @js_configuration.send('render_asset_group_asset', 'test.js', {})
+  end
+
+  test 'js asset group renders and uploads to shopify' do
+    stub_api_request(:put, "#{@shop.admin_url}/assets.json", 'widget_store/assets/create_test_js')
+    @js_configuration.render_asset_group(:js_assets)
+  end
+
+  test 'widget asset group renders and uploads to shopify' do
+    stub_api_request(:put, "#{@shop.admin_url}/assets.json", 'widget_store/assets/create_widget_scss')
+    stub_api_request(:put, "#{@shop.admin_url}/assets.json", 'widget_store/assets/create_widget_js')
+    @widget_configuration.render_asset_group(:widget_assets)
+  end
+
+  test 'script tag asset group renders, uploads to shopify and creates new script tag' do
+    stub_api_request(:put, "#{@shop.admin_url}/assets.json", 'widget_store/assets/create_script_tag_js')
+    stub_api_request(:get, "#{@shop.admin_url}/script_tags.json", 'widget_store/assets/get_script_tags_empty')
+    stub_api_request(:post, "#{@shop.admin_url}/script_tags.json", 'widget_store/assets/create_script_tag')
+    @widget_configuration.render_asset_group(:script_tag_assets)
+  end
+
+  test 'script tag asset group renders, uploads to shopify and updates existing script tag' do
+    stub_api_request(:put, "#{@shop.admin_url}/assets.json", 'widget_store/assets/create_script_tag_js')
+    stub_api_request(:get, "#{@shop.admin_url}/script_tags.json", 'widget_store/assets/get_script_tags_preexisting')
+    stub_api_request(:put, "#{@shop.admin_url}/script_tags/38138886.json", 'widget_store/assets/update_script_tag')
+    @widget_configuration.render_asset_group(:script_tag_assets)
+  end
+
+  private
+
+    # Return an asset fixture as a string.
+    def asset_fixture(path)
+      filename = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), 'fixtures', 'assets', "#{path}")
+      File.read(filename)
+    end
+
+end

data/test/support/test_shopify_api.rb

@@ -5,7 +5,7 @@ module DiscoApp::Test
       if method == :get
         stub_request(method, endpoint)
           .to_return(status: 200, body: api_fixture("#{fixture_name}_response").to_json)
-      elsif method == :post
+      elsif method == :post or method == :put
         stub_request(method, endpoint)
           .with(body: api_fixture("#{fixture_name}_request").to_json)
           .to_return(status: 201, body: api_fixture("#{fixture_name}_response").to_json)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disco_app
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Gavin Ballard
@@ -220,6 +220,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.5
+- !ruby/object:Gem::Dependency
+  name: render_anywhere
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.12
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.12
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -389,10 +403,12 @@ files:
 - app/jobs/disco_app/app_uninstalled_job.rb
 - app/jobs/disco_app/concerns/app_installed_job.rb
 - app/jobs/disco_app/concerns/app_uninstalled_job.rb
+- app/jobs/disco_app/concerns/render_asset_group_job.rb
 - app/jobs/disco_app/concerns/shop_update_job.rb
 - app/jobs/disco_app/concerns/subscription_changed_job.rb
 - app/jobs/disco_app/concerns/synchronise_carrier_service_job.rb
 - app/jobs/disco_app/concerns/synchronise_webhooks_job.rb
+- app/jobs/disco_app/render_asset_group_job.rb
 - app/jobs/disco_app/shop_job.rb
 - app/jobs/disco_app/shop_update_job.rb
 - app/jobs/disco_app/subscription_changed_job.rb
@@ -403,6 +419,7 @@ files:
 - app/models/disco_app/concerns/app_settings.rb
 - app/models/disco_app/concerns/plan.rb
 - app/models/disco_app/concerns/plan_code.rb
+- app/models/disco_app/concerns/renders_assets.rb
 - app/models/disco_app/concerns/shop.rb
 - app/models/disco_app/concerns/subscription.rb
 - app/models/disco_app/concerns/synchronises.rb
@@ -522,7 +539,13 @@ files:
 - test/dummy/app/jobs/products_delete_job.rb
 - test/dummy/app/jobs/products_update_job.rb
 - test/dummy/app/models/disco_app/shop.rb
+- test/dummy/app/models/js_configuration.rb
 - test/dummy/app/models/product.rb
+- test/dummy/app/models/widget_configuration.rb
+- test/dummy/app/views/assets/script_tag.js.erb
+- test/dummy/app/views/assets/test.js.erb
+- test/dummy/app/views/assets/widget.js.erb
+- test/dummy/app/views/assets/widget.scss.erb
 - test/dummy/app/views/home/index.html.erb
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
@@ -554,11 +577,28 @@ files:
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
 - test/dummy/db/migrate/20160307182229_create_products.rb
+- test/dummy/db/migrate/20160530160739_create_asset_models.rb
 - test/dummy/db/schema.rb
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/fixtures/api/widget_store/assets/create_script_tag_js_request.json
+- test/fixtures/api/widget_store/assets/create_script_tag_js_response.json
+- test/fixtures/api/widget_store/assets/create_script_tag_request.json
+- test/fixtures/api/widget_store/assets/create_script_tag_response.json
+- test/fixtures/api/widget_store/assets/create_test_js_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/create_widget_js_response.json
+- test/fixtures/api/widget_store/assets/create_widget_scss_request.json
+- test/fixtures/api/widget_store/assets/create_widget_scss_response.json
+- test/fixtures/api/widget_store/assets/get_script_tags_empty_request.json
+- test/fixtures/api/widget_store/assets/get_script_tags_empty_response.json
+- test/fixtures/api/widget_store/assets/get_script_tags_preexisting_request.json
+- test/fixtures/api/widget_store/assets/get_script_tags_preexisting_response.json
+- test/fixtures/api/widget_store/assets/update_script_tag_request.json
+- test/fixtures/api/widget_store/assets/update_script_tag_response.json
 - test/fixtures/api/widget_store/charges/activate_application_charge_request.json
 - test/fixtures/api/widget_store/charges/activate_application_charge_response.json
 - test/fixtures/api/widget_store/charges/activate_recurring_application_charge_request.json
@@ -577,21 +617,25 @@ files:
 - test/fixtures/api/widget_store/charges/get_pending_recurring_application_charge_response.json
 - test/fixtures/api/widget_store/shop.json
 - test/fixtures/api/widget_store/webhooks.json
+- test/fixtures/assets/test.js
 - test/fixtures/disco_app/application_charges.yml
 - test/fixtures/disco_app/plan_codes.yml
 - test/fixtures/disco_app/plans.yml
 - test/fixtures/disco_app/recurring_application_charges.yml
 - test/fixtures/disco_app/shops.yml
 - test/fixtures/disco_app/subscriptions.yml
+- test/fixtures/js_configurations.yml
 - test/fixtures/products.yml
 - test/fixtures/webhooks/app_uninstalled.json
 - test/fixtures/webhooks/product_created.json
 - test/fixtures/webhooks/product_deleted.json
 - test/fixtures/webhooks/product_updated.json
+- test/fixtures/widget_configurations.yml
 - test/integration/synchronises_test.rb
 - test/jobs/disco_app/app_installed_job_test.rb
 - test/jobs/disco_app/app_uninstalled_job_test.rb
 - test/models/disco_app/plan_test.rb
+- test/models/disco_app/renders_assets_test.rb
 - test/models/disco_app/session_test.rb
 - test/models/disco_app/shop_test.rb
 - test/models/disco_app/subscription_test.rb
@@ -649,7 +693,14 @@ test_files:
 - 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/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/views/home/index.html.erb
+- 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
@@ -676,6 +727,22 @@ test_files:
 - test/dummy/config/database.yml
 - test/dummy/config/database.gitlab-ci.yml
 - test/dummy/config/application.rb
+- 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_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/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/charges/create_application_charge_response.json
 - test/fixtures/api/widget_store/charges/create_second_recurring_application_charge_response.json
@@ -694,6 +761,9 @@ test_files:
 - 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/shop.json
+- test/fixtures/assets/test.js
+- test/fixtures/widget_configurations.yml
+- test/fixtures/js_configurations.yml
 - test/fixtures/disco_app/plan_codes.yml
 - test/fixtures/disco_app/shops.yml
 - test/fixtures/disco_app/application_charges.yml
@@ -723,5 +793,6 @@ test_files:
 - 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/renders_assets_test.rb
 - test/services/disco_app/charges_service_test.rb
 - test/services/disco_app/subscription_service_test.rb