RubyGems - sass-rails - Versions diffs - 5.1.0 → 6.0.0.beta1 - Mend

sass-rails 5.1.0 → 6.0.0.beta1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

checksums.yaml +5 -5
data/MIT-LICENSE +1 -1
data/README.md +10 -7
data/lib/sass/rails.rb +0 -2
data/lib/sass/rails/importer.rb +18 -7
data/lib/sass/rails/logger.rb +0 -1
data/lib/sass/rails/railtie.rb +5 -21
data/lib/sass/rails/version.rb +1 -1
metadata +21 -49
data/lib/sass/rails/cache_store.rb +0 -31
data/lib/sass/rails/helpers.rb +0 -13
data/lib/sass/rails/template.rb +0 -72

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 81b377677315439a968f5d8c1fe884680e40681853aa6ce0059fec8f81a7561e
-  data.tar.gz: fce2dc70c42fd35b13dd1310c6e7f48825143497bb98fde3d4ded15efa5b72fe
+SHA1:
+  metadata.gz: c1b04b0301fea537ecc93336d859d7014bd44547
+  data.tar.gz: a635205225e4fa734031611d03a2c1436af98184
 SHA512:
-  metadata.gz: 561d100c511ed762dec416a081117bb949833e2ffde2ea8fa984cfae44f4f432e3cb52f3f213c8b4c37fe365c50a77b8fbe04e26f48a4a12b7cc5f8fd074ffce
-  data.tar.gz: 20b336c399d4907f64c95112a95ab912ce04575f8e3f153476e1b10d5d70dba4038d220baadbf4d408f509fe2c58cdde26c5250383ad52b011394c46afe90f65
+  metadata.gz: 16f8ca2843e8e61ab0d94c7b795880b8952910c3613c0acc44516d07aa516d8e97bf1a2ec76dd7265dc181051666b0ecf509c783045cd9b7b5d5d309ffa6f459
+  data.tar.gz: bfdc2a2f767e1321b94ba6f46d3eb0d2fd7f89fd6a36a4be0603281de5da251f797de18ad0fcd987d0f751ca11d61f4f82acb1217761714d81780431c9daee29

data/MIT-LICENSE CHANGED

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

@@ -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

data/lib/sass/rails.rb CHANGED

@@ -5,7 +5,5 @@ module Sass
 end
 require 'sass/rails/version'
-require 'sass/rails/helpers'
 require 'sass/rails/importer'
-require 'sass/rails/template'
 require 'sass/rails/railtie'

data/lib/sass/rails/importer.rb CHANGED

@@ -1,7 +1,8 @@
 require 'active_support/deprecation/reporting'
-require 'sass'
-require 'sprockets/sass_importer'
-require 'tilt'
+require 'sass/importers'
+require 'sprockets/file_reader'
+require 'sprockets/erb_processor'
+require 'sprockets/processor_utils'
 module Sass
   module Rails
@@ -86,10 +87,20 @@ module Sass
         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], {})
+              context = engine.options[:sprockets][:context]
-              Sass::Engine.new(contents, engine.options.merge(:syntax => syntax))
+              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
@@ -134,8 +145,8 @@ module Sass
           end
       end
-      include Deprecated
       include ERB
+      include Deprecated
       include Globbing
       # Allow .css files to be @import'd

data/lib/sass/rails/logger.rb CHANGED

@@ -1,4 +1,3 @@
-require 'sass'
 require 'sass/logger'
 module Sass

data/lib/sass/rails/railtie.rb CHANGED

@@ -1,6 +1,7 @@
 require 'sass'
 require 'active_support/core_ext/class/attribute'
 require 'sprockets/railtie'
+require 'sprockets/sass_processor'
 module Sass::Rails
   class Railtie < ::Rails::Railtie
@@ -54,27 +55,10 @@ module Sass::Rails
       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
+        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

data/lib/sass/rails/version.rb CHANGED

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

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-rails
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 6.0.0.beta1
 platform: ruby
 authors:
 - wycats
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-16 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -17,35 +17,38 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        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: 5.2.0
+        version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -53,9 +56,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -63,42 +63,16 @@ dependencies:
   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'
+        version: 4.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 4.x
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -132,12 +106,9 @@ files:
 - 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,14 +122,15 @@ 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:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project:
+rubygems_version: 2.5.1
 signing_key:
 specification_version: 4
 summary: Sass adapter for the Rails asset pipeline.

data/lib/sass/rails/cache_store.rb DELETED

@@ -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 DELETED

@@ -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 DELETED

@@ -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