middleman-sprockets 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b05f69c2af0e939cb74267c61976401d5e5b421
-  data.tar.gz: 0a97406cc10465aa6c19ddc6b624a9327699accb
+  metadata.gz: 34a2daf8999a062df4e3c9748976ae478e53909d
+  data.tar.gz: e01569c1de6a03bbb4a82fd55b2858a7358c59a1
 SHA512:
-  metadata.gz: d59ffb935b66a302c5d4ee3df787dfb5d69189a13547f7a74bd0270eeec410713c7518b66a6dd605017291576380babab346ff946db61791e84f4984f02c3f3d
-  data.tar.gz: a92202dd7d0460ea58f8bf91d192e2900bde148916d3694cf2007c7ce34cce1ed648edcc2d29dccf35f35b877649ad90f2b3ab47afef4a506586e1d59092540e
+  metadata.gz: 7b7fc8ee856ba9f10aec3778eb0f63c66293d122017b26fd234f78e3914b1a16d1cb1575fc3639db68da2dd16bbe8b25202cbb8c6fd80b935be68e97d672f371
+  data.tar.gz: a39d233603ba9e607add0c774fa0ecf724fca7bb21cc6fde2fe2f06b3b67909c5dbb33e6a872921e4619a4ff70860776f5d34a0618c6d0ec01e08c8aada19e8a

data/.travis.yml

@@ -4,10 +4,9 @@ sudo: false
 env: TEST=true
 
 rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2.5
-  - 2.3.1
+  - 2.2
+  - 2.3.4
+  - 2.4.1
   - ruby-head
 
 gemfile:
@@ -15,17 +14,17 @@ gemfile:
 
 matrix:
   include:
-  - rvm: 2.3.1
+  - rvm: 2.4.1
     gemfile: gemfiles/middleman-head.gemfile
     env: SKIP_ASSET_HASH=true MIDDLEMAN_HEAD=true
-  - rvm: 2.3.1
+  - rvm: 2.4.1
     gemfile: gemfiles/middleman-4.0.gemfile
     env: SKIP_ASSET_HASH=true
-  - rvm: 2.3.1
+  - rvm: 2.4.1
     gemfile: gemfiles/sprockets-4.0.gemfile
     env: SKIP_ASSET_HASH=true
 
   allow_failures:
     - rvm: ruby-head
-    - rvm: 2.3.1
+    - rvm: 2.4.1
       gemfile: gemfiles/sprockets-4.0.gemfile

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+4.1.1
+=====
+**fixes**
+- support sprockets renderable proxied assets, fixes [#128] related to how the I18n extension moves assets.
+
 4.1.0
 =====
 

data/ISSUE_TEMPLATE.md

@@ -0,0 +1,10 @@
+## Expected behavior and actual behavior
+
+## Steps to reproduce the problem (from a clean middleman installation) or example repo
+
+## Additional information
+
+- Ruby version: 
+- Middleman version: 
+- Middleman Sprockets version: 
+- OS version: 

data/README.md

@@ -108,6 +108,7 @@ The best way to get quick responses to your issues and swift fixes to your bugs
 3. Run `bundle install` inside the project root to install the gem dependencies.
 4. Run test cases: `bundle exec rake test`
 
+To run specs for an individual feature, `cucumber features/PATH_TO_FEATURE`
 
 ## Donate
 

data/features/test_cases/proxy_asset.feature

@@ -0,0 +1,70 @@
+Feature: Handles proxied assets
+
+  Scenario: Proxied assets can be renderable via Sprockets
+    Given a fixture app "base-app"
+    And a file named "config.rb" with:
+      """
+      proxy "assets/vendor/site.js", "vendor/site.js"
+
+      activate :sprockets
+      sprockets.append_path File.join(root, "source", "vendor")
+      """
+    And a file named "source/vendor/site.js" with:
+      """
+      alert("site.js");
+      """
+    And the Server is running
+
+    When I go to "/assets/vendor/site.js"
+    Then I should see 'alert("site.js");'
+
+  Scenario: Proxied assets should be able to require files relative to their source
+    Given a fixture app "base-app"
+    And a file named "config.rb" with:
+      """
+      proxy "assets/vendor/site.js", "vendor/site.js"
+
+      activate :sprockets
+      sprockets.append_path File.join(root, "source", "vendor")
+      """
+    And a file named "source/vendor/_include.js" with:
+      """
+      console.log("include");
+      """
+    And a file named "source/vendor/site.js" with:
+      """
+      //= require "_include.js"
+      """
+    And the Server is running
+
+    When I go to "/assets/vendor/site.js"
+    Then I should see 'console.log("include");'
+
+    When I go to "/vendor/site.js"
+    Then I should see 'console.log("include");'
+
+
+  Scenario: Proxied assets can ignore their source file
+    Given a fixture app "base-app"
+    And a file named "config.rb" with:
+      """
+      proxy "javascripts/site.js", "vendor/site.js", ignore: true
+
+      activate :sprockets
+      sprockets.append_path File.join(root, "source", "vendor")
+      """
+    And a file named "source/vendor/_include.js" with:
+      """
+      console.log("include");
+      """
+    And a file named "source/vendor/site.js" with:
+      """
+      //= require "_include.js"
+      """
+    And the Server is running
+
+    When I go to "/javascripts/site.js"
+    Then I should see 'console.log("include");'
+
+    When I go to "/vendor/site.js"
+    Then the status code should be "404"

data/lib/middleman-sprockets/extension.rb

@@ -114,9 +114,15 @@ module Middleman
         Contract ::Middleman::Sitemap::Resource => Or[::Middleman::Sitemap::Resource, Resource]
         def process_sprockets_resource resource
           ::Middleman::Util.instrument 'sprockets', name: 'process_resource', resource: resource do
-            sprockets_resource = generate_resource(resource.path, resource.source_file, resource.path)
+            sprockets_resource = generate_resource(
+              resource.path,
+              resource.source_file,
+              source_file_relative_to_root(resource)
+            )
             @resources.add sprockets_resource
 
+            sprockets_resource.ignore! if resource.ignored?
+
             sprockets_resource
           end
         rescue => e
@@ -147,6 +153,12 @@ module Middleman
                       '   consider using Sprockets 4.x to render with SassC'
         end
 
+        def source_file_relative_to_root resource
+          Pathname.new(resource.source_file).relative_path_from(
+            Pathname.new(File.join(@app.root, @app.config[:source]))
+          ).to_s
+        end
+
         # Backwards compatible means of finding all the latest gemspecs
         # available on the system
         #

data/lib/middleman-sprockets/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Sprockets
-    VERSION = '4.1.0'.freeze
+    VERSION = '4.1.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-sprockets
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -72,6 +72,7 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
+- ISSUE_TEMPLATE.md
 - LICENSE.md
 - README.md
 - Rakefile
@@ -100,6 +101,7 @@ files:
 - features/test_cases/partial_rendering.feature
 - features/test_cases/path_helpers.feature
 - features/test_cases/processible_outside_asset_dir.feature
+- features/test_cases/proxy_asset.feature
 - features/test_cases/sass_globs.feature
 - features/test_cases/sass_partials.feature
 - features/test_cases/sassc.feature
@@ -205,6 +207,7 @@ test_files:
 - features/test_cases/partial_rendering.feature
 - features/test_cases/path_helpers.feature
 - features/test_cases/processible_outside_asset_dir.feature
+- features/test_cases/proxy_asset.feature
 - features/test_cases/sass_globs.feature
 - features/test_cases/sass_partials.feature
 - features/test_cases/sassc.feature