formulary 0.0.2 → 0.0.3

data/lib/formulary/html_form/fields/field_group.rb

@@ -6,8 +6,8 @@ module Formulary::HtmlForm::Fields
       end
     end
 
-    def initialize(group_name, elements)
-      @group_name, @elements = group_name, elements
+    def initialize(html_form, group_name, elements)
+      @html_form, @group_name, @elements = html_form, group_name, elements
     end
 
     def name
@@ -20,7 +20,7 @@ module Formulary::HtmlForm::Fields
 
     def error
       return super if super.present?
-      return "choose" if !value_in_list?
+      return "'#{label}' must be chosen from the available options" if !value_in_list?
     end
   end
 end

data/lib/formulary/html_form/fields/input.rb

@@ -15,7 +15,7 @@ module Formulary::HtmlForm::Fields
 
     def error
       return super if super.present?
-      return "format" unless pattern_correct?
+      return "'#{label}' does not match the expected format" unless pattern_correct?
     end
 
   protected

data/lib/formulary/html_form/fields/month_input.rb

@@ -0,0 +1,15 @@
+module Formulary::HtmlForm::Fields
+  class MonthInput < DateInput
+    def self.compatible_type
+      "month"
+    end
+
+    def display_format
+      "YYYY-MM"
+    end
+
+    def datetime_format
+      "%Y-%m"
+    end
+  end
+end

data/lib/formulary/html_form/fields/number_input.rb

@@ -0,0 +1,63 @@
+module Formulary::HtmlForm::Fields
+  class NumberInput < Input
+    def self.compatible_type
+      "number"
+    end
+
+    def initialize(html_form, element)
+      @html_form, @element = html_form, element
+      @min = @element.attributes['min'].try('value')
+      @max = @element.attributes['max'].try('value')
+      @step = @element.attributes['step'].try('value')
+    end
+
+    def valid?
+      super && number_correct? && min_correct? && max_correct? && step_correct?
+    end
+
+    def error
+      return super if super.present?
+      return "'#{label}' must be a valid number" unless number_correct?
+      return "'#{label}' must be greater than or equal to #{@min}" unless min_correct?
+      return "'#{label}' must be less than or equal to #{@max}" unless max_correct?
+      return "'#{label}' must be a step of #{@step}, the nearest valid values are #{@lower_step} and #{@higher_step}" unless step_correct?
+    end
+
+  protected
+
+    def number_correct?
+      return true if @value.blank?
+      return true if @value.match(/^\d*$/)
+      false
+    end
+
+    def min_correct?
+      return true if @value.blank?
+      return true if @min.blank?
+      return true if @value.to_i >= @min.to_i
+      false
+    end
+
+    def max_correct?
+      return true if @value.blank?
+      return true if @max.blank?
+      return true if @value.to_i <= @max.to_i
+      false
+    end
+
+    def step_correct?
+      return true if @value.blank?
+      return true if @step.blank?
+      start = @min.to_i || 0
+      step = @step.to_i
+      value = @value.to_i
+      match_mod = start % step
+      return true if value % step == match_mod
+
+      @lower_step = value - (value % step)
+      @higher_step = value + (step - (value % step))
+
+      false
+    end
+  end
+end

data/lib/formulary/html_form/fields/password_input.rb

@@ -0,0 +1,7 @@
+module Formulary::HtmlForm::Fields
+  class PasswordInput < Input
+    def self.compatible_type
+      "password"
+    end
+  end
+end

data/lib/formulary/html_form/fields/range_input.rb

@@ -0,0 +1,7 @@
+module Formulary::HtmlForm::Fields
+  class RangeInput < NumberInput
+    def self.compatible_type
+      "range"
+    end
+  end
+end

data/lib/formulary/html_form/fields/search_input.rb

@@ -0,0 +1,7 @@
+module Formulary::HtmlForm::Fields
+  class SearchInput < Input
+    def self.compatible_type
+      "search"
+    end
+  end
+end

data/lib/formulary/html_form/fields/select.rb

@@ -9,7 +9,7 @@ module Formulary::HtmlForm::Fields
     end
 
     def error
-      return "choose" unless valid?
+      return "'#{label}' must be chosen from the available options" unless valid?
     end
 
   protected

data/lib/formulary/html_form/fields/week_input.rb

@@ -0,0 +1,15 @@
+module Formulary::HtmlForm::Fields
+  class WeekInput < DateInput
+    def self.compatible_type
+      "week"
+    end
+
+    def display_format
+      "YYYY-W##"
+    end
+
+    def datetime_format
+      "%Y-W%U"
+    end
+  end
+end

data/lib/formulary/html_form/labels.rb

