mkuklis-webrat 0.5.1 → 0.6.rc1

data/lib/webrat/adapters/mechanize.rb

@@ -1,78 +1,78 @@
-require "mechanize"
-
-module Webrat #: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
-
-    def get(url, data, headers_argument_not_used = nil)
-      @response = mechanize.get(url, data)
-    end
-
-    def post(url, data, headers_argument_not_used = nil)
-      post_data = data.inject({}) do |memo, param|
-        case param.last
-        when Hash
-          param.last.each {|attribute, value| memo["#{param.first}[#{attribute}]"] = value }
-        else
-          memo[param.first] = param.last
-        end
-        memo
-      end
-      @response = mechanize.post(url, post_data)
-    end
-
-    def response_body
-      @response.content
-    end
-
-    def response_code
-      @response.code.to_i
-    end
-
-    def mechanize
-      @mechanize ||= WWW::Mechanize.new
-    end
-
-    def_delegators :mechanize, :basic_auth
-
-    def absolute_url(url) #:nodoc:
-      current_host, current_path = split_current_url
-      if url =~ Regexp.new('^https?://')
-        url
-      elsif url =~ Regexp.new('^/')
-        current_host + url
-      elsif url =~ Regexp.new('^\.')
-        current_host + absolute_path(current_path, url)
-      else
-        url
-      end
-    end
-
-    private
-      def split_current_url
-        current_url =~ Regexp.new('^(https?://[^/]+)(/.*)?')
-        [Regexp.last_match(1), Regexp.last_match(2)]
-      end
-
-      def absolute_path(current_path, url)
-        levels_up = url.split('/').find_all { |x| x == '..' }.size
-        ancestor = if current_path.nil?
-          ""
-        else
-          current_path.split("/")[0..(-1 - levels_up)].join("/")
-        end
-        descendent = url.split("/")[levels_up..-1].join
-        "#{ancestor}/#{descendent}"
-      end
-  end
-end
+require "mechanize"
+
+module Webrat #: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
+
+    def get(url, data, headers_argument_not_used = nil)
+      @response = mechanize.get(url, data)
+    end
+
+    def post(url, data, headers_argument_not_used = nil)
+      post_data = data.inject({}) do |memo, param|
+        case param.last
+        when Hash
+          param.last.each {|attribute, value| memo["#{param.first}[#{attribute}]"] = value }
+        else
+          memo[param.first] = param.last
+        end
+        memo
+      end
+      @response = mechanize.post(url, post_data)
+    end
+
+    def response_body
+      @response.content
+    end
+
+    def response_code
+      @response.code.to_i
+    end
+
+    def mechanize
+      @mechanize ||= WWW::Mechanize.new
+    end
+
+    def_delegators :mechanize, :basic_auth
+
+    def absolute_url(url) #:nodoc:
+      current_host, current_path = split_current_url
+      if url =~ Regexp.new('^https?://')
+        url
+      elsif url =~ Regexp.new('^/')
+        current_host + url
+      elsif url =~ Regexp.new('^\.')
+        current_host + absolute_path(current_path, url)
+      else
+        url
+      end
+    end
+
+    private
+      def split_current_url
+        current_url =~ Regexp.new('^(https?://[^/]+)(/.*)?')
+        [Regexp.last_match(1), Regexp.last_match(2)]
+      end
+
+      def absolute_path(current_path, url)
+        levels_up = url.split('/').find_all { |x| x == '..' }.size
+        ancestor = if current_path.nil?
+          ""
+        else
+          current_path.split("/")[0..(-1 - levels_up)].join("/")
+        end
+        descendent = url.split("/")[levels_up..-1].join
+        "#{ancestor}/#{descendent}"
+      end
+  end
+end

data/lib/webrat/adapters/merb.rb

@@ -1,11 +1,11 @@
-require "webrat/integrations/merb"
-
-module Webrat
-  class MerbAdapter < RackAdapter #:nodoc:
-    def initialize(context=nil)
-      app = context.respond_to?(:app) ?
-        context.app : Merb::Rack::Application.new
-      super(Rack::Test::Session.new(Rack::MockSession.new(app, "www.example.com")))
-    end
-  end
-end
+require "webrat/integrations/merb"
+
+module Webrat
+  class MerbAdapter < RackAdapter #:nodoc:
+    def initialize(context=nil)
+      app = context.respond_to?(:app) ?
+        context.app : Merb::Rack::Application.new
+      super(Rack::Test::Session.new(Rack::MockSession.new(app, "www.example.com")))
+    end
+  end
+end

data/lib/webrat/adapters/rack.rb

@@ -1,25 +1,25 @@
-require "rack/test"
-
-module Webrat
-  class RackAdapter
-    extend Forwardable
-
-    def_delegators :@session, :get, :post, :put, :delete
-
-    def initialize(session) #:nodoc:
-      @session = session
-    end
-
-    def response_body
-      response.body
-    end
-
-    def response_code
-      response.status
-    end
-
-    def response
-      @session.last_response
-    end
-  end
-end
+require "rack/test"
+
+module Webrat
+  class RackAdapter
+    extend Forwardable
+
+    def_delegators :@session, :get, :post, :put, :delete
+
+    def initialize(session) #:nodoc:
+      @session = session
+    end
+
+    def response_body
+      response.body
+    end
+
+    def response_code
+      response.status
+    end
+
+    def response
+      @session.last_response
+    end
+  end
+end

data/lib/webrat/adapters/rails.rb

@@ -1,81 +1,81 @@
-require "webrat/integrations/rails"
-require "action_controller/record_identifier"
-
-module Webrat
-  class RailsAdapter #:nodoc:
-    include ActionController::RecordIdentifier
-
-    attr_reader :integration_session
-
-    def initialize(session)
-      @integration_session = session
-    end
-
-    def doc_root
-      File.expand_path(File.join(RAILS_ROOT, 'public'))
-    end
-
-    def saved_page_dir
-      File.expand_path(File.join(RAILS_ROOT, "tmp"))
-    end
-
-    def get(url, data, headers = nil)
-      do_request(:get, url, data, headers)
-    end
-
-    def post(url, data, headers = nil)
-      do_request(:post, url, data, headers)
-    end
-
-    def put(url, data, headers = nil)
-      do_request(:put, url, data, headers)
-    end
-
-    def delete(url, data, headers = nil)
-      do_request(:delete, url, data, headers)
-    end
-
-    def response_body
-      response.body
-    end
-
-    def response_code
-      response.code.to_i
-    end
-
-    def xml_content_type?
-      response.headers["Content-Type"].to_s =~ /xml/
-    end
-
-  protected
-
-    def do_request(http_method, url, data, headers) #:nodoc:
-      update_protocol(url)
-      integration_session.send(http_method, normalize_url(url), data, headers)
-    end
-
-    # remove protocol, host and anchor
-    def normalize_url(href) #:nodoc:
-      uri = URI.parse(href)
-      normalized_url = []
-      normalized_url << "#{uri.scheme}://" if uri.scheme
-      normalized_url << uri.host if uri.host
-      normalized_url << ":#{uri.port}" if uri.port && ![80,443].include?(uri.port)
-      normalized_url << uri.path if uri.path
-      normalized_url << "?#{uri.query}" if uri.query
-      normalized_url.join
-    end
-
-    def update_protocol(href) #:nodoc:
-      if href =~ /^https:/
-        integration_session.https!(true)
-      elsif href =~ /^http:/
-        integration_session.https!(false)
-      end
-    end
-
-    def response #:nodoc:
-      integration_session.response
-    end
-  end
-end
+require "webrat/integrations/rails"
+require "action_controller/record_identifier"
+
+module Webrat
+  class RailsAdapter #:nodoc:
+    include ActionController::RecordIdentifier
+
+    attr_reader :integration_session
+
+    def initialize(session)
+      @integration_session = session
+    end
+
+    def doc_root
+      File.expand_path(File.join(RAILS_ROOT, 'public'))
+    end
+
+    def saved_page_dir
+      File.expand_path(File.join(RAILS_ROOT, "tmp"))
+    end
+
+    def get(url, data, headers = nil)
+      do_request(:get, url, data, headers)
+    end
+
+    def post(url, data, headers = nil)
+      do_request(:post, url, data, headers)
+    end
+
+    def put(url, data, headers = nil)
+      do_request(:put, url, data, headers)
+    end
+
+    def delete(url, data, headers = nil)
+      do_request(:delete, url, data, headers)
+    end
+
+    def response_body
+      response.body
+    end
+
+    def response_code
+      response.code.to_i
+    end
+
+    def xml_content_type?
+      response.headers["Content-Type"].to_s =~ /xml/
+    end
+
+  protected
+
+    def do_request(http_method, url, data, headers) #:nodoc:
+      update_protocol(url)
+      integration_session.send(http_method, normalize_url(url), data, headers)
+    end
+
+    # remove protocol, host and anchor
+    def normalize_url(href) #:nodoc:
+      uri = URI.parse(href)
+      normalized_url = []
+      normalized_url << "#{uri.scheme}://" if uri.scheme
+      normalized_url << uri.host if uri.host
+      normalized_url << ":#{uri.port}" if uri.port && ![80,443].include?(uri.port)
+      normalized_url << uri.path if uri.path
+      normalized_url << "?#{uri.query}" if uri.query
+      normalized_url.join
+    end
+
+    def update_protocol(href) #:nodoc:
+      if href =~ /^https:/
+        integration_session.https!(true)
+      elsif href =~ /^http:/
+        integration_session.https!(false)
+      end
+    end
+
+    def response #:nodoc:
+      integration_session.response
+    end
+  end
+end

data/lib/webrat/adapters/sinatra.rb

@@ -1,9 +1,9 @@
-module Webrat
-  class SinatraAdapter < RackAdapter
-    def initialize(context)
-      app = context.respond_to?(:app) ? context.app : Sinatra::Application
-
-      super(Rack::Test::Session.new(Rack::MockSession.new(app, "www.example.com")))
-    end
-  end
-end
+module Webrat
+  class SinatraAdapter < RackAdapter
+    def initialize(context)
+      app = context.respond_to?(:app) ? context.app : Sinatra::Application
+
+      super(Rack::Test::Session.new(Rack::MockSession.new(app, "www.example.com")))
+    end
+  end
+end

data/lib/webrat/core/configuration.rb

@@ -1,92 +1,92 @@
-require "webrat/core_extensions/deprecate"
-
-module Webrat
-
-  # Configures Webrat. If this is not done, Webrat will be created
-  # with all of the default settings.
-  def self.configure(configuration = Webrat.configuration)
-    yield configuration if block_given?
-    @@configuration = configuration
-  end
-
-  def self.configuration # :nodoc:
-    @@configuration ||= Webrat::Configuration.new
-  end
-
-  # Webrat can be configured using the Webrat.configure method. For example:
-  #
-  #   Webrat.configure do |config|
-  #     config.mode = :sinatra
-  #   end
-  class Configuration
-
-    # Webrat's mode, set automatically when requiring webrat/rails, webrat/merb, etc.
-    attr_reader :mode # :nodoc:
-
-    # Save and open pages with error status codes (500-599) in a browser? Defualts to true.
-    attr_writer :open_error_files
-
-    # Which rails environment should the selenium tests be run in? Defaults to selenium.
-    attr_accessor :application_environment
-    webrat_deprecate :selenium_environment, :application_environment
-    webrat_deprecate :selenium_environment=, :application_environment=
-
-    # Which port is the application running on for selenium testing? Defaults to 3001.
-    attr_accessor :application_port
-    webrat_deprecate :selenium_port, :application_port
-    webrat_deprecate :selenium_port=, :application_port=
-
-    # Which underlying app framework we're testing with selenium
-    attr_accessor :application_framework
-
-    # Which server the application is running on for selenium testing? Defaults to localhost
-    attr_accessor :application_address
-
-    # Which server Selenium server is running on. Defaults to nil(server starts in webrat process and runs locally)
-    attr_accessor :selenium_server_address
-
-    # Which server Selenium port is running on. Defaults to 4444
-    attr_accessor :selenium_server_port
-
-    # Set the key that Selenium uses to determine the browser running. Default *firefox
-    attr_accessor :selenium_browser_key
-
-    # Set the timeout for waiting for the browser process to start
-    attr_accessor :selenium_browser_startup_timeout
-
-    # How many redirects to the same URL should be halted as an infinite redirect
-    # loop? Defaults to 10
-    attr_accessor :infinite_redirect_limit
-
-    def initialize # :nodoc:
-      self.open_error_files = true
-      self.application_environment = :test
-      self.application_port = 3001
-      self.application_address = 'localhost'
-      self.application_framework = :rails
-      self.selenium_server_port = 4444
-      self.infinite_redirect_limit = 10
-      self.selenium_browser_key = '*firefox'
-      self.selenium_browser_startup_timeout = 5
-    end
-
-    def open_error_files? #:nodoc:
-      @open_error_files ? true : false
-    end
-
-    # Allows setting of webrat's mode, valid modes are:
-    # :rails, :selenium, :rack, :sinatra, :mechanize, :merb
-    def mode=(mode)
-      @mode = mode.to_sym
-
-      begin
-        require("webrat/integrations/#{mode}")
-      rescue LoadError
-        # Only some modes have integration code that needs to
-        # be loaded, so this is OK
-      end
-    end
-
-  end
-
-end
+require "webrat/core_extensions/deprecate"
+
+module Webrat
+
+  # Configures Webrat. If this is not done, Webrat will be created
+  # with all of the default settings.
+  def self.configure(configuration = Webrat.configuration)
+    yield configuration if block_given?
+    @@configuration = configuration
+  end
+
+  def self.configuration # :nodoc:
+    @@configuration ||= Webrat::Configuration.new
+  end
+
+  # Webrat can be configured using the Webrat.configure method. For example:
+  #
+  #   Webrat.configure do |config|
+  #     config.mode = :sinatra
+  #   end
+  class Configuration
+
+    # Webrat's mode, set automatically when requiring webrat/rails, webrat/merb, etc.
+    attr_reader :mode # :nodoc:
+
+    # Save and open pages with error status codes (500-599) in a browser? Defualts to true.
+    attr_writer :open_error_files
+
+    # Which rails environment should the selenium tests be run in? Defaults to selenium.
+    attr_accessor :application_environment
+    webrat_deprecate :selenium_environment, :application_environment
+    webrat_deprecate :selenium_environment=, :application_environment=
+
+    # Which port is the application running on for selenium testing? Defaults to 3001.
+    attr_accessor :application_port
+    webrat_deprecate :selenium_port, :application_port
+    webrat_deprecate :selenium_port=, :application_port=
+
+    # Which underlying app framework we're testing with selenium
+    attr_accessor :application_framework
+
+    # Which server the application is running on for selenium testing? Defaults to localhost
+    attr_accessor :application_address
+
+    # Which server Selenium server is running on. Defaults to nil(server starts in webrat process and runs locally)
+    attr_accessor :selenium_server_address
+
+    # Which server Selenium port is running on. Defaults to 4444
+    attr_accessor :selenium_server_port
+
+    # Set the key that Selenium uses to determine the browser running. Default *firefox
+    attr_accessor :selenium_browser_key
+
+    # Set the timeout for waiting for the browser process to start
+    attr_accessor :selenium_browser_startup_timeout
+
+    # How many redirects to the same URL should be halted as an infinite redirect
+    # loop? Defaults to 10
+    attr_accessor :infinite_redirect_limit
+
+    def initialize # :nodoc:
+      self.open_error_files = true
+      self.application_environment = :test
+      self.application_port = 3001
+      self.application_address = 'localhost'
+      self.application_framework = :rails
+      self.selenium_server_port = 4444
+      self.infinite_redirect_limit = 10
+      self.selenium_browser_key = '*firefox'
+      self.selenium_browser_startup_timeout = 5
+    end
+
+    def open_error_files? #:nodoc:
+      @open_error_files ? true : false
+    end
+
+    # Allows setting of webrat's mode, valid modes are:
+    # :rails, :selenium, :rack, :sinatra, :mechanize, :merb
+    def mode=(mode)
+      @mode = mode.to_sym
+
+      begin
+        require("webrat/integrations/#{mode}")
+      rescue LoadError
+        # Only some modes have integration code that needs to
+        # be loaded, so this is OK
+      end
+    end
+
+  end
+
+end

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

