intersys 0.1 → 0.2

data/lib/Makefile

@@ -4,11 +4,11 @@ SHELL = /bin/sh
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /opt/local/lib/ruby/1.8/powerpc-darwin8.4.0
+topdir = /opt/local/lib/ruby/1.8/i686-darwin8.7.1
 hdrdir = $(topdir)
 VPATH = $(srcdir):$(topdir):$(hdrdir)
 prefix = $(DESTDIR)/opt/local
-exec_prefix = $(DESTDIR)/opt/local
+exec_prefix = $(prefix)
 sitedir = $(prefix)/lib/ruby/site_ruby
 rubylibdir = $(libdir)/ruby/$(ruby_version)
 archdir = $(rubylibdir)/$(arch)
@@ -19,7 +19,7 @@ includedir = $(prefix)/include
 infodir = $(prefix)/info
 sysconfdir = $(prefix)/etc
 mandir = $(DESTDIR)/opt/local/share/man
-libdir = $(DESTDIR)/opt/local/lib
+libdir = $(exec_prefix)/lib
 sharedstatedir = $(prefix)/com
 oldincludedir = $(DESTDIR)/usr/include
 sitearchdir = $(sitelibdir)/$(sitearch)
@@ -36,19 +36,19 @@ LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
 LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
 LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
 
-CFLAGS   =  -fno-common -O -pipe -I/opt/local/include  -fno-common -pipe -fno-common -I/Applications/Cache/dev/cpp/include -I/cygdrive/c/Progra~1/Cache/dev/cpp/include -I/cygdrive/c/Cachesys/dev/cpp/include -Wall 
-CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)  -O -pipe -I/opt/local/include
+CFLAGS   =  -fno-common -O -pipe -I/opt/local/include  -fno-common -pipe -fno-common -I/home/max/cache/dev/cpp/include -I/Applications/Cache/dev/cpp/include -I/cygdrive/c/Progra~1/Cache/dev/cpp/include -I/cygdrive/c/Cachesys/dev/cpp/include -IC:/Cachesys/dev/cpp/include -I./sql_include -Wall 
+CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir) -DHAVE_C_API_H -DHAVE_SQL_H -DHAVE_SQLEXT_H -O -pipe -I/opt/local/include
 CXXFLAGS = $(CFLAGS) 
-DLDFLAGS = -L/opt/local/lib  
+DLDFLAGS = -L/opt/local/lib -L/home/max/cache/dev/cpp/lib -L/Applications/Cache/dev/cpp/lib -L/cygdrive/c/Progra~1/Cache/dev/cpp/lib -L/cygdrive/c/Cachesys/dev/cpp/lib -LC:/Cachesys/dev/cpp/lib -Wall  
 LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
 AR = ar
 EXEEXT = 
 
 RUBY_INSTALL_NAME = ruby
 RUBY_SO_NAME = ruby
-arch = powerpc-darwin8.4.0
-sitearch = powerpc-darwin8.4.0
-vendorarch = powerpc-darwin8.4.0
+arch = i686-darwin8.7.1
+sitearch = i686-darwin8.7.1
+vendorarch = i686-darwin8.7.1
 ruby_version = 1.8
 ruby = /opt/local/bin/ruby
 RUBY = $(ruby)

data/lib/callable.rb

@@ -0,0 +1,86 @@
+module Intersys
+
+module Callable
+  # Returns ClassDefinition object for current class
+  def intersys_reflector
+    @reflector ||= Intersys::Reflection::ClassDefinition.open(class_name)
+  end
+  
+  # returns list of methods for this class
+  def intersys_methods
+    @methods ||= intersys_reflector._methods
+  end
+
+  # returns list of properties for current class
+  def intersys_properties
+    @properties ||= intersys_reflector.properties
+  end
+  
+#protected
+  # Loads property definition with required name for required object
+  # for internal use only
+  def intersys_property(name)
+    Property.new(database, class_name, name.to_s, self)
+  end
+
+  # Loads method definition with required name for required object
+  # for internal use only
+  def intersys_method(name)
+    Method.new(database, class_name, name.to_s, self)
+  end
+  
+public
+  # call class method
+  def intersys_call(method_name, *args)
+    intersys_method(method_name).call!(args)
+  end
+  alias :call :intersys_call
+  
+  def intersys_has_property?(property)
+    self.intersys_reflector.properties.to_a.include?(property)
+  end
+  
+  def intersys_has_method?(method)
+    self.intersys_reflector._methods.to_a.include?(method)
+  end
+  
+  # Get the specified property
+  def intersys_get(property)
+    intersys_property(property).get
+  end
+  
+  # Set the specified property
+  def intersys_set(property, value)
+    intersys_property(property).set(value)
+  end
+
+  def method_missing(method, *args)
+    method_name = method.to_s.camelize
+    if match_data = method_name.match(/intersys_(.*)/)
+      # Protection from errors in this method
+      return super(method, *args)
+    end
+    if match_data = method_name.match(/(\w+)=/)
+      return intersys_set(match_data.captures.first, args.first)
+    end
+    return intersys_get(method_name) if intersys_has_property?(method_name) && args.empty?
+    begin
+      return intersys_call(method_name, *args)
+    rescue NoMethodError => e
+    end
+    begin
+      return intersys_call("%"+method_name, *args)
+    rescue NoMethodError => e
+    end
+    super(method, *args)
+  end
+  
+end
+
+
+class Object
+  include Callable
+end
+Intersys::Object.extend(Callable)
+
+end

data/lib/database.c

@@ -1,8 +1,15 @@
 #include "intersys.h"
 
-void intersys_base_free(struct rbDatabase* base) {
+
+static void intersys_base_real_close(struct rbDatabase* base) {
+	if(base->closed) return;
+	base->closed = 1;
 	RUN(cbind_free_db(base->database));
 	RUN(cbind_free_conn(base->connection));
+}
+
+void intersys_base_free(struct rbDatabase* base) {
+	intersys_base_real_close(base);
 	free(base);
 }
 
@@ -32,6 +39,7 @@ VALUE intersys_base_connect(VALUE self, VALUE options) {
 	char conn_str[256];
 	wchar_t w_conn_str[256];
 	int size;
+	bool_t is_uni;
 
 	VALUE host, port, user, password, namespace, timeout;
 
@@ -58,9 +66,21 @@ VALUE intersys_base_connect(VALUE self, VALUE options) {
 	RUN(cbind_alloc_conn(w_conn_str, WCHARSTR(user), WCHARSTR(password),
 		FIX2INT(timeout), &base->connection));
 	RUN(cbind_alloc_db(base->connection, &base->database));
+	RUN(cbind_is_uni_srv(base->database, &is_uni));
+	if(!is_uni) {
+		rb_warn("Warning! Cache database is not in Unicode mode. Perhaps, everything will fail working. In this case contact max@maxidoors.ru");
+	}
 	return self;
 }
 
+VALUE intersys_base_close(VALUE self) {
+	struct rbDatabase* base;
+	Data_Get_Struct(self, struct rbDatabase, base);
+	intersys_base_real_close(base);
+	return Qtrue;
+}
+
+
 VALUE intersys_base_start(VALUE self) {
 	struct rbDatabase* base;
 	Data_Get_Struct(self, struct rbDatabase, base);

data/lib/extconf.rb

@@ -1,9 +1,11 @@
 #!/usr/bin/env ruby
 
 require "mkmf"
-#CONFIG["CPP"] = "g++"
-CONFIG["CC"] = "gcc -g"
 
+CONFIG["CC"] = "gcc -g" unless RUBY_PLATFORM.match /mswin/
+
+WIN32 = RUBY_PLATFORM.match(/mswin/)
+MACOS = RUBY_PLATFORM.match(/darwin/)
 
 #alias :old_cpp_include :cpp_include
 #def cpp_include(header)
@@ -13,14 +15,14 @@ CONFIG["CC"] = "gcc -g"
 #EOF
 #end
 
-@cache_placements = ["/Applications/Cache", "/cygdrive/c/Progra~1/Cache", "/cygdrive/c/Cachesys"]
+@cache_placements = ["/home/max/cache", "/Applications/Cache", "/cygdrive/c/Progra~1/Cache", "/cygdrive/c/Cachesys", "C:/Cachesys"]
 
 def locations(suffix)
-  @cache_placements.map {|place| place + suffix}
-end
+  @cache_placements.map {|place| place + suffix}.map{|place| place.split("/").join(WIN32 ? "\\" : "/") }
+end                                                                                             
 
 def include_locations
-  locations("/dev/cpp/include")
+  locations("/dev/cpp/include") + ["./sql_include"]
 end
 
 def library_locations
@@ -31,9 +33,31 @@ end
 def include_flags
   " "+(include_locations.map { |place| "-I"+place} + ["-Wall"]).join(" ")
 end
-find_header "c_api.h", *include_locations
+
+if WIN32
+  $CFLAGS << ' -I"C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\PlatformSDK\\Include" '
+  $CFLAGS << ' -I"C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\include" '
+  $LDFLAGS << ' -libpath:"C:\\CacheSys\\dev\\cpp\\lib" '
+  $LDFLAGS << ' -libpath:"C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib" '
+  $LDFLAGS << ' -libpath:"C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\PlatformSDK\\Lib" '
+end
+
+
+def link_flags
+  " "+(library_locations.map { |place| "-L"+place} + ["-Wall"]).join(" ")
+end
+
 $CFLAGS << include_flags
-#$LDFLAGS << "-Wl,-no-export-libs,cbind.lib"
-find_library "cbind", "cbind_alloc_db",*library_locations
+$LDFLAGS << link_flags
+
+have_header "c_api.h"
+have_header "sql.h"
+have_header "sqlext.h"
+
+unless MACOS
+  find_library "cbind", "cbind_alloc_db",*library_locations
+end
+
+
 create_makefile 'intersys_cache'
 

data/lib/global.c

@@ -0,0 +1,66 @@
+#include "intersys.h"
+
+
+static void intersys_global_mark(struct rbGlobal* global) {
+	rb_gc_mark(global->name);
+}
+
+VALUE intersys_global_s_allocate(VALUE klass) {
+	struct rbGlobal* global = ALLOC(struct rbGlobal);
+	global->name = Qnil;
+	return Data_Wrap_Struct(klass, intersys_global_mark, 0, global);
+}
+
+VALUE intersys_global_initialize(VALUE self, VALUE name) {
+	struct rbGlobal* global;
+	Data_Get_Struct(self, struct rbGlobal, global);
+	global->name = name;
+	return self;
+}
+
+VALUE intersys_global_set(int argc, VALUE *argv, VALUE self) {
+	struct rbGlobal* global;
+	int i;
+	VALUE value = argv[argc - 1];
+	argc--;
+	Data_Get_Struct(self, struct rbGlobal, global);
+	for(i = 0; i < argc; i++) {
+		// marshall dimension
+	}
+	// perform setting with value
+	return Qnil;
+	return value;
+}
+
+
+VALUE intersys_global_get(int argc, VALUE *argv, VALUE self) {
+	struct rbGlobal* global;
+	int i;
+	VALUE value = Qnil;
+	Data_Get_Struct(self, struct rbGlobal, global);
+	for(i = 0; i < argc; i++) {
+		// marshall dimension
+	}
+	// perform getting with value
+	return value;
+}
+
+VALUE intersys_global_delete(int argc, VALUE *argv, VALUE self) {
+	struct rbGlobal* global;
+	int i;
+	Data_Get_Struct(self, struct rbGlobal, global);
+	for(i = 0; i < argc; i++) {
+		// marshall dimension
+	}
+	// perform getting with value
+	return Qnil;
+}
+
+
+VALUE intersys_global_name(VALUE self) {
+	struct rbGlobal* global;
+	Data_Get_Struct(self, struct rbGlobal, global);
+	return global->name;
+}
+
+

data/lib/intersys.c

@@ -1,8 +1,12 @@
 #include "intersys.h"
 
-VALUE mIntersys, cDatabase, cQuery, cObject, cDefinition, cProperty, cMethod, cArgument;
+VALUE mIntersys, cDatabase, cObject, cDefinition, cProperty, cMethod, cArgument, cGlobal;
 VALUE cTime, cMarshallError, cUnMarshallError, cObjectNotFound, cIntersysException, cStatus;
 
+#ifdef HAVE_SQL_H
+VALUE cQuery;
+#endif
+
 void Init_intersys_cache() {
 	rb_define_method(rb_cString, "to_wchar", string_to_wchar, 0);
 	rb_define_method(rb_cString, "from_wchar", string_from_wchar, 0);
@@ -35,15 +39,24 @@ void Init_intersys_cache() {
 	rb_define_method(cDatabase, "rollback_db_transaction", intersys_base_rollback, 0);
 	rb_define_method(cDatabase, "rollback", intersys_base_rollback, 0);
 	rb_define_method(cDatabase, "level", intersys_base_level, 0);
+	rb_define_method(cDatabase, "close!", intersys_base_close, 0);
 
+#ifdef HAVE_SQL_H
 	cQuery = rb_define_class_under(mIntersys, "Query", rb_cObject);
 	rb_define_alloc_func(cQuery, intersys_query_s_allocate);
-	rb_define_method(cQuery, "native_initialize", intersys_query_initialize, 2);
+	rb_define_method(cQuery, "initialize", intersys_query_initialize, 2);
+	rb_define_method(cQuery, "bind_params", intersys_query_bind_params, 1);
 	rb_define_method(cQuery, "execute", intersys_query_execute, 0);
 	rb_define_method(cQuery, "fetch", intersys_query_fetch, 0);
+	rb_define_method(cQuery, "each", intersys_query_each, 0);
 	rb_define_method(cQuery, "column_name", intersys_query_column_name, 1);
 	rb_define_method(cQuery, "get_data", intersys_query_get_data, 1);
 	rb_define_method(cQuery, "close", intersys_query_close, 0);
+	rb_define_method(cQuery, "limit", intersys_query_get_limit, 0);
+	rb_define_method(cQuery, "limit=", intersys_query_set_limit, 1);
+	rb_define_method(cQuery, "offset", intersys_query_get_offset, 0);
+	rb_define_method(cQuery, "offset=", intersys_query_set_offset, 1);
+#endif
 
 	cObject = rb_define_class_under(mIntersys, "Object", rb_cObject);
 	rb_define_alloc_func(cObject, intersys_object_s_allocate);
@@ -76,6 +89,7 @@ void Init_intersys_cache() {
 	cArgument = rb_define_class_under(mIntersys, "Argument", cDefinition);
 	rb_define_method(cArgument, "initialize", intersys_argument_initialize, 4);
 	rb_define_method(cArgument, "default", intersys_argument_default_value, 0);
+	rb_define_method(cArgument, "by_ref?", intersys_argument_is_by_ref, 0);
 	rb_define_method(cArgument, "marshall_dlist_element", intersys_argument_marshall_dlist_elem, 1);
 	rb_define_method(cArgument, "marshall_dlist", intersys_argument_marshall_dlist, 1);
 	/*
@@ -88,6 +102,13 @@ void Init_intersys_cache() {
     "end\n" \
   	"end");
 	*/
-	rb_define_method(cArgument, "by_ref?", intersys_argument_is_by_ref, 0);
+	
+	cGlobal = rb_define_class_under(mIntersys, "Global", rb_cObject);
+	rb_define_alloc_func(cGlobal, intersys_global_s_allocate);
+	rb_define_method(cGlobal, "initialize", intersys_global_initialize, 1);
+	rb_define_method(cGlobal, "[]=", intersys_global_set, -1);
+	rb_define_method(cGlobal, "[]", intersys_global_get, -1);
+	rb_define_method(cGlobal, "delete", intersys_global_delete, -1);
+	rb_define_method(cGlobal, "name", intersys_global_name, 0);
 }
 

data/lib/intersys.h

@@ -10,14 +10,20 @@
 struct rbDatabase {
 	h_connection connection;
 	h_database database;
+	bool_t closed;
 };
 
+
+#ifdef HAVE_SQL_H
 struct rbQuery {
 	h_query query;
 	bool_t empty;
 	bool_t closed;
 	bool_t executed;
+	int offset;
+	int limit;
 };
+#endif
 
 struct rbObject {
 	h_database database;
@@ -62,6 +68,10 @@ struct rbStatus {
 	VALUE message;
 };
 
+struct rbGlobal {
+	VALUE name;	
+};
+
 enum { D_PROPERTY, D_METHOD, D_ARGUMENT};
 
 enum {
@@ -69,7 +79,8 @@ enum {
 };
 
 
-extern VALUE mIntersys, cDatabase, cQuery, cObject, cDefinition, cProperty, cMethod, cArgument, cObjectNotFound, cStatus;
+extern VALUE mIntersys, cDatabase, cQuery, cObject, cDefinition, cProperty, 
+	cMethod, cArgument, cObjectNotFound, cStatus, cGlobal;
 extern VALUE cTime, cMarshallError, cUnMarshallError;
 
 
@@ -92,22 +103,30 @@ VALUE intersys_status_to_s(VALUE self);
 VALUE intersys_base_s_allocate(VALUE klass);
 VALUE intersys_base_initialize(VALUE self, VALUE options);
 VALUE intersys_base_connect(VALUE self, VALUE options);
+VALUE intersys_base_close(VALUE self);
 VALUE intersys_base_start(VALUE self);
 VALUE intersys_base_commit(VALUE self);
 VALUE intersys_base_rollback(VALUE self);
 VALUE intersys_base_level(VALUE self);
 
 
+#ifdef HAVE_SQL_H
 /******* Query functions *******/
 
 VALUE intersys_query_s_allocate(VALUE klass);
 VALUE intersys_query_initialize(VALUE self, VALUE database, VALUE sql_query);
+VALUE intersys_query_bind_params(VALUE self, VALUE params);
 VALUE intersys_query_execute(VALUE self);
 VALUE intersys_query_column_name(VALUE self, VALUE index);
 VALUE intersys_query_get_data(VALUE self, VALUE index);
 VALUE intersys_query_fetch(VALUE self);
+VALUE intersys_query_each(VALUE self);
 VALUE intersys_query_close(VALUE self);
-
+VALUE intersys_query_set_limit(VALUE self, VALUE limit);
+VALUE intersys_query_get_limit(VALUE self);
+VALUE intersys_query_set_offset(VALUE self, VALUE limit);
+VALUE intersys_query_get_offset(VALUE self);
+#endif
 
 
 /******* Object functions *******/
@@ -147,7 +166,14 @@ VALUE intersys_argument_set(VALUE self, VALUE obj);
 VALUE intersys_method_extract_retval(VALUE self);
 
 
+/******* Globals *******/
 
+VALUE intersys_global_s_allocate(VALUE klass);
+VALUE intersys_global_initialize(VALUE self, VALUE name);
+VALUE intersys_global_get(int argc, VALUE* argv, VALUE self);
+VALUE intersys_global_set(int argc, VALUE* argv, VALUE self);
+VALUE intersys_global_delete(int argc, VALUE* argv, VALUE self);
+VALUE intersys_global_name(VALUE self);
 
 
 
@@ -155,6 +181,7 @@ VALUE intersys_method_extract_retval(VALUE self);
 #define QUERY_RUN(x) {int sql_code = 0; (x); run(sql_code, __FILE__, __LINE__);}
 #define STR(x) (RSTRING(x)->ptr)
 #define LEN(x) (RSTRING(x)->len)
+#define CAPA(x) (RSTRING(x)->aux.capa)
 #define CALL(x, method) (rb_funcall((x), rb_intern(method), 0))
 
 #define WCHARSTR(x) ((wchar_t *)STR(x))