mkuklis-webrat 0.5.1 → 0.6.rc1

data/lib/webrat/core/locators/button_locator.rb

@@ -1,54 +1,54 @@
-require "webrat/core/locators/locator"
-
-module Webrat
-  module Locators
-
-    class ButtonLocator < Locator # :nodoc:
-
-      def locate
-        ButtonField.load(@session, button_element)
-      end
-
-      def button_element
-        button_elements.detect do |element|
-          @value.nil?             ||
-          matches_id?(element)    ||
-          matches_value?(element) ||
-          matches_html?(element)  ||
-          matches_alt?(element)
-        end
-      end
-
-      def matches_id?(element)
-        (@value.is_a?(Regexp) && element["id"] =~ @value) ||
-        (!@value.is_a?(Regexp) && element["id"] == @value.to_s)
-      end
-
-      def matches_value?(element)
-        element["value"] =~ /^\W*#{Regexp.escape(@value.to_s)}/i
-      end
-
-      def matches_html?(element)
-        element.inner_html =~ /#{Regexp.escape(@value.to_s)}/i
-      end
-
-      def matches_alt?(element)
-        element["alt"] =~ /^\W*#{Regexp.escape(@value.to_s)}/i
-      end
-
-      def button_elements
-        @dom.xpath(*ButtonField.xpath_search)
-      end
-
-      def error_message
-        "Could not find button #{@value.inspect}"
-      end
-
-    end
-
-    def find_button(value) #:nodoc:
-      ButtonLocator.new(@session, dom, value).locate!
-    end
-
-  end
-end
+require "webrat/core/locators/locator"
+
+module Webrat
+  module Locators
+
+    class ButtonLocator < Locator # :nodoc:
+
+      def locate
+        ButtonField.load(@session, button_element)
+      end
+
+      def button_element
+        button_elements.detect do |element|
+          @value.nil?             ||
+          matches_id?(element)    ||
+          matches_value?(element) ||
+          matches_html?(element)  ||
+          matches_alt?(element)
+        end
+      end
+
+      def matches_id?(element)
+        (@value.is_a?(Regexp) && element["id"] =~ @value) ||
+        (!@value.is_a?(Regexp) && element["id"] == @value.to_s)
+      end
+
+      def matches_value?(element)
+        element["value"] =~ /^\W*#{Regexp.escape(@value.to_s)}/i
+      end
+
+      def matches_html?(element)
+        element.inner_html =~ /#{Regexp.escape(@value.to_s)}/i
+      end
+
+      def matches_alt?(element)
+        element["alt"] =~ /^\W*#{Regexp.escape(@value.to_s)}/i
+      end
+
+      def button_elements
+        @dom.xpath(*ButtonField.xpath_search)
+      end
+
+      def error_message
+        "Could not find button #{@value.inspect}"
+      end
+
+    end
+
+    def find_button(value) #:nodoc:
+      ButtonLocator.new(@session, dom, value).locate!
+    end
+
+  end
+end

data/lib/webrat/core/locators/field_by_id_locator.rb

@@ -1,37 +1,37 @@
-require "webrat/core/locators/locator"
-
-module Webrat
-  module Locators
-
-    class FieldByIdLocator < Locator # :nodoc:
-
-      def locate
-        Field.load(@session, field_element)
-      end
-
-      def field_element
-        field_elements.detect do |field_element|
-          if @value.is_a?(Regexp)
-            field_element["id"] =~ @value
-          else
-            field_element["id"] == @value.to_s
-          end
-        end
-      end
-
-      def field_elements
-        @dom.xpath(*Field.xpath_search)
-      end
-
-      def error_message
-        "Could not find field with id #{@value.inspect}"
-      end
-
-    end
-
-    def field_with_id(id, *field_types)
-      FieldByIdLocator.new(@session, dom, id, *field_types).locate!
-    end
-
-  end
-end
+require "webrat/core/locators/locator"
+
+module Webrat
+  module Locators
+
+    class FieldByIdLocator < Locator # :nodoc:
+
+      def locate
+        Field.load(@session, field_element)
+      end
+
+      def field_element
+        field_elements.detect do |field_element|
+          if @value.is_a?(Regexp)
+            field_element["id"] =~ @value
+          else
+            field_element["id"] == @value.to_s
+          end
+        end
+      end
+
+      def field_elements
+        @dom.xpath(*Field.xpath_search)
+      end
+
+      def error_message
+        "Could not find field with id #{@value.inspect}"
+      end
+
+    end
+
+    def field_with_id(id, *field_types)
+      FieldByIdLocator.new(@session, dom, id, *field_types).locate!
+    end
+
+  end
+end

data/lib/webrat/core/locators/field_labeled_locator.rb

@@ -1,56 +1,56 @@
-require "webrat/core_extensions/detect_mapped"
-require "webrat/core/locators/locator"
-
-module Webrat
-  module Locators
-
-    class FieldLabeledLocator < Locator # :nodoc:
-
-      def locate
-        matching_labels.any? && matching_labels.detect_mapped { |label| label.field }
-      end
-
-      def matching_labels
-        matching_label_elements.sort_by do |label_element|
-          text(label_element).length
-        end.map do |label_element|
-          Label.load(@session, label_element)
-        end
-      end
-
-      def matching_label_elements
-        label_elements.select do |label_element|
-          text(label_element) =~ /^\W*#{Regexp.escape(@value.to_s)}(\b|\Z)/i
-        end
-      end
-
-      def label_elements
-        @dom.xpath(*Label.xpath_search)
-      end
-
-      def error_message
-        "Could not find field labeled #{@value.inspect}"
-      end
-
-      def text(element)
-        str = element.inner_text
-        str.gsub!("\n","")
-        str.strip!
-        str.squeeze!(" ")
-        str
-      end
-
-    end
-
-    # Locates a form field based on a <tt>label</tt> element in the HTML source.
-    # This can be useful in order to verify that a field is pre-filled with the
-    # correct value.
-    #
-    # Example:
-    #   field_labeled("First name").value.should == "Bryan"
-    def field_labeled(label, *field_types)
-      FieldLabeledLocator.new(@session, dom, label, *field_types).locate!
-    end
-
-  end
-end
+require "webrat/core_extensions/detect_mapped"
+require "webrat/core/locators/locator"
+
+module Webrat
+  module Locators
+
+    class FieldLabeledLocator < Locator # :nodoc:
+
+      def locate
+        matching_labels.any? && matching_labels.detect_mapped { |label| label.field }
+      end
+
+      def matching_labels
+        matching_label_elements.sort_by do |label_element|
+          text(label_element).length
+        end.map do |label_element|
+          Label.load(@session, label_element)
+        end
+      end
+
+      def matching_label_elements
+        label_elements.select do |label_element|
+          text(label_element) =~ /^\W*#{Regexp.escape(@value.to_s)}(\b|\Z)/i
+        end
+      end
+
+      def label_elements
+        @dom.xpath(*Label.xpath_search)
+      end
+
+      def error_message
+        "Could not find field labeled #{@value.inspect}"
+      end
+
+      def text(element)
+        str = element.inner_text
+        str.gsub!("\n","")
+        str.strip!
+        str.squeeze!(" ")
+        str
+      end
+
+    end
+
+    # Locates a form field based on a <tt>label</tt> element in the HTML source.
+    # This can be useful in order to verify that a field is pre-filled with the
+    # correct value.
+    #
+    # Example:
+    #   field_labeled("First name").value.should == "Bryan"
+    def field_labeled(label, *field_types)
+      FieldLabeledLocator.new(@session, dom, label, *field_types).locate!
+    end
+
+  end
+end

data/lib/webrat/core/locators/field_locator.rb

@@ -1,25 +1,25 @@
-require "webrat/core/locators/locator"
-
-module Webrat
-  module Locators
-
-    class FieldLocator < Locator # :nodoc:
-
-      def locate
-        FieldByIdLocator.new(@session, @dom, @value).locate   ||
-        FieldNamedLocator.new(@session, @dom, @value, *@field_types).locate   ||
-        FieldLabeledLocator.new(@session, @dom, @value, *@field_types).locate
-      end
-
-      def error_message
-        "Could not find field: #{@value.inspect}"
-      end
-
-    end
-
-    def field(*args) # :nodoc:
-      FieldLocator.new(@session, dom, *args).locate!
-    end
-
-  end
-end
+require "webrat/core/locators/locator"
+
+module Webrat
+  module Locators
+
+    class FieldLocator < Locator # :nodoc:
+
+      def locate
+        FieldByIdLocator.new(@session, @dom, @value).locate   ||
+        FieldNamedLocator.new(@session, @dom, @value, *@field_types).locate   ||
+        FieldLabeledLocator.new(@session, @dom, @value, *@field_types).locate
+      end
+
+      def error_message
+        "Could not find field: #{@value.inspect}"
+      end
+
+    end
+
+    def field(*args) # :nodoc:
+      FieldLocator.new(@session, dom, *args).locate!
+    end
+
+  end
+end

data/lib/webrat/core/locators/field_named_locator.rb

@@ -1,41 +1,41 @@
-require "webrat/core/locators/locator"
-
-module Webrat
-  module Locators
-
-    class FieldNamedLocator < Locator # :nodoc:
-
-      def locate
-        Field.load(@session, field_element)
-      end
-
-      def field_element
-        field_elements.detect do |field_element|
-          field_element["name"] == @value.to_s
-        end
-      end
-
-      def field_elements
-        @dom.xpath(*xpath_searches)
-      end
-
-      def xpath_searches
-        if @field_types.any?
-          @field_types.map { |field_type| field_type.xpath_search }.flatten
-        else
-          Field.xpath_search
-        end
-      end
-
-      def error_message
-        "Could not find field named #{@value.inspect}"
-      end
-
-    end
-
-    def field_named(name, *field_types)
-      FieldNamedLocator.new(@session, dom, name, *field_types).locate!
-    end
-
-  end
-end
+require "webrat/core/locators/locator"
+
+module Webrat
+  module Locators
+
+    class FieldNamedLocator < Locator # :nodoc:
+
+      def locate
+        Field.load(@session, field_element)
+      end
+
+      def field_element
+        field_elements.detect do |field_element|
+          field_element["name"] == @value.to_s
+        end
+      end
+
+      def field_elements
+        @dom.xpath(*xpath_searches)
+      end
+
+      def xpath_searches
+        if @field_types.any?
+          @field_types.map { |field_type| field_type.xpath_search }.flatten
+        else
+          Field.xpath_search
+        end
+      end
+
+      def error_message
+        "Could not find field named #{@value.inspect}"
+      end
+
+    end
+
+    def field_named(name, *field_types)
+      FieldNamedLocator.new(@session, dom, name, *field_types).locate!
+    end
+
+  end
+end

data/lib/webrat/core/locators/form_locator.rb

@@ -1,19 +1,19 @@
-require "webrat/core/locators/locator"
-
-module Webrat
-  module Locators
-
-    class FormLocator < Locator # :nodoc:
-
-      def locate
-        Form.load(@session, form_element)
-      end
-
-      def form_element
-        @dom.css("#" + @value).first
-      end
-
-    end
-
-  end
-end
+require "webrat/core/locators/locator"
+
+module Webrat
+  module Locators
+
+    class FormLocator < Locator # :nodoc:
+
+      def locate
+        Form.load(@session, form_element)
+      end
+
+      def form_element
+        @dom.css("#" + @value).first
+      end
+
+    end
+
+  end
+end

data/lib/webrat/core/locators/label_locator.rb

@@ -1,34 +1,34 @@
-require "webrat/core_extensions/detect_mapped"
-require "webrat/core/locators/locator"
-
-module Webrat
-  module Locators
-
-    class LabelLocator < Locator # :nodoc:
-
-      def locate
-        Label.load(@session, label_element)
-      end
-
-      def label_element
-        label_elements.detect do |label_element|
-          text(label_element) =~ /^\W*#{Regexp.escape(@value.to_s)}(\b|\Z)/i
-        end
-      end
-
-      def label_elements
-        @dom.xpath(*Label.xpath_search)
-      end
-
-      def text(label_element)
-        str = label_element.inner_text
-        str.gsub!("\n","")
-        str.strip!
-        str.squeeze!(" ")
-        str
-      end
-
-    end
-
-  end
-end
+require "webrat/core_extensions/detect_mapped"
+require "webrat/core/locators/locator"
+
+module Webrat
+  module Locators
+
+    class LabelLocator < Locator # :nodoc:
+
+      def locate
+        Label.load(@session, label_element)
+      end
+
+      def label_element
+        label_elements.detect do |label_element|
+          text(label_element) =~ /^\W*#{Regexp.escape(@value.to_s)}(\b|\Z)/i
+        end
+      end
+
+      def label_elements
+        @dom.xpath(*Label.xpath_search)
+      end
+
+      def text(label_element)
+        str = label_element.inner_text
+        str.gsub!("\n","")
+        str.strip!
+        str.squeeze!(" ")
+        str
+      end
+
+    end
+
+  end
+end