unichars 0.4 → 0.5

data/ext/glib/Makefile

@@ -0,0 +1,186 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = .
+topdir = /Users/manfred/.rvm/ruby-1.9.2-preview1/include/ruby-1.9.1
+hdrdir = /Users/manfred/.rvm/ruby-1.9.2-preview1/include/ruby-1.9.1
+arch_hdrdir = /Users/manfred/.rvm/ruby-1.9.2-preview1/include/ruby-1.9.1/$(arch)
+VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
+prefix = $(DESTDIR)/Users/manfred/.rvm/ruby-1.9.2-preview1
+rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
+exec_prefix = $(prefix)
+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)
+infodir = $(datarootdir)/info
+docdir = $(datarootdir)/doc/$(PACKAGE)
+oldincludedir = $(DESTDIR)/usr/include
+includedir = $(prefix)/include
+localstatedir = $(prefix)/var
+sharedstatedir = $(prefix)/com
+sysconfdir = $(prefix)/etc
+datadir = $(datarootdir)
+datarootdir = $(prefix)/share
+libexecdir = $(exec_prefix)/libexec
+sbindir = $(exec_prefix)/sbin
+bindir = $(exec_prefix)/bin
+rubylibdir = $(rubylibprefix)/$(ruby_version)
+archdir = $(rubylibdir)/$(arch)
+sitelibdir = $(sitedir)/$(ruby_version)
+sitearchdir = $(sitelibdir)/$(sitearch)
+vendorlibdir = $(vendordir)/$(ruby_version)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
+
+CC = gcc
+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)-static
+OUTFLAG = -o 
+COUTFLAG = -o 
+
+RUBY_EXTCONF_H = 
+cflags   =  $(optflags) $(debugflags) $(warnflags)
+optflags = -O3
+debugflags = -g
+warnflags = -Wall -Wno-unused-parameter -Wno-parentheses -Wno-missing-field-initializers -Wshorten-64-to-32 -Wpointer-arith -Wwrite-strings
+CFLAGS   = -fno-common $(cflags)  -pipe -I/opt/homebrew/Cellar/glib/2.20.5/include/glib-2.0 -I/opt/homebrew/Cellar/glib/2.20.5/lib/glib-2.0/include   
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
+DEFS     = 
+CPPFLAGS =  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags)
+CXXFLAGS = $(CFLAGS) $(cxxflags)
+ldflags  = -L. -L/usr/local/lib -L/opt/homebrew/Cellar/glib/2.20.5/lib -L/opt/homebrew/Cellar/gettext/0.17/lib
+dldflags = 
+archflag = 
+DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
+LDSHARED = $(CC) -dynamic -bundle -undefined suppress -flat_namespace
+LDSHAREDXX = $(CXX) -dynamic -bundle -undefined suppress -flat_namespace
+AR = ar
+EXEEXT = 
+
+RUBY_BASE_NAME = ruby
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = ruby
+arch = i386-darwin10.2.0
+sitearch = $(arch)
+ruby_version = 1.9.1
+ruby = /Users/manfred/.rvm/ruby-1.9.2-preview1/bin/ruby
+RUBY = $(ruby)
+RM = rm -f
+RM_RF = $(RUBY) -run -e rm -- -rf
+RMDIRS = $(RUBY) -run -e rmdir -- -p
+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 = 
+DISTCLEANDIRS = 
+
+extout = 
+extout_prefix = 
+target_prefix = 
+LOCAL_LIBS = 
+LIBS =   -lglib-2.0 -lintl   -lpthread -ldl -lobjc 
+SRCS = glib.c
+OBJS = glib.o
+TARGET = glib
+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 
+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-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)
+
+realclean: distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(RUBYARCHDIR) $(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) $(COUTFLAG)$@ -c $<
+
+.cxx.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.cpp.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.C.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.c.o:
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
+
+$(DLLIB): $(OBJS) Makefile
+	@-$(RM) $(@)
+	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+
+
+
+$(OBJS): $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h

data/ext/glib/glib.c

