rserve-client 0.3.0 → 0.3.1

data/History.txt

@@ -1,3 +1,25 @@
+=== 0.3.1 / 2013-07-26
+
+* 2D Names functionality for Arrays and Matrices
+* A bug that occurs when R returns a named array consisting of only 1
+* Added code to handle Infinity values from double
+* Added functionality to recognize 2D named objects
+* Added specs for infinite? method
+* Added support for cases when only one dimension of names is specified
+* Bugfix: undefined method 'new' for #<Rserve::Protocol::REXPFactory
+* Fix for raw expressions transfer error.Padding to size divisible by 4 was not being done.
+* Fixed bug for named numerics
+* Fixed failing specs, split new functionality between With2DNames (applied to Array and Matrix) and With2DSizes (only applied to Array)
+* Fixed named_2d? not returning booleans
+* Fixed starting of Rserve when running on JRuby
+* Fixed starting of server inside Rserve::Connection when running on JRuby
+* Incorrect Handling of infinite values
+* Make row_by_name and column_by_name return named arrays
+* No method exception when converting a "named Float" to ruby
+* Raw expression transfer to rserve error.
+* eval Exception is not caused by voidEval
+
+
 === 0.3.0 / 2011-12-26
 
 * Added some extra documentation

data/Manifest.txt

@@ -44,6 +44,8 @@ lib/rserve/rfactor.rb
 lib/rserve/rlist.rb
 lib/rserve/session.rb
 lib/rserve/talk.rb
+lib/rserve/with2dnames.rb
+lib/rserve/with2dsizes.rb
 lib/rserve/withattributes.rb
 lib/rserve/withnames.rb
 spec/rserve_connection_on_unix_spec.rb
@@ -63,5 +65,7 @@ spec/rserve_rlist_spec.rb
 spec/rserve_session_spec.rb
 spec/rserve_spec.rb
 spec/rserve_talk_spec.rb
+spec/rserve_with2dnames_spec.rb
+spec/rserve_with2dsizes_spec.rb
 spec/rserve_withnames_spec.rb
 spec/spec_helper.rb

data/lib/rserve.rb

@@ -1,13 +1,16 @@
 require 'socket'
 require 'rbconfig'
 module Rserve
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
   ON_WINDOWS=RbConfig::CONFIG['arch']=~/mswin|mingw/
 end
 
+require 'spoon' if RUBY_PLATFORM == "java"
 
 require 'rserve/withnames'
 require 'rserve/withattributes'
+require 'rserve/with2dnames'
+require 'rserve/with2dsizes'
 
 
 require 'rserve/protocol'

data/lib/rserve/connection.rb

@@ -75,7 +75,7 @@ module Rserve
             raise ServerNotAvailableError, "Rserve started, but not available on #{hostname}:#{port_number}"
             # Rserve not available. We should instanciate it first
           else
-            if system @cmd_init
+            if run_server
               # Wait a moment, please
               sleep(0.25)
               retry
@@ -200,7 +200,7 @@ module Rserve
       if !rp.nil? and rp.ok?
         parse_eval_response(rp)
       else
-        raise EvalError.new(rp), "voidEval failed: #{rp.to_s}"
+        raise EvalError.new(rp), "eval failed: #{rp.to_s}"
       end
     end
 
@@ -327,5 +327,19 @@ module Rserve
         raise "Cannot detach"
       end
     end
+
+    private
+
+      def run_server
+        if RUBY_PLATFORM != "java"
+          system @cmd_init
+        else
+          pid = Spoon.spawnp *@cmd_init.split
+          return false if pid < 0
+          Process.waitpid pid
+          true
+        end
+      end
+
   end
 end

data/lib/rserve/protocol/rexpfactory.rb

@@ -265,7 +265,7 @@ module Rserve
           o+=4
           d=buf[o,as]
           o = eox;
-          @cont = new REXP::Raw.new(d, get_attr);
+          @cont = REXP::Raw.new(d, get_attr);
           return o;
         end
 
@@ -617,6 +617,11 @@ module Rserve
           set_int(by.length,buf,off);
           off+=4
           by.each_with_index {|v,i| buf[off+i]=v}
+		  off+=by.length
+		  while ((off & 3) != 0)
+            buf[off] = 0
+            off+=1
+          end
         elsif(rxt==XT_ARRAY_STR)
           sa=cont.as_strings
           io=off

data/lib/rserve/rexp.rb

@@ -388,19 +388,23 @@ module Rserve
     #  
     # @return [Object] Ruby object.
     def to_ruby
-      #pp self
       v=to_ruby_internal
-      #p v
-      if !v.nil? and !v.is_a? Fixnum and !v.is_a? TrueClass and !v.is_a? FalseClass
+      if !v.nil? and !v.is_a? Numeric and !v.is_a? TrueClass and !v.is_a? FalseClass
         v.extend Rserve::WithAttributes
         v.attributes=attr.to_ruby unless attr.nil?
         if !v.attributes.nil? and v.attributes.has_name? 'names'
           v.attributes['names']=[v.attributes['names']] unless v.attributes['names'].is_a? Array or v.attributes['names'].nil?
-          
           v.extend Rserve::WithNames
-          
           v.names=v.attributes['names']
         end
+        if v.attributes and v.attributes.has_name? 'dim' and v.attributes.has_name? 'dimnames' and v.attributes['dim'].size == 2
+          if v.is_a? Array
+            v.extend Rserve::With2DSizes
+            v.sizes = v.attributes['dim']
+          end
+          v.extend Rserve::With2DNames
+          v.names = v.attributes['dimnames'].map{|dimension_names| (dimension_names.nil? or dimension_names.is_a?(Array)) ? dimension_names : [dimension_names]}
+        end
       end
       
       # Hack: change attribute row.names according to spec 

data/lib/rserve/rexp/double.rb

@@ -35,7 +35,7 @@ module Rserve
       end
       def as_integers
         @payload.map do |v|
-          na?(v) ? nil : v.to_i
+          (na?(v) or Double.infinite?(v)) ? nil : v.to_i
         end
       end
       def as_doubles
@@ -53,9 +53,15 @@ module Rserve
         #else  
         #  value.respond_to? :nan? and value.nan?
         #end
-        return ((value.is_a? Float and value.nan?) or value.to_i==NA) unless value.nil?
-        @payload.map {|v| ((v.is_a? Float and v.nan?) or v.to_i==NA)}
+        return _na?(value) unless value.nil?
+        @payload.map {|v| _na?(v) }
       end
+
+      def self.infinite?(value)
+        value.respond_to?(:infinite?) and value.infinite?
+      end
+
+
       def to_debug_string
         t=super
         t << "{"  << @payload.map(&:to_s).join(",") << "}"
@@ -71,6 +77,17 @@ module Rserve
           super
         end
       end
+
+protected
+
+      def _na?(value)
+        if value.is_a? Float
+          return true if value.nan?
+          return false if value.infinite?
+        end
+        value.to_i == NA
+      end
+
     end
   end
 end

data/lib/rserve/with2dnames.rb

@@ -0,0 +1,67 @@
+module Rserve
+
+  module With2DNames
+    attr_reader :row_names, :column_names
+
+    def names=(names)
+      raise ArgumentError, "sizes must be of size 2" unless (names.size == 2)
+      if self.is_a? Array
+        raise ArgumentError, "mismatch between the size of row labels and the actual number of elements" if (names[0] and ((self.count % names[0].size) != 0))
+        raise ArgumentError, "mismatch between the size of column labels and the actual number of elements" if (names[1] and ((self.count % names[1].size) != 0))
+        raise ArgumentError, "mismatch between the provided sizes and the actual number of elements" if (names[0] and names[1] and ((names[0].size * names[1].size) != self.count))
+      elsif self.is_a? Matrix
+        raise ArgumentError, "mismatch between the size of row labels and the actual number of rows" if (names[0] and (names[0].size != self.row_size))
+        raise ArgumentError, "mismatch between the size of column labels and the actual number of rows" if (names[1] and (names[1].size != self.column_size))
+      else
+        raise ArgumentError, "unsupported type for With2DNames"
+      end
+      @row_names = names[0]
+      @column_names = names[1]
+    end
+
+    def by_name(row_name, column_name)
+      return nil unless @row_names and @column_names
+      i = @row_names.index(row_name)
+      j = @column_names.index(column_name)
+      return nil unless i and j
+      if self.is_a? Array
+        at_2d(i, j)
+      elsif self.is_a? Matrix
+        self[i, j]
+      else
+        raise ArgumentError, "unsupported type for With2DNames"
+      end
+    end
+
+    def row_by_name(name)
+      return nil unless @row_names
+      i = @row_names.index(name)
+      return nil unless i
+      result = row(i).to_a
+      if @column_names
+        result.extend WithNames
+        result.names = @column_names
+      end
+      result
+    end
+
+    def column_by_name(name)
+      return nil unless @column_names
+      j = @column_names.index(name)
+      return nil unless j
+      result = column(j).to_a
+      if @row_names
+        result.extend WithNames
+        result.names = @row_names
+      end
+      result
+    end
+
+    def named_2d?
+      !(@row_names.nil? or @column_names.nil?)
+    end
+
+  end
+
+
+end

data/lib/rserve/with2dsizes.rb

@@ -0,0 +1,35 @@
+module Rserve
+
+  module With2DSizes
+
+    attr_reader :column_size, :row_size
+
+    def sizes=(sizes)
+      raise ArgumentError, "sizes must be of size 2" unless (sizes.size == 2)
+      raise ArgumentError, "mismatch between provided size info and actual number of elements" unless self.size == (sizes[0] * sizes[1])
+      @row_size = sizes[0]
+      @column_size = sizes[1]
+
+    end
+
+    def at_2d(i,j)
+      self[i + j * row_size]
+    end
+
+    def row(i)
+      return nil unless (-row_size...row_size) === i
+      each_slice(row_size).map {|col| col[i]}
+    end
+
+    def column(j)
+      return nil unless (-column_size...column_size) === j
+      self[(j * row_size), row_size]
+    end
+
+
+
+  end
+
+
+
+end

data/spec/rserve_double_spec.rb

@@ -15,22 +15,41 @@ describe Rserve::REXP::Double do
   end
   describe "NA management" do
     before do
-      @payload=[3,5,Rserve::REXP::Double::NA, 10,20]
+      @payload=[3,5,Rserve::REXP::Double::NA, 10,20, (1.0 / 0)]
       @a=Rserve::REXP::Double.new(@payload)
     end
 
     it "method na? should return coherent answer" do
       @a.na?(@a.as_integers[0]).should be_false
       @a.na?(@a.as_integers[2]).should be_true
-      @a.na?.should==[false,false,true,false,false]
+      @a.na?.should==[false,false,true,false,false, false]
     end
     it "to_a should return correct values with NA" do
-      @a.to_a.should==[3,5, nil, 10, 20]
+      @a.to_a.should==[3,5, nil, 10, 20, Float::INFINITY]
     end
     it "to_ruby should return correct values with NA" do
-      @a.to_ruby.should==[3,5, nil, 10, 20]
+      @a.to_ruby.should==[3,5, nil, 10, 20, Float::INFINITY]
     end
+
   end
+
+  describe "infinite?" do
+
+    it "should return false for non Float objects" do
+      Rserve::REXP::Double.infinite?(1).should be_false
+    end
+
+    it "should return false for non infinite floats" do
+      Rserve::REXP::Double.infinite?(Math::PI).should be_false
+    end
+
+    it "should return true for infinite floats" do
+      Rserve::REXP::Double.infinite?(-Float::INFINITY).should be_true
+      Rserve::REXP::Double.infinite?(Float::INFINITY).should be_true
+    end
+
+  end
+
   describe "common methods" do
     before do
       @n=rand(10)+10

data/spec/rserve_rexp_to_ruby_spec.rb

@@ -5,6 +5,7 @@ describe "Rserve::REXP#to_ruby" do
     before do
       @r=Rserve::Connection.new
     end
+
     after do
       @r.close
     end
@@ -74,6 +75,11 @@ describe "Rserve::REXP#to_ruby" do
     it "should return an array of strings with a vector with two or more strings" do
       @r.eval("c('a','b',NA)").to_ruby.should==['a','b',nil]
     end
+    it "should handle named floats" do
+      @r.void_eval('y <- sample(1:100, 10)')
+      @r.void_eval('x <- sample(1:100, 10)')
+      @r.eval('lm(y ~ 0 + x)').to_ruby.should be_instance_of(Array)
+    end
     it "should return an array extended with Rserve::WithNames and Rserve::WithAttributes for a list" do
       expected=[1,2,3].extend Rserve::WithNames
       expected.names=%w{a b c}
@@ -89,5 +95,65 @@ describe "Rserve::REXP#to_ruby" do
       df.attributes['class'].should=='data.frame'
       
     end
+
+    context "when passing an object with dim and dimnames attributes" do
+
+      let :attr_with_dimnames do
+        col_names = Rserve::REXP::String.new(%w(c1 c2 c3 c4), nil)
+        row_names = Rserve::REXP::String.new(%w(r1 r2 r3), nil)
+        names_list = Rserve::Rlist.new([row_names, col_names])
+        names_vector = Rserve::REXP::GenericVector.new(names_list)
+        dim_array = [3,4]
+        dimensions = Rserve::REXP::Integer.new(dim_array)
+        attr_payload = Rserve::Rlist.new([dimensions, names_vector], %w(dim dimnames))
+        Rserve::REXP::List.new(attr_payload)
+      end
+
+      context "and the object is converted to an array" do
+
+        before do
+          payload = [true, true, true, true, true, true, false, true, true, false, false, true]
+          @array = Rserve::REXP::Logical.new(payload, attr_with_dimnames).to_ruby
+        end
+
+        it "should return a 2d object as an array with Rserve::With2DNames and Rserve::With2DSizes" do
+          @array.should be_an Array
+          @array.should be_a Rserve::With2DNames
+          @array.should be_a Rserve::With2DSizes
+        end
+
+        it "should set the row and column labels" do
+          @array.row_names.should == %w(r1 r2 r3)
+          @array.column_names.should == %W(c1 c2 c3 c4)
+        end
+
+        it "should set the row and column sizes" do
+          @array.row_size.should == 3
+          @array.column_size.should == 4
+        end
+
+      end
+
+
+      context "and the object is converted to a matrix" do
+
+        before do
+          payload = [1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0]
+          @matrix = Rserve::REXP::Double.new(payload, attr_with_dimnames).to_ruby
+        end
+
+        it "should return a Matrix with Rserve::With2DNames" do
+          @matrix.should be_a Matrix
+          @matrix.should be_a Rserve::With2DNames
+        end
+
+        it "should set the row and column labels" do
+          @matrix.row_names.should == %w(r1 r2 r3)
+          @matrix.column_names.should == %W(c1 c2 c3 c4)
+        end
+
+      end
+
+    end
   end
 end

data/spec/rserve_spec.rb

@@ -39,6 +39,7 @@ severity <- as.data.frame(cbind(diseasesev,temperature))
 severity.lm <- lm(diseasesev~temperature,data=severity)
     EOF
     @r.void_eval(script)
+    temp = @r.eval('severity.lm')
     @r.eval('severity.lm').should be_instance_of(Rserve::REXP::GenericVector)
     @r.eval('severity.lm').to_ruby.should be_true
     @r.eval('summary(severity.lm)').should be_true

data/spec/rserve_with2dnames_spec.rb

@@ -0,0 +1,234 @@
+require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
+
+describe Rserve::With2DNames do
+
+  before do
+
+    # when a 2d object is returned by R as an array
+    # the elements are listed column by column
+    @array = [1,5,9,2,6,10,3,7,11,4,8,12]
+    # corresponds to a matrix like
+    # 1  2  3  4
+    # 5  6  7  8
+    # 9  10 11 12
+    @array.extend Rserve::With2DSizes
+    @array.sizes = [3,4]
+    @array.extend Rserve::With2DNames
+    @matrix = Matrix[[1,2,3,4],[5,6,7,8],[9,10,11,12]]
+    @matrix.extend Rserve::With2DNames
+  end
+
+  describe "names=" do
+
+    context "when passed the correct values" do
+
+      it "should set the names for rows and columns for an array" do
+        @array.names = [%w(r1 r2 r3),%w(c1 c2 c3 c4)]
+        @array.row_names.should == %w(r1 r2 r3)
+        @array.column_names.should == %w(c1 c2 c3 c4)
+      end
+
+      it "should set the names for rows and columns for an array" do
+        @matrix.names = [%w(r1 r2 r3),%w(c1 c2 c3 c4)]
+        @matrix.row_names.should == %w(r1 r2 r3)
+        @matrix.column_names.should == %w(c1 c2 c3 c4)
+      end
+
+    end
+
+    context "when passing only names for one dimension" do
+
+      before do
+        @array.names = [%w(r1 r2 r3), nil]
+        @matrix.names = [nil, %w(c1 c2 c3 c4)]
+      end
+
+      it "should not assign the missing names" do
+        @array.column_names.should be_nil
+        @matrix.row_names.should be_nil
+      end
+
+    end
+
+    context "when passed the wrong values" do
+
+      it "should throw if the object passed does not have two elements" do
+        expect{@array.names = [%w(r1 r2 r3)]}.to raise_error ArgumentError
+        expect{@matrix.names = [%w(r1 r2 r3)]}.to raise_error ArgumentError
+      end
+
+      it "should throw if the sizes passed do not match the array size" do
+        expect{@array.names = [%w(r1 r2 r3 r4),%w(c1 c2 c3 c4)]}.to raise_error ArgumentError
+        expect{@matrix.names = [%w(r1 r2 r3 r4),%w(c1 c2 c3 c4)]}.to raise_error ArgumentError
+      end
+
+    end
+
+  end
+
+  describe "row_by_name" do
+
+    before do
+      @array.names = [%w(r1 r2 r3),%w(c1 c2 c3 c4)]
+      @matrix.names = [%w(r1 r2 r3),%w(c1 c2 c3 c4)]
+    end
+
+    context "when the name is present" do
+
+      it "should return the correct row for arrays" do
+        @array.row_by_name("r2").should == [5, 6, 7, 8]
+      end
+
+      it "should return the correct row as an array for matrices" do
+        @matrix.row_by_name("r2").should == [5, 6, 7, 8]
+      end
+
+      it "should return a named object" do
+        @array.row_by_name("r1").named?.should == true
+        @matrix.row_by_name("r1").named?.should == true
+      end
+
+    end
+
+    context "when no row names have been assigned" do
+
+      it "should return nil" do
+        @array.names = [nil,%w(c1 c2 c3 c4)]
+        @matrix.names = [nil,%w(c1 c2 c3 c4)]
+        @array.row_by_name("r1").should be_nil
+        @matrix.row_by_name("r2").should be_nil
+      end
+
+    end
+
+    context "when no column names have been assigned" do
+
+      it "should return a plain (unnamed) array" do
+        @array.names = [%w(r1 r2 r3), nil]
+        @matrix.names = [%w(r1 r2 r3),nil]
+        @array.row_by_name("r1").should_not be_a Rserve::WithNames
+        @matrix.row_by_name("r2").should_not be_a Rserve::WithNames
+      end
+
+    end
+
+    context "when the index is out of range" do
+
+      it "should return nil" do
+        @array.row_by_name("not_there").should be_nil
+        @matrix.row_by_name("not_there").should be_nil
+      end
+
+    end
+
+  end
+
+  describe "column_by_name" do
+
+    before do
+      @array.names = [%w(r1 r2 r3),%w(c1 c2 c3 c4)]
+      @matrix.names = [%w(r1 r2 r3),%w(c1 c2 c3 c4)]
+    end
+
+    context "when the name is present" do
+
+      it "should return the correct column for arrays" do
+        @array.column_by_name("c1").should == [1, 5, 9]
+      end
+
+      it "should return the correct column as an array for matrix" do
+        @matrix.column_by_name("c1").should == [1, 5, 9]
+      end
+
+      it "should return a named object" do
+        @array.column_by_name("c1").named?.should == true
+        @matrix.column_by_name("c1").named?.should == true
+      end
+
+    end
+
+    context "when no column names have been assigned" do
+
+      it "should return nil" do
+        @array.names = [%w(r1 r2 r3), nil]
+        @matrix.names = [%w(r1 r2 r3),nil]
+        @array.column_by_name("c1").should be_nil
+        @matrix.column_by_name("c2").should be_nil
+      end
+
+    end
+
+    context "when no row names have been assigned" do
+
+      it "should return a plain (unnamed) array" do
+        @array.names = [nil,%w(c1 c2 c3 c4)]
+        @matrix.names = [nil,%w(c1 c2 c3 c4)]
+        @array.column_by_name("c1").should_not be_a Rserve::WithNames
+        @matrix.column_by_name("c2").should_not be_a Rserve::WithNames
+      end
+
+    end
+
+    context "when the name is not present" do
+
+      it "should return nil" do
+        @array.column_by_name("not_there").should be_nil
+        @matrix.column_by_name("not_there").should be_nil
+      end
+
+    end
+
+  end
+
+  describe "named_2d?" do
+
+    it "should return false if no names are set" do
+      @array.named_2d?.should == false
+      @matrix.named_2d?.should == false
+    end
+
+    it "should return true if names have been set" do
+      @array.names = [%w(r1 r2 r3),%w(c1 c2 c3 c4)]
+      @matrix.names = [%w(r1 r2 r3),%w(c1 c2 c3 c4)]
+      @array.named_2d?.should == true
+      @matrix.named_2d?.should == true
+    end
+
+
+    it "should return false if only one dimension names are set" do
+      @array.names = [%w(r1 r2 r3), nil]
+      @matrix.names = [nil, %w(c1 c2 c3 c4)]
+      @array.named_2d?.should == false
+      @array.named_2d?.should == false
+    end
+
+  end
+
+  describe "by_name" do
+
+    before do
+      @array.names = [%w(r1 r2 r3),%w(c1 c2 c3 c4)]
+      @matrix.names = [%w(r1 r2 r3),%w(c1 c2 c3 c4)]
+    end
+
+    it "should return the correct value" do
+      @array.by_name("r1","c2").should == 2
+      @matrix.by_name("r3","c4").should == 12
+    end
+
+    it "should return nil if either of the parameters is not found" do
+      @array.by_name("not_there","c1").should be_nil
+      @matrix.by_name("r1","not_there").should be_nil
+
+    end
+
+    it "should return nil when either column or row names are set" do
+      @array.names = [nil,%w(c1 c2 c3 c4)]
+      @matrix.names = [%w(r1 r2 r3),nil]
+      @array.by_name("r1","c1").should be_nil
+      @matrix.by_name("r1","c1").should be_nil
+    end
+
+  end
+
+end

data/spec/rserve_with2dsizes_spec.rb

@@ -0,0 +1,111 @@
+require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
+
+describe Rserve::With2DSizes do
+
+  before do
+
+    # when a 2d object is returned by R as an array
+    # the elements are listed column by column
+    @array = [1,5,9,2,6,10,3,7,11,4,8,12]
+    # corresponds to a matrix like
+    # 1  2  3  4
+    # 5  6  7  8
+    # 9  10 11 12
+    @array.extend Rserve::With2DSizes
+  end
+
+  describe "sizes=" do
+
+    context "when passed the correct values" do
+
+      it "should set the size values for rows and columns" do
+        @array.sizes = [3,4]
+        @array.row_size.should == 3
+        @array.column_size.should == 4
+      end
+
+    end
+
+    context "when passed the wrong values" do
+
+      it "should throw if the object passed does not have two elements" do
+        expect{@array.sizes = [5]}.to raise_error ArgumentError
+      end
+
+      it "should throw if the sizes passed do not match the array size" do
+        expect{@array.sizes = [1,5]}.to raise_error ArgumentError
+      end
+
+    end
+
+  end
+
+  describe "row" do
+
+    before do
+      @array.sizes = [3,4]
+    end
+
+    context "when the index is in the valid range" do
+
+      it "should return the correct row" do
+        @array.row(0).should == [1, 2, 3, 4]
+        @array.row(-1).should == [9, 10, 11, 12]
+      end
+
+    end
+
+    context "when the index is out of range" do
+
+      it "should return nil" do
+        @array.row(3).should be_nil
+        @array.row(-4).should be_nil
+      end
+
+    end
+
+  end
+
+  describe "column" do
+
+    before do
+      @array.sizes = [3,4]
+    end
+
+    context "when the index is in the valid range" do
+
+      it "should return the correct column" do
+        @array.column(0).should == [1, 5, 9]
+        @array.column(-1).should == [4, 8, 12]
+      end
+
+    end
+
+    context "when the index is out of range" do
+
+      it "should return nil" do
+        @array.column(4).should be_nil
+        @array.column(-5).should be_nil
+      end
+
+    end
+
+  end
+
+  describe "at_2d" do
+
+    before do
+      @array.sizes = [3,4]
+    end
+
+
+    it "should return the correct values" do
+      @array.at_2d(0,0).should == 1
+      @array.at_2d(2,0).should == 9
+      @array.at_2d(0,3).should == 4
+      @array.at_2d(2,3).should == 12
+    end
+
+  end
+
+end

metadata

@@ -1,46 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: rserve-client
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
 - Claudio Bustos
 autorequire: 
 bindir: bin
-cert_chain:
-- !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURNakNDQWhxZ0F3SUJB
-  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREEvTVJFd0R3WURWUVFEREFoamJH
-  SjEKYzNSdmN6RVZNQk1HQ2dtU0pvbVQ4aXhrQVJrV0JXZHRZV2xzTVJNd0VR
-  WUtDWkltaVpQeUxHUUJHUllEWTI5dApNQjRYRFRFd01ETXlPVEl4TXpnMU5W
-  b1hEVEV4TURNeU9USXhNemcxTlZvd1B6RVJNQThHQTFVRUF3d0lZMnhpCmRY
-  TjBiM014RlRBVEJnb0praWFKay9Jc1pBRVpGZ1ZuYldGcGJERVRNQkVHQ2dt
-  U0pvbVQ4aXhrQVJrV0EyTnYKYlRDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFB
-  RGdnRVBBRENDQVFvQ2dnRUJBTGY4SlZNR3FFN201a1liK1BOTgpuZVp2MnBj
-  WFY1ZlFDaTZ4a3lHOGJpMi9TSUZ5L0x5eHV2THpFZU94QmVhejFCZTkzYmF5
-  SVVxdU9JcXczZHl3Ci9LWFdhMzFGeHVOdXZBbTZDTjhmeWVSWVgvb3U0Y3cz
-  T0lVVW5JdkI3Uk1OSXU0d2JnZU02aHRWL1FFc05McnYKYXQxL21oOUpwcWF3
-  UHJjaklPVk1qNEJJcDY3dm16SkNhVWYrUy9IMnVZdFNPMDlGK1lRRTN0djg1
-  VFBlUm1xVQp5anlYeVRjL29KaXcxY1hza1VMOFV0TVdabXJ3TkxIWHVaV1dJ
-  TXpraml6M1VOZGhKci90NVJPazhTMldQem5sCjBiTXkvUE1JbEFicVdvbFJu
-  MXpsMlZGSjNUYVhTY2JxSW1ZOFdmNGc2MmIvMVpTVWxHcnRuTE5zQ1lYcldp
-  c28KVVBVQ0F3RUFBYU01TURjd0NRWURWUjBUQkFJd0FEQUxCZ05WSFE4RUJB
-  TUNCTEF3SFFZRFZSME9CQllFRkd1OQpyckoxSDY0cVJtTk51M0pqL1Fqdmgw
-  dTVNQTBHQ1NxR1NJYjNEUUVCQlFVQUE0SUJBUUNWMFVua2E1aXNyaFprCkdq
-  cVNEcVkvNmhGK0cycGJGY2JXVXBqbUM4Tld0QXhlQys3TkdWM2xqZDBlMVNM
-  Zm95Qmo0Z25GdEZtWThxWDQKSzAydGdTWk0wZURWOFRwZ0ZwV1h6SzZMekh2
-  b2FudWFoSExaRXRrLytaODg1bEZlbmUrbkhhZGtlbTFuOWlBQgpjczk2Sk85
-  L0pmRnl1WE0yN3dGQXdtZkhDbUpmUEYwOVI0VnZHSFJBdmI4TUd6U1ZnazJp
-  MDZPSlRxa0JUd3Z2CkpISmRveXczKzhidzlSSitqTGFOb1EreHUrMXBRZFMy
-  YmIzbTd4alpwdWZtbC9tOHpGQ3RqWU0vN3Fna0tSOHoKL1padDhsQ2lLZkZB
-  cnBwUnJaYXlFMkZWc3BzNFg2V3dCZHJLVE1aMENLU1hUUmN0YkVqMUJBWjY3
-  ZW9UdkJCdApycFAwampzMAotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2011-12-26 00:00:00.000000000 Z
+cert_chain: []
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyforge
-  requirement: &18815860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -48,40 +21,60 @@ dependencies:
         version: 2.0.4
   type: :development
   prerelease: false
-  version_requirements: *18815860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &18815440 !ruby/object:Gem::Requirement
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *18815440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: &18814940 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *18814940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &11048380 !ruby/object:Gem::Requirement
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.7'
   type: :development
   prerelease: false
-  version_requirements: *11048380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.7'
 description: ! 'Ruby client for Rserve, a Binary R server (http://www.rforge.net/Rserve/).
 
 
@@ -143,6 +136,8 @@ files:
 - lib/rserve/rlist.rb
 - lib/rserve/session.rb
 - lib/rserve/talk.rb
+- lib/rserve/with2dnames.rb
+- lib/rserve/with2dsizes.rb
 - lib/rserve/withattributes.rb
 - lib/rserve/withnames.rb
 - spec/rserve_connection_on_unix_spec.rb
@@ -162,11 +157,14 @@ files:
 - spec/rserve_session_spec.rb
 - spec/rserve_spec.rb
 - spec/rserve_talk_spec.rb
+- spec/rserve_with2dnames_spec.rb
+- spec/rserve_with2dsizes_spec.rb
 - spec/rserve_withnames_spec.rb
 - spec/spec_helper.rb
 - .gemtest
 homepage: http://github.com/clbustos/Rserve-Ruby-client
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options:
 - --main
@@ -187,26 +185,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruby-statsample
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby client for Rserve, a Binary R server (http://www.rforge.net/Rserve/)
 test_files:
-- spec/rserve_rlist_spec.rb
-- spec/rserve_rexp_wrapper_spec.rb
-- spec/rserve_rfactor_spec.rb
+- spec/rserve_with2dnames_spec.rb
 - spec/rserve_connection_spec.rb
-- spec/rserve_rexp_to_ruby_spec.rb
+- spec/rserve_rfactor_spec.rb
 - spec/rserve_double_spec.rb
-- spec/rserve_withnames_spec.rb
+- spec/rserve_rexp_to_ruby_spec.rb
+- spec/rserve_logical_spec.rb
+- spec/rserve_session_spec.rb
+- spec/rserve_talk_spec.rb
+- spec/rserve_rlist_spec.rb
+- spec/rserve_genericvector_spec.rb
+- spec/rserve_with2dsizes_spec.rb
 - spec/rserve_packet_spec.rb
-- spec/rserve_connection_on_unix_spec.rb
+- spec/rserve_integer_spec.rb
 - spec/rserve_rexpfactory_spec.rb
+- spec/rserve_withnames_spec.rb
+- spec/rserve_protocol_spec.rb
 - spec/rserve_rexp_spec.rb
-- spec/rserve_integer_spec.rb
 - spec/rserve_spec.rb
-- spec/rserve_protocol_spec.rb
-- spec/rserve_genericvector_spec.rb
-- spec/rserve_session_spec.rb
-- spec/rserve_logical_spec.rb
-- spec/rserve_talk_spec.rb
+- spec/rserve_rexp_wrapper_spec.rb
+- spec/rserve_connection_on_unix_spec.rb

metadata.gz.sig

@@ -1 +0,0 @@
-��e�h9hܚ����_�m��f-Mb®L�'������E�*��v�Y��- @��F"XA#MbuÚkrm+�d��-��{��D��e�V>�4�m�����G\