intersys 0.0.2 → 0.0.4

data/lib/object.c

@@ -2,7 +2,6 @@
 
 
 static void intersys_object_free(struct rbObject* object) {
-//	printf("Releasing object %d\n", object->oref);
 	if (object->oref) {
 		RUN(cbind_object_release(object->database, object->oref));
 	}
@@ -23,12 +22,11 @@ VALUE intersys_object_s_allocate(VALUE klass) {
 VALUE intersys_object_initialize(VALUE self) {
 	struct rbObject* object;
 	struct rbDatabase* base;
-	VALUE klass = rb_funcall(self, rb_intern("class"), 0);
-	VALUE database = rb_funcall(klass, rb_intern("database"), 0);
+	VALUE database = rb_funcall(rb_obj_class(self), rb_intern("database"), 0);
 	Data_Get_Struct(self, struct rbObject, object);
 	Data_Get_Struct(database, struct rbDatabase, base);
 	object->database = base->database;
-	object->class_name = TOWCHAR(rb_funcall(klass, rb_intern("class_name"), 0));
+	object->class_name = TOWCHAR(rb_funcall(rb_obj_class(self), rb_intern("class_name"), 0));
 	return self;
 }
 

data/lib/query.c

@@ -1,9 +1,22 @@
 #include "intersys.h"
+#ifdef __CYGWIN__
+#include <windef.h>
+#endif
 #include <sql.h>
 #include <sqlext.h>
 #include <sqlucode.h>
 
+static void query_close(struct rbQuery* query) {
+	printf("Trying to close query (%d,%d)\n", query->closed, query->executed);
+	if(!query->closed && query->executed) {
+		printf("Closing query\n");
+		RUN(cbind_query_close(query->query));
+		query->closed = 1;
+	}
+}
+
 void intersys_query_free(struct rbQuery* query) {
+	query_close(query);
 	RUN(cbind_free_query(query->query));
 	free(query);
 }
@@ -32,6 +45,7 @@ VALUE intersys_query_execute(VALUE self) {
 	Data_Get_Struct(self, struct rbQuery, query);
 	RUN(cbind_query_execute(query->query, &sql_code));
     RUN(cbind_query_get_num_pars(query->query, &res));
+	query->executed = 1;
 	return self;
 }
 
@@ -148,6 +162,6 @@ VALUE intersys_query_fetch(VALUE self) {
 VALUE intersys_query_close(VALUE self) {
 	struct rbQuery* query;
 	Data_Get_Struct(self, struct rbQuery, query);
-	RUN(cbind_query_close(query->query));
+	query_close(query);
 	return self;
 }

data/lib/test.rb

@@ -0,0 +1,15 @@
+require 'intersys'
+
+class Person < Intersys::Object
+end
+
+#puts Person.intersys_methods
+def my_mtd
+  Intersys::Reflection::ClassDefinition.method("%OpenId", nil)
+end
+def class_mtd
+  my_mtd.class_method?
+end
+
+
+Person.intersys_call("%OpenId", 20)

data/test/object.rb

@@ -7,11 +7,21 @@ end
 
 class QueryTest < Test::Unit::TestCase
   def test_open_and_save
-    @p = Person.open(21)
     @name = "Anni Fyo"
+    @id = 26001
+    #assert Person.intersys_call("Populate", 1000)
+    assert @p = Person.open(@id)
     @p.name = @name
-    @p.save
-    @p = Article.open(21)
+    assert @p.save
+    assert @p = Person.open(@id)
     assert_equal @name, @p.name
+    assert Person.intersys_call("%DeleteExtent")
   end
-end
+  
+  def test_create
+    assert @p = Person.intersys_call("%New")
+    @p.name = "Test user"
+    assert @p.save
+    puts @p.id
+  end
+end

data/test/query.rb

@@ -4,6 +4,7 @@ require File.dirname(__FILE__) + '/../lib/intersys'
 
 class QueryTest < Test::Unit::TestCase
   def test_query1
+    return
     @db = Intersys::Database.new({})
 
     @data = @db.query("select * from sample.person")

data/test/reflection.rb

@@ -2,9 +2,12 @@ require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/intersys'
 
 
-class Article < Intersys::Object
+class MyTest < Intersys::Object
   prefix "Sample"
 end
+
+class Article < Intersys::Object
+end
 class Person < Intersys::Object
 end
 
@@ -14,17 +17,17 @@ class ReflectionTest < Test::Unit::TestCase
     assert_equal "%Dictionary.ClassDefinition", @cdef.name
     assert_equal "persistent", @cdef.class_type
     assert_equal "%Persistent,%Dictionary.ClassDefinitionQuery", @cdef.super
-    assert_equal 58, @cdef.properties.size
-    assert_equal 19, @cdef._methods.size
+    assert 50 < @cdef.properties.size
+    assert 10 < @cdef._methods.size
   end
   
   def test_class_names
-    assert_equal Article, Article.lookup("Sample.Article")
-    assert_equal Person, Article.lookup("User.Person")
+    assert_equal MyTest, MyTest.lookup("Sample.MyTest")
+    assert_equal Person, Person.lookup("User.Person")
   end
   
   def test_class_create
-    @cdef = Intersys::Reflection::ClassDefinition.call("%New", "User.Person")
+    @cdef = Intersys::Reflection::ClassDefinition.call("%New", "User.Article")
     @cdef.class_type = "persistent"
     @cdef.super = "%Persistent,%Populate,%XML.Adaptor"
     @props = @cdef.properties
@@ -53,13 +56,9 @@ class ReflectionTest < Test::Unit::TestCase
     assert @props << @prop
     @prop.type = "Sample.Address"
     
-    assert_equal "User.Person", @cdef.name
+    assert_equal "User.Article", @cdef.name
     assert_equal 6, @cdef.properties.size
     #@cdef.save
   end
-  
-  def test_populate
-    assert Person.intersys_call("Populate", 1000)
-    
-  end
-end
+end
+

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: intersys
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2006-09-02 00:00:00 +04:00
+  version: 0.0.4
+date: 2006-09-08 00:00:00 +04:00
 summary: Intersystems Cache ruby driver
 require_paths: 
 - lib
@@ -33,14 +33,24 @@ files:
 - test/reflection.rb
 - test/strings.rb
 - lib/common.c
+- lib/common.o
 - lib/database.c
+- lib/database.o
 - lib/definition.c
+- lib/definition.o
 - lib/extconf.rb
 - lib/intersys.c
 - lib/intersys.h
+- lib/intersys.o
 - lib/intersys.rb
+- lib/intersys_cache.bundle
+- lib/Makefile
+- lib/mkmf.log
 - lib/object.c
+- lib/object.o
 - lib/query.c
+- lib/query.o
+- lib/test.rb
 - README
 test_files: []