davidtrogers-webrat 0.4.4.2 → 0.7.0

data/Thorfile

@@ -0,0 +1,118 @@
+module GemHelpers
+
+  def generate_gemspec
+    $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), "lib")))
+    require "webrat"
+
+    Gem::Specification.new do |s|
+      s.name      = "davidtrogers-webrat"
+      s.version   = Webrat::VERSION
+      s.author    = "Bryan Helmkamp"
+      s.email     = "bryan@brynary.com"
+      s.homepage  = "http://github.com/brynary/webrat"
+      s.summary   = "Ruby Acceptance Testing for Web applications"
+      s.description  = <<-EOS.strip
+Webrat lets you quickly write expressive and robust acceptance tests
+for a Ruby web application. It supports simulating a browser inside
+a Ruby process to avoid the performance hit and browser dependency of
+Selenium or Watir, but the same API can also be used to drive real
+Selenium tests when necessary (eg. for testing AJAX interactions).
+Most Ruby web frameworks and testing frameworks are supported.
+      EOS
+      s.rubyforge_project = "webrat"
+
+      require "git"
+      repo = Git.open(".")
+
+      s.files      = normalize_files(repo.ls_files.keys - repo.lib.ignored_files)
+      s.test_files = normalize_files(Dir['spec/**/*.rb'] - repo.lib.ignored_files)
+
+      s.has_rdoc = true
+      s.extra_rdoc_files = %w[README.rdoc MIT-LICENSE.txt History.txt]
+
+      s.add_dependency "nokogiri", ">= 1.2.0"
+      s.add_dependency "rack", ">= 1.0"
+      s.add_dependency "rack-test", ">= 0.5.3"
+    end
+  end
+
+  def normalize_files(array)
+    # only keep files, no directories, and sort
+    array.select do |path|
+      File.file?(path)
+    end.sort
+  end
+
+  # Adds extra space when outputting an array. This helps create better version
+  # control diffs, because otherwise it is all on the same line.
+  def prettyify_array(gemspec_ruby, array_name)
+    gemspec_ruby.gsub(/s\.#{array_name.to_s} = \[.+?\]/) do |match|
+      leadin, files = match[0..-2].split("[")
+      leadin + "[\n    #{files.split(",").join(",\n   ")}\n  ]"
+    end
+  end
+
+  def read_gemspec
+    @read_gemspec ||= eval(File.read("davidtrogers-webrat.gemspec"))
+  end
+
+  def sh(command)
+    puts command
+    system command
+  end
+end
+
+class Default < Thor
+  include GemHelpers
+
+  desc "gemspec", "Regenerate davidtrogers-webrat.gemspec"
+  def gemspec
+    File.open("davidtrogers-webrat.gemspec", "w") do |file|
+      gemspec_ruby = generate_gemspec.to_ruby
+      gemspec_ruby = prettyify_array(gemspec_ruby, :files)
+      gemspec_ruby = prettyify_array(gemspec_ruby, :test_files)
+      gemspec_ruby = prettyify_array(gemspec_ruby, :extra_rdoc_files)
+
+      file.write gemspec_ruby
+    end
+
+    puts "Wrote gemspec to davidtrogers-webrat.gemspec"
+    read_gemspec.validate
+  end
+
+  desc "build", "Build a webrat gem"
+  def build
+    sh "gem build davidtrogers-webrat.gemspec"
+    FileUtils.mkdir_p "pkg"
+    FileUtils.mv read_gemspec.file_name, "pkg"
+  end
+
+  desc "install", "Install the latest built gem"
+  def install
+    sh "gem install --local pkg/#{read_gemspec.file_name}"
+  end
+
+  desc "release", "Release the current branch to GitHub and Gemcutter"
+  def release
+    gemspec
+    build
+    Release.new.tag
+    Release.new.gem
+  end
+end
+
+class Release < Thor
+  include GemHelpers
+
+  desc "tag", "Tag the gem on the origin server"
+  def tag
+    release_tag = "v#{read_gemspec.version}"
+    sh "git tag -a #{release_tag} -m 'Tagging #{release_tag}'"
+    sh "git push origin #{release_tag}"
+  end
+
+  desc "gem", "Push the gem to Gemcutter"
+  def gem
+    sh "gem push pkg/#{read_gemspec.file_name}"
+  end
+end

data/lib/webrat.rb

@@ -1,31 +1,18 @@
-require "rubygems"
-
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
+require "rack"
+require "nokogiri"
 
 module Webrat
-  # The common base class for all exceptions raised by Webrat.
-  class WebratError < StandardError
-  end
-
-  VERSION = '0.4.4'
+  VERSION = "0.7.1.pre"
 
-  def self.require_xml
-    if on_java?
-      gem "nokogiri", ">= 1.2.4"
-    else
-      gem "nokogiri", ">= 1.0.6"
-    end
+  autoload :MechanizeAdapter, "webrat/adapters/mechanize"
+  autoload :MerbAdapter, "webrat/adapters/merb"
+  autoload :RackAdapter, "webrat/adapters/rack"
+  autoload :RailsAdapter, "webrat/adapters/rails"
+  autoload :SinatraAdapter, "webrat/adapters/sinatra"
 
-    require "nokogiri"
-    require "webrat/core/xml/nokogiri"
-  end
-
-  def self.on_java?
-    RUBY_PLATFORM =~ /java/
+  # The common base class for all exceptions raised by Webrat.
+  class WebratError < StandardError
   end
-
 end
 
-Webrat.require_xml
-
 require "webrat/core"

data/lib/webrat/{mechanize.rb → adapters/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
@@ -67,7 +71,7 @@ module Webrat #:nodoc:
         else
           current_path.split("/")[0..(-1 - levels_up)].join("/")
         end
-        descendent = url.split("/")[levels_up..-1]
+        descendent = url.split("/")[levels_up..-1].join
         "#{ancestor}/#{descendent}"
       end
   end

data/lib/webrat/adapters/merb.rb

@@ -0,0 +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

data/lib/webrat/adapters/rack.rb

@@ -0,0 +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

data/lib/webrat/{rails.rb → adapters/rails.rb}

@@ -1,34 +1,14 @@
-require "webrat"
-
-require "action_controller"
-require "action_controller/integration"
+require "webrat/integrations/rails"
 require "action_controller/record_identifier"
 
 module Webrat
-  class RailsSession < Session #:nodoc:
+  class RailsAdapter #:nodoc:
     include ActionController::RecordIdentifier
 
-    # The Rails version of within supports passing in a model and Webrat
-    # will apply a scope based on Rails' dom_id for that model.
-    #
-    # Example:
-    #   within User.last do
-    #     click_link "Delete"
-    #   end
-    def within(selector_or_object, &block)
-      if selector_or_object.is_a?(String)
-        super
-      else
-        super('#' + dom_id(selector_or_object), &block)
-      end
-    end
-
-    def doc_root
-      File.expand_path(File.join(RAILS_ROOT, 'public'))
-    end
+    attr_reader :integration_session
 
-    def saved_page_dir
-      File.expand_path(File.join(RAILS_ROOT, "tmp"))
+    def initialize(session)
+      @integration_session = session
     end
 
     def get(url, data, headers = nil)
@@ -61,10 +41,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,13 +69,5 @@ module Webrat
     def response #:nodoc:
       integration_session.response
     end
-
-  end
-end
-
-module ActionController #:nodoc:
-  IntegrationTest.class_eval do
-    include Webrat::Methods
-    include Webrat::Matchers
   end
 end

data/lib/webrat/adapters/sinatra.rb

@@ -0,0 +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

data/lib/webrat/core.rb

@@ -1,6 +1,5 @@
 require "webrat/core/configuration"
 require "webrat/core/xml"
-require "webrat/core/xml/nokogiri"
 require "webrat/core/logging"
 require "webrat/core/elements/form"
 require "webrat/core/scope"

data/lib/webrat/core/configuration.rb

@@ -1,4 +1,5 @@
 require "webrat/core_extensions/deprecate"
+require "pathname"
 
 module Webrat
 
@@ -16,20 +17,20 @@ module Webrat
   # Webrat can be configured using the Webrat.configure method. For example:
   #
   #   Webrat.configure do |config|
-  #     config.parse_with_nokogiri = false
+  #     config.mode = :sinatra
   #   end
   class Configuration
 
-    # Should XHTML be parsed with Nokogiri? Defaults to true, except on JRuby. When false, Hpricot and REXML are used
-    attr_writer :parse_with_nokogiri
-
     # 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.
+    # Save and open page storage directory, defaults to "tmp" under current directory if exists, otherwise current directory
+    attr_accessor :saved_pages_dir
+
+    # Which rails environment should the selenium tests be run in? Defaults to test.
     attr_accessor :application_environment
     webrat_deprecate :selenium_environment, :application_environment
     webrat_deprecate :selenium_environment=, :application_environment=
@@ -39,6 +40,13 @@ module Webrat
     webrat_deprecate :selenium_port, :application_port
     webrat_deprecate :selenium_port=, :application_port=
 
+    # Which port should selenium use to access the application. Defaults to application_port
+    attr_writer :application_port_for_selenium
+    
+    def application_port_for_selenium
+      @application_port_for_selenium || self.application_port
+    end
+
     # Which underlying app framework we're testing with selenium
     attr_accessor :application_framework
 
@@ -53,7 +61,7 @@ module Webrat
 
     # 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
 
@@ -63,7 +71,6 @@ module Webrat
 
     def initialize # :nodoc:
       self.open_error_files = true
-      self.parse_with_nokogiri = true
       self.application_environment = :test
       self.application_port = 3001
       self.application_address = 'localhost'
@@ -72,12 +79,11 @@ module Webrat
       self.infinite_redirect_limit = 10
       self.selenium_browser_key = '*firefox'
       self.selenium_browser_startup_timeout = 5
-    end
 
-    def parse_with_nokogiri? #:nodoc:
-      @parse_with_nokogiri ? true : false
+      tmp_dir = Pathname.new(Dir.pwd).join("tmp")
+      self.saved_pages_dir = tmp_dir.exist? ? tmp_dir : Dir.pwd
     end
-
+    
     def open_error_files? #:nodoc:
       @open_error_files ? true : false
     end
@@ -87,13 +93,11 @@ module Webrat
     def mode=(mode)
       @mode = mode.to_sym
 
-      # This is a temporary hack to support backwards compatibility
-      # with Merb 1.0.8 until it's updated to use the new Webrat.configure
-      # syntax
-      if @mode == :merb
-        require("webrat/merb_session")
-      else
-        require("webrat/#{mode}")
+      begin
+        require("webrat/integrations/#{mode}")
+      rescue LoadError
+        # Only some modes have integration code that needs to
+        # be loaded, so this is OK
       end
     end
 

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

@@ -4,7 +4,7 @@ module Webrat
   class Area < Element #:nodoc:
 
     def self.xpath_search
-      ".//area"
+      [".//area"]
     end
 
     def click(method = nil, options = {})
@@ -14,7 +14,7 @@ module Webrat
   protected
 
     def href
-      Webrat::XML.attribute(@element, "href")
+      @element["href"]
     end
 
     def absolute_href

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

@@ -3,14 +3,14 @@ module Webrat
   class Element # :nodoc:
 
     def self.load_all(session, dom)
-      Webrat::XML.xpath_search(dom, xpath_search).map do |element|
+      dom.xpath(*xpath_search).map do |element|
         load(session, element)
       end
     end
 
     def self.load(session, element)
       return nil if element.nil?
-      session.elements[Webrat::XML.xpath_to(element)] ||= self.new(session, element)
+      session.elements[element.path] ||= self.new(session, element)
     end
 
     attr_reader :element
@@ -21,7 +21,7 @@ module Webrat
     end
 
     def path
-      Webrat::XML.xpath_to(@element)
+      @element.path
     end
 
     def inspect