automatthew-casuistry 0.1.1 → 0.2.0

data/casuistry.gemspec

@@ -1,14 +1,14 @@
 
-# Gem::Specification for Casuistry-0.1.1
+# Gem::Specification for Casuistry-0.2.0
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{casuistry}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew King"]
-  s.date = %q{2008-07-07}
+  s.date = %q{2008-07-08}
   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"]
@@ -40,7 +40,7 @@ end
 #   require dep
 # end
 # 
-# Version = '0.1.1'
+# Version = '0.2.0'
 # 
 # task :default => [:test]
 # 

data/lib/casuistry.rb

@@ -8,20 +8,23 @@ class Casuistry
   
   attr_reader :data, :assigns
   
-  def self.process(file)
-    cssy = File.read(file)
-    c = self.new
-    c.process(cssy)
-    c
+  def self.process(*args,&block)
+    self.new.process(*args,&block)
   end
-  
-  def process(string)
-    self.instance_eval(string)
-  end
-  
+      
   def initialize(selector=nil)
     @selector = selector
     @data = []
+    
+  end
+  
+  def process(*args, &block)
+    if block
+      Selector.new(@selector, self).instance_eval(&block)
+    else
+      Selector.new(@selector, self).instance_eval(args.join("\n"))
+    end
+    @data
   end
   
   def output
@@ -34,46 +37,110 @@ class Casuistry
     output
   end
   
-  def selector_eval(*args, &block)
-    selector = args.compact.join(" ")
-    Selector.new(selector, self).instance_eval(&block)
-  end
+end
 
+class Selector
   
-  def selectify(method_name)
-    matches = method_name.to_s.match( /([\w_]+)!$/)
-    matches ? "##{matches[1]}" : ".#{method_name}"
+  def initialize(base_selector, casuist)
+    @selectors = [ base_selector ]
+    @properties = []
+    @casuist = casuist
+    # possible states are :closed_block, :chaining, :open_block
+    @state = :closed_block
   end
   
-  def method_missing(name, &block)
-    selector = selectify(name)
-    if block
-      selector_eval(@selector, selector, &block)
+  
+  # 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
+      open_properties
+    when :chaining
+      # puts current_selector, new_selector
+      @selectors[-1] = "#{current_selector}#{new_selector}"
+      open_properties
     else
-      x = [@selector, selector].compact.join(' ')
-      Selector.new(x, self)
+      raise "You can't get to :open_block from #{@state.inspect}"
     end
+    @state = :open_block
   end
   
-end
-
-class Selector
-  include Tags
-  def initialize(base_selector, casuist)
-    @selector = base_selector
-    @casuist = casuist
+  def chaining(new_selector)
+    case @state
+    when :closed_block, :open_block
+      combined_selector = [current_selector, new_selector].compact.join(" ")
+      @selectors.push( combined_selector)
+    when :chaining
+      @selectors[-1] = "#{current_selector}#{new_selector}"
+    else
+      raise "You can't get to :chaining from #{@state.inspect}"
+    end
+    @state = :chaining
   end
-
   
-  def selector_eval(*args, &block)
-    selector = args.compact.join(" ")
-    if block
-      Selector.new(selector, @casuist).instance_eval(&block)
+  def closed_block
+    case @state
+    when :open_block, :closed_block
+      @selectors.pop
+      @properties.pop
     else
-       Selector.new(selector, @casuist)
+      raise "You can't get to :closed_block from #{@state.inspect}"
     end
+    @state = :closed_block
   end
   
+  
+# methods
+  
+  def selector_eval(sel)
+    if block_given?
+      open_block(sel)
+      yield
+      closed_block
+    else
+      chaining(sel)
+    end
+    self
+  end
+  
+  def method_missing(name, &block)
+    sel = selectify(name)
+    if block_given?
+      open_block(sel)
+      yield
+      closed_block
+    else
+      chaining(sel)
+    end
+    self
+  end
+
+  def current_selector
+      @selectors[-1]
+  end
+  
+  def current_properties
+    @properties[-1]
+  end
+  
+  def open_properties
+    @properties.push []
+    @casuist.data << [current_selector, current_properties ]
+  end
+
+  # define tag methods to delegate to selector_eval
+  methods =  Tags::HTML_TAGS.map do |tag|
+    <<-METHOD
+    def #{tag}(&block)
+      selector_eval('#{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('_', '-')
@@ -81,34 +148,20 @@ class Selector
     end
   end
   
-  def properties
-    if @properties
-      return @properties
-    else
-      @properties ||= []
-      @casuist.data << [@selector, @properties]
-      @properties
-    end
-  end
+
   
   def property(css_attr, *args)
-    properties << "#{css_attr}: #{args.join(' ')};"
+    current_properties << "#{css_attr}: #{args.join(' ')};"
   end
   
+
+  
+  
   def selectify(method_name)
     matches = method_name.to_s.match( /([\w_]+)!$/)
     matches ? "##{matches[1]}" : ".#{method_name}"
   end
-  
-  def method_missing(name, &block)
-    selector = selectify(name)
-    if block
-      selector_eval(@selector, selector, &block)
-    else
-      x = [@selector, selector].join(' ')
-      Selector.new(x, @casuist)
-    end
-  end
+
   
 end
 

data/lib/properties.rb

@@ -50,7 +50,10 @@ list_style_image
 list_style_position
 list_style_type
 margin
+margin_left
 margin_top
+margin_right
+margin_bottom
 marker_offset
 marks
 max_height
@@ -64,7 +67,10 @@ outline_style
 outline_width
 overflow
 padding
+padding_left
 padding_top
+padding_right
+padding_bottom
 page
 page_break_after
 page_break_before

data/lib/tags.rb

@@ -81,7 +81,7 @@ module Tags
 
     # define tag methods to delegate to selector_eval
     methods =  HTML_TAGS.map do |tag|
-      "def #{tag}(&block); selector_eval(@selector, '#{tag}', &block);end\n"
+      "def #{tag}(&block); selector_eval(@selector.first, '#{tag}', &block);end\n"
     end.join
 
     module_eval methods

data/test/basics.rb

@@ -3,73 +3,104 @@ require "#{here}/helper"
 
 describe "Casuistry" do
   
-  before do    
-    @string = File.read("test.css")
-    @data = [
-        [ '.class_name1 .class_name2 .class_name3', 
-            [ 'font-size: 2em;', 'line-height: 3em;', 'border: 1px solid blue;']],
-        [ '#milk', 
-            ['background-color: blue;', 'border: 1px solid red']]
+  it "can nest blocks" do
+    proc = lambda do
+      div do
+        form { width "35px" }
+        ul do
+          li { background :red }
+        end
+      end
+    end
+    
+    data = [
+      ["div", []],
+      ["div form", ["width: 35px;"]],
+      ["div ul", []],
+      ["div ul li", ["background: red;"]]
     ]
-    @data2 = [
-      [ '#header', ['width: 500px;'] ],
-      [ '#header #menu', ['background: gray;']]
+    Cssy.process(&proc).should == data
+  end
+  
+  it "can chain blocks" do
+    proc = lambda do
+      p.smurf { color :blue }
+      p.gnome.hat { color :red }
+    end
+    
+    data = [
+      ["p.smurf", [ "color: blue;"]],
+      ["p.gnome.hat", ["color: red;"]]
     ]
+    Cssy.process(&proc).should == data
+  end
+  
+  it "can nest and chain" do
+    proc = lambda do
+      div do
+        span.ugly { font_family "Arial" }
+      end
+    end
     
-    @data3 = [
-      ["ul", ["background: red;", "width: 134px;"]], 
-      ["ul li .ugly", ["color: green;"]],
-      ["ul .smurf .house", ["height: 256px;"]],
-      ["ul #asrael", ["padding: 10px;"]],
-      [".gargamel", ["margin: 0px;"]],
-      [".outer .middle .inner", ["top: 34px;"]]
+    data = [
+      ["div", []],
+      ["div span.ugly", ["font-family: Arial;"]]
     ]
+    Cssy.process(&proc).should == data
+  end
+  
+  it "can chain and nest" do
+    proc = lambda do
+      ul.monkey do
+        li { list_style :none }
+      end
+    end
     
-    @css1 = <<-CSS
-ul
-{
-  background: red;
-  width: 134px;
-}
-ul li .ugly
-{
-  color: green;
-}
-ul .smurf .house
-{
-  height: 256px;
-}
-ul #asrael
-{
-  padding: 10px;
-}
-.gargamel
-{
-  margin: 0px;
-}
-.outer .middle .inner
-{
-  top: 34px;
-}
-    CSS
+    data = [
+      ["ul.monkey", []],
+      ["ul.monkey li", ["list-style: none;"]]
+    ]
+    Cssy.process(&proc).should == data
   end
-
-
-  it "interprets unknown ! methods as ids and others as classes" do
-    c = Casuistry.new
-    c.selectify("smurf!").should == "#smurf"
-    c.selectify("smurf").should == ".smurf"
+  
+  it "can chain and nest and chain and ..." do
+    proc = lambda do
+      div do
+        div.milk!.toast do
+          p.jam { margin :auto }
+          hr { background :green }
+        end
+        
+        p { border :none }
+      end
+    end
+    
+    data = [
+      ["div", []],
+      ["div div#milk.toast", []],
+      ["div div#milk.toast p.jam", ["margin: auto;"]],
+      ["div div#milk.toast hr", ["background: green;"]],
+      ["div p", ["border: none;"]]
+    ]
+    Cssy.process(&proc).should == data
   end
 
-  it "processes cssy code" do
-    c = Casuistry.new
-    c.instance_eval do
-      @background = "red"
-    end
-    c.process(File.read( "#{here}/fiddle.cssy"))
-    c.data.should == @data3
-    c.output.should == @css1
+
+  it "processes strings" do
+    fiddle = [
+      ["ul", ["background: red;"]],
+      ["ul li", ["color: green;"]],
+      ["ul p.ugly", ["color: aqua;"]],
+      ["ul .smurf.house", ["height: 256px;"]],
+      ["ul #asrael", ["padding: 10px;"]],
+      [".gargamel", ["margin: 0px;"]],
+      [".outer.middle.inner", ["top: 34px;"]]
+    ]
+    c = Cssy.process(File.read( "#{here}/fiddle.cssy"))
+    c.should == fiddle
+    # c.output.should == File.read( "#{here}/fiddle.css")
   end
   
   
+  
 end

data/test/dan.css

@@ -1,58 +1,40 @@
-/* reset.css */
-@import url( /stylesheets/main.css );
-@import url( /stylesheets/products.css );
-
-#intro_text a.back {
-	padding: 0 0 2px 25px;
-	font-weight: bold;
-	background: url("/images/icons-back.gif") 0 0 no-repeat;
-}
-div.wizard { margin-right: 8px; float: left; }
+#content form ul.properties li.property hr { display: block; clear: left; float: none; height: 0; visibility: hidden; margin: -0.66em; padding: 0; }
+
+#intro_text a.back{padding:0 0 2px 25px;font-weight:bold;background:url("/images/icons-back.gif") 0 0 no-repeat;}
+
+
+div.ac_results { border: 1px solid silver; text-align: left; background-color: white; color: gray; padding: 5px; margin-top: -8px;  }
+
+div.preview { float: left ; height: 400px; }
+div.preview iframe { border: none; display: block; position: relative; width: 490px; height: 340px; border: 1px solid silver; margin: 4px; padding: 30px 0;  }
+
+div.radio div.option, div.checkbox div.option { cursor: pointer; }
+
+div.tab-selector span{color:gray;font-size:11px;text-align:center;display:block;float:left;height:26px;width:129px;padding:12px 8px 0px 8px;background:url( /images/tab/unselected.gif ) repeat-x;cursor:pointer;}
+div.tab-selector span.selected{font-weight:bold;color:black;background:url( /images/tab/selected.gif ) repeat-x;}
+
+div.text.value { margin-top: -4px; }
+div.text.value input { height: 23px; width: 220px; border: none; background: url( /images/textfield_bg.gif) no-repeat;padding: 4px; font-size: 11px; font-weight: bold; color: gray;   }
+div.text.value textarea { width: 280px; height: 184px; font-size: 11px; color: gray; }
 
+div.wizard { margin-right: 8px; float: left; }
+form div.value { float: left; color: gray; }
+form label { float: left; display: block; width: 80px; text-align: right; padding-right: 14px; color: gray; font-weight: bold; font-size: 13px; }
 form ul.properties { display: block; margin: 0; padding: 0; clear: both; }
+img.title { padding-bottom: 8px; }
+
 li.property { display: block; list-style-type: none; clear: both; padding-bottom: 40px; }
-#content form ul.properties li.property hr { display: block; clear: left; float: none; height: 0; visibility: hidden; margin: -0.66em; padding: 0; }
-form label { float: left; display: block; width: 80px; text-align: right; padding-right: 14px; color: gray; font-weight: bold; font-size: 13px; }
-form div.value { float: left; color: gray; }
-div.radio div.option, div.checkbox div.option { cursor: pointer; }
+li.code.property { display: none; }
+
 li.size div.option { background: url( /images/bt_radio_off.gif) no-repeat; padding-left: 17px; height: 21px; font-size: 13px; }
 li.size div.option.selected { background: url( /images/bt_radio_on.gif) no-repeat; padding-left: 17px; height: 21px; font-size: 13px; }
+
 li.style div.option { float: left; border: 1px solid silver; padding: 1px; margin-left: 4px; opacity: 0.5; }
 li.style div.option.hover, li.style div.option.selected { border: 1px solid gray; }
 li.style div.option.selected { opacity: 1.0; }
-li.tos div.option { background: url( /images/checkbox.gif ) no-repeat; padding-left: 17px; }
-li.code.property { display: none; }
-div.text.value { margin-top: -4px; }
-div.text.value input { height: 23px; width: 220px; border: none; background: url( /images/textfield_bg.gif) no-repeat;
-	padding: 4px; font-size: 11px; font-weight: bold; color: gray;   }
-div.text.value textarea { width: 280px; height: 184px; font-size: 11px; color: gray; }
-div.preview { float: left ; height: 400px; }
-div.preview iframe { border: none; display: block; position: relative; width: 490px; height: 340px; border: 1px solid silver; margin: 4px; padding: 30px 0;  }
-
-div.ac_results { border: 1px solid silver; text-align: left; background-color: white; color: gray; padding: 5px; margin-top: -8px;  }
 
-img.title { padding-bottom: 8px; }
+li.tos div.option { background: url( /images/checkbox.gif ) no-repeat; padding-left: 17px; }
 
 ul.steps { display: block; margin: 0; padding: 0; clear: both; }
-
-ul.steps li.step { 
-	display: none; width: 403px; height: 335px;
-	margin-left: 2px; padding: 16px;
-	list-style-type: none; 
-	border: 1px solid silver; 
-}
-u.steps li.step.selected { display: block; }
-
-div.tab-selector span { 
-	color: gray;
-	font-size: 11px; text-align: center;
-	display: block; float: left; height: 26px; width: 129px; padding: 12px 8px 0px 8px; 
-	background: url( /images/tab/unselected.gif ) repeat-x; cursor: pointer;
-}
-
-div.tab-selector span.selected { 
-	/* border-right: 1px solid gray; border-left: 1px solid gray; border-top: 1px solid silver; */
-	font-weight: bold; color: black;
-	background: url( /images/tab/selected.gif ) repeat-x;
-}
-
+ul.steps li.step{display:none;width:403px;height:335px;margin-left:2px;padding:16px;list-style-type:none;border:1px solid silver;}
+ul.steps li.step.selected { display: block; }

data/test/fiddle.cssy

@@ -1,11 +1,15 @@
-favorite = 'green'
+# favorite = 'green'
 
 ul do
   
   background('red')
   
-  li.ugly do
-    color(favorite)
+  li do
+    color('green')
+  end
+  
+  p.ugly do
+    color('aqua')
   end
   
   smurf.house do
@@ -16,7 +20,7 @@ ul do
     padding("10px")
   end
   
-  width('134px')
+  # width('9934px')
   
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: automatthew-casuistry
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Matthew King
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-07 00:00:00 -07:00
+date: 2008-07-08 00:00:00 -07:00
 default_executable: 
 dependencies: []