sassc-rails 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d64addcb28c15b04b17828fcb483f865e31f5807
-  data.tar.gz: 89b980dbf7276dc1ba6e3d5b547b74be35537a7b
+SHA256:
+  metadata.gz: 597d03494d8a7feeff8bae4c0be19c2afe9852a05499afd17ab59010257cdfc2
+  data.tar.gz: 7055195b1511df649ab20ff16e06dd14a385fcd7b44f2c0acf51c844559a457f
 SHA512:
-  metadata.gz: 680cfb7d2a6144a63e3fc94baf65d6ebc15eb6d3c0fa5f65ce995606016b69e685a371c255e7f22830127c3796abed7993f8cb52da1c27b62b0b1714df0aaaf9
-  data.tar.gz: 98e2152e6aef09bfb9b7291779f80f02a441f5f6c4835e71780d16d2c6b580731be8c423154ea6c3d4400329aee35bf2023a07b5775e2b654548494b86cd6ac4
+  metadata.gz: 441e0939dd260e0cd05505cdbd38bcf638f65f5eec6ec15588698eaa9b8a354f0776bd89a2596732346e9a40e426fcac4cf3f951c67b742259af3ddd0d70c8bf
+  data.tar.gz: 566ffe365478924633f4ad7ceb2cb0b7739c22040527342727853af18e071189b5ed3b0d50ad80cd07aa4ccefb32bc9bfcf834c84f483a6bcb98925fd6d5db9f

data/.travis.yml

@@ -5,17 +5,16 @@ bundler_args: "--binstubs --standalone --without documentation --path ../bundle"
 script: "bundle exec rake test"
 
 gemfile:
-  - gemfiles/sprockets_2_12.gemfile
+  - gemfiles/sprockets-rails_3_0.gemfile
+  - gemfiles/sprockets-rails_2_3.gemfile
   - gemfiles/sprockets_3_0.gemfile
   - gemfiles/sprockets_4_0.gemfile
-  - gemfiles/sprockets-rails_3_0.gemfile
   - gemfiles/rails_4_2.gemfile
-  - gemfiles/rails_4_1.gemfile
-  - gemfiles/rails_4_0.gemfile
+  - gemfiles/rails_5_2.gemfile
 
 rvm:
-  - 2.2.2
-  - 2.3.0
+  - 2.4.4
+  - 2.5.1
 
 notifications:
   email: false

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,10 @@
+Sass is more than a technology; Sass is driven by the community of individuals
+that power its development and use every day. As a community, we want to embrace
+the very differences that have made our collaboration so powerful, and work
+together to provide the best environment for learning, growing, and sharing of
+ideas. It is imperative that we keep Sass a fun, welcoming, challenging, and
+fair place to play.
+
+[The full community guidelines can be found on the Sass website.][link]
+
+[link]: http://sass-lang.com/community-guidelines

data/README.md

@@ -22,8 +22,6 @@ In one larger project, this made compilation 4x faster:
 
 This should essentially be a drop in alternative to [sass-rails](https://github.com/rails/sass-rails).
 
-__Note:  This is a new project, please report any issues you come across!__
-
 ## Inline Source Maps
 
 With SassC-Rails, it's also extremely easy to turn on inline source maps. Simply
@@ -87,6 +85,9 @@ is maintained by [Ryan Boland](https://ryanboland.com) and [awesome contributors
 
 ## Changelog
 
+- **2.0.0**
+  - [Drop support for Sprockets 2](https://github.com/sass/sassc-rails/pull/109)
+  - [Remove dependency on Ruby Sass](https://github.com/sass/sassc-rails/pull/109)
 - **1.3.0**
   - [Silence Sprockets deprecation warnings](https://github.com/sass/sassc-rails/pull/76)
   - [Sprockets 4 compatibility](https://github.com/sass/sassc-rails/pull/65)

data/Rakefile

@@ -10,12 +10,10 @@ namespace :tests do
   gemfiles = %w[
     sprockets-rails_3_0
     sprockets-rails_2_3
-    sprockets_2_12
     sprockets_3_0
+    sprockets_4_0
     rails_4_2
-    rails_4_1
-    rails_4_0
-    with_sass_rails
+    rails_5_2
   ]
 
   gemfiles.each do |gemfile|

data/gemfiles/{rails_4_0.gemfile → rails_5_2.gemfile}

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem "rails", "~> 4.0.0"
+gem "rails", "~> 5.2.1"
 
 # Specify your gem's dependencies in sassc-rails.gemspec
 gemspec path: "../"

data/gemfiles/sprockets-rails_2_3.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem "sprockets-rails", "~> 2.3.0"
+gem "sprockets-rails", "~> 2.3.3"
 
 # Specify your gem's dependencies in sassc-rails.gemspec
 gemspec path: "../"

data/lib/sassc-rails.rb

@@ -1,8 +1,4 @@
-begin
-  require "sass-rails"
-  Rails::Railtie.subclasses.delete Sass::Rails::Railtie
-rescue LoadError
-end
+# frozen_string_literal: true
 
 require_relative "sassc/rails"
 

data/lib/sassc/rails.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "rails/version"
 
 require "sassc"

data/lib/sassc/rails/compressor.rb

@@ -1,6 +1,19 @@
+# frozen_string_literal: true
+
 require 'sprockets/sass_compressor'
+require 'securerandom'
 
 class Sprockets::SassCompressor
+  def initialize(options = {})
+    @options = {
+      syntax: :scss,
+      cache: false,
+      read_cache: false,
+      style: :compressed
+    }.merge(options).freeze
+    @cache_key = SecureRandom.uuid
+  end
+
   def call(*args)
     input = if defined?(data)
       data # sprockets 2.x

data/lib/sassc/rails/functions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sprockets/sass_functions'
 
 module Sprockets

data/lib/sassc/rails/importer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tilt'
 
 module SassC
@@ -100,6 +102,9 @@ module SassC
           search_paths.map! do |path|
             File.join(path, specified_dir)
           end
+          search_paths.select! do |path|
+            File.directory?(path)
+          end
         end
 
         search_paths.each do |search_path|

data/lib/sassc/rails/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/class/attribute'
 require 'sprockets/railtie'
 
@@ -51,8 +53,8 @@ module SassC::Rails
         end
 
         if env.respond_to?(:register_transformer)
-          env.register_transformer 'text/sass', 'text/css', SassC::Rails::SassTemplate.new #->() { puts "yoyoyoy" }
-          env.register_transformer 'text/scss', 'text/css', SassC::Rails::ScssTemplate.new #->() { puts "yoyoyoy" }
+          env.register_transformer 'text/sass', 'text/css', SassC::Rails::SassTemplate.new
+          env.register_transformer 'text/scss', 'text/css', SassC::Rails::ScssTemplate.new
         end
 
         if env.respond_to?(:register_engine)

data/lib/sassc/rails/template.rb

@@ -1,71 +1,46 @@
-require "sprockets/version"
-
-begin
-  require 'sprockets/sass_processor'
-rescue LoadError
-  require "sprockets/sass_template"
-end
+# frozen_string_literal: true
 
+require "sprockets/version"
+require 'sprockets/sass_processor'
 require "sprockets/utils"
 
 module SassC::Rails
-
-  class SassTemplate < defined?(Sprockets::SassProcessor) ? Sprockets::SassProcessor : Sprockets::SassTemplate
-    module Sprockets3
-      def call(input)
-        context = input[:environment].context_class.new(input)
-
-        options = {
-          filename: input[:filename],
-          line_comments: line_comments?,
-          syntax: self.class.syntax,
-          load_paths: input[:environment].paths,
-          importer: SassC::Rails::Importer,
-          sprockets: {
-            context: context,
-            environment: input[:environment],
-            dependencies: context.metadata[:dependency_paths]
-          }
-        }.merge(config_options) { |*args| safe_merge(*args) }
-
-        engine = ::SassC::Engine.new(input[:data], options)
-
-        css = Sprockets::Utils.module_include(::SassC::Script::Functions, @functions) do
-          engine.render
-        end
-
-        context.metadata.merge(data: css)
+  class SassTemplate < Sprockets::SassProcessor
+    def initialize(options = {}, &block)
+      @cache_version = options[:cache_version]
+      @cache_key = "#{self.class.name}:#{VERSION}:#{SassC::VERSION}:#{@cache_version}".freeze
+      #@importer_class = options[:importer] || Sass::Importers::Filesystem
+      @sass_config = options[:sass_config] || {}
+      @functions = Module.new do
+        include Functions
+        include options[:functions] if options[:functions]
+        class_eval(&block) if block_given?
       end
     end
 
-    module Sprockets2
-      def self.included(base)
-        base.class_eval do
-          self.default_mime_type = "text/css"
-        end
+    def call(input)
+      context = input[:environment].context_class.new(input)
+
+      options = {
+        filename: input[:filename],
+        line_comments: line_comments?,
+        syntax: self.class.syntax,
+        load_paths: input[:environment].paths,
+        importer: SassC::Rails::Importer,
+        sprockets: {
+          context: context,
+          environment: input[:environment],
+          dependencies: context.metadata[:dependency_paths]
+        }
+      }.merge(config_options) { |*args| safe_merge(*args) }
+
+      engine = ::SassC::Engine.new(input[:data], options)
+
+      css = Sprockets::Utils.module_include(::SassC::Script::Functions, @functions) do
+        engine.render
       end
 
-      def evaluate(context, locals, &block)
-        options = {
-          filename: eval_file,
-          line_comments: line_comments?,
-          syntax: syntax,
-          load_paths: context.environment.paths,
-          importer: SassC::Rails::Importer,
-          sprockets: {
-            context: context,
-            environment: context.environment
-          }
-        }.merge(config_options, &method(:safe_merge))
-
-        ::SassC::Engine.new(data, options).render
-      end
-    end
-
-    if Sprockets::VERSION > "3.0.0"
-      include Sprockets3
-    else
-      include Sprockets2
+      context.metadata.merge(data: css)
     end
 
     def config_options
@@ -104,20 +79,34 @@ module SassC::Rails
         right
       end
     end
-  end
 
-  class ScssTemplate < SassTemplate
-    unless Sprockets::VERSION > "3.0.0"
-      self.default_mime_type = 'text/css'
-    end
+    # The methods in the Functions module were copied here from sprockets in order to
+    # override the Value class names (e.g. ::SassC::Script::Value::String)
+    module Functions
+      def asset_path(path, options = {})
+        path = path.value
 
-    # Sprockets 3
-    def self.syntax
-      :scss
+        path, _, query, fragment = URI.split(path)[5..8]
+        path     = sprockets_context.asset_path(path, options)
+        query    = "?#{query}" if query
+        fragment = "##{fragment}" if fragment
+
+        ::SassC::Script::Value::String.new("#{path}#{query}#{fragment}", :string)
+      end
+
+      def asset_url(path, options = {})
+        ::SassC::Script::Value::String.new("url(#{asset_path(path, options).value})")
+      end
+
+      def asset_data_url(path)
+        url = sprockets_context.asset_data_uri(path.value)
+        ::SassC::Script::Value::String.new("url(" + url + ")")
+      end
     end
+  end
 
-    # Sprockets 2
-    def syntax
+  class ScssTemplate < SassTemplate
+    def self.syntax
       :scss
     end
   end

data/lib/sassc/rails/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module SassC
   module Rails
-    VERSION = "1.3.0"
+    VERSION = "2.0.0"
   end
 end

data/sassc-rails.gemspec

@@ -23,14 +23,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency 'mocha'
 
-  # Unfortunately we require sass for now, so that we can
-  # reuse portions of the Sprockets template
-  spec.add_dependency 'sass'
-  spec.add_dependency "sassc", "~> 1.9"
-
+  spec.add_dependency "sassc", ">= 2.0"
   spec.add_dependency "tilt"
 
   spec.add_dependency 'railties', '>= 4.0.0'
-  spec.add_dependency 'sprockets', '> 2.11'
+  spec.add_dependency 'sprockets', '> 3.0'
   spec.add_dependency 'sprockets-rails'
 end

data/test/sassc_rails_test.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
-class SassRailsTest < MiniTest::Unit::TestCase
+class SassRailsTest < MiniTest::Test
   attr_reader :app
 
   def setup
@@ -167,7 +169,7 @@ class SassRailsTest < MiniTest::Unit::TestCase
 
     css_output = render_asset("css_scss_handler.css")
     assert_match %r{/* line 1}, css_output
-    assert_match %r{.+/sassc-rails/test/dummy/app/assets/stylesheets/css_scss_handler.css.scss}, css_output
+    assert_match %r{.+test/dummy/app/assets/stylesheets/css_scss_handler.css.scss}, css_output
   end
 
   def test_context_is_being_passed_to_erb_render
@@ -191,7 +193,7 @@ class SassRailsTest < MiniTest::Unit::TestCase
   def test_css_compressor_config_item_may_be_nil_in_test_mode
     @app.config.assets.css_compressor = nil
     initialize!
-    assert_equal nil, Rails.application.config.assets.css_compressor
+    assert_nil Rails.application.config.assets.css_compressor
   end
 
   def test_css_compressor_is_defined_in_test_mode

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ENV["RAILS_ENV"] = "test"
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -8,7 +10,7 @@ require "fileutils"
 require 'rails'
 require 'bundler/setup'
 require "minitest/autorun"
-require 'mocha/mini_test'
+require 'mocha/minitest'
 
 Bundler.require
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -67,33 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sassc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +114,14 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
@@ -159,19 +145,17 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rails_4_0.gemfile
-- gemfiles/rails_4_1.gemfile
 - gemfiles/rails_4_2.gemfile
+- gemfiles/rails_5_2.gemfile
 - gemfiles/sprockets-rails_2_3.gemfile
 - gemfiles/sprockets-rails_3_0.gemfile
-- gemfiles/sprockets_2_12.gemfile
 - gemfiles/sprockets_3_0.gemfile
 - gemfiles/sprockets_4_0.gemfile
-- gemfiles/with_sass_rails.gemfile
 - lib/sassc-rails.rb
 - lib/sassc/rails.rb
 - lib/sassc/rails/compressor.rb
@@ -239,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Integrate SassC-Ruby into Rails.

data/gemfiles/rails_4_1.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gem "rails", "~> 4.1.0"
-
-# Specify your gem's dependencies in sassc-rails.gemspec
-gemspec path: "../"

data/gemfiles/sprockets_2_12.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gem "sprockets", "~> 2.12.0"
-
-# Specify your gem's dependencies in sassc-rails.gemspec
-gemspec path: "../"

data/gemfiles/with_sass_rails.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gem "sass-rails"
-
-# Specify your gem's dependencies in sassc-rails.gemspec
-gemspec path: "../"