oreorenasass 3.4.12 → 3.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8baffd1e4296f5b06cba21579d113a04ee110fc
-  data.tar.gz: 4c01f1f9eb215d73ee64e8f1cfe20b162b1455c8
+  metadata.gz: bc99e1d35d50bcf1f0bc6c4141e6939dac3bd08a
+  data.tar.gz: f9771f207f9b9e0a4026503a1bcdcb927fa4d37e
 SHA512:
-  metadata.gz: 1e8bff0959e4029dffa863ed37d086838862bd66dd3a99c258a5b94652ddc1f07e253c6c8eff63c9fe037948bd7b36bd96ff662f13821970b96eea58c4d44321
-  data.tar.gz: 05c5abf342a33181eba4793961c6839076c1dca2eb22e375c8364d803136e162694d59ff2a7913cbb653ba5484150332873b3071ca2d6ed87c90e99667725f4a
+  metadata.gz: d5ea4d649d5d8fe6fecd89ab8a4867c712adc56a888f1c773417cc23e3287f100ff1d47357fe23d8e69ec00087b45ee63f4bd2dc995f42f2b0b76fd512bfd9de
+  data.tar.gz: 5b4002d6cae01f01188ec93dc13e7b3e040c5200b53f519455ff189c2ab6665a9317857631d40fac97cd602ef3b09a0a6edb5a6affd79f1712a553147a04872c

data/VERSION

@@ -1 +1 @@
-3.4.12
+3.4.13

data/lib/sass/tree/root_node.rb

@@ -21,26 +21,55 @@ module Sass
         Visitors::CheckNesting.visit(result) # Check again to validate mixins
         result, extends = Visitors::Cssize.visit(result)
         Visitors::Extend.visit(result, extends)
-        #extended_result(result.to_s)
-        p = result.to_s
-        File.open('/tmp/hoge', 'w') do |f|
-          f.puts p
-        end
-        p
+        extended_result(result.to_s)
       end
 
       private
 
-      def extended_result(result)
-        File.open('/tmp/hoge', 'w') do |f|
-          f.puts result.split('/*').map { |x|
-            a, b = x.split("\n", 2)
-            m = a.match(/\/app\/assets\/stylesheets\/([^. \/]+)\./)
-            next nil unless m
-            [m[1], b.split("\n")[0].strip[0...-1]]
-          }.compact.to_s
+      def calculate_selector(selector, name)
+        class_prefix = calculate_class_prefix(name)
+        doc = CSSPool.CSS("#{selector} {}")
+        replace_class(doc, class_prefix)
+        doc_to_selector(doc)
+      end
+
+      def calculate_class_prefix(name)
+        names = name.split('/')
+        names = names[0...(names.index { |x| x.start_with?('_') } || -1)]
+        return '' if names.empty?
+        "#{names.join('__')}___"
+      end
+
+      def replace_class(doc, prefix)
+        doc.rule_sets[0].selectors.map do |selector|
+          selector.simple_selectors.each do |simple_selector|
+            simple_selector.additional_selectors.each do |additional_selector|
+              case additional_selector
+              when CSSPool::Selectors::Class
+                additional_selector.name = "#{prefix}#{additional_selector.name}"
+              when CSSPool::Selectors::PseudoClass
+                d = CSSPool.CSS("#{additional_selector.extra} {}")
+                replace_class(d, prefix)
+                additional_selector.extra = doc_to_selector(d)
+              end
+            end
+          end
         end
-        result
+      end
+
+      def doc_to_selector(doc)
+        doc.to_css.split("\n")[0][0...-1].strip.gsub('\00002e', '.')
+      end
+
+      def extended_result(result)
+        result.split('/*').map { |x|
+          next x if x.strip.empty?
+          a, b = x.split("\n",q 2)
+          m = a.match(/\/app\/assets\/stylesheets\/([^. ]+)\./)
+          next "#{a}\n#{b}" unless m
+          selector = calculate_selector(b.split("\n")[0].strip[0...-1].strip, m[1])
+          "#{a}\n#{selector} {\n#{b.split("\n", 2)[1]}"
+        }.join('/*')
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oreorenasass
 version: !ruby/object:Gem::Version
-  version: 3.4.12
+  version: 3.4.13
 platform: ruby
 authors:
 - Nathan Weizenbaum