dolores-cml 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.3

data/cml.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cml}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Van Pelt"]
-  s.date = %q{2009-08-26}
+  s.date = %q{2009-08-27}
   s.description = %q{CML let's you easily create form elements and custom interfaces for the CrowdFlower Croud Labor platform}
   s.email = %q{vanpelt@doloreslabs.com}
   s.extra_rdoc_files = [

data/lib/cml/tag.rb

@@ -83,11 +83,11 @@ module CML
     def label(label, tag = "label")
       label ||= @attrs["name"].to_s.capitalize
       required = " <span class=\"required\">(required)</span>" if validations.include?("required")
-      "<#{tag}>#{label}#{required}</#{tag.split(" ")[0]}>" if label.to_s != ""
+      "<#{tag} class=\"legend\">#{label}#{required}</#{tag.split(" ")[0]}>" if label.to_s != ""
     end
     
     def legend(label)
-      label(label, "legend") if label
+      label(label, "h2") if label
     end
     
     def to_liquid
@@ -125,7 +125,7 @@ module CML
       (@opts[:data] || {}).merge({
         "name" => prefix(name), 
         "label" => label(@attrs["label"]),
-        "legend" => label(@attrs["label"], "h2 class=\"legend\""),
+        "legend" => legend(@attrs["label"]),
         "classes" => classes,
         "value" => value
       })

data/lib/cml/tags/select.rb

@@ -8,8 +8,14 @@ module CML
 </select>
       HTML
       
+      #Auto magically prepend a default option if required
+      def default
+        default = [Option.new("<cml:option value=\"\">#{@cml["default"]}</cml:option>", @opts)] if @cml["default"]
+        default ||= [Option.new("<cml:option value=\"\">Select one</cml:option", @opts)] if validations.include?('validates-required')
+        default || [] 
+      end
+      
       def children
-        default = @cml["default"] ? [Option.new("<cml:option value=\"\">#{@cml["default"]}</cml:option>", @opts)] : []  
         default + @cml.xpath("cml:option").map do |c|
           Option.new(c, @opts)
         end

data/spec/complex_spec.rb

@@ -8,7 +8,7 @@ describe "CML Complex" do
       <h1>This is my name</h1>
       <p>This is a description about me</p>
       <div class="select">
-        <label>Awesome</label>
+        <label class="legend">Awesome</label>
         <select name="u12345[awesome]" class="awesome validates-required">
           <option value="">Choose an option</option>
           <option>Awesome</option>
@@ -19,11 +19,11 @@ describe "CML Complex" do
         <p class="instructions">Just be cool about it</p>
       </div>
       <div class="text">
-        <label>Opinion</label>
+        <label class="legend">Opinion</label>
         <input name="u12345[opinion]" class="opinion validates-minLength:30 large" type="text" value="">
       </div>
       <div class="text">
-        <label>Email</label>
+        <label class="legend">Email</label>
         <input name="u12345[email]" class="email validates-required validates-email" type="text" value="">
       </div>
       <div class="rad">

data/spec/tags/group_spec.rb

@@ -25,7 +25,7 @@ describe "CML Select" do
           </label>
         </div>
         <div class="text">
-          <label>Something</label>
+          <label class="legend">Something</label>
           <input name="u12345[something]" class="something" type="text" value="" />
         </div>
       </div>

data/spec/tags/select_spec.rb

@@ -13,7 +13,7 @@ describe "CML Select" do
     @p.to_html.should sorta_match(<<-HTML)
     <div class="cml" id="u12345">
       <div class="select">
-        <label>Basic</label>
+        <label class="legend">Basic</label>
         <select name="u12345[basic]" class="basic">
           <option>One</option>
           <option>Two</option>
@@ -24,6 +24,30 @@ describe "CML Select" do
     HTML
   end
   
+  it "should render correctly when required" do
+    cml = <<-HTML
+      <cml:select label="Basic" validates="required">
+        <cml:option value="oney">One</option>
+        <cml:option selected="true">Two</option>
+        <cml:option label="Awesome"/>
+      </cml:select>
+    HTML
+    @p = Parser.new(cml, :prefix => "u12345")
+    @p.to_html.should sorta_match(<<-HTML)
+    <div class="cml" id="u12345">
+      <div class="select">
+        <label class="legend">Basic</label>
+        <select name="u12345[basic]" class="basic validates-required">
+          <option value="">Select one</option>
+          <option value="oney">One</option>
+          <option selected="selected">Two</option>
+          <option>Awesome</option>
+        </select>
+      </div>
+    </div>
+    HTML
+  end
+  
   it "should render complex select" do
     cml = <<-HTML
       <cml:select label="Basic" default="Choose an option">
@@ -36,7 +60,7 @@ describe "CML Select" do
     @p.to_html.should sorta_match(<<-HTML)
     <div class="cml" id="u12345">
       <div class="select">
-        <label>Basic</label>
+        <label class="legend">Basic</label>
         <select name="u12345[basic]" class="basic">
           <option value="">Choose an option</option>
           <option value="oney">One</option>

data/spec/tags/text_spec.rb

@@ -9,7 +9,7 @@ describe "CML Text" do
     @p.to_html.should sorta_match(<<-HTML)
     <div class="cml" id="u12345">
       <div class="text">
-        <label>Coolio</label>
+        <label class="legend">Coolio</label>
         <input type="text" value="" name="u12345[coolio]" class="coolio"/>
       </div>
     </div>
@@ -26,7 +26,7 @@ describe "CML Text" do
     @p.to_html.should sorta_match(<<-HTML)
     <div class="cml" id="u12345">
       <div class="text">
-        <label>Coolio</label>
+        <label class="legend">Coolio</label>
         <input type="text" class="coolio validates-required small default" value="Awesome" name="u12345[coolio]" />
         <p class="instructions">Just be <b>cool</b> bro!</p>
       </div>

data/spec/tags/textarea_spec.rb

@@ -9,7 +9,7 @@ describe "CML Textarea" do
     @p.to_html.should sorta_match(<<-HTML)
     <div class="cml" id="u12345">
       <div class="textarea">
-        <label>Sweet dude man!</label>
+        <label class="legend">Sweet dude man!</label>
         <textarea name="u12345[sweet_dude_man]" class="sweet_dude_man">4 sure</textarea>
       </div>
     </div>
@@ -24,7 +24,7 @@ describe "CML Textarea" do
     @p.to_html.should sorta_match(<<-HTML)
     <div class="cml" id="u12345">
       <div class="textarea">
-        <label>Hot</label>
+        <label class="legend">Hot</label>
         <textarea name="u12345[hot]" class="hot validates-url default">Awesome</textarea>
         <p class="instructions">Nice</p>
       </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dolores-cml
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Chris Van Pelt
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-26 00:00:00 -07:00
+date: 2009-08-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,6 +97,7 @@ files:
 - spec/validation_spec.rb
 has_rdoc: false
 homepage: http://github.com/dolores/cml
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: CML is CrowdFlower Markup Language