sass-rails 5.0.0.beta1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48440623f66d3f63e45218b96959bb726ce72ea2
-  data.tar.gz: 635bdea2f7044d1c4c111d9023d80f0858c8c776
+  metadata.gz: 7e8d1de04c3b2051b0aab8f75e4aab8fb1bbd150
+  data.tar.gz: 510bf6be01cd389f355589ef1e323e47b18cea7d
 SHA512:
-  metadata.gz: 187cf250f24ccd61482158404450b063f3c7e6cb8f31f814e457ea0bf44c5200d8f16faec87450c4efe998732af5d3c6f2a644c10a5c97a87c123e9ca229992a
-  data.tar.gz: 5d8b55270d3eae58dc8bd17328ea347eb87e5a56e5cdc3e946147daaf64d74d16ce3918b90947ff12f96e911620c852afbeeccf4b9e2314b9f565b38e3bc4012
+  metadata.gz: 7d78a7e4a55fd6d9ca44a612051ed5d260b379f92ac763b421f053f525a468e31644d468d759fba9015db5d4641276ed63a86b0ea732cf0f072e4cbacf6a67e0
+  data.tar.gz: 86b70308e42217a83c48f0ba8899bfcd2a135a02ddd78517f1a99e8206ea8def3c87deb0814fe9612dc58669a39cc4c1c38f229c7bbdae20c4c5b0d13ea9f57a

data/CHANGELOG.md

@@ -1,8 +1,20 @@
 # CHANGELOG
 
-## unreleased
+## 5.0.0 (Dec 12, 2014)
 
 * Register scss and sass extensions for rake notes
+* Make possible to use sprockes > 2.8 and < 4
+* Make possible to use sass ~> 3.1
+* Deprecate .css.scss and .css.sass extentions
+
+## 4.0.5 (Nov 25, 2014)
+
+* Make possible to use sprockets 2.12.
+
+## 4.0.4 (Oct 29, 2014)
+
+* Make possible to use any sprockets version in the 2.11 series.
+* Require at least sass 3.2.2.
 
 ## 4.0.3 (Apr 4, 2014)
 

data/lib/rails/generators/sass/assets/assets_generator.rb

@@ -6,7 +6,7 @@ module Sass
       source_root File.expand_path("../templates", __FILE__)
 
       def copy_sass
-        template "stylesheet.css.sass", File.join('app/assets/stylesheets', class_path, "#{file_name}.css.sass")
+        template "stylesheet.sass", File.join('app/assets/stylesheets', class_path, "#{file_name}.sass")
       end
     end
   end

data/lib/rails/generators/sass_scaffold.rb

@@ -8,9 +8,8 @@ module Sass
         dir = ::Rails::Generators::ScaffoldGenerator.source_root
         file = File.join(dir, "scaffold.css")
         converted_contents = ::Sass::CSS.new(File.read(file)).render(syntax)
-        create_file "app/assets/stylesheets/scaffolds.css.#{syntax}", converted_contents
+        create_file "app/assets/stylesheets/scaffolds.#{syntax}", converted_contents
       end
     end
   end
 end
-

data/lib/rails/generators/scss/assets/assets_generator.rb

@@ -6,7 +6,7 @@ module Scss
       source_root File.expand_path("../templates", __FILE__)
 
       def copy_scss
-        template "stylesheet.css.scss", File.join('app/assets/stylesheets', class_path, "#{file_name}.css.scss")
+        template "stylesheet.scss", File.join('app/assets/stylesheets', class_path, "#{file_name}.scss")
       end
     end
   end

data/lib/sass/rails/cache_store.rb

