mkuklis-webrat 0.5.1 → 0.6.rc1

data/lib/webrat/core/elements/form.rb

@@ -1,103 +1,103 @@
-require "webrat/core/elements/field"
-require "webrat/core_extensions/blank"
-
-require "webrat/core/elements/element"
-require "webrat/core/locators/field_named_locator"
-
-module Webrat
-  class Form < Element #:nodoc:
-    attr_reader :element
-
-    def self.xpath_search
-      [".//form"]
-    end
-
-    def fields
-      @fields ||= Field.load_all(@session, @element)
-    end
-
-    def submit
-      @session.request_page(form_action, form_method, params)
-    end
-
-    def field_named(name, *field_types)
-      Webrat::Locators::FieldNamedLocator.new(@session, dom, name, *field_types).locate
-    end
-
-  protected
-
-    def dom
-      @session.dom.xpath(path).first
-    end
-
-    def fields_by_type(field_types)
-      if field_types.any?
-        fields.select { |f| field_types.include?(f.class) }
-      else
-        fields
-      end
-    end
-
-    def params
-      all_params = {}
-
-      fields.each do |field|
-        next if field.to_param.nil?
-        merge(all_params, field.to_param)
-      end
-
-      all_params
-    end
-
-    def form_method
-      @element["method"].blank? ? :get : @element["method"].downcase
-    end
-
-    def form_action
-      @element["action"].blank? ? @session.current_url : @element["action"]
-    end
-
-    def merge(all_params, new_param)
-      new_param.each do |key, value|
-        case all_params[key]
-        when *hash_classes
-          merge_hash_values(all_params[key], value)
-        when Array
-          all_params[key] += value
-        else
-          all_params[key] = value
-        end
-      end
-    end
-
-    def merge_hash_values(a, b) # :nodoc:
-      a.keys.each do |k|
-        if b.has_key?(k)
-          case [a[k], b[k]].map{|value| value.class}
-          when *hash_classes.zip(hash_classes)
-            a[k] = merge_hash_values(a[k], b[k])
-            b.delete(k)
-          when [Array, Array]
-            a[k] += b[k]
-            b.delete(k)
-          end
-        end
-      end
-      a.merge!(b)
-    end
-
-    def hash_classes
-      klasses = [Hash]
-
-      case Webrat.configuration.mode
-      when :rails
-        klasses << HashWithIndifferentAccess
-      when :merb
-        klasses << Mash
-      end
-
-      klasses
-    end
-
-  end
-end
+require "webrat/core/elements/field"
+require "webrat/core_extensions/blank"
+
+require "webrat/core/elements/element"
+require "webrat/core/locators/field_named_locator"
+
+module Webrat
+  class Form < Element #:nodoc:
+    attr_reader :element
+
+    def self.xpath_search
+      [".//form"]
+    end
+
+    def fields
+      @fields ||= Field.load_all(@session, @element)
+    end
+
+    def submit
+      @session.request_page(form_action, form_method, params)
+    end
+
+    def field_named(name, *field_types)
+      Webrat::Locators::FieldNamedLocator.new(@session, dom, name, *field_types).locate
+    end
+
+  protected
+
+    def dom
+      @session.dom.xpath(path).first
+    end
+
+    def fields_by_type(field_types)
+      if field_types.any?
+        fields.select { |f| field_types.include?(f.class) }
+      else
+        fields
+      end
+    end
+
+    def params
+      all_params = {}
+
+      fields.each do |field|
+        next if field.to_param.nil?
+        merge(all_params, field.to_param)
+      end
+
+      all_params
+    end
+
+    def form_method
+      @element["method"].blank? ? :get : @element["method"].downcase
+    end
+
+    def form_action
+      @element["action"].blank? ? @session.current_url : @element["action"]
+    end
+
+    def merge(all_params, new_param)
+      new_param.each do |key, value|
+        case all_params[key]
+        when *hash_classes
+          merge_hash_values(all_params[key], value)
+        when Array
+          all_params[key] += value
+        else
+          all_params[key] = value
+        end
+      end
+    end
+
+    def merge_hash_values(a, b) # :nodoc:
+      a.keys.each do |k|
+        if b.has_key?(k)
+          case [a[k], b[k]].map{|value| value.class}
+          when *hash_classes.zip(hash_classes)
+            a[k] = merge_hash_values(a[k], b[k])
+            b.delete(k)
+          when [Array, Array]
+            a[k] += b[k]
+            b.delete(k)
+          end
+        end
+      end
+      a.merge!(b)
+    end
+
+    def hash_classes
+      klasses = [Hash]
+
+      case Webrat.configuration.mode
+      when :rails
+        klasses << HashWithIndifferentAccess
+      when :merb
+        klasses << Mash
+      end
+
+      klasses
+    end
+
+  end
+end

