mechwarrior 0.0.1 → 0.0.2

data/lib/capybara/mechanize/browser.rb

@@ -0,0 +1,50 @@
+require 'mechanize'
+
+class Capybara::Mechanize::Browser
+  attr_reader :agent
+  
+  def initialize
+    @agent = Mechanize.new do |config|
+      config.follow_meta_refresh = true
+      config.redirection_limit   = 5
+    end
+  end
+  
+  def get(url)  
+    referrer = been_somewhere? ? self.url : nil
+    @agent.get(url, [], referrer)
+  end
+  
+  def post(url); @agent.post(url); end
+  def put(url); @agent.get(url); end
+  def delete(url); @agent.delete(url); end
+  def submit(form); @agent.submit(form); end
+  
+  def uri
+    been_somewhere? ? @agent.current_page.uri : nil
+  end
+  
+  def url
+    uri.nil? ? '' : uri.to_s
+  end
+  
+  def headers
+    been_somewhere? ? @agent.current_page.header : {}
+  end
+  
+  def status_code
+    been_somewhere? ? @agent.current_page.code.to_i : nil
+  end
+  
+  def dom
+    been_somewhere? ? @agent.current_page.root : Nokogiri::HTML(nil)
+  end
+  
+  def source
+    been_somewhere? ? @agent.current_page.body : ''
+  end
+  
+  def been_somewhere?
+    !@agent.current_page.nil?
+  end
+end

data/lib/capybara/mechanize/driver.rb

@@ -1,5 +1,3 @@
-require 'mechanize'
-
 class Capybara::Mechanize::Driver < Capybara::Driver::Base
   attr_reader :app, :rack_server, :options
 
@@ -13,48 +11,37 @@ class Capybara::Mechanize::Driver < Capybara::Driver::Base
   end
 
   def browser
-    unless @browser
-      @browser = Mechanize.new
-      @browser.follow_meta_refresh
-    end
-    @browser
+    @browser ||= Capybara::Mechanize::Browser.new
   end
 
   def visit(path)
     browser.get(url(path))
   end
 
-  def follow(_method, path, attributes={})
-    return if is_javascript_hashy_path?(path)
-
-    absolute_url = make_absolute_url(path)
-
-    if _method == :get
-      browser.get(absolute_url, [], self.current_url)
-    else
-      browser.send(_method, absolute_url, attributes)
-    end
+  def follow(_method, path)
+    return if is_fragment?(path)
+    browser.send(_method, make_absolute_url(path))
   end
-
-  def submit(form_node, button_node)
-    form   = Capybara::Mechanize::Form.new(form_node, browser)
-    button = Mechanize::Form::Button.new(button_node)
-
-    form.action = form.action || self.current_url
-
-    browser.submit(form, button)
+  
+  def get(url);    follow(:get, url);    end
+  def post(url);   follow(:post, url);   end
+  def put(url);    follow(:put, url);    end
+  def delete(url); follow(:delete, url); end
+  
+  def submit(form)
+    browser.submit(form)
   end
 
   def current_url
-    current_page? ? current_page.uri.to_s : ''
+    browser.url
   end
 
   def response_headers
-    current_page? ? current_page.header : {}
+    browser.headers
   end
 
   def status_code
-    current_page? ? current_page.code.to_i : nil
+    browser.status_code
   end
 
   def find(selector)
@@ -62,12 +49,12 @@ class Capybara::Mechanize::Driver < Capybara::Driver::Base
   end
 
   def source
-    current_page? ? current_page.body : ''
+    browser.source
   end
   alias :body :source
 
   def dom
-    current_page? ? current_page.root : Nokogiri::HTML(nil)
+    browser.dom
   end
 
   def reset!
@@ -75,44 +62,36 @@ class Capybara::Mechanize::Driver < Capybara::Driver::Base
   end
 
   private
-
-  def url(path)
-    rack_server.url(path)
-  end
-
-  def current_page
-    browser.current_page
-  end
-
-  def current_page?
-    !browser.current_page.nil?
-  end
-
-  def current_page_is_external?
-    current_page.uri.host != (Capybara.app_host || rack_server.host)
-  end
-
-  def request_path
-    browser.current_page.uri.path
-  end
-
+  
   def make_absolute_url(path)
     return path unless URI.parse(path).relative?
 
-    path = "#{ request_path }#{ path }" if is_query_string?(path)
+    path = "#{ browser.uri.path }#{ path }" if is_query_string?(path)
 
-    if current_page? && current_page_is_external?
-      current_page.uri.merge(path).to_s
+    if browser.been_somewhere? && current_page_is_external?
+      external_url(path)
     else
       url(path)
     end
   end
   
+  def external_url(path)
+    browser.uri.merge(path).to_s  
+  end
+  
+  def url(path)
+    rack_server.url(path)
+  end
+
+  def current_page_is_external?
+    browser.uri.host != (rack_server.host || URI.parse(Capybara.app_host).host)
+  end
+  
   def is_query_string?(path)
-    path.start_with?('?')
+    browser.been_somewhere? && path.start_with?('?')
   end
 
-  def is_javascript_hashy_path?(path)
-    path.gsub(/^#{request_path}/, '').start_with?('#')
+  def is_fragment?(path)
+    browser.been_somewhere? && path.gsub(/^#{browser.uri.path}/, '').start_with?('#')
   end
 end

data/lib/capybara/mechanize/form.rb

@@ -2,42 +2,42 @@ require 'mechanize'
 
 class Capybara::Mechanize::Form < Mechanize::Form
   
-  def initialize(node, mech=nil, page=nil)
-    super(strip_disabled_nodes(node), mech, page)
-    normalize_uploads
+  def initialize(driver, form_node)
+    @driver   = driver
+    form_node = form_node.clone
+    
+    form_node.search('*[disabled=disabled]').remove
+    
+    super(form_node, @driver.browser.agent)
   end
   
-  private
-  
-  def strip_disabled_nodes(form_node)
-    stripped_form_node = form_node.clone
-    stripped_form_node.search('*[disabled=disabled]').remove
-    stripped_form_node
-  end
-  
-  def normalize_uploads
-    if self.enctype.downcase =~ /^multipart\/form-data/
-      assign_files_to_uploads
-    else
-      create_dummy_fields
-    end
-  end
-  
-  def assign_files_to_uploads
-    self.file_uploads.each do |upload|
-      file_path = upload.node["value"]
-      upload.file_name = file_path if !file_path.nil? && file_path != ''
-    end 
+  def submit(button_node)
+    button        = Mechanize::Form::Button.new(button_node)
+    self.action ||= @driver.current_url
+    
+    self.normalize_uploads!
+    self.add_button_to_query(button)
+
+    @driver.submit(self)
   end
   
-  def create_dummy_fields
+  protected
+    
+  def normalize_uploads!
     self.file_uploads.each do |upload|
       file_path = upload.node["value"]
+      next if file_path.nil? || file_path == ''
       
-      if !file_path.nil? && file_path != ''        
+      if self.multipart?
+        upload.file_name = file_path 
+      else
         new_field = Mechanize::Form::Field.new(upload.node, File.basename(file_path))
         self.fields << new_field
       end
-    end 
+    end
   end
+  
+  def multipart?
+    !!(self.enctype.downcase =~ /^multipart\/form-data/)
+  end  
 end

data/lib/capybara/mechanize/node.rb

@@ -1,100 +1,11 @@
-class Capybara::Mechanize::Node < Capybara::Driver::Node
-  def text
-    native.text
-  end
-
-  def [](name)
-    string_node[name]
-  end
-
-  def value
-    string_node.value
-  end
-
-  def set(value)
-    if tag_name == 'input' and type == 'radio'
-      other_radios_xpath = XPath.generate { |x| x.anywhere(:input)[x.attr(:name).equals(self[:name])] }.to_s
-      driver.dom.xpath(other_radios_xpath).each { |node| node.remove_attribute("checked") }
-      native['checked'] = 'checked'
-    elsif tag_name == 'input' and type == 'checkbox'
-      if value && !native['checked']
-        native['checked'] = 'checked'
-      elsif !value && native['checked']
-        native.remove_attribute('checked')
-      end
-    elsif tag_name == 'input'
-      if (type == 'text' || type == 'password') && self[:maxlength]
-        value = value[0...self[:maxlength].to_i]
-      end
-      native['value'] = value.to_s
-    elsif tag_name == "textarea"
-      native.content = value.to_s
-    end
-  end
-
-  def select_option
-    if select_node['multiple'] != 'multiple'
-      select_node.find(".//option[@selected]").each { |node| node.native.remove_attribute("selected") }
-    end
-    native["selected"] = 'selected'
-  end
-
-  def unselect_option
-    if select_node['multiple'] != 'multiple'
-      raise Capybara::UnselectNotAllowed, "Cannot unselect option from single select box."
-    end
-    native.remove_attribute('selected')
-  end
-
+class Capybara::Mechanize::Node < Capybara::RackTest::Node
   def click
     if tag_name == 'a'
       method = self["data-method"] || :get
       driver.follow(method, self[:href].to_s)
-    elsif (tag_name == 'input' && %w(submit image).include?(type)) || ((tag_name == 'button') && type.nil? || type == "submit")
-      driver.submit(form, self)
+    elsif (tag_name == 'input' and %w(submit image).include?(type)) or
+        ((tag_name == 'button') and type.nil? or type == "submit")
+      Capybara::Mechanize::Form.new(driver, form).submit(self)
     end
-  end
-
-  def tag_name
-    native.node_name
-  end
-
-  def visible?
-    string_node.visible?
-  end
-
-  def checked?
-    string_node.checked?
-  end
-
-  def selected?
-    string_node.selected?
-  end
-
-  def path
-    native.path
-  end
-
-  def find(locator)
-    native.xpath(locator).map { |n| self.class.new(driver, n) }
-  end
-
-private
-
-  def string_node
-    @string_node ||= Capybara::Node::Simple.new(native)
-  end
-
-  # a reference to the select node if this is an option node
-  def select_node
-    find('./ancestor::select').first
-  end
-
-  def type
-    native[:type]
-  end
-
-  def form
-    native.ancestors('form').first
-  end
+  end  
 end

data/lib/capybara/mechanize.rb

@@ -2,6 +2,7 @@ require 'capybara'
 
 module Capybara
   module Mechanize
+    autoload :Browser, 'capybara/mechanize/browser'
     autoload :Driver,  'capybara/mechanize/driver'
     autoload :Node,    'capybara/mechanize/node'
     autoload :Form,    'capybara/mechanize/form'

data/lib/mechwarrior/version.rb

@@ -1,3 +1,3 @@
 module Mechwarrior
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/mechanize_driver_spec.rb

@@ -12,6 +12,12 @@ describe Capybara::Mechanize::Driver do
     end.should raise_error(ArgumentError)
   end
 
+  it "should not follow more than 5 redirects" do
+    running do
+      @driver.visit('/redirect/6/times')
+    end.should raise_error(Mechanize::RedirectLimitReachedError)
+  end
+
   it_should_behave_like "driver"
   it_should_behave_like "driver with header support"
   it_should_behave_like "driver with status code support"

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require "bundler/setup"
 
 require 'rspec'
 require 'mechwarrior'
+require 'mechanize'
 
 RSpec.configure do |config|
   config.before do

metadata

@@ -1,116 +1,113 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mechwarrior
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.2
   prerelease: 
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - Chris Lowder
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-25 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-01 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: capybara
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2168495700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mechanize
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2168495700
+- !ruby/object:Gem::Dependency
+  name: mechanize
+  requirement: &2168494920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2168494920
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &2168494200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.4
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2168494200
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2168493580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2168493580
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: &2168493000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.5
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2168493000
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2168491920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.8
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: fuubar
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2168491920
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: &2155958500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.1
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2155958500
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &2155957920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.10"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.10'
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: *2155957920
 description: A Mechanize based Capybara driver.
-email: 
+email:
 - clowder@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
+- lib/capybara/mechanize/browser.rb
 - lib/capybara/mechanize/driver.rb
 - lib/capybara/mechanize/form.rb
 - lib/capybara/mechanize/node.rb
@@ -122,34 +119,31 @@ files:
 - spec/mechanize_session_spec.rb
 - spec/spec_helper.rb
 - README.md
-has_rdoc: true
 homepage: http://github.com/clowder/mechwarrior
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
-summary: A Mechanize based Capybara driver, designed to get round the rack-test limitation of not being able to visit external (i.e. not the app your testing) websites.
+summary: A Mechanize based Capybara driver, designed to get round the rack-test limitation
+  of not being able to visit external (i.e. not the app your testing) websites.
 test_files: []
-