unichars 0.2 → 0.3

data/ext/glib/extconf.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'mkmf'
 
 unless pkg_config('glib-2.0')

data/ext/glib/glib.c

@@ -1,6 +1,14 @@
 #include <ruby.h>
 #include <glib.h>
 
+/*
+ *  call-seq:
+ *    utf8_size(string)
+ *
+ *  Returns the length of the string expressed in codepoints.
+ *
+ *    Glib.utf8_size('A ehm…, word.') #=> 13
+ */
 static VALUE utf8_size(VALUE self, VALUE string)
 {
   VALUE result;
@@ -11,6 +19,14 @@ static VALUE utf8_size(VALUE self, VALUE string)
   return result;
 }
 
+/*
+ *  call-seq:
+ *    utf8_upcase(string)
+ *
+ *  Returns the string in capitals if they are are available for the supplied characters.
+ *
+ *    Glib.utf8_upcase('Sluß') #=> SLUSS
+ */
 static VALUE utf8_upcase(VALUE self, VALUE string)
 {
   VALUE result;
@@ -23,6 +39,14 @@ static VALUE utf8_upcase(VALUE self, VALUE string)
   return result;
 }
 
+/*
+ *  call-seq:
+ *    utf8_downcase(string)
+ *
+ *  Returns the string in lowercase characters if they are are available for the supplied characters.
+ *
+ *    Glib.utf8_downcase('ORGANISÉE') #=> organisée
+ */
 static VALUE utf8_downcase(VALUE self, VALUE string)
 {
   VALUE result;
@@ -35,6 +59,14 @@ static VALUE utf8_downcase(VALUE self, VALUE string)
   return result;
 }
 
+/*
+ *  call-seq:
+ *    utf8_reverse(string)
+ *
+ *  Returns a string with the characters in reverse order.
+ *
+ *    Glib.utf8_reverse('Comment ça va?') #=> av aç tnemmoC
+ */
 static VALUE utf8_reverse(VALUE self, VALUE string)
 {
   VALUE result;
@@ -47,6 +79,50 @@ static VALUE utf8_reverse(VALUE self, VALUE string)
   return result;
 }
 
+
+/*
+ *  call-seq:
+ *    utf_normalize(string, form)
+ *
+ *  Returns the normalized form of the string. See http://www.unicode.org/reports/tr15/tr15-29.html for more
+ *  information about normalization.
+ *
+ *  <i>form</i> can be one of the following: <tt>:c</tt>, <tt>:kc</tt>, <tt>:d</tt>, or <tt>:kd</tt>.
+ *
+ *    decomposed = [101, 769].pack('U*')
+ *    composed = Glib.utf8_normalize(decomposed, :kc)
+ *    composed.unpack('U*') #=> [233]
+ */
+static VALUE utf8_normalize(VALUE self, VALUE string, VALUE form)
+{
+  VALUE result;
+  gchar *temp;
+  GNormalizeMode mode;
+
+  Check_Type(string, T_STRING);
+  Check_Type(form, T_SYMBOL);
+
+  if (ID2SYM(rb_intern("d")) == form) {
+    mode = G_NORMALIZE_NFD;
+  } else if (ID2SYM(rb_intern("c")) == form) {
+    mode = G_NORMALIZE_NFC;
+  } else if (ID2SYM(rb_intern("kd")) == form) {
+    mode = G_NORMALIZE_NFKD;
+  } 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);
+  }
+
+  temp = g_utf8_normalize(StringValuePtr(string), RSTRING(string)->len, mode);
+  result = rb_str_new2(temp);
+
+  return result;
+}
+
+
+/* The Glib module holds methods which wrap Glib2 functions.
+ */
 void
 Init_glib()
 {
@@ -57,4 +133,5 @@ Init_glib()
   rb_define_module_function(mGlib, "utf8_upcase", utf8_upcase, 1);
   rb_define_module_function(mGlib, "utf8_downcase", utf8_downcase, 1);
   rb_define_module_function(mGlib, "utf8_reverse", utf8_reverse, 1);
+  rb_define_module_function(mGlib, "utf8_normalize", utf8_normalize, 2);
 }

data/lib/chars.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 class Chars
   attr_reader :wrapped_string
   alias to_s wrapped_string

data/lib/unichars.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'glib'
 
 begin
@@ -8,6 +10,12 @@ rescue NameError
 end
 
 class Unichars
+  NORMALIZATION_FORMS = [:c, :kc, :d, :kd]
+  
+  class << self
+    attr_accessor :default_normalization_form
+  end
+  
   def size
     Glib.utf8_size(@wrapped_string)
   end
@@ -23,4 +31,10 @@ class Unichars
   def reverse
     self.class.new(Glib.utf8_reverse(@wrapped_string))
   end
-end
+  
+  def normalize(form=Unichars.default_normalization_form)
+    self.class.new(Glib.utf8_normalize(@wrapped_string, form))
+  end
+end
+
+Unichars.default_normalization_form = :kc

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: unichars
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Manfred Stienstra
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-24 00:00:00 +01:00
+date: 2008-12-22 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -22,16 +22,13 @@ extensions:
 extra_rdoc_files: 
 - README
 - LICENSE
+- ext/glib/glib.c
 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

data/ext/glib/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 -I/opt/local/include/glib-2.0 -I/opt/local/lib/glib-2.0/include -I/opt/local/include   
-INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
-CPPFLAGS =  
-CXXFLAGS = $(CFLAGS) 
-DLDFLAGS = -L. -arch ppc -arch i386 -L/opt/local/lib  
-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)  -lglib-2.0 -lintl -liconv   -lpthread -ldl -lm  
-SRCS = glib.c
-OBJS = glib.o
-TARGET = glib
-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/ext/glib/mkmf.log

@@ -1,5 +0,0 @@
-package configuration for glib-2.0
-cflags: -I/opt/local/include/glib-2.0 -I/opt/local/lib/glib-2.0/include -I/opt/local/include  
-ldflags: -L/opt/local/lib
-libs: -lglib-2.0 -lintl -liconv  
-