@@ -0,0 +1,39 @@
+module Formulary::HtmlForm::Labels
+  def label_for_field(field_name)
+    fields_for_name = document.css("*[name='#{field_name}']")
+
+    if fields_for_name.length > 1
+      labels_for_fieldset(fields_for_name)
+    else
+      label_for_single_field(fields_for_name.first)
+    end
+  end
+
+protected
+
+  def labels_for_fieldset(fields_for_name)
+    labels = fields_for_name.each_with_object({}) do |n, h|
+      h[n["value"]] = n.ancestors("label").first.text
+    end
+
+    fieldset_legend = fields_for_name.first.ancestors("fieldset").css("legend")
+    labels["fieldset"] = fieldset_legend.text
+    labels
+  end
+
+  def label_for_single_field(field)
+    input_id = field["id"]
+    label = document.css("label[for='#{input_id}']")
+
+    if label.empty?
+      parent_label = field.ancestors("label").first
+      if parent_label.nil?
+        nil
+      else
+        parent_label.text.strip
+      end
+    else
+      label.text
+    end
+  end
+end

data/lib/formulary/version.rb

@@ -1,3 +1,3 @@
 module Formulary
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/html_form/fields/checkbox_group_spec.rb

@@ -1,6 +1,11 @@
 require 'spec_helper'
 
 describe Formulary::HtmlForm::Fields::CheckboxGroup do
+  let(:markup_with_label) do
+    "<fieldset><legend>Field</legend>#{markup}</fieldset>"
+  end
+  let(:html_form) { Formulary::HtmlForm.new(markup_with_label) }
+
   describe ".compatible_with?" do
     subject { Formulary::HtmlForm::Fields::CheckboxGroup.compatible_with?(elements) }
 
@@ -40,14 +45,18 @@ describe Formulary::HtmlForm::Fields::CheckboxGroup do
 
   describe "validations" do
     subject(:checkbox_group) do
-      Formulary::HtmlForm::Fields::CheckboxGroup.new("food", elements)
+      Formulary::HtmlForm::Fields::CheckboxGroup.new(html_form, "field", elements)
     end
 
     context "when one of the items in the group is required" do
       let(:markup) do
         %{
-          <input type="checkbox" name="field" value="first" required>
-          <input type="checkbox" name="field" value="second">
+          <label>
+            First<input type="checkbox" name="field" value="first" required>
+          </label>
+          <label>
+            Second<input type="checkbox" name="field" value="second">
+          </label>
         }
       end
 
@@ -69,27 +78,31 @@ describe Formulary::HtmlForm::Fields::CheckboxGroup do
         before { checkbox_group.set_value("second") }
 
         it { should_not be_valid }
-        its(:error) { should include("required") }
+        its(:error) { should eql("'Field' is required") }
       end
 
       context "with a value that isn't expected" do
         before { checkbox_group.set_value([ "first", "invalid" ]) }
 
         it { should_not be_valid }
-        its(:error) { should include("choose") }
+        its(:error) { should eql("'Field' must be chosen from the available options") }
       end
 
       context "with no value" do
         it { should_not be_valid }
-        its(:error) { should include("required") }
+        its(:error) { should eql("'Field' is required") }
       end
     end
 
     context "when none are required" do
       let(:markup) do
         %{
-          <input type="checkbox" name="field" value="first">
-          <input type="checkbox" name="field" value="second">
+          <label>
+            <input type="checkbox" name="field" value="first">
+          </label>
+          <label>
+            <input type="checkbox" name="field" value="second">
+          </label>
         }
       end
 
@@ -97,7 +110,7 @@ describe Formulary::HtmlForm::Fields::CheckboxGroup do
         before { checkbox_group.set_value("invalid") }
 
         it { should_not be_valid }
-        its(:error) { should include("choose") }
+        its(:error) { should eql("'Field' must be chosen from the available options") }
       end
 
       context "with no value" do
@@ -109,7 +122,7 @@ describe Formulary::HtmlForm::Fields::CheckboxGroup do
         before { checkbox_group.set_value("on") }
 
         it { should_not be_valid }
-        its(:error) { should include("choose") }
+        its(:error) { should eql("'Field' must be chosen from the available options") }
       end
     end
 

data/spec/html_form/fields/color_input_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe Formulary::HtmlForm::Fields::ColorInput do
+  let(:markup_with_label) { "<label for='field'>Field</label>#{markup}" }
+  let(:html_form) { Formulary::HtmlForm.new(markup_with_label) }
+
+  describe ".compatible_with?" do
+    subject { Formulary::HtmlForm::Fields::ColorInput.compatible_with?(element) }
+    let(:markup) { %{<input type="#{type}" name="name" />} }
+
+    context "color type" do
+      let(:type) { "color" }
+      it { should be_true }
+    end
+
+    context "text type" do
+      let(:type) { "text" }
+      it { should be_false }
+    end
+  end
+
+  describe "validations" do
+    subject(:input) { Formulary::HtmlForm::Fields::ColorInput.new(html_form, element) }
+    let(:markup) { %{<input type="color" id="field" name="name" />} }
+
+    context "with a valid color" do
+      before { input.set_value("#123DEF") }
+
+      it { should be_valid }
+      its(:error) { should be_blank }
+    end
+
+    context "with an invalid color address" do
+      before { input.set_value("invalid!") }
+
+      it { should_not be_valid }
+      its(:error) { should eql("'Field' is not a valid color hex value") }
+    end
+
+    context "with a nil color" do
+      before { input.set_value(nil) }
+
+      it { should be_valid }
+      its(:error) { should be_blank }
+    end
+  end
+
+  it_should_behave_like "a field that allows the required attribute" do
+    let(:markup_with_required) { %{<input type="color" id="field" name="field" required />} }
+    let(:markup_without_required) { %{<input type="color" id="field" name="field" />} }
+    let(:valid_value) { "#123456" }
+  end
+
+  it_should_behave_like "a field that allows the pattern attribute" do
+    let(:markup) { %{<input type="color" id="field" name="field" pattern="^#[A-F]*$" />} }
+    let(:valid_value) { "#ABCDEF" }
+  end
+end

