casuistry 0.2.1 → 0.2.2

data/casuistry.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Casuistry-0.2.1
+# Gem::Specification for Casuistry-0.2.2
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{casuistry}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew King"]
-  s.date = %q{2008-07-09}
+  s.date = %q{2008-07-29}
   s.description = %q{Generates CSS using Ruby, like Markaby}
   s.email = %q{automatthew@gmail.com}
   s.extra_rdoc_files = ["lib/casuistry.rb", "lib/properties.rb", "lib/tags.rb", "README.rdoc"]
-  s.files = ["casuistry.gemspec", "lib/casuistry.rb", "lib/properties.rb", "lib/tags.rb", "Manifest", "README.rdoc", "test/basics.rb", "test/dan.css", "test/dan.cssy", "test/fiddle.css", "test/fiddle.cssy", "test/helper.rb", "test/nesting.cssy", "test/test.css", "test/test.cssy"]
+  s.files = ["casuistry.gemspec", "lib/casuistry.rb", "lib/properties.rb", "lib/tags.rb", "Manifest", "README.rdoc", "test/basics.rb", "test/dan.css", "test/dan.cssy", "test/fiddle.css", "test/fiddle.cssy", "test/helper.rb", "test/nesting.cssy", "test/test.css", "test/test.cssy", "test/benchmark_for_fun.rb"]
   s.has_rdoc = true
   s.homepage = %q{}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Casuistry", "--main", "README.rdoc"]
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{casuistry}
   s.rubygems_version = %q{1.2.0}
   s.summary = %q{Generates CSS using Ruby, like Markaby}
-  s.test_files = ["test/basics.rb", "test/helper.rb"]
+  s.test_files = ["test/basics.rb", "test/benchmark_for_fun.rb", "test/helper.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -40,7 +40,7 @@ end
 #   require dep
 # end
 # 
-# Version = '0.2.1'
+# Version = '0.2.2'
 # 
 # task :default => [:test]
 # 

data/lib/casuistry.rb

@@ -6,19 +6,20 @@ class Casuistry
     
   attr_reader :data
   
-  def self.process(*args,&block)
-    self.new.process(*args,&block)
-  end
-      
   def initialize(sel=nil)
     @data = []
-    @selectors = [ sel]
+    @selectors = [ sel ]
     @properties = []
     
+    # Primitive state machine
     # possible states are :closed_block, :chain, :open_block
     @state = :closed_block
   end
   
+  def self.process(*args,&block)
+    self.new.process(*args,&block)
+  end
+  
   def process(*args, &block)
     if block
       instance_eval(&block)
@@ -29,128 +30,127 @@ class Casuistry
   end
   
   def output
-    output = ""
-    @data.each do |sel|
-      output << sel.first
-      properties = sel.last.map { |s| "  #{s}" }.join("\n")
-      output << "\n{\n#{properties}\n}\n"
-    end
-    output
+    @data.map do |sel|
+      properties = sel.last.join("\n  ")
+      "#{sel.first}\n{\n  #{properties}\n}\n"
+    end.join
   end
-  
-    # state transitions
-    def open_block(new_selector)
-      case @state
-      when :closed_block, :open_block
-        combined_selector = [current_selector, new_selector].compact.join(" ")
-        @selectors.push combined_selector
-        new_property_set
-      when :chain
-        @selectors[-1] = "#{current_selector}#{new_selector}"
-        new_property_set
-      else
-        raise "You can't get to :open_block from #{@state.inspect}"
-      end
-      
-      @state = :open_block
-    end
 
-    def chain(new_selector)
-      case @state
-      when :closed_block, :open_block
-        combined_selector = [current_selector, new_selector].compact.join(" ")
-        @selectors.push( combined_selector)
-      when :chain
-        @selectors[-1] = "#{current_selector}#{new_selector}"
-      else
-        raise "You can't get to :chain from #{@state.inspect}"
-      end
-      
-      @state = :chain
-    end
 
-    def closed_block
-      case @state
-      when :open_block, :closed_block
-        @selectors.pop
-        @properties.pop
-      else
-        raise "You can't get to :closed_block from #{@state.inspect}"
-      end
-      
-      @state = :closed_block
-    end
 
+  # Pushes an empty array on the properties stack and registers
+  # that array (against the current selector) in @data
+  def new_property_set
+    @properties.push []
+    @data << [@selectors[-1], @properties[-1] ]
+  end
 
-  # normal methods
 
-    def selector(sel)
-      if block_given?
-        open_block(sel)
-        yield
-        closed_block
-      else
-        chain(sel)
-      end
-      self
+  # Declare a CSS selector using a block.  May be chained and nested.
+  def selector(sel)
+    if block_given?
+      open_block(sel)
+      yield
+      closed_block
+    else
+      chain(sel)
     end
-
-    def method_missing(name, &block)
-      sel = selectify(name)
-      if block_given?
-        open_block(sel)
-        yield
-        closed_block
-      else
-        chain(sel)
-      end
-      self
+    self
+  end
+  
+  # Catch unknown methods and treat them as CSS class or id selectors.
+  def method_missing(name, &block)
+    sel = selectify(name)
+    if block_given?
+      open_block(sel)
+      yield
+      closed_block
+    else
+      chain(sel)
     end
+    self
+  end
+  
+  # bang methods represent CSS ids.  Otherwise CSS classes.
+  def selectify(method_name)
+    matches = method_name.to_s.match( /([\w_]+)!$/)
+    matches ? "##{matches[1]}" : ".#{method_name}"
+  end
 
-    def current_selector
-        @selectors[-1]
-    end
 
-    def current_properties
-      @properties[-1]
+  # define tag methods that delegate to selector
+  methods =  HTML_TAGS.map do |tag|
+    <<-METHOD
+    def #{tag}(&block)
+      selector('#{tag}', &block)
     end
-
-    def new_property_set
-      @properties.push []
-      @data << [current_selector, current_properties ]
+    METHOD
+  end.join; module_eval(methods)
+
+  # define methods for CSS properties.
+  CSS_PROPERTIES.each do |method_name|
+    define_method method_name do |*args|
+      css_attr = method_name.gsub('_', '-')
+      property(css_attr, args)
     end
+  end
 
-    # define tag methods to delegate to selector
-    methods =  HTML_TAGS.map do |tag|
-      <<-METHOD
-      def #{tag}(&block)
-        selector('#{tag}', &block)
-      end
-      METHOD
-    end.join
-
-    module_eval methods
-
-    CSS_PROPERTIES.each do |method_name|
-      define_method method_name do |*args|
-        css_attr = method_name.gsub('_', '-')
-        property(css_attr, args)
-      end
+  # Add a property declaration string to the current selector's properties array.
+  def property(css_attr, *args)
+    @properties[-1] << "#{css_attr}: #{args.join(' ')};"
+  end
+  
+  ##  State transitions
+  
+  # Push the accumulated selector and a new property array onto the
+  # tops of their respected stacks
+  def open_block(new_selector)
+    case @state
+    when :closed_block, :open_block
+      combined_selector = [@selectors[-1], new_selector].compact.join(" ")
+      @selectors.push combined_selector
+      new_property_set
+    when :chain
+      @selectors[-1] = "#{@selectors[-1]}#{new_selector}"
+      new_property_set
+    else
+      raise "You can't get to :open_block from #{@state.inspect}"
     end
+    
+    @state = :open_block
+  end
 
-
-
-    def property(css_attr, *args)
-      current_properties << "#{css_attr}: #{args.join(' ')};"
+  # Pushes accumulated selector on the stack without generating a new properties array.
+  def chain(new_selector)
+    case @state
+    when :closed_block, :open_block
+      combined_selector = [@selectors[-1], new_selector].compact.join(" ")
+      @selectors.push( combined_selector)
+    when :chain
+      @selectors[-1] = "#{@selectors[-1]}#{new_selector}"
+    else
+      raise "You can't get to :chain from #{@state.inspect}"
     end
+    
+    @state = :chain
+  end
 
+  # Pop the selector string and property array for the closing block
+  # off of their respective stacks
+  def closed_block
+    case @state
+    when :open_block, :closed_block
+      @selectors.pop
+      @properties.pop
+    else
+      raise "You can't get to :closed_block from #{@state.inspect}"
+    end
+    
+    @state = :closed_block
+  end
 
 
-
-    def selectify(method_name)
-      matches = method_name.to_s.match( /([\w_]+)!$/)
-      matches ? "##{matches[1]}" : ".#{method_name}"
-    end
+  
   
 end
 

data/lib/properties.rb

@@ -8,6 +8,10 @@ class Casuistry
   background_position
   background_repeat
   border
+  border_left
+  border_top
+  border_right
+  border_bottom
   border_collapse
   border_color
   border_spacing

data/test/basics.rb

@@ -99,7 +99,7 @@ describe "Casuistry" do
     c = Cssy.new
     c.process(File.read( "#{here}/fiddle.cssy"))
     c.data.should == fiddle
-    # c.output.should == File.read( "#{here}/fiddle.css")
+    c.output.should == File.read( "#{here}/fiddle.css")
   end
   
   

data/test/benchmark_for_fun.rb

@@ -0,0 +1,50 @@
+require 'benchmark'
+require 'rubygems'
+require 'ruby-prof'
+here = File.dirname(__FILE__)
+require "#{here}/helper"
+
+n = 1000
+
+Benchmark.bm do |x|
+  x.report "fiddle.css    " do
+    n.times do
+      css = File.read "#{here}/fiddle.css"
+    end
+  end
+  
+  x.report "fiddle.cssy   " do
+    n.times do
+      c = Cssy.new
+      c.process(File.read("#{here}/fiddle.cssy"))
+      css = c.output
+    end
+  end
+  
+  x.report "blog.css      " do
+    n.times do
+      css = File.read "#{here}/blog.css"
+    end
+  end
+  
+  x.report "blog.cssy     " do
+    n.times do
+      c = Cssy.new
+      c.process(File.read("#{here}/blog.cssy"))
+      css = c.output
+    end
+  end
+  
+end
+
+result = RubyProf.profile do
+  c = Cssy.new
+  c.process(File.read("#{here}/blog.cssy"))
+  # css = c.output
+end
+
+printer = RubyProf::FlatPrinter.new(result)
+printer.print(STDOUT, 0)
+
+printer = RubyProf::GraphPrinter.new(result)
+printer.print(STDOUT, 0)

data/test/fiddle.css

@@ -1,17 +1,21 @@
-ul
+div
 {
   background: red;
-  width: 134px;
+  width: 9934px;
 }
-ul li .ugly
+div ul li
 {
   color: green;
 }
-ul .smurf .house
+div p.ugly.truly
+{
+  color: aqua;
+}
+div .smurf.house
 {
   height: 256px;
 }
-ul #asrael
+div #menu
 {
   padding: 10px;
 }
@@ -19,7 +23,7 @@ ul #asrael
 {
   margin: 0px;
 }
-.outer .middle .inner
+.outer.middle.inner
 {
   top: 34px;
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: casuistry
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Matthew King
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-09 00:00:00 -05:00
+date: 2008-07-29 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -73,4 +73,5 @@ specification_version: 2
 summary: Generates CSS using Ruby, like Markaby
 test_files: 
 - test/basics.rb
+- test/benchmark_for_fun.rb
 - test/helper.rb