culerity 0.2.6 → 0.2.7

data/CHANGES.md

@@ -1,3 +1,10 @@
+## 0.2.7
+
+* fixed RemoteBrowser#confirm called celerity remove_listener with invalid arguments
+* extended communication protocol to be able to send procs as arguments and blocks
+* default mail delivery method is now 'persistent', ActionMailer::Base.deliveries works again in features
+
+
 ## 0.2.5
 
 * added javascript helper to make 'I wait for the AJAX call to finish' work reliably (langalex)

data/README.md

@@ -77,10 +77,6 @@ My database is not cleared automatically between scenarios
       end
     end
 
-I want to test emails but the ActionMailer::Base.deliveries array is always empty.
-
-* that's because the :test delivery method stores all emails in memory, but now that your test process is not the same as your rails process you don't have access to that array. install the http://github.com/ngty/action_mailer_cache_delivery plugin to access the emails in your rails process via a temporary file
-
 
 ## Links to Celerity documentation
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :build: 
+:patch: 7
 :major: 0
 :minor: 2
-:patch: 6

data/culerity.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{culerity}
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Lang"]
-  s.date = %q{2009-12-09}
+  s.date = %q{2010-01-17}
   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 = [
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
      "init.rb",
      "lib/culerity.rb",
      "lib/culerity/celerity_server.rb",
+     "lib/culerity/persistent_delivery.rb",
      "lib/culerity/remote_browser_proxy.rb",
      "lib/culerity/remote_object_proxy.rb",
      "rails/init.rb",

data/features/installing_culerity.feature

@@ -8,7 +8,7 @@ Feature: Installing culerity
       And I run executable "script/generate" with arguments "cucumber"
       And I delete file "features/step_definitions/webrat_steps.rb"
       And I delete file "features/support/env.rb"
-      And I copy the project generators into "vendor/generators"
+      And culerity is installed as a plugin
       And I invoke task "rake db:migrate"
     When I run executable "script/generate" with arguments "culerity"
       And I setup load path to local code

data/features/running_cucumber_without_explicitly_running_external_services.feature

@@ -8,7 +8,7 @@ Feature: Running cucumber without explicitly running external services
       And I run executable "script/generate" with arguments "cucumber"
       And I delete file "features/step_definitions/webrat_steps.rb"
       And I delete file "features/support/env.rb"
-      And I copy the project generators into "vendor/generators"
+      And culerity is installed as a plugin
       And I invoke task "rake db:migrate"
     When I run executable "script/generate" with arguments "culerity"
       And I setup load path to local code

data/features/step_definitions/rails_setup_steps.rb

@@ -5,11 +5,17 @@ Given /^a Rails app$/ do
   @active_project_folder = File.expand_path(File.join(@tmp_root, "my_project"))
 end
 
-Given /^I copy the project generators into "([^\"]*)"$/ do |target_folder|
+Given /^culerity is installed as a plugin$/ do
+  generators_folder = 'vendor/generators'
+  plugin_folder = 'vendor/plugins/culerity'
   in_project_folder do
-    FileUtils.mkdir_p(target_folder)
+    FileUtils.mkdir_p(generators_folder)
+    FileUtils.mkdir_p(plugin_folder)
   end
-  `cp -rf #{File.dirname(__FILE__) + "/../../rails_generators/*"} #{File.join(@active_project_folder, target_folder)}`
+  `cp -rf #{File.dirname(__FILE__) + "/../../rails_generators/*"} #{File.join(@active_project_folder, generators_folder)}`
+  `cp -rf #{File.dirname(__FILE__) + "/../../lib"} #{File.join(@active_project_folder, plugin_folder)}`
+  `cp -rf #{File.dirname(__FILE__) + "/../../rails"} #{File.join(@active_project_folder, plugin_folder)}`
+  `cp -rf #{File.dirname(__FILE__) + "/../../init.rb"} #{File.join(@active_project_folder, plugin_folder)}`
 end
 
 When /^I add a feature file to test Rails index.html default file$/ do

data/lib/culerity/celerity_server.rb

@@ -10,19 +10,12 @@ module Culerity
       @browsers = []
 
       while(true)
-        call = eval _in.gets.to_s.strip
-        return if call == ["_exit_"]
-        next(close_browsers) if call == ["_close_browsers_"]
+        call, block = 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
-            if call.last.is_a?(Proc)
-              # pass as &call[-1]
-              result = target(call.first).send call[1], *call[2..-2], &call[-1]
-            else
-              # just call with args as normal
-              result = target(call.first).send call[1], *call[2..-1]
-            end
+            result = target(call.first).send call[1], *call[2..-1], &block
             _out << "[:return, #{proxify result}]\n"
           rescue => e
             _out << "[:exception, \"#{e.class.name}\", #{e.message.inspect}, #{e.backtrace.inspect}]\n"

data/lib/culerity/persistent_delivery.rb

@@ -0,0 +1,35 @@
+require 'fileutils'
+
+module Culerity
+  module PersistentDelivery
+ 
+    DELIVERIES_PATH =
+      File.join(RAILS_ROOT, 'tmp', 'action_mailer_acceptance_deliveries.cache')
+    
+    def self.included(base)
+      base.class_eval do
+        def self.deliveries
+          return [] unless File.exist?(DELIVERIES_PATH)
+          File.open(DELIVERIES_PATH,'r') do |f| 
+            Marshal.load(f)
+          end
+        end 
+      
+        def self.clear_deliveries
+          FileUtils.rm_f DELIVERIES_PATH
+        end
+      end
+    end
+ 
+    def perform_delivery_persistent(mail)
+      deliveries << mail
+      File.open(DELIVERIES_PATH,'w') do |f| 
+        f << Marshal.dump(deliveries)
+      end 
+    end 
+ 
+  end
+end
+
+ActionMailer::Base.send :include, Culerity::PersistentDelivery
+

data/lib/culerity/remote_browser_proxy.rb

@@ -49,7 +49,7 @@ module Culerity
       
       self.send_remote(:add_listener, :confirm) { blk }
       block.call
-      self.send_remote(:remove_listener, :confirm) { blk }
+      self.send_remote(:remove_listener, :confirm, lambda {blk})
     end
     
   end

data/lib/culerity/remote_object_proxy.rb

@@ -21,8 +21,8 @@ module Culerity
       send_remote(:id)
     end
 
-    def method_missing(name, *args)
-      send_remote(name, *args)
+    def method_missing(name, *args, &block)
+      send_remote(name, *args, &block)
     end
 
     #
@@ -34,9 +34,9 @@ module Culerity
     # straight through, otherwise it will be wrapped in a lambda string before sending.
     #
     def send_remote(name, *args, &blk)
-      input = [remote_object_id, %Q{"#{name}"}, *args.map{|a| a.inspect}]
-      input << block_to_string(&blk) if block_given?
-      @io << "[#{input.join(", ")}]\n"
+      input = [remote_object_id, %Q{"#{name}"}, *args.map{|a| arg_to_string(a)}]
+      serialized_block = ", #{block_to_string(&blk)}" if block_given?
+      @io << "[[#{input.join(", ")}]#{serialized_block}]\n"
       process_result @io.gets.to_s.strip
     end
 
@@ -68,6 +68,14 @@ module Culerity
       end
       result
     end
+    
+    def arg_to_string(arg)
+      if arg.is_a?(Proc)
+        block_to_string(&arg)
+      else
+        arg.inspect
+      end
+    end
 
     def remote_object_id
       @remote_object_id

data/rails_generators/culerity/templates/config/environments/culerity_continuousintegration.rb

@@ -9,20 +9,8 @@ config.action_controller.consider_all_requests_local = false
 config.action_controller.perform_caching             = true
 config.action_view.cache_template_loading            = true
 
-# See everything in the log (default is :info)
-# config.log_level = :debug
+config.action_mailer.delivery_method = :persistent
 
-# Use a different logger for distributed setups
-# config.logger = SyslogLogger.new
-
-# Use a different cache store in production
-# config.cache_store = :mem_cache_store
-
-# Enable serving of images, stylesheets, and javascripts from an asset server
-# config.action_controller.asset_host = "http://assets.example.com"
-
-# Disable delivery errors, bad email addresses will be ignored
-# config.action_mailer.raise_delivery_errors = false
-
-# Enable threaded mode
-# config.threadsafe!
+config.after_initialize do
+  require 'culerity/persistent_delivery'
+end

data/rails_generators/culerity/templates/config/environments/culerity_development.rb

@@ -14,4 +14,9 @@ config.action_controller.allow_forgery_protection    = false
 # Tell Action Mailer not to deliver emails to the real world.
 # The :test delivery method accumulates sent emails in the
 # ActionMailer::Base.deliveries array.
-config.action_mailer.delivery_method = :test
+config.action_mailer.delivery_method = :persistent
+
+config.after_initialize do
+  require 'culerity/persistent_delivery'
+end
+

data/rails_generators/culerity/templates/public/javascripts/culerity.js

@@ -12,15 +12,19 @@ jQuery(function($) {
 				throw(e);
 			}
 			window.running_ajax_calls -= 1;
-		}
+		};
 	};
 	window.running_ajax_calls = 0;
 	
 	var ajax_with_count = function(options) {
-		window.running_ajax_calls += 1;
-		options.success = count_down(options.success);
-		options.error = count_down(options.error);
-		original_ajax(options);
+		if(options.async == false) {
+		  return(original_ajax(options));
+		} else {
+			window.running_ajax_calls += 1;
+			options.success = count_down(options.success);
+			options.error = count_down(options.error);
+			return original_ajax(options);
+		}
 	};
 
 	$.ajax = ajax_with_count;

data/spec/celerity_server_spec.rb

@@ -9,14 +9,35 @@ describe Culerity::CelerityServer 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("[\"browser0\", \"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 pass procs" do
+    @browser.should_receive(:remove_listener).with(:confirm, instance_of(Proc))
+    _in = stub 'in'
+    _in.stub!(:gets).and_return("[[\"browser0\", \"remove_listener\", :confirm, lambda{true}]]\n", "[\"_exit_\"]\n")
+    _out = stub 'out', :<< => nil
+    Culerity::CelerityServer.new(_in, _out)
+  end
+  
+  it "should pass blocks" do
+    def @browser.add_listener(type, &block)
+      @type = type
+      @block = block
+    end
+    _in = stub 'in'
+    _in.stub!(:gets).and_return("[[\"browser0\", \"add_listener\", :confirm], lambda{true}]\n", "[\"_exit_\"]\n")
+    _out = stub 'out', :<< => nil
+    Culerity::CelerityServer.new(_in, _out)
+    @browser.instance_variable_get(:@type).should == :confirm
+    @browser.instance_variable_get(:@block).call.should == true
+  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")
+    _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)
@@ -24,14 +45,14 @@ describe Culerity::CelerityServer do
 
   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")
+    _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")
+    _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
@@ -44,7 +65,7 @@ describe Culerity::CelerityServer do
   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("[\"browser0\", \"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)
@@ -61,7 +82,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("[\"browser0\", \"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)
@@ -70,7 +91,7 @@ describe Culerity::CelerityServer do
   it "should send back arrays" do
     @browser.stub!(:goto).and_return([true, false, "test", 1, 12.3, nil, stub('123', :object_id => 456), ["test2", 32.1, 5000, nil, false, true, stub('789', :object_id => 101)]])
     _in = stub 'in'
-    _in.stub!(:gets).and_return("[\"browser0\", \"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, false, \"test\", 1, 12.3, nil, Culerity::RemoteObjectProxy.new(456, @io), [\"test2\", 32.1, 5000, nil, false, true, Culerity::RemoteObjectProxy.new(101, @io)]]]\n")
     Culerity::CelerityServer.new(_in, _out)
@@ -80,7 +101,7 @@ describe Culerity::CelerityServer do
     proxy = stub('123', :object_id => 456)
     @browser.stub!(:goto).and_return(proxy)
     _in = stub 'in'
-    _in.stub!(:gets).and_return("[\"browser0\", \"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)
@@ -90,7 +111,7 @@ describe Culerity::CelerityServer do
     @browser.should_receive(:goto).with('/homepage')
     @browser.should_receive(:goto).with('/page2')
     _in = stub 'in'
-    _in.stub!(:gets).and_return("[\"browser0\", \"goto\", \"/homepage\"]\n", "[\"browser0\", \"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
@@ -98,7 +119,7 @@ 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("[\"browser0\", \"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)

data/spec/remote_browser_proxy_spec.rb

@@ -4,9 +4,10 @@ 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.should_receive(:<<).with("[\"celerity\", \"new_browser\", {}]\n").ordered
-    @io.should_receive(:<<).with("[\"browser0\", \"goto\", \"/homepage\"]\n").ordered
+    @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
@@ -19,7 +20,7 @@ describe Culerity::RemoteBrowserProxy do
   
   it "should send the browser options to the remote server" do
     io = stub 'io', :gets => "[:return, \"browser0\"]"
-    io.should_receive(:<<).with('["celerity", "new_browser", {:browser=>:firefox}]' + "\n")
+    io.should_receive(:<<).with('[["celerity", "new_browser", {:browser=>:firefox}]]' + "\n")
     proxy = Culerity::RemoteBrowserProxy.new io, {:browser => :firefox}
   end
   
@@ -52,7 +53,7 @@ describe Culerity::RemoteBrowserProxy do
 
     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)
-    proxy.should_receive(:send_remote).with(:remove_listener, :confirm).and_return(true)
+    proxy.should_receive(:send_remote).with(:remove_listener, :confirm, an_instance_of(Proc)).and_return(true)
 
     proxy.confirm(true) do
       proxy.goto "http://example.com"

data/spec/remote_object_proxy_spec.rb

@@ -19,22 +19,22 @@ describe Culerity::RemoteObjectProxy do
   
   it "should send the serialized method call to the output" do
     io = stub 'io', :gets => '[:return]'
-    io.should_receive(:<<).with(%Q{[345, "goto", "/homepage"]\n})
+    io.should_receive(:<<).with(%Q{[[345, "goto", "/homepage"]]\n})
     proxy = Culerity::RemoteObjectProxy.new 345, io
     proxy.goto '/homepage'
   end
   
-  it "should send the serialized method call with argument plus block to the output" do
+  it "should send the serialized method call with a proc argument to the output" do
     io = stub 'io', :gets => "[:return]"
-    io.should_receive(:<<).with(%Q{[345, "method", true, lambda { true }]\n})
+    io.should_receive(:<<).with(%Q{[[345, "method", true, lambda { true }]]\n})
     proxy = Culerity::RemoteObjectProxy.new 345, io
     
-    proxy.send_remote(:method, true) { "lambda { true }" }
+    proxy.send_remote(:method, true, lambda{true})
   end
   
-  it "should send the serialized method call without argument plus block to the output" do
+  it "should send the serialized method call and a block to the output" do
     io = stub 'io', :gets => "[:return]"
-    io.should_receive(:<<).with(%Q{[345, "method", lambda { true }]\n})
+    io.should_receive(:<<).with(%Q{[[345, "method"], lambda { true }]\n})
     proxy = Culerity::RemoteObjectProxy.new 345, io
     
     proxy.send_remote(:method) { "lambda { true }" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: culerity
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors: 
 - Alexander Lang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-09 00:00:00 +01:00
+date: 2010-01-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,7 @@ files:
 - init.rb
 - lib/culerity.rb
 - lib/culerity/celerity_server.rb
+- lib/culerity/persistent_delivery.rb
 - lib/culerity/remote_browser_proxy.rb
 - lib/culerity/remote_object_proxy.rb
 - rails/init.rb