@@ -0,0 +1,31 @@
+require 'sass'
+
+module Sass
+  module Rails
+    class CacheStore < ::Sass::CacheStores::Base
+      attr_reader :environment
+
+      def initialize(environment)
+        @environment = environment
+      end
+
+      def _store(key, version, sha, contents)
+        environment.cache_set("sass/#{key}", {:version => version, :sha => sha, :contents => contents})
+      end
+
+      def _retrieve(key, version, sha)
+        if obj = environment.cache_get("sass/#{key}")
+          return unless obj[:version] == version
+          return unless obj[:sha] == sha
+          obj[:contents]
+        else
+          nil
+        end
+      end
+
+      def path_to(key)
+        key
+      end
+    end
+  end
+end

data/lib/sass/rails/helpers.rb

@@ -1,30 +1,11 @@
 require 'sprockets/sass_functions'
-require 'active_support/deprecation'
 
 module Sprockets
   module SassFunctions
-    if instance_methods.map(&:to_sym).include?(:asset_path)
-      undef_method :asset_path
-    end
-
-    def asset_path(path, kind = nil)
-      ActiveSupport::Deprecation.warn "asset_path with two arguments is deprecated. Use asset_path(#{path}) instead." if kind
-
-      Sass::Script::String.new(sprockets_context.asset_path(path.value), :string)
-    end
-
-    if instance_methods.map(&:to_sym).include?(:asset_url)
-      undef_method :asset_url
-    end
-
-    def asset_url(path, kind = nil)
-      ActiveSupport::Deprecation.warn "asset_url with two arguments is deprecated. Use asset_url(#{path}) instead." if kind
-
-      Sass::Script::String.new("url(" + sprockets_context.asset_path(path.value) + ")")
-    end
-
     def asset_data_url(path)
       Sass::Script::String.new("url(" + sprockets_context.asset_data_uri(path.value) + ")")
     end
   end
 end
+
+::Sass::Script::Functions.send :include, Sprockets::SassFunctions

data/lib/sass/rails/importer.rb

@@ -1,96 +1,146 @@
+require 'active_support/deprecation/reporting'
+require 'sass'
 require 'sprockets/sass_importer'
+require 'tilt'
 
 module Sass
   module Rails
     class SassImporter < Sass::Importers::Filesystem
-      GLOB = /\*|\[.+\]/
+      module Globbing
+        GLOB = /(\A|\/)(\*|\*\*\/\*)\z/
 
-      attr_reader :context
-      def initialize(context, *args)
-        @context = context
-        super(*args)
-      end
-
-      def extensions
-        {
-          'css'          => :scss,
-          'css.scss'     => :scss,
-          'css.sass'     => :sass,
-          'css.erb'      => :scss,
-          'scss.erb'     => :scss,
-          'sass.erb'     => :sass,
-          'css.scss.erb' => :scss,
-          'css.sass.erb' => :sass
-        }.merge!(super)
-      end
-
-      def find_relative(name, base, options)
-        if name =~ GLOB
-          glob_imports(name, Pathname.new(base), options)
-        else
-          engine_from_path(name, File.dirname(base), options)
+        def find_relative(name, base, options)
+          if options[:sprockets] && m = name.match(GLOB)
+            path = name.sub(m[0], "")
+            base = File.expand_path(path, File.dirname(base))
+            glob_imports(base, m[2], options)
+          else
+            super
+          end
         end
-      end
 
-      def find(name, options)
-        if name =~ GLOB
-          nil # globs must be relative
-        else
-          engine_from_path(name, root, options)
+        def find(name, options)
+          # globs must be relative
+          return if name =~ GLOB
+          super
         end
-      end
 
-      private
-
-        def each_globbed_file(glob, base_pathname, options)
-          Dir["#{base_pathname}/#{glob}"].sort.each do |filename|
-            next if filename == options[:filename]
-            if File.directory?(filename)
-              context.depend_on(filename)
-              context.depend_on(File.expand_path('..', filename))
-            elsif context.asset_requirable?(filename)
-              context.depend_on(File.dirname(filename))
-              yield filename
+        private
+          def glob_imports(base, glob, options)
+            contents = ""
+            context = options[:sprockets][:context]
+            each_globbed_file(base, glob, context) do |filename|
+              next if filename == options[:filename]
+              contents << "@import #{filename.inspect};\n"
             end
+            return nil if contents == ""
+            Sass::Engine.new(contents, options.merge(
+              :importer => self,
+              :syntax => :scss
+            ))
           end
-        end
 
-        def glob_imports(glob, base_pathname, options)
-          contents = ""
-          each_globbed_file(glob, base_pathname.dirname, options) do |filename|
-            contents << "@import #{Pathname.new(filename).relative_path_from(base_pathname.dirname).to_s.inspect};\n"
+          def each_globbed_file(base, glob, context)
+            raise ArgumentError unless glob == "*" || glob == "**/*"
+
+            exts = extensions.keys.map { |ext| Regexp.escape(".#{ext}") }.join("|")
+            sass_re = Regexp.compile("(#{exts})$")
+
+            context.depend_on(base)
+
+            Dir["#{base}/#{glob}"].sort.each do |path|
+              if File.directory?(path)
+                context.depend_on(path)
+              elsif sass_re =~ path
+                yield path
+              end
+            end
           end
-          return nil if contents.empty?
-          Sass::Engine.new(contents, options.merge(
-            :filename => base_pathname.to_s,
-            :importer => self,
-            :syntax => :scss
-          ))
+      end
+
+      module ERB
+        def extensions
+          {
+            'css.erb'  => :scss_erb,
+            'scss.erb' => :scss_erb,
+            'sass.erb' => :sass_erb
+          }.merge(super)
         end
 
+        def erb_extensions
+          {
+            :scss_erb => :scss,
+            :sass_erb => :sass
+          }
+        end
 
-        def engine_from_path(name, dir, options)
-          full_filename, syntax = Sass::Util.destructure(find_real_file(dir, name, options))
-          return unless full_filename && File.readable?(full_filename)
+        def find_relative(*args)
+          process_erb_engine(super)
+        end
 
-          context.depend_on full_filename
-          engine = Sass::Engine.new(evaluate(full_filename), options.merge(
-            syntax: syntax,
-            filename: full_filename,
-            importer: self
-          ))
+        def find(*args)
+          process_erb_engine(super)
+        end
+
+        private
+          def process_erb_engine(engine)
+            if engine && engine.options[:sprockets] && syntax = erb_extensions[engine.options[:syntax]]
+              template = Tilt::ERBTemplate.new(engine.options[:filename])
+              contents = template.render(engine.options[:sprockets][:context], {})
+
+              Sass::Engine.new(contents, engine.options.merge(:syntax => syntax))
+            else
+              engine
+            end
+          end
+      end
 
-          engine
+      module Deprecated
+        def extensions
+          {
+            'css.scss'     => :scss,
+            'css.sass'     => :sass,
+            'css.scss.erb' => :scss_erb,
+            'css.sass.erb' => :sass_erb
+          }.merge(super)
         end
 
-        def evaluate(filename)
-          attributes = context.environment.attributes_for(filename)
-          processors = context.environment.preprocessors(attributes.content_type) +
-            attributes.engines.reverse - [Sass::Rails::ScssTemplate, Sass::Rails::SassTemplate]
+        def find_relative(*args)
+          deprecate_extra_css_extension(super)
+        end
 
-          context.evaluate(filename, processors: processors)
+        def find(*args)
+          deprecate_extra_css_extension(super)
         end
 