data/spec/html_form/fields/date_input_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe Formulary::HtmlForm::Fields::DateInput do
+  let(:markup_with_label) { "<label for='field'>Field</label>#{markup}" }
+  let(:html_form) { Formulary::HtmlForm.new(markup_with_label) }
+
+  describe ".compatible_with?" do
+    subject { Formulary::HtmlForm::Fields::DateInput.compatible_with?(element) }
+    let(:markup) { %{<input type="#{type}" name="name" />} }
+
+    context "text type" do
+      let(:type) { "text" }
+      it { should be_false }
+    end
+
+    context "date type" do
+      let(:type) { "date" }
+      it { should be_true }
+    end
+  end
+
+  it_should_behave_like "a field that allows the required attribute" do
+    let(:markup_with_required) { %{<input type="date" id="field" name="field" required />} }
+    let(:markup_without_required) { %{<input type="date" id="field" name="field" />} }
+    let(:valid_value) { "2014-01-01" }
+  end
+
+  describe "validations" do
+    subject(:input) { Formulary::HtmlForm::Fields::DateInput.new(html_form, element) }
+    let(:markup) { %{<input type="date" id="field" name="test" min="2013-12-31" max="2014-02-01" />} }
+
+    context "with a valid date" do
+      before { input.set_value("2014-01-01") }
+
+      it { should be_valid }
+      its(:error) { should be_blank }
+    end
+
+    context "with a invalid date" do
+      before { input.set_value("1/5/14") }
+
+      it { should_not be_valid }
+      its(:error) { should eql("'Field' is not a properly formatted date, please use YYYY-MM-DD") }
+    end
+
+    context "with a date less than the min" do
+      before { input.set_value("2013-01-01") }
+
+      it { should_not be_valid }
+      its(:error) { should eql("'Field' must be a date after 2013-12-31") }
+    end
+
+    context "with a date greater than the max" do
+      before { input.set_value("2015-01-01") }
+
+      it { should_not be_valid }
+      its(:error) { should eql("'Field' must be a date before 2014-02-01") }
+    end
+  end
+end

data/spec/html_form/fields/email_input_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Formulary::HtmlForm::Fields::EmailInput do
+  let(:markup_with_label) { "<label for='field'>Field</label>#{markup}" }
+  let(:html_form) { Formulary::HtmlForm.new(markup_with_label) }
+
   describe ".compatible_with?" do
     subject { Formulary::HtmlForm::Fields::EmailInput.compatible_with?(element) }
     let(:markup) { %{<input type="#{type}" name="name" />} }
@@ -17,19 +20,19 @@ describe Formulary::HtmlForm::Fields::EmailInput do
   end
 
   it_should_behave_like "a field that allows the required attribute" do
-    let(:markup_with_required) { %{<input type="email" name="field" required />} }
-    let(:markup_without_required) { %{<input type="email" name="field" />} }
+    let(:markup_with_required) { %{<input type="email" id="field" name="field" required />} }
+    let(:markup_without_required) { %{<input type="email" id="field" name="field" />} }
     let(:valid_value) { "test@example.com" }
   end
 
   it_should_behave_like "a field that allows the pattern attribute" do
-    let(:markup) { '<input type="email" name="field" pattern="@example\.com$" />' }
+    let(:markup) { '<input type="email" id="field" name="field" pattern="@example\.com$" />' }
     let(:valid_value) { "test@example.com" }
   end
 
   describe "validations" do
-    subject(:input) { Formulary::HtmlForm::Fields::EmailInput.new(element) }
-    let(:markup) { %{<input type="email" name="name" />} }
+    subject(:input) { Formulary::HtmlForm::Fields::EmailInput.new(html_form, element) }
+    let(:markup) { %{<input type="email" id="field" name="name" />} }
 
     context "with a valid email address" do
       before { input.set_value("test@example.com") }
@@ -42,7 +45,14 @@ describe Formulary::HtmlForm::Fields::EmailInput do
       before { input.set_value("invalid!") }
 
       it { should_not be_valid }
-      its(:error) { should include("email") }
+      its(:error) { should eql("'Field' is not a valid email address") }
+    end
+
+    context "with an email address that is somewhat invalid but passes the client-side spec" do
+      before { input.set_value("e@e.e") }
+
+      it { should be_valid }
+      its(:error) { should be_blank }
     end
 
     context "with a nil email address" do