middleman-sprockets 3.3.8 → 3.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2c436ca5f47b2aa7302e16325b55b3739da37bc
-  data.tar.gz: f2ccca61bbc6194a1e214af3c2d42e3c454c0048
+  metadata.gz: 90a84b5089422a2a7e6cffda601d696422d5e374
+  data.tar.gz: 6291740944a94b8698e3d98fe298cfe2040c69cd
 SHA512:
-  metadata.gz: f5f5f7e441931f06f8db2d9c4935acc3de263c4c187f972bf2ce8460fb575ea59e129fe6e3c4fe5a02fa173138845dd0b72352facfe3d50626a118fe4fc43263
-  data.tar.gz: 63157c86772734a37f536b3689271f9ef2c132f83a0521de0ef5b64fc26f0fb7276d6c45cda182584b58599945bdb34799487c80ba3c349a27dc06e9522e11fe
+  metadata.gz: 376c2fe3005f8af184c90f0dadc39075a80ebbad31b15db60bdbbf5ca1d7f84e2e32d35a0234add1ff2fc3ecef67fb785885e5106ba50bdb5c8525151fd10c39
+  data.tar.gz: 86b61f7a4d3cb1dea4d37b588be5c9f3d8f2673afdd254735a60ca1d846e0f96d68ed1553d255f58d378cb944a7c94fdad449c6ad697c440824afd06e45d4fe4

data/.travis.yml

@@ -2,6 +2,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.1
+  - 2.1.2
   - jruby-19mode
 
 gemfile:

data/lib/middleman-sprockets/environment.rb

@@ -178,6 +178,11 @@ module Middleman
         super
       end
 
+      # Never return 304s, downstream may want to manipulate data.
+      def etag_match?(asset, env)
+        false
+      end
+
       def call(env)
         # Set the app current path based on the full URL so that helpers work
         request_path = URI.decode(File.join(env['SCRIPT_NAME'], env['PATH_INFO']))

data/lib/middleman-sprockets/extension.rb

@@ -117,27 +117,13 @@ module Middleman
 
     # Add any directories from gems with Rails-like paths to sprockets load path
     def append_paths_from_gems
-      try_paths = [
-                   %w{ assets },
-                   %w{ app },
-                   %w{ app assets },
-                   %w{ vendor },
-                   %w{ vendor assets },
-                   %w{ lib },
-                   %w{ lib assets }
-                  ].inject([]) do |sum, v|
-        sum + [
-               File.join(v, 'javascripts'),
-               File.join(v, 'stylesheets'),
-               File.join(v, 'images'),
-               File.join(v, 'fonts')
-              ]
-      end
+      root_paths = ::Middleman.rubygems_latest_specs.map(&:full_gem_path) << app.root
+      base_paths = %w[assets app app/assets vendor vendor/assets lib lib/assets]
+      asset_dirs = %w[javascripts js stylesheets css images img fonts]
 
-      ([app.root] + ::Middleman.rubygems_latest_specs.map(&:full_gem_path)).each do |root_path|
-        try_paths.map {|p| File.join(root_path, p) }.
-          select {|p| File.directory?(p) }.
-          each {|path| self.environment.append_path(path) }
+      root_paths.product(base_paths.product(asset_dirs)).each do |root, (base, asset)|
+        path = File.join(root, base, asset)
+        environment.append_path(path) if File.directory?(path)
       end
     end
   end

data/lib/middleman-sprockets/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Sprockets
-    VERSION = "3.3.8"
+    VERSION = "3.3.9"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-sprockets
 version: !ruby/object:Gem::Version
-  version: 3.3.8
+  version: 3.3.9
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -264,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Sprockets support for Middleman