xass 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1379c927e3705f0b1b043c71175479304ad30d03
-  data.tar.gz: 2f7fcce9680f8c8eb9ec60a9edb0e6e21da10647
+  metadata.gz: 80a50e4ca63afeb3d5131cdf4cdd811b930b8ea8
+  data.tar.gz: 8bddf67014de48ec254ddef2faed3155305b508d
 SHA512:
-  metadata.gz: 65808d49586c48ae14721767581591bc76b604fb0dd1f1c065ea92f8e59c1a27c1795fa8c094372dbedd2ff671b4dc3d89d709faf97d3c9392944446b3deb61d
-  data.tar.gz: c0862d2067d4328c79e06ae1d4b5ff2ca2f6c3846c145bea648b0bcfeff09d622aa7a25a89e5085522f3e761dbc6555ad2c1e6e807b54b67343d94ea7f8e20ef
+  metadata.gz: 9e3e98cd4b5b969ffba2c7fe4ab8b4e1ec4f8e20c0ee46b492b53909a9616f26a55214b6bdf05b28599d6d80abc37285cece2035a05b631a18edd7047771690f
+  data.tar.gz: 1dc7a5bd0f6eb59c0dba2de7213501ea292e879d314876592cc21cff2996fecc6f88ced0063dcfd0e9d576e551cb77366d71a03fc122d0b4bd9a8d1e53052f76

data/lib/xass/view_helpers.rb

@@ -1,15 +1,13 @@
 module Xass
   module ViewHelpers
     def namespace(*names, reset: false, &block)
-      nss = namespaces
-      if reset
-        @namespaces = [names]
-      else
-        @namespaces = nss + [names]
-      end
+      n = reset ? names : namespace_stack.last + names
+      namespace_stack.push(n)
       res = capture(&block)
-      @namespaces = nss
-      res
+      namespace_stack.pop
+      node = Nokogiri::HTML(res)
+      process_namespace_classes(node, n)
+      node.to_html.html_safe
     end
 
     def namespace!(*names, &block)
@@ -17,8 +15,8 @@ module Xass
     end
 
     def namespace_with_root(*names, tag: :div, attrs: {}, reset: false, &block)
-      nss = reset ? [] : namespaces
-      content_tag(tag, block ? namespace(*names, reset: reset, &block) : '', attrs_with_additional_class(attrs, ns_root!(*(nss.flatten + names))))
+      nss = reset ? [] : namespace_stack.last
+      content_tag(tag, block ? namespace(*names, reset: reset, &block) : '', attrs_with_additional_class(attrs, ns_root!(*(nss + names))))
     end
 
     def namespace_with_root!(*names, tag: :div, attrs: {}, &block)
@@ -31,18 +29,14 @@ module Xass
       content_tag(_tag, block ? capture(&block) : '', attrs_with_additional_name(_attrs, name))
     end
 
-    def ns_link_to(name, _name = nil, options = nil, html_options = nil, &block)
-      if block
-        options ||= {}
-        link_to(_name, attrs_with_additional_name(options, name), &block)
-      else
-        html_options ||= {}
-        link_to(_name, options, attrs_with_additional_name(html_options, name), &block)
-      end
+    def ns_content(name = :content, _tag = nil, _attrs = nil, tag: :div, attrs: {}, &block)
+      _tag ||= tag
+      _attrs ||= attrs
+      ns_wrap(name, tag: _tag, attrs: _attrs, &block)
     end
 
     def ns_root(*names)
-      ns_root!(*(namespaces.flatten + names))
+      ns_root!(*(namespace_stack.last + names))
     end
 
     def ns_root!(*names)
@@ -50,17 +44,35 @@ module Xass
     end
 
     def ns(*names)
-      "#{ns_root(*names[0...-1])}___#{names[-1]}"
+      ns!(*(namespace_stack.last + names))
     end
 
     def ns!(*names)
       "#{ns_root!(*names[0...-1])}___#{names[-1]}"
     end
 
+    def ns_link_to(name, _name = nil, options = nil, html_options = nil, &block)
+      if block
+        options ||= {}
+        link_to(_name, attrs_with_additional_name(options, name), &block)
+      else
+        html_options ||= {}
+        link_to(_name, options, attrs_with_additional_name(html_options, name), &block)
+      end
+    end
+
+    alias :dns :namespace
+    alias :dns! :namespace!
+    alias :dnsr :namespace_with_root
+    alias :dnsr! :namespace_with_root!
+    alias :nsr :ns_root
+    alias :nsr! :ns_root!
+    alias :nsc :ns_content
+
     private
 
