dolores-cfml 0.1.0 → 0.1.1

data/Rakefile

@@ -5,11 +5,14 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "cfml"
-    gem.summary = "CFML is Crowd Flower Marup Language"
-    gem.description = "CFML let's you easily create form elements and custom interfaces for the CrowdFlower Croudsourcing platform"
+    gem.summary = "CFML is Crowd Flower Markup Language"
+    gem.description = "CFML let's you easily create form elements and custom interfaces for the CrowdFlower CroudSourcing platform"
     gem.email = "vanpelt@doloreslabs.com"
     gem.homepage = "http://github.com/dolores/cfml"
     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 is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/cfml.gemspec

@@ -0,0 +1,95 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{cfml}
+  s.version = "0.1.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-16}
+  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 = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "cfml.gemspec",
+     "lib/cfml.rb",
+     "lib/cfml/liquid_filters.rb",
+     "lib/cfml/parser.rb",
+     "lib/cfml/tag.rb",
+     "lib/cfml/tags/checkbox.rb",
+     "lib/cfml/tags/checkboxes.rb",
+     "lib/cfml/tags/group.rb",
+     "lib/cfml/tags/hidden.rb",
+     "lib/cfml/tags/radio.rb",
+     "lib/cfml/tags/radios.rb",
+     "lib/cfml/tags/ratings.rb",
+     "lib/cfml/tags/select.rb",
+     "lib/cfml/tags/text.rb",
+     "lib/cfml/tags/textarea.rb",
+     "lib/cfml/tags/unknown.rb",
+     "spec/complex_spec.rb",
+     "spec/fixtures/complex.cfml",
+     "spec/gold_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"
+  ]
+  s.homepage = %q{http://github.com/dolores/cfml}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.4}
+  s.summary = %q{CFML is Crowd Flower Markup Language}
+  s.test_files = [
+    "spec/complex_spec.rb",
+     "spec/gold_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"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    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"])
+    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"])
+    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"])
+  end
+end

data/lib/cfml.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'nokogiri'
+require 'json'
 require 'liquid'
 
 require 'cfml/parser'

data/lib/cfml/liquid_filters.rb

@@ -1,14 +1,5 @@
 module CFML
-  module LiquidFilters
-    def marukurized(input)
-      if input.blank?
-        ""
-      else
-        marukurized = ::Maruku.new(input)
-        marukurized.to_html
-      end
-    end
-    
+  module LiquidFilters    
     def to_json(input)
       input.to_json
     end

data/lib/cfml/tags/checkbox.rb

@@ -3,13 +3,9 @@ module CFML
     class Checkbox < Tag
       Template = <<-HTML.freeze
 {{default}}
-<input name="{{name}}" type="checkbox" value="{{value}}" class="{{classes}}"/>
+<label><input name="{{name}}" type="checkbox" value="{{value}}" class="{{classes}}"/> {{label}}</label>
       HTML
       
-      def wrapper(parsed)
-        super("#{parsed} #{@attrs["label"]}", "label")
-      end
-      
       def prefix(name)
         super(name) + (grouped? ? "[]" : "")
       end
@@ -18,13 +14,17 @@ module CFML
         @cfml.parent && @cfml.parent.name == "checkboxes"
       end
       
+      def wrapper(parsed)
+        grouped? ? parsed : super
+      end
+      
       def data
         default = ""
         if @attrs["default"]
           default = Parser.new("<cf:hidden name=\"#{name}\" value=\"#{@attrs["default"]}\"/>", @opts.merge(:no_wrap => true)).to_html
         end
         value = @attrs["value"] || (grouped? ? @attrs["label"] : "true")
-        super.merge({"value" => value.to_s, "default" => default})
+        super.merge({"value" => value.to_s, "default" => default, "label" => @attrs["label"].to_s})
       end
     end
   end

data/lib/cfml/tags/radio.rb

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

data/spec/complex_spec.rb

@@ -27,20 +27,20 @@ describe "CFML Complex" do
         <input name="u12345[email]" class="email validates-required validates-email" type="text" value="">
       </div>
       <div class="rad">
-        <label class="checkbox">
-          <input name="u12345[you_sure]" class="you_sure" type="checkbox" value="yes"> You sure?
-        </label>
+        <div class="checkbox">
+          <label><input name="u12345[you_sure]" class="you_sure" type="checkbox" value="yes"> You sure?</label>
+        </div>
       </div>
       <div class="group only-if:awesome">
       
         <fieldset class="checkboxes">
           <legend>Cool checkboxes</legend>
         
-          <label class="checkbox">
+          <label>
             <input name="u12345[rad][]" class="rad" type="checkbox" value="Wanna do it?">
           Wanna do it?</label>
         
-          <label class="checkbox">
+          <label>
             <input name="u12345[rad][]" class="rad" type="checkbox" value="Sure?">
           Sure?</label>
         

data/spec/tags/checkbox_spec.rb

@@ -8,9 +8,9 @@ describe "CFML Radio" do
     @p = Parser.new(cfml, :prefix => "u12345")
     @p.to_html.should sorta_match(<<-HTML)
     <div class="cfml u12345">
-      <label class="checkbox">
-        <input type="checkbox" value="true" name="u12345[check]" class="check"/> Check
-      </label>
+      <div class="checkbox">
+        <label><input type="checkbox" value="true" name="u12345[check]" class="check"/> Check</label>
+      </div>
     </div>
     HTML
   end
@@ -22,9 +22,9 @@ describe "CFML Radio" do
     @p = Parser.new(cfml, :prefix => "u12345")
     @p.to_html.should sorta_match(<<-HTML)
     <div class="cfml u12345">
-      <label class="checkbox">
-        <input type="checkbox" value="yes" name="u12345[check]" class="check"/> Check
-      </label>
+      <div class="checkbox">
+        <label><input type="checkbox" value="yes" name="u12345[check]" class="check"/> Check</label>
+      </div>
     </div>
     HTML
   end
@@ -36,10 +36,10 @@ describe "CFML Radio" do
     @p = Parser.new(cfml, :prefix => "u12345")
     @p.to_html.should sorta_match(<<-HTML)
     <div class="cfml u12345">
-      <label class="checkbox">
+      <div class="checkbox">
         <input type="hidden" value="false" name="u12345[check]" class="check"/>
-        <input type="checkbox" value="true" name="u12345[check]" class="check"/> Check
-      </label>
+        <label><input type="checkbox" value="true" name="u12345[check]" class="check"/> Check</label>
+      </div>
     </div>
     HTML
   end
@@ -71,9 +71,9 @@ describe "CFML Radio" do
     @p.to_html.should sorta_match(<<-HTML)
     <div class="cfml u12345">
       <div class="rando">
-        <label class="checkbox">
-          <input type="checkbox" value="true" name="u12345[rad]" class="rad"/> Rad
-        </label>
+        <div class="checkbox">
+          <label><input type="checkbox" value="true" name="u12345[rad]" class="rad"/> Rad</label>
+        </div>
       </div>
     </div>
     HTML

data/spec/tags/checkboxes_spec.rb

@@ -13,10 +13,10 @@ describe "CFML Checkboxes" do
     <div class="cfml u12345">
       <fieldset class="checkboxes">
         <legend>Cool checkboxes</legend>
-        <label class="checkbox">
+        <label>
           <input type="checkbox" value="Wanna do it?" name="u12345[cool_checkboxes][]" class="cool_checkboxes"/> Wanna do it?
         </label>
-        <label class="checkbox">
+        <label>
           <input type="checkbox" value="Sure?" name="u12345[cool_checkboxes][]" class="cool_checkboxes"/> Sure?
         </label>
       </fieldset>

data/spec/tags/group_spec.rb

@@ -17,10 +17,10 @@ describe "CFML Select" do
       <div class="group only-if:awesome">
         <fieldset class="checkboxes">
           <legend>Cool checkboxes</legend>
-          <label class="checkbox">
+          <label>
             <input name="u12345[rad][]" class="rad" type="checkbox" value="Wanna do it?" /> Wanna do it?
           </label>
-          <label class="checkbox">
+          <label>
             <input name="u12345[rad][]" class="rad" type="checkbox" value="Sure?" /> Sure?
           </label>
         </fieldset>

data/spec/tags/radio_spec.rb

@@ -1,6 +1,7 @@
 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"/>
@@ -8,9 +9,9 @@ describe "CFML Radio" do
     @p = Parser.new(cfml, :prefix => "u12345")
     @p.to_html.should sorta_match(<<-HTML)
     <div class="cfml u12345">
-      <label class="radio">
-        <input type="radio" value="Rad" name="u12345[rad]" class="rad"/> Rad
-      </label>
+      <div class="radio">
+        <label><input type="radio" value="Rad" name="u12345[rad]" class="rad"/> Rad</label>
+      </div>
     </div>
     HTML
   end

data/spec/tags/radios_spec.rb

@@ -13,10 +13,10 @@ describe "CFML Radios" do
     <div class="cfml u12345">
       <fieldset class="radios">
         <legend>Cool radios</legend>
-        <label class="radio">
+        <label>
           <input type="radio" value="Wanna do it?" name="u12345[cool_radios]" class="cool_radios"/> Wanna do it?
         </label>
-        <label class="radio">
+        <label>
           <input type="radio" value="Sure!" name="u12345[cool_radios]" class="cool_radios"/> Sure!
         </label>
       </fieldset>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dolores-cfml
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Chris Van Pelt
@@ -9,11 +9,40 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-13 00:00:00 -07:00
+date: 2009-08-16 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
-description: CFML let's you easily create form elements and custom interfaces for the CrowdFlower Croudsourcing platform
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: liquid
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.3.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: httparty
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.3
+    version: 
+description: CFML let's you easily create form elements and custom interfaces for the CrowdFlower CroudSourcing platform
 email: vanpelt@doloreslabs.com
 executables: []
 
@@ -29,6 +58,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- cfml.gemspec
 - lib/cfml.rb
 - lib/cfml/liquid_filters.rb
 - lib/cfml/parser.rb
@@ -85,7 +115,7 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: CFML is Crowd Flower Marup Language
+summary: CFML is Crowd Flower Markup Language
 test_files: 
 - spec/complex_spec.rb
 - spec/gold_spec.rb