fast_trie 0.3.6 → 0.3.7

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 6
 :major: 0
 :minor: 3
 :build: 
+:patch: 7

data/ext/trie/trie.c

@@ -305,8 +305,11 @@ static VALUE rb_trie_node_alloc(VALUE klass) {
 static VALUE rb_trie_node_initialize_copy(VALUE self, VALUE from) {
 	RDATA(self)->data = trie_state_clone(RDATA(from)->data);
     
-    rb_iv_set(self, "@state", rb_iv_get(from, "@state"));
-    rb_iv_set(self, "@full_state", rb_iv_get(from, "@full_state"));
+    VALUE state = rb_iv_get(from, "@state");
+    rb_iv_set(self, "@state", state == Qnil ? Qnil : rb_str_dup(state));
+
+    VALUE full_state = rb_iv_get(from, "@full_state");
+    rb_iv_set(self, "@full_state", full_state == Qnil ? Qnil : rb_str_dup(full_state));
 
     return self;
 }
@@ -388,7 +391,7 @@ static VALUE rb_trie_node_walk(VALUE self, VALUE rchar) {
 		VALUE full_state = rb_iv_get(new_node, "@full_state");
 		rb_str_append(full_state, rchar);
 		rb_iv_set(new_node, "@full_state", full_state);
-		return self;
+		return new_node;
     } else
 		return Qnil;
 }

data/spec/trie_spec.rb

@@ -1,6 +1,4 @@
-#require File.dirname(__FILE__) + '/../ext/trie/trie'
-require 'rubygems'
-require 'trie'
+require File.dirname(__FILE__) + '/../lib/trie'
 
 describe Trie do
   before :each do
@@ -204,7 +202,7 @@ describe TrieNode do
   describe :walk do
     it 'returns a new node object when the walk succeeds' do
       other = @node.walk('r')
-      other.should != @node
+      other.should_not == @node
     end
 
     it 'returns nil when the walk fails' do

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fast_trie
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  hash: 29
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Tyler McMullen
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 -08:00
+date: 2010-07-19 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -25,7 +31,6 @@ extra_rdoc_files:
 files: 
 - README.textile
 - VERSION.yml
-- ext/trie/Makefile
 - ext/trie/darray.c
 - ext/trie/darray.h
 - ext/trie/extconf.rb
@@ -39,7 +44,6 @@ files:
 - ext/trie/trie.h
 - ext/trie/triedefs.h
 - ext/trie/typedefs.h
-- lib/trie.rb
 - spec/trie_spec.rb
 - LICENSE
 has_rdoc: true
@@ -58,23 +62,28 @@ rdoc_options:
 - README
 require_paths: 
 - ext
-- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby Trie based on libdatrie.

data/ext/trie/Makefile

@@ -1,149 +0,0 @@
-
-SHELL = /bin/sh
-
-#### 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
-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)
-localedir = $(datarootdir)/locale
-htmldir = $(docdir)
-datadir = $(datarootdir)
-includedir = $(prefix)/include
-infodir = $(DESTDIR)/usr/share/info
-sysconfdir = $(prefix)/etc
-mandir = $(DESTDIR)/usr/share/man
-libdir = $(exec_prefix)/lib
-sharedstatedir = $(prefix)/com
-oldincludedir = $(DESTDIR)/usr/include
-pdfdir = $(docdir)
-sitearchdir = $(sitelibdir)/$(sitearch)
-bindir = $(exec_prefix)/bin
-localstatedir = $(prefix)/var
-sitelibdir = $(sitedir)/$(ruby_version)
-libexecdir = $(exec_prefix)/libexec
-
-CC = gcc
-LIBRUBY = $(LIBRUBY_SO)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)
-
-RUBY_EXTCONF_H = 
-CFLAGS   =  -fno-common -arch ppc -arch i386 -Os -pipe -fno-common 
-INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
-CPPFLAGS =  
-CXXFLAGS = $(CFLAGS) 
-DLDFLAGS = -L. -arch ppc -arch i386  
-LDSHARED = cc -arch ppc -arch i386 -pipe -bundle -undefined dynamic_lookup
-AR = ar
-EXEEXT = 
-
-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
-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 = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lm  
-SRCS = darray.c fileutils.c tail.c trie-private.c trie.c
-OBJS = darray.o fileutils.o tail.o trie-private.o trie.o
-TARGET = trie
-DLLIB = $(TARGET).bundle
-EXTSTATIC = 
-STATIC_LIB = 
-
-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)
-	@-$(RM) $@
-	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
-
-
-
-$(OBJS): ruby.h defines.h

data/lib/trie.rb

@@ -1 +0,0 @@
-#require File.dirname(__FILE__) + '/../ext/trie'