page_record 0.4.0 → 0.5.0

data/lib/page_record/errors.rb

@@ -1,88 +1,87 @@
 module PageRecord
 
+  ##
+  # This {::Exception} is raised when the specified record is not found
+  # on the page. Check your selector, filter and HTML code for details.
+  #
+  # ```html
+  # <div data-team-id='10'>
+  # 	<div data-attribute-for='name'>Ajax</div>
+  # </div>
+  # ```
+  # When the following code is executed, the {RecordNotFound} exception is raised.
+  #
+  # ```ruby
+  # TeamPage.find(11)
+  # ```
+  #
+  class RecordNotFound < Exception
+  end
 
-	##
-	# This {::Exception} is raised when the specified record is not found 
-	# on the page. Check your selector, filter and HTML code for details.
-	#
-	# ```html
-	# <div data-team-id='10'>
-	# 	<div data-attribute-for='name'>Ajax</div>
-	# </div>
-	# ```
-	# When the following code is executed, the {RecordNotFound} exception is raised.
-	#
-	# ```ruby
-	# TeamPage.find(11)
-	#```
-	#
-	class RecordNotFound < Exception
-	end
+  ##
+  # This {::Exception} is raised when the specfied attribute is not found
+  # on the page. Check your selector, filter and HTML code for details.
+  #
+  # ```html
+  # <div data-team-id='10'>
+  # 	<div data-attribute-for='name'>Ajax</div>
+  # </div>
+  # ```
+  # When the following code is executed, the {AttributeNotFound} exception is raised.
+  #
+  # ```ruby
+  # TeamPage.find(10).ranking
+  # ```
+  #
+  class AttributeNotFound < Exception
+  end
 
-	##
-	# This {::Exception} is raised when the specfied attribute is not found
-	# on the page. Check your selector, filter and HTML code for details.
-	#
-	# ```html
-	# <div data-team-id='10'>
-	# 	<div data-attribute-for='name'>Ajax</div>
-	# </div>
-	# ```
-	# When the following code is executed, the {AttributeNotFound} exception is raised.
-	#
-	# ```ruby
-	# TeamPage.find(10).ranking
-	#```
-	#
-	class AttributeNotFound < Exception
-	end
+  ##
+  # This {::Exception} is raised when you have not set the page variable
+  # of the class. Check {PageRecord::Base.page} for details
+  #
+  class PageNotSet < Exception
+  end
 
-	##
-	# This {::Exception} is raised when you have not set the page variable
-	# of the class. Check {PageRecord::Base.page} for details
-	#
-	class PageNotSet < Exception
-	end
+  ##
+  # This {::Exception} is raised when the page contains multiple instances
+  # of the specfied record type. Use a selector to narrow the search.
+  #
+  # ```html
+  # <div id='first-table' data-team-id='10'>
+  # 	<div data-attribute-for='name'>Ajax</div>
+  # </div>
+  # <div id='second-table' data-team-id='10'>
+  # 	<div data-attribute-for='name'>Ajax</div>
+  # </div>
+  # ```
+  # When the following code is executed, the {MultipleRecords} exception is raised.
+  #
+  # ```ruby
+  # TeamPage.find(10)
+  # ```
+  #
+  # To fix this, use the `#first-table` in the selector
+  #
+  # ```ruby
+  # TeamPage.find(10, '#first-table')
+  # ```
+  #
+  class MultipleRecords < Exception
+  end
 
-	##
-	# This {::Exception} is raised when the page contains multiple instances 
-	# of the specfied record type. Use a selector to narrow the search.
-	#
-	# ```html
-	# <div id='first-table' data-team-id='10'>
-	# 	<div data-attribute-for='name'>Ajax</div>
-	# </div>
-	# <div id='second-table' data-team-id='10'>
-	# 	<div data-attribute-for='name'>Ajax</div>
-	# </div>
-	# ```
-	# When the following code is executed, the {MultipleRecords} exception is raised.
-	#
-	# ```ruby
-	# TeamPage.find(10)
-	#```
-	#
-	# To fix this, use the `#first-table` in the selector
-	#
-	# ```ruby
-	# TeamPage.find(10, '#first-table')
-	#```
-	#
-	class MultipleRecords < Exception
-	end
-
-	# This {::Exception} is raised when you try to set a non input field.
-	#
-	# ```ruby
-	# <div data-team-id=1>
-	# 	<div data-attribute-for='name'>PSV</div>
-	# </div>
-	# ```
-	# When the following code is executed, the {NotInputField} exception is raised.
-	#
-	# ```ruby
-	# team_on_page.name = 'Ajax'  
-	# ```
-	class NotInputField < Exception
-	end
-end
+  # This {::Exception} is raised when you try to set a non input field.
+  #
+  # ```ruby
+  # <div data-team-id=1>
+  # 	<div data-attribute-for='name'>PSV</div>
+  # </div>
+  # ```
+  # When the following code is executed, the {NotInputField} exception is raised.
+  #
+  # ```ruby
+  # team_on_page.name = 'Ajax'
+  # ```
+  class NotInputField < Exception
+  end
+end

data/lib/page_record/finders.rb

@@ -1,135 +1,133 @@
 module PageRecord
-	##
-	# PageRecord is  a specific sort of {http://assertselenium.com/automation-design-practices/page-object-pattern/ PageObject pattern}. Where a "normal" 
-	# {http://assertselenium.com/automation-design-practices/page-object-pattern/ PageObject} tries to make the page accessible with business like functions. 
-	# We have taken a different approach. We've noticed that a lot of WebPage are 
-	# mainly luxury CRUD pages. This means that almost every page shows one or more 
-	# records of a certain type and has the ability to create, read update and delete
-	# one or more records. Sounds familiar? Yes,  it is the same as an ActiveRecord 
-	# pattern. So we tried to make accessing a page as close as possible to accessing
-	# an ActiveRecord.
-	#
-	# To make this work, however, we need to add extra information to the HTML page. 
-	# With HTML5, , you can do this easily. HTML-5 supports the data- attributes on any
-	# tag. We use these tags to identify the records on the page.
-	#
-	#
-	class Base
-		##
-		#
-		# Searches the page and returns an {::Array} of {PageRecord::Base} of instances of
-		# that match the selector and the filter. See {file:README.md#markup markup} for more
-		# details about formatting the page.
-		# 
-		# example:
-		#
-		# ```ruby
-		# TeamPage.all
-		# ```
-		# 
-		# returns all records on the page
-		#
-		# @param	selector 	[String] selector to use for searching the table on the page
-		# @param	filter		[String] filter to use on the records on the page
-		#
-		# @return	[Array Pagerecord]	The Array containing instances of [PageRecord::Base] 
-		#  								with records that fit the selector and the filter
-		#
-		# @raise	[MultipleRecords]	if the page contains more then on set of records
-		# @raise 	[RecordNotFound]	if the page does not contain any of the specified records
-		#
-		def self.all(selector = nil, filter = nil)
-			selector ||= self.instance_variable_get('@selector')
-			filter ||= self.instance_variable_get('@filter')
-			records = []
-			context = context_for_selector(selector)				
-			context.all("[data-#{@type}-id]#{filter}").each do | record|
-				id = record["data-#{@type}-id"]
-				records << self.new(id, selector)
-			end
-			records
-		end
+  ##
+  # PageRecord is  a specific sort of {http://assertselenium.com/automation-design-practices/page-object-pattern/ PageObject pattern}. Where a "normal"
+  # {http://assertselenium.com/automation-design-practices/page-object-pattern/ PageObject} tries to make the page accessible with business like functions.
+  # We have taken a different approach. We've noticed that a lot of WebPage are
+  # mainly luxury CRUD pages. This means that almost every page shows one or more
+  # records of a certain type and has the ability to create, read update and delete
+  # one or more records. Sounds familiar? Yes,  it is the same as an ActiveRecord
+  # pattern. So we tried to make accessing a page as close as possible to accessing
+  # an ActiveRecord.
+  #
+  # To make this work, however, we need to add extra information to the HTML page.
+  # With HTML5, , you can do this easily. HTML-5 supports the data- attributes on any
+  # tag. We use these tags to identify the records on the page.
+  #
+  #
+  class Base
+    ##
+    #
+    # Searches the page and returns an {::Array} of {PageRecord::Base} of instances of
+    # that match the selector and the filter. See {file:README.md#markup markup} for more
+    # details about formatting the page.
+    #
+    # example:
+    #
+    # ```ruby
+    # TeamPage.all
+    # ```
+    #
+    # returns all records on the page
+    #
+    # @param	selector 	[String] selector to use for searching the table on the page
+    # @param	filter		[String] filter to use on the records on the page
+    #
+    # @return	[Array Pagerecord]	The Array containing instances of [PageRecord::Base]
+    #  								with records that fit the selector and the filter
+    #
+    # @raise	[MultipleRecords]	if the page contains more then on set of records
+    # @raise 	[RecordNotFound]	if the page does not contain any of the specified records
+    #
+    def self.all(selector = nil, filter = nil)
+      selector ||= @selector
+      filter ||= @filter
+      records = []
+      context = context_for_selector(selector)
+      context.all("[data-#{@type}-id]#{filter}").each do | record|
+        id = record["data-#{@type}-id"]
+        records << new(id, selector)
+      end
+      records
+    end
 
-		##
-		#
-		# Searches the page and returns an instance of {PageRecord::Base} of instances of
-		# that matches the given id, selector and the filter. See {file:README.md#markup markup} for more
-		# details about formatting the page.
-		# 
-		# example:
-		#
-		# ```ruby
-		# TeamPage.find(1)
-		# ```
-		# 
-		# returns the record with id 
-		# 
-		# When you don't specify an id, `find` returns the only record on the page.
-		# If you have more than one record on the page, `find` raises {MultipleRecords}.
-		#
-		# example:
-		#
-		# ```ruby
-		# TeamPage.find()
-		# ```
-		#
-		# @param	selector 	[String] selector to use for searching the table on the page
-		# @param	filter		[String] filter to use on the records on the page
-		#
-		# @return	[Pagerecord]	An instance of [PageRecord::Base]
-		#
-		# @raise	[MultipleRecords] if the page contains more then on set of records
-		# @raise 	[RecordNotFound] if the page does not contain any of the specified records
-		#
-		def self.find(id=nil, selector = nil, filter= nil)
-			selector ||= self.instance_variable_get('@selector')
-			filter ||= self.instance_variable_get('@filter')
-			self.new(id, selector, filter)
-		end
+    ##
+    #
+    # Searches the page and returns an instance of {PageRecord::Base} of instances of
+    # that matches the given id, selector and the filter. See {file:README.md#markup markup} for more
+    # details about formatting the page.
+    #
+    # example:
+    #
+    # ```ruby
+    # TeamPage.find(1)
+    # ```
+    #
+    # returns the record with id
+    #
+    # When you don't specify an id, `find` returns the only record on the page.
+    # If you have more than one record on the page, `find` raises {MultipleRecords}.
+    #
+    # example:
+    #
+    # ```ruby
+    # TeamPage.find()
+    # ```
+    #
+    # @param	selector 	[String] selector to use for searching the table on the page
+    # @param	filter		[String] filter to use on the records on the page
+    #
+    # @return	[Pagerecord]	An instance of [PageRecord::Base]
+    #
+    # @raise	[MultipleRecords] if the page contains more then on set of records
+    # @raise 	[RecordNotFound] if the page does not contain any of the specified records
+    #
+    def self.find(id = nil, selector = nil, filter = nil)
+      selector ||= @selector
+      filter ||= @filter
+      new(id, selector, filter)
+    end
 
-		##
-		#
-		# Searches the page and returns an instance of {PageRecord::Base} of instances of
-		# that matches the given attribute. See {file:README.md#markup markup} for more
-		# details about formatting the page.
-		#
-		# Although you can call this yourself, {PageRecord::Base} uses this method for defining a
-		# finder for all attributes when you define your page class, {PageRecord::Base}
-		# See {PageRecord::Base.attributes} for more details.
-		# 
-		# example:
-		#
-		# ```ruby
-		# TeamPage.find_by_name('Ajax')
-		# ```
-		# 
-		# returns the record where the name is set to Ajax 
-		# 
-		# @param	attribute 	[String] The attribute name
-		# @param	value 		[String] The value to search for
-		# @param	selector 	[String] selector to use for searching the table on the page
-		# @param	filter		[String] filter to use on the records on the page
-		#
-		# @return	[Pagerecord]	An instance of [PageRecord::Base].
-		#
-		# @raise	[MultipleRecords] if the page contains more then on set of records
-		# @raise 	[RecordNotFound] if the page does not contain any of the specified records
-		#
-		def self.find_by_attribute(attribute, value, selector, filter)
-			begin
-				selector ||= self.instance_variable_get('@selector')
-				filter ||= self.instance_variable_get('@filter')
-				
-				context = self.context_for_selector(selector)
-				record = context.find("[data-#{@type}-id]#{filter} > [data-attribute-for='#{attribute}']", :text => value)
-				parent = record.find(:xpath, "..")
-				id = parent["data-#{@type}-id"]
-				self.new(id, selector)
-				rescue Capybara::Ambiguous
-					raise MultipleRecords, "Found multiple #{@type} record with #{attribute} #{value} on page"				
-				rescue Capybara::ElementNotFound
-					raise RecordNotFound, "#{@type} record with #{attribute} #{value} not found on page"
-			end
-		end
-	end
+    ##
+    #
+    # Searches the page and returns an instance of {PageRecord::Base} of instances of
+    # that matches the given attribute. See {file:README.md#markup markup} for more
+    # details about formatting the page.
+    #
+    # Although you can call this yourself, {PageRecord::Base} uses this method for defining a
+    # finder for all attributes when you define your page class, {PageRecord::Base}
+    # See {PageRecord::Base.attributes} for more details.
+    #
+    # example:
+    #
+    # ```ruby
+    # TeamPage.find_by_name('Ajax')
+    # ```
+    #
+    # returns the record where the name is set to Ajax
+    #
+    # @param	attribute 	[String] The attribute name
+    # @param	value 		[String] The value to search for
+    # @param	selector 	[String] selector to use for searching the table on the page
+    # @param	filter		[String] filter to use on the records on the page
+    #
+    # @return	[Pagerecord]	An instance of [PageRecord::Base].
+    #
+    # @raise	[MultipleRecords] if the page contains more then on set of records
+    # @raise 	[RecordNotFound] if the page does not contain any of the specified records
+    #
+    def self.find_by_attribute(attribute, value, selector, filter)
+      selector ||= @selector
+      filter ||= @filter
+
+      context = context_for_selector(selector)
+      record = context.find("[data-#{@type}-id]#{filter} > [data-attribute-for='#{attribute}']", text: value)
+      parent = record.find(:xpath, '..')
+      id = parent["data-#{@type}-id"]
+      new(id, selector)
+      rescue Capybara::Ambiguous
+        raise MultipleRecords, "Found multiple #{@type} record with #{attribute} #{value} on page"
+      rescue Capybara::ElementNotFound
+        raise RecordNotFound, "#{@type} record with #{attribute} #{value} not found on page"
+    end
+  end
 end

data/lib/page_record/form_builder.rb

@@ -3,18 +3,18 @@ module PageRecord
   class FormBuilder < ActionView::Helpers::FormBuilder
     include PageRecord::Helpers
 
-    helpers = field_helpers + %w(time_zone_select date_select) - %w(hidden_field fields_for label)
+    helpers = field_helpers + [:time_zone_select, :date_select] - [:hidden_field, :fields_for, :label]
     helpers.each do |helper|
       define_method helper do |field, *args|
-        options = args.detect{ |a| a.is_a?(Hash) } || {}
+        options = args.find { |a| a.is_a?(Hash) } || {}
         super field, options.merge(attribute_for(field))
       end
     end
 
-    actions = ['submit','button']
+    actions = %w(submit button)
     actions.each do |helper|
       define_method helper do |field, *args|
-        options = args.detect{ |a| a.is_a?(Hash) } || {}
+        options = args.find { |a| a.is_a?(Hash) } || {}
         super field, options.merge(action_for(field.downcase))
       end
     end

data/lib/page_record/formtastic.rb

@@ -2,6 +2,18 @@ module Formtastic
 
   module Inputs
     module Base
+
+      module Errors
+        
+        def error_sentence_html
+          extend(PageRecord::Helpers)
+          error_class = options[:error_class] || builder.default_inline_error_class
+          options = { :class => error_class }.merge(error_for(@method))
+          template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.html_safe), options)
+        end
+      end
+
+
       module Html
 
         alias_method :input_html_options_org, :input_html_options
@@ -13,14 +25,13 @@ module Formtastic
         #
 
         def input_html_options
-          self.extend(PageRecord::Helpers)
-          input_html_options_org.merge(attribute_for(@method))
+          extend(PageRecord::Helpers)
+          input_html_options_org.merge(attribute_for(input_name))
         end
       end
     end
   end
 
-
   module Actions
     module Buttonish
 
@@ -32,7 +43,7 @@ module Formtastic
       # for all action methods
       #
       def extra_button_html_options
-        self.extend(PageRecord::Helpers)
+        extend(PageRecord::Helpers)
         extra_button_html_options_org.merge(action_for(@method))
       end
 
@@ -46,21 +57,21 @@ module Formtastic
 
       #
       # This is a replacement method for the original `semantic_form_for` method from `Formtastic`.
-      # The only thing it does, is merge the `form_record_for` into the output. 
+      # The only thing it does, is merge the `form_record_for` into the output.
       #
       def semantic_form_for(record_or_name_or_array, *args, &proc)
-        self.extend(PageRecord::Helpers)
+        extend(PageRecord::Helpers)
         options = args.extract_options!
-        options||= {}
+        options ||= {}
         case record_or_name_or_array
         when String, Symbol
           object_name = record_or_name_or_array
         else
           object      = record_or_name_or_array.is_a?(Array) ? record_or_name_or_array.last : record_or_name_or_array
-          raise ArgumentError, "First argument in form cannot contain nil or be empty" unless object
+          raise ArgumentError, 'First argument in form cannot contain nil or be empty' unless object
           object_name = options[:as] || model_name_from_record_or_class(object).param_key
         end
-        options = options.merge(html:form_record_for(object_name))
+        options = options.merge(html: form_record_for(object_name))
         args << options
         semantic_form_for_org(record_or_name_or_array, *args, &proc)
       end