sassc-rails 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 880d0912909e0a73c114fb30870f6fbcfed113ee2f8b0d4503ad00ad4312bc8c
-  data.tar.gz: 35b13baed25a489f93569882e475d3a33df69c2b0f57c919db0676ccc7d475c6
+  metadata.gz: bab6450e8f0f559676574d793ebfd3907047d86f1211f7b37d7ddefef7d9d489
+  data.tar.gz: 319f4a01bd86c17e651e54971d7e275e1112e5edf403b2ff224bcffa4860b2e8
 SHA512:
-  metadata.gz: c72d762a74b7a5a599e7fb3d975d265ef29be217d511fb9ef6233f2303cc36601f27efeb4ce3b4e8383d31cc71a62a41564569b3c5db7e616c17ffabec0a7422
-  data.tar.gz: eb80a249c2b07d4765805ca13ceff9acd8275065a498b6a57e699758fa9bb40390903d8ab5fec71a2e974165a2183996812ec08b79c65ae15cb85fbeccc4d9c2
+  metadata.gz: ea0d8aa788795d3fd25cb7f929728cb24bc521fada59bc41d9342ac8d91748243ea4de171c3aa06b7135d93e72d204606fd4dd364b032cc45ca7a4f0f35f5abc
+  data.tar.gz: 3a058c13f10d1605db0a80e326dd16e1f5a1f7bb9e6f7775ff5102dd154ceb90e03d6c100b090ebd3de4d2ccb32d81f02a47bedb0771ce2f6632305088b1d0a4

data/.travis.yml

@@ -4,6 +4,10 @@ bundler_args: "--binstubs --standalone --without documentation --path ../bundle"
 
 script: "bundle exec rake test"
 
+before_install:
+  - rvm @global do gem uninstall bundler -x
+  - gem install bundler --version '< 2'
+
 gemfile:
   - gemfiles/sprockets-rails_3_0.gemfile
   - gemfiles/sprockets-rails_2_3.gemfile
@@ -13,9 +17,15 @@ gemfile:
   - gemfiles/rails_5_2.gemfile
 
 rvm:
-  - 2.4.4
-  - 2.5.1
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
   - jruby
 
+matrix:
+  allow_failures:
+    - gemfile: gemfiles/rails_4_2.gemfile
+      rvm: jruby
+
 notifications:
   email: false

data/CODE_OF_CONDUCT.md

@@ -7,4 +7,4 @@ fair place to play.
 
 [The full community guidelines can be found on the Sass website.][link]
 
-[link]: http://sass-lang.com/community-guidelines
+[link]: https://sass-lang.com/community-guidelines

data/README.md

