cml 1.4.2 → 1.5.0

data/spec/tags/ratings_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "CML Radios" do
-  it "should render simple radtings" do
+  it "should render simple ratings" do
     cml = <<-HTML
       <cml:ratings label="Rate it" from="Bad" to="Worst" points="4" />
     HTML

data/spec/tags/select_spec.rb

@@ -73,4 +73,49 @@ describe "CML Select" do
     </div>
     HTML
   end
+
+  it "should render correctly with liquid logic" do
+    cml = <<-HTML
+      <cml:select label="basic" validates="required">
+        {% if entity1 != 'No data available' %}
+          <cml:option label="{{ entity1 }}" />
+        {% endif %}
+        {% if entity2 != 'No data available' %}
+          <cml:option label="{{ entity2 }}" />
+        {% endif %}
+        {% if entity3 != 'No data available' %}
+          <cml:option label="{{ entity3 }}" />
+        {% endif %}
+        {% if entity4 != 'No data available' %}
+          <cml:option label="{{ entity4 }}" />
+        {% endif %}
+        <cml:option label="none of the above" />
+      </cml:select>
+    HTML
+    @p = Parser.new(cml, :prefix => "u12345")
+    @p.to_html.should sorta_match(<<-HTML)
+      <div class="cml" id="u12345">
+        <div class="select cml_field">
+          <label class="legend">basic</label>
+          <div class="cml_row">
+            <select name="u12345[basic]" class="basic validates-required">
+              <option value="">Select one</option>
+              {% if entity1 != 'No data available' %}
+              <option>{{ entity1 }}</option>
+              {% endif %}
+              {% if entity2 != 'No data available' %}
+              <option>{{ entity2 }}</option>
+              {% endif %}
+              {% if entity3 != 'No data available' %}
+              <option>{{ entity3 }}</option>
+              {% endif %}
+              {% if entity4 != 'No data available' %}
+              <option>{{ entity4 }}</option>
+              {% endif %}
+              <option>none of the above</option></select>
+          </div>
+        </div>
+      </div>
+    HTML
+  end
 end

data/spec/tags/tag_spec.rb

@@ -29,6 +29,31 @@ describe "CML Tag" do
     HTML
   end
   
+  it "allows #finite_value? override with CML `is-finite='true'` attribute" do
+    @p = Parser.new(<<-HTML)
+      <cml:text label="I could be anything" />
+    HTML
+    @p.tags[0].should_not be_finite_value
+    
+    @p = Parser.new(<<-HTML)
+      <cml:text label="I feel boxed-in" is-finite="true" />
+    HTML
+    @p.tags[0].should be_finite_value
+  end
+  
+  it "may be found in CML::Parser#finite_fields" do
+    @p = Parser.new(<<-HTML)
+      <cml:text label="I could be anything" />
+      <cml:text label="I feel boxed-in" is-finite="true" />
+      <cml:checkbox label="Black or white"/>
+    HTML
+    @p.finite_fields.length.should == 2
+    @p.finite_fields.keys.should include('i_feel_boxedin')
+    @p.finite_fields.keys.should include('black_or_white')
+    @p.finite_fields['i_feel_boxedin'].should be_kind_of(CML::Tag)
+    @p.finite_fields['black_or_white'].should be_kind_of(CML::Tag)
+  end
+  
   describe "with data attributes" do
     it "handles one data attribute" do
       @cml = "<cml:text label='foo' data-is-fun='true' />"

data/spec/tags/taxonomy_spec.rb

@@ -0,0 +1,112 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "CML Taxonomy" do
+  it "should render taxonomy with attributes as a field" do
+    cml = <<-CML
+      <cml:taxonomy name="puppies" src="http://www.mycooltaxonomy.com" selectable="[1,2,3,4]" />
+    CML
+    
+    @p = Parser.new(cml, :prefix => "u12345")
+    @p.to_html.should sorta_match(<<-HTML)
+    <div class="cml" id="u12345">
+      <div class="taxonomy cml_field">
+        <label class="legend">Puppies</label>
+        <div class="cml_row taxonomy_choice">
+          <input name="u12345[puppies]" type="text" class="puppies" value="" />
+          <input name="u12345[puppies_id]" type="text" class="taxonomy_id no_validate" value="" />
+        </div>
+        <div class="taxonomy_widget_container" data-selectable="[1,2,3,4]" data-src="http://www.mycooltaxonomy.com"></div>
+      </div>
+    </div>
+    HTML
+  end
+  it "should render taxonomy with attributes as a multi-select field" do
+    cml = <<-CML
+      <cml:taxonomy name="puppies" src="http://www.mycooltaxonomy.com" selectable="[1,2,3,4]" multi-select="true" />
+    CML
+    
+    @p = Parser.new(cml, :prefix => "u12345")
+    @p.to_html.should sorta_match(<<-HTML)
+    <div class="cml" id="u12345">
+      <div class="taxonomy cml_field">
+        <label class="legend">Puppies</label>
+        <div class="taxonomy_choices">
+          <div class="cml_row taxonomy_choice">
+            <input name="u12345[puppies][]" type="text" class="puppies" value="" />
+            <input name="u12345[puppies_id][]" type="text" class="taxonomy_id no_validate" value="" />
+          </div>
+        </div>
+        <div class="taxonomy_widget_container" data-selectable="[1,2,3,4]" data-src="http://www.mycooltaxonomy.com" data-multi-select=\"true\"></div>
+      </div>
+    </div>
+    HTML
+  end
+
+  it "should render taxonomy with search as a field" do
+    cml = <<-CML
+      <cml:taxonomy name="puppies" src="http://www.mycooltaxonomy.com" search-src="http://mycoolsearch.com" log-search="true" selectable="[1,2,3,4]" />
+    CML
+    
+    @p = Parser.new(cml, :prefix => "u12345")
+    @p.to_html.should sorta_match(<<-HTML)
+    <div class="cml" id="u12345">
+      <div class="taxonomy cml_field">
+        <label class="legend">Puppies</label>
+        <div class="cml_row taxonomy_choice">
+          <input name="u12345[puppies]" type="text" class="puppies" value="" />
+          <input name="u12345[puppies_id]" type="text" class="taxonomy_id no_validate" value="" />
+        </div>
+        <div class="cml_row taxonomy_search" data-name="puppies_search_log"></div>
+        <div class="taxonomy_widget_container" data-search-src="http://mycoolsearch.com" data-selectable="[1,2,3,4]" data-log-search="true" data-src="http://www.mycooltaxonomy.com"></div>
+      </div>
+    </div>
+    HTML
+  end
+
+  it "should render taxonomy with attributes as a non-field" do
+    cml = <<-CML
+      <cml:taxonomy name="puppies" src="http://www.mycooltaxonomy.com" selectable="[1,2,3,4]" field="false" />
+    CML
+
+    @p = Parser.new(cml, :prefix => "u12345")
+    @p.to_html.should sorta_match(<<-HTML)
+    <div class="cml" id="u12345">
+      <div class="taxonomy cml_field">
+        <label class="legend">Puppies</label>
+        <div class="taxonomy_widget_container" data-selectable="[1,2,3,4]" data-src="http://www.mycooltaxonomy.com"></div>
+      </div>
+    </div>
+    HTML
+  end
+
+  it "should handle normalization/gold" do
+    cml = <<-CML
+      <cml:taxonomy name="puppies" src="http://www.mycooltaxonomy.com" gold="true" />
+    CML
+
+    @p = Parser.new(cml, :prefix => "u12345", :normalize => true, :data =>{
+      "puppies_gold" => ["Animals > Dogs > Chihuahua", "Animals > Cats > Dead Cat"],
+      "puppies_id" => ["123", "456"]
+    })
+    @p.to_html.should sorta_match(<<-HTML)
+    <div class="cml" id="u12345">
+      <div class="taxonomy cml_field">
+        <label class="legend">Puppies</label>
+        <div class="cml_row taxonomy_choice">
+          <input name="u12345[puppies_gold][]" type="text" class="puppies_gold cml_gold_loaded" value="Animals &gt; Dogs &gt; Chihuahua" />
+          <input name="u12345[puppies_id][]" type="text" class="taxonomy_id no_validate" value="123" />
+        </div>
+        <div class="cml_row taxonomy_choice">
+          <input name="u12345[puppies_gold][]" type="text" class="puppies_gold cml_gold_loaded" value="Animals &gt; Cats &gt; Dead Cat" />
+          <input name="u12345[puppies_id][]" type="text" class="taxonomy_id no_validate" value="456" />
+        </div>
+        <div class="taxonomy_widget_container" data-src="http://www.mycooltaxonomy.com"></div>
+        <div class="cml_gold_reason">
+          <label class="legend">Reason</label>
+          <textarea name="u12345[puppies_gold_reason]"></textarea>
+        </div>
+      </div>
+    </div>
+    HTML
+  end
+end

data/spec/validation_spec.rb

@@ -59,4 +59,56 @@ describe "CML Validation" do
     @p = Parser.new(File.read(File.dirname(__FILE__) + "/fixtures/complex.cml"), {:prefix => "u12345"})
     @p.should be_valid
   end
+  
+  it "reports logic referencing a non-existent element" do
+    @p = Parser.new(<<-HTML)
+    <cml:text label="OMG" />
+    <cml:checkboxes label="w t f" only-if="nonexistent:[1]">
+      <cml:checkbox label="lol" />
+      <cml:checkbox label="rtfm" />
+    </cml:checkboxes>
+    HTML
+    @p.should_not be_valid
+    @p.errors.should == ["CML element 'w_t_f' contains only-if logic that references a missing field 'nonexistent'."]
+  end
+  
+  it "reports logic referencing the checked value of a non-checkbox element" do
+    @p = Parser.new(<<-HTML)
+    <cml:text label="OMG" />
+    <cml:text label="wtf" only-if="omg:unchecked" />
+    HTML
+    @p.should_not be_valid
+    @p.errors.should == ["CML element 'wtf' contains only-if logic that references a checked value, 'omg:unchecked', but 'omg' is not a checkbox nor contains checkboxes."]
+  end
+  
+  it "reports logic referencing a child index on an element without children" do
+    @p = Parser.new(<<-HTML)
+<cml:radios label="Does this Course have at least one required Book?" name="has_required_book" validates="required" >
+  <cml:radio label="Yes" value="TRUE" />
+  <cml:radio label="No" value="FALSE" />
+</cml:radios>
+
+<cml:checkbox label="If the ISBN is included, check this box and enter ONLY the ISBN below:" name="has_isbn" only-if="has_required_book:[0]" instructions="Other fields below are not needed and will be removed if the ISBN is present." value="true" />
+
+<cml:text label="Copy/Paste the ISBN(s) as they appear:" only-if="has_required_book:[0]++has_isbn:[0]" default="978-3-16-148410-0" multiple="true" name="isbn" instructions="" />
+
+
+<cml:group only-if="has_required_book:[0]++!has_isbn:[0]" multiple="true">
+  <div class="course_info">
+    <div class="book_title">
+      <cml:text label="Book(s) Title" default="e.g. Intermediate Accounting"  name="book_title" instructions="" />
+    </div>
+    <div class="book_edition">
+      <cml:text label="Edition or Volume" default="e.g. 2nd Ed."  name="book_edition" instructions="copy/paste the information as it appears in the syllabus" />
+    </div>
+       <div class="book_authors">
+         <cml:text label="Authors" default="e.g. Spiceland, Sepe, and Nelson" name="book_authors" instructions="copy/paste all the author names as they appear in the syllabus" />   
+    </div>
+  </div>
+</cml:group>
+
+    HTML
+    @p.should_not be_valid
+    @p.errors.should == ["CML element 'isbn' contains only-if logic that references a child index, 'has_isbn:[0]', but 'has_isbn' contains no child elements."]
+  end
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 1
-  - 4
-  - 2
-  version: 1.4.2
+  - 5
+  - 0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Chris Van Pelt
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 -08:00
-default_executable: 
+date: 2013-04-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: liquid
@@ -50,33 +49,97 @@ dependencies:
         version: 1.4.2
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  type: :development
+  version_requirements: *id006
 description: CML let's you easily create form elements and custom interfaces for the CrowdFlower Croud Labor platform
-email: vanpelt@doloreslabs.com
+email: 
+- vanpelt@doloreslabs.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
+- .rspec
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - cml.gemspec
 - lib/cml.rb
 - lib/cml/converters/jsawesome.rb
 - lib/cml/gold.rb
 - lib/cml/liquid_filters.rb
+- lib/cml/logic.rb
+- lib/cml/logic_tree/graph.rb
+- lib/cml/logic_tree/solver.rb
 - lib/cml/parser.rb
 - lib/cml/tag.rb
 - lib/cml/tags/checkbox.rb
 - lib/cml/tags/checkboxes.rb
 - lib/cml/tags/group.rb
 - lib/cml/tags/hidden.rb
+- lib/cml/tags/hours.rb
 - lib/cml/tags/iterate.rb
 - lib/cml/tags/meta.rb
 - lib/cml/tags/multiple_text.rb
@@ -86,18 +149,31 @@ files:
 - lib/cml/tags/ratings.rb
 - lib/cml/tags/search.rb
 - lib/cml/tags/select.rb
+- lib/cml/tags/taxonomy.rb
 - lib/cml/tags/text.rb
 - lib/cml/tags/textarea.rb
 - lib/cml/tags/thumb.rb
 - lib/cml/tags/unknown.rb
+- lib/cml/version.rb
 - spec/complex_spec.rb
 - spec/converters/jsawesome_spec.rb
 - spec/fixtures/complex.cml
 - spec/fixtures/html.cml
 - spec/fixtures/invalid.cml
+- spec/fixtures/logic_broken.cml
+- spec/fixtures/logic_circular.cml
+- spec/fixtures/logic_grouped.cml
+- spec/fixtures/logic_nested.cml
+- spec/fixtures/logic_none.cml
+- spec/fixtures/logic_not_nested.cml
 - spec/fixtures/script-style.cml
 - spec/fixtures/segfault.cml
 - spec/gold_spec.rb
+- spec/liquid_filter_spec.rb
+- spec/logic_depends_on_spec.rb
+- spec/logic_spec.rb
+- spec/logic_tree_graph_spec.rb
+- spec/logic_tree_solver_spec.rb
 - spec/meta_spec.rb
 - spec/normalize_spec.rb
 - spec/show_data_spec.rb
@@ -107,6 +183,7 @@ files:
 - spec/tags/checkboxes_spec.rb
 - spec/tags/group_spec.rb
 - spec/tags/hidden_spec.rb
+- spec/tags/hours_spec.rb
 - spec/tags/iterate_spec.rb
 - spec/tags/meta_spec.rb
 - spec/tags/multiple_text_spec.rb
@@ -115,18 +192,18 @@ files:
 - spec/tags/search_spec.rb
 - spec/tags/select_spec.rb
 - spec/tags/tag_spec.rb
+- spec/tags/taxonomy_spec.rb
 - spec/tags/text_spec.rb
 - spec/tags/textarea_spec.rb
 - spec/tags/thumb_spec.rb
 - spec/tags/unknown_spec.rb
 - spec/validation_spec.rb
-has_rdoc: true
-homepage: http://github.com/dolores/cml
-licenses: []
-
+homepage: https://github.com/dolores/cml
+licenses: 
+- MIT
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -150,14 +227,30 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: CML is CrowdFlower Markup Language
 test_files: 
 - spec/complex_spec.rb
 - spec/converters/jsawesome_spec.rb
+- spec/fixtures/complex.cml
+- spec/fixtures/html.cml
+- spec/fixtures/invalid.cml
+- spec/fixtures/logic_broken.cml
+- spec/fixtures/logic_circular.cml
+- spec/fixtures/logic_grouped.cml
+- spec/fixtures/logic_nested.cml
+- spec/fixtures/logic_none.cml
+- spec/fixtures/logic_not_nested.cml
+- spec/fixtures/script-style.cml
+- spec/fixtures/segfault.cml
 - spec/gold_spec.rb
+- spec/liquid_filter_spec.rb
+- spec/logic_depends_on_spec.rb
+- spec/logic_spec.rb
+- spec/logic_tree_graph_spec.rb
+- spec/logic_tree_solver_spec.rb
 - spec/meta_spec.rb
 - spec/normalize_spec.rb
 - spec/show_data_spec.rb
@@ -167,6 +260,7 @@ test_files:
 - spec/tags/checkboxes_spec.rb
 - spec/tags/group_spec.rb
 - spec/tags/hidden_spec.rb
+- spec/tags/hours_spec.rb
 - spec/tags/iterate_spec.rb
 - spec/tags/meta_spec.rb
 - spec/tags/multiple_text_spec.rb
@@ -175,6 +269,7 @@ test_files:
 - spec/tags/search_spec.rb
 - spec/tags/select_spec.rb
 - spec/tags/tag_spec.rb
+- spec/tags/taxonomy_spec.rb
 - spec/tags/text_spec.rb
 - spec/tags/textarea_spec.rb
 - spec/tags/thumb_spec.rb

data/VERSION

@@ -1 +0,0 @@
-1.4.1