@@ -1,6 +1,14 @@
 #include <ruby.h>
 #include <glib.h>
 
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(string) RSTRING(string)->len
+#endif
+
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(string) RSTRING(string)->ptr
+#endif
+
 /*
  *  call-seq:
  *    utf8_size(string)
@@ -14,7 +22,7 @@ static VALUE utf8_size(VALUE self, VALUE string)
   VALUE result;
 
   Check_Type(string, T_STRING);
-  result = ULONG2NUM(g_utf8_strlen(StringValuePtr(string), RSTRING(string)->len));
+  result = ULONG2NUM(g_utf8_strlen(StringValuePtr(string), RSTRING_LEN(string)));
 
   return result;
 }
@@ -33,7 +41,7 @@ static VALUE utf8_upcase(VALUE self, VALUE string)
   gchar *temp;
 
   Check_Type(string, T_STRING);
-  temp = g_utf8_strup(StringValuePtr(string), RSTRING(string)->len);
+  temp = g_utf8_strup(StringValuePtr(string), RSTRING_LEN(string));
   result = rb_str_new2(temp);
   free(temp);
 
@@ -54,7 +62,7 @@ static VALUE utf8_downcase(VALUE self, VALUE string)
   gchar *temp;
 
   Check_Type(string, T_STRING);
-  temp = g_utf8_strdown(StringValuePtr(string), RSTRING(string)->len);
+  temp = g_utf8_strdown(StringValuePtr(string), RSTRING_LEN(string));
   result = rb_str_new2(temp);
   free(temp);
 
@@ -75,7 +83,7 @@ static VALUE utf8_reverse(VALUE self, VALUE string)
   gchar *temp;
 
   Check_Type(string, T_STRING);
-  temp = g_utf8_strreverse(StringValuePtr(string), RSTRING(string)->len);
+  temp = g_utf8_strreverse(StringValuePtr(string), RSTRING_LEN(string));
   result = rb_str_new2(temp);
   free(temp);
 
@@ -114,10 +122,10 @@ static VALUE utf8_normalize(VALUE self, VALUE string, VALUE form)
   } else if (ID2SYM(rb_intern("kc")) == form) {
     mode = G_NORMALIZE_NFKC;
   } else {
-    rb_raise(rb_eArgError, "%s is not a valid normalization form, options are: :d, :kd, :c, or :kc", RSTRING(rb_inspect(form))->ptr);
+    rb_raise(rb_eArgError, "%s is not a valid normalization form, options are: :d, :kd, :c, or :kc", RSTRING_PTR(rb_inspect(form)));
   }
 
-  temp = g_utf8_normalize(StringValuePtr(string), RSTRING(string)->len, mode);
+  temp = g_utf8_normalize(StringValuePtr(string), RSTRING_LEN(string), mode);
   result = rb_str_new2(temp);
   free(temp);
 

data/ext/glib/mkmf.log

@@ -0,0 +1,5 @@
+package configuration for glib-2.0
+cflags: -I/opt/homebrew/Cellar/glib/2.20.5/include/glib-2.0 -I/opt/homebrew/Cellar/glib/2.20.5/lib/glib-2.0/include  
+ldflags: -L/opt/homebrew/Cellar/glib/2.20.5/lib -L/opt/homebrew/Cellar/gettext/0.17/lib
+libs: -lglib-2.0 -lintl  
+

data/lib/chars.rb

@@ -9,9 +9,15 @@ class Chars
   alias to_s wrapped_string
   alias to_str wrapped_string
   
-  # Creates a new Chars instance by wrapping _string_.
-  def initialize(string)
-    @wrapped_string = string
+  if 'string'.respond_to?(:force_encoding)
+    # Creates a new Chars instance by wrapping _string_.
+    def initialize(string)
+      @wrapped_string = string.dup.force_encoding(Encoding::UTF_8)
+    end
+  else
+    def initialize(string) #:nodoc:
+      @wrapped_string = string.dup
+    end
   end
   
   # Forward all undefined methods to the wrapped string.
@@ -42,7 +48,7 @@ class Chars
   def <=>(other)
     @wrapped_string <=> other.to_s
   end
-
+  
   # Returns a new Chars object containing the _other_ object concatenated to the string.
   #
   # Example:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: unichars
 version: !ruby/object:Gem::Version 
-  version: "0.4"
+  version: "0.5"
 platform: ruby
 authors: 
 - Manfred Stienstra
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-06 00:00:00 +01:00
+date: 2010-02-22 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
-description: Unichars is a wrapper around Glib2 UTF8 functions.
+description: "    Unichars is a wrapper around Glib2 UTF8 functions.\n"
 email: manfred@fngtps.com
 executables: []
 
@@ -26,13 +26,18 @@ extra_rdoc_files:
 files: 
 - lib/chars.rb
 - lib/unichars.rb
-- ext/glib
 - ext/glib/extconf.rb
+- ext/glib/glib.bundle
 - ext/glib/glib.c
+- ext/glib/glib.o
+- ext/glib/Makefile
+- ext/glib/mkmf.log
 - README
 - LICENSE
 has_rdoc: true
 homepage: 
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=utf-8
@@ -53,9 +58,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Unichars is a wrapper around Glib2 UTF8 functions. It was written to speed up ActiveSupport::Multibyte, but I'm sure people can find other uses for it.
 test_files: []