@@ -85,6 +85,10 @@ is maintained by [Ryan Boland](https://ryanboland.com) and [awesome contributors
 
 ## Changelog
 
+- **2.1.2**
+  - [Correct reference to SassC::Script::Value::String](https://github.com/sass/sassc-rails/pull/129)
+- **2.1.1**
+  - [Fix Scaffolding](https://github.com/sass/sassc-rails/pull/119)
 - **2.1.0**
   - [JRuby support](https://github.com/sass/sassc-rails/pull/113)
   - [SCSS / SASS scaffolding](https://github.com/sass/sassc-rails/pull/112)

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

@@ -1,3 +1,3 @@
 // 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/
+// You can use Sass here: https://sass-lang.com/

data/lib/rails/generators/sass_scaffold.rb

@@ -1,4 +1,4 @@
-require "sass/css"
+require "sassc/engine"
 require "rails/generators/named_base"
 
 module Sass
@@ -7,7 +7,7 @@ module Sass
       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)
+        converted_contents = ::SassC::Engine.new(File.read(file)).render
         create_file "app/assets/stylesheets/scaffolds.#{syntax}", converted_contents
       end
     end

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

@@ -1,3 +1,3 @@
 // 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/
+// You can use Sass (SCSS) here: https://sass-lang.com/

data/lib/sassc/rails/functions.rb

@@ -5,7 +5,7 @@ require 'sprockets/sass_functions'
 module Sprockets
   module SassFunctions
     def asset_data_url(path)
-      SassC::Script::String.new("url(" + sprockets_context.asset_data_uri(path.value) + ")")
+      ::SassC::Script::Value::String.new("url(" + sprockets_context.asset_data_uri(path.value) + ")")
     end
   end
 end

data/lib/sassc/rails/importer.rb

@@ -75,13 +75,13 @@ module SassC
       EXTENSIONS = [
         CssScssExtension.new,
         CssSassExtension.new,
-        Extension.new(".scss"),
-        Extension.new(".sass"),
-        CSSExtension.new,
+        SassERBExtension.new,
         ERBExtension.new(".scss.erb"),
         ERBExtension.new(".css.erb"),
-        SassERBExtension.new
-      ]
+        Extension.new(".scss"),
+        Extension.new(".sass"),
+        CSSExtension.new
+      ].freeze
 
       PREFIXS = [ "", "_" ]
       GLOB = /(\A|\/)(\*|\*\*\/\*)\z/

data/lib/sassc/rails/version.rb

@@ -2,6 +2,6 @@
 
 module SassC
   module Rails
-    VERSION = "2.1.0"
+    VERSION = "2.1.2"
   end
 end

data/sassc-rails.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency 'mocha'
 

data/test/dummy/app/assets/stylesheets/glob_multiple_extensions_test.scss

@@ -0,0 +1 @@
+@import "globbed_multiple_extensions/**/*";

data/test/dummy/app/assets/stylesheets/globbed_multiple_extensions/glob.scss.erb

@@ -0,0 +1,3 @@
+.glob {
+  margin: <%= 0 %>;
+}

data/test/sassc_rails_test.rb

@@ -271,6 +271,16 @@ class SassRailsTest < MiniTest::Test
   #  assert_match /\.import-css-application/, css_output
   #end
 
+  def test_globbed_imports_work_with_multiple_extensions
+    initialize!
+
+    asset = render_asset("glob_multiple_extensions_test.css")
+
+    assert_equal <<-CSS, asset
+.glob{margin:0}
+    CSS
+  end
+
   def test_globbed_imports_work_when_globbed_file_is_changed
     skip "This seems to work in practice, possible test setup problem"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc-rails
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2019-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -186,9 +186,11 @@ files:
 - test/dummy/app/assets/stylesheets/css_scss_erb_handler.scss.erb
 - test/dummy/app/assets/stylesheets/css_scss_handler.css.scss
 - test/dummy/app/assets/stylesheets/erb_render_with_context.css.erb
+- test/dummy/app/assets/stylesheets/glob_multiple_extensions_test.scss
 - test/dummy/app/assets/stylesheets/glob_test.scss
 - test/dummy/app/assets/stylesheets/globbed/globbed.scss
 - test/dummy/app/assets/stylesheets/globbed/nested/nested_glob.scss
+- test/dummy/app/assets/stylesheets/globbed_multiple_extensions/glob.scss.erb
 - test/dummy/app/assets/stylesheets/helpers_test.scss
 - test/dummy/app/assets/stylesheets/imports_test.scss
 - test/dummy/app/assets/stylesheets/in_load_paths/partial_in_load_paths.scss
@@ -249,9 +251,11 @@ test_files:
 - test/dummy/app/assets/stylesheets/css_scss_erb_handler.scss.erb
 - test/dummy/app/assets/stylesheets/css_scss_handler.css.scss
 - test/dummy/app/assets/stylesheets/erb_render_with_context.css.erb
+- test/dummy/app/assets/stylesheets/glob_multiple_extensions_test.scss
 - test/dummy/app/assets/stylesheets/glob_test.scss
 - test/dummy/app/assets/stylesheets/globbed/globbed.scss
 - test/dummy/app/assets/stylesheets/globbed/nested/nested_glob.scss
+- test/dummy/app/assets/stylesheets/globbed_multiple_extensions/glob.scss.erb
 - test/dummy/app/assets/stylesheets/helpers_test.scss
 - test/dummy/app/assets/stylesheets/imports_test.scss
 - test/dummy/app/assets/stylesheets/in_load_paths/partial_in_load_paths.scss