cml 1.4.2 → 1.5.0

data/lib/cml/tag.rb

@@ -2,9 +2,28 @@ require 'cgi'
 
 module CML
   class Tag
+    
+    include CML::TagLogic
+    
     attr_reader :attrs, :tag, :data, :cml, :opts
     #liquid_methods :raw_label
     
+    #memoize hotness
+    def self.memoize(*methods)
+      methods.each do |m|
+        class_eval %Q{
+          alias :original_#{m} :#{m}
+          
+          def #{m}(*args)
+            @#{m}_cache ||= {}
+            key = {:prefix => @opts[:prefix], :missed => @opts[:missed]}.merge(:_args => args)
+            return @#{m}_cache[key] if @#{m}_cache[key]
+            @#{m}_cache[key] = self.original_#{m}(*args)
+          end
+        }
+      end
+    end
+    
     def initialize(cml, opts = {})
       @cml = cml.is_a?(String) ? Parser.parse(cml).at("/root/*") : cml
       @attrs = @cml.attributes#Hash[*cml.attributes.map {|k,v| [k.intern,v]}.flatten]
@@ -16,10 +35,14 @@ module CML
     def prefix(name)
       if @opts[:iteration] 
         m = case @tag
-          when "checkbox": "[{{i}}][]"
-          when "radio":  "[{{i}}]"
-          when "rating": @opts[:normalize] ? "[{{i}}][]" : "[{{i}}]"
-          when "text", "textarea": @opts[:normalize] ? "[{{i}}][]" : "[]"
+          when "checkbox"
+            "[{{i}}][]"
+          when "radio"
+              "[{{i}}]"
+          when "rating"
+            @opts[:normalize] ? "[{{i}}][]" : "[{{i}}]"
+          when "text", "textarea"
+            @opts[:normalize] ? "[{{i}}][]" : "[]"
           else
             "[]"
           end
@@ -52,7 +75,8 @@ module CML
     #:list means an array of values in the result csv
     #:columnlist means a new column that is a list
     def multi_type
-      grouped = @cml.xpath("ancestor::cml:*[@multiple]")
+      grouped = self.parent_multiples
+      
       if @attrs["multiple"] || !grouped.empty?
         if @cml.at(".//cml:checkboxes|.//cml:radios|.//cml:ratings")
           :column
@@ -72,6 +96,11 @@ module CML
       end
     end
     
+    def parent_multiples
+      @cml.xpath("ancestor::cml:*[@multiple]")
+    end
+    memoize :parent_multiples
+    
     def gold?
       @attrs["gold"] ? @cml : @cml.at("./cml:gold")
     end
@@ -191,7 +220,7 @@ module CML
     end
     
     def validations
-      @validations ||= validators.map {|v| "validates-#{v}"}
+      @validations ||= validators.map {|v| v.to_s.empty? ? nil : "validates-#{v}"}.compact
     end
     
     def instructions
@@ -264,6 +293,10 @@ module CML
       })
     end
     
+    def finite_value?
+      (@attrs['is-finite'] && @attrs['is-finite'].value=='true') || false
+    end
+    
     protected
     
     def data_attributes
@@ -288,21 +321,9 @@ module CML
       
       attributes.join(" ")
     end
-    
-    #memoize hotness
-    def self.memoize(*methods)
-      methods.each do |m|
-        class_eval %Q{
-          alias :original_#{m} :#{m}
-          
-          def #{m}(*args)
-            @#{m}_cache ||= {}
-            key = {:prefix => @opts[:prefix], :missed => @opts[:missed]}.merge(:_args => args)
-            return @#{m}_cache[key] if @#{m}_cache[key]
-            @#{m}_cache[key] = send(:original_#{m}, *args)
-          end
-        }
-      end
+
+    def title_attribute
+      @attrs['title'].nil? ? "" :"title=\"#{@attrs['title']}\""
     end
   end
 end

data/lib/cml/tags/checkbox.rb

@@ -7,7 +7,7 @@ module CML
       HTML
       
       Template = <<-HTML.freeze
-{{default_normalized}}<div class="cml_row"><label class="{{gold_class}}">#{BareTemplate} {{label}}</label></div>
+{{default_normalized}}<div class="cml_row" {{title}}><label class="{{gold_class}}">#{BareTemplate} {{label}}</label></div>
       HTML
       
       def prefix(name)
@@ -20,6 +20,14 @@ module CML
         @opts[:bare] || (@cml.parent && @cml.parent.name == "checkboxes")
       end
       
+      def in_logic_graph?
+        !grouped?
+      end
+      
+      def finite_value?
+        true
+      end
+      
       def wrapper(parsed)
         grouped? || @opts[:no_reason] ? parsed : super
       end
@@ -47,7 +55,7 @@ module CML
           end
         elsif preload = preloaded_data
           manipulated = true
-          if preload.map{|x| x.to_s.downcase }.include?(value.to_s.downcase)
+          if Array(preload).map{|x| x.to_s.downcase }.include?(value.to_s.downcase)
             return "checked=\"checked\""
           end
         end
@@ -70,8 +78,10 @@ module CML
           "default" => default, 
           "default_normalized" => default_normalized,
           "checked" => c,
-          "label" => @attrs["label"].to_s})
+          "label" => @attrs["label"].to_s,
+          "title" => title_attribute
+          })
       end
     end
   end
-end
+end

data/lib/cml/tags/checkboxes.rb

@@ -6,6 +6,10 @@ module CML
   {{content}}
       HTML
       
+      def finite_value?
+        true
+      end
+      
       def data
         #Don't memoize individual checkboxes if we are normalizing
         super.merge({"content" => content(@opts[:normalize] ? @opts[:iteration] : nil) })

data/lib/cml/tags/group.rb

@@ -6,6 +6,10 @@ module CML
   {{content}}
       HTML
       
+      def in_logic_graph?
+        false
+      end
+      
       def validate?
         false
       end

data/lib/cml/tags/hours.rb

@@ -0,0 +1,263 @@
+module CML
+  
+  class TimeSelect
+    HOURS = [12, 1.upto(11).to_a]
+    MINUTES = [0, 15, 30, 45]
+    SUFFIXES = [:am, :pm]
+    
+    BlankOption = "<option value=\"\">Select one:</option>"
+    GoldBlankOption = "<option value=\"\">(Any)</option>"
+    NotListedOption = "<option{{selected_att}} value=\"not_listed\">(Not listed)</option>"
+    
+    # Builds a time <select> input that submits military time values.
+    def self.build( name, gold=false, opts={} )
+      opts = {
+        :selected => nil,
+        :allow_unlisted => false
+      }.merge( opts )
+      
+      time_options = SUFFIXES.map do |am_pm|
+        HOURS.flatten.map do |h|
+          h_mil = h
+          h_mil = 0 if h_mil == 12 && am_pm == :am
+          MINUTES.map do |m|
+            time_label = "#{h}:#{self.zero_pad(m)}#{am_pm}"
+            mil_time = self.to_military( h_mil, m, am_pm )
+            selected_att = mil_time == opts[:selected] ? " selected=\"selected\"" : ""
+            "<option#{selected_att} value=\"#{mil_time}\">#{time_label}</option>"
+          end.join("")
+        end.join("")
+      end.join("")
+      extras = gold ? GoldBlankOption : BlankOption
+
+      # Add the not listed field and select it if needed
+      if opts[:allow_unlisted]
+        selected_att = "not_listed" == opts[:selected] ? " selected=\"selected\"" : ""
+        not_listed_html = Liquid::Template.parse( NotListedOption ).render( "selected_att" => selected_att )
+        extras += not_listed_html
+      end
+      
+      "<select name=\"#{name}\" class=\"cml_hours_time\">#{extras}#{time_options}</select>"
+    end
+    
+    protected
+    
+    def self.zero_pad( num )
+      '%02d' % num 
+    end
+    
+    def self.to_military( hour, minute, am_pm )
+      if am_pm == :am
+        hour = 0 if minute == 0 && hour == 12
+      elsif hour < 12
+        hour = hour + 12
+      end
+      
+      "#{self.zero_pad( hour )}:#{self.zero_pad( minute )}"
+    end
+  end
+  
+  # =============
+  # = CML:Hours =
+  # =============
+  
+  module Tags
+    class Hours < Tag
+      
+      DAYS = [
+        { :key => 'mon', :label => "Monday" },
+        { :key => 'tue', :label => "Tuesday" },
+        { :key => 'wed', :label => "Wednesday" },
+        { :key => 'thu', :label => "Thursday" },
+        { :key => 'fri', :label => "Friday" },
+        { :key => 'sat', :label => "Saturday" },
+        # { :key => 'cat', :label => "Caturday" },
+        { :key => 'sun', :label => "Sunday" }
+      ]
+      
+      # =============
+      # = Templates =
+      # =============
+      
+      Template = <<-HTML.freeze
+        {{label}}
+        <table class="cml_hours cml_row {{classes}}">
+          {{rows_html}}
+        </table>
+      HTML
+      
+      RowTemplate = Liquid::Template.parse(<<-HTML.freeze)
+        <tr class="cml_hours_{{day_key}}">
+          <td class="cml_hours_day">{{day_label}}</td>
+          <td class="cml_hours_hours">
+            <p class="cml_hours_1">
+              <span class="cml_hours_selects">{{hours_open_1}}</span>
+              <span class="cml_hours_to">to</span>
+              <span class="cml_hours_selects">{{hours_close_1}}</span>
+            </p>
+            <p class="cml_hours_2">
+              <span class="cml_hours_selects">{{hours_open_2}}</span>
+              <span class="cml_hours_to">to</span>
+              <span class="cml_hours_selects">{{hours_close_2}}</span>
+            </p>
+          </td>
+          <td class="cml_hours_open_close">
+            <p class="cml_hours_openallday">
+              {{open_checkbox}}
+            </p>
+            <p class="cml_hours_closedallday">
+              {{closed_checkbox}}
+            </p>
+          </td>
+        </tr>
+      HTML
+      
+      TrueFalseCheckboxTemplate = Liquid::Template.parse(<<-HTML)
+        <input type="hidden" name="{{name}}" value="FALSE" />
+        <input {{checked}}type="checkbox" name="{{name}}" id="{{id}}" value="TRUE" />
+        <label for="{{id}}">{{label}}</label>
+      HTML
+      
+      TimeSelectTemplate = Liquid::Template.parse( TimeSelect.build( "{{name}}", false ) )
+      TimeSelectTemplateAllowUnlisted = Liquid::Template.parse( TimeSelect.build( "{{name}}", false, :allow_unlisted => true ) )
+      
+      def initialize(cml, opts = {})
+        super( cml, opts )
+        @attrs["matcher"] = "hours"
+        @attrs["validates"] = @attrs["validates"].to_s + " hours"
+        @attrs["allowunlisted"] = !(@attrs["allowunlisted"].to_s =~ /^t/i).nil?
+      end
+      
+      def finite_value?
+        true
+      end
+      
+      # =============
+      # = Rendering =
+      # =============
+      
+      def to_html
+        data = self.data.merge({
+          "rows_html" => rows_html
+        })
+        rendered = Liquid::Template.parse( Template ).render( data )
+        wrapper( rendered )
+      end
+      
+      # =============
+      # = Normalize =
+      # =============
+      
+      def normalize?
+        @opts[:normalize]
+      end
+      
+      def raw_data
+        @opts[:data] || {}
+      end
+      
+      # Returns data value as array of values or nil, if none.
+      def normalized_data_value( name )
+        val = raw_data[name]
+        if val && !val.empty?
+          Array( val )
+        else
+          nil
+        end
+      end
+      
+      # "true", true, "coolio" --> true
+      # "false", false, "", nil --> false
+      def truthy_checkbox_value?( value )
+        value = value.is_a?(Array) ? value[0].to_s : value.to_s
+        !( value.empty? || value =~ /^f/i )
+      end
+      
+      # ===============
+      # = Field names =
+      # ===============
+      
+      # Builds a field name for the given day and suffix. e.g:
+      #    field_name( <tue>, "open_1" ) --> "u123[my_field_tue_open_1]"
+      def field_name( day, field_suffix )
+        prefix( name( true, "#{day[:key]}_#{field_suffix}" ) )
+      end
+      
+      protected
+      
+      # Render a time <select> for the given day and field suffix ("open_1",
+      # "closed_1", etc.)
+      def time_select_html( day, suffix )
+        key = name( true, "#{day[:key]}_#{suffix}" )
+        name = field_name( day, suffix )
+        allow_unlisted = @attrs["allowunlisted"]
+        
+        if normalize?
+          if values = self.normalized_data_value( key )
+            # With preloaded values
+            values.map do |value|
+              TimeSelect.build( name, true, {
+                :selected => value,
+                :allow_unlisted => allow_unlisted
+              })
+            end.join( "\n" )
+          else
+            # No preloaded values
+            TimeSelect.build( name, true, :allow_unlisted => allow_unlisted )
+          end
+        else
+          template = allow_unlisted ? TimeSelectTemplateAllowUnlisted : TimeSelectTemplate
+          template.render( 'name' => name )
+        end
+      end
+      
+      # Turn any string into a reasonable id attribute
+      def make_id( str )
+        "id_#{str}".gsub(/[^a-z0-9\{\}]/, "_").gsub(/_+/, "_").sub(/_+$/, "")
+      end
+      
+      # Render HTML with a <tr> of inputs for every day of the week
+      def rows_html
+        DAYS.map do |day|
+          RowTemplate.render({
+            "day_key" => day[:key],
+            "day_label" => day[:label],
+            'open_checkbox' => self.open_all_day_html( day ),
+            'closed_checkbox' => self.closed_all_day_html( day ),
+            "hours_open_1" => self.time_select_html( day, "open_1" ), 
+            "hours_close_1" => self.time_select_html( day, "close_1" ),
+            "hours_open_2" => self.time_select_html( day, "open_2" ),
+            "hours_close_2" => self.time_select_html( day, "close_2" )
+          })
+        end.join("\n")
+      end
+      
+      def open_all_day_html( day )
+        self.checkbox_html( "Open all day", day, "openallday" )
+      end
+      
+      def closed_all_day_html( day )
+        self.checkbox_html( "Closed all day", day, "closedallday" )
+      end
+      
+      # Build HTML for a "TRUE" / "FALSE" checkbox with the usual hidden input
+      # hackery.
+      def checkbox_html( label, day, suffix )
+        key = name( true, "#{day[:key]}_#{suffix}" )
+        name = field_name( day, suffix )
+        if truthy_checkbox_value?( raw_data[key] )
+          checked = "checked=\"checked\" "
+        else
+          checked = ""
+        end
+        
+        TrueFalseCheckboxTemplate.render({
+          'name' => name,
+          'id' => self.make_id( name ),
+          'label' => label,
+          'checked' => checked
+        })
+      end
+    end
+  end
+end

data/lib/cml/tags/iterate.rb

@@ -5,6 +5,10 @@ module CML
   {{ content }}
       HTML
       
+      def in_logic_graph?
+        false
+      end
+      
       def validate?
         false
       end

data/lib/cml/tags/meta.rb

@@ -4,6 +4,10 @@ module CML
       Template = <<-HTML.freeze
       HTML
       
+      def in_logic_graph?
+        false
+      end
+      
       def wrapper(parsed)
         parsed
       end

data/lib/cml/tags/option.rb

@@ -5,6 +5,10 @@ module CML
 <option {{value}} {{selected}}>{{label}}</option>
       HTML
       
+      def in_logic_graph?
+        false
+      end
+      
       def wrapper(parsed)
         parsed
       end

data/lib/cml/tags/radio.rb

@@ -6,7 +6,7 @@ module CML
       HTML
       
       Template = <<-HTML.freeze
-<div class="cml_row"><label class="{{gold_class}}">#{BareTemplate} {{label}}</label></div>
+<div class="cml_row" {{title}}><label class="{{gold_class}}">#{BareTemplate} {{label}}</label></div>
       HTML
       
       #Radios should always be grouped, but for consistency with checkboxes, we check
@@ -14,6 +14,14 @@ module CML
         @opts[:bare] || (@cml.parent && ["radios","ratings"].include?(@cml.parent.name))
       end
       
+      def in_logic_graph?
+        !grouped?
+      end
+      
+      def finite_value?
+        true
+      end
+      
       def wrapper(parsed)
         grouped? ? parsed : super
       end
@@ -30,7 +38,7 @@ module CML
         manipulated = !@opts[:missed].nil?
         if preload = preloaded_data
           manipulated = true
-          if preload.map{|x| x.to_s.downcase }.include?(value.to_s.downcase)
+          if Array(preload).map{|x| x.to_s.downcase }.include?(value.to_s.downcase)
             return "checked=\"checked\""
           end
         end
@@ -40,9 +48,10 @@ module CML
       def data
         super.merge({
           "checked" => checked,
-          "label" => @attrs["label"].to_s
+          "label" => @attrs["label"].to_s,
+          "title" => title_attribute
         })
       end
     end
   end
-end
+end

data/lib/cml/tags/radios.rb

@@ -31,6 +31,10 @@ module CML
         end
       end
       memoize :children
+      
+      def finite_value?
+        true
+      end
     end
   end
 end

data/lib/cml/tags/ratings.rb

@@ -39,6 +39,10 @@ module CML
       def gold_classes
         ratings.map {|rating| rating.gold_class }
       end
+
+      def children
+        ratings
+      end
       
       def ratings
         if @cml.xpath(".//cml:rating").empty?
@@ -56,6 +60,10 @@ module CML
         end
       end
       memoize :ratings
+      
+      def finite_value?
+        true
+      end
     end
   end
-end
+end

data/lib/cml/tags/search.rb

@@ -25,6 +25,10 @@ module CML
         !(@attrs["field"] && @attrs["field"].to_s == "false")
       end
       
+      def in_logic_graph?
+        is_field?
+      end
+      
       def search_terms_classes
         (@attrs["default"] ? "default " : "") + engine + " no_validate"
       end
@@ -46,11 +50,13 @@ module CML
       end
       
       def search_terms_value
-        ((@opts[:data] || {})[search_terms_name] || @attrs["default"]).to_s
+        val = ((@opts[:data] || {})[search_terms_name] || @attrs["default"])
+        val.is_a?(Array) ? val[0].to_s : val.to_s
       end
       
       def search_result_value
-        (@attrs["value"] || (@opts[:data] || {})[name] || "").to_s
+        val = (@attrs["value"] || (@opts[:data] || {})[name] || "")
+        val.is_a?(Array) ? val[0].to_s : val.to_s
       end
       
       def data

data/lib/cml/tags/select.rb

@@ -34,7 +34,7 @@ module CML
         # Preloaded data
         preload = preloaded_data
         
-        cloned.add_child(d[0].cml) if d.length > 0
+        cloned.children.first.add_previous_sibling(d[0].cml) if d.length > 0
         cloned.xpath(".//cml:*[not(self::cml:option)]").remove
         cloned.xpath(".//cml:option").each_with_index do |r,i|
           r.namespace = nil
@@ -45,6 +45,10 @@ module CML
         cloned.to_xhtml.gsub(/<\/?cml:select[^>]*?>|<\/?>/,'')
       end
       memoize :content
+      
+      def finite_value?
+        true
+      end
     end
   end
-end
+end