akephalos2 2.0.6 → 2.0.7

data/README.md

@@ -49,11 +49,10 @@ We use GitHub issues:
 </a>
 
 ``` bash
-git clone https://github.com/Nerian/akephalos2 
-git submodule update --init
+git clone --recursive https://github.com/Nerian/akephalos2 
 ```
 
-The last line will grab the HTMLUnit jar files from [https://github.com/Nerian/html-unit-vendor](https://github.com/Nerian/html-unit-vendor)
+The HTMLUnit files are located at [https://github.com/Nerian/html-unit-vendor](https://github.com/Nerian/html-unit-vendor) and are automatically downloaded as a submodule.
 
 Also, we have a .rvmrc file already cooked:
 
@@ -83,15 +82,20 @@ Here's some sample RSpec code:
     
 ``` ruby
 describe "Home Page" do
-	before { visit "/" }
-	context "searching" do
-		before do
-			fill_in "Search", :with => "akephalos"
-			click_button "Go"
-		end
-		it "returns results" { page.should have_css("#results") }
-		it "includes the search term" { page.should have_content("akephalos") }
-	end
+  before { visit "/" }
+  
+  context "searching" do
+  
+    before do
+      fill_in "Search", :with => "akephalos" 
+      click_button "Go"
+    end
+    
+    it "returns results" { page.should have_css("#results") }
+    
+    it "includes the search term" { page.should have_content("akephalos") }
+  end
+  
 end 
 ```
 
@@ -102,9 +106,9 @@ Capybara allows you to perform your action on a context, for example inside a di
   <p id="test">Test</p>
   <iframe id="first" src="/one_text"></iframe>
   <p id="test2">Test2</p>
-	<iframe class="second" src="/two_text"></iframe>
-	<p id="test3">Test3</p>
-	<iframe id="third" src="/three_text"></iframe>
+  <iframe class="second" src="/two_text"></iframe>
+  <p id="test3">Test3</p>
+  <iframe id="third" src="/three_text"></iframe>
 </body>
 ```
 
@@ -113,12 +117,12 @@ You can operate within the context of iframe `test2` with any of these calls:
 ``` ruby
 # By ID
 within_frame("test2") do
-	....
+  ....
 end
 
 # By index
 within_frame(1) do
-	....
+  ....
 end
 ```
 
@@ -136,7 +140,7 @@ ENV['akephalos_jvm_max_memory']
 ```                              
   
 
-The default value is 256 MB.
+The default value is 128 MB.
 
 If you use akephalos's bin the parameter `-m [memory]` sets the max memory for the JVM.
 
@@ -153,9 +157,9 @@ Firefox 3.6.
 
 ``` ruby
 Capybara.register_driver :akephalos do |app|
-	# available options:
-	#   :ie6, :ie7, :ie8, :firefox_3_6
-	Capybara::Driver::Akephalos.new(app, :browser => :ie8)
+  #  available options:
+  #  :ie6, :ie7, :ie8, :firefox_3_6
+  Capybara::Driver::Akephalos.new(app, :browser => :ie8)
 end     
 ```   
 
@@ -164,7 +168,7 @@ end
        
 ``` ruby         
 Capybara.register_driver :akephalos do |app|
-	Capybara::Driver::Akephalos.new(app, :http_proxy => 'myproxy.com', :http_proxy_port => 8080)
+  Capybara::Driver::Akephalos.new(app, :http_proxy => 'myproxy.com', :http_proxy_port => 8080)
 end 
 ```
 
@@ -180,7 +184,7 @@ ignore javascript errors.
            
 ``` ruby
 Capybara.register_driver :akephalos do |app|
-	Capybara::Driver::Akephalos.new(app, :validate_scripts => false)
+  Capybara::Driver::Akephalos.new(app, :validate_scripts => false)
 end 
 ```  
        
@@ -191,9 +195,9 @@ By default it uses the 'fatal' level. You can change that like this:
         
 ``` ruby
 Capybara.register_driver :akephalos do |app|  
-	# available options 
-	# "trace", "debug", "info", "warn", "error", or "fatal"
-	Capybara::Driver::Akephalos.new(app, :htmlunit_log_level => 'fatal')
+  # available options 
+  # "trace", "debug", "info", "warn", "error", or "fatal"
+  Capybara::Driver::Akephalos.new(app, :htmlunit_log_level => 'fatal')
 end 
 ```
        
@@ -202,13 +206,13 @@ end
          
 ``` ruby
 Spork.prefork do
-    ...
-	Akephalos::RemoteClient.manager                                 
+  ...
+  Akephalos::RemoteClient.manager                                 
 end
 
 Spork.each_run do 
-	...
-	Thread.current['DRb'] = { 'server' => DRb::DRbServer.new }
+  ...
+  Thread.current['DRb'] = { 'server' => DRb::DRbServer.new }
 end
 ```       
 
@@ -231,13 +235,13 @@ By default, all filtered requests will return an empty body with a 200 status co
    
 ``` ruby
 Akephalos.filter(:get, "http://google.com/missing", 
-	:status => 404, :body => "... <h1>Not Found</h1> ...")
+  :status => 404, :body => "... <h1>Not Found</h1> ...")
 
 Akephalos.filter(:post, "http://my-api.com/resource.xml",
-	:status => 201, :headers => {
-		"Content-Type" => "application/xml",
-		"Location" => "http://my-api.com/resources/1.xml" },
-	:body => {:id => 100}.to_xml)	
+  :status => 201, :headers => {
+    "Content-Type" => "application/xml",
+    "Location" => "http://my-api.com/resources/1.xml" },
+    :body => {:id => 100}.to_xml)	
 ```    
 
                                          
@@ -249,7 +253,7 @@ Google Analytics code is passively applied based on HTML comments, so simply ret
 
 ``` ruby
 Akephalos.filter(:get, "http://www.google-analytics.com/ga.js",
-	:headers => {"Content-Type" => "application/javascript"})    
+  :headers => {"Content-Type" => "application/javascript"})    
 ```       
 
 
@@ -257,15 +261,15 @@ Google Maps requires the most extensive amount of API definitions of the three,
 
 ``` ruby
 Akephalos.filter(:get, "http://maps.google.com/maps/api/js?sensor=false",
-	:headers => {"Content-Type" => "application/javascript"},
-	:body => "window.google = {
-		maps: {
-			LatLng: function(){},
-			Map: function(){},
-			Marker: function(){},
-			MapTypeId: {ROADMAP:1}
-		}
-	};") 
+  :headers => {"Content-Type" => "application/javascript"},
+  :body => "window.google = {
+    maps: {
+      LatLng: function(){},
+      Map: function(){},
+      Marker: function(){},
+      MapTypeId: {ROADMAP:1}
+    }
+   };") 
 ```  
 
 		
@@ -277,9 +281,9 @@ When you enable Facebook Connect on your page, the FeatureLoader is requested, a
 
 ``` ruby
 Akephalos.filter(:get, 
-	"http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php",
-	:headers => {"Content-Type" => "application/javascript"},
-	:body => "window.FB_RequireFeatures = function() {};")    
+  "http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php",
+  :headers => {"Content-Type" => "application/javascript"},
+  :body => "window.FB_RequireFeatures = function() {};")    
 ```        
 
 		
@@ -295,11 +299,11 @@ Running Akephalos in interactive mode gives you an IRB context for interacting w
          
 ``` ruby
 $ akephalos --interactive
-	->	Capybara.app_host # => "http://localhost:3000"
-	->	page.visit "/"
-	->	page.fill_in "Search", :with => "akephalos"
-	->	page.click_button "Go"
-	->	page.has_css?("#search_results") # => true  
+  ->  Capybara.app_host # => "http://localhost:3000"
+  ->  page.visit "/"
+  ->  page.fill_in "Search", :with => "akephalos"
+  ->  page.click_button "Go"
+  ->  page.has_css?("#search_results") # => true  
 ```
 	     
 	

data/bin/akephalos

@@ -39,25 +39,25 @@ case
 when options[:use_htmlunit_snapshot]
   require "fileutils"
 
-  FileUtils.mkdir_p("vendor/htmlunit")
-  Dir["vendor/htmlunit/*.jar"].each { |jar| File.unlink(jar) }
+  FileUtils.mkdir_p("vendor/html-unit")
+  Dir["vendor/html-unit/*.jar"].each { |jar| File.unlink(jar) }
 
   Dir.chdir("vendor") do
     $stdout.print "Downloading latest snapshot... "
     $stdout.flush
-    %x[curl -O http://build.canoo.com/htmlunit/artifacts/htmlunit-2.10-SNAPSHOT-with-dependencies.zip &> /dev/null]
+    %x[curl -O http://build.canoo.com/htmlunit/artifacts/htmlunit-2.10-SNAPSHOT-with-dependencies.zip]
     puts "done"
 
     $stdout.print "Extracting dependencies... "
     $stdout.flush
-    %x[unzip -j -d htmlunit htmlunit-2.10-SNAPSHOT-with-dependencies.zip htmlunit-2.10-SNAPSHOT/lib htmlunit-2.10-SNAPSHOT/lib/* &> /dev/null]
+    %x[unzip -j -d html-unit htmlunit-2.10-SNAPSHOT-with-dependencies.zip htmlunit-2.10-SNAPSHOT/lib htmlunit-2.10-SNAPSHOT/lib/* &> /dev/null]
     puts "done"
 
     File.unlink "htmlunit-2.10-SNAPSHOT-with-dependencies.zip"
   end
 
   $stdout.puts "="*40
-  $stdout.puts "The latest HtmlUnit snapshot has been extracted to vendor/htmlunit!"
+  $stdout.puts "The latest HtmlUnit snapshot has been extracted to vendor/html-unit!"
 when options[:interactive]
   $LOAD_PATH.unshift('vendor', lib, src)
   require 'akephalos'
@@ -82,7 +82,8 @@ else
     java_args = [
      "-Xmx#{options[:akephalos_jvm_max_memory]}M",
       "-cp", [JRubyJars.core_jar_path, JRubyJars.stdlib_jar_path].join(File::PATH_SEPARATOR),
-      "org.jruby.Main"
+      "org.jruby.Main",
+      "-X+O"
     ]
     ruby_args = [ 
       "-Ku",
@@ -95,7 +96,7 @@ else
     # since the akephalos server doesn't have any gem dependencies and is
     # always executed with the same context, we clear RUBYOPT before running
     # exec.
-    ENV["RUBYOPT"] = ""
-    exec("java", *(java_args + ruby_args))
+    ENV["RUBYOPT"] = "--1.9"
+    exec("java", *(java_args + ruby_args))  
   end
 end

data/lib/akephalos/htmlunit.rb

@@ -1,13 +1,7 @@
 require "pathname"
 require "java"
 
-dependency_directory = $LOAD_PATH.detect { |path| Dir[File.join(path, 'html-unit/htmlunit-*.jar')].any? }
-
-raise "Could not find html-unit/htmlunit-VERSION.jar in load path:\n  [ #{$LOAD_PATH.join(",\n    ")}\n  ]" unless dependency_directory
-
-Dir[File.join(dependency_directory, "html-unit/*.jar")].each do |jar|
-  require jar
-end
+Dir[File.dirname(__FILE__) + "/../.." + "/vendor/html-unit/*.jar"].each {|file| require file }
 
 java.lang.System.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.SimpleLog")
 java.lang.System.setProperty("org.apache.commons.logging.simplelog.defaultlog", "fatal")

data/lib/akephalos/version.rb

@@ -1,3 +1,3 @@
 module Akephalos #:nodoc
-  VERSION = "2.0.6"
+  VERSION = "2.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: akephalos2
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-12 00:00:00.000000000 Z
+date: 2011-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70196501018280 !ruby/object:Gem::Requirement
+  requirement: &70282312283800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70196501018280
+  version_requirements: *70282312283800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70196501017140 !ruby/object:Gem::Requirement
+  requirement: &70282312282580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70196501017140
+  version_requirements: *70282312282580
 - !ruby/object:Gem::Dependency
   name: jruby-jars
-  requirement: &70196501014680 !ruby/object:Gem::Requirement
+  requirement: &70282312280200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70196501014680
+  version_requirements: *70282312280200
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70196501028980 !ruby/object:Gem::Requirement
+  requirement: &70282312294200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196501028980
+  version_requirements: *70282312294200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70196501025760 !ruby/object:Gem::Requirement
+  requirement: &70282312291200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196501025760
+  version_requirements: *70282312291200
 description: Headless Browser for Integration Testing with Capybara
 email: bj.schaefer@gmail.com
 executables: