cml 1.4.2 → 1.5.0

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in cml.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,33 @@
+PATH
+  remote: .
+  specs:
+    cml (1.23.0)
+      json
+      liquid (>= 2.0.0)
+      nokogiri (>= 1.4.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.2)
+    json (1.7.6)
+    liquid (2.5.0)
+    nokogiri (1.5.9)
+    rake (10.0.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.3)
+  cml!
+  rake
+  rspec (~> 2.0)

data/README.rdoc

@@ -1,6 +1,16 @@
-= cml
+= CML
 
-Description goes here.
+A.K.A. JSAwesome 2.0: Electric Boogaloo
+
+To refresh CML gem in local builder:
+
+    rake refresh_builder
+
+General release process:
+
+    # run and pass specs
+    rake version:bump:patch|minor|major
+    rake release
 
 == Note on Patches/Pull Requests
  
@@ -15,4 +25,4 @@ Description goes here.
 
 == Copyright
 
-Copyright (c) 2009 Chris Van Pelt. See LICENSE for details.
+Copyright (c) 2011 Chris Van Pelt. See LICENSE for details.

data/Rakefile

@@ -1,56 +1,16 @@
 require 'rubygems'
 require 'rake'
+require 'rspec/core/rake_task'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "cml"
-    gem.summary = "CML is CrowdFlower Markup Language"
-    gem.description = "CML let's you easily create form elements and custom interfaces for the CrowdFlower Croud Labor platform"
-    gem.email = "vanpelt@doloreslabs.com"
-    gem.homepage = "http://github.com/dolores/cml"
-    gem.authors = ["Chris Van Pelt"]
-    gem.add_dependency 'liquid', '>= 2.0.0'
-    gem.add_dependency 'nokogiri', '>= 1.4.2'
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_opts = ["--format", "specdoc"]
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :refresh_builder => [:build] do
-  cp "pkg/cml-#{File.read("VERSION").strip}.gem", "../builder/gems/cache/"
-  rm_rf "../builder/gems/gems/cml-#{File.read("VERSION").strip}/"
-  `cd ../builder && bin/thor merb:gem:redeploy`
-end
+RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION.yml')
-    config = YAML.load(File.read('VERSION.yml'))
-    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-  else
-    version = ""
-  end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "cml #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+task :refresh_builder => [:build] do
+  builder_dir = ENV['BUILDER_DIR'] || '../builder'
+  cp "cml.gemspec", "#{builder_dir}/vendor/bundle/ruby/1.8/specifications/cml-#{File.read("VERSION").strip}.gemspec"
+  cp "pkg/cml-#{File.read("VERSION").strip}.gem", "#{builder_dir}/vendor/bundle/ruby/1.8/cache/"
+  rm_rf "#{builder_dir}/vendor/bundle/ruby/1.8/gems/cml-#{File.read("VERSION").strip}/"
+  mkdir "#{builder_dir}/vendor/bundle/ruby/1.8/gems/cml-#{File.read("VERSION").strip}"
+  cp_r ".", "#{builder_dir}/vendor/bundle/ruby/1.8/gems/cml-#{File.read("VERSION").strip}/"
 end

data/cml.gemspec

@@ -1,129 +1,27 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'cml/version'
 
-Gem::Specification.new do |s|
-  s.name = %q{cml}
-  s.version = "1.4.2"
+Gem::Specification.new do |spec|
+  spec.name          = "cml"
+  spec.version       = CML::VERSION
+  spec.authors       = ["Chris Van Pelt"]
+  spec.email         = ["vanpelt@doloreslabs.com"]
+  spec.description   = %q{CML let's you easily create form elements and custom interfaces for the CrowdFlower Croud Labor platform}
+  spec.summary       = %q{CML is CrowdFlower Markup Language}
+  spec.homepage      = "https://github.com/dolores/cml"
+  spec.license       = "MIT"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Chris Van Pelt"]
-  s.date = %q{2011-02-28}
-  s.description = %q{CML let's you easily create form elements and custom interfaces for the CrowdFlower Croud Labor platform}
-  s.email = %q{vanpelt@doloreslabs.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "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/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/iterate.rb",
-     "lib/cml/tags/meta.rb",
-     "lib/cml/tags/multiple_text.rb",
-     "lib/cml/tags/option.rb",
-     "lib/cml/tags/radio.rb",
-     "lib/cml/tags/radios.rb",
-     "lib/cml/tags/ratings.rb",
-     "lib/cml/tags/search.rb",
-     "lib/cml/tags/select.rb",
-     "lib/cml/tags/text.rb",
-     "lib/cml/tags/textarea.rb",
-     "lib/cml/tags/thumb.rb",
-     "lib/cml/tags/unknown.rb",
-     "spec/complex_spec.rb",
-     "spec/converters/jsawesome_spec.rb",
-     "spec/fixtures/complex.cml",
-     "spec/fixtures/html.cml",
-     "spec/fixtures/invalid.cml",
-     "spec/fixtures/script-style.cml",
-     "spec/fixtures/segfault.cml",
-     "spec/gold_spec.rb",
-     "spec/meta_spec.rb",
-     "spec/normalize_spec.rb",
-     "spec/show_data_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/iterate_spec.rb",
-     "spec/tags/meta_spec.rb",
-     "spec/tags/multiple_text_spec.rb",
-     "spec/tags/radios_spec.rb",
-     "spec/tags/ratings_spec.rb",
-     "spec/tags/search_spec.rb",
-     "spec/tags/select_spec.rb",
-     "spec/tags/tag_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"
-  ]
-  s.homepage = %q{http://github.com/dolores/cml}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{CML is CrowdFlower Markup Language}
-  s.test_files = [
-    "spec/complex_spec.rb",
-     "spec/converters/jsawesome_spec.rb",
-     "spec/gold_spec.rb",
-     "spec/meta_spec.rb",
-     "spec/normalize_spec.rb",
-     "spec/show_data_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/iterate_spec.rb",
-     "spec/tags/meta_spec.rb",
-     "spec/tags/multiple_text_spec.rb",
-     "spec/tags/radios_spec.rb",
-     "spec/tags/ratings_spec.rb",
-     "spec/tags/search_spec.rb",
-     "spec/tags/select_spec.rb",
-     "spec/tags/tag_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"
-  ]
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<liquid>, [">= 2.0.0"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.2"])
-    else
-      s.add_dependency(%q<liquid>, [">= 2.0.0"])
-      s.add_dependency(%q<nokogiri>, [">= 1.4.2"])
-    end
-  else
-    s.add_dependency(%q<liquid>, [">= 2.0.0"])
-    s.add_dependency(%q<nokogiri>, [">= 1.4.2"])
-  end
+  spec.add_dependency "liquid", ">= 2.0.0"
+  spec.add_dependency "nokogiri", ">= 1.4.2"
+  spec.add_dependency "json"
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec", "~> 2.0"
 end

data/lib/cml/converters/jsawesome.rb

@@ -28,7 +28,7 @@ module CML
       end
       
       def label(k)
-        k = k.sub(/^[_#*^~]?\+?/,'')
+        k = k.to_s.sub(/^[_#*^~]?\+?/,'')
         l = @labels[k]
         label = l.is_a?(Hash) ? l["label"] : l if l
         label ||= k.capitalize.gsub(/_/,' ')
@@ -38,7 +38,7 @@ module CML
         val = Array(val)
         return nil unless val[0]
         parts = val[0].split("|")
-        key = parts[0].sub(/^[_#*^~]?\+?/,'')
+        key = parts[0].to_s.sub(/^[_#*^~]?\+?/,'')
         label = label(parts[0])
         parts << key if label != key.capitalize.gsub(/_/,' ') || opts[:meta]
         attrs = opts[:meta] ? [] : ["label=\"#{label}\""]
@@ -69,7 +69,7 @@ module CML
         select_default = @labels['{}'] || "Choose Category"
         cml = case v
         #a select tag or group of radios/checkboxes
-        when Array:
+        when Array
           if(k =~ /^[^_]/)
             if $~[0] == "*"
               parent = "radios"

data/lib/cml/gold.rb

@@ -1,24 +1,29 @@
 module CML
   class Gold
-    Attrs = ["exact","strict","regex","structured","matcher"]
-    attr_reader *(Attrs + [:src, :name])
+    Attrs = ["exact","strict","regex","structured","matcher","superset"]
+    ATTR_ALIASES = {'subset' => 'strict'}
+    attr_reader *(Attrs + [:src, :name, :tag])
         
     def initialize(tag, gold)
-      @name = tag.name(false)
+      @tag = tag
+      @name = @tag.name(false)
       @src = (gold.attributes["gold"] || gold.attributes["src"]).to_s
       @src = "#{@name}_gold" if @src =~ /^(true|\s*)$/
-      Attrs.each do |attribute|
+      (Attrs + ATTR_ALIASES.keys).each do |attribute|
         if a = gold.attributes[attribute]
+          attribute = ATTR_ALIASES[attribute] || attribute
           value = case attribute
-          when "regex": [a.to_s, gold.attributes["flags"].to_s, gold.attributes["no_escape"].to_s]
-          when "matcher": a.to_s
+          when "regex"
+            [a.to_s, gold.attributes["flags"].to_s, gold.attributes["no_escape"].to_s]
+          when "matcher"
+            a.to_s
           else
             a.to_s == "true"
           end
           instance_variable_set "@#{attribute}", value
         end
       end
-      @structured = true if tag.iterating?
+      @structured = true if @tag.iterating?
     end
     
     def to_hash

data/lib/cml/liquid_filters.rb

@@ -3,6 +3,10 @@ module CML
     def to_json(input)
       input.to_json
     end
+
+    def random(input)
+      rand(input.to_i)
+    end
   end
   
   class LiquidHash < Hash