mkuklis-webrat 0.5.1 → 0.6.rc1

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

@@ -1,74 +1,74 @@
-require "webrat/core/locators/locator"
-
-module Webrat
-  module Locators
-
-    class LinkLocator < Locator # :nodoc:
-
-      def locate
-        Link.load(@session, link_element)
-      end
-
-      def link_element
-        matching_links.min { |a, b| a.inner_text.length <=> b.inner_text.length }
-      end
-
-      def matching_links
-        @matching_links ||= link_elements.select do |link_element|
-          matches_text?(link_element) ||
-          matches_id?(link_element)
-        end
-      end
-
-      def matches_text?(link)
-        if @value.is_a?(Regexp)
-          matcher = @value
-        else
-          matcher = /#{Regexp.escape(@value.to_s)}/i
-        end
-
-        replace_nbsp(link.inner_text) =~ matcher ||
-        replace_nbsp_ref(link.inner_html) =~ matcher ||
-        link["title"] =~ matcher
-      end
-
-      def matches_id?(link)
-        if @value.is_a?(Regexp)
-          link["id"] =~ @value ? true : false
-        else
-          link["id"] == @value ? true : false
-        end
-      end
-
-      def link_elements
-        @dom.xpath(*Link.xpath_search)
-      end
-
-      def replace_nbsp(str)
-        if str.respond_to?(:valid_encoding?)
-          if str.valid_encoding?
-            str.gsub(/\xc2\xa0/u, ' ')
-          else
-            str.force_encoding('UTF-8').gsub(/\xc2\xa0/u, ' ')
-          end
-        else
-          str.gsub(/\xc2\xa0/u, ' ')
-        end
-      end
-
-      def replace_nbsp_ref(str)
-        str.gsub('&#xA0;',' ').gsub('&nbsp;', ' ')
-      end
-
-      def error_message
-        "Could not find link with text or title or id #{@value.inspect}"
-      end
-
-    end
-
-    def find_link(text_or_title_or_id) #:nodoc:
-      LinkLocator.new(@session, dom, text_or_title_or_id).locate!
-    end
-
-  end
-end
+require "webrat/core/locators/locator"
+
+module Webrat
+  module Locators
+
+    class LinkLocator < Locator # :nodoc:
+
+      def locate
+        Link.load(@session, link_element)
+      end
+
+      def link_element
+        matching_links.min { |a, b| a.inner_text.length <=> b.inner_text.length }
+      end
+
+      def matching_links
+        @matching_links ||= link_elements.select do |link_element|
+          matches_text?(link_element) ||
+          matches_id?(link_element)
+        end
+      end
+
+      def matches_text?(link)
+        if @value.is_a?(Regexp)
+          matcher = @value
+        else
+          matcher = /#{Regexp.escape(@value.to_s)}/i
+        end
+
+        replace_nbsp(link.inner_text) =~ matcher ||
+        replace_nbsp_ref(link.inner_html) =~ matcher ||
+        link["title"] =~ matcher
+      end
+
+      def matches_id?(link)
+        if @value.is_a?(Regexp)
+          link["id"] =~ @value ? true : false
+        else
+          link["id"] == @value ? true : false
+        end
+      end
+
+      def link_elements
+        @dom.xpath(*Link.xpath_search)
+      end
+
+      def replace_nbsp(str)
+        if str.respond_to?(:valid_encoding?)
+          if str.valid_encoding?
+            str.gsub(/\xc2\xa0/u, ' ')
+          else
+            str.force_encoding('UTF-8').gsub(/\xc2\xa0/u, ' ')
+          end
+        else
+          str.gsub(/\xc2\xa0/u, ' ')
+        end
+      end
+
+      def replace_nbsp_ref(str)
+        str.gsub('&#xA0;',' ').gsub('&nbsp;', ' ')
+      end
+
+      def error_message
+        "Could not find link with text or title or id #{@value.inspect}"
+      end
+
+    end
+
+    def find_link(text_or_title_or_id) #:nodoc:
+      LinkLocator.new(@session, dom, text_or_title_or_id).locate!
+    end
+
+  end
+end

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

@@ -1,20 +1,20 @@
-module Webrat
-  module Locators
-
-    class Locator # :nodoc:
-
-      def initialize(session, dom, value, *field_types)
-        @session = session
-        @dom = dom
-        @value = value
-        @field_types = field_types
-      end
-
-      def locate!
-        locate || raise(NotFoundError.new(error_message))
-      end
-
-    end
-
-  end
-end
+module Webrat
+  module Locators
+
+    class Locator # :nodoc:
+
+      def initialize(session, dom, value, *field_types)
+        @session = session
+        @dom = dom
+        @value = value
+        @field_types = field_types
+      end
+
+      def locate!
+        locate || raise(NotFoundError.new(error_message))
+      end
+
+    end
+
+  end
+end

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

@@ -1,59 +1,59 @@
-require "webrat/core_extensions/detect_mapped"
-require "webrat/core/locators/locator"
-
-module Webrat
-  module Locators
-
-    class SelectOptionLocator < Locator # :nodoc:
-
-      def initialize(session, dom, option_text, id_or_name_or_label)
-        @session = session
-        @dom = dom
-        @option_text = option_text
-        @id_or_name_or_label = id_or_name_or_label
-      end
-
-      def locate
-        if @id_or_name_or_label
-          field = FieldLocator.new(@session, @dom, @id_or_name_or_label, SelectField).locate!
-
-          field.options.detect do |o|
-            if @option_text.is_a?(Regexp)
-              o.element.inner_text =~ @option_text
-            else
-              o.inner_text == @option_text.to_s
-            end
-          end
-        else
-          option_element = option_elements.detect do |o|
-            if @option_text.is_a?(Regexp)
-              o.inner_text =~ @option_text
-            else
-              o.inner_text == @option_text.to_s
-            end
-          end
-
-          SelectOption.load(@session, option_element)
-        end
-      end
-
-      def option_elements
-        @dom.xpath(*SelectOption.xpath_search)
-      end
-
-      def error_message
-        if @id_or_name_or_label
-          "The '#{@option_text}' option was not found in the #{@id_or_name_or_label.inspect} select box"
-        else
-          "Could not find option #{@option_text.inspect}"
-        end
-      end
-
-    end
-
-    def select_option(option_text, id_or_name_or_label = nil) #:nodoc:
-      SelectOptionLocator.new(@session, dom, option_text, id_or_name_or_label).locate!
-    end
-
-  end
-end
+require "webrat/core_extensions/detect_mapped"
+require "webrat/core/locators/locator"
+
+module Webrat
+  module Locators
+
+    class SelectOptionLocator < Locator # :nodoc:
+
+      def initialize(session, dom, option_text, id_or_name_or_label)
+        @session = session
+        @dom = dom
+        @option_text = option_text
+        @id_or_name_or_label = id_or_name_or_label
+      end
+
+      def locate
+        if @id_or_name_or_label
+          field = FieldLocator.new(@session, @dom, @id_or_name_or_label, SelectField).locate!
+
+          field.options.detect do |o|
+            if @option_text.is_a?(Regexp)
+              o.element.inner_text =~ @option_text
+            else
+              o.inner_text == @option_text.to_s
+            end
+          end
+        else
+          option_element = option_elements.detect do |o|
+            if @option_text.is_a?(Regexp)
+              o.inner_text =~ @option_text
+            else
+              o.inner_text == @option_text.to_s
+            end
+          end
+
+          SelectOption.load(@session, option_element)
+        end
+      end
+
+      def option_elements
+        @dom.xpath(*SelectOption.xpath_search)
+      end
+
+      def error_message
+        if @id_or_name_or_label
+          "The '#{@option_text}' option was not found in the #{@id_or_name_or_label.inspect} select box"
+        else
+          "Could not find option #{@option_text.inspect}"
+        end
+      end
+
+    end
+
+    def select_option(option_text, id_or_name_or_label = nil) #:nodoc:
+      SelectOptionLocator.new(@session, dom, option_text, id_or_name_or_label).locate!
+    end
+
+  end
+end

data/lib/webrat/core/locators.rb

@@ -1,20 +1,20 @@
-require "webrat/core/locators/area_locator"
-require "webrat/core/locators/button_locator"
-require "webrat/core/locators/field_labeled_locator"
-require "webrat/core/locators/label_locator"
-require "webrat/core/locators/field_named_locator"
-require "webrat/core/locators/field_by_id_locator"
-require "webrat/core/locators/select_option_locator"
-require "webrat/core/locators/link_locator"
-require "webrat/core/locators/field_locator"
-require "webrat/core/locators/form_locator"
-
-module Webrat
-  module Locators
-
-    def field_by_xpath(xpath)
-      Field.load(@session, dom.xpath(xpath).first)
-    end
-
-  end
-end
+require "webrat/core/locators/area_locator"
+require "webrat/core/locators/button_locator"
+require "webrat/core/locators/field_labeled_locator"
+require "webrat/core/locators/label_locator"
+require "webrat/core/locators/field_named_locator"
+require "webrat/core/locators/field_by_id_locator"
+require "webrat/core/locators/select_option_locator"
+require "webrat/core/locators/link_locator"
+require "webrat/core/locators/field_locator"
+require "webrat/core/locators/form_locator"
+
+module Webrat
+  module Locators
+
+    def field_by_xpath(xpath)
+      Field.load(@session, dom.xpath(xpath).first)
+    end
+
+  end
+end

