octave-ruby 1.0.9 → 2.0.0

data/History.txt

@@ -1,3 +1,9 @@
+== 2.0.0 / 2012-11-08
+
+* 2 major enhancements
+  * Octave 3.6 compatability. Support for 3.0 has been deprecated
+  * Added Ruby 1.9 compatability
+  
 == 1.0.9 / 2008-12-30
 
 * 1 major bug fix

data/README.txt

@@ -55,4 +55,4 @@ If you have Octave installed in a non-standard location, you can specify the loc
 
 octave-ruby is licensed under the GPL License.
 
-Copyright (c) 2007 Jonathan Younger <jonathan.younger@lipomics.com>
+Copyright (c) 2007-2012 Jonathan Younger <jonathan@daikini.com>

data/ext/octave_api/Makefile

@@ -1,63 +1,98 @@
 
 SHELL = /bin/sh
 
+# V=0 quiet, V=1 verbose.  other values don't work.
+V = 0
+Q1 = $(V:1=)
+Q = $(Q1:0=@)
+n=$(NULLCMD)
+ECHO1 = $(V:1=@$n)
+ECHO = $(ECHO1:0=@echo)
+
 #### Start of system configuration section. ####
 
-srcdir = .
-topdir = /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin9.0
-hdrdir = $(topdir)
-VPATH = $(srcdir):$(topdir):$(hdrdir)
-prefix = $(DESTDIR)/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr
+srcdir = /Volumes/MacintoshHD/Projects/Daikini/octave-ruby/ext/octave_api
+topdir = /Users/jonathan/.rbenv/versions/1.9.3-p286/include/ruby-1.9.1
+hdrdir = /Users/jonathan/.rbenv/versions/1.9.3-p286/include/ruby-1.9.1
+arch_hdrdir = /Users/jonathan/.rbenv/versions/1.9.3-p286/include/ruby-1.9.1/$(arch)
+VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
+prefix = $(DESTDIR)/Users/jonathan/.rbenv/versions/1.9.3-p286
+rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
 exec_prefix = $(prefix)
-sitedir = $(DESTDIR)/Library/Ruby/Site
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-datarootdir = $(prefix)/share
-archdir = $(rubylibdir)/$(arch)
-sbindir = $(exec_prefix)/sbin
-psdir = $(docdir)
+vendorhdrdir = $(rubyhdrdir)/vendor_ruby
+sitehdrdir = $(rubyhdrdir)/site_ruby
+rubyhdrdir = $(includedir)/$(RUBY_BASE_NAME)-$(ruby_version)
+vendordir = $(rubylibprefix)/vendor_ruby
+sitedir = $(rubylibprefix)/site_ruby
+ridir = $(datarootdir)/$(RI_BASE_NAME)
+mandir = $(datarootdir)/man
 localedir = $(datarootdir)/locale
+libdir = $(exec_prefix)/lib
+psdir = $(docdir)
+pdfdir = $(docdir)
+dvidir = $(docdir)
 htmldir = $(docdir)
-datadir = $(datarootdir)
+infodir = $(datarootdir)/info
+docdir = $(datarootdir)/doc/$(PACKAGE)
+oldincludedir = $(DESTDIR)/usr/include
 includedir = $(prefix)/include
-infodir = $(DESTDIR)/usr/share/info
-sysconfdir = $(prefix)/etc
-mandir = $(DESTDIR)/usr/share/man
-libdir = $(exec_prefix)/lib
+localstatedir = $(prefix)/var
 sharedstatedir = $(prefix)/com
-oldincludedir = $(DESTDIR)/usr/include
-pdfdir = $(docdir)
-sitearchdir = $(sitelibdir)/$(sitearch)
+sysconfdir = $(prefix)/etc
+datadir = $(datarootdir)
+datarootdir = $(prefix)/share
+libexecdir = $(exec_prefix)/libexec
+sbindir = $(exec_prefix)/sbin
 bindir = $(exec_prefix)/bin
-localstatedir = $(prefix)/var
+rubylibdir = $(rubylibprefix)/$(ruby_version)
+archdir = $(rubylibdir)/$(arch)
 sitelibdir = $(sitedir)/$(ruby_version)
-libexecdir = $(exec_prefix)/libexec
+sitearchdir = $(sitelibdir)/$(sitearch)
+vendorlibdir = $(vendordir)/$(ruby_version)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
+
+NULLCMD = :
 
 CC = gcc
-LIBRUBY = $(LIBRUBY_SO)
+CXX = g++
+LIBRUBY = $(LIBRUBY_A)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)
+LIBRUBYARG_SHARED = 
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+empty =
+OUTFLAG = -o $(empty)
+COUTFLAG = -o $(empty)
 
 RUBY_EXTCONF_H = 
-CFLAGS   =  -fno-common -arch i386 -Os -pipe -fno-common 
-INCFLAGS = -I. -I. -I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin9.0 -I.
-CPPFLAGS = -DHAVE_OCTAVE_H -I/Applications/Octave.app/Contents/Resources/include -I/Applications/Octave.app/Contents/Resources/lib -I/Applications/Octave.app/Contents/Resources/include/octave-3.0.2/octave -I/Applications/Octave.app/Contents/Resources/lib/octave-3.0.2 -I/Applications/Octave.app/Contents/Resources/include/octave-3.0.2
-CXXFLAGS = $(CFLAGS) 
-DLDFLAGS = -L. -arch i386  
+cflags   =  $(optflags) $(debugflags) $(warnflags)
+optflags = -O3
+debugflags = -ggdb
+warnflags = -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wshorten-64-to-32 -Wimplicit-function-declaration
+CFLAGS   = -fno-common $(cflags)  -pipe $(ARCH_FLAG)
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
+DEFS     = 
+CPPFLAGS = -DHAVE_OCTAVE_H -I/usr/local/include -I/usr/local/lib/octave -I/usr/local/include/octave-3.6.2/octave -I/usr/local/lib/octave/3.6.2 -I/usr/local/include/octave-3.6.2
+CXXFLAGS = $(CFLAGS) $(cxxflags)
+ldflags  = -L. -L'/Users/jonathan/.rbenv/versions/1.9.3-p286/lib' 
+dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress -Wl,-flat_namespace
+ARCH_FLAG = 
+DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
 LDSHARED = g++ -pipe -bundle
+LDSHAREDXX = $(CXX) -dynamic -bundle
 AR = ar
 EXEEXT = 
 
+RUBY_BASE_NAME = ruby
 RUBY_INSTALL_NAME = ruby
 RUBY_SO_NAME = ruby
-arch = universal-darwin9.0
-sitearch = universal-darwin9.0
-ruby_version = 1.8
-ruby = /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+arch = x86_64-darwin12.2.0
+sitearch = $(arch)
+ruby_version = 1.9.1
+ruby = /Users/jonathan/.rbenv/versions/1.9.3-p286/bin/ruby
 RUBY = $(ruby)
 RM = rm -f
+RM_RF = $(RUBY) -run -e rm -- -rf
+RMDIRS = rmdir -p
 MAKEDIRS = mkdir -p
 INSTALL = /usr/bin/install -c
 INSTALL_PROG = $(INSTALL) -m 0755
@@ -68,18 +103,19 @@ COPY = cp
 
 preload = 
 
-libpath = . $(libdir) /Applications/Octave.app/Contents/Resources/lib /Applications/Octave.app/Contents/Resources/lib/octave-3.0.2
-LIBPATH =  -L"." -L"$(libdir)" -L"/Applications/Octave.app/Contents/Resources/lib" -L"/Applications/Octave.app/Contents/Resources/lib/octave-3.0.2"
+libpath = . $(libdir) /usr/local/lib/octave /usr/local/lib/octave/3.6.2
+LIBPATH =  -L. -L$(libdir) -L/usr/local/lib/octave -L/usr/local/lib/octave/3.6.2
 DEFFILE = 
 
 CLEANFILES = mkmf.log
 DISTCLEANFILES = 
+DISTCLEANDIRS = 
 
 extout = 
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED) -loctinterp -lcruft -loctave  -lpthread -ldl -lm  
+LIBS =  -loctinterp -lcruft -loctave  -lpthread -ldl -lobjc 
 SRCS = octave_api.c octave-ruby.cpp or-array.cpp or-boolean_matrix.cpp or-cell_matrix.cpp or-hash.cpp or-matrix.cpp or-string.cpp or-struct_matrix.cpp or-variable.cpp
 OBJS = octave_api.o octave-ruby.o or-array.o or-boolean_matrix.o or-cell_matrix.o or-hash.o or-matrix.o or-string.o or-struct_matrix.o or-variable.o
 TARGET = octave_api
@@ -87,63 +123,92 @@ DLLIB = $(TARGET).bundle
 EXTSTATIC = 
 STATIC_LIB = 
 
+BINDIR        = $(bindir)
 RUBYCOMMONDIR = $(sitedir)$(target_prefix)
 RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
 RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+HDRDIR        = $(rubyhdrdir)/ruby$(target_prefix)
+ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
 
 TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).bundle $(TARGET).il? $(TARGET).tds $(TARGET).map
-CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
-
-all:		$(DLLIB)
-static:		$(STATIC_LIB)
-
-clean:
+CLEANLIBS     = $(TARGET).bundle 
+CLEANOBJS     = *.o  *.bak
+
+all:    $(DLLIB)
+static: $(STATIC_LIB)
+.PHONY: all install static install-so install-rb
+.PHONY: clean clean-so clean-rb
+
+clean-rb-default::
+clean-rb::
+clean-so::
+clean: clean-so clean-rb-default clean-rb
 		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
 
-distclean:	clean
+distclean-rb-default::
+distclean-rb::
+distclean-so::
+distclean: clean distclean-so distclean-rb-default distclean-rb
 		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
 		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+		@-$(RMDIRS) $(DISTCLEANDIRS) 2> /dev/null || true
 
-realclean:	distclean
+realclean: distclean
 install: install-so install-rb
 
 install-so: $(RUBYARCHDIR)
 install-so: $(RUBYARCHDIR)/$(DLLIB)
 $(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+	@-$(MAKEDIRS) $(@D)
+	$(INSTALL_PROG) $(DLLIB) $(@D)
 install-rb: pre-install-rb install-rb-default
 install-rb-default: pre-install-rb-default
 pre-install-rb: Makefile
 pre-install-rb-default: Makefile
+pre-install-rb-default:
+	$(ECHO) installing default octave_api libraries
 $(RUBYARCHDIR):
-	$(MAKEDIRS) $@
+	$(Q) $(MAKEDIRS) $@
 
 site-install: site-install-so site-install-rb
 site-install-so: install-so
 site-install-rb: install-rb
 
-.SUFFIXES: .c .m .cc .cxx .cpp .C .o
+.SUFFIXES: .c .m .cc .mm .cxx .cpp .C .o
 
 .cc.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.mm.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .cxx.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .cpp.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .C.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .c.o:
-	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
+	$(ECHO) compiling $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
+
+.m.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
 
-$(DLLIB): $(OBJS)
-	@-$(RM) $@
-	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+$(DLLIB): $(OBJS) Makefile
+	$(ECHO) linking shared-object $(DLLIB)
+	@-$(RM) $(@)
+	$(Q) $(LDSHAREDXX) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
 
 
 
-$(OBJS): ruby.h defines.h
+$(OBJS): $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h

data/ext/octave_api/extconf.rb

@@ -7,7 +7,7 @@ dep_dirs = dir_config( "dep", octave_dirs.first.split(File::SEPARATOR)[0..-3].jo
 if have_header("octave.h" ) &&
   have_library("octave") &&
   have_library("cruft") &&
-  have_library("octinterp", "octave_main" )
+  have_library("octinterp")
   
   if Config::CONFIG["arch"] =~ /-darwin\d/
     CONFIG['LDSHARED'] = "g++ -pipe -bundle"
@@ -26,5 +26,9 @@ if have_header("octave.h" ) &&
     end
   end
   
+  if RUBY_VERSION =~ /1.8/ then
+      $CPPFLAGS += " -DRUBY_18"
+  end
+  
   create_makefile( "octave_api" )
 end

data/ext/octave_api/octave-includes.h

@@ -1,3 +1,6 @@
+#ifndef OCTAVE_INCLUDES_H_INCLUDED_
+#define OCTAVE_INCLUDES_H_INCLUDED_
+
 #include "octave/config.h"
 #include "octave.h"
 #include "symtab.h"
@@ -9,3 +12,5 @@
 #include "sighandlers.h"
 #include "sysdep.h"
 #include "ov-struct.h"
+
+#endif /*OCTAVE_INCLUDES_H_INCLUDED_ */

data/ext/octave_api/octave-ruby.cpp

@@ -13,11 +13,11 @@ void initialize_octave()
 
 extern void recover_from_exception(void)
 {
-  unwind_protect::run_all();
+  // unwind_protect::run_all();
   can_interrupt = true;
   octave_interrupt_immediately = 0;
   octave_interrupt_state = 0;
-  octave_allocation_error = 0;
+  octave_exception_state = octave_no_exception;
 }
 
 VALUE or_feval(VALUE function_name, VALUE arguments)
@@ -26,14 +26,14 @@ VALUE or_feval(VALUE function_name, VALUE arguments)
   int i, n;
   octave_value_list argList;
   
-  n = RARRAY(arguments)->len;
+  n = RARRAY_LEN(arguments);
   
   for (i = 0; i < n; i++) {
-    argList(i) = OR_Variable(RARRAY(arguments)->ptr[i]).to_octave();
+    argList(i) = OR_Variable(RARRAY_PTR(arguments)[i]).to_octave();
   }
   
   if (octave_set_current_context) {
-    unwind_protect::run_all();
+    // unwind_protect::run_all();
     raw_mode(0);
   }
 
@@ -41,10 +41,10 @@ VALUE or_feval(VALUE function_name, VALUE arguments)
   octave_initialized = true;
 
   try {
-    curr_sym_tab = top_level_sym_tab;
+    symbol_table::set_scope(symbol_table::top_scope());
     reset_error_handler();
     
-    octave_value_list val = feval(std::string(RSTRING(function_name)->ptr), argList, 1);
+    octave_value_list val = feval(std::string(RSTRING_PTR(function_name)), argList, 1);
     if(val.length() > 0 && val(0).is_defined()) {
       ruby_val = OR_Variable(val(0)).to_ruby();
     }
@@ -60,3 +60,14 @@ VALUE or_feval(VALUE function_name, VALUE arguments)
 
   return(ruby_val);
 }
+
+extern VALUE or_get_variable(VALUE variable_name)
+{
+  return OR_Variable(get_top_level_value(std::string(RSTRING_PTR(variable_name)))).to_ruby();
+}
+
+extern VALUE or_put_variable(VALUE variable_name, VALUE value)
+{
+  set_top_level_value(std::string(RSTRING_PTR(variable_name)), OR_Variable(value).to_octave());
+  return value;
+}

data/ext/octave_api/octave-ruby.h

@@ -7,8 +7,18 @@
 extern "C"
 {
 #endif
+  
+/* Macros for backwards compatibility with 1.8 */
+#ifdef RUBY_18
+  #define RARRAY_LEN(a) (RARRAY(a)->len)
+  #define RARRAY_PTR(a) (RARRAY(a)->ptr)
+  #define RFLOAT_VALUE(v) (RFLOAT(v)->value)
+  #define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#endif
 
 extern VALUE or_feval(VALUE function_name, VALUE arguments);
+extern VALUE or_get_variable(VALUE variable_name);
+extern VALUE or_put_variable(VALUE variable_name, VALUE value);
 extern void initialize_octave();
 
 #ifdef __cplusplus /* extern "C" */

data/ext/octave_api/octave_api.c

@@ -12,7 +12,8 @@ void Init_octave_api() {
   OCTAVE_API = rb_define_module_under(OCTAVE_API, "Native");
   OCTAVE_API = rb_define_module_under(OCTAVE_API, "API");
   rb_define_module_function(OCTAVE_API, "feval", feval, 2);
-  
+  rb_define_module_function(OCTAVE_API, "get_variable", get_variable, 1);
+  rb_define_module_function(OCTAVE_API, "put_variable", put_variable, 2);
   initialize_octave();
 }
 
@@ -20,3 +21,13 @@ VALUE feval(VALUE self, VALUE function_name, VALUE arguments)
 {
   return or_feval(function_name, arguments);
 }
+
+static VALUE get_variable(VALUE self, VALUE variable_name)
+{
+  return or_get_variable(variable_name);
+}
+
+static VALUE put_variable(VALUE self, VALUE variable_name, VALUE value)
+{
+  return or_put_variable(variable_name, value);
+}

data/ext/octave_api/octave_api.h

@@ -7,7 +7,8 @@ extern "C" {
 // Prototype for the initialization method - Ruby calls this, not you
 void Init_octave_api();
 static VALUE feval(VALUE self, VALUE function_name, VALUE arguments);
-
+static VALUE get_variable(VALUE self, VALUE variable_name);
+static VALUE put_variable(VALUE self, VALUE variable_name, VALUE value);
 #ifdef __cplusplus
 }
 #endif

data/ext/octave_api/or-array.cpp

@@ -6,14 +6,14 @@ OR_Array::~OR_Array() {}
 octave_value OR_Array::to_octave()
 {
   int row_index;
-  int number_of_rows = RARRAY(ruby_val)->len;
+  int number_of_rows = RARRAY_LEN(ruby_val);
   VALUE cell;
   
   if (should_convert_to_cell_matrix()) {
     Cell matrix = Cell(number_of_rows, 1);
     
     for (row_index = 0; row_index < number_of_rows; row_index++) {
-      cell = RARRAY(ruby_val)->ptr[row_index];
+      cell = RARRAY_PTR(ruby_val)[row_index];
       matrix(row_index, 0) = OR_Variable(cell).to_octave();
     }
     
@@ -22,10 +22,10 @@ octave_value OR_Array::to_octave()
     Matrix matrix = Matrix(number_of_rows, 1);
     
     for (row_index = 0; row_index < number_of_rows; row_index++) {
-      cell = RARRAY(ruby_val)->ptr[row_index];
+      cell = RARRAY_PTR(ruby_val)[row_index];
 
       if (rb_type(cell) == T_FLOAT) {
-        matrix(row_index, 0) = RFLOAT(cell)->value;
+        matrix(row_index, 0) = RFLOAT_VALUE(cell);
       } else if (rb_type(cell) == T_FIXNUM) {
         matrix(row_index, 0) = FIX2LONG(cell);
       } else {
@@ -42,10 +42,10 @@ bool OR_Array::should_convert_to_cell_matrix()
   int row_index;
   VALUE value;
   VALUE type;
-  int number_of_rows = RARRAY(ruby_val)->len;
+  int number_of_rows = RARRAY_LEN(ruby_val);
 
   for (row_index = 0; row_index < number_of_rows; row_index++) {
-    value = RARRAY(ruby_val)->ptr[row_index];
+    value = RARRAY_PTR(ruby_val)[row_index];
     type = rb_type(value);
     if (type != T_FLOAT && type != T_FIXNUM && value != Qnil) {
       return true;

data/ext/octave_api/or-cell_matrix.cpp

@@ -54,10 +54,10 @@ octave_value OR_CellMatrix::to_octave()
   Cell matrix = Cell(number_of_rows, number_of_columns);
   
   for (row_index = 0; row_index < number_of_rows; row_index++) {
-    row = RARRAY(cells)->ptr[row_index];
+    row = RARRAY_PTR(cells)[row_index];
     
     for (column_index = 0; column_index < number_of_columns; column_index++) {
-      cell = RARRAY(row)->ptr[column_index];
+      cell = RARRAY_PTR(row)[column_index];
       matrix(row_index, column_index) = OR_Variable(cell).to_octave();
     }
   }

data/ext/octave_api/or-hash.cpp

@@ -7,16 +7,16 @@ octave_value OR_Hash::to_octave()
 {
   int i;
   VALUE names = rb_funcall(ruby_val, rb_intern("keys"), 0);
-  int number_of_keys = RARRAY(names)->len;
+  int number_of_keys = RARRAY_LEN(names);
 
   string_vector keys = string_vector();
   for (i = 0; i < number_of_keys; i++) {
-    keys.append(std::string(RSTRING(RARRAY(names)->ptr[i])->ptr));
+    keys.append(std::string(RSTRING_PTR(RARRAY_PTR(names)[i])));
   }
 
   Octave_map struct_matrix = Octave_map(dim_vector(1, 1), Cell(keys));
   for (i = 0; i < number_of_keys; i++) {
-    struct_matrix.contents(std::string(RSTRING(RARRAY(names)->ptr[i])->ptr)) = OR_Variable(rb_hash_aref(ruby_val, rb_str_new2(RSTRING(RARRAY(names)->ptr[i])->ptr))).to_octave();
+    struct_matrix.contents(std::string(RSTRING_PTR(RARRAY_PTR(names)[i]))) = OR_Variable(rb_hash_aref(ruby_val, rb_str_new2(RSTRING_PTR(RARRAY_PTR(names)[i])))).to_octave();
   }
 
   return struct_matrix;

data/ext/octave_api/or-matrix.cpp

@@ -70,13 +70,13 @@ octave_value OR_Matrix::to_octave()
   Matrix matrix = Matrix(number_of_rows, number_of_columns);
   
   for (row_index = 0; row_index < number_of_rows; row_index++) {
-    row = RARRAY(cells)->ptr[row_index];
+    row = RARRAY_PTR(cells)[row_index];
     
     for (column_index = 0; column_index < number_of_columns; column_index++) {
-      cell = RARRAY(row)->ptr[column_index];
+      cell = RARRAY_PTR(row)[column_index];
       
       if (rb_type(cell) == T_FLOAT) {
-        matrix(row_index, column_index) = RFLOAT(cell)->value;
+        matrix(row_index, column_index) = RFLOAT_VALUE(cell);
       } else if (rb_type(cell) == T_FIXNUM) {
         matrix(row_index, column_index) = FIX2LONG(cell);
       } else {

data/ext/octave_api/or-string.cpp

@@ -9,5 +9,5 @@ VALUE OR_String::to_ruby()
 
 octave_value OR_String::to_octave()
 {
-  return std::string(RSTRING(ruby_val)->ptr);
+  return std::string(RSTRING_PTR(ruby_val));
 }

data/ext/octave_api/or-struct_matrix.cpp

@@ -62,24 +62,24 @@ octave_value OR_StructMatrix::to_octave()
   VALUE row, cell;
   VALUE cells = rb_iv_get(ruby_val, "@cells");
   VALUE names = rb_iv_get(ruby_val, "@names");
-  int number_of_keys = RARRAY(names)->len;
+  int number_of_keys = RARRAY_LEN(names);
   int number_of_rows = FIX2INT(rb_iv_get(ruby_val, "@m"));
   int number_of_columns = FIX2INT(rb_iv_get(ruby_val, "@n"));
 
   string_vector keys = string_vector();
   for (i = 0; i < number_of_keys; i++) {
-    keys.append(std::string(RSTRING(RARRAY(names)->ptr[i])->ptr));
+    keys.append(std::string(RSTRING_PTR(RARRAY_PTR(names)[i])));
   }
   
   Octave_map struct_matrix = Octave_map(dim_vector(number_of_rows, number_of_columns), Cell(keys));
   for (row_index = 0; row_index < number_of_rows; row_index++) {
-    row = RARRAY(cells)->ptr[row_index];
+    row = RARRAY_PTR(cells)[row_index];
   
     for (column_index = 0; column_index < number_of_columns; column_index++) {
-      cell = RARRAY(row)->ptr[column_index];
+      cell = RARRAY_PTR(row)[column_index];
       
       for (i = 0; i < number_of_keys; i++) {
-        struct_matrix.contents(std::string(RSTRING(RARRAY(names)->ptr[i])->ptr))(row_index, column_index) = OR_Variable(rb_hash_aref(cell, rb_str_new2(RSTRING(RARRAY(names)->ptr[i])->ptr))).to_octave();
+        struct_matrix.contents(std::string(RSTRING_PTR(RARRAY_PTR(names)[i])))(row_index, column_index) = OR_Variable(rb_hash_aref(cell, rb_str_new2(RSTRING_PTR(RARRAY_PTR(names)[i])))).to_octave();
       }
     }
   }

data/ext/octave_api/or-variable.cpp

@@ -39,7 +39,7 @@ octave_value OR_Variable::to_octave()
   } else if (ruby_val == Qnil) {
     return octave_NaN;
   } else if (rb_type(ruby_val) == T_FLOAT) {
-    return RFLOAT(ruby_val)->value;
+    return RFLOAT_VALUE(ruby_val);
   } else if (rb_type(ruby_val) == T_FIXNUM) {
     return FIX2LONG(ruby_val);
   } else if (rb_obj_is_kind_of(ruby_val, rb_path2class("Array")) == Qtrue) {

data/lib/octave/driver/native/driver.rb

@@ -11,16 +11,11 @@ module Octave ; module Driver ; module Native
     end
     
     def put_variable(name, value)
-      global_name = "octave_ruby_#{name}"
-      feval("eval", "function octave_ruby_put_variable(value) global #{global_name}; #{global_name} = value; endfunction")
-      feval("octave_ruby_put_variable", value)
-      result = feval("eval", "global #{global_name}; #{name} = #{global_name}")
-      feval("clear", global_name)
-      result
+      API.put_variable(name, value)
     end
     
     def get_variable(name)
-      feval("eval", name)
+      API.get_variable(name)
     end  
   end
 end ; end ; end

data/octave-ruby.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = %q{octave-ruby}
-  s.version = "1.0.9"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jonathan Younger"]
-  s.date = %q{2008-12-30}
+  s.date = %q{2012-11-08}
   s.description = %q{== USAGE:  require 'octave'  engine = Octave::Engine.new engine.eval "123.456 * 789.101112" engine.rand(10)  matrix = Octave::Matrix.new(20, 400) 20.times { |m| 400.times { |n| matrix[m, n] = rand } } engine.put_variable("m", matrix)  engine.save "/tmp/20_x_400_matrix"  == REQUIREMENTS:  * Octave * GCC or some other compiler to build the included extension * Mocha (For testing only)}
   s.email = ["jonathan@daikini.com"]
   s.extensions = ["ext/octave_api/extconf.rb"]

data/test/driver/native/test_conversions.rb

@@ -9,11 +9,11 @@ require 'yaml'
 class ConversionsTest < Test::Unit::TestCase
   def setup
     @driver = Octave::Driver::Native::Driver.new
-    @driver.feval "eval", "function r = to_octave(val); r = val; endfunction"
   end
   
   def to_octave_to_ruby(value)
-    @driver.feval "to_octave", value
+    @driver.put_variable("to_octave_to_ruby_variable", value)
+    @driver.get_variable("to_octave_to_ruby_variable")
   end
   
   def assert_octave_and_ruby_equal(value)
@@ -197,7 +197,8 @@ class ConversionsTest < Test::Unit::TestCase
   
   def test_should_convert_boolean_matrix
     assert_octave_and_ruby_equal [true, false, true]
-    boolean_matrix = @driver.feval "eval", "x = [1,2]; (x > 2 | x < 2)"
+    @driver.put_variable("x", [1,2])
+    boolean_matrix = @driver.feval "eval", "(x > 2 | x < 2)"
     assert_equal [true, false], boolean_matrix
   end
 end

data/test/driver/native/test_driver.rb

@@ -24,9 +24,12 @@ class DriverTest < Test::Unit::TestCase
   
   def test_putting_variable_with_same_name_multiple_times
     assert_equal "foo", @driver.put_variable("some_variable_name", "foo")
+    assert_equal "foo", @driver.get_variable("some_variable_name")
+    
     assert_equal "bar", @driver.put_variable("some_variable_name", "bar")
-    assert_equal "baz", @driver.put_variable("some_variable_name", "baz")
+    assert_equal "bar", @driver.get_variable("some_variable_name")
     
+    assert_equal "baz", @driver.put_variable("some_variable_name", "baz")
     assert_equal "baz", @driver.get_variable("some_variable_name")
   end
 end

data/test/test_engine.rb

@@ -19,12 +19,15 @@ class EngineTest_Init < Test::Unit::TestCase
     exception = assert_raise(LoadError) do
       engine = Octave::Engine.new(:driver => "foo")
     end
-    assert_equal "no such file to load -- octave/driver/foo/driver", exception.message
+    
+    expected_message = "-- octave/driver/foo/driver"
+    assert_equal expected_message, exception.message[-expected_message.length, expected_message.length]
     
     exception = assert_raise(LoadError) do
       engine = Octave::Engine.new(:driver => :bar)
     end
-    assert_equal "no such file to load -- octave/driver/bar/driver", exception.message
+    expected_message = "-- octave/driver/bar/driver"
+    assert_equal expected_message, exception.message[-expected_message.length, expected_message.length]
   end
   
   def test_new_with_native_driver

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: octave-ruby
 version: !ruby/object:Gem::Version 
-  version: 1.0.9
+  prerelease: false
+  segments: 
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Jonathan Younger
@@ -9,19 +14,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-30 00:00:00 -07:00
+date: 2012-11-08 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.2
-    version: 
+dependencies: []
+
 description: "== USAGE:  require 'octave'  engine = Octave::Engine.new engine.eval \"123.456 * 789.101112\" engine.rand(10)  matrix = Octave::Matrix.new(20, 400) 20.times { |m| 400.times { |n| matrix[m, n] = rand } } engine.put_variable(\"m\", matrix)  engine.save \"/tmp/20_x_400_matrix\"  == REQUIREMENTS:  * Octave * GCC or some other compiler to build the included extension * Mocha (For testing only)"
 email: 
 - jonathan@daikini.com
@@ -76,6 +72,8 @@ files:
 - test/test_engine.rb
 has_rdoc: true
 homepage: http://octave-ruby.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -87,20 +85,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: octave-ruby
-rubygems_version: 1.3.1
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A Ruby interface to the Octave interpreted language.
 test_files: 
 - test/driver/native/test_conversions.rb