+        private
+          def deprecate_extra_css_extension(engine)
+            if engine && filename = engine.options[:filename]
+              if filename.end_with?('.css.scss')
+                msg = "Extra .css in SCSS file is unnecessary. Rename #{filename} to #{filename.sub('.css.scss', '.scss')}."
+              elsif filename.end_with?('.css.sass')
+                msg = "Extra .css in SASS file is unnecessary. Rename #{filename} to #{filename.sub('.css.sass', '.sass')}."
+              elsif filename.end_with?('.css.scss.erb')
+                msg = "Extra .css in SCSS/ERB file is unnecessary. Rename #{filename} to #{filename.sub('.css.scss.erb', '.scss.erb')}."
+              elsif filename.end_with?('.css.sass.erb')
+                msg = "Extra .css in SASS/ERB file is unnecessary. Rename #{filename} to #{filename.sub('.css.sass.erb', '.sass.erb')}."
+              end
+
+              ActiveSupport::Deprecation.warn(msg) if msg
+            end
+
+            engine
+          end
+      end
+
+      include Deprecated
+      include ERB
+      include Globbing
+
+      # Allow .css files to be @import'd
+      def extensions
+        { 'css' => :scss }.merge(super)
+      end
     end
   end
 end

data/lib/sass/rails/railtie.rb

@@ -1,11 +1,8 @@
+require 'active_support/core_ext/class/attribute'
 require 'sprockets/railtie'
 
 module Sass::Rails
   class Railtie < ::Rails::Railtie
-    module SassContext
-      attr_accessor :sass_config
-    end
-
     config.sass = ActiveSupport::OrderedOptions.new
 
     # Establish static configuration defaults
@@ -59,8 +56,10 @@ module Sass::Rails
         app.assets.register_engine '.sass', Sass::Rails::SassTemplate
         app.assets.register_engine '.scss', Sass::Rails::ScssTemplate
 
-        app.assets.context_class.extend(SassContext)
-        app.assets.context_class.sass_config = app.config.sass
+        app.assets.context_class.class_eval do
+          class_attribute :sass_config
+          self.sass_config = app.config.sass
+        end
       end
 
       Sass.logger = app.config.sass.logger

data/lib/sass/rails/template.rb

@@ -1,39 +1,69 @@
-require "sprockets/sass_template"
+require 'sass'
+require 'sass/rails/cache_store'
+require 'sass/rails/helpers'
+require 'sprockets/sass_functions'
+require 'tilt'
 
 module Sass
   module Rails
-    class SassTemplate < Sprockets::SassTemplate
+    class SassTemplate < Tilt::Template
+      def self.default_mime_type
+        'text/css'
+      end
+
+      def self.engine_initialized?
+        true
+      end
+
+      def initialize_engine
+      end
+
+      def prepare
+      end
+
+      def syntax
+        :sass
+      end
 
       def evaluate(context, locals, &block)
-        cache_store = Sprockets::SassCacheStore.new(context.environment)
+        cache_store = CacheStore.new(context.environment)
 
         options = {
           :filename => eval_file,
           :line => line,
           :syntax => syntax,
           :cache_store => cache_store,
-          :importer => SassImporter.new(context, context.pathname.to_s),
-          :load_paths => context.environment.paths.map { |path| SassImporter.new(context, path.to_s) },
+          :importer => importer_class.new(context.pathname.to_s),
+          :load_paths => context.environment.paths.map { |path| importer_class.new(path.to_s) },
           :sprockets => {
             :context => context,
             :environment => context.environment
           }
         }
 
-        sass_config = context.environment.context_class.sass_config.merge(options)
+        sass_config = context.sass_config.merge(options)
+
+        engine = ::Sass::Engine.new(data, sass_config)
+        css = engine.render
+
+        engine.dependencies.map do |dependency|
+          context.depend_on(dependency.options[:filename])
+        end
 
-        ::Sass::Engine.new(data, sass_config).render
+        css
       rescue ::Sass::SyntaxError => e
         context.__LINE__ = e.sass_backtrace.first[:line]
         raise e
       end
-    end
 
-    class ScssTemplate < SassTemplate
-      def self.default_mime_type
-        'text/css'
+      private
+
+      def importer_class
+        SassImporter
       end
+    end
 
+    class ScssTemplate < SassTemplate
       def syntax
         :scss
       end