xass 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 376b30a8930cfe354ce8093ef63e87b2c925e6a8
-  data.tar.gz: 45047749d602f718e572d6136b2603cc2b1d0ac2
+  metadata.gz: b92f761f31b78611e6fb903d0405ea97624e899f
+  data.tar.gz: d33d71d2a47b26f5c07efa014a4c83902ead0538
 SHA512:
-  metadata.gz: 553d01e5b16b3b6d921695ad5eea1b1ebc8a2db1b4419b56ce6428d4ac07c33bf459947da68a750e6c7e2da3b85b8b9bdcced3e950058d6ac60a9c4cdcb6b05b
-  data.tar.gz: 667687cb31f8a0277695a03ced263a636e531713cd0a36425392892a1e29b837191867cf98f7ff5a3d2845cb3eeb9d5a8b6a3fde0ce0c9daa007e07282bbfa93
+  metadata.gz: a90d64d429b02e361cc3c94556c52f8502f3df55726f6e21d2b2681f51114fb59a51d1b4f6675c103cb079378bc9a14f86695fc4ac04553c98daf7801943d519
+  data.tar.gz: 7047ae1e555ff7e838d4d849c71ab55bb58e769e32085426d612534e6e3bb6842bf794cedf4ee60b089165b702d907cb1c08ce7fd0ef42d4046ee50a121dbbce

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    xass (0.1.9)
+    xass (0.3.0)
       activesupport (~> 4.0)
       csspool
       nokogiri
-      sass
+      sass (= 3.4.7)
 
 GEM
   remote: https://rubygems.org/
@@ -38,7 +38,7 @@ GEM
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
     builder (3.2.2)
