sassc-rails 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 597d03494d8a7feeff8bae4c0be19c2afe9852a05499afd17ab59010257cdfc2
-  data.tar.gz: 7055195b1511df649ab20ff16e06dd14a385fcd7b44f2c0acf51c844559a457f
+  metadata.gz: 880d0912909e0a73c114fb30870f6fbcfed113ee2f8b0d4503ad00ad4312bc8c
+  data.tar.gz: 35b13baed25a489f93569882e475d3a33df69c2b0f57c919db0676ccc7d475c6
 SHA512:
-  metadata.gz: 441e0939dd260e0cd05505cdbd38bcf638f65f5eec6ec15588698eaa9b8a354f0776bd89a2596732346e9a40e426fcac4cf3f951c67b742259af3ddd0d70c8bf
-  data.tar.gz: 566ffe365478924633f4ad7ceb2cb0b7739c22040527342727853af18e071189b5ed3b0d50ad80cd07aa4ccefb32bc9bfcf834c84f483a6bcb98925fd6d5db9f
+  metadata.gz: c72d762a74b7a5a599e7fb3d975d265ef29be217d511fb9ef6233f2303cc36601f27efeb4ce3b4e8383d31cc71a62a41564569b3c5db7e616c17ffabec0a7422
+  data.tar.gz: eb80a249c2b07d4765805ca13ceff9acd8275065a498b6a57e699758fa9bb40390903d8ab5fec71a2e974165a2183996812ec08b79c65ae15cb85fbeccc4d9c2

data/.travis.yml

@@ -15,6 +15,7 @@ gemfile:
 rvm:
   - 2.4.4
   - 2.5.1
+  - jruby
 
 notifications:
   email: false

data/README.md

@@ -85,6 +85,9 @@ is maintained by [Ryan Boland](https://ryanboland.com) and [awesome contributors
 
 ## Changelog
 
+- **2.1.0**
+  - [JRuby support](https://github.com/sass/sassc-rails/pull/113)
+  - [SCSS / SASS scaffolding](https://github.com/sass/sassc-rails/pull/112)
 - **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)

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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +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/

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

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +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/

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

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

data/lib/sassc/rails/importer.rb

@@ -113,7 +113,7 @@ module SassC
 
             EXTENSIONS.each do |extension|
               try_path = File.join(search_path, file_name + extension.postfix)
-              if File.exists?(try_path)
+              if File.exist?(try_path)
                 record_import_as_dependency try_path
                 return extension.import_for(try_path, parent_dir, options)
               end

data/lib/sassc/rails/template.rb

@@ -32,7 +32,7 @@ module SassC::Rails
           environment: input[:environment],
           dependencies: context.metadata[:dependency_paths]
         }
-      }.merge(config_options) { |*args| safe_merge(*args) }
+      }.merge!(config_options) { |key, left, right| safe_merge(key, left, right) }
 
       engine = ::SassC::Engine.new(input[:data], options)
 
@@ -70,9 +70,9 @@ module SassC::Rails
       Rails.application.config.sass.line_comments
     end
 
-    def safe_merge(key, left, right)
+    def safe_merge(_key, left, right)
       if [left, right].all? { |v| v.is_a? Hash }
-        left.merge(right) { |*args| safe_merge *args }
+        left.merge(right) { |k, l, r| safe_merge(k, l, r) }
       elsif [left, right].all? { |v| v.is_a? Array }
         (left + right).uniq
       else

data/lib/sassc/rails/version.rb

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

data/test/sassc_rails_test.rb

@@ -250,9 +250,9 @@ class SassRailsTest < MiniTest::Test
   #    css_output = asset_output('css_application.css')
   #    assert_match /globbed/, css_output
 
-  #    if File.exists?("#{app_root}/log/development.log")
+  #    if File.exist?("#{app_root}/log/development.log")
   #      log_file = "#{app_root}/log/development.log"
-  #    elsif File.exists?("#{app_root}/log/test.log")
+  #    elsif File.exist?("#{app_root}/log/test.log")
   #      log_file = "#{app_root}/log/test.log"
   #    else
   #      flunk "log file was not created"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-30 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -156,6 +156,13 @@ files:
 - gemfiles/sprockets-rails_3_0.gemfile
 - gemfiles/sprockets_3_0.gemfile
 - gemfiles/sprockets_4_0.gemfile
+- 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/sassc-rails.rb
 - lib/sassc/rails.rb
 - lib/sassc/rails/compressor.rb