sprockets 4.0.0.beta1 → 4.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60c7b56c815bf217d4f5dfaeba611132c1b69964
-  data.tar.gz: 0ed9b0faa7b1606dc0cba718b3ec39afeb62255e
+  metadata.gz: 06325c03db04bdfa682ae1244a2645283542c960
+  data.tar.gz: c17ca6d3798591d677981fa783e97a0a64972f8b
 SHA512:
-  metadata.gz: 6f297befe6ef41895b1b239741c9f705c52436f902963443c6bde3b68c67e89d3dfcfec3e132ce9aa21276ae6ac7e7759d7651d3d8f00e7d0f7d68445570202a
-  data.tar.gz: cf82702092f023a61057f9557cae0e9f2cdcacf0a0d9cd5619bdad116a984681bd5a1a9319aaaf2ca40109be6b31107ae49ec5bea7ab5a6822514f94304ca0fb
+  metadata.gz: a9330a81697f56e97ee07707d7f6ed54b3cdebe6c0a6726e7b74f3372c2fbbb738a4d3a54afdc383bf539f66719bc73592f1994fc3a4a2dabfed19a02f73dda9
+  data.tar.gz: 965f0aa60b2bdcc3841681c8070af54253748c28deefb16e9908e8695eb87560d572203fe56cdb811c0fbc5e5d490809ea36f3a1d62869fc67ed530ec565c077

data/CHANGELOG.md

@@ -1,3 +1,15 @@
 **Master**
 
-Please check the 3.x branch for previous changes https://github.com/rails/sprockets/blob/3.x/CHANGELOG.md.
+Get upgrade notes from Sprockets 3.x to 4.x at https://github.com/rails/sprockets/blob/master/UPGRADING.md
+
+## 4.0.0.beta2
+
+- Fix load_paths on Sass processors [#223]
+
+
+## 4.0.0.beta1
+
+- Initial release of Sprockets 4
+
+Please upgrade to the latest Sprockets 3 version before upgrading to Sprockets 4. Check the 3.x branch for previous changes https://github.com/rails/sprockets/blob/3.x/CHANGELOG.md.
+

data/lib/sprockets/sass_processor.rb

@@ -58,7 +58,7 @@ module Sprockets
     def call(input)
       context = input[:environment].context_class.new(input)
 
-      engine_options = {
+      engine_options = merge_options({
         filename: input[:filename],
         syntax: self.class.syntax,
         cache_store: build_cache_store(input, @cache_version),
@@ -69,7 +69,7 @@ module Sprockets
           environment: input[:environment],
           dependencies: context.metadata[:dependencies]
         }
-      }.merge!(@sass_config)
+      })
 
       engine = Autoload::Sass::Engine.new(input[:data], engine_options)
 
@@ -106,6 +106,18 @@ module Sprockets
     end
     private :build_cache_store
 
+    def merge_options(options)
+      defaults = @sass_config.dup
+
+      if load_paths = defaults.delete(:load_paths)
+        options[:load_paths] += load_paths
+      end
+
+      options.merge!(defaults)
+      options
+    end
+    private :merge_options
+
     # Public: Functions injected into Sass context during Sprockets evaluation.
     #
     # This module may be extended to add global functionality to all Sprockets

data/lib/sprockets/sassc_processor.rb

@@ -43,7 +43,7 @@ module Sprockets
     end
 
     def engine_options(input, context)
-      {
+      merge_options({
         filename: input[:filename],
         syntax: self.class.syntax,
         load_paths: input[:environment].paths,
@@ -55,7 +55,7 @@ module Sprockets
           environment: input[:environment],
           dependencies: context.metadata[:dependencies]
         }
-      }.merge!(@sass_config)
+      })
     end
   end
 

data/lib/sprockets/version.rb

@@ -1,3 +1,3 @@
 module Sprockets
-  VERSION = "4.0.0.beta1"
+  VERSION = "4.0.0.beta2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta1
+  version: 4.0.0.beta2
 platform: ruby
 authors:
 - Sam Stephenson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack