drnic-culerity 0.2.1 → 0.2.2

data/.gitignore

@@ -2,3 +2,5 @@ coverage
 rdoc
 pkg
 tmp
+*.sw?
+*.gem

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:major: 0
 :minor: 2
-:patch: 1
+:patch: 2
+:major: 0

data/culerity.gemspec

@@ -1,15 +1,12 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{culerity}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Lang"]
-  s.date = %q{2009-08-15}
+  s.date = %q{2009-08-16}
   s.description = %q{Culerity integrates Cucumber and Celerity in order to test your application's full stack.}
   s.email = %q{alex@upstream-berlin.com}
   s.extra_rdoc_files = [
@@ -52,7 +49,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/langalex/culerity}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.3}
   s.summary = %q{Culerity integrates Cucumber and Celerity in order to test your application's full stack.}
   s.test_files = [
     "spec/celerity_server_spec.rb",

data/lib/culerity/celerity_server.rb

@@ -7,11 +7,12 @@ module Culerity
     
     def initialize(_in, _out)
       @proxies = {}
-      @browser_options = {}
-      
+      @browsers = []
+
       while(true)
         call = eval _in.gets.to_s.strip
         return if call == ["_exit_"]
+        next(close_browsers) if call == ["_close_browsers_"]
         unless call.nil?
           begin
             # check if last arg is a block
@@ -27,6 +28,7 @@ module Culerity
             _out << "[:exception, \"#{e.class.name}\", #{e.message.inspect}, #{e.backtrace.inspect}]\n"
           end
         end
+
       end
       
     end
@@ -37,13 +39,27 @@ module Culerity
       @browser_options = options
     end
     
-    def browser
-      @browser ||= Celerity::Browser.new @browser_options || {}
+    def new_browser(options, number = nil)
+      number ||= @browsers.size
+      @browsers[number] = Celerity::Browser.new(options || @browser_options || {})
+      "browser#{number}"
+    end
+
+    def close_browsers
+      @browsers.each { |browser| browser.close }
+      @browsers = []
+    end
+
+    def browser(number)
+      unless @browsers[number]
+        new_browser(nil, number)
+      end
+      @browsers[number]
     end
     
     def target(object_id)
-      if object_id == 'browser'
-        browser
+      if object_id =~ /browser(\d+)/
+        browser($1.to_i)
       elsif object_id == 'celerity'
         self
       else
@@ -62,4 +78,4 @@ module Culerity
       end
     end
   end
-end
+end

data/lib/culerity/remote_browser_proxy.rb

@@ -3,11 +3,8 @@ module Culerity
   class RemoteBrowserProxy < RemoteObjectProxy
     def initialize(io, browser_options = {})
       @io = io
-      unless browser_options.empty?
-        @remote_object_id = 'celerity'
-        configure_browser browser_options 
-        @remote_object_id = nil
-      end
+      @remote_object_id = "celerity".inspect
+      @remote_object_id = new_browser(browser_options).inspect
     end
     
     # 
@@ -55,11 +52,7 @@ module Culerity
       self.send_remote(:remove_listener, :confirm) { blk }
     end
     
-    private
-    
-    def remote_object_id
-      (@remote_object_id || 'browser').inspect
-    end
   end
   
-end
+  
+end

data/lib/culerity/remote_object_proxy.rb

@@ -73,4 +73,4 @@ module Culerity
       @remote_object_id
     end
   end
-end
+end

data/lib/culerity.rb

@@ -3,8 +3,19 @@ require File.dirname(__FILE__) + '/culerity/remote_browser_proxy'
 
 module Culerity
 
+  module ServerCommands
+    def exit_server
+      self << '["_exit_"]'
+      close
+    end
+
+    def close_browsers
+      self.puts '["_close_browsers_"]'
+    end
+  end
+
   def self.run_server
-    IO.popen("jruby #{__FILE__}", 'r+')
+    IO.popen("jruby #{__FILE__}", 'r+').extend(ServerCommands)
 
     # open the two pipes that were created below
     # while(!File.exists?("tmp/culerity_in.pipe")) 

data/spec/celerity_server_spec.rb

@@ -6,18 +6,45 @@ describe Culerity::CelerityServer do
     Celerity::Browser.stub!(:new).and_return(@browser)
   end
   
-  it "should pass the method call to the selerity browser" do
+  it "should pass the method call to the celerity browser" do
     @browser.should_receive(:goto).with('/homepage')
     _in = stub 'in'
-    _in.stub!(:gets).and_return("[\"browser\", \"goto\", \"/homepage\"]\n", "[\"_exit_\"]\n")
+    _in.stub!(:gets).and_return("[\"browser0\", \"goto\", \"/homepage\"]\n", "[\"_exit_\"]\n")
     _out = stub 'out', :<< => nil
     Culerity::CelerityServer.new(_in, _out)
   end
+
+  it "should return the browser id when a new browser is requested" do
+    _in = stub 'in'
+    _in.stub!(:gets).and_return("[\"celerity\", \"new_browser\", {}]\n", "[\"_exit_\"]\n")
+    _out = stub 'out'
+    _out.should_receive(:<<).with("[:return, \"browser0\"]\n")
+    Culerity::CelerityServer.new(_in, _out)
+  end
+
+  it "should create a new browser with the provided options" do
+    _in = stub 'in'
+    _in.stub!(:gets).and_return("[\"celerity\", \"new_browser\", {:browser => :firefox}]\n", "[\"_exit_\"]\n")
+    Celerity::Browser.should_receive(:new).with(:browser => :firefox)
+    Culerity::CelerityServer.new(_in, stub.as_null_object)
+  end
+
+  it "should create multiple browsers and return the appropriate id for each" do
+    _in = stub 'in'
+    _in.stub!(:gets).and_return("[\"celerity\", \"new_browser\", {}]\n", "[\"celerity\", \"new_browser\", {}]\n", "[\"_exit_\"]\n")
+    Celerity::Browser.should_receive(:new).twice
+    _out = stub 'out'
+    _out.should_receive(:<<).with("[:return, \"browser0\"]\n").ordered
+    _out.should_receive(:<<).with("[:return, \"browser1\"]\n").ordered
+    Culerity::CelerityServer.new(_in, _out)
+
+  end
+
   
   it "should send back the return value of the call" do
     @browser.stub!(:goto).and_return(true)
     _in = stub 'in'
-    _in.stub!(:gets).and_return("[\"browser\", \"goto\", \"/homepage\"]\n", "[\"_exit_\"]\n")
+    _in.stub!(:gets).and_return("[\"browser0\", \"goto\", \"/homepage\"]\n", "[\"_exit_\"]\n")
     _out = stub 'out'
     _out.should_receive(:<<).with("[:return, true]\n")
     Culerity::CelerityServer.new(_in, _out)
@@ -34,7 +61,7 @@ describe Culerity::CelerityServer do
   it "should send back a proxy if the return value is not a string, number, nil or boolean" do
     @browser.stub!(:goto).and_return(stub('123', :object_id => 456))
     _in = stub 'in'
-    _in.stub!(:gets).and_return("[\"browser\", \"goto\", \"/homepage\"]\n", "[\"_exit_\"]\n")
+    _in.stub!(:gets).and_return("[\"browser0\", \"goto\", \"/homepage\"]\n", "[\"_exit_\"]\n")
     _out = stub 'out'
     _out.should_receive(:<<).with("[:return, Culerity::RemoteObjectProxy.new(456, @io)]\n")
     Culerity::CelerityServer.new(_in, _out)
@@ -44,24 +71,17 @@ describe Culerity::CelerityServer do
     proxy = stub('123', :object_id => 456)
     @browser.stub!(:goto).and_return(proxy)
     _in = stub 'in'
-    _in.stub!(:gets).and_return("[\"browser\", \"goto\", \"/homepage\"]\n", "[456, \"goto_2\", \"1\"]", "[\"_exit_\"]\n")
+    _in.stub!(:gets).and_return("[\"browser0\", \"goto\", \"/homepage\"]\n", "[456, \"goto_2\", \"1\"]", "[\"_exit_\"]\n")
     _out = stub 'out', :<< => nil
     proxy.should_receive(:goto_2).with('1')
     Culerity::CelerityServer.new(_in, _out)
   end
-  
-  it "should configure the browser" do
-    _in = stub 'in'
-    _in.stub!(:gets).and_return('["celerity", "configure_browser", {:browser=>:firefox}]' + "\n", '["browser", "goto", "/homepage"]' + "\n", "[\"_exit_\"]\n")
-    Celerity::Browser.should_receive(:new).with(:browser => :firefox)
-    Culerity::CelerityServer.new(_in, stub.as_null_object)
-  end
-  
+
   it "should pass multiple method calls" do
     @browser.should_receive(:goto).with('/homepage')
     @browser.should_receive(:goto).with('/page2')
     _in = stub 'in'
-    _in.stub!(:gets).and_return("[\"browser\", \"goto\", \"/homepage\"]\n", "[\"browser\", \"goto\", \"/page2\"]\n", "[\"_exit_\"]\n")
+    _in.stub!(:gets).and_return("[\"browser0\", \"goto\", \"/homepage\"]\n", "[\"browser0\", \"goto\", \"/page2\"]\n", "[\"_exit_\"]\n")
     _out = stub 'out', :<< => nil
     Culerity::CelerityServer.new(_in, _out)
   end
@@ -69,9 +89,9 @@ describe Culerity::CelerityServer do
   it "should return an exception" do
     @browser.stub!(:goto).and_raise(RuntimeError.new('test exception with "quotes"'))
     _in = stub 'in'
-    _in.stub!(:gets).and_return("[\"browser\", \"goto\", \"/homepage\"]\n", "[\"_exit_\"]\n")
+    _in.stub!(:gets).and_return("[\"browser0\", \"goto\", \"/homepage\"]\n", "[\"_exit_\"]\n")
     _out = stub 'out'
     _out.should_receive(:<<).with(/^\[:exception, \"RuntimeError\", \"test exception with \\\"quotes\\\"\", \[.*\]\]\n$/)
     Culerity::CelerityServer.new(_in, _out)
   end
-end
+end

data/spec/remote_browser_proxy_spec.rb

@@ -1,10 +1,13 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe Culerity::RemoteBrowserProxy do
+  before(:each) do
+    @io = stub 'io', :gets => "[:return, \"browser0\"]", :<<  => nil
+  end
   it "should send the serialized method call to the output" do
-    io = stub 'io', :gets => '[return, :okay]'
-    io.should_receive(:<<).with("[\"browser\", \"goto\", \"/homepage\"]\n")
-    proxy = Culerity::RemoteBrowserProxy.new io
+    @io.should_receive(:<<).with("[\"celerity\", \"new_browser\", {}]\n").ordered
+    @io.should_receive(:<<).with("[\"browser0\", \"goto\", \"/homepage\"]\n").ordered
+    proxy = Culerity::RemoteBrowserProxy.new @io
     proxy.goto '/homepage'
   end
   
@@ -15,37 +18,37 @@ describe Culerity::RemoteBrowserProxy do
   end
   
   it "should send the brower options to the remote server" do
-    io = stub 'io', :gets => "[:return, :okay]"
-    io.should_receive(:<<).with('["celerity", "configure_browser", {:browser=>:firefox}]' + "\n")
+    io = stub 'io', :gets => "[:return, \"browser0\"]"
+    io.should_receive(:<<).with('["celerity", "new_browser", {:browser=>:firefox}]' + "\n")
     proxy = Culerity::RemoteBrowserProxy.new io, {:browser => :firefox}
   end
   
   it "should timeout if wait_until takes too long" do
-    proxy = Culerity::RemoteBrowserProxy.new nil
+    proxy = Culerity::RemoteBrowserProxy.new @io
     lambda {
       proxy.wait_until(0.1) { false }
     }.should raise_error(Timeout::Error)
   end
   
   it "should return successfully when wait_until returns true" do
-    proxy = Culerity::RemoteBrowserProxy.new nil
+    proxy = Culerity::RemoteBrowserProxy.new @io
     proxy.wait_until(0.1) { true }.should == true
   end
   
   it "should timeout if wait_while takes too long" do
-    proxy = Culerity::RemoteBrowserProxy.new nil
+    proxy = Culerity::RemoteBrowserProxy.new @io
     lambda {
       proxy.wait_while(0.1) { true }
     }.should raise_error(Timeout::Error)
   end
   
   it "should return successfully when wait_while returns !true" do
-    proxy = Culerity::RemoteBrowserProxy.new nil
+    proxy = Culerity::RemoteBrowserProxy.new @io
     proxy.wait_while(0.1) { false }.should == true
   end
 
   it "should accept all javascript confirmation dialogs" do
-    proxy = Culerity::RemoteBrowserProxy.new nil
+    proxy = Culerity::RemoteBrowserProxy.new @io
 
     proxy.should_receive(:send_remote).with(:add_listener, :confirm).and_return(true)
     proxy.should_receive(:send_remote).with(:goto, "http://example.com").and_return(true)
@@ -56,4 +59,4 @@ describe Culerity::RemoteBrowserProxy do
     end
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: drnic-culerity
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Alexander Lang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-15 00:00:00 -07:00
+date: 2009-08-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency