formulary 0.0.2 → 0.0.3

data/spec/html_form_spec.rb

@@ -1,130 +1,264 @@
 require 'spec_helper'
 
 describe Formulary::HtmlForm do
-  let(:markup) do
-    <<-EOS
-    <div class="lead widget">
+  context "with a form with complex validations" do
+    let(:markup) do
+      <<-EOS
+      <div class="lead widget">
 
-      <p class="heading">Apply</p>
+        <p class="heading">Apply</p>
 
-      <form id="lead_form" action="{{ widget.lead_form.submission_url.value }}" method="POST">
+        <form id="lead_form" action="{{ widget.lead_form.submission_url.value }}" method="POST">
 
-        <div class="field">
-          <label for="first_name">First Name</label>
-          <input type="text" name="first_name" required />
-        </div>
-
-        <div class="field">
-          <label for="last_name">Last Name</label>
-          <input type="text" name="last_name" required />
-        </div>
-
-        <div class="field">
-          <label for="email">Email</label>
-          <input type="email" name="email" required />
-        </div>
-
-        <div class="field">
-          <label for="g5_email">G5 Email</label>
-          <input type="email" name="g5_email" pattern="@getg5\.com$" />
-        </div>
-
-        <div class="field">
-          <label for="phone">Phone</label>
-          <input type="tel" name="phone" />
-        </div>
-
-        <div class="field">
-          <label for="message">Message</label>
-          <textarea name="message"></textarea>
-        </div>
-
-        <div class="field">
-          <label for="unit">Unit</label>
-          <select name="unit">
-            <option>5x5</option>
-            <option value="5x10">Five By Ten</option>
-          </select>
-        </div>
-
-        <input type="radio" name="foods" value="bacon">Bacon<br>
-        <input type="radio" name="foods" value="butter" checked>Butter<br>
-
-        <input type="radio" name="beverages" value="water">Water<br>
-
-        <input type="hidden" name="syndication_url" value="example.com" />
-
-        <input type="checkbox" name="terms">
-
-        <input type="submit" value="Apply" />
-      </form>
-    </div>
-    EOS
-  end
+          <div class="field">
+            <label for="first_name">First Name</label>
+            <input type="text" id="first_name" name="first_name" required />
+          </div>
+
+          <div class="field">
+            <input type="text" name="last_name" required />
+          </div>
+
+          <div class="field">
+            <label for="email">Email</label>
+            <input type="email" id="email" name="email" required />
+          </div>
+
+          <div class="field">
+            <label for="company_email">G5 Email</label>
+            <input type="email" id="company_email" name="g5_email" pattern="@getg5\.com$" />
+          </div>
+
+          <div class="field">
+            <label for="phone">Phone</label>
+            <input type="tel" name="phone" />
+          </div>
+
+          <div class="field">
+            <label for="message">Message</label>
+            <textarea name="message"></textarea>
+          </div>
+
+          <div class="field">
+            <label for="unit">Unit</label>
+            <select name="unit">
+              <option>5x5</option>
+              <option value="5x10">Five By Ten</option>
+            </select>
+          </div>
+
+          <fieldset>
+            <legend>What is your favorite grease?</legend>
+            <label><input type="radio" name="foods" value="bacon">Bacon</label>
+            <label><input type="radio" name="foods" value="butter" checked>Butter</label>
+          </fieldset>
+
+          <input type="radio" name="beverages" value="water">Water<br>
+
+          <label for="date">Date</label>
+          <input type="date" id="date" name="date" />
+
+          <input type="hidden" name="syndication_url" value="example.com" />
+
+          <label>
+            <input type="checkbox" name="terms">I accept your terms
+          </label>
+
+          <div class="field">
+            <label for="labeless_field"></label>
+            <input type="email" id="labeless_field" name="labeless_field" />
+          </div>
+
+          <div class="field">
+            <label for="number">Number</label>
+            <input type="number" name="number" id="number" min="5" />
+          </div>
 
-  let(:html_form) { Formulary::HtmlForm.new(markup) }
+          <div class="field">
+            <label for="range">Range</label>
+            <input type="range" name="range" id="range" step="5" />
+          </div>
 
-  context "unsupported field type" do
-    let(:markup) { %{<input type="bacon" name="delicious" />} }
+          <div class="field">
+            <label for="search">Search</label>
+            <input type="search" name="search" id="search" />
+          </div>
 
-    it "explodes" do
-      expect { html_form }.to raise_error(Formulary::UnsupportedFieldType, /bacon/)
+          <div class="field">
+            <label for="password">Password</label>
+            <input type="password" name="password" id="password" />
+          </div>
+
+          <div class="field">
+            <label for="color">Color</label>
+            <input type="color" name="color" id="color" />
+          </div>
+
+          <input type="submit" value="Submit" />
+          <input type="button" value="Button" />
+          <input type="image" value="Image" />
+          <input type="reset" value="Reset" />
+        </form>
+      </div>
+      EOS
     end
-  end
 
-  describe "validations" do
-    let(:valid_params) do
-      {
-        first_name: "First",
-        last_name: "Last",
-        email: "test@test.com",
-        g5_email: "test@getg5.com",
-        unit: "5x5"
-      }
+    let(:html_form) { Formulary::HtmlForm.new(markup) }
+
+    context "unsupported field type" do
+      let(:markup) { %{<input type="bacon" name="delicious" />} }
+
+      it "explodes" do
+        expect { html_form }.to raise_error(Formulary::UnsupportedFieldType, /bacon/)
+      end
     end
 
-    describe "#valid?" do
-      subject(:valid) { html_form.valid?(params) }
+    context "with a mismatch of field types for a group" do
+      let(:markup) do
+        %{
+          <input type="radio" name="bacon" />
+          <input type="checkbox" name="bacon" />
+        }
+      end
 
-      context "with a valid submission" do
-        let(:params) { valid_params }
-        it { should be_true }
+      it "explodes" do
+        expect { html_form }.to raise_error(Formulary::UnsupportedFieldType, /bacon/)
       end
+    end
 
-      context "with an invalid submission" do
-        let(:params) { {} }
-        it { should be_false }
+    describe "validations" do
+      let(:valid_params) do
+        {
+          first_name: "First",
+          last_name: "Last",
+          email: "test@test.com",
+          g5_email: "test@getg5.com",
+          unit: "5x5"
+        }
       end
 
-      context "due to unexpected parameters" do
-        let(:params) { valid_params.merge(extra: "test") }
+      describe "#valid?" do
+        subject(:valid) { html_form.valid?(params) }
 
-        it "raises a Formulary::UnexpectedParameter exception" do
-          expect { valid }.to raise_error(Formulary::UnexpectedParameter, /extra/)
+        context "with a valid submission" do
+          let(:params) { valid_params }
+          it { should be_true }
+        end
+
+        context "with an invalid submission" do
+          let(:params) { {} }
+          it { should be_false }
+        end
+
+        context "due to unexpected parameters" do
+          let(:params) { valid_params.merge(extra: "test") }
+
+          it "raises a Formulary::UnexpectedParameter exception" do
+            expect { valid }.to raise_error(Formulary::UnexpectedParameter, /extra/)
+          end
+        end
+      end
+
+      describe "#errors" do
+        before { html_form.valid?(params) }
+        subject { html_form.errors }
+
+        context "with a valid submission" do
+          let(:params) { valid_params }
+          it { should be_empty }
+        end
+
+        context "with an invalid submission" do
+          let(:params) do
+            {
+              email: "invalid",
+              g5_email: "test@example.com",
+              foods: "water",
+              date: "4 score and 7 years ago",
+              number: "1",
+              range: "8"
+            }
+          end
+
+          its(["first_name"]) { should eql("'First Name' is required") }
+          its(["email"]) { should include("'Email' is not a valid email address") }
+          its(["g5_email"]) { should include("'G5 Email' does not match the expected format") }
+          its(["foods"]) { should include("'What is your favorite grease?' must be chosen from the available options") }
+          its(["date"]) { should include("'Date' is not a properly formatted date") }
+          its(["number"]) { should include("'Number' must be greater than or equal to 5") }
+          its(["range"]) { should include("'Range' must be a step of 5, the nearest valid values are 5 and 10") }
         end
       end
     end
 
-    describe "#errors" do
-      before { html_form.valid?(params) }
-      subject { html_form.errors }
+    describe "#label_for_field" do
+      subject { html_form.label_for_field(field_name) }
 
-      context "with a valid submission" do
-        let(:params) { valid_params }
-        it { should be_empty }
+      context "with a label with a for attribute" do
+        let(:field_name) { "first_name" }
+        it { should eq("First Name") }
       end
 
-      context "with an invalid submission" do
-        let(:params) do
-          {
-            email: "invalid", g5_email: "test@example.com", foods: "water"
-          }
-        end
+      context "with no matching label" do
+        let(:field_name) { "last_name" }
+        it { should be_nil }
+      end
+
+      context "with a label with no text" do
+        let(:field_name) { "labeless_field" }
+        it { should eq("") }
+      end
+
+      context "with a parent label" do
+        let(:field_name) { "terms" }
+        it { should eq("I accept your terms") }
+      end
+
+      context "with a name and id mismatch on the field" do
+        let(:field_name) { "g5_email" }
+        it { should eq("G5 Email") }
+      end
+
+      context "with a fieldset" do
+        let(:field_name) { "foods" }
+        its(["fieldset"]) { should eq("What is your favorite grease?") }
+        its(["bacon"]) { should eq("Bacon") }
+        its(["butter"]) { should eq("Butter") }
+      end
+    end
+  end
+
+  context "with a form with nested fields" do
+    let(:markup) do
+      <<-EOS
+        <form id="lead_form" action="{{ widget.lead_form.submission_url.value }}" method="POST">
+
+          <label for="first_name">First Name</label>
+          <input type="text" name="first_name" required />
+
+          <label for="parent[child]">Nested Field</label>
+          <input type="text" name="parent[child]" required />
+
+          <input type="submit" value="Apply" />
+        </form>
+      EOS
+    end
+
+    subject(:valid) { Formulary::HtmlForm.new(markup).valid?(params) }
+
+    context "with valid nested parameters" do
+      let(:params) do
+        { "first_name" => "Test", "parent" => { "child" => "nested value" } }
+      end
+
+      it { should be_true }
+    end
+
+    context "with invalid nested parameters" do
+      let(:params) { { "parent" => { "invalid" => "bad" } } }
 
-        its(["first_name"]) { should include("required") }
-        its(["email"]) { should include("email") }
-        its(["g5_email"]) { should include("format") }
-        its(["foods"]) { should include("choose") }
+      it " explodes violently" do
+        expect { valid }.to raise_error(Formulary::UnexpectedParameter, /invalid/)
       end
     end
   end

data/spec/support/element_helper.rb

@@ -6,7 +6,7 @@ module ElementHelper
   def elements
     @elements ||= \
       Nokogiri::HTML("<html><body>#{markup}</body></html>").
-        css("body > *")
+        css("body input, body textarea, body select")
   end
 end
 

data/spec/support/shared_examples_for_pattern.rb

@@ -1,5 +1,7 @@
 shared_examples_for "a field that allows the pattern attribute" do
-  subject(:input) { described_class.new(element) }
+  let(:markup_with_label) { "<label for='field'>Field</label>#{markup}" }
+  let(:html_form) { Formulary::HtmlForm.new(markup_with_label) }
+  subject(:input) { described_class.new(html_form, element) }
 
   context "with a matching value" do
     before { input.set_value(valid_value) }
@@ -10,6 +12,6 @@ shared_examples_for "a field that allows the pattern attribute" do
   context "without a matching value" do
     before { input.set_value("z") }
     it { should_not be_valid }
-    its(:error) { should include("format") }
+    its(:error) { should include("'Field' does not match the expected format") }
   end
 end

data/spec/support/shared_examples_for_required.rb

@@ -1,5 +1,7 @@
 shared_examples_for "a field that allows the required attribute" do
-  subject(:input) { described_class.new(element) }
+  let(:markup_with_label) { "<label for='field'>Field</label>#{markup}" }
+  let(:html_form) { Formulary::HtmlForm.new(markup_with_label) }
+  subject(:input) { described_class.new(html_form, element) }
 
   context "required" do
     let(:markup) { markup_with_required }
@@ -19,7 +21,7 @@ shared_examples_for "a field that allows the required attribute" do
     context "submitted a nil value" do
       before { input.set_value(nil) }
       it { should_not be_valid }
-      its(:error) { should include("required") }
+      its(:error) { should eql("'Field' is required") }
     end
   end
 

metadata

@@ -1,121 +1,110 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: formulary
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Matt Bohme
 - Don Petersen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-01-10 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-03-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: email_veracity
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: pry
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Valid form submission based on the HTML5 validation on the form itself
-email: 
+email:
 - matt.bohme@g5searchmarketing.com
 - don.petersen@g5searchmarketing.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .rspec
+files:
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -125,73 +114,92 @@ files:
 - lib/formulary/html_form.rb
 - lib/formulary/html_form/fields.rb
 - lib/formulary/html_form/fields/checkbox_group.rb
+- lib/formulary/html_form/fields/color_input.rb
+- lib/formulary/html_form/fields/date_input.rb
 - lib/formulary/html_form/fields/email_input.rb
 - lib/formulary/html_form/fields/field.rb
 - lib/formulary/html_form/fields/field_group.rb
 - lib/formulary/html_form/fields/hidden_input.rb
 - lib/formulary/html_form/fields/input.rb
+- lib/formulary/html_form/fields/month_input.rb
+- lib/formulary/html_form/fields/number_input.rb
+- lib/formulary/html_form/fields/password_input.rb
 - lib/formulary/html_form/fields/radio_button_group.rb
+- lib/formulary/html_form/fields/range_input.rb
+- lib/formulary/html_form/fields/search_input.rb
 - lib/formulary/html_form/fields/select.rb
 - lib/formulary/html_form/fields/tel_input.rb
 - lib/formulary/html_form/fields/text_input.rb
 - lib/formulary/html_form/fields/textarea.rb
+- lib/formulary/html_form/fields/week_input.rb
+- lib/formulary/html_form/labels.rb
 - lib/formulary/version.rb
 - spec/html_form/fields/checkbox_group_spec.rb
+- spec/html_form/fields/color_input_spec.rb
+- spec/html_form/fields/date_input_spec.rb
 - spec/html_form/fields/email_input_spec.rb
 - spec/html_form/fields/field_spec.rb
 - spec/html_form/fields/hidden_input_spec.rb
 - spec/html_form/fields/input_spec.rb
+- spec/html_form/fields/month_input_spec.rb
+- spec/html_form/fields/number_input_spec.rb
+- spec/html_form/fields/password_input_spec.rb
 - spec/html_form/fields/radio_button_group_spec.rb
+- spec/html_form/fields/range_input_spec.rb
+- spec/html_form/fields/search_input_spec.rb
 - spec/html_form/fields/select_spec.rb
 - spec/html_form/fields/tel_input_spec.rb
 - spec/html_form/fields/text_input_spec.rb
 - spec/html_form/fields/textarea_spec.rb
+- spec/html_form/fields/week_input_spec.rb
 - spec/html_form_spec.rb
 - spec/spec_helper.rb
 - spec/support/element_helper.rb
 - spec/support/shared_examples_for_pattern.rb
 - spec/support/shared_examples_for_required.rb
-has_rdoc: true
 homepage: http://github.com/g5/formulary
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Valid form submission based on the HTML5 validation on the form itself
-test_files: 
+test_files:
 - spec/html_form/fields/checkbox_group_spec.rb
+- spec/html_form/fields/color_input_spec.rb
+- spec/html_form/fields/date_input_spec.rb
 - spec/html_form/fields/email_input_spec.rb
 - spec/html_form/fields/field_spec.rb
 - spec/html_form/fields/hidden_input_spec.rb
 - spec/html_form/fields/input_spec.rb
+- spec/html_form/fields/month_input_spec.rb
+- spec/html_form/fields/number_input_spec.rb
+- spec/html_form/fields/password_input_spec.rb
 - spec/html_form/fields/radio_button_group_spec.rb
+- spec/html_form/fields/range_input_spec.rb
+- spec/html_form/fields/search_input_spec.rb
 - spec/html_form/fields/select_spec.rb
 - spec/html_form/fields/tel_input_spec.rb
 - spec/html_form/fields/text_input_spec.rb
 - spec/html_form/fields/textarea_spec.rb
+- spec/html_form/fields/week_input_spec.rb
 - spec/html_form_spec.rb
 - spec/spec_helper.rb
 - spec/support/element_helper.rb