-    csspool (4.0.1)
+    csspool (4.0.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     haml (4.0.5)
@@ -49,11 +49,11 @@ GEM
     mail (2.6.1)
       mime-types (>= 1.16, < 3)
     mime-types (2.3)
-    mini_portile (0.6.0)
+    mini_portile (0.6.1)
     minitest (5.4.1)
     multi_json (1.10.1)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    nokogiri (1.6.4.1)
+      mini_portile (~> 0.6.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -85,7 +85,7 @@ GEM
     rspec-mocks (3.1.0)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.0)
-    sass (3.4.3)
+    sass (3.4.7)
     sprockets (2.12.2)
       hike (~> 1.2)
       multi_json (~> 1.0)

data/README.md

@@ -2,6 +2,10 @@
 
 Xass extends Rails with namespacing CSS classes in Sass.
 
+##SUPPORT
+
+Currently supported sass version is 3.2.19
+
 ##INSTALLATION
 
 We suppose you use Rails with sass-rails.
@@ -14,7 +18,7 @@ gem 'xass'
 
 ##USAGE
 
-###Example 1
+###Namespacing by directory tree
 
 ```sass
 // /app/assets/stylesheets/application.sass
@@ -29,7 +33,7 @@ gem 'xass'
   width: 100px
 ```
 
-This emits the following css.
+This emits the following css (notice that there are three underscores before `hogehoge`.)
 
 ```css
 .hoge__piyo__fuga___hogehoge {
@@ -37,13 +41,14 @@ This emits the following css.
 }
 ```
 
-In view, use helpers to apply the style.
+In view, use helpers or `ns` prefixed class names to apply the style.
 
 ```haml
 -# /app/views/someview.html.haml
 
 = namespace :hoge, :piyo, :fuga do
-  %div{ class: ns(:hogehoge) }
+  .ns-hogehoge
+  -# or %div{ class: ns(:hogehoge) }
 ```
 
 This emits
@@ -60,21 +65,25 @@ As matter of course, `namespace` can be nested as follows.
 = namespace :hoge do
   = namespace :piyo do
     = namespace :fuga do
-      %div{ class: ns(:hogehoge) }
+      .ns-hogehoge
 ```
 
-###Example 2
+If you don't want to dig namespaces, you can specify namespaces directly in `ns` prefixed class name.
 
-You can use `root` class for convenience.
+```haml
+= namespace :hoge do
+  .ns-piyo--fuga--hogehoge
+```
+
+###Special class name `root`
+
+You can use `root` class for specify a root class name.
 
 ```sass
 // /app/assets/stylesheets/main/hoge/piyo/fuga.sass
 
 .root
   width: 10px
-
-.hogehoge
-  width: 100px
 ```
 
 This emits
@@ -83,10 +92,6 @@ This emits
 .hoge__piyo__fuga {
   width: 10px;
 }
-
-.hoge__piyo__fuga___hogehoge {
-  width: 100px;
-}
 ```
 
 And,
@@ -95,16 +100,14 @@ And,
 -# /app/views/someview.html.haml
 
 = namespace :hoge, :piyo, :fuga do
-  %div{ class: ns_root }
-    %div{ class: ns(:hogehoge) }
+  .nsr
+  -# or %div{ class: nsr }
 ```
 
 This emits
 
 ```html
-<div class="hoge__piyo__fuga">
-  <div class="hoge__piyo__fuga___hogehoge"></div>
-</div>
+<div class="hoge__piyo__fuga"></div>
 ```
 
 Abbreviately, you can write this as follows.
@@ -112,11 +115,10 @@ Abbreviately, you can write this as follows.
 ```haml
 -# /app/views/someview.html.haml
 
-= namespace_with_root :hoge, :piyo, :fuga do
-  %div{ class: ns(:hogehoge) }
+= namespace_with_root :hoge, :piyo, :fuga
 ```
 
-###Example 3
+###Disable namespacing
 
 You can use `_` prefix to disable namespacing.
 
@@ -129,12 +131,6 @@ You can use `_` prefix to disable namespacing.
 ```sass
 // /app/assets/stylesheets/main/hoge/piyo/fuga.sass
 
-.root
-  width: 10px
-
-.hogehoge
-  width: 100px
-
 ._current
   background-color: black
 ```
@@ -142,20 +138,12 @@ You can use `_` prefix to disable namespacing.
 This emits the following css.
 
 ```css
-.hoge__piyo__fuga {
-  width: 10px;
-}
-
-.hoge__piyo__fuga___hogehoge {
-  width: 100px;
-}
-
 .current {
   background-color: black;
 }
 ```
 
-###Example 4
+###Reset current namespace
 
 In partial, you may want to reset current namespace. `namespace!` and `namespace_with_root!` do this.
 
@@ -167,7 +155,7 @@ In partial, you may want to reset current namespace. `namespace!` and `namespace
 ```
 
 ```haml
--# /app/views/partial.html.haml
+-# /app/views/_partial.html.haml
 
 = namespace_with_root! :foo do
   foo
@@ -182,3 +170,14 @@ This emits
   </div>
 </div>
 ```
+
+###Abbreviations
+
+The following aliases are available.
+
+```ruby
+alias :dns :namespace
+alias :dns! :namespace!
+alias :dnsr :namespace_with_root
+alias :dnsr! :namespace_with_root!
+```

data/lib/xass.rb

@@ -3,43 +3,37 @@ require_relative 'initialize'
 module Sass::Tree
   class Visitors::Perform
     def visit_mixin(node)
-      include_loop = true
-      handle_include_loop!(node) if @stack.any? {|e| e[:name] == node.name}
-      include_loop = false
+      @environment.stack.with_mixin(node.filename, node.line, node.name) do
+        mixin = @environment.mixin(node.name)
+        raise Sass::SyntaxError.new("Undefined mixin '#{node.name}'.") unless mixin
 
-      @stack.push(:filename => node.filename, :line => node.line, :name => node.name)
-      raise Sass::SyntaxError.new("Undefined mixin '#{node.name}'.") unless mixin = @environment.mixin(node.name)
-
-      if node.children.any? && !mixin.has_content
-        raise Sass::SyntaxError.new(%Q{Mixin "#{node.name}" does not accept a content block.})
-      end
+        if node.children.any? && !mixin.has_content
+          raise Sass::SyntaxError.new(%Q{Mixin "#{node.name}" does not accept a content block.})
+        end
 
-      args = node.args.map {|a| a.perform(@environment)}
-      keywords = Sass::Util.map_hash(node.keywords) {|k, v| [k, v.perform(@environment)]}
-      splat = node.splat.perform(@environment) if node.splat
-
-      self.class.perform_arguments(mixin, args, keywords, splat) do |env|
-        env.caller = Sass::Environment.new(@environment)
-        env.content = node.children if node.has_children
-
-        trace_node = Sass::Tree::TraceNode.from_node(node.name, node)
-        with_environment(env) {
-          trace_node.children = mixin.tree.map {|c|
-            d = c.deep_copy
-            xass_recursive_set_filename(d, node.filename)
-            visit(d)
-          }.flatten
-        }
-        trace_node
+        args = node.args.map {|a| a.perform(@environment)}
+        keywords = Sass::Util.map_vals(node.keywords) {|v| v.perform(@environment)}
+        splat = self.class.perform_splat(node.splat, keywords, node.kwarg_splat, @environment)
+
+        self.class.perform_arguments(mixin, args, splat, @environment) do |env|
+          env.caller = Sass::Environment.new(@environment)
+          env.content = [node.children, @environment] if node.has_children
+
+          trace_node = Sass::Tree::TraceNode.from_node(node.name, node)
+          with_environment(env) {
+            trace_node.children = mixin.tree.map { |c|
+              d = c.deep_copy
+              xass_recursive_set_filename(d, node.filename)
+              visit(c)
+            }.flatten
+          }
+          trace_node
+        end
       end
     rescue Sass::SyntaxError => e
-      unless include_loop
-        e.modify_backtrace(:mixin => node.name, :line => node.line)
-        e.add_backtrace(:line => node.line)
-      end
+      e.modify_backtrace(:mixin => node.name, :line => node.line)
+      e.add_backtrace(:line => node.line)
       raise e
-    ensure
-      @stack.pop unless include_loop
     end
 
     private

data/xass.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'xass'
-  s.version = '0.2.0'
+  s.version = '0.3.0'
   s.authors = ['Tetsuri Moriya']
   s.email = ['tetsuri.moriya@gmail.com']
   s.summary = 'Sass namespace extension'
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rails', '>= 0'
   s.add_development_dependency 'haml', '>= 0'
   s.add_runtime_dependency 'activesupport', '~> 4.0'
-  s.add_runtime_dependency 'sass', '>= 0'
+  s.add_runtime_dependency 'sass', '= 3.4.7'
   s.add_runtime_dependency 'csspool', '>= 0'
   s.add_runtime_dependency 'nokogiri', '>= 0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xass
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Tetsuri Moriya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2014-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -70,16 +70,16 @@ dependencies:
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.7
 - !ruby/object:Gem::Dependency
   name: csspool
   requirement: !ruby/object:Gem::Requirement