disco_app 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b67b4667e899a379d0cc4152f228bfe7a80bef4aa6b35c26f54ee76c20c967f
-  data.tar.gz: d421b6283198d07e8ddc9a902e71a13320745e84f8fd5b3dbc981e6e88b70062
+  metadata.gz: f1b17eb89a3f6a2f3caaa40ec50fb2a17bc8cccbd21722590efb17fce2bcb305
+  data.tar.gz: 204dbf1c5ecde8bec93d4383d7a13289a5155fd9162a2e9f1a43947d6a71b8ed
 SHA512:
-  metadata.gz: b713f8e47aefe3614a2016bad8046d91fdee669fa5635f3768d167d9c6768622af51ec5f6cb711040f7d712dc2cdac2e9f879f4d752956c008444de52ad326ec
-  data.tar.gz: df1e8549d1e7474f137bc7d6a483f7e06450f26273181bdb4724b79003d6a3f51e19b4b29c6d0736f2f390e9d2c8dcd922d5b7e1785717166e70f6e152b4ebdd
+  metadata.gz: deef290c436235c522ad85d5ecfb337e1d7f156f2b4410cadd73d8e873c06822e46556a1a2a95951ca516d65ee72528fe5301c3866e5c68d112f88795b2d3a7d
+  data.tar.gz: f3d12b4672edc1517d712a3ff8071fdb0c48fb43bfbb2d1dd1e4fd164c78d626a4fbb64ae33e14f8ef4f7cee10ec76d6576e6590ddaef4cb45de3664b2254124

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

@@ -94,7 +94,7 @@ module DiscoApp::Concerns::RendersAssets
       # Create/replace the asset via the Shopify API.
       shopify_asset = shop.temp {
         ShopifyAPI::Asset.create(
-          key: "assets/#{asset}",
+          key: asset,
           value: render_asset_group_asset(asset, public_urls)
         )
       }
@@ -102,7 +102,9 @@ module DiscoApp::Concerns::RendersAssets
       # 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?')
+      if shopify_asset.public_url.present?
+        public_urls[asset] = shopify_asset.public_url.gsub(/\.scss\?/, '.scss.css?')
+      end
     end
 
     # If we specified the creation of any script tags based on newly rendered
@@ -117,7 +119,7 @@ module DiscoApp::Concerns::RendersAssets
     # 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}",
+        template: asset,
         layout: nil,
         locals: {
           :"@#{self.class.name.underscore}" => self,

data/lib/disco_app/version.rb

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

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

@@ -3,6 +3,6 @@ class JsConfiguration < ActiveRecord::Base
 
   belongs_to :shop, class_name: 'DiscoApp::Shop'
 
-  renders_assets :js_assets, assets: 'test.js', triggered_by: 'locale'
+  renders_assets :js_assets, assets: 'assets/test.js', triggered_by: 'locale'
 
 end

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

@@ -3,8 +3,8 @@ class WidgetConfiguration < ActiveRecord::Base
 
   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'
+  renders_assets :widget_assets, assets: ['assets/widget.scss', 'assets/widget.js'], triggered_by: ['locale', 'background_color']
+  renders_assets :liquid_assets, assets: 'snippets/widget.liquid', triggered_by: ['locale']
+  renders_assets :script_tag_assets, assets: 'assets/script_tag.js', script_tags: 'assets/script_tag.js'
 
 end

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

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

data/test/dummy/app/views/snippets/widget.liquid.erb

@@ -0,0 +1 @@
+{{ shop.metafields.locales['<%= @widget_configuration.locale %>'] }}

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

@@ -0,0 +1,6 @@
+{
+  "asset":{
+    "key":"snippets/widget.liquid",
+    "value":"{{ shop.metafields.locales['sv'] }}\n"
+  }
+}

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

@@ -0,0 +1,12 @@
+{
+  "asset": {
+    "key": "snippets/widget.liquid",
+    "public_url": null,
+    "created_at": "2016-06-01T09:17:11-04:00",
+    "updated_at": "2016-06-01T09:17:11-04:00",
+    "content_type": "text/x-liquid",
+    "size": 36,
+    "theme_id": 106913286,
+    "warnings": []
+  }
+}

data/test/models/disco_app/renders_assets_test.rb

@@ -61,7 +61,7 @@ class DiscoApp::RendersAssetsTest < ActiveSupport::TestCase
   ##
 
   test 'individual js asset renders correctly' do
-    assert_equal asset_fixture('test.js'), @js_configuration.send('render_asset_group_asset', 'test.js', {})
+    assert_equal asset_fixture('test.js'), @js_configuration.send('render_asset_group_asset', 'assets/test.js', {})
   end
 
   test 'js asset group renders and uploads to shopify' do
@@ -75,6 +75,11 @@ class DiscoApp::RendersAssetsTest < ActiveSupport::TestCase
     @widget_configuration.render_asset_group(:widget_assets)
   end
 
+  test 'liquid asset group renders and uploads to shopify' do
+    stub_api_request(:put, "#{@shop.admin_url}/assets.json", 'widget_store/assets/create_widget_liquid')
+    @widget_configuration.render_asset_group(:liquid_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')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disco_app
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Gavin Ballard
@@ -547,6 +547,7 @@ files:
 - 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/app/views/snippets/widget.liquid.erb
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
 - test/dummy/bin/rake
@@ -591,6 +592,8 @@ files:
 - 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_liquid_request.json
+- test/fixtures/api/widget_store/assets/create_widget_liquid_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
@@ -699,6 +702,7 @@ test_files:
 - 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/snippets/widget.liquid.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
@@ -735,10 +739,12 @@ test_files:
 - 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_widget_liquid_request.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/create_widget_liquid_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