ionfish-stylish 0.1.3 → 0.1.4

data/History.txt

@@ -1,4 +1,10 @@
-=== Version 0.1.3 (TODO)
+=== Version 0.1.4 (2009-04-25)
+
+Bug fixes
+* Fix variable and selector serialisation bugs
+
+
+=== Version 0.1.3 (2009-04-24)
 
 Variables in the DSL
 * Selector and property variables

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 1
-:patch: 3
+:patch: 4
 :major: 0

data/lib/stylish/background.rb

@@ -214,7 +214,7 @@ module Stylish
     #
     # Otherwise it will produce an unordered list of individual background
     # declarations.
-    def to_s(symbols = {})
+    def to_s(symbols = {}, scope = "")
       if @compressed
         "background:#{self.value(true).map {|p, v| v }.compact.join(" ")};"
       else

data/lib/stylish/color.rb

@@ -373,7 +373,7 @@ module Stylish #:nodoc:
     #   color.type = :rgb
     #   color.to_s # => "rgb(0, 0, 0)"
     #
-    def to_s(symbols = {})
+    def to_s(symbols = {}, scope = "")
       return "inherit" if @type == :inherit
       
       self.send(:"to_#{self.type.to_s}")

data/lib/stylish/core.rb

@@ -192,8 +192,7 @@ module Stylish
     # The Selector class is also used internally by the Tree::SelectorScope
     # class, to store its scope value.
     def to_s(symbols = {}, scope = "")
-      (scope.empty? ? "" : scope + " ") +
-        (@selector.is_a?(String) ? @selector.to_s : @selector.to_s(symbols))
+      (scope.empty? ? "" : scope + " ") + @selector
     end
   end
   

data/lib/stylish/generate.rb

@@ -109,16 +109,16 @@ module Stylish
       # the tree is traversed. Nodes must then serialise themselves, and if
       # they contain Variables they must pass them the symbol table so that
       # they can be resolved to a given value.
-      def to_s(symbols)
+      def to_s(symbols, scope = "")
         if @constructor.nil?
           symbols[@name]
         elsif @name.is_a? Symbol
-          @constructor.new(symbols[@name]).to_s
+          @constructor.new(symbols[@name]).to_s(symbols, scope)
         else
           @constructor.new(@name.to_a.inject({}) {|a, e|
             a[e.first] = symbols[e.last]
             a
-          }).to_s
+          }).to_s(symbols, scope)
         end
       end
     end
@@ -219,7 +219,7 @@ module Stylish
         
         selectors = [selectors] unless selectors.is_a?(Array)
         selectors.map! do |s|
-          Selector.new(s.is_a?(Symbol) ? Variable.new(s) : s)
+          s.is_a?(Symbol) ? Variable.new(s, Selector) : Selector.new(s)
         end
         
         declarations = Generate.parse_declarations(declarations)

data/lib/stylish/tree.rb

@@ -45,8 +45,8 @@ module Stylish
       def initialize(selector)
         accept_format(/\s*/m, "\n")
         
-        @scope = Selector.new(selector)
         @nodes = []
+        @scope = selector
       end
             
       # Return the child node at the given index.
@@ -86,8 +86,10 @@ module Stylish
       # Recursively serialise the selector tree.
       def to_s(symbols = {}, scope = "")
         return "" if @nodes.empty?
-        scope = scope.empty? ? @scope.to_s : scope + " " + @scope.to_s
-        @nodes.map {|node| node.to_s(symbols, scope) }.join(@format)
+        
+        @nodes.map {|node|
+          node.to_s(symbols, @scope.to_s(symbols, scope))
+        }.join(@format)
       end
       
       # Return the node's child nodes.

data/test/stylesheet_test.rb

@@ -2,8 +2,8 @@ class StylesheetTest < Test::Unit::TestCase
   
   def setup
     @style = Stylish::Stylesheet.new
-    @node  = Stylish::Tree::SelectorScope.new("div")
-    @onde  = Stylish::Tree::SelectorScope.new("span")
+    @node  = Stylish::Tree::SelectorScope.new(Stylish::Selector.new("div"))
+    @onde  = Stylish::Tree::SelectorScope.new(Stylish::Selector.new("span"))
     @rule  = Stylish::Rule.new([Stylish::Selector.new("em")],
                [Stylish::Declaration.new("font-weight", "bold")])
   end

data/test/tree_test.rb

@@ -2,7 +2,7 @@ class TreeTest < Test::Unit::TestCase
   
   def setup
     @tree    = Stylish::Stylesheet.new
-    @node    = Stylish::Tree::SelectorScope.new(".test")
+    @node    = Stylish::Tree::SelectorScope.new(Stylish::Selector.new(".test"))
     @rule    = Stylish::Rule.new([Stylish::Selector.new("p")],
                  [Stylish::Declaration.new("font-weight", "bold")])
     @comment = Stylish::Comment.new("Comment header",
@@ -45,7 +45,8 @@ class TreeTest < Test::Unit::TestCase
   end
   
   def test_selector_serialisation
-    onde = Stylish::Tree::SelectorScope.new(".parent > .child")
+    selector = Stylish::Selector.new(".parent > .child")
+    onde = Stylish::Tree::SelectorScope.new(selector)
     @node << @rule
     onde  << @rule
     @tree << @node

data/test/variable_test.rb

@@ -19,10 +19,22 @@ class VariableTest < Test::Unit::TestCase
   def test_selector_variables
     style = Stylish.generate do
       rule :some_selector, :line_height => 1.5
+      
+      rule :some_other_selector do
+        em :font_weight => "bold"
+      end
+      
+      form do
+        rule :third_selector, :text_transform => "uppercase"
+      end
     end
     
-    assert_equal("body p {line-height:1.5;}",
-      style.to_s({:some_selector => "body p"}))
+    assert_equal("body p {line-height:1.5;}\n" +
+      "div em {font-weight:bold;}\n" +
+      "form legend {text-transform:uppercase;}",
+      style.to_s({:some_selector => "body p",
+                  :some_other_selector => "div",
+                  :third_selector => "legend"}))
   end
   
   def test_color_variables

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ionfish-stylish
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Benedict Eastaugh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-24 00:00:00 -07:00
+date: 2009-04-25 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -73,7 +73,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Write CSS with Ruby
 test_files: 
 - test/background_test.rb