css_modules 0.7.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c9871bc394fa4fc5d7f43d7481929f7d8873f06
-  data.tar.gz: 0ad7ecb1028b027b456e371762258dd132a67605
+  metadata.gz: 21b9fabe952b1363c961b54679fc160c266a4015
+  data.tar.gz: 055009fe0234af3921b944ef78971844ca5f5076
 SHA512:
-  metadata.gz: 6f1af91b7bc4de1258ac9e4a4eebb0e15609a07327755077463c42c455197be1c2c896acb83b455a2afd68e496dba50b60ca6b0cae649f0496bd456f700536e9
-  data.tar.gz: ad3d5ce2e82397097f242b97f9f9ed55e364031ce86ccf43de73e6b32cf6c78ea498cce3f68e22ba4761e7c79a55996534d345d0075cb5ef14e8b543d938f74d
+  metadata.gz: d2bacefe1455169e48a20efe29caa16ed6ce85cc56f8dee9dd0535062f6245a19e3d2a66c558ce6a0988c0cf8153f840875e0400e7f434464d3b527ec67c53f7
+  data.tar.gz: 7bc30bd4c1c1a1c97b262aedd2f98616d89c4214fd4d63bc660c66e3fb91605b8f3ff1e6950319c4334bd7ed2ede9795c8121b6a29fc5fbd5d151f827ab7defd

data/README.md

@@ -159,8 +159,9 @@ $ gem install css_modules
   - Sprockets require CSS to JS? `require_styles` ?
 - Support plain `.css`
 - Support Sprockets 3+
+- Test on different Sass versions
 - Check for hash collisions in development
-- Fix bundle cache
+- Fix sprockets cache: a new version of this gem should expire an old cache
 
 ## License
 

data/lib/css_modules/engine.rb

@@ -6,11 +6,26 @@ module CSSModules
       # Make css_module.js accessible to Sprockets
       app.config.assets.paths << File.expand_path("../assets", __FILE__)
 
-      # This is Sprockets 2 only :S
       app.config.assets.configure do |env|
-        env.register_postprocessor('text/css', :css_modules) do |context, data|
-          CSSModules::Rewrite.rewrite_css(data)
-        end
+        env.register_postprocessor('text/css', RewritePostprocessor)
+      end
+    end
+
+    # Sprockets 2 & Sprockets 3-compatible postprocessor
+    # https://github.com/rails/sprockets/blob/master/guides/extending_sprockets.md#supporting-all-versions-of-sprockets-in-processors
+    class RewritePostprocessor
+      # Sprockets 2
+      def initialize(filename)
+        @source = yield
+      end
+
+      def render(variable, empty_hash)
+        self.class.call(data: @source)
+      end
+
+      # Sprockets 3+
+      def self.call(input)
+        CSSModules::Rewrite.rewrite_css(input[:data])
       end
     end
   end

data/lib/css_modules/rewrite.rb

@@ -43,8 +43,8 @@ module CSSModules
 
       def rebuild_parsed_rules(parsed_rules)
         new_members = parsed_rules.members.map do |member_seq|
-          leading_rule = first_selector(member_seq).to_s
-          matches = Rewrite::RE_MODULE.match(leading_rule)
+          leading_rule = first_pseudo_selector(member_seq).to_s
+          matches = leading_rule && Rewrite::RE_MODULE.match(leading_rule)
           if matches
             module_name = matches[:module_name]
             deeply_transform(module_name, member_seq)
@@ -55,13 +55,15 @@ module CSSModules
         Sass::Selector::CommaSequence.new(new_members)
       end
 
-      # Get the first non-sequence member of `seq`
-      def first_selector(seq)
+      # Get the first Sass::Selector::Pseudo member of `seq`, or nil
+      def first_pseudo_selector(seq)
         case seq
         when Sass::Selector::AbstractSequence
-          first_selector(seq.members.first)
-        else
+          seq.members.find { |m| first_pseudo_selector(m) }
+        when Sass::Selector::Pseudo
           seq
+        else # eg, String
+          nil
         end
       end
 
@@ -74,7 +76,9 @@ module CSSModules
           new_members.compact! # maybe a module selector returned nil
           clone_sequence(seq, new_members)
         when Sass::Selector::Id, Sass::Selector::Class
-          modulized_name = Rewrite.modulize_selector(module_name, seq.name)
+          # Sass 3.2 has an array here, Sass 3.4 has a string:
+          selector_name = seq.name.is_a?(Array) ? seq.name.first : seq.name
+          modulized_name = Rewrite.modulize_selector(module_name, selector_name)
           seq.class.new(modulized_name)
         when Sass::Selector::Pseudo
           if seq.to_s =~ /:module/

data/lib/css_modules/version.rb

@@ -1,3 +1,3 @@
 module CSSModules
-  VERSION = "0.7.0"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: css_modules
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-17 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides a css-module-like experience to Sass/SCSS, Rails views and JavaScript
 email:
 - rdmosolgo@gmail.com