css_modules 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dce9ca6ecb86907f4b2b6dd0b19eed2769d56f8a
-  data.tar.gz: ef5476565fb76bb21618521dbe9e7e57c0adbef0
+  metadata.gz: 403f0b499fe5a5237f4bfc5c21a92829bc4bc9bc
+  data.tar.gz: 862dca4771710a27d889663475c1e65bdb8feeae
 SHA512:
-  metadata.gz: 386082a080e70bef2535c1bb7730f6203969f8d7655563572b427ffffbbcb96d197ac638e2a4abf8db14bbaaf50529ac414073e7703e8fa0f1ad10d397e79b38
-  data.tar.gz: fee03dea66978d5af49efb5a68b0702e0fc85ccfb8d1cca2ad683358dec4c325f6acfc13276bea7981c2f8b7503888a5a3f6111724e57254f280837f483587d6
+  metadata.gz: bad7f00717805d0c236dfc0b62f9ada3fbce90141452b3e6e51b85582ca74b10e16c5eaebc550f77557e8f787614dc9cb7346d636d15ae09bd955b889478017d
+  data.tar.gz: d1c2adbd20eb6d351bd2c7f8bedde52a7abde889e4c30858b502868fc5599fc0cc3c9dfbe653b14121aa096b8dff95a3fa30cd521162f8d543598736b5162a5c

data/README.md

@@ -114,12 +114,10 @@ $ gem install css_modules
 
 ## TODO
 
-- Support minified identifiers for Production Env
 - Dead code warning for Development env:
   - Warn when not all styles are used?
   - Sprockets require CSS to JS? `require_styles` ?
 - Support plain `.css`
-- Use Sass's built-in parser?
 - Support Sprockets 3+
 - Check for hash collisions in development
 - Fix bundle cache

data/lib/css_modules/assets/css_module.js.erb

