fletcherm-culerity 0.2.8 → 0.2.9

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.2.9
+* fixed memory leaks within the java process by clearing proxies (dewind)
+* fixed syntax error when sending multiline lambdas (endor, langalex)
+
 ## 0.2.8
 
 * removed separate development and continuous integration environments and replaced them with a single one (thilo)

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:build: 
-:patch: 8
 :major: 0
+:build: 
 :minor: 2
+:patch: 9

data/fletcherm-culerity.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fletcherm-culerity}
-  s.version = "0.2.8"
+  s.version = "0.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Lang", "Matt Fletcher"]
-  s.date = %q{2010-02-17}
+  s.date = %q{2010-02-19}
   s.description = %q{Culerity integrates Cucumber and Celerity in order to test your application's full stack.}
   s.email = %q{fletcher@atomicobject.com}
   s.extra_rdoc_files = [

data/lib/culerity/celerity_server.rb

@@ -64,7 +64,7 @@ module Culerity
     def proxify(result)
       if result.is_a?(Array)
         "[" + result.map {|x| proxify(x) }.join(", ") + "]"
-      elsif [String, TrueClass, FalseClass, Fixnum, Float, NilClass].include?(result.class)
+      elsif [Symbol, String, TrueClass, FalseClass, Fixnum, Float, NilClass].include?(result.class)
         result.inspect
       else
         @proxies[result.object_id] = result

data/lib/culerity/remote_object_proxy.rb

@@ -63,10 +63,10 @@ module Culerity
     #
     def block_to_string &block
       result = block.call.to_s
-      unless result.is_a?(String) && result[/^lambda \s* \{ .*? \}/x]
+      unless result.is_a?(String) && result[/^lambda \s* \{ .*? \}/xm]
         result = "lambda { #{result} }"
       end
-      result
+      result.gsub("\n", ";")
     end
     
     def arg_to_string(arg)

data/spec/celerity_server_spec.rb

@@ -79,7 +79,16 @@ describe Culerity::CelerityServer do
     Culerity::CelerityServer.new(_in, _out)
   end
   
-  it "should send back a proxy if the return value is not a string, number, nil or boolean" do
+  it "should send back a symbol" do
+    @browser.stub!(:goto).and_return(:ok)
+    _in = stub 'in'
+    _in.stub!(:gets).and_return("[[\"browser0\", \"goto\"]]\n", "[\"_exit_\"]\n")
+    _out = stub 'out'
+    _out.should_receive(:<<).with("[:return, :ok]\n")
+    Culerity::CelerityServer.new(_in, _out)
+  end
+  
+  it "should send back a proxy if the return value is not a string, number, nil, symbol 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")

data/spec/remote_object_proxy_spec.rb

@@ -8,6 +8,12 @@ describe Culerity::RemoteObjectProxy do
       proxy.send(:block_to_string, &block).should == "lambda { true}"
     end
     
+    it "should replace newlines in lambda string with semicolons so that the server can parse it as one command" do
+      proxy = Culerity::RemoteObjectProxy.new nil, nil
+      block = lambda { "lambda { \ntrue\n}" }
+      proxy.send(:block_to_string, &block).should == "lambda { ;true;}"
+    end
+    
     it "should return lambda string when block result isn't a lambda string" do
       proxy = Culerity::RemoteObjectProxy.new nil, nil
       [true, false, "blah", 5].each do |var|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fletcherm-culerity
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors: 
 - Alexander Lang
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-17 00:00:00 -05:00
+date: 2010-02-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency