dolores-cfml 0.1.1 → 0.2.0

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.authors = ["Chris Van Pelt"]
     gem.add_dependency 'liquid', '>= 2.0.0'
     gem.add_dependency 'nokogiri', '>= 1.3.3'
-    gem.add_dependency 'httparty', '>= 1.1.3'
+    gem.add_dependency 'json_pure', '>= 1.1.3'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 
@@ -32,8 +32,11 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-
-
+task :refresh_builder => [:build] do
+  cp "pkg/cfml-#{File.read("VERSION").strip}.gem", "../builder/gems/cache/"
+  rm_rf "../builder/gems/gems/cfml-#{File.read("VERSION").strip}/"
+  `cd ../builder && bin/thor merb:gem:redeploy`
+end
 
 task :default => :spec
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/cfml.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cfml}
-  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 = ["Chris Van Pelt"]
-  s.date = %q{2009-08-16}
+  s.date = %q{2009-08-19}
   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 = [
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "cfml.gemspec",
      "lib/cfml.rb",
+     "lib/cfml/converters/jsawesome.rb",
      "lib/cfml/liquid_filters.rb",
      "lib/cfml/parser.rb",
      "lib/cfml/tag.rb",
@@ -29,6 +30,7 @@ Gem::Specification.new do |s|
      "lib/cfml/tags/checkboxes.rb",
      "lib/cfml/tags/group.rb",
      "lib/cfml/tags/hidden.rb",
+     "lib/cfml/tags/option.rb",
      "lib/cfml/tags/radio.rb",
      "lib/cfml/tags/radios.rb",
      "lib/cfml/tags/ratings.rb",
@@ -37,20 +39,21 @@ Gem::Specification.new do |s|
      "lib/cfml/tags/textarea.rb",
      "lib/cfml/tags/unknown.rb",
      "spec/complex_spec.rb",
+     "spec/converters/jsawesome_spec.rb",
      "spec/fixtures/complex.cfml",
-     "spec/gold_spec.rb",
+     "spec/fixtures/invalid.cfml",
+     "spec/meta_spec.rb",
      "spec/sorta_match.rb",
      "spec/spec_helper.rb",
      "spec/tags/checkbox_spec.rb",
      "spec/tags/checkboxes_spec.rb",
      "spec/tags/group_spec.rb",
      "spec/tags/hidden_spec.rb",
-     "spec/tags/radio_spec.rb",
-     "spec/tags/radios_spec.rb",
      "spec/tags/select_spec.rb",
      "spec/tags/text_spec.rb",
      "spec/tags/textarea_spec.rb",
-     "spec/tags/unknown_spec.rb"
+     "spec/tags/unknown_spec.rb",
+     "spec/validation_spec.rb"
   ]
   s.homepage = %q{http://github.com/dolores/cfml}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -59,19 +62,19 @@ Gem::Specification.new do |s|
   s.summary = %q{CFML is Crowd Flower Markup Language}
   s.test_files = [
     "spec/complex_spec.rb",
-     "spec/gold_spec.rb",
+     "spec/converters/jsawesome_spec.rb",
+     "spec/meta_spec.rb",
      "spec/sorta_match.rb",
      "spec/spec_helper.rb",
      "spec/tags/checkbox_spec.rb",
      "spec/tags/checkboxes_spec.rb",
      "spec/tags/group_spec.rb",
      "spec/tags/hidden_spec.rb",
-     "spec/tags/radio_spec.rb",
-     "spec/tags/radios_spec.rb",
      "spec/tags/select_spec.rb",
      "spec/tags/text_spec.rb",
      "spec/tags/textarea_spec.rb",
-     "spec/tags/unknown_spec.rb"
+     "spec/tags/unknown_spec.rb",
+     "spec/validation_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -81,15 +84,15 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<liquid>, [">= 2.0.0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.3.3"])
-      s.add_runtime_dependency(%q<httparty>, [">= 1.1.3"])
+      s.add_runtime_dependency(%q<json_pure>, [">= 1.1.3"])
     else
       s.add_dependency(%q<liquid>, [">= 2.0.0"])
       s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
-      s.add_dependency(%q<httparty>, [">= 1.1.3"])
+      s.add_dependency(%q<json_pure>, [">= 1.1.3"])
     end
   else
     s.add_dependency(%q<liquid>, [">= 2.0.0"])
     s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
-    s.add_dependency(%q<httparty>, [">= 1.1.3"])
+    s.add_dependency(%q<json_pure>, [">= 1.1.3"])
   end
 end

data/lib/cfml/converters/jsawesome.rb

@@ -0,0 +1,92 @@
+module CFML
+  module Converters
+    class JSAwesome
+      def initialize(json)
+        parsed = JSON.parse(json)
+        @json = parsed[0] || []
+        @labels = parsed[1] || {}
+      end
+      
+      def convert
+        @json.map do |k,v|
+          if k.is_a?(Array)
+            (k << v).map {|k,v| process(k,v)}
+          else
+            process(k,v)
+          end
+        end.join("\n")
+      end
+      
+      def label(k)
+        k = k.sub(/^[_#*^~]?\+?/,'')
+        l = @labels[k]
+        label = l.is_a?(Hash) ? l["label"] : l if l
+        label ||= k.capitalize.gsub(/_/,' ')
+      end
+      
+      def tag(tag, val, opts = {})
+        val = Array(val)
+        parts = val[0].split("|")
+        key = parts[0].sub(/^[_#*^~]?\+?/,'')
+        attrs = ["label=\"#{label(parts[0])}\""]
+        attrs << "name=\"#{parts[1]}\"" if parts[1]
+        attrs << "checked=\"true\"" if val[1]
+        attrs << "required=\"true\"" if @labels[key] && @labels[key]["required"]
+        opts.reject {|k,v| v.to_s.strip.length == 0}.each do |k,v|
+          attrs << "#{k}=\"#{v}\""
+        end
+        if @labels["gold"] && @labels["gold"][key]
+          src = @labels["gold"][key]
+          gattrs = ["src=\"#{src}\""]
+          regex = Array(@labels["gold"]["_"+src+"_regex"])
+          gattrs << "regex=\"#{regex[0]}\"" if regex[0]
+          gattrs << "flags=\"#{regex[1]}\"" if regex[1]
+          gattrs << "strict=\"true\"" if @labels["gold"]["_"+src+"_strict"]
+          gold = "><cf:gold #{gattrs.join(" ")} /></cf:#{tag}>"
+        else
+          gold = "/>"
+        end
+        
+        "<cf:#{tag} #{attrs.join(" ")} #{gold}"
+      end
+      
+      def process(k,v)
+        select_default = @labels['{}'] || "Choose Category"
+        cfml = case v
+        #a select tag or group of radios/checkboxes
+        when Array:
+          if(k =~ /^[^_]/)
+            if $~[0] == "*"
+              parent = "radios"
+              child = "radio"
+            elsif $~[0] == "^"
+              parent = "checkboxes"
+              child = "checkbox"
+            else
+              parent = "select"
+              child = "option"
+            end
+            <<-HTML
+            <cf:#{parent} label="#{label(k)}">
+              #{v.map { |c| tag(child, c)}.join("\n")}
+            </cf:#{parent}>
+            HTML
+          #Multiple hidden fields...
+          elsif(k =~ /^_/)
+            v.map { |c| tag("hidden", c)}.join("\n")
+          end
+        else
+          if(k =~ /^#/)
+            tag("textarea", k, {:default => v})
+          elsif(k =~ /^_/)
+            tag("hidden", k, {:value => v})
+          elsif(k =~ /^\^/)
+            tag("checkbox", k, {:default => v})
+          else
+            tag("text", k, {:default => v})
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cfml/parser.rb

@@ -1,37 +1,77 @@
 module CFML
   class Parser
+    attr_reader :doc, :cftags, :tags, :errors
+    
     def initialize(content, opts = {})
       @opts = opts
-      @doc = Nokogiri::XML("<root xmlns:cf='http://crowdflower.com'>#{content}</root>")
+      @doc = Parser.parse(content)
       @cftags = @doc.xpath("//cf:*[not(ancestor::cf:*)]")
+      @tags = @cftags.map do |t|
+        tag_class(t.name).new(t, @opts)
+      end
+    end
+    
+    def self.parse(content)
+      Nokogiri::XML("<root xmlns:cf='http://crowdflower.com'>#{content}</root>")
     end
     
     def convert
-      @cftags.each do |t|
-        t.replace(tag_class(t.name).new(t, @opts).convert)
+      @cftags.each_with_index do |t,i|
+        t.replace(@tags[i].convert)
       end
       @doc
     end
     
+    def fields
+      @fields = {}
+      @tags.each do |g|
+        agg = g.attrs["aggregation"]
+        @fields[g.name] = agg.to_s if agg
+      end
+      @fields
+    end
+    
     def golds
       return @golds if @golds
       @golds = {}
-      @doc.xpath("//cf:gold|//cf:*[@gold]").map do |g|
-        p = g.name == "gold" ? g.parent : g
-        next unless p
-        ref = tag_class(p.name).new(p, @opts).name
-        gold = (g.attributes["gold"] || g.attributes["src"]).to_s
-        gold = "#{ref}_gold" if gold =~ /^(true|\s*)$/
-        @golds[ref] = gold
+      @tags.each do |g|
+        gold = g.gold?
+        next unless gold
+        val = (gold.attributes["gold"] || gold.attributes["src"]).to_s
+        val = "#{g.name}_gold" if val =~ /^(true|\s*)$/
+        @golds[g.name] = val
         ["strict","regex"].each do |attrs|
-          if a = g.attributes[attrs]
-            @golds["_#{gold}_#{attrs}"] = attrs == "regex" ? [a.to_s,g.attributes["flags"].to_s] : a.to_s
+          if a = gold.attributes[attrs]
+            @golds["_#{val}_#{attrs}"] = attrs == "regex" ? [a.to_s, gold.attributes["flags"].to_s] : a.to_s
           end
         end
       end
       @golds
     end
     
+    def valid?
+      @errors = []
+      @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."]
+      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."]
+      end
+      @tags.each do |t|
+        next unless t.children
+        dupes = t.children.select do |child|
+          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."]
+        end
+      end
+      @errors.length == 0
+    end
+    
     def wrap(content)
       @opts[:no_wrap] ? content : "<div class=\"cfml #{@opts[:prefix]}\">#{content}</div>"
     end

data/lib/cfml/tag.rb

@@ -1,7 +1,9 @@
 module CFML
   class Tag
+    attr_reader :attrs, :tag, :data
+    
     def initialize(cfml, opts = {})
-      @cfml = cfml
+      @cfml = cfml.is_a?(String) ? Parser.parse(cfml).root.children.first : cfml
       @attrs = @cfml.attributes#Hash[*cfml.attributes.map {|k,v| [k.intern,v]}.flatten]
       @tag = @cfml.name
       @opts = opts
@@ -11,6 +13,10 @@ module CFML
       @opts[:prefix] ? "#{@opts[:prefix]}[#{name}]" : "#{name}"
     end
     
+    def gold?
+      @attrs["gold"] ? @cfml : @cfml.at("./cf:gold")
+    end
+    
     def name
       (@attrs["name"] || @attrs["label"]).to_s.downcase.gsub(/\s/,"_").gsub(/\W/,"")
     end
@@ -20,6 +26,10 @@ module CFML
       "#{@tag} #{extras}".strip
     end
     
+    def children
+      false
+    end
+    
     def classes
       @classes ||= [name] << validations << @attrs["class"].to_s.split(/ /)
       @classes.uniq.reject {|c| c.length == 0 }.join(" ").strip
@@ -34,24 +44,37 @@ module CFML
       wrapper(@parsed)
     end
     
+    def to_s
+      @cfml.to_s
+    end
+    
     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
+      "<#{tag}>#{label}#{required}</#{tag}>" if label.to_s != ""
     end
     
     def legend(label)
       label(label, "legend") if label
     end
     
+    def to_liquid
+      to_html
+    end
+    
     def validations
       @validations ||= @attrs["validations"].to_s.split(/ /).map {|v| "validates-#{v}"}
     end
     
     def instructions
-      @instructions ||= @attrs["instructions"] || (@cfml.at("instructions") ? @cfml.at("instructions").inner_html : nil)
+      @instructions ||= @attrs["instructions"] || (@cfml.at("./cf:instructions") ? @cfml.at("./cf:instructions").inner_html : nil)
       @instructions ? "<p class=\"instructions\">#{@instructions}</p>" : nil
     end
     
+    def validate?
+      true
+    end
+    
     def wrapper(parsed, tag = "div")
       #Deal with a label only wrapper... kinda jank
       if tag == "label" && instructions
@@ -62,13 +85,17 @@ module CFML
       "<#{tag} class=\"#{wrapper_classes}\">#{parsed}#{instructions}</#{tag}>"
     end
     
+    def value
+      @attrs["value"].to_s
+    end
+    
     def data
       (@opts[:data] || {}).merge({
         "name" => prefix(name), 
         "label" => label(@attrs["label"]),
         "legend" => legend(@attrs["label"]),
         "classes" => classes,
-        "value" => @attrs["value"].to_s
+        "value" => value
       })
     end
   end

data/lib/cfml/tags/checkbox.rb

@@ -3,7 +3,7 @@ module CFML
     class Checkbox < Tag
       Template = <<-HTML.freeze
 {{default}}
-<label><input name="{{name}}" type="checkbox" value="{{value}}" class="{{classes}}"/> {{label}}</label>
+<label><input name="{{name}}" type="checkbox" value="{{value}}" class="{{classes}}" {{checked}}/> {{label}}</label>
       HTML
       
       def prefix(name)
@@ -21,10 +21,13 @@ module CFML
       def data
         default = ""
         if @attrs["default"]
-          default = Parser.new("<cf:hidden name=\"#{name}\" value=\"#{@attrs["default"]}\"/>", @opts.merge(:no_wrap => true)).to_html
+          default = Hidden.new("<cf:hidden name=\"#{name}\" value=\"#{@attrs["default"]}\"/>", @opts).to_html
         end
-        value = @attrs["value"] || (grouped? ? @attrs["label"] : "true")
-        super.merge({"value" => value.to_s, "default" => default, "label" => @attrs["label"].to_s})
+        super.merge({
+          "value" => (@attrs["value"] || (grouped? ? @attrs["label"] : "true")).to_s, 
+          "default" => default, 
+          "checked" => @attrs["checked"] ? "checked=\"checked\"" : "",
+          "label" => @attrs["label"].to_s})
       end
     end
   end

data/lib/cfml/tags/checkboxes.rb

@@ -9,14 +9,14 @@ module CFML
       HTML
       
       def data
-        super.merge({"checkboxes" => checkboxes})
+        super.merge({"checkboxes" => children})
       end
       
-      def checkboxes
+      def children
         @cfml.xpath("cf:checkbox").map do |c|
           c["name"] ||= name
           c["validations"] ||= @attrs["validations"].to_s
-          Checkbox.new(c, @opts).to_html
+          Checkbox.new(c, @opts)
         end
       end
       

data/lib/cfml/tags/group.rb

@@ -6,6 +6,10 @@ module CFML
   {{content}}
       HTML
       
+      def validate?
+        false
+      end
+      
       def data
         super.merge({"content" => Parser.new(@cfml.inner_html, @opts.merge(:no_wrap => true)).to_html})
       end

data/lib/cfml/tags/option.rb

@@ -0,0 +1,25 @@
+module CFML
+  module Tags
+    class Option < Tag
+      Template = <<-HTML.freeze
+<option {{value}} {{selected}}>{{label}}</option>
+      HTML
+      
+      def wrapper(parsed)
+        parsed
+      end
+      
+      def value
+        (@attrs["value"] || @attrs["label"]).to_s
+      end
+      
+      def data
+        super.merge({
+          "value" => @attrs["value"] ? "value=\"#{@attrs["value"]}\"" : "", 
+          "selected" => @attrs["selected"] ? "selected=\"selected\"" : "",
+          "label" => (@attrs["label"] || @cfml.inner_html).to_s
+        })
+      end
+    end
+  end
+end

data/lib/cfml/tags/radio.rb

@@ -2,7 +2,7 @@ module CFML
   module Tags
     class Radio < Tag
       Template = <<-HTML.freeze
-<label><input name="{{name}}" type="radio" value="{{value}}" class="{{classes}}"/> {{label}}</label>
+<label><input name="{{name}}" type="radio" value="{{value}}" class="{{classes}}" {{checked}}/> {{label}}</label>
       HTML
       
       #Radios should always be grouped, but for consistency with checkboxes, we check
@@ -15,8 +15,11 @@ module CFML
       end
       
       def data
-        value = @attrs["value"] || @attrs["label"]
-        super.merge({"value" => value.to_s, "label" => @attrs["label"].to_s})
+        super.merge({
+          "value" => (@attrs["value"] || @attrs["label"]).to_s,
+          "checked" => @attrs["checked"] ? "checked=\"checked\"" : "",
+          "label" => @attrs["label"].to_s
+        })
       end
     end
   end

data/lib/cfml/tags/radios.rb

@@ -9,14 +9,14 @@ module CFML
       HTML
       
       def data
-        super.merge({"radios" => radios})
+        super.merge({"radios" => children})
       end
       
-      def radios
+      def children
         @cfml.xpath("cf:radio").map do |c|
           c["name"] ||= name
           c["validations"] ||= @attrs["validations"].to_s
-          Radio.new(c, @opts).to_html
+          Radio.new(c, @opts)
         end
       end
       

data/lib/cfml/tags/select.rb

@@ -8,8 +8,15 @@ module CFML
 </select>
       HTML
       
+      def children
+        default = @cfml["default"] ? [Option.new("<cf:option value=\"\">#{@cfml["default"]}</cf:option>", @opts)] : []  
+        default + @cfml.xpath("cf:option").map do |c|
+          Option.new(c, @opts)
+        end
+      end
+      
       def data
-        super.merge({"options" => @cfml.xpath("option").map {|c| c.to_xhtml}})
+        super.merge({"options" => children})
       end
     end
   end

data/lib/cfml/tags/unknown.rb

@@ -5,6 +5,10 @@ module CFML
   {{content}}
       HTML
     
+      def validate?
+        false
+      end
+    
       def wrapper_classes
         super + " unknown"
       end

data/spec/complex_spec.rb

@@ -43,7 +43,7 @@ describe "CFML Complex" do
           <label>
             <input name="u12345[rad][]" class="rad" type="checkbox" value="Sure?">
           Sure?</label>
-        
+          <p class=\"instructions\">This <i>is</i> cool</p>
         </fieldset>
         <input type="hidden" name="u12345[secret]" value="cool" class="secret" />
       </div>

data/spec/converters/jsawesome_spec.rb

@@ -0,0 +1,55 @@
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../../lib/cfml/converters/jsawesome")
+
+describe "JSAwesome Converter" do
+  it "converts" do
+    json = "[[
+            [\"text_field\", \"default value\"],
+            [\"#text_area\", \"\"],
+            [\"single_select\", [\"boo\", \"~yah\"]],
+            [\"^check\", [\"One|totally_rad\", [\"two\",true], \"three\"]],
+            [\"*radio\", [\"a\", \"b\", [\"c\", true]]],
+            [\"_hidden\",\"hot\"],
+            [[\"^single_check\"],[\"^Edge|edge_case\", false]]
+          ], 
+          {\"text_field\": \"JSAwesome\",
+           \"text_area\": {
+              \"required\":true,
+              \"validation\": [\"\\d+\", \"Field must contain atleast one digit\"],
+              \"label\": \"Input some text with atleast one digit\"
+           },
+           \"single_select\": {
+              \"required\":true
+           },
+           \"gold\": {
+            \"_awesome_gold_strict\": true, 
+            \"text_field\": \"awesome_gold\", 
+            \"_awesome_gold_regex\": [\"\\\\.asdf\\\\.\", \"i\"]
+           }}]"
+    @c = Converters::JSAwesome.new(json)
+  #puts Parser.escape(@c.convert)
+    @c.convert.should sorta_match(<<-HTML)
+    <cf:text label="JSAwesome" default="default value">
+      <gold src="awesome_gold" regex="\\.asdf\\." flags="i" strict="true" />
+    </cf:text> 
+    <cf:textarea label="Input some text with atleast one digit" required="true" /> 
+    <cf:select label="Single select"> 
+      <cf:option label="Boo" /> 
+      <cf:option label="Yah" /> 
+    </cf:select>
+    <cf:checkboxes label="Check"> 
+      <cf:checkbox label="One" name="totally_rad" /> 
+      <cf:checkbox label="Two" checked="true" /> 
+      <cf:checkbox label="Three" /> 
+    </cf:checkboxes> 
+    <cf:radios label="Radio"> 
+      <cf:radio label="A" /> 
+      <cf:radio label="B" /> 
+      <cf:radio label="C" checked="true" /> 
+    </cf:radios> 
+    <cf:hidden label="Hidden" value="hot" />
+    <cf:checkbox label="Single check" /> 
+    <cf:checkbox label="Edge" name="edge_case" default="false" /> 
+    HTML
+  end
+end

data/spec/fixtures/complex.cfml

@@ -1,12 +1,11 @@
 <h1>This is my name</h1>
 <p>This is a description about me</p>
-<cf:select label="Awesome" validations="required" instructions="Just be cool about it">
+<cf:select label="Awesome" validations="required" default="Choose an option" instructions="Just be cool about it">
   <cf:gold src="awesome_gold" regex="\\.asdf\\." flags="i" strict="true"  />
-  <option value="">Choose an option</option>
-  <option>Awesome</option>
-  <option>Cool</option>
-  <option>Rad</option>
-  <option>Neat</option>
+  <cf:option label="Awesome" />
+  <cf:option label="Cool" />
+  <cf:option label="Rad" />
+  <cf:option label="Neat" />
 </cf:select>
 <cf:text label="Opinion" validations="minLength:30" class="large" />
 <cf:text label="Email" validations="required email" />

data/spec/fixtures/invalid.cfml

@@ -0,0 +1,10 @@
+<cf:select label="Awesome">
+  <cf:gold src="awesome_gold" regex="\\.asdf\\." flags="i" strict="true"  />
+  <cf:option label="Awesome" />
+  <cf:option label="Rad" />
+  <cf:option label="Rad" />
+  <cf:option label="Neat" />
+</cf:select>
+<cf:text label="Opinion" validations="minLength:30" class="large" />
+<cf:text label="Awesome" validations="required email" />
+<cf:checkbox label="" value="yes" gold="true" />

data/spec/{gold_spec.rb → meta_spec.rb}

@@ -1,23 +1,31 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "CFML Gold" do
-  it "should give me da gold" do
+  it "should give me da gold & fields" do
     cfml = <<-HTML
-      <cf:checkboxes label="Checkboxes">
+      <cf:checkboxes label="Checkboxes" aggregation="all">
         <cf:gold src="awesome_gold" regex="\\.asdf\\." flags="i" strict="true" />
         <cf:checkbox label="Wanna do it?" />
         <cf:checkbox label="Sure?" />
       </cf:checkboxes>
-      <cf:text name="cool" gold="true" />
+      <cf:checkbox label="No way">
+        <cf:gold />
+      </cf:checkbox>
+      <cf:text name="cool" gold="true" aggregation="agg" />
       <cf:textarea name="sweet" gold="sweetness" />
     HTML
     @p = Parser.new(cfml, :prefix => "u12345")
     @p.golds.should == {
       "_awesome_gold_strict" => "true", 
-      "sweet" => "sweetness", 
+      "sweet" => "sweetness",
+      "no_way" => "no_way_gold",
       "checkboxes" => "awesome_gold", 
       "_awesome_gold_regex" => ["\\.asdf\\.", "i"], 
       "cool" => "cool_gold"
     }
+    @p.fields.should == {
+      "checkboxes"=>"all",
+      "cool"=>"agg"
+    }
   end
 end

data/spec/tags/checkbox_spec.rb

@@ -61,6 +61,23 @@ describe "CFML Radio" do
     HTML
   end
   
+  it "should render gold" do
+    cfml = <<-HTML
+      <cf:checkbox label="Rad">
+        <cf:gold src="rad_gold"/>
+      </cf:checkbox>
+    HTML
+    @p = Parser.new(cfml, :prefix => "u12345")
+    @p.tags[0].should be_gold
+    @p.to_html.should sorta_match(<<-HTML)
+    <div class="cfml u12345">
+      <div class="checkbox">
+        <label><input type="checkbox" value="true" name="u12345[rad]" class="rad"/> Rad</label>
+      </div>
+    </div>
+    HTML
+  end
+  
   it "should render checkbox nested" do
     cfml = <<-HTML
       <div class="rando">

data/spec/tags/checkboxes_spec.rb

@@ -5,7 +5,8 @@ describe "CFML Checkboxes" do
     cfml = <<-HTML
       <cf:checkboxes label="Cool checkboxes">
         <cf:checkbox label="Wanna do it?"/>
-        <cf:checkbox label="Sure?">
+        <cf:checkbox label="Sure?"/>
+        <cf:checkbox label="Not really..." value="nope" checked="true"/>
       </cf:checkboxes>
     HTML
     @p = Parser.new(cfml, :prefix => "u12345")
@@ -19,6 +20,9 @@ describe "CFML Checkboxes" do
         <label>
           <input type="checkbox" value="Sure?" name="u12345[cool_checkboxes][]" class="cool_checkboxes"/> Sure?
         </label>
+        <label>
+          <input type="checkbox" value="nope" checked="checked" name="u12345[cool_checkboxes][]" class="cool_checkboxes"/> Sure?
+        </label>
       </fieldset>
     </div>
     HTML

data/spec/tags/select_spec.rb

@@ -4,9 +4,9 @@ describe "CFML Select" do
   it "should render basic select" do
     cfml = <<-HTML
       <cf:select label="Basic">
-        <option>One</option>
-        <option>Two</option>
-        <option>Three</option>
+        <cf:option>One</option>
+        <cf:option>Two</option>
+        <cf:option>Three</option>
       </cf:select>
     HTML
     @p = Parser.new(cfml, :prefix => "u12345")
@@ -23,4 +23,28 @@ describe "CFML Select" do
     </div>
     HTML
   end
+  
+  it "should render complex select" do
+    cfml = <<-HTML
+      <cf:select label="Basic" default="Choose an option">
+        <cf:option value="oney">One</option>
+        <cf:option selected="true">Two</option>
+        <cf:option label="Awesome"/>
+      </cf:select>
+    HTML
+    @p = Parser.new(cfml, :prefix => "u12345")
+    @p.to_html.should sorta_match(<<-HTML)
+    <div class="cfml u12345">
+      <div class="select">
+        <label>Basic</label>
+        <select name="u12345[basic]" class="basic">
+          <option value="">Choose an option</option>
+          <option value="oney">One</option>
+          <option selected="selected">Two</option>
+          <option>Awesome</option>
+        </select>
+      </div>
+    </div>
+    HTML
+  end
 end

data/spec/tags/text_spec.rb

@@ -19,7 +19,7 @@ describe "CFML Text" do
   it "should render text with classes and instructions tag" do
     cfml = <<-HTML
       <cf:text label="Coolio" class="small">
-        <instructions>Just be <b>cool</b> bro!</instructions>
+        <cf:instructions>Just be <b>cool</b> bro!</cf:instructions>
       </cf:text>
     HTML
     @p = Parser.new(cfml, :prefix => "u12345")

data/spec/validation_spec.rb

@@ -0,0 +1,19 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "CFML Validation" do
+  it "adds errors if invalid" 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."]
+    ]
+  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.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Chris Van Pelt
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-16 00:00:00 -07:00
+date: 2009-08-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
         version: 1.3.3
     version: 
 - !ruby/object:Gem::Dependency 
-  name: httparty
+  name: json_pure
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -60,6 +60,7 @@ files:
 - VERSION
 - cfml.gemspec
 - lib/cfml.rb
+- lib/cfml/converters/jsawesome.rb
 - lib/cfml/liquid_filters.rb
 - lib/cfml/parser.rb
 - lib/cfml/tag.rb
@@ -67,6 +68,7 @@ files:
 - lib/cfml/tags/checkboxes.rb
 - lib/cfml/tags/group.rb
 - lib/cfml/tags/hidden.rb
+- lib/cfml/tags/option.rb
 - lib/cfml/tags/radio.rb
 - lib/cfml/tags/radios.rb
 - lib/cfml/tags/ratings.rb
@@ -75,20 +77,21 @@ files:
 - lib/cfml/tags/textarea.rb
 - lib/cfml/tags/unknown.rb
 - spec/complex_spec.rb
+- spec/converters/jsawesome_spec.rb
 - spec/fixtures/complex.cfml
-- spec/gold_spec.rb
+- spec/fixtures/invalid.cfml
+- spec/meta_spec.rb
 - spec/sorta_match.rb
 - spec/spec_helper.rb
 - spec/tags/checkbox_spec.rb
 - spec/tags/checkboxes_spec.rb
 - spec/tags/group_spec.rb
 - spec/tags/hidden_spec.rb
-- spec/tags/radio_spec.rb
-- spec/tags/radios_spec.rb
 - spec/tags/select_spec.rb
 - spec/tags/text_spec.rb
 - spec/tags/textarea_spec.rb
 - spec/tags/unknown_spec.rb
+- spec/validation_spec.rb
 has_rdoc: false
 homepage: http://github.com/dolores/cfml
 licenses: 
@@ -118,16 +121,16 @@ specification_version: 3
 summary: CFML is Crowd Flower Markup Language
 test_files: 
 - spec/complex_spec.rb
-- spec/gold_spec.rb
+- spec/converters/jsawesome_spec.rb
+- spec/meta_spec.rb
 - spec/sorta_match.rb
 - spec/spec_helper.rb
 - spec/tags/checkbox_spec.rb
 - spec/tags/checkboxes_spec.rb
 - spec/tags/group_spec.rb
 - spec/tags/hidden_spec.rb
-- spec/tags/radio_spec.rb
-- spec/tags/radios_spec.rb
 - spec/tags/select_spec.rb
 - spec/tags/text_spec.rb
 - spec/tags/textarea_spec.rb
 - spec/tags/unknown_spec.rb
+- spec/validation_spec.rb

data/spec/tags/radio_spec.rb

@@ -1,18 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe "CFML Radio" do
-  #Doesn't make sense on its own but tested here anyway...
-  it "should render basic radio" do
-    cfml = <<-HTML
-      <cf:radio label="Rad"/>
-    HTML
-    @p = Parser.new(cfml, :prefix => "u12345")
-    @p.to_html.should sorta_match(<<-HTML)
-    <div class="cfml u12345">
-      <div class="radio">
-        <label><input type="radio" value="Rad" name="u12345[rad]" class="rad"/> Rad</label>
-      </div>
-    </div>
-    HTML
-  end
-end

data/spec/tags/radios_spec.rb

@@ -1,26 +0,0 @@
-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:radios>
-    HTML
-    @p = Parser.new(cfml, :prefix => "u12345")
-    @p.to_html.should sorta_match(<<-HTML)
-    <div class="cfml u12345">
-      <fieldset class="radios">
-        <legend>Cool radios</legend>
-        <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>
-      </fieldset>
-    </div>
-    HTML
-  end
-end