sass-rails 6.0.0.beta1 → 6.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c1b04b0301fea537ecc93336d859d7014bd44547
-  data.tar.gz: a635205225e4fa734031611d03a2c1436af98184
+SHA256:
+  metadata.gz: fdb55e4ec7ba4e141764095288c4657b407434770231b200f53ed959fd3b4cc2
+  data.tar.gz: 37f07940c5723becaea39eeb87a6615cae3505f272c0e91adf21ae4481c9639c
 SHA512:
-  metadata.gz: 16f8ca2843e8e61ab0d94c7b795880b8952910c3613c0acc44516d07aa516d8e97bf1a2ec76dd7265dc181051666b0ecf509c783045cd9b7b5d5d309ffa6f459
-  data.tar.gz: bfdc2a2f767e1321b94ba6f46d3eb0d2fd7f89fd6a36a4be0603281de5da251f797de18ad0fcd987d0f751ca11d61f4f82acb1217761714d81780431c9daee29
+  metadata.gz: e87ba4605c8479ba1be9bb10294a5574829eb477f195fd1984ad14259515b9215a67aa3c35474414b127b24dd741cce47e8e349211598107840a4a429b582cca
+  data.tar.gz: 5727a314aa6f2668336f89966093e3150809a62be53f1e1250ed83bfc58406ce7b4d22915845a5751fd7db4bf238784cb8fa9cbedeeefe26aa98b4c5e6c2050d

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2016 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

@@ -101,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,9 +1 @@
-module Sass
-  module Rails
-    autoload :Logger, 'sass/rails/logger'
-  end
-end
-
-require 'sass/rails/version'
-require 'sass/rails/importer'
-require 'sass/rails/railtie'
+require 'sassc/rails'

data/lib/sass/rails/importer.rb

@@ -1,158 +1,5 @@
-require 'active_support/deprecation/reporting'
-require 'sass/importers'
-require 'sprockets/file_reader'
-require 'sprockets/erb_processor'
-require 'sprockets/processor_utils'
+# 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]]
-              context = engine.options[:sprockets][:context]
-
-              input = {
-                filename: engine.options[:filename],
-                environment: context.environment,
-                content_type: "text/#{syntax}",
-                metadata: {}
-              }
-
-              processors = [Sprockets::ERBProcessor, Sprockets::FileReader]
-
-              result = Sprockets::ProcessorUtils.call_processors(processors, input)
-
-              Sass::Engine.new(result[:data], 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 ERB
-      include Deprecated
-      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,21 +1,5 @@
-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,78 +1 @@
-require 'sass'
-require 'active_support/core_ext/class/attribute'
-require 'sprockets/railtie'
-require 'sprockets/sass_processor'
-
-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|
-        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
-
-      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 = "6.0.0.beta1"
+    VERSION = "6.0.0.beta2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-rails
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta1
+  version: 6.0.0.beta2
 platform: ruby
 authors:
 - wycats
@@ -9,84 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2019-03-27 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: 4.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: sass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: 2.1.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: sprockets-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.x
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.x
-- !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.0
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 description: Sass adapter for the Rails asset pipeline.
 email:
 - wycats@gmail.com
@@ -97,13 +41,6 @@ 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/importer.rb
@@ -129,8 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Sass adapter for the Rails asset pipeline.

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
-