data/lib/webrat/core/elements/label.rb

@@ -1,31 +1,31 @@
-require "webrat/core/elements/element"
-
-module Webrat
-  class Label < Element #:nodoc:
-
-    attr_reader :element
-
-    def self.xpath_search
-      [".//label"]
-    end
-
-    def for_id
-      @element["for"]
-    end
-
-    def field
-      Field.load(@session, field_element)
-    end
-
-  protected
-
-    def field_element
-      if for_id.blank?
-        @element.xpath(*Field.xpath_search_excluding_hidden).first
-      else
-        @session.current_dom.css("#" + for_id).first
-      end
-    end
-
-  end
-end
+require "webrat/core/elements/element"
+
+module Webrat
+  class Label < Element #:nodoc:
+
+    attr_reader :element
+
+    def self.xpath_search
+      [".//label"]
+    end
+
+    def for_id
+      @element["for"]
+    end
+
+    def field
+      Field.load(@session, field_element)
+    end
+
+  protected
+
+    def field_element
+      if for_id.blank?
+        @element.xpath(*Field.xpath_search_excluding_hidden).first
+      else
+        @session.current_dom.css("#" + for_id).first
+      end
+    end
+
+  end
+end

data/lib/webrat/core/elements/link.rb

@@ -1,93 +1,93 @@
-require "English"
-
-require "webrat/core_extensions/blank"
-require "webrat/core/elements/element"
-
-module Webrat
-  class Link < Element #:nodoc:
-
-    def self.xpath_search
-      [".//a[@href]"]
-    end
-
-    def click(options = {})
-      method = options[:method] || http_method
-      return if href =~ /^#/ && method == :get
-
-      options[:javascript] = true if options[:javascript].nil?
-
-      if options[:javascript]
-        @session.request_page(absolute_href, method, data)
-      else
-        @session.request_page(absolute_href, :get, {})
-      end
-    end
-
-  protected
-
-    def id
-      @element["id"]
-    end
-
-    def data
-      authenticity_token.blank? ? {} : {"authenticity_token" => authenticity_token}
-    end
-
-    def title
-      @element["title"]
-    end
-
-    def href
-      @element["href"]
-    end
-
-    def absolute_href
-      if href =~ /^\?/
-        "#{@session.current_url}#{href}"
-      elsif href !~ %r{^https?://} && (href !~ /^\//)
-        "#{@session.current_url}/#{href}"
-      else
-        href
-      end
-    end
-
-    def authenticity_token
-      return unless onclick && onclick.include?("s.setAttribute('name', 'authenticity_token');") &&
-        onclick =~ /s\.setAttribute\('value', '([a-f0-9]{40})'\);/
-      $LAST_MATCH_INFO.captures.first
-    end
-
-    def onclick
-      @element["onclick"]
-    end
-
-    def http_method
-      if !onclick.blank? && onclick.include?("f.submit()")
-        http_method_from_js_form
-      else
-        :get
-      end
-    end
-
-    def http_method_from_js_form
-      if onclick.include?("m.setAttribute('name', '_method')")
-        http_method_from_fake_method_param
-      else
-        :post
-      end
-    end
-
-    def http_method_from_fake_method_param
-      if onclick.include?("m.setAttribute('value', 'delete')")
-        :delete
-      elsif onclick.include?("m.setAttribute('value', 'put')")
-        :put
-      elsif onclick.include?("m.setAttribute('value', 'post')")
-        :post
-      else
-        raise Webrat::WebratError.new("No HTTP method for _method param in #{onclick.inspect}")
-      end
-    end
-
-  end
-end
+require "English"
+
+require "webrat/core_extensions/blank"
+require "webrat/core/elements/element"
+
+module Webrat
+  class Link < Element #:nodoc:
+
+    def self.xpath_search
+      [".//a[@href]"]
+    end
+
+    def click(options = {})
+      method = options[:method] || http_method
+      return if href =~ /^#/ && method == :get
+
+      options[:javascript] = true if options[:javascript].nil?
+
+      if options[:javascript]
+        @session.request_page(absolute_href, method, data)
+      else
+        @session.request_page(absolute_href, :get, {})
+      end
+    end
+
+  protected
+
+    def id
+      @element["id"]
+    end
+
+    def data
+      authenticity_token.blank? ? {} : {"authenticity_token" => authenticity_token}
+    end
+
+    def title
+      @element["title"]
+    end
+
+    def href
+      @element["href"]
+    end
+
+    def absolute_href
+      if href =~ /^\?/
+        "#{@session.current_url}#{href}"
+      elsif href !~ %r{^https?://} && (href !~ /^\//)
+        "#{@session.current_url}/#{href}"
+      else
+        href
+      end
+    end
+
+    def authenticity_token
+      return unless onclick && onclick.include?("s.setAttribute('name', 'authenticity_token');") &&
+        onclick =~ /s\.setAttribute\('value', '([a-f0-9]{40})'\);/
+      $LAST_MATCH_INFO.captures.first
+    end
+
+    def onclick
+      @element["onclick"]
+    end
+
+    def http_method
+      if !onclick.blank? && onclick.include?("f.submit()")
+        http_method_from_js_form
+      else
+        :get
+      end
+    end
+
+    def http_method_from_js_form
+      if onclick.include?("m.setAttribute('name', '_method')")
+        http_method_from_fake_method_param
+      else
+        :post
+      end
+    end
+
+    def http_method_from_fake_method_param
+      if onclick.include?("m.setAttribute('value', 'delete')")
+        :delete
+      elsif onclick.include?("m.setAttribute('value', 'put')")
+        :put
+      elsif onclick.include?("m.setAttribute('value', 'post')")
+        :post
+      else
+        raise Webrat::WebratError.new("No HTTP method for _method param in #{onclick.inspect}")
+      end
+    end
+
+  end
+end

data/lib/webrat/core/elements/select_option.rb

@@ -1,48 +1,48 @@
-require "webrat/core/elements/element"
-
-module Webrat
-  class SelectOption < Element #:nodoc:
-
-    def self.xpath_search
-      [".//option"]
-    end
-
-    def choose
-      select.raise_error_if_disabled
-      select.set(value)
-    end
-
-    def unchoose
-      select.raise_error_if_disabled
-      select.unset(value)
-    end
-
-    def inner_text
-      @element.inner_text
-    end
-
-  protected
-
-    def select
-      SelectField.load(@session, select_element)
-    end
-
-    def select_element
-      parent = @element.parent
-
-      while parent.respond_to?(:parent)
-        return parent if parent.name == 'select'
-        parent = parent.parent
-      end
-    end
-
-    def value
-      @element["value"] || @element.inner_html
-    end
-
-    def label
-      @element.inner_html
-    end
-
-  end
-end
+require "webrat/core/elements/element"
+
+module Webrat
+  class SelectOption < Element #:nodoc:
+
+    def self.xpath_search
+      [".//option"]
+    end
+
+    def choose
+      select.raise_error_if_disabled
+      select.set(value)
+    end
+
+    def unchoose
+      select.raise_error_if_disabled
+      select.unset(value)
+    end
+
+    def inner_text
+      @element.inner_text
+    end
+
+  protected
+
+    def select
+      SelectField.load(@session, select_element)
+    end
+
+    def select_element
+      parent = @element.parent
+
+      while parent.respond_to?(:parent)
+        return parent if parent.name == 'select'
+        parent = parent.parent
+      end
+    end
+
+    def value
+      @element["value"] || @element.inner_html
+    end
+
+    def label
+      @element.inner_html
+    end
+
+  end
+end

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

@@ -1,38 +1,38 @@
-require "webrat/core/locators/locator"
-
-module Webrat
-  module Locators
-
-    class AreaLocator < Locator # :nodoc:
-
-      def locate
-        Area.load(@session, area_element)
-      end
-
-      def area_element
-        area_elements.detect do |area_element|
-          area_element["title"] =~ matcher ||
-          area_element["id"] =~ matcher
-        end
-      end
-
-      def matcher
-        /#{Regexp.escape(@value.to_s)}/i
-      end
-
-      def area_elements
-        @dom.xpath(*Area.xpath_search)
-      end
-
-      def error_message
-        "Could not find area with name #{@value}"
-      end
-
-    end
-
-    def find_area(id_or_title) #:nodoc:
-      AreaLocator.new(@session, dom, id_or_title).locate!
-    end
-
-  end
-end
+require "webrat/core/locators/locator"
+
+module Webrat
+  module Locators
+
+    class AreaLocator < Locator # :nodoc:
+
+      def locate
+        Area.load(@session, area_element)
+      end
+
+      def area_element
+        area_elements.detect do |area_element|
+          area_element["title"] =~ matcher ||
+          area_element["id"] =~ matcher
+        end
+      end
+
+      def matcher
+        /#{Regexp.escape(@value.to_s)}/i
+      end
+
+      def area_elements
+        @dom.xpath(*Area.xpath_search)
+      end
+
+      def error_message
+        "Could not find area with name #{@value}"
+      end
+
+    end
+
+    def find_area(id_or_title) #:nodoc:
+      AreaLocator.new(@session, dom, id_or_title).locate!
+    end
+
+  end
+end