form_object_model 0.1.1 → 0.1.2

data/.travis.yml

@@ -2,4 +2,4 @@ language: ruby
 rvm:
   - 1.9.3
   - 1.9.2
-
+  - 1.8.7

data/README.md

@@ -1,6 +1,7 @@
 # FormObjectModel
 
 [![Build Status](https://secure.travis-ci.org/reinteractive-open/form-object-model.png?branch=master)](http://travis-ci.org/reinteractive-open/form-object-model)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/reinteractive-open/form-object-model)
 
 This gem lets you construct an object model
 of a form you're using in your request specs.
@@ -35,7 +36,7 @@ So given the following form in a page:
 Forms are defined like so:
 
 ```ruby
-form = FormObjectModel.new do |fom|
+form = FormObjectModel::Form.new do |fom|
   form.text_field :name, "Name"
   form.select     :title, "Title"
   form.radio      :gender, "input[name = gender]"

data/form_object_model.gemspec

@@ -2,8 +2,8 @@
 require File.expand_path('../lib/form_object_model/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Sean Geoghegan"]
-  gem.email         = ["sean@seangeo.me"]
+  gem.authors       = ["Sean Geoghegan", "Aaron Beckerman"]
+  gem.email         = ["sean@seangeo.me", "aaron@aaronbeckerman.com"]
   gem.description   = %q{An OO form testing helper that makes Capayaba-based form testing easy.}
   gem.summary       = %q{An OO form testing helper that makes Capayaba-based form testing easy.}
   gem.homepage      = "https://github.com/reinteractive-open/form-object-model"

data/lib/form_object_model.rb

@@ -3,4 +3,9 @@ require "form_object_model/version"
 require "form_object_model/form.rb"
 require "form_object_model/helper.rb"
 require "form_object_model/matcher.rb"
+require "form_object_model/field.rb"
+require "form_object_model/text_field.rb"
+require "form_object_model/select_field.rb"
+require "form_object_model/radio_field.rb"
+require "form_object_model/field_module.rb"
 

data/lib/form_object_model/field.rb

@@ -0,0 +1,12 @@
+module FormObjectModel
+  class Field < Struct.new(:page, :name, :locator)
+    def ==(other)
+      if respond_to?(:has_value?)
+        has_value? other
+      else
+        super
+      end
+    end
+  end
+end
+

data/lib/form_object_model/field_module.rb

@@ -0,0 +1,11 @@
+module FormObjectModel
+  # A module that defines the getter and setter for the field
+  # properties of a form.
+  class FieldModule < Module
+    def initialize(name, field)
+      define_method(name.to_sym) { |*args| field }
+      define_method("#{name}=".to_sym) { |val| field.fill(val) }
+    end
+  end
+end
+

data/lib/form_object_model/form.rb

@@ -1,73 +1,5 @@
 module FormObjectModel
   class Form
-    Field = Struct.new(:page, :name, :locator)
-    class TextField < Field
-      def fill(value)
-        page.fill_in(locator, :with => value.to_s)
-      end
-
-      def has_value?(value)
-        page.has_field?(locator, :with => value.to_s)
-      end
-
-      def value
-        page.find_field(locator).value
-      end
-    end
-
-    class SelectField < Field
-      def fill(value)
-        page.select(value.to_s, :from => locator)
-      end
-
-      def has_value?(value)
-        page.has_select?(locator, :selected => value.to_s)
-      end
-
-      def value
-        value = nil
-        page.within(page.find_field(locator)) do
-          value = page.find("option[selected]").text
-        end
-        value
-      end
-    end
-
-    class RadioField < Field
-      # This lets you select the radio button by it's label instead of id
-      def fill(value)
-        if button = button_for(value)
-          button.set(true)
-        else
-          raise "Could not find button with locator '#{locator}' and label '#{value}'"
-        end
-      end
-
-      def has_value?(value)
-        button = button_for(value)
-        button && %w(checked true).include?(button['checked'])
-      end
-
-      def value
-        element = checked_element
-        element && element.value
-      end
-
-      private
-      def checked_element
-        page.all(locator).find {|b| b['checked'] == 'checked' }
-      end
-
-      def button_for(value)
-        label_ids = label_ids_for(value)
-        page.all(locator).find {|b| label_ids.include?(b['id']) }
-      end
-
-      def label_ids_for(value)
-        page.all("label:contains('#{value}')").map {|label| label['for'] }
-      end
-    end
-
     attr_reader :page
 
     def initialize(page)
@@ -108,10 +40,7 @@ module FormObjectModel
     private
 
     def define_field(name, field)
-      (class << self; self; end).class_eval do
-        define_method(name) {|*args| field }
-        define_method("#{name.to_s}=".to_sym) {|val| field.fill(val) }
-      end
+      self.extend(FieldModule.new(name, field))
     end
   end
 end

data/lib/form_object_model/radio_field.rb

@@ -0,0 +1,37 @@
+module FormObjectModel
+  class RadioField < Field
+    # This lets you select the radio button by it's label instead of id
+    def fill(value)
+      if button = button_for(value)
+        button.set(true)
+      else
+        raise "Could not find button with locator '#{locator}' and label '#{value}'"
+      end
+    end
+
+    def has_value?(value)
+      button = button_for(value)
+      button && %w(checked true).include?(button['checked'])
+    end
+
+    def value
+      element = checked_element
+      element && element.value
+    end
+
+    private
+    def checked_element
+      page.all(locator).find {|b| b['checked'] == 'checked' }
+    end
+
+    def button_for(value)
+      label_ids = label_ids_for(value)
+      page.all(locator).find {|b| label_ids.include?(b['id']) }
+    end
+
+    def label_ids_for(value)
+      page.all("label:contains('#{value}')").map {|label| label['for'] }
+    end
+  end
+end
+

data/lib/form_object_model/select_field.rb

@@ -0,0 +1,20 @@
+module FormObjectModel
+  class SelectField < Field
+    def fill(value)
+      page.select(value.to_s, :from => locator)
+    end
+
+    def has_value?(value)
+      page.has_select?(locator, :selected => value.to_s)
+    end
+
+    def value
+      value = nil
+      page.within(page.find_field(locator)) do
+        value = page.find("option[selected]").text
+      end
+      value
+    end
+  end
+end
+

data/lib/form_object_model/text_field.rb

@@ -0,0 +1,16 @@
+module FormObjectModel
+  class TextField < Field
+    def fill(value)
+      page.fill_in(locator, :with => value.to_s)
+    end
+
+    def has_value?(value)
+      page.has_field?(locator, :with => value.to_s)
+    end
+
+    def value
+      page.find_field(locator).value
+    end
+  end
+end
+

data/lib/form_object_model/version.rb

@@ -1,3 +1,3 @@
 module FormObjectModel
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/integration/form_object_model_spec.rb

@@ -75,10 +75,20 @@ describe FormObjectModel do
       lambda { form.textfield1.should have_value("Other value") }.should raise_error(RSpec::Expectations::ExpectationNotMetError)
     end
 
+    it "should fail (with ==) when the value of the field is different" do
+      page.fill_in("Text Field 1", :with => "A value")
+      lambda { form.textfield1.should == "Other value" }.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+    end
+
     it "should pass when the value of the field is the same" do
       page.fill_in("Text Field 1", :with => "A value")
       form.textfield1.should have_value("A value")
     end
+
+    it "should pass (with ==) when the value of the field is the same" do
+      page.fill_in("Text Field 1", :with => "A value")
+      form.textfield1.should == "A value"
+    end
   end
 
   context "single select" do
@@ -92,7 +102,7 @@ describe FormObjectModel do
       lambda { form.selectfield1.should have_value("Option 2") }.should raise_error(RSpec::Expectations::ExpectationNotMetError)
     end
 
-    it "should pass with the value is the same" do
+    it "should pass when the value is the same" do
       page.select("Option 2", :from => "Select Field")
       form.selectfield1.should have_value("Option 2")
     end

data/spec/unit/field_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe FormObjectModel::Field do
+  context "when self responds to has_value?" do
+    before do
+      subject.stub(:respond_to?).with(:has_value?).and_return(true)
+      subject.should_receive(:has_value?).with("A value").and_return(true)
+    end
+
+    describe "==" do
+      it "calls has_value? with its argument" do
+        (subject == "A value").should be_true
+      end
+    end
+
+    describe "!=" do
+      it "calls has_value? with its argument" do
+        (subject != "A value").should be_false
+      end
+    end
+  end
+
+  context "when self does not respond to has_value?" do
+    before do
+      subject.stub(:respond_to?).with(:has_value?).and_return(false)
+    end
+
+    describe "== method" do
+      it "behaves in the conventional way" do
+        (subject == "A value").should be_false
+      end
+    end
+
+    describe "!= method" do
+      it "behaves in the conventional way" do
+        (subject != "A value").should be_true
+      end
+    end
+  end
+end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: form_object_model
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
 - Sean Geoghegan
+- Aaron Beckerman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -62,6 +63,7 @@ dependencies:
 description: An OO form testing helper that makes Capayaba-based form testing easy.
 email:
 - sean@seangeo.me
+- aaron@aaronbeckerman.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -74,12 +76,18 @@ files:
 - Rakefile
 - form_object_model.gemspec
 - lib/form_object_model.rb
+- lib/form_object_model/field.rb
+- lib/form_object_model/field_module.rb
 - lib/form_object_model/form.rb
 - lib/form_object_model/helper.rb
 - lib/form_object_model/matcher.rb
+- lib/form_object_model/radio_field.rb
+- lib/form_object_model/select_field.rb
+- lib/form_object_model/text_field.rb
 - lib/form_object_model/version.rb
 - spec/integration/form_object_model_spec.rb
 - spec/spec_helper.rb
+- spec/unit/field_spec.rb
 homepage: https://github.com/reinteractive-open/form-object-model
 licenses: []
 post_install_message: 
@@ -94,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4303086123423288710
+      hash: -4576561865437419326
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -103,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4303086123423288710
+      hash: -4576561865437419326
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.19
@@ -113,3 +121,4 @@ summary: An OO form testing helper that makes Capayaba-based form testing easy.
 test_files:
 - spec/integration/form_object_model_spec.rb
 - spec/spec_helper.rb
+- spec/unit/field_spec.rb