dolores-cfml 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/cfml.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cfml}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   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-19}
+  s.date = %q{2009-08-21}
   s.description = %q{CFML let's you easily create form elements and custom interfaces for the CrowdFlower CroudSourcing platform}
   s.email = %q{vanpelt@doloreslabs.com}
   s.extra_rdoc_files = [
@@ -49,6 +49,7 @@ Gem::Specification.new do |s|
      "spec/tags/checkboxes_spec.rb",
      "spec/tags/group_spec.rb",
      "spec/tags/hidden_spec.rb",
+     "spec/tags/radios_spec.rb",
      "spec/tags/select_spec.rb",
      "spec/tags/text_spec.rb",
      "spec/tags/textarea_spec.rb",
@@ -70,6 +71,7 @@ Gem::Specification.new do |s|
      "spec/tags/checkboxes_spec.rb",
      "spec/tags/group_spec.rb",
      "spec/tags/hidden_spec.rb",
+     "spec/tags/radios_spec.rb",
      "spec/tags/select_spec.rb",
      "spec/tags/text_spec.rb",
      "spec/tags/textarea_spec.rb",

data/lib/cfml/tag.rb

@@ -51,7 +51,7 @@ module CFML
     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}>" if label.to_s != ""
+      "<#{tag}>#{label}#{required}</#{tag.split(" ")[0]}>" if label.to_s != ""
     end
     
     def legend(label)
@@ -93,7 +93,7 @@ module CFML
       (@opts[:data] || {}).merge({
         "name" => prefix(name), 
         "label" => label(@attrs["label"]),
-        "legend" => legend(@attrs["label"]),
+        "legend" => label(@attrs["label"], "h2 class=\"legend\""),
         "classes" => classes,
         "value" => value
       })

data/lib/cfml/tags/checkboxes.rb

@@ -19,10 +19,6 @@ module CFML
           Checkbox.new(c, @opts)
         end
       end
-      
-      def wrapper(parsed)
-        super(parsed,"fieldset")
-      end
     end
   end
 end

data/lib/cfml/tags/radios.rb

@@ -19,10 +19,6 @@ module CFML
           Radio.new(c, @opts)
         end
       end
-      
-      def wrapper(parsed)
-        super(parsed, "fieldset")
-      end
     end
   end
 end

data/spec/complex_spec.rb

@@ -33,8 +33,8 @@ describe "CFML Complex" do
       </div>
       <div class="group only-if:awesome">
       
-        <fieldset class="checkboxes">
-          <legend>Cool checkboxes</legend>
+        <div class="checkboxes">
+          <h2 class="legend">Cool checkboxes</h2>
         
           <label>
             <input name="u12345[rad][]" class="rad" type="checkbox" value="Wanna do it?">
@@ -44,7 +44,7 @@ describe "CFML Complex" do
             <input name="u12345[rad][]" class="rad" type="checkbox" value="Sure?">
           Sure?</label>
           <p class=\"instructions\">This <i>is</i> cool</p>
-        </fieldset>
+        </div>
         <input type="hidden" name="u12345[secret]" value="cool" class="secret" />
       </div>
     </div>

data/spec/tags/checkboxes_spec.rb

@@ -12,8 +12,8 @@ describe "CFML Checkboxes" do
     @p = Parser.new(cfml, :prefix => "u12345")
     @p.to_html.should sorta_match(<<-HTML)
     <div class="cfml u12345">
-      <fieldset class="checkboxes">
-        <legend>Cool checkboxes</legend>
+      <div class="checkboxes">
+        <h2 class="legend">Cool checkboxes</h2>
         <label>
           <input type="checkbox" value="Wanna do it?" name="u12345[cool_checkboxes][]" class="cool_checkboxes"/> Wanna do it?
         </label>
@@ -23,7 +23,7 @@ describe "CFML Checkboxes" do
         <label>
           <input type="checkbox" value="nope" checked="checked" name="u12345[cool_checkboxes][]" class="cool_checkboxes"/> Sure?
         </label>
-      </fieldset>
+      </div>
     </div>
     HTML
   end

data/spec/tags/group_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe "CFML Select" do
   it "should render group" do
     cfml = <<-HTML
-      <cf:group only-if="awesome">
+      <cf:group only-if="awesome[1]">
       <cf:checkboxes label="Cool checkboxes" name="rad">
         <cf:checkbox label="Wanna do it?"/>
         <cf:checkbox label="Sure?"/>
@@ -14,16 +14,16 @@ describe "CFML Select" do
     @p = Parser.new(cfml, :prefix => "u12345")
     @p.to_html.should sorta_match(<<-HTML)
     <div class="cfml u12345">
-      <div class="group only-if:awesome">
-        <fieldset class="checkboxes">
-          <legend>Cool checkboxes</legend>
+      <div class="group only-if:awesome[1]">
+        <div class="checkboxes">
+          <h2 class="legend">Cool checkboxes</h2>
           <label>
             <input name="u12345[rad][]" class="rad" type="checkbox" value="Wanna do it?" /> Wanna do it?
           </label>
           <label>
             <input name="u12345[rad][]" class="rad" type="checkbox" value="Sure?" /> Sure?
           </label>
-        </fieldset>
+        </div>
         <div class="text">
           <label>Something</label>
           <input name="u12345[something]" class="something" type="text" value="" />

data/spec/tags/radios_spec.rb

@@ -0,0 +1,30 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "CFML Radios" do
+  it "should render basic radios" do
+    cfml = <<-HTML
+      <cf:radios label="Cool radios">
+        <cf:radio label="Wanna do it?"/>
+        <cf:radio label="Sure?"/>
+        <cf:radio label="Not really..." value="nope" checked="true"/>
+      </cf:radios>
+    HTML
+    @p = Parser.new(cfml, :prefix => "u12345")
+    @p.to_html.should sorta_match(<<-HTML)
+    <div class="cfml u12345">
+      <div class="radios">
+        <h2 class="legend">Cool radios</h2>
+        <label>
+          <input type="radio" value="Wanna do it?" name="u12345[cool_radios]" class="cool_radios"/> Wanna do it?
+        </label>
+        <label>
+          <input type="radio" value="Sure?" name="u12345[cool_radios]" class="cool_radios"/> Sure?
+        </label>
+        <label>
+          <input type="radio" value="nope" checked="checked" name="u12345[cool_radios]" class="cool_radios"/> Sure?
+        </label>
+      </div>
+    </div>
+    HTML
+  end
+end

data/spec/tags/text_spec.rb

@@ -27,7 +27,7 @@ describe "CFML Text" do
     <div class="cfml u12345">
       <div class="text">
         <label>Coolio</label>
-        <input type="text" class="coolio small" value="" name="u12345[coolio]" class="coolio"/>
+        <input type="text" class="coolio small" value="" name="u12345[coolio]" />
         <p class="instructions">Just be <b>cool</b> bro!</p>
       </div>
     </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dolores-cfml
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Chris Van Pelt
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-19 00:00:00 -07:00
+date: 2009-08-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,6 +87,7 @@ files:
 - spec/tags/checkboxes_spec.rb
 - spec/tags/group_spec.rb
 - spec/tags/hidden_spec.rb
+- spec/tags/radios_spec.rb
 - spec/tags/select_spec.rb
 - spec/tags/text_spec.rb
 - spec/tags/textarea_spec.rb
@@ -129,6 +130,7 @@ test_files:
 - spec/tags/checkboxes_spec.rb
 - spec/tags/group_spec.rb
 - spec/tags/hidden_spec.rb
+- spec/tags/radios_spec.rb
 - spec/tags/select_spec.rb
 - spec/tags/text_spec.rb
 - spec/tags/textarea_spec.rb