emipair-webrat 0.0.1 → 0.5.3

data/lib/webrat.rb

@@ -1,31 +1,10 @@
-require "rubygems"
-
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
-
 module Webrat
   # The common base class for all exceptions raised by Webrat.
   class WebratError < StandardError
   end
-
-  VERSION = '0.4.4'
-
-  def self.require_xml
-    if on_java?
-      gem "nokogiri", ">= 1.2.4"
-    else
-      gem "nokogiri", ">= 1.0.6"
-    end
-
-    require "nokogiri"
-    require "webrat/core/xml/nokogiri"
-  end
-
-  def self.on_java?
-    RUBY_PLATFORM =~ /java/
-  end
-
 end
 
-Webrat.require_xml
-
+require "rack"
+require "nokogiri"
+require "webrat/core/xml/nokogiri"
 require "webrat/core"

data/lib/webrat/core/configuration.rb

@@ -57,6 +57,9 @@ module Webrat
     # Set the timeout for waiting for the browser process to start
     attr_accessor :selenium_browser_startup_timeout
 
+    # Set the default timeout for selenium waits
+    attr_accessor :selenium_timeout
+
     # How many redirects to the same URL should be halted as an infinite redirect
     # loop? Defaults to 10
     attr_accessor :infinite_redirect_limit
@@ -72,6 +75,7 @@ module Webrat
       self.infinite_redirect_limit = 10
       self.selenium_browser_key = '*firefox'
       self.selenium_browser_startup_timeout = 5
+      self.selenium_timeout = 5
     end
 
     def parse_with_nokogiri? #:nodoc:
@@ -91,7 +95,7 @@ module Webrat
       # with Merb 1.0.8 until it's updated to use the new Webrat.configure
       # syntax
       if @mode == :merb
-        require("webrat/merb_session")
+        require("webrat/merb_adapter")
       else
         require("webrat/#{mode}")
       end

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

@@ -87,10 +87,8 @@ module Webrat
         parse_rails_request_params("#{name}=#{escaped_value}")
       when :merb
         ::Merb::Parse.query("#{name}=#{escaped_value}")
-      when :mechanize
-        { name => value }
       else
-        { name => escaped_value }
+        { name => value }
       end
     end
 
@@ -368,6 +366,8 @@ module Webrat
       when :merb
         # TODO: support content_type
         File.new(@value)
+      when :rack
+        Rack::Test::UploadedFile.new(@value, content_type)
       end
     end
 

data/lib/webrat/core/logging.rb

@@ -1,3 +1,5 @@
+require "logger"
+
 module Webrat
   module Logging #:nodoc:
 
@@ -13,10 +15,7 @@ module Webrat
       when :merb
         Merb.logger
       else
-        @logger ||= begin
-          require "logger"
-          ::Logger.new("webrat.log")
-        end
+        @logger ||= ::Logger.new("webrat.log")
       end
     end
 

data/lib/webrat/core/methods.rb

@@ -16,10 +16,10 @@ module Webrat
     end
 
     def webrat_session
-      if Webrat.configuration.mode == :rack_test
-        @_webrat_session ||= ::Webrat::RackTestSession.new(rack_test_session)
-      else
-        @_webrat_session ||= ::Webrat.session_class.new(self)
+      @_webrat_session ||= begin
+        session = Webrat.session_class.new
+        session.adapter = Webrat.adapter_class.new(self) if session.respond_to?(:adapter=)
+        session
       end
     end
 

data/lib/webrat/core/mime.rb

@@ -1,29 +1,18 @@
 module Webrat #:nodoc:
   module MIME #:nodoc:
+    MIME_TYPES = Rack::Mime::MIME_TYPES.dup.merge(
+      ".multipart_form"   => "multipart/form-data",
+      ".url_encoded_form" => "application/x-www-form-urlencoded"
+    ).freeze
 
-    def self.mime_type(string_or_symbol) #:nodoc:
-      if string_or_symbol.is_a?(String)
-        string_or_symbol
-      else
-        case string_or_symbol
-        when :text              then "text/plain"
-        when :html              then "text/html"
-        when :js                then "text/javascript"
-        when :css               then "text/css"
-        when :ics               then "text/calendar"
-        when :csv               then "text/csv"
-        when :xml               then "application/xml"
-        when :rss               then "application/rss+xml"
-        when :atom              then "application/atom+xml"
-        when :yaml              then "application/x-yaml"
-        when :multipart_form    then "multipart/form-data"
-        when :url_encoded_form  then "application/x-www-form-urlencoded"
-        when :json              then "application/json"
-        else
-          raise ArgumentError.new("Invalid Mime type: #{string_or_symbol.inspect}")
-        end
-      end
+    def mime_type(type)
+      return type if type.nil? || type.to_s.include?("/")
+      type = ".#{type}" unless type.to_s[0] == ?.
+      MIME_TYPES.fetch(type) { |type|
+        raise ArgumentError.new("Invalid Mime type: #{type}")
+      }
     end
 
+    module_function :mime_type
   end
 end

data/lib/webrat/core/session.rb

@@ -13,21 +13,30 @@ module Webrat
   end
 
   def self.session_class
+    if Webrat.configuration.mode == :selenium
+      SeleniumSession
+    else
+      Session
+    end
+  end
+
+  def self.adapter_class
     case Webrat.configuration.mode
     when :rails
-      RailsSession
+      RailsAdapter
     when :merb
-      MerbSession
-    when :selenium
-      SeleniumSession
+      MerbAdapter
     when :rack
-      RackSession
+      RackAdapter
+    when :rack_test
+      warn("The :rack_test mode is deprecated. Please use :rack instead")
+      require "webrat/rack"
+      RackAdapter
     when :sinatra
-      SinatraSession
+      warn("The :sinatra mode is deprecated. Please use :rack instead")
+      SinatraAdapter
     when :mechanize
-      MechanizeSession
-    when :rack_test
-      RackTestSession
+      MechanizeAdapter
     else
       raise WebratError.new(<<-STR)
 Unknown Webrat mode: #{Webrat.configuration.mode.inspect}
@@ -50,16 +59,22 @@ For example:
     extend Forwardable
     include Logging
     include SaveAndOpenPage
+
+    attr_accessor :adapter
+
     attr_reader :current_url
     attr_reader :elements
 
-    def initialize(context = nil) #:nodoc:
+    def_delegators :@adapter, :response, :response_code, :response_body,
+      :response_body=, :response_code=,
+      :get, :post, :put, :delete
+
+    def initialize(adapter = nil)
+      @adapter         = adapter
       @http_method     = :get
       @data            = {}
       @default_headers = {}
       @custom_headers  = {}
-      @context         = context
-
       reset
     end
 

data/lib/webrat/mechanize.rb

@@ -1,11 +1,15 @@
 require "mechanize"
 
 module Webrat #:nodoc:
-  class MechanizeSession < Session #:nodoc:
+  class MechanizeAdapter #:nodoc:
+    extend Forwardable
 
     attr_accessor :response
     alias :page :response
 
+    def initialize(*args)
+    end
+
     def request_page(url, http_method, data) #:nodoc:
       super(absolute_url(url), http_method, data)
     end

data/lib/webrat/{merb_session.rb → merb_adapter.rb}

@@ -3,7 +3,7 @@ require "merb-core"
 require "webrat/merb_multipart_support"
 
 module Webrat
-  class MerbSession < Session #:nodoc:
+  class MerbAdapter #:nodoc:
     include Merb::Test::MakeRequest
 
     # Include Webrat's own version of multipart_post/put because the officially
@@ -12,6 +12,8 @@ module Webrat
 
     attr_accessor :response
 
+    def initialize(context=nil); end
+
     def get(url, data, headers = nil)
       do_request(url, data, headers, "GET")
     end
@@ -72,7 +74,7 @@ module Merb #:nodoc:
   module Test #:nodoc:
     module RequestHelper #:nodoc:
       def request(uri, env = {})
-        @_webrat_session ||= Webrat::MerbSession.new
+        @_webrat_session ||= Webrat::MerbAdapter.new
         @_webrat_session.response = @_webrat_session.request(uri, env)
       end
     end

data/lib/webrat/rack.rb

@@ -1,24 +1,25 @@
-require 'webrat'
+require "rack/test"
 
-class CGIMethods #:nodoc:
-  def self.parse_query_parameters(params)
-    hash = {}
-    params.split('&').each do |p|
-      pair = p.split('=')
-      hash[pair[0]] = pair[1]
+module Webrat
+  class RackAdapter
+    extend Forwardable
+
+    def_delegators :@session, :get, :post, :put, :delete
+
+    def initialize(session) #:nodoc:
+      @session = session
     end
-    hash
-  end
-end
 
-module Webrat
-  class RackSession < Session #:nodoc:
     def response_body
-      @response.body
+      response.body
     end
 
     def response_code
-      @response.status
+      response.status
+    end
+
+    def response
+      @session.last_response
     end
   end
 end

data/lib/webrat/rails.rb

@@ -1,13 +1,15 @@
 require "webrat"
 
-require "action_controller"
-require "action_controller/integration"
-require "action_controller/record_identifier"
-
 module Webrat
-  class RailsSession < Session #:nodoc:
+  class RailsAdapter #:nodoc:
     include ActionController::RecordIdentifier
 
+    attr_reader :integration_session
+
+    def initialize(session)
+      @integration_session = session
+    end
+
     # The Rails version of within supports passing in a model and Webrat
     # will apply a scope based on Rails' dom_id for that model.
     #
@@ -61,10 +63,6 @@ module Webrat
 
   protected
 
-    def integration_session
-      @context
-    end
-
     def do_request(http_method, url, data, headers) #:nodoc:
       update_protocol(url)
       integration_session.send(http_method, normalize_url(url), data, headers)
@@ -93,7 +91,6 @@ module Webrat
     def response #:nodoc:
       integration_session.response
     end
-
   end
 end
 

data/lib/webrat/selenium.rb

@@ -1,5 +1,4 @@
 require "webrat"
-gem "selenium-client", ">=1.2.16"
 require "selenium/client"
 require "webrat/selenium/silence_stream"
 require "webrat/selenium/selenium_session"

data/lib/webrat/selenium/selenium_session.rb

@@ -43,7 +43,7 @@ module Webrat
 
     def fill_in(field_identifier, options)
       locator = "webrat=#{field_identifier}"
-      selenium.wait_for_element locator, :timeout_in_seconds => 5
+      selenium.wait_for_element locator, :timeout_in_seconds => Webrat.configuration.selenium_timeout
       selenium.type(locator, "#{options[:with]}")
     end
 
@@ -70,7 +70,7 @@ module Webrat
       pattern ||= '*'
       locator = "button=#{pattern}"
 
-      selenium.wait_for_element locator, :timeout_in_seconds => 5
+      selenium.wait_for_element locator, :timeout_in_seconds => Webrat.configuration.selenium_timeout
       selenium.click locator
     end
 
@@ -79,7 +79,7 @@ module Webrat
     def click_link(link_text_or_regexp, options = {})
       pattern = adjust_if_regexp(link_text_or_regexp)
       locator = "webratlink=#{pattern}"
-      selenium.wait_for_element locator, :timeout_in_seconds => 5
+      selenium.wait_for_element locator, :timeout_in_seconds => Webrat.configuration.selenium_timeout
       selenium.click locator
     end
 
@@ -87,7 +87,7 @@ module Webrat
 
     def click_link_within(selector, link_text, options = {})
       locator = "webratlinkwithin=#{selector}|#{link_text}"
-      selenium.wait_for_element locator, :timeout_in_seconds => 5
+      selenium.wait_for_element locator, :timeout_in_seconds => Webrat.configuration.selenium_timeout
       selenium.click locator
     end
 
@@ -102,7 +102,7 @@ module Webrat
         select_locator = "webratselectwithoption=#{option_text}"
       end
 
-      selenium.wait_for_element select_locator, :timeout_in_seconds => 5
+      selenium.wait_for_element select_locator, :timeout_in_seconds => Webrat.configuration.selenium_timeout
       selenium.select(select_locator, option_text)
     end
 
@@ -110,7 +110,7 @@ module Webrat
 
     def choose(label_text)
       locator = "webrat=#{label_text}"
-      selenium.wait_for_element locator, :timeout_in_seconds => 5
+      selenium.wait_for_element locator, :timeout_in_seconds => Webrat.configuration.selenium_timeout
       selenium.click locator
     end
 
@@ -118,7 +118,7 @@ module Webrat
 
     def check(label_text)
       locator = "webrat=#{label_text}"
-      selenium.wait_for_element locator, :timeout_in_seconds => 5
+      selenium.wait_for_element locator, :timeout_in_seconds => Webrat.configuration.selenium_timeout
       selenium.click locator
     end
     alias_method :uncheck, :check
@@ -141,7 +141,7 @@ module Webrat
     end
 
     def wait_for(params={})
-      timeout = params[:timeout] || 5
+      timeout = params[:timeout] || Webrat.configuration.selenium_timeout
       message = params[:message] || "Timeout exceeded"
 
       begin_time = Time.now

data/lib/webrat/sinatra.rb

@@ -1,44 +1,11 @@
 require "webrat/rack"
-require "sinatra/test"
 
 module Webrat
-  class SinatraSession < RackSession
-    include Sinatra::Test
-
-    attr_reader :request, :response
-
-    def initialize(context = nil)
-      super(context)
-
+  class SinatraAdapter < RackAdapter
+    def initialize(context)
       app = context.respond_to?(:app) ? context.app : Sinatra::Application
-      @browser = Sinatra::TestHarness.new(app)
-    end
-
-    %w(get head post put delete).each do |verb|
-      class_eval <<-RUBY
-        def #{verb}(path, data, headers = {})
-          params = data.inject({}) do |data, (key,value)|
-            data[key] = Rack::Utils.unescape(value)
-            data
-          end
-          headers["HTTP_HOST"] = "www.example.com"
-          @browser.#{verb}(path, params, headers)
-        end
-      RUBY
-    end
-
-    def response_body
-      @browser.body
-    end
 
-    def response_code
-      @browser.status
+      super(Rack::Test::Session.new(Rack::MockSession.new(app, "www.example.com")))
     end
-
-    private
-
-      def response
-        @browser.response
-      end
   end
 end