data/lib/webrat/core/logging.rb

@@ -1,23 +1,23 @@
-require "logger"
-
-module Webrat
-  module Logging #:nodoc:
-
-    def debug_log(message) # :nodoc:
-      return unless logger
-      logger.debug message
-    end
-
-    def logger # :nodoc:
-      case Webrat.configuration.mode
-      when :rails
-        defined?(RAILS_DEFAULT_LOGGER) ? RAILS_DEFAULT_LOGGER : nil
-      when :merb
-        ::Merb.logger
-      else
-        @logger ||= ::Logger.new("webrat.log")
-      end
-    end
-
-  end
-end
+require "logger"
+
+module Webrat
+  module Logging #:nodoc:
+
+    def debug_log(message) # :nodoc:
+      return unless logger
+      logger.debug message
+    end
+
+    def logger # :nodoc:
+      case Webrat.configuration.mode
+      when :rails
+        defined?(RAILS_DEFAULT_LOGGER) ? RAILS_DEFAULT_LOGGER : nil
+      when :merb
+        ::Merb.logger
+      else
+        @logger ||= ::Logger.new("webrat.log")
+      end
+    end
+
+  end
+end

data/lib/webrat/core/matchers/have_content.rb

@@ -1,68 +1,68 @@
-module Webrat
-  module Matchers
-
-    class HasContent #:nodoc:
-      def initialize(content)
-        @content = content
-      end
-
-      def matches?(stringlike)
-        @document = Webrat::XML.document(stringlike)
-        @element = @document.inner_text
-
-        case @content
-        when String
-          @element.include?(@content)
-        when Regexp
-          @element.match(@content)
-        end
-      end
-
-      # ==== Returns
-      # String:: The failure message.
-      def failure_message
-        "expected the following element's content to #{content_message}:\n#{squeeze_space(@element)}"
-      end
-
-      # ==== Returns
-      # String:: The failure message to be displayed in negative matches.
-      def negative_failure_message
-        "expected the following element's content to not #{content_message}:\n#{squeeze_space(@element)}"
-      end
-
-      def squeeze_space(inner_text)
-        inner_text.gsub(/^\s*$/, "").squeeze("\n")
-      end
-
-      def content_message
-        case @content
-        when String
-          "include \"#{@content}\""
-        when Regexp
-          "match #{@content.inspect}"
-        end
-      end
-    end
-
-    # Matches the contents of an HTML document with
-    # whatever string is supplied
-    def contain(content)
-      HasContent.new(content)
-    end
-
-    # Asserts that the body of the response contain
-    # the supplied string or regexp
-    def assert_contain(content)
-      hc = HasContent.new(content)
-      assert hc.matches?(response_body), hc.failure_message
-    end
-
-    # Asserts that the body of the response
-    # does not contain the supplied string or regepx
-    def assert_not_contain(content)
-      hc = HasContent.new(content)
-      assert !hc.matches?(response_body), hc.negative_failure_message
-    end
-
-  end
-end
+module Webrat
+  module Matchers
+
+    class HasContent #:nodoc:
+      def initialize(content)
+        @content = content
+      end
+
+      def matches?(stringlike)
+        @document = Webrat::XML.document(stringlike)
+        @element = @document.inner_text
+
+        case @content
+        when String
+          @element.include?(@content)
+        when Regexp
+          @element.match(@content)
+        end
+      end
+
+      # ==== Returns
+      # String:: The failure message.
+      def failure_message
+        "expected the following element's content to #{content_message}:\n#{squeeze_space(@element)}"
+      end
+
+      # ==== Returns
+      # String:: The failure message to be displayed in negative matches.
+      def negative_failure_message
+        "expected the following element's content to not #{content_message}:\n#{squeeze_space(@element)}"
+      end
+
+      def squeeze_space(inner_text)
+        inner_text.gsub(/^\s*$/, "").squeeze("\n")
+      end
+
+      def content_message
+        case @content
+        when String
+          "include \"#{@content}\""
+        when Regexp
+          "match #{@content.inspect}"
+        end
+      end
+    end
+
+    # Matches the contents of an HTML document with
+    # whatever string is supplied
+    def contain(content)
+      HasContent.new(content)
+    end
+
+    # Asserts that the body of the response contain
+    # the supplied string or regexp
+    def assert_contain(content)
+      hc = HasContent.new(content)
+      assert hc.matches?(response_body), hc.failure_message
+    end
+
+    # Asserts that the body of the response
+    # does not contain the supplied string or regepx
+    def assert_not_contain(content)
+      hc = HasContent.new(content)
+      assert !hc.matches?(response_body), hc.negative_failure_message
+    end
+
+  end
+end