dolores-cfml 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/cfml.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cfml}
-  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 = ["Chris Van Pelt"]
-  s.date = %q{2009-08-21}
+  s.date = %q{2009-08-23}
   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 = [

data/lib/cfml/parser.rb

@@ -51,14 +51,17 @@ module CFML
     
     def valid?
       @errors = []
+      @doc.errors.each do |e|
+        @errors << "Malformed HTML.  #{e.message.chomp} on line #{e.line} column #{e.column}."
+      end
       @tags.select {|t| t.validate? && t.name =~ /^\s*$/ }.each do |t|
-        @errors << [t.to_s.split("\n")[0], "does not have a label or name specified."]
+        @errors << ["#{t.to_s.split("\n")[0]} does not have a label or name specified."]
       end
       dupes = @tags.select do |tag|
         tag.validate? && @tags.select {|t| t.name == tag.name}.length > 1
       end
       (dupes[1..-1] || []).each do |t|
-        @errors << [t.to_s.split("\n")[0], "has a duplicated name, please specify a unique name attribute."]
+        @errors << ["#{t.to_s.split("\n")[0]} has a duplicated name, please specify a unique name attribute."]
       end
       @tags.each do |t|
         next unless t.children
@@ -66,7 +69,7 @@ module CFML
           t.children.select {|c| c.value == child.value}.length > 1
         end
         (dupes[1..-1] || []).each do |c|
-          @errors << [c.to_s, "a child of #{t.to_s.split("\n")[0]} has a duplicated value, please specify a unique value attribute."]
+          @errors << ["#{c} a child of #{t.to_s.split("\n")[0]} has a duplicated value, please specify a unique value attribute."]
         end
       end
       @errors.length == 0

data/lib/cfml/tags/checkbox.rb

@@ -18,13 +18,16 @@ module CFML
         grouped? ? parsed : super
       end
       
+      def value
+        (@attrs["value"] || (grouped? ? @attrs["label"] : "true")).to_s
+      end
+      
       def data
         default = ""
         if @attrs["default"]
           default = Hidden.new("<cf:hidden name=\"#{name}\" value=\"#{@attrs["default"]}\"/>", @opts).to_html
         end
-        super.merge({
-          "value" => (@attrs["value"] || (grouped? ? @attrs["label"] : "true")).to_s, 
+        super.merge({ 
           "default" => default, 
           "checked" => @attrs["checked"] ? "checked=\"checked\"" : "",
           "label" => @attrs["label"].to_s})

data/lib/cfml/tags/radio.rb

@@ -14,9 +14,12 @@ module CFML
         grouped? ? parsed : super
       end
       
+      def value
+        (@attrs["value"] || @attrs["label"]).to_s
+      end
+      
       def data
         super.merge({
-          "value" => (@attrs["value"] || @attrs["label"]).to_s,
           "checked" => @attrs["checked"] ? "checked=\"checked\"" : "",
           "label" => @attrs["label"].to_s
         })

data/spec/validation_spec.rb

@@ -5,15 +5,24 @@ describe "CFML Validation" do
     @p = Parser.new(File.read(File.dirname(__FILE__) + "/fixtures/invalid.cfml"), {:prefix => "u12345"})
     @p.should_not be_valid
     @p.errors.should == [
-      ["<cf:checkbox label=\"\" value=\"yes\" gold=\"true\"/>", "does not have a label or name specified."], 
-      ["<cf:text label=\"Awesome\" validations=\"required email\"/>", "has a duplicated name, please specify a unique name attribute."], 
-      ["<cf:option label=\"Rad\"/>", "a child of <cf:select label=\"Awesome\"> has a duplicated value, please specify a unique value attribute."]
+      ["<cf:checkbox label=\"\" value=\"yes\" gold=\"true\"/> does not have a label or name specified."], 
+      ["<cf:text label=\"Awesome\" validations=\"required email\"/> has a duplicated name, please specify a unique name attribute."], 
+      ["<cf:option label=\"Rad\"/> a child of <cf:select label=\"Awesome\"> has a duplicated value, please specify a unique value attribute."]
     ]
   end
   
+  it "oks no duplicate checkbox" do
+    @p = Parser.new(<<-HTML)
+    <cf:checkboxes label="Cool">
+      <cf:checkbox label="one"/>
+      <cf:checkbox label="two"/>
+    </cf:checkboxes>
+    HTML
+    @p.should be_valid
+  end
+  
   it "oks valid cfml" do
     @p = Parser.new(File.read(File.dirname(__FILE__) + "/fixtures/complex.cfml"), {:prefix => "u12345"})
-    @p.valid?
     @p.should be_valid
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dolores-cfml
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Chris Van Pelt
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-21 00:00:00 -07:00
+date: 2009-08-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency