rserve-client 0.1.0 → 0.1.3

data/.autotest

@@ -0,0 +1,23 @@
+# -*- ruby -*-
+
+require 'autotest/restart'
+
+# Autotest.add_hook :initialize do |at|
+#   at.extra_files << "../some/external/dependency.rb"
+#
+#   at.libs << ":../some/external"
+#
+#   at.add_exception 'vendor'
+#
+#   at.add_mapping(/dependency.rb/) do |f, _|
+#     at.files_matching(/test_.*rb$/)
+#   end
+#
+#   %w(TestA TestB).each do |klass|
+#     at.extra_class_map[klass] = "test/test_misc.rb"
+#   end
+# end
+
+# Autotest.add_hook :run_command do |at|
+#   system "rake build"
+# end

data/.gitignore

@@ -0,0 +1,4 @@
+*~
+doc
+pkg
+coverage

data/History.txt

@@ -1,3 +1,19 @@
+=== 0.1.3 / 2010-05-24
+* Better README.txt
+* Implemented hash of options on Connection.new
+* Better implementation of errors on connections
+* REXP::Double#as_strings returns values as floats, not Rationals
+* Bug fix on REXP#as_double_matrix. 
+* Added REXP#as_matrix, which return a standard library matrix from a R matrix
+* New spec: REXP
+
+=== 0.1.2 / 2010-05-21
+* List names works now
+
+=== 0.1.1 / 2010-05-21
+
+YANKED
+
 === 0.1.0 / 2010-05-21
 
 * First operational version. Can void_eval and eval on vectors. List needs more work

data/Manifest.txt

@@ -1,3 +1,5 @@
+.autotest
+.gitignore
 History.txt
 Manifest.txt
 README.txt
@@ -12,10 +14,13 @@ lib/rserve/rexp.rb
 lib/rserve/rexp/double.rb
 lib/rserve/rexp/genericvector.rb
 lib/rserve/rexp/integer.rb
+lib/rserve/rexp/language.rb
 lib/rserve/rexp/list.rb
 lib/rserve/rexp/logical.rb
+lib/rserve/rexp/null.rb
 lib/rserve/rexp/string.rb
 lib/rserve/rexp/symbol.rb
+lib/rserve/rexp/unknown.rb
 lib/rserve/rexp/vector.rb
 lib/rserve/rlist.rb
 lib/rserve/talk.rb
@@ -24,6 +29,7 @@ spec/rserve_double_spec.rb
 spec/rserve_integer_spec.rb
 spec/rserve_packet_spec.rb
 spec/rserve_protocol_spec.rb
+spec/rserve_rexp_spec.rb
 spec/rserve_rexpfactory_spec.rb
 spec/rserve_spec.rb
 spec/rserve_talk_spec.rb

data/README.txt

@@ -9,16 +9,77 @@ Ruby client for Rserve, a Binary R server (http://www.rforge.net/Rserve/).
 
 Follows closely the new Java client API, but maintains all Ruby conventions when possible.
 
-Connection to Rserve not yet developed, but between June-July 2010 the system should be operational.
+== FEATURES / LIMITATIONS
+
+* 100% ruby
+* Uses TCP/IP sockets to interchange data and commands
+* 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
+  * Implements almost completely R's datatypes: integer, doubles, chars, logical vectors, lists and raw data.
+  * Follows closely the Java API, so any change on the server could be adopted without much problem
+  * Fast
+Cons:
+  * Requires Rserve
+  * No seamless integration with Ruby. You obtain data with an interface closer to R than Ruby.
+ 
+== RELATED LIBRARIES (Ruby / R)
+
+* Rinruby [http://rinruby.ddahl.org/]
+  * 100% ruby 
+  * Uses pipes to send commands and evals
+  * Uses TCP/IP Sockets to send and retrieve data
+  * Pros:
+    * Doesn't requires anything but R
+    * Work with Ruby 1.8, 1.9 and JRuby 1.5
+    * All API tested
+  * Cons:
+    * VERY SLOW
+    * Very limited datatypes: Only vector and Matrix
+* RSRuby
+  * C Extension for Ruby, linked to R's shared library
+  * Pros:
+    * Very fast data access
+    * Seamless integration with ruby. Every method and object is treated like a Ruby one
+  * Cons:
+    * Transformation between R and Ruby types aren't trivial
+    * Dependent of operating system, Ruby implementation and R version
+    * Not available for alternative implementations of Ruby (JRuby, IronRuby and Rubinius)
+    
+    
+== TODO
+
+Implements
+
+* REXPs
+  * Enviroment
+  * ExpressionVector
+  * Factor
+  * Raw
+  * Reference
+  * S4
+  * Wrapper
+* Sessions
+* Authentification
+* Original test
+
+Spec
+
+* Test suite on Rserve Java new API
+* First tutorial on R
+
 
 == SYNOPSIS:
 
   require 'rserve'
   con=Rserve::Connection.new
-  con.eval("x<-renorm(1)")
+  con.eval("x<-rnorm(1)")
   => #<Rserve::REXP::Double:0x000000011a13c8 
         @payload=[(5339785585931699/2251799813685248)], 
 	@attr=nil>
+  con.eval("list(name='Fred')").as_list
+  
+  => #<Rserve::Rlist:0x00000001bf82a8 @names=["name"], @data=[#<Rserve::REXP::String:0x00000001bf8548 @payload=["Fred"], @attr=nil>]>
 
 == REQUIREMENTS:
 

data/Rakefile

@@ -5,10 +5,10 @@ require 'hoe'
 require 'rserve'
 Hoe.plugin :git
 Hoe.spec 'rserve-client' do
-  self.testlib=:rspec
+   self.testlib=:rspec
    self.version=Rserve::VERSION
    self.rubyforge_name = 'ruby-statsample' # if different than 'rserve'
-  self.developer('Claudio Bustos', 'clbustos_AT_gmail.com')
+   self.developer('Claudio Bustos', 'clbustos_AT_gmail.com')
 end
 
 # vim: syntax=ruby

data/lib/rserve.rb

@@ -1,7 +1,7 @@
 require 'socket'
 
 module Rserve
-  VERSION = '0.1.0'
+  VERSION = '0.1.3'
 end
 
 

data/lib/rserve/connection.rb

@@ -1,12 +1,23 @@
 module Rserve
   class Connection < Rserve::Engine
     include Rserve::Protocol
-    ServerNotInstalled=Class.new(Exception)
+    
+    # :section: Exceptions
+    RserveNotStarted=Class.new(Exception)
+    ServerNotAvailable=Class.new(Exception)
     IncorrectServer=Class.new(Exception)
     IncorrectServerVersion=Class.new(Exception)
     IncorrectProtocol=Class.new(Exception)
     NotConnected=Class.new(Exception)
-    EvalError=Class.new(Exception)
+    # Eval error
+    class EvalError < RuntimeError
+      attr_accessor :request_packet
+      def initialize(rp)
+        @request_packet=rp
+      end
+    end
+    attr_reader :hostname
+    attr_reader :port_number
     attr_reader :protocol 
     attr_reader :last_error
     attr_reader :connected
@@ -21,41 +32,43 @@ module Rserve
     AT_plain=0
     AT_crypt=1
     
-    def host
-      @hostname
-    end
     def initialize(opts=Hash.new)
-      @auth_req=false
-      @transfer_charset="UTF-8"
-      @auth_type=AT_plain
-      @hostname="127.0.0.1"
-      @port_number=6311
-      @tries=0
-      @max_tries=5
+      @auth_req         = opts.delete(:auth_req)          || false
+      @transfer_charset = opts.delete(:transfer_charset)  || "UTF-8"
+      @auth_type        = opts.delete(:auth_type)         || AT_plain
+      @hostname         = opts.delete(:hostname)          || "127.0.0.1"
+      @port_number      = opts.delete(:port_number)       || 6311
+      @max_tries        = opts.delete(:max_tries)         || 5
+
+      @tries            = 0
       @connected=false
+      
+      
       begin 
         #puts "Tryin to connect..."
         connect
       rescue Errno::ECONNREFUSED
         if @tries<@max_tries
+           @tries+=1
+           # Rserve is available?
+           if system "killall -s 0 Rserve"
+             # Rserve is available. Incorrect host and/or portname
+             raise ServerNotAvailable, "Rserve started, but not available on #{hostname}:#{port_number}"
+           # Rserve not available. We should instanciate it first
+           else 
+             if system "R CMD Rserve"
+             #puts "Ok"
+             retry
+              else
+                raise RserveNotStarted, "Can't start Rserve"
+              end
+           end
           #puts "Init RServe"
-          if system "R CMD Rserve"
-          #puts "Ok"
-            retry
-	  else
-	    raise ServerNotInstalled, "Rserve not installed"
-	  end
+          
         else
           raise
         end
       end
-      
-    end
-    def is
-      @s
-    end
-    def os
-      @s
     end
     def connect
         close if @connected
@@ -64,7 +77,7 @@ module Rserve
         #puts "Connected"
         # Accept first input
         input=@s.recv(32).unpack("a4a4a4a20")
-        raise IncorrectServer,"Handshake failed: Rsrv signature expected, but received #{input[0]}" unless input[0]=="Rsrv"
+        raise IncorrectServer,"Handshake failed: Rsrv signature expected, but received [#{input[0]}]" unless input[0]=="Rsrv"
         @rsrv_version=input[1].to_i
         raise IncorrectServerVersion, "Handshake failed: The server uses more recent protocol than this client." if @rsrv_version>103
         @protocol=input[2]
@@ -78,9 +91,13 @@ module Rserve
       @connected
     end
     def close
-        @s.shutdown if !@s.nil? and !@s.closed?
-        @connected=false
-        return true
+      if !@s.nil? and !@s.closed?
+        @s.close_write
+        @s.close_read
+      end
+      raise "Can't close socket" unless @s.closed?
+      @connected=false
+      true
     end
     def get_server_version
       @rsrv_version
@@ -94,7 +111,7 @@ module Rserve
       if !rp.nil? and rp.ok?
         true
       else
-        raise EvalError, "voidEval failed: #{rp.to_s}"
+        raise EvalError.new(rp), "voidEval failed: #{rp.to_s}"
       end
       
     end
@@ -109,7 +126,7 @@ module Rserve
     if !rp.nil? and rp.ok?
       parse_eval_response(rp)
     else
-      raise EvalError, "voidEval failed: #{rp.to_s}"
+      raise EvalError.new(rp), "voidEval failed: #{rp.to_s}"
     end
   end
   def parse_eval_response(rp)

data/lib/rserve/packet.rb

@@ -2,6 +2,11 @@ module Rserve
   class Packet
     attr_reader :cont
     attr_reader :cmd
+    
+    ERROR_DESCRIPTIONS={
+      2=>'Invalid expression',
+    127=>'Unknown variable/method'}
+    
     def initialize(cmd, cont)
       raise "cont [#{cont.class} - #{cont.to_s}] should respond to :length" if !cont.nil? and !cont.respond_to? :length
       @cmd=cmd
@@ -19,11 +24,14 @@ module Rserve
     def stat
       (@cmd>>24)&127
     end
+    def get_error_description(stat)
+      ERROR_DESCRIPTIONS[stat]
+    end
     def to_s
       if error?
-        status="status=error - #{stat}"
+        status="error:'#{get_error_description(stat)}'(#{stat})"
       else
-        status="status=ok"
+        status="ok"
       end
       "Packet[cmd=#{@cmd},len="+((cont.nil?)?"<nil>":(""+cont.length.to_s))+", con='"+(cont.nil?  ? "<nil>" : cont.pack("C*"))+"', status=#{status}]"
     end

data/lib/rserve/protocol.rb

@@ -11,13 +11,15 @@ module Rserve
     CMD_RESP=0x010000 # all responses have this flag set
     RESP_OK=(CMD_RESP|0x0001) # command succeeded; returned parameters depend on the command issued 
     RESP_ERR=(CMD_RESP|0x0002) # command failed, check stats code attached string may describe the error
-    
     ERR_auth_failed=0x41 # auth.failed or auth.requested but no login came. in case of authentification failure due to name/pwd mismatch, server may send CMD_accessDenied instead
     ERR_conn_broken=0x42 #  connection closed or broken packet killed it */
+
     ERR_inv_cmd=0x43 #  unsupported/invalid command */
     ERR_inv_par=0x44 #  some parameters are invalid */
     ERR_Rerror=0x45 #  R-error occured, usually followed by connection shutdown */
     ERR_IOerror=0x46 #  I/O error */
+
+
     ERR_notOpen=0x47 #  attempt to perform fileRead/Write  on closed file */
     ERR_accessDenied=0x48 #  this answer is also valid on CMD_login; otherwise it's sent if the server deosn;t allow the user to issue the specified command. (e.g. some server admins may block file I/O operations for some users) 
     ERR_unsupportedCmd=0x49 #  unsupported command */
@@ -27,7 +29,7 @@ module Rserve
     ERR_out_of_mem=0x4d #  out of memory. the connection is usually closed after this error was sent 
     ERR_ctrl_closed=0x4e #  control pipe to the master process is closed or broken 
     ERR_session_busy=0x50 #  session is still busy */
-    ERR_detach_failed=0x51 #  unable to detach seesion (cannot determine peer IP or problems creating a listening socket for resume) */
+    ERR_detach_failed=0x51 #  unable to detach session (cannot determine peer IP or problems creating a listening socket for resume) */
     
     
     CMD_login=0x001 #  "name\npwd" : - */
@@ -89,6 +91,26 @@ module Rserve
     DT_SEXP=10 #  encoded SEXP */
     DT_ARRAY=11 #  array of objects (i.e. first 4 bytes specify how many subsequent objects are part of the array; 0 is legitimate) */
     DT_LARGE=64 #  new in 0102: if this flag is set then the length of the object is coded as 56-bit integer enlarging the header by 4 bytes */
+
+    ERROR_DESCRIPTIONS={
+      ERR_auth_failed=>'auth.failed or auth.requested but no login came',
+      ERR_conn_broken=>'connection closed or broken packet killed it',
+      ERR_inv_cmd=>"unsupported/invalid command",
+      ERR_inv_par=>"some parameters are invalid",
+      ERR_Rerror=>"R-error",
+      ERR_IOerror=>"I/O error",
+      ERR_notOpen=>"attempt to perform fileRead/Write  on closed file",
+      ERR_accessDenied=>"Access denied",
+      ERR_unsupportedCmd=>"unsupported command",
+      ERR_unknownCmd=>"unknown command",
+      ERR_data_overflow=>"data overflow",
+      ERR_object_too_big=>"requested object is too big",
+      ERR_out_of_mem=>"out of memory",
+      ERR_ctrl_closed=>"control pipe to the master process is closed or broken",
+      ERR_session_busy=>"session still busy",
+      ERR_detach_failed=>"unable to detach seesion"
+    } # error descriptions
+    
     
     # writes bit-wise int to a byte buffer at specified position in Intel-endian form
     # Internal: byte buffer will be the result of unpack("CCCC") an integer.

data/lib/rserve/protocol/rexpfactory.rb

@@ -75,6 +75,9 @@ module Rserve
         def get_attr
           attr.nil? ? nil : attr.cont
         end
+        def sexp_mismatch(type)
+          STDERR.puts("Warning: #{type} SEXP size mismatch") 
+        end
         def initialize(*args)
           if args.size==0
             
@@ -129,7 +132,7 @@ module Rserve
           o=attr.parse_REXP(buf,o) if has_at
           
           if xt==XT_NULL
-            @cont=REXP::Null(get_attr)
+            @cont=REXP::Null.new(get_attr)
             return o
           end
           if xt==XT_DOUBLE
@@ -137,7 +140,7 @@ module Rserve
             d=[longBitsToDouble(lr)]
             o+=8
             if(o!=eox)
-              $STDERR.puts("Warning: double SEXP size mismatch\n");
+              sexp_mismatch("double")
               o=eox
             end
             @cont=REXP::Double.new(d,get_attr)
@@ -153,7 +156,7 @@ module Rserve
               i+=1
             end
             if(o!=eox)
-              $STDERR.puts("Warning: double SEXP size mismatch\n");
+              sexp_mismatch("double")
               o=eox
             end
             @cont=REXP::Double.new(d,get_attr)
@@ -220,13 +223,29 @@ module Rserve
               $STDERR.puts "int SEXP size mismatch"
               o=eox
             end
-          # hack for list. Not implemented yet!
-            @cont=nil
-            @cont=REXP::Integer(d,get_attr)
+            
+            # hack for factors
+              if (!get_attr.nil?)
+                ca = get_attr().as_list().at("class");
+                ls = get_attr().as_list().at("levels");
+                if (!ca.nil? and !ls.nil? and  ca.as_string=="factor") 
+                  # R uses 1-based index, Java (and Ruby) uses 0-based one
+                  @cont = REXP::Factor.new(d, ls.as_strings(), get_attr)
+                  xt = XT_FACTOR;
+                end
+              end
+            
+            
+            
+              if @cont.nil?
+                @cont=REXP::Integer.new(d,get_attr)
+              end
             return o
           end
           
           # RAW not implemented yet
+          
+          
           if xt==XT_LIST_NOTAG or xt==XT_LIST_TAG or xt==XT_LANG_NOTAG or xt==XT_LANG_TAG
             lc=REXPFactory.new
             nf=REXPFactory.new
@@ -236,9 +255,11 @@ module Rserve
               o=lc.parse_REXP(buf,o)
               if(xt==XT_LIST_TAG or xt==XT_LANG_TAG)
                 o=nf.parse_REXP(buf,o)
-                name=nf.cont.as_strings if(nf.cont.symbol? or nf.cont.string?)
+                
+                name=nf.cont.as_string if(nf.cont.symbol? or nf.cont.string?)
               end
               if name.nil?
+                
                 l.add(lc.cont) 
               else
                 l.put(name,lc.cont)
@@ -268,7 +289,7 @@ module Rserve
               v.push(xx.cont);
             end
             if (o!=eox) 
-              $STDERR.puts("Warning: int vector SEXP size mismatch\n");
+              sexp_mismatch("int")
               o=eox;
             end
             # fixup for lists since they're stored as attributes of vectors
@@ -282,7 +303,7 @@ module Rserve
                 names=Array.new(aa.length)
                 aa.length.times {|i| names[i]=aa[i].as_string}
               end
-              l=RList.new(v,names)
+              l=Rlist.new(v,names)
               @cont=(xt==XT_VECTOR_EXP) ? REXP::ExpressionVector.new(l,get_attr) : REXP::GenericVector.new(l,get_attr)
             else
               
@@ -341,6 +362,7 @@ module Rserve
       end
 				if (xt==XT_STR)
 					@cont = REXP::String.new(buf[o,i-o].pack("C*"), get_attr);
+          
 				else
 					@cont = REXP::Symbol.new(buf[o,i-o].pack("C*"))
         end
@@ -348,8 +370,27 @@ module Rserve
 			o = eox;
 			return o;
     end
+    
+    #not implemented  XT_SYM, 
+    
+    
+    if (xt==XT_CLOS) 
+			o=eox;
+			return o;
+    end
+		
+		if (xt==XT_UNKNOWN) 
+			@cont = REXP::Unknown.new(get_int(buf,o), get_attr)
+			o=eox;
+			return o;
+    end
+		
+		if (xt==XT_S4) 
+			@cont = new REXP::S4(get_attr)
+			o=eox
+			return o;
+    end
           
-          #not implemented  XT_SYM, XT_CLOSS, XT_UNKNOWN, XT_S4
           @cont=nil
           o=eox
           raise "Unhandled type:#{xt}"

data/lib/rserve/rexp.rb

@@ -121,7 +121,7 @@ module Rserve
 	# * @return attribute value or <code>null</code> if the attribute does not exist */
   
   def get_attribute(name)
-    nil if @attr.nil? or !@attr.is_list?
+    nil if @attr.nil? or !@attr.list?
     @attr.as_list[name]
   end
 	
@@ -129,7 +129,7 @@ module Rserve
   # * @param name attribute name
   # * @return <code>true</code> if the attribute exists, <code>false</code> otherwise */
   def has_attribute? (name) 
-    return (!@attr.nil? and @attr.is_list and !@attr.as_list[name].nil?);
+    return (!@attr.nil? and @attr.list? and !@attr.as_list[name].nil?);
   end
 
 
@@ -165,37 +165,39 @@ module Rserve
 	
     # returns a string description of the object
     # @return string describing the object - it can be of an arbitrary form and used only for debugging (do not confuse with {@link #asString()} for accessing string REXPs) */
-    #def to_s
-    #return super+((!@attr.nil?) ? "+" : "");
-    # end
+    def to_s
+    return (!@attr.nil?) ? "+" : ""
+    end
 
     # returns representation that it useful for debugging (e.g. it includes attributes and may include vector values -- see {@link #maxDebugItems})
     # @return extended description of the obejct -- it may include vector values
-    #def inspect {
-    #     (!@attr.nil?) ? (("<"+@attr.inspect()+">")+to_s()) : to_s;
-    #}
-
+    def to_debug_string 
+      (!@attr.nil?) ? (("<"+@attr.to_debug_string()+">")+to_s()) : to_s
+    end
+    
+    
+    
     #//======= complex convenience methods
     # returns the content of the REXP as a ruby matrix of doubles (2D-array: m[rows][cols]). You could use Matrix.rows(result) to create
-    # a ruby dfeault library matrix.
-    # Matrix(c.eval("matrix(c(1,2,3,4,5,6),2,3)").asDoubleMatrix());</code>
+    # a ruby matrix.
+    # Matrix(c.eval("matrix(c(1,2,3,4,5,6),2,3)").as_double_matrix());</code>
+    #
     # @return 2D array of doubles in the form double[rows][cols] or <code>null</code> if the contents is no 2-dimensional matrix of doubles */
     def as_double_matrix()  
       ct = as_doubles()
-      dim =get_attribute "dim"
+      dim = get_attribute "dim"
       raise MismatchException, "matrix (dim attribute missing)" if dim.nil?
       ds = dim.as_integers
       raise MismatchException, "matrix (wrong dimensionality)"     if (ds.length!=2)
-      m = ds[0], n = ds[1]
+      m,n = ds[0], ds[1]
       # R stores matrices as matrix(c(1,2,3,4),2,2) = col1:(1,2), col2:(3,4)
       # we need to copy everything, since we create 2d array from 1d array
       r=m.times.map {|i| n.times.map {|j| ct[j*n+i]}}
     end
-    def to_s
-      (@attr.nil? ? "" : "+")
-    end
-    def to_debug_string
-      (@attr.nil? ? "" : "<"+@attr.to_debug_string+">")
+    # Returns a standard library's matrix
+    def as_matrix
+      require 'matrix'
+      Matrix.rows(as_double_matrix)
     end
     
     # :section: tools
@@ -224,10 +226,15 @@ module Rserve
 end
 
 require 'rserve/rexp/vector'
+require 'rserve/rexp/null'
+
 require 'rserve/rexp/genericvector'
 require 'rserve/rexp/integer'
 require 'rserve/rexp/double'
 require 'rserve/rexp/list'
+require 'rserve/rexp/language'
+require 'rserve/rexp/unknown'
+
 require 'rserve/rexp/logical'
 require 'rserve/rexp/string'
 require 'rserve/rexp/symbol'

data/lib/rserve/rexp/double.rb

@@ -30,7 +30,7 @@ module Rserve
         @payload
       end
       def as_strings
-        @payload.map(&:to_s)
+        @payload.map {|v| v.to_f.to_s}
       end
       
       def na?(value=nil)

data/lib/rserve/rexp/language.rb

@@ -0,0 +1,13 @@
+module Rserve
+  class REXP
+    class Language < REXP::List 
+      def initialize(list, attr=nil)
+        super(list,attr)
+        
+      end
+      def language?
+        true
+      end
+    end
+  end
+end

data/lib/rserve/rexp/list.rb

@@ -25,8 +25,13 @@ module Rserve
         super+(as_list.named? ? "named":"")
       end
       def to_debug_string
-        t=super
-        t << "{"  << @payload.map {|k,v| "#{k}=#{v}"}.join(",\n") << "}"
+        t=super+(as_list.named? ? "named":"")
+        if @payload.named?
+          inner="{"+@payload.size.times.map {|i| "#{@payload.names[i]}=#{@payload.data[i].to_debug_string}"}.join(",")+"}"
+        else
+          inner="{"+@payload.size.times.map {|i| "#{@payload.data[i].to_debug_string}"}.join(",")+"}"
+        end
+        t+inner
       end
     end
   end

data/lib/rserve/rexp/null.rb

@@ -0,0 +1,17 @@
+module Rserve
+  class REXP
+# represents a NULL object in R.
+# Note: there is a slight asymmetry - in R NULL is represented by a zero-length pairlist. For this reason <code>REXPNull</code> returns <code>true</code> for {@link #isList()} and {@link #asList()} will return an empty list. Nonetheless <code>REXPList</code> of the length 0 will NOT return <code>true</code> in {@link #isNull()} (currently), becasue it is considered a different object in Java. These nuances are still subject to change, because it's not clear how it should be treated. At any rate use <code>REXPNull</code> instead of empty <code>REXPList</code> if NULL is the intended value.
+ class Null < REXP 
+   def null?
+     true
+   end
+   def list?
+     true
+   end
+   def as_list
+     Rlist.new
+   end
+ end
+end
+end

data/lib/rserve/rexp/symbol.rb

@@ -4,7 +4,7 @@ module Rserve
       attr_reader :name
       def initialize(name)
         super()
-        @name== name.nil? ? "":name
+        @name= (name.nil?) ? "" : name
       end
       def symbol?
         true

data/lib/rserve/rexp/unknown.rb

@@ -0,0 +1,14 @@
+module Rserve
+  class REXP
+    class Unknown < REXP
+      attr_reader :type
+      def initialize(type,attr=nil)
+        @type=type
+        super(attr)
+      end
+      def to_s
+        super()+"[#{@type}]"
+      end
+    end
+  end
+end

data/lib/rserve/rlist.rb

@@ -37,7 +37,7 @@ module Rserve
     end
     
     def at(v)
-      @data[v]
+      self.[](v)
     end
     
     def key_at(v)
@@ -71,25 +71,22 @@ module Rserve
     end
     
     def put(key,value)
-      if key.nil?
-        add(value)
-        return nil
-      end
-      if !names.nil?
-        p=names.index(key)
-        if !p.nil?
-          return @names[p]=value
+        puts "rlist.put(#{key},#{value})" if $DEBUG
+        if key.nil?
+          add(value)
+          return nil
         end
-      end
-      i=size
-      add(value)
-      if(@names.nil?)
-        @names=Array.new(i+1)
-        while(@names.size<i) do
-          @names.push(nil)
+        if !@names.nil?
+          p=names.index(key)
+          if !p.nil?
+            return @names[p]=value
+          end
         end
+        puts "add key and value" if $DEBUG
+        i=size      
+        @names=Array.new(i) if(@names.nil?)
+        @data.push(value)
         @names.push(key)
-      end
       
     end
     def add(a,b=nil)

data/spec/rserve_connection_spec.rb

@@ -1,20 +1,28 @@
 require File.dirname(__FILE__)+"/spec_helper.rb"
 describe Rserve::Connection do
    describe "opening and closing" do
-     it "should be open a connection and receive ID-String" do
+     before do
        @r=Rserve::Connection.new()
+     end
+     it "should be open a connection and receive ID-String" do
        @r.get_server_version.should==103
        @r.protocol.should=="QAP1"
        @r.last_error.should=="OK"
        @r.rt.should be_instance_of(Rserve::Talk)
      end
+     it "should raise ServerNotAvailable if started another instance on another port" do
+       lambda {Rserve::Connection.new(:port_number=>6700)}.should raise_exception(Rserve::Connection::ServerNotAvailable)
+     end
      it "should quit correctly" do
-       @r=Rserve::Connection.new
        @r.should be_connected
        @r.close.should be_true
        @r.should_not be_connected
        @r.close.should be_true
      end
+     it "raise an error if eval is clased after closed" do
+       @r.close
+       lambda {@r.eval("TRUE")}.should raise_exception(Rserve::Connection::NotConnected)
+     end
      after do
        @r.close if @r.connected?
      end
@@ -24,20 +32,32 @@ describe Rserve::Connection do
     before do
       @r=Rserve::Connection.new
     end
-    it "should eval_void correctly" do
+    it "method eval_void should return true with correct expression" do
       @r.void_eval("x<-1").should be_true
     end
-    it "should eval correctly" do
-      la=@r.eval("c(TRUE,TRUE,FALSE,FALSE)")
+    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|
+      e.request_packet.stat.should==127}
+    end
+    
+    it "method eval should return a simple object" do
+      la=@r.eval("TRUE")
       la.should be_instance_of(Rserve::REXP::Logical)
-      la.true?.should==[true,true,false,false]
+      la.true?.should==[true]
+    end
+    
+    it "method eval should raise an error with an incorrect expression" do
+      lambda {@r.eval("x<-")}.should raise_exception(Rserve::Connection::EvalError) {|e| e.request_packet.stat.should==2}
+      lambda {@r.eval("as.stt(c(1))")}.should raise_exception(Rserve::Connection::EvalError) {|e|
+      e.request_packet.stat.should==127}
     end
+    
     it "should eval_void and eval correctly" do
       @r.void_eval("x<-c(TRUE,FALSE)").should be_true
       la=@r.eval("x")
       la.should be_instance_of(Rserve::REXP::Logical)
       la.true?.should==[true,false]      
-      
     end
   end
 end

data/spec/rserve_rexp_spec.rb

@@ -0,0 +1,52 @@
+require File.dirname(__FILE__)+"/spec_helper.rb"
+
+describe Rserve::REXP do
+  before do
+    @r=Rserve::Connection.new
+  end
+  describe "with matrix" do
+    before {@m=@r.eval('matrix(c(1,2,3,4,5,6,7,8,9), 3,3)') }
+    it "method as_integers should return correct values for original vector" do
+      @m.as_integers.should==[1,2,3,4,5,6,7,8,9] # verification
+    end
+    it "method dim should return correct dimensions" do
+      @m.dim.should==[3,3]
+    end
+    it "method as_double_matrix returns a valid double matrix" do
+      @m.as_double_matrix.should==[[1,4,7],[2,5,8],[3,6,9]]
+    end
+    it "method as_matrix returns a valid standard library matrix" do
+      @m=@r.eval('matrix(c(1,2,3,4,5,6,7,8,9), 3,3)')
+      @m.as_matrix.should==Matrix[[1,4,7],[2,5,8],[3,6,9]]
+    end
+  end
+  describe "common methods" do
+    before do
+      @v=@r.eval("c(1.5,2.5,3.5)")
+      @l=@r.eval("list(at='val')")
+    end
+    it "method as_integer should return first value as integer" do
+      @v.as_integer.should==1
+    end
+    it "method as_double should  return first value as float" do
+      @v.as_double.should==1.5
+    end
+    it "method as_string should return first value as string (float representation)" do
+      @v.as_string.should=="1.5"
+    end
+    it "method has_attribute? should return false for non-lists" do
+      @v.has_attribute?('randomattribute').should be_false
+    end
+    it "method has_attribute? should return true for existing value" do
+      @l.has_attribute?('names').should be_true
+    end
+    it "method has_attribute? should return false for non existing value" do
+      @l.has_attribute?('at2').should be_false
+    end
+    it "method get_attrivute should return correct value for attribute" do
+      @l.get_attribute('names').as_strings.should==['at']
+    end
+    
+  end
+  
+end

data/spec/rserve_rexpfactory_spec.rb

@@ -37,8 +37,10 @@ describe Rserve::Protocol::REXPFactory do
   end
   it "should process list" do
     require 'pp'
-    la=@r.eval("list(name='Fred', wife='Mary', no.children=3, child.ages=c(4,7,9))")
-    pp la
+    la=@r.eval("list(name='Fred',age=30,10,20,kids=c(1,2,3))")
+    la.should be_list
+    la.should be_recursive
+    la.as_list.names.should==['name','age','','','kids']
   end
 
 end

data/spec/rserve_spec.rb

@@ -4,15 +4,26 @@ describe Rserve do
   before do
      @r=Rserve::Connection.new()
   end
-  it "should receive a valid response to valid expression" do
-    #response=@r.send(Rserve::CMD_eval, @r.string("1:5"))
-    #p response
-    #response[:response].should==Rserve::RESP_OK
-  end
-  it "should receive error on invalid expression" do
-    #response=@r.send(Rserve::CMD_eval, @r.string("a|sdsds<-||#@r3"))
-    #p response
-    #response[:response].should==Rserve::RESP_ERR
+  it "should calcule a basic LR without hazzle" do
+    script=<<-EOF
+## Disease severity as a function of temperature
+
+# Response variable, disease severity
+diseasesev<-c(1.9,3.1,3.3,4.8,5.3,6.1,6.4,7.6,9.8,12.4)
+
+# Predictor variable, (Centigrade)
+temperature<-c(2,1,5,5,20,20,23,10,30,25)
+## For convenience, the data may be formatted into a dataframe
+severity <- as.data.frame(cbind(diseasesev,temperature))
+
+## Fit a linear model for the data and summarize the output from function lm()
+severity.lm <- lm(diseasesev~temperature,data=severity)
+EOF
+@r.void_eval(script)
+@r.eval('severity.lm').should be_true
+@r.eval('summary(severity.lm)').should be_true
+
+
   end
 
 end

data/spec/spec_helper.rb

@@ -2,3 +2,4 @@ $:.unshift(File.dirname(__FILE__)+"/../lib")
 require 'spec'
 require 'spec/autorun'
 require 'rserve'
+require 'matrix'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Claudio Bustos
@@ -35,7 +35,7 @@ cert_chain:
   rpP0jjs0
   -----END CERTIFICATE-----
 
-date: 2010-05-21 00:00:00 -04:00
+date: 2010-05-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,8 +70,6 @@ description: |-
   Ruby client for Rserve, a Binary R server (http://www.rforge.net/Rserve/).
   
   Follows closely the new Java client API, but maintains all Ruby conventions when possible.
-  
-  Connection to Rserve not yet developed, but between June-July 2010 the system should be operational.
 email: 
 - clbustos_AT_gmail.com
 executables: []
@@ -83,6 +81,8 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 files: 
+- .autotest
+- .gitignore
 - History.txt
 - Manifest.txt
 - README.txt
@@ -97,10 +97,13 @@ files:
 - lib/rserve/rexp/double.rb
 - lib/rserve/rexp/genericvector.rb
 - lib/rserve/rexp/integer.rb
+- lib/rserve/rexp/language.rb
 - lib/rserve/rexp/list.rb
 - lib/rserve/rexp/logical.rb
+- lib/rserve/rexp/null.rb
 - lib/rserve/rexp/string.rb
 - lib/rserve/rexp/symbol.rb
+- lib/rserve/rexp/unknown.rb
 - lib/rserve/rexp/vector.rb
 - lib/rserve/rlist.rb
 - lib/rserve/talk.rb
@@ -109,6 +112,7 @@ files:
 - spec/rserve_integer_spec.rb
 - spec/rserve_packet_spec.rb
 - spec/rserve_protocol_spec.rb
+- spec/rserve_rexp_spec.rb
 - spec/rserve_rexpfactory_spec.rb
 - spec/rserve_spec.rb
 - spec/rserve_talk_spec.rb