rserve-client 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.2.2 / 2010-06-24
+* ¿Bug? fix: a R matrix with a 0 dims raise an error [clbustos]
+* Bug fix on rexpfactory: typo on creation of S4
+* Updated Spec: session doesn't tested on windows
+* Updated README.txt
+
 === 0.2.1 / 2010-06-18
 * Added suport to assign ruby std lib Matrix. Bug fix on retrieving matrix
 * Fixed whitespace problem on README.txt

data/README.txt

@@ -16,7 +16,6 @@ Follows closely the new Java client API, but maintains all Ruby conventions when
 * Requires Rserve installed on the server machine. On debian /  ubuntu, you should use <tt>sudo apt-get install r-cran-rserve</tt>
 Pros:
 * Work with Ruby 1.8, 1.9 and JRuby 1.5.
-* Work on Windows. Rserve limitations on that plataform applies (single connection, crash on parse errors)
 * Retrieve and assign various R's datatypes: integer, doubles, chars, logical vectors, lists and raw data.
 * Session allows to process data asynchronously. You start a command, detach the process and retrieve result later. You can marshall the session, store on file or database and use it when you need it.
 * Ruby API follows closely the Java API, so any change on the server API could be adopted without much problem
@@ -27,6 +26,7 @@ Pros:
   * From Ruby side: Every REXP objects has a <tt>to_ruby</tt> method, which automagicly converts every R type on equivalent Ruby type. So, a vector of size 1 is converted to an integer or double, a vector of size>1 returns an array, a named list returns a hash and so on. If you need to create a complex expression, you could always use method <tt>eval</tt> without problem
 Cons:
 * Requires Rserve
+* Limited features on Windows, caused by limitations on Rserve on this platform: single concurrent connection allowed, server crash on parse errors and can't spawn sessions.
 
 == RELATED LIBRARIES (Ruby / R)
 
@@ -36,6 +36,7 @@ Cons:
   * Uses TCP/IP Sockets to send and retrieve data
   * Pros:
     * Doesn't requires anything but R
+    * Works flawlessly on Windows
     * Work with Ruby 1.8, 1.9 and JRuby 1.5
     * All API tested
   * Cons:

data/lib/rserve/connection.rb

@@ -1,4 +1,3 @@
-require 'rbconfig'
 module Rserve
   class Connection < Rserve::Engine
     @@connected_object=nil
@@ -80,7 +79,7 @@ module Rserve
     def connect
       # On windows, Rserve doesn't allows concurrent connections. 
       # So, we must close the last open connection first
-      if RbConfig::CONFIG['arch']=~/mswin/ and !@@connected_object.nil?
+      if ON_WINDOWS and !@@connected_object.nil?
         @@connected_object.close
       end
 

data/lib/rserve/protocol/rexpfactory.rb

@@ -446,7 +446,7 @@ module Rserve
         end
 
         if (xt==XT_S4)
-          @cont = new REXP::S4.new(get_attr)
+          @cont = REXP::S4.new(get_attr)
           o=eox
           return o;
         end

data/lib/rserve/protocol.rb

@@ -10,12 +10,10 @@ module Rserve
   module Protocol
     # Arch dependent Long Nil value 
     case Config::CONFIG['arch']
-      when 'i686-linux'
+      when /i686-linux|mswin|mingw/
         LONG_NA=9221120237041092514 # :nodoc:
-      when /mswin/
-	LONG_NA=9221120237041092514 # :nodoc:
       else
-	LONG_NA=9218868437227407266 # :nodoc:
+        LONG_NA=9218868437227407266 # :nodoc:
       end
     # Defines from Rsrv.h
     CMD_RESP=0x010000 # all responses have this flag set

data/lib/rserve/rexp/double.rb

@@ -5,12 +5,10 @@ module Rserve
       attr_reader :payload
       # NA is arch dependent
       case Config::CONFIG['arch']
-      when 'i686-linux'
-        NA = 269653970229425383598692395468593241088322026492507901905402939417320933254485890939796955099302180188971623023005661539310855695935759376615857567599472873400528811349204333736152257830107446553333670133666606746438802800063353690283455789426038632208916715592554825644961573453826957827246636338344317943808
-      when /mswin/
-        NA = 269653970229425383598692395468593241088322026492507901905402939417320933254485890939796955099302180188971623023005661539310855695935759376615857567599472873400528811349204333736152257830107446553333670133666606746438802800063353690283455789426038632208916715592554825644961573453826957827246636338344317943808
-      else
-        NA = 0x100000000007a2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+      when /i686-linux|mswin|mingw/
+          NA = 269653970229425383598692395468593241088322026492507901905402939417320933254485890939796955099302180188971623023005661539310855695935759376615857567599472873400528811349204333736152257830107446553333670133666606746438802800063353690283455789426038632208916715592554825644961573453826957827246636338344317943808
+        else
+          NA = 0x100000000007a2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
       end
 
       def initialize(data, attrs=nil)

data/lib/rserve/rexp.rb

@@ -253,12 +253,12 @@ module Rserve
     # 
     #  @return [Array] an array of integers with corresponding dimensions or <code>nil</code> if the object has no dimension attribute
     def dim
-    begin
-      return has_attribute?("dim") ? @attr.as_list['dim'].as_integers :  nil;
-      rescue MismatchException
-    # nothing to do
-    end
-    nil
+      begin
+        return has_attribute?("dim") ? @attr.as_list['dim'].as_integers :  nil;
+        rescue MismatchException
+      # nothing to do
+      end
+      nil
     end
     
     # determines whether this object inherits from a given class in the same fashion as the <code>inherits()</code> function in R does (i.e. ignoring S4 inheritance).
@@ -332,6 +332,7 @@ module Rserve
         raise "Improper size ar:#{ar} , dims=#{dims[0]}" if ar.size!=dims[0]
         return ar 
       elsif dims.size==2
+        return Array.new() if dims.any? {|v| v==0}
         dims.reverse!
         # should rearrange values as R do
         # dims[0]=cols, dims[1]=rows

data/lib/rserve.rb

@@ -1,7 +1,8 @@
 require 'socket'
-
+require 'rbconfig'
 module Rserve
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
+  ON_WINDOWS=RbConfig::CONFIG['arch']=~/mswin|mingw/
 end
 
 

data/spec/rserve_connection_on_unix_spec.rb

@@ -1,10 +1,9 @@
 require File.dirname(__FILE__)+"/spec_helper.rb"
-require 'rbconfig'
 describe "Rserve::Connection on unix" do
+  if !Rserve::ON_WINDOWS
   before do
       @r=Rserve::Connection.new
   end
-  if RbConfig::CONFIG['arch']!~/mswin/
     it "method eval_void should raise an error with an incorrect expression" do
       lambda {@r.void_eval("x<-")}.should raise_exception(Rserve::Connection::EvalError) {|e| e.request_packet.stat.should==2}
       lambda {@r.void_eval("as.stt(c(1))")}.should raise_exception(Rserve::Connection::EvalError) {|e|
@@ -26,10 +25,30 @@ describe "Rserve::Connection on unix" do
        s.eval('a').to_i.should==2
        s.close
     end
+    it "should eval_void_detach correctly" do
+      s=@r.void_eval_detach("x<-c(TRUE,FALSE)")
+      @r.should_not be_connected      
+      s.should be_instance_of(Rserve::Session)
+      s.host.should==@r.hostname
+      s.key.size.should==32
+    end
+    it "should detach correctly" do
+      x=rand(100)
+     @r.void_eval("x<-#{x}")
+      s=@r.detach
+      @r.should_not be_connected      
+      s.should be_instance_of(Rserve::Session)
+      s.host.should==@r.hostname
+      s.key.size.should==32
+      r=s.attach
+      r.eval("x").to_ruby==x
+    end
   else
     it "shouldn't crash server with an incorrect expression as Windows version does"
     it "shouldn't raise ServerNotAvailable if started another instance on another port as Windows version does"
-    it "shouldn create a different session. On Windows, every new connection closes previously open session"
+    it "shouldn't create a different session. On Windows, every new connection closes previously open session"
+    it "shouldn't eval_void_detach correctly"
+    it "shouldn't detach correctly"
   end
   
 end

data/spec/rserve_connection_spec.rb

@@ -38,24 +38,7 @@ describe Rserve::Connection do
       la.should be_instance_of(Rserve::REXP::Logical)
       la.true?.should==[true]
     end
-    it "should eval_void_detach correctly" do
-      s=@r.void_eval_detach("x<-c(TRUE,FALSE)")
-      @r.should_not be_connected      
-      s.should be_instance_of(Rserve::Session)
-      s.host.should==@r.hostname
-      s.key.size.should==32
-    end
-    it "should detach correctly" do
-      x=rand(100)
-     @r.void_eval("x<-#{x}")
-      s=@r.detach
-      @r.should_not be_connected      
-      s.should be_instance_of(Rserve::Session)
-      s.host.should==@r.hostname
-      s.key.size.should==32
-      r=s.attach
-      r.eval("x").to_ruby==x
-    end
+    
     
     it "should eval_void and eval correctly" do
       @r.void_eval("x<-c(TRUE,FALSE)").should be_true

data/spec/rserve_rexp_to_ruby_spec.rb

@@ -44,6 +44,10 @@ describe "Rserve::REXP#to_ruby" do
       @r.void_eval("a<-1:16; attr(a,'dim')<-c(2,2,2,2)")
       @r.eval("a").to_ruby.should==[[[[1.0, 3.0], [2.0, 4.0]], [[5.0, 7.0], [6.0, 8.0]]],
  [[[9.0, 11.0], [10.0, 12.0]], [[13.0, 15.0], [14.0, 16.0]]]]
+    end
+    it "should return an empty Matrix with a matrix with a 0 dim" do
+      @r.void_eval("a<-as.matrix(numeric(0))")
+      @r.eval("a").to_ruby.should==Matrix[]
       
     end
     it "should return a boolean with a logical with one element" do

data/spec/rserve_session_spec.rb

@@ -1,27 +1,31 @@
 require File.dirname(__FILE__)+"/spec_helper.rb"
 describe Rserve::Session do
-  before do
-    @r=Rserve::Connection.new
-  end
-  it "should resume an detached session with void_eval_detach" do
-      x2=10+rand(12)
-      s=@r.void_eval_detach("x<-1:#{x2}")
-      r=Rserve::Connection.new
-      r.void_eval("x<-1")
-      r.eval("x").to_ruby.should==1
-      s.should be_instance_of(Rserve::Session)
-      r2=s.attach
-      r2.eval("x").to_ruby.should==(1..x2).to_a
+  if !Rserve::ON_WINDOWS
+    before do
+      @r=Rserve::Connection.new
     end
-  it "should resume an detached session with detach" do
-      x2=10+rand(12)
-      @r.void_eval("x<-1:#{x2}")
-      s=@r.detach
-      r=Rserve::Connection.new
-      r.void_eval("x<-1")
-      r.eval("x").to_ruby.should==1
-      s.should be_instance_of(Rserve::Session)
-      r2=s.attach
-      r2.eval("x").to_ruby.should==(1..x2).to_a
-    end    
+    it "should resume an detached session with void_eval_detach" do
+        x2=10+rand(12)
+        s=@r.void_eval_detach("x<-1:#{x2}")
+        r=Rserve::Connection.new
+        r.void_eval("x<-1")
+        r.eval("x").to_ruby.should==1
+        s.should be_instance_of(Rserve::Session)
+        r2=s.attach
+        r2.eval("x").to_ruby.should==(1..x2).to_a
+      end
+    it "should resume an detached session with detach" do
+        x2=10+rand(12)
+        @r.void_eval("x<-1:#{x2}")
+        s=@r.detach
+        r=Rserve::Connection.new
+        r.void_eval("x<-1")
+        r.eval("x").to_ruby.should==1
+        s.should be_instance_of(Rserve::Session)
+        r2=s.attach
+        r2.eval("x").to_ruby.should==(1..x2).to_a
+    end
+  else
+    it "shouldn't work with sessions on windows"
+  end    
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Claudio Bustos
@@ -35,7 +35,7 @@ cert_chain:
   rpP0jjs0
   -----END CERTIFICATE-----
 
-date: 2010-06-18 00:00:00 -04:00
+date: 2010-06-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency