slim-attributes 0.6.6 → 0.7.1

data/Rakefile

@@ -12,8 +12,10 @@ begin
     s.authors = ["Stephen Sykes"]
     s.files = FileList["[A-Z]*", "{ext,lib,test}/**/*"]
     s.extensions = "ext/extconf.rb"
+    s.rubyforge_project = 'slim-attributes'
   end
   Jeweler::GemcutterTasks.new
+  Jeweler::RubyforgeTasks.new
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://
 gems.github.com"

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
-:minor: 6
-:patch: 6
+:minor: 7
+:patch: 1

data/ext/Makefile

@@ -0,0 +1,157 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = .
+topdir = /usr/local/lib/ruby/1.8/i686-darwin10.0.0
+hdrdir = $(topdir)
+VPATH = $(srcdir):$(topdir):$(hdrdir)
+exec_prefix = $(prefix)
+prefix = $(DESTDIR)/usr/local
+sharedstatedir = $(prefix)/com
+mandir = $(datarootdir)/man
+psdir = $(docdir)
+oldincludedir = $(DESTDIR)/usr/include
+localedir = $(datarootdir)/locale
+bindir = $(exec_prefix)/bin
+libexecdir = $(exec_prefix)/libexec
+sitedir = $(libdir)/ruby/site_ruby
+htmldir = $(docdir)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
+includedir = $(prefix)/include
+infodir = $(datarootdir)/info
+vendorlibdir = $(vendordir)/$(ruby_version)
+sysconfdir = $(prefix)/etc
+libdir = $(exec_prefix)/lib
+sbindir = $(exec_prefix)/sbin
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+vendordir = $(libdir)/ruby/vendor_ruby
+datarootdir = $(prefix)/share
+pdfdir = $(docdir)
+archdir = $(rubylibdir)/$(arch)
+sitearchdir = $(sitelibdir)/$(sitearch)
+datadir = $(datarootdir)
+localstatedir = $(prefix)/var
+sitelibdir = $(sitedir)/$(ruby_version)
+
+CC = gcc
+LIBRUBY = $(LIBRUBY_A)
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = 
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+
+RUBY_EXTCONF_H = 
+CFLAGS   =  -fno-common -g -O2 -pipe -fno-common $(cflags) -Wall
+INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
+DEFS     = 
+CPPFLAGS =   -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags) -I/usr/local/mysql/include  -g -Os -arch i386 -fno-common   -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT  -DDONT_DECLARE_CXA_PURE_VIRTUAL
+CXXFLAGS = $(CFLAGS) 
+ldflags  = -L. 
+dldflags = 
+archflag = 
+DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
+LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
+AR = ar
+EXEEXT = 
+
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = ruby
+arch = i686-darwin10.0.0
+sitearch = i686-darwin10.0.0
+ruby_version = 1.8
+ruby = /usr/local/bin/ruby
+RUBY = $(ruby)
+RM = rm -f
+MAKEDIRS = mkdir -p
+INSTALL = /usr/bin/install -c
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+COPY = cp
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = . $(libdir)
+LIBPATH =  -L. -L$(libdir)
+DEFFILE = 
+
+CLEANFILES = mkmf.log
+DISTCLEANFILES = 
+
+extout = 
+extout_prefix = 
+target_prefix = 
+LOCAL_LIBS = 
+LIBS =  -L/usr/local/mysql/lib -lmysqlclient -lz -lm     -lmygcc  -ldl -lobjc  
+SRCS = slim_attrib_ext.c
+OBJS = slim_attrib_ext.o
+TARGET = slim_attrib_ext
+DLLIB = $(TARGET).bundle
+EXTSTATIC = 
+STATIC_LIB = 
+
+BINDIR        = $(bindir)
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(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:
+		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+
+distclean:	clean
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+
+realclean:	distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+install-rb: pre-install-rb install-rb-default
+install-rb-default: pre-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+$(RUBYARCHDIR):
+	$(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
+
+.cc.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cxx.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cpp.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.C.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.c.o:
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
+
+$(DLLIB): $(OBJS) Makefile
+	@-$(RM) $@
+	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+
+
+
+$(OBJS): ruby.h defines.h

data/ext/slim_attrib_ext.c

@@ -18,7 +18,8 @@
 #define GetCharStarPtr(obj) (Check_Type(obj, T_DATA), (char**)DATA_PTR(obj))
 
 VALUE cRowHash, cClass;
-ID pointers_id, row_info_id, field_indexes_id, real_hash_id, to_hash_id;
+ID pointers_id, row_info_id, field_indexes_id, real_hash_id, to_hash_id, sq_parens_id, 
+   sq_parens_equal_id, has_key_id;
 
 #define MAX_CACHED_COLUMN_IDS 40
 ID column_ids[MAX_CACHED_COLUMN_IDS];
@@ -30,8 +31,8 @@ struct mysql_res {
 };
 
 // row info
-#define SLIM_IS_NULL (char)0x01
-#define SLIM_IS_SET (char)0x02
+#define SLIM_IS_NULL 0x01
+#define SLIM_IS_SET 0x02
 
 #define GET_COL_IV_ID(str, cnum) (cnum < MAX_CACHED_COLUMN_IDS ? column_ids[cnum] : (sprintf(str, "@col_%ld", cnum), rb_intern(str)))
 
@@ -103,7 +104,7 @@ static VALUE fetch_by_index(VALUE obj, VALUE index) {
   long col_number = FIX2LONG(index);
   unsigned int length;
   row_info = GetCharPtr(rb_ivar_get(obj, row_info_id)) + col_number;  // flags for this column
-  if (*row_info == SLIM_IS_NULL) return Qnil;  // return nil if null from db
+  if (*row_info & SLIM_IS_NULL) return Qnil;  // return nil if null from db
   col_id = GET_COL_IV_ID(col_name, col_number);
   if (*row_info == SLIM_IS_SET) return rb_ivar_get(obj, col_id);  // was made to a string already
   pointers = GetCharStarPtr(rb_ivar_get(obj, pointers_id));  // find the data and make ruby string
@@ -118,12 +119,16 @@ static VALUE fetch_by_index(VALUE obj, VALUE index) {
 // This is the [] method of the row data object.
 // It checks for a real hash, but if none exists it will call fetch_by_index
 static VALUE slim_fetch(VALUE obj, VALUE name) {
-  VALUE field_indexes, hash_lookup;
+  VALUE field_indexes, hash_lookup, real_hash;
   
-  if (REAL_HASH_EXISTS) return rb_hash_aref(rb_ivar_get(obj, real_hash_id), name);
+  if (REAL_HASH_EXISTS) return rb_funcall(rb_ivar_get(obj, real_hash_id), sq_parens_id, 1, name);
 
   hash_lookup = rb_hash_aref(field_indexes, name);
-  if (NIL_P(hash_lookup)) return Qnil;
+  if (NIL_P(hash_lookup)) {
+    real_hash = rb_ivar_get(obj, real_hash_id);
+    if (NIL_P(real_hash)) return Qnil;
+    return rb_funcall(real_hash, sq_parens_id, 1, name);
+  }
   return fetch_by_index(obj, hash_lookup);
 }
 
@@ -136,10 +141,10 @@ static VALUE set_element(VALUE obj, VALUE name, VALUE val) {
   char col_name[16];
   ID col_id;
 
-  if (REAL_HASH_EXISTS) return rb_hash_aset(rb_ivar_get(obj, real_hash_id), name, val);
+  if (REAL_HASH_EXISTS) return rb_funcall(rb_ivar_get(obj, real_hash_id), sq_parens_equal_id, 2, name, val);
   
   hash_lookup = rb_hash_aref(field_indexes, name);  
-  if (NIL_P(hash_lookup)) return rb_hash_aset(rb_funcall(obj, to_hash_id, 0), name, val);
+  if (NIL_P(hash_lookup)) return rb_funcall(rb_funcall(obj, to_hash_id, 0), sq_parens_equal_id, 2, name, val);
   col_number = FIX2LONG(hash_lookup);
   col_id = GET_COL_IV_ID(col_name, col_number);
   rb_ivar_set(obj, col_id, val);
@@ -184,15 +189,20 @@ static VALUE slim_dup(VALUE obj) {
 // Calls to model property methods in AR cause a call to has_key?, so it
 // is implemented here in C for speed.
 static VALUE has_key(VALUE obj, VALUE name) {
-  VALUE field_indexes;
+  VALUE field_indexes, real_hash;
 
 #ifdef RHASH_TBL
   if (REAL_HASH_EXISTS) return (st_lookup(RHASH_TBL(rb_ivar_get(obj, real_hash_id)), name, 0) ? Qtrue : Qfalse);
-  else return (st_lookup(RHASH_TBL(field_indexes), name, 0) ? Qtrue : Qfalse);
+  else if (st_lookup(RHASH_TBL(field_indexes), name, 0)) return Qtrue;
 #else
   if (REAL_HASH_EXISTS) return (st_lookup(RHASH(rb_ivar_get(obj, real_hash_id))->tbl, name, 0) ? Qtrue : Qfalse);
-  else return (st_lookup(RHASH(field_indexes)->tbl, name, 0) ? Qtrue : Qfalse);
+  else if (st_lookup(RHASH(field_indexes)->tbl, name, 0)) return Qtrue;
 #endif
+  else {
+    real_hash = rb_ivar_get(obj, real_hash_id);
+    if (NIL_P(real_hash)) return Qfalse;
+    return rb_funcall(real_hash, has_key_id, 1, name);
+  }
 }
 
 void Init_slim_attrib_ext() {
@@ -210,13 +220,18 @@ void Init_slim_attrib_ext() {
   rb_define_method(cRowHash, "[]", (VALUE(*)(ANYARGS))slim_fetch, 1);
   rb_define_method(cRowHash, "[]=", (VALUE(*)(ANYARGS))set_element, 2);
   rb_define_method(cRowHash, "dup", (VALUE(*)(ANYARGS))slim_dup, 0);
-  rb_define_method(cRowHash, "has_key?", (VALUE(*)(ANYARGS))has_key, 1);  
+  rb_define_method(cRowHash, "has_key?", (VALUE(*)(ANYARGS))has_key, 1);
+  rb_define_method(cRowHash, "accessed_keys", (VALUE(*)(ANYARGS))accessed_keys, 0);
+  
   // set up some symbols that we will need
   pointers_id = rb_intern("@pointers");
   row_info_id = rb_intern("@row_info");
   field_indexes_id = rb_intern("@field_indexes");
   real_hash_id = rb_intern("@real_hash");
   to_hash_id = rb_intern("to_hash");
+  sq_parens_id = rb_intern("[]");
+  sq_parens_equal_id = rb_intern("[]=");
+  has_key_id = rb_intern("has_key?");
   for(i=0; i < MAX_CACHED_COLUMN_IDS; i++) {
     sprintf(col_name, "@col_%d", i);
     column_ids[i] = rb_intern(col_name);

data/lib/slim_attributes.rb

@@ -9,6 +9,8 @@ require 'slim_attrib_ext'
 
 class Mysql::Result
   class RowHash
+    attr_accessor :real_hash
+
     def marshal_dump
       to_hash
     end
@@ -28,8 +30,8 @@ class Mysql::Result
     # This should be the exception though, and the efficiencies of using slim-attributes
     # are lost when this happens.
     def to_hash
-      return @real_hash if @real_hash
-      @real_hash = {}
+      return @real_hash unless @field_indexes
+      @real_hash ||= {}
       @field_indexes.each_pair {|name, index| @real_hash[name] = fetch_by_index(index)}
       @field_indexes = nil
       @real_hash
@@ -46,7 +48,7 @@ class Mysql::Result
       to_hash.freeze
       regular_freeze
     end
-    
+
     def method_missing(name, *args, &block)
       to_hash.send(name, *args, &block)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: slim-attributes
 version: !ruby/object:Gem::Version 
-  version: 0.6.6
+  version: 0.7.1
 platform: ruby
 authors: 
 - Stephen Sykes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-10 00:00:00 +03:00
+date: 2009-10-20 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -28,8 +28,11 @@ files:
 - README
 - Rakefile
 - VERSION.yml
+- ext/Makefile
 - ext/extconf.rb
+- ext/slim_attrib_ext.bundle
 - ext/slim_attrib_ext.c
+- ext/slim_attrib_ext.o
 - lib/slim_attributes.rb
 - test/benchmark.rb
 - test/database.yml
@@ -59,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: slim-attributes
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3