@@ -1,31 +1,31 @@
-require "webrat/core/elements/element"
-
-module Webrat
-  class Area < Element #:nodoc:
-
-    def self.xpath_search
-      [".//area"]
-    end
-
-    def click(method = nil, options = {})
-      @session.request_page(absolute_href, :get, {})
-    end
-
-  protected
-
-    def href
-      @element["href"]
-    end
-
-    def absolute_href
-      if href =~ /^\?/
-        "#{@session.current_url}#{href}"
-      elsif href !~ %r{^https?://[\w|.]+(/.*)} && (href !~ /^\//)
-        "#{@session.current_url}/#{href}"
-      else
-        href
-      end
-    end
-
-  end
-end
+require "webrat/core/elements/element"
+
+module Webrat
+  class Area < Element #:nodoc:
+
+    def self.xpath_search
+      [".//area"]
+    end
+
+    def click(method = nil, options = {})
+      @session.request_page(absolute_href, :get, {})
+    end
+
+  protected
+
+    def href
+      @element["href"]
+    end
+
+    def absolute_href
+      if href =~ /^\?/
+        "#{@session.current_url}#{href}"
+      elsif href !~ %r{^https?://[\w|.]+(/.*)} && (href !~ /^\//)
+        "#{@session.current_url}/#{href}"
+      else
+        href
+      end
+    end
+
+  end
+end