-    def namespaces
-      @namespaces ||= []
+    def namespace_stack
+      @namespace_stack ||= [[]]
     end
 
     def attrs_with_additional_class(attrs, klass)
@@ -72,5 +84,40 @@ module Xass
     def attrs_with_additional_name(attrs, name)
       attrs_with_additional_class(attrs, ns(name))
     end
+
+    def process_namespace_classes(node, n)
+      unless node['class'].blank?
+        node['class'] = node['class'].split(/ +/).map { |c|
+          if c.start_with?('ns-')
+            ns!(*n, *c[3..-1].split('--'))
+          elsif c.start_with?('nsb-')
+            ns!(*c[4..-1].split('--'))
+          elsif c.start_with?('dns-')
+            n = n + c[4..-1].split('--')
+            ''
+          elsif c.start_with?('dnsb-')
+            n = c[5..-1].split('--')
+            ''
+          elsif c == 'nsr'
+            nsr!(*n)
+          elsif c.start_with?('nsr-')
+            nsr!(*n, *c[4..-1].split('--'))
+          elsif c.start_with?('nsrb-')
+            nsr!(*c[5..-1].split('--'))
+          elsif c.start_with?('dnsr-')
+            n = n + c[5..-1].split('--')
+            nsr!(*n)
+          elsif c.start_with?('dnsrb-')
+            n = c[6..-1].split('--')
+            nsr!(*n)
+          else
+            c
+          end
+        }.join(' ')
+      end
+      node.children.each do |c|
+        process_namespace_classes(c, n)
+      end
+    end
   end
 end

data/lib/xass.rb

@@ -25,8 +25,8 @@ module Sass::Tree
         trace_node = Sass::Tree::TraceNode.from_node(node.name, node)
         with_environment(env) {
           trace_node.children = mixin.tree.map {|c|
-            d = c.dup
-            d.filename = node.filename
+            d = c.deep_copy
+            xass_recursive_set_filename(d, node.filename)
             visit(d)
           }.flatten
         }
@@ -41,6 +41,13 @@ module Sass::Tree
     ensure
       @stack.pop unless include_loop
     end
+
+    private
+
+    def xass_recursive_set_filename(node, filename)
+      node.filename = filename
+      node.children.each { |x| xass_recursive_set_filename(x, filename) }
+    end
   end
 
   class RootNode
@@ -50,9 +57,12 @@ module Sass::Tree
       old_render.split('/*').map { |x|
         next x unless x.match(/^ line [0-9]+, /)
         a, b = x.split("\n", 2)
-        m = a.match(/\/app\/assets\/stylesheets\/([^. ]+)\./)
-        next "#{a}\n#{b}" unless m
-        selector = class_replaced_selector(b.split("\n")[0].strip[0...-1].strip, class_prefix(m[1]))
+        m = a.match(/#{Rails.root}\/app\/assets\/stylesheets\/([^. ]+)\./)
+        d = "#{a}\n#{b}"
+        next d unless m
+        p = class_prefix(m[1])
+        next d unless p
+        selector = class_replaced_selector(b.split("\n")[0].strip[0...-1].strip, p)
         "#{a}\n#{selector} {\n#{b.split("\n", 2)[1]}"
       }.join('/*')
     end
@@ -68,7 +78,8 @@ module Sass::Tree
     def class_prefix(name)
       names = name.split('/')
       names = names[1..(names.index { |x| x.start_with?('!') } || -1)]
-      names.join('__')
+      p = names.join('__')
+      p.empty? ? nil : p
     end
 
     def replace_class(doc, class_prefix)

data/xass.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'xass'
-  s.version = '0.1.8'
+  s.version = '0.1.9'
   s.authors = ['Tetsuri Moriya']
   s.email = ['tetsuri.moriya@gmail.com']
   s.summary = 'Sass namespace extension'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xass
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Tetsuri Moriya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -112,4 +112,3 @@ signing_key:
 specification_version: 4
 summary: Sass namespace extension
 test_files: []
-has_rdoc: