sass-rails 5.1.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81b377677315439a968f5d8c1fe884680e40681853aa6ce0059fec8f81a7561e
-  data.tar.gz: fce2dc70c42fd35b13dd1310c6e7f48825143497bb98fde3d4ded15efa5b72fe
+  metadata.gz: d162298f6dcc547ef3c5e3e51d6d5bca7df731e8161737f03b01b05e3c77aba3
+  data.tar.gz: 2f10eb26a35786fa327e5ede671c6e487881c6bf85cce2eea5481aec63ab99db
 SHA512:
-  metadata.gz: 561d100c511ed762dec416a081117bb949833e2ffde2ea8fa984cfae44f4f432e3cb52f3f213c8b4c37fe365c50a77b8fbe04e26f48a4a12b7cc5f8fd074ffce
-  data.tar.gz: 20b336c399d4907f64c95112a95ab912ce04575f8e3f153476e1b10d5d70dba4038d220baadbf4d408f509fe2c58cdde26c5250383ad52b011394c46afe90f65
+  metadata.gz: 4862c7852e9d3928e48ef3d8a314e8872557d94345a8a8845f6c3fc7f80e0166947c07fbf09d11505a86b3f8075d933f5576c45ef5d90eadcf0980707cbf549e
+  data.tar.gz: 75616f8708d8f20b2d32d84adf73d779c193c18d6ac7784a3d9ba10fc4309e7694dc39f09087daf6ec993357e363ebe2d2e3292160ae4e2944ed6e50f105a3da

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Christopher Eppstein
+Copyright (c) 2011-2019 Christopher Eppstein
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -6,7 +6,9 @@ This gem provides official integration for Ruby on Rails projects with the Sass
 
 Since Rails 3.1, new Rails projects will be already configured to use Sass. If you are upgrading to Rails 3.1 you will need to add the following to your Gemfile:
 
-    gem 'sass-rails'
+```ruby
+gem 'sass-rails'
+```
 
 ## Configuration
 
@@ -30,12 +32,13 @@ can be found on the Sass Website with the following caveats:
 - `:line` - This is provided by the template handler.
 
 ### Example
-
-    MyProject::Application.configure do
-      config.sass.preferred_syntax = :sass
-      config.sass.line_comments = false
-      config.sass.cache = false
-    end
+```ruby
+MyProject::Application.configure do
+  config.sass.preferred_syntax = :sass
+  config.sass.line_comments = false
+  config.sass.cache = false
+end
+```
 
 ## Important Note
 
@@ -98,4 +101,3 @@ If you need to test against local gems, use Bundler's gem :path option in the Ge
 
 * [![Travis CI](https://api.travis-ci.org/rails/sass-rails.svg)](http://travis-ci.org/rails/sass-rails)
 * [![Gem Version](https://badge.fury.io/rb/sass-rails.svg)](http://badge.fury.io/rb/sass-rails)
-* [![Dependencies](https://gemnasium.com/rails/sass-rails.svg)](https://gemnasium.com/rails/sass-rails)

data/lib/sass-rails.rb

@@ -1 +1 @@
-require 'sass/rails'
+require 'sassc/rails'

data/lib/sass/rails.rb

@@ -1,11 +1 @@
-module Sass
-  module Rails
-    autoload :Logger, 'sass/rails/logger'
-  end
-end
-
-require 'sass/rails/version'
-require 'sass/rails/helpers'
-require 'sass/rails/importer'
-require 'sass/rails/template'
-require 'sass/rails/railtie'
+require 'sassc/rails'

data/lib/sass/rails/importer.rb

@@ -1,147 +1,5 @@
-require 'active_support/deprecation/reporting'
-require 'sass'
-require 'sprockets/sass_importer'
-require 'tilt'
+# frozen_string_literal: true
 
-module Sass
-  module Rails
-    class SassImporter < Sass::Importers::Filesystem
-      module Globbing
-        GLOB = /(\A|\/)(\*|\*\*\/\*)\z/
+require "active_support/deprecation"
 
-        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
-
-        def find(name, options)
-          # globs must be relative
-          return if name =~ GLOB
-          super
-        end
-
-        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(
-              :filename => base,
-              :importer => self,
-              :syntax => :scss
-            ))
-          end
-
-          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
-      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 find_relative(*args)
-          process_erb_engine(super)
-        end
-
-        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
-
-      module Deprecated
-        def extensions
-          {
-            'css.scss'     => :scss,
-            'css.sass'     => :sass,
-            'css.scss.erb' => :scss_erb,
-            'css.sass.erb' => :sass_erb
-          }.merge(super)
-        end
-
-        def find_relative(*args)
-          deprecate_extra_css_extension(super)
-        end
-
-        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
+ActiveSupport::Deprecation.warn "Sass::Rails::Importer has been removed, please use SassC::Rails::Importer instead."

data/lib/sass/rails/logger.rb

@@ -1,22 +1,5 @@
-require 'sass'
-require 'sass/logger'
+# frozen_string_literal: true
 
-module Sass
-  module Rails
-    class Logger < Sass::Logger::Base
-      def _log(level, message)
+require "active_support/deprecation"
 
-        case level
-          when :trace, :debug
-            ::Rails.logger.debug message
-          when :warn
-            ::Rails.logger.warn message
-          when :error
-            ::Rails.logger.error message
-          when :info
-            ::Rails.logger.info message
-        end
-      end
-    end
-  end
-end
+ActiveSupport::Deprecation.warn "Sass::Rails::Logger has been removed, please stop requiring sass/rails/logger."

data/lib/sass/rails/railtie.rb

@@ -1,94 +1 @@
-require 'sass'
-require 'active_support/core_ext/class/attribute'
-require 'sprockets/railtie'
-
-module Sass::Rails
-  class Railtie < ::Rails::Railtie
-    config.sass = ActiveSupport::OrderedOptions.new
-
-    # Establish static configuration defaults
-    # Emit scss files during stylesheet generation of scaffold
-    config.sass.preferred_syntax = :scss
-    # Write sass cache files for performance
-    config.sass.cache            = true
-    # Read sass cache files for performance
-    config.sass.read_cache       = true
-    # Display line comments above each selector as a debugging aid
-    config.sass.line_comments    = true
-    # Initialize the load paths to an empty array
-    config.sass.load_paths       = []
-    # Send Sass logs to Rails.logger
-    config.sass.logger           = Sass::Rails::Logger.new
-
-    # Set the default stylesheet engine
-    # It can be overridden by passing:
-    #     --stylesheet_engine=sass
-    # to the rails generate command
-    config.app_generators.stylesheet_engine config.sass.preferred_syntax
-
-    if config.respond_to?(:annotations)
-      config.annotations.register_extensions("scss", "sass") { |annotation| /\/\/\s*(#{annotation}):?\s*(.*)$/ }
-    end
-
-    # Remove the sass middleware if it gets inadvertently enabled by applications.
-    config.after_initialize do |app|
-      app.config.middleware.delete(Sass::Plugin::Rack) if defined?(Sass::Plugin::Rack)
-    end
-
-    initializer :setup_sass, group: :all do |app|
-      # Only emit one kind of syntax because though we have registered two kinds of generators
-      syntax     = app.config.sass.preferred_syntax.to_sym
-      alt_syntax = syntax == :sass ? "scss" : "sass"
-      app.config.generators.hide_namespace alt_syntax
-
-      # Override stylesheet engine to the preferred syntax
-      config.app_generators.stylesheet_engine syntax
-
-      # Set the sass cache location
-      config.sass.cache_location   = File.join(Rails.root, "tmp/cache/sass")
-
-      # Establish configuration defaults that are evironmental in nature
-      if config.sass.full_exception.nil?
-        # Display a stack trace in the css output when in development-like environments.
-        config.sass.full_exception = app.config.consider_all_requests_local
-      end
-
-      config.assets.configure do |env|
-        if env.respond_to?(:register_engine)
-          args = ['.sass', Sass::Rails::SassTemplate]
-          args << { silence_deprecation: true } if env.method(:register_engine).arity.abs > 2
-          env.register_engine(*args)
-
-          args = ['.scss', Sass::Rails::ScssTemplate]
-          args << { silence_deprecation: true } if env.method(:register_engine).arity.abs > 2
-          env.register_engine(*args)
-        end
-
-        if env.respond_to?(:register_transformer)
-          env.register_transformer 'text/sass', 'text/css',
-            Sprockets::SassProcessor.new(importer: SassImporter, sass_config: app.config.sass)
-          env.register_transformer 'text/scss', 'text/css',
-            Sprockets::ScssProcessor.new(importer: SassImporter, sass_config: app.config.sass)
-        end
-
-        env.context_class.class_eval do
-          class_attribute :sass_config
-          self.sass_config = app.config.sass
-        end
-      end
-
-      Sass.logger = app.config.sass.logger
-    end
-
-    initializer :setup_compression, group: :all do |app|
-      if Rails.env.development?
-        # Use expanded output instead of the sass default of :nested unless specified
-        app.config.sass.style ||= :expanded
-      else
-        # config.assets.css_compressor may be set to nil in non-dev environments.
-        # otherwise, the default is sass compression.
-        app.config.assets.css_compressor = :sass unless app.config.assets.has_key?(:css_compressor)
-      end
-    end
-  end
-end
+require 'sassc/rails/railtie'

data/lib/sass/rails/version.rb

@@ -1,5 +1,5 @@
 module Sass
   module Rails
-    VERSION = "5.1.0"
+    VERSION = "6.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-rails
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 6.0.0
 platform: ruby
 authors:
 - wycats
@@ -12,107 +12,25 @@ cert_chain: []
 date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.0
-- !ruby/object:Gem::Dependency
-  name: sass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: sprockets-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.8'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.8'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.1
 description: Sass adapter for the Rails asset pipeline.
 email:
 - wycats@gmail.com
@@ -123,21 +41,11 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
-- lib/rails/generators/sass/assets/assets_generator.rb
-- lib/rails/generators/sass/assets/templates/stylesheet.sass
-- lib/rails/generators/sass/scaffold/scaffold_generator.rb
-- lib/rails/generators/sass_scaffold.rb
-- lib/rails/generators/scss/assets/assets_generator.rb
-- lib/rails/generators/scss/assets/templates/stylesheet.scss
-- lib/rails/generators/scss/scaffold/scaffold_generator.rb
 - lib/sass-rails.rb
 - lib/sass/rails.rb
-- lib/sass/rails/cache_store.rb
-- lib/sass/rails/helpers.rb
 - lib/sass/rails/importer.rb
 - lib/sass/rails/logger.rb
 - lib/sass/rails/railtie.rb
-- lib/sass/rails/template.rb
 - lib/sass/rails/version.rb
 homepage: https://github.com/rails/sass-rails
 licenses:
@@ -151,7 +59,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

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

@@ -1,13 +0,0 @@
-require "rails/generators/named_base"
-
-module Sass
-  module Generators
-    class AssetsGenerator < ::Rails::Generators::NamedBase
-      source_root File.expand_path("../templates", __FILE__)
-
-      def copy_sass
-        template "stylesheet.sass", File.join('app/assets/stylesheets', class_path, "#{file_name}.sass")
-      end
-    end
-  end
-end

data/lib/rails/generators/sass/assets/templates/stylesheet.sass

@@ -1,3 +0,0 @@
-// Place all the styles related to the <%= name %> controller here.
-// They will automatically be included in application.css.
-// You can use Sass here: http://sass-lang.com/

data/lib/rails/generators/sass/scaffold/scaffold_generator.rb

@@ -1,9 +0,0 @@
-require "rails/generators/sass_scaffold"
-
-module Sass
-  module Generators
-    class ScaffoldGenerator < ::Sass::Generators::ScaffoldBase
-      def syntax() :sass end
-    end
-  end
-end

data/lib/rails/generators/sass_scaffold.rb

@@ -1,15 +0,0 @@
-require "sass/css"
-require "rails/generators/named_base"
-
-module Sass
-  module Generators
-    class ScaffoldBase < ::Rails::Generators::NamedBase
-      def copy_stylesheet
-        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.#{syntax}", converted_contents
-      end
-    end
-  end
-end

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

@@ -1,13 +0,0 @@
-require "rails/generators/named_base"
-
-module Scss
-  module Generators
-    class AssetsGenerator < ::Rails::Generators::NamedBase
-      source_root File.expand_path("../templates", __FILE__)
-
-      def copy_scss
-        template "stylesheet.scss", File.join('app/assets/stylesheets', class_path, "#{file_name}.scss")
-      end
-    end
-  end
-end

data/lib/rails/generators/scss/assets/templates/stylesheet.scss

@@ -1,3 +0,0 @@
-// Place all the styles related to the <%= name %> controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/

data/lib/rails/generators/scss/scaffold/scaffold_generator.rb

@@ -1,10 +0,0 @@
-require "rails/generators/sass_scaffold"
-
-module Scss
-  module Generators
-    class ScaffoldGenerator < ::Sass::Generators::ScaffoldBase
-      def syntax() :scss end
-    end
-  end
-end
-

data/lib/sass/rails/cache_store.rb

@@ -1,31 +0,0 @@
-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,13 +0,0 @@
-require 'sass'
-require 'sprockets/sass_functions'
-
-module Sprockets
-  module SassFunctions
-    remove_method :asset_data_url if method_defined?(:asset_data_url)
-    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/template.rb

@@ -1,72 +0,0 @@
-require 'sass'
-require 'sass/rails/cache_store'
-require 'sass/rails/helpers'
-require 'sprockets/sass_functions'
-require 'tilt'
-
-module Sass
-  module Rails
-    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 = CacheStore.new(context.environment)
-
-        options = {
-          :filename => eval_file,
-          :line => line,
-          :syntax => syntax,
-          :cache_store => cache_store,
-          :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.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
-
-        css
-      rescue ::Sass::SyntaxError => e
-        context.__LINE__ = e.sass_backtrace.first[:line]
-        raise e
-      end
-
-      private
-
-      def importer_class
-        SassImporter
-      end
-    end
-
-    class ScssTemplate < SassTemplate
-      def syntax
-        :scss
-      end
-    end
-  end
-end