@@ -37,14 +37,14 @@ var CSSModule = (function() {
 
   function modulizeSelector(moduleName, selectorName, environment) {
     if (environment === "production") {
-      return moduleName.substr(0, 1) + computeHash(moduleName + selectorName) + selectorName.substr(0, 1);
+      return moduleName.substr(0, 1) + computeHash(moduleName) + selectorName;
     } else {
-      return moduleName + "_" + computeHash(moduleName + selectorName) + "_" + selectorName;
+      return moduleName + "_" + computeHash(moduleName) + "_" + selectorName;
     }
   }
 
   function _CSSModule(moduleName, selectorName, environment) {
-    environment || (environment = "<% Rails.env %>")
+    environment || (environment = "<% CSSModules.env.to_s %>")
 
     if (selectorName) {
       return modulizeSelector(moduleName, selectorName, environment);

data/lib/css_modules/rewrite.rb

@@ -1,5 +1,5 @@
-require "css_parser"
 require "css_modules/transform"
+require "sass"
 
 module CSSModules
   module Rewrite
@@ -13,19 +13,13 @@ module CSSModules
     # so that selectors can only be accessed programatically,
     # not by class name literals.
     def rewrite_css(css_module_code)
-      parser = CssParser::Parser.new
-      parser.load_string!(css_module_code)
+      # Parse incoming CSS into an AST
+      css_root = Sass::SCSS::CssParser.new(css_module_code, "(CSSModules)", 1).parse
 
-      rules = ""
+      Sass::Tree::Visitors::SetOptions.visit(css_root, {})
+      ModuleVisitor.visit(css_root)
 
-      parser.each_selector do |selector, declarations, specificity|
-        prettified_declarations = declarations.gsub(/;\s+/, ";\n  ")
-        modulized_selector = parse_selector(selector)
-        rules << "#{modulized_selector} {\n  #{prettified_declarations}\n}\n"
-      end
-
-      rules.strip!
-      rules
+      css_root.render
     end
 
     # Combine `module_name` and `selector`, but don't prepend a `.` or `#`
@@ -34,37 +28,63 @@ module CSSModules
     # @param selector [String] A would-be DOM selector (without the leading `.` or `#`)
     # @return [String] An opaque selector for this module-selector pair
     def modulize_selector(module_name, selector)
-      tran = Rails.env.production? ? Transform::ProductionTransform : Transform::DevelopmentTransform
+      tran = CSSModules.env == :production ? Transform::ProductionTransform : Transform::DevelopmentTransform
       tran.transform(module_name, selector)
     end
 
-    private
-    module_function
+    class ModuleVisitor < Sass::Tree::Visitors::Base
+      # No need to `yield` here since we run _after_ Sass -- it's already flattened.
+      # @return [void]
+      def visit_rule(node)
+        node.rule = node.rule.map { |r| transform_selector(r) }
+        node.parsed_rules = rebuild_parsed_rules(node.parsed_rules)
+      end
+
+      private
 
-    # This parses the selector for `:module` definitions or does nothing.
-    def parse_selector(selector)
-      matches = RE_MODULE.match(selector)
-      if matches.nil?
-        selector
-      else
-        module_name = matches[:module_name]
-        declaration_parts = matches[:declarations].split(" ")
-        declaration_parts
-          .map { |declaration_or_operator| rebuild_selector(module_name, declaration_or_operator) }
-          .join(" ")
+      def rebuild_parsed_rules(parsed_rules)
+        new_members = parsed_rules.members.map do |member_seq|
+          # `member_seq` is actually a deeply-nested array-like thing
+          # but since we're running _after_ Sass itself,
+          # we know all the tricky stuff is already taken care of.
+          # So now we can flatten it and re-parse it, no problem.
+          rule_s = member_seq.to_s
+          transformed_rule_s = transform_selector(rule_s)
+          selector_to_sass(transformed_rule_s)
+        end
+        Sass::Selector::CommaSequence.new(new_members)
+      end
+
+      def selector_to_sass(selector)
+        # This strips off leading whitespace, should I be putting it back on?
+        Sass::SCSS::StaticParser.new(selector.strip, nil, 1).parse_selector
+      end
+
+      # This parses the selector for `:module` definitions or does nothing.
+      def transform_selector(selector)
+        matches = Rewrite::RE_MODULE.match(selector)
+        if matches.nil?
+          selector
+        else
+          module_name = matches[:module_name]
+          declaration_parts = matches[:declarations].split(" ")
+          declaration_parts
+            .map { |declaration_or_operator| rebuild_selector(module_name, declaration_or_operator) }
+            .join(" ")
+        end
       end
-    end
 
-    # If `selector` is a class or ID, scope it to this module.
-    # If it is a bare element, leave it unscoped.
-    def rebuild_selector(module_ident, selector)
-      case selector[0]
-      when "#"
-        "##{modulize_selector(module_ident, selector[1..-1])}"
-      when "."
-        ".#{modulize_selector(module_ident, selector[1..-1])}"
-      else
-        selector
+      # If `selector` is a class or ID, scope it to this module.
+      # If it is a bare element, leave it unscoped.
+      def rebuild_selector(module_name, selector)
+        case selector[0]
+        when "#"
+          "##{Rewrite.modulize_selector(module_name, selector[1..-1])}"
+        when "."
+          ".#{Rewrite.modulize_selector(module_name, selector[1..-1])}"
+        else
+          selector
+        end
       end
     end
   end

data/lib/css_modules/transform.rb

@@ -25,13 +25,13 @@ module CSSModules
 
     module DevelopmentTransform
       def self.transform(module_name, selector_name)
-        "#{module_name}_#{Transform.compute_hash(module_name + selector_name)}_#{selector_name}"
+        "#{module_name}_#{Transform.compute_hash(module_name)}_#{selector_name}"
       end
     end
 
     module ProductionTransform
       def self.transform(module_name, selector_name)
-        "#{module_name[0]}#{Transform.compute_hash(module_name + selector_name)}#{selector_name[0]}"
+        "#{module_name[0]}#{Transform.compute_hash(module_name)}#{selector_name}"
       end
     end
   end

data/lib/css_modules/version.rb

@@ -1,3 +1,3 @@
 module CSSModules
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/css_modules.rb

@@ -2,3 +2,12 @@ require "css_modules/engine"
 require "css_modules/version"
 require "css_modules/rewrite"
 require "css_modules/view_helper"
+
+
+module CSSModules
+  class << self
+    attr_accessor :env
+  end
+  # If `:production`, then we use shorter hashes
+  self.env = Rails.env.production? ? :production : :development
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: css_modules
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: css_parser
+  name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement