icu 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d1207d28f79754afd8b68f7ecf9d298d62f4aab
-  data.tar.gz: ce0b6e3e1fcc8ca6bdac3091ddbda9111f3cb99b
+  metadata.gz: 52bd5b4ff7de493e861afcde8e5b8d0d166e1978
+  data.tar.gz: 4a38c359cc8ed339e2a328a221c29a22c0db405c
 SHA512:
-  metadata.gz: 9acb80e891bd190cfde5b4a877723d97c31c25ea30004c70f5cb8232c93ffd9c3d413d57ef08d01713068352c2163906cd79bbc2efea4f572ac558b1b09763a8
-  data.tar.gz: f3e384258d81c4e2435797cb58754b471535ae90bd6b7bcaee67177023ea8a20fa1e4eab21b24c687e0b910a93a41ceed902a9d43a4b59c0ceea114cd9980fad
+  metadata.gz: 4d22f947f3b513b9a4abb8e5c2a0eab570bb4ad28ea2ea0f0ffeaacf56924a51fd0ea224f2bca48e9777fc785c1feecc0ea7e6aaee6bf0b4a989d2e650a34049
+  data.tar.gz: 687fde4436ca2b756ebdda7502f40d3b0433ae8ecafe236dbc0a7e946bd957eb1752c74ae741a98a0e6cdbd25f3147d4459fbe2ce454e72f9774bd30f6cab8a9

data/README.md

@@ -6,6 +6,27 @@ Ruby required 2.3.1.
 
 [![Build Status](https://travis-ci.org/fantasticfears/icu4r.svg?branch=master)](https://travis-ci.org/fantasticfears/icu4r)
 
+## Usage
+
+If you use OS X,
+
+```
+brew install icu4c
+gem install icu -- --use-system-libraries
+```
+
+else,
+
+```
+gem install icu
+```
+
+For usage:
+
+```
+require 'icu'
+```
+
 ## Design
 
 Almost all arguments passed should be expected as Ruby `String` with various encodings.

data/ext/icu/extconf.rb

@@ -6,15 +6,25 @@ ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 
 # Utility functions
 
+def asplode(lib)
+  abort "-----\n#{lib} is missing.  Please locate mkmf.log to investigate how it is failing.\n-----"
+end
+
 def using_system_libraries?
   arg_config('--use-system-libraries', !!ENV['ICU_USE_SYSTEM_LIBRARIES'])
 end
 
+def lib_a(ldflag)
+  case ldflag
+  when /\A-l(.+)/
+    "lib#{$1}.#{$LIBEXT}"
+  end
+end
+
 # Building with system ICU
 
 if using_system_libraries?
-  message "Building ICU using system libraries.\n Not supported yet, PR welcome!"
-  exit 1
+  message "Building ICU using system libraries.\n"
 
   unless dir_config('icu').any?
     base = if !`which brew`.empty?
@@ -43,7 +53,7 @@ install by brew install icu4c or apt-get install libicu-dev)
   have_library 'icuuc' or abort 'libicuuc missing'
   have_library 'icudata' or abort 'libicudata missing'
 else
-  message "Building ICU from source.\n"
+  message "Building ICU from source. TODO: Loading in OS X. Use brew icu4c instead.\n"
 
   # The gem version constraint in the Rakefile is not respected at install time.
   # Keep this version in sync with the one in the Rakefile !
@@ -225,14 +235,20 @@ If you are using Bundler, tell it to use the option:
     $CPPFLAGS = '-DU_DISABLE_RENAMING=1 -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0 -DU_STATIC_IMPLEMENTATION' << ' ' << $CPPFLAGS
     $CFLAGS = `sh #{config} --cflags`.strip << $CFLAGS
   end
+
+  $LIBPATH = ["#{libicu_recipe.path}/lib"] | $LIBPATH if libicu_recipe
+  $libs = ["-licui18n", "-licuuc", "-licudata"].map do |arg|
+   File.join(libicu_recipe.path, 'lib', lib_a(arg))
+  end.shelljoin
 end
 
 $CFLAGS << ' -O3 -funroll-loops -std=c99'
 $CFLAGS << ' -Wextra -O0 -ggdb3' if ENV['DEBUG']
 
-unless have_library('icui18n', 'u_errorName') or
-  have_library('libicui18n', 'u_errorName') or
-  find_library('icui18n', 'u_errorName', *$LIBPATH)
-  crash("ICU build not found.")
-end
+have_func('u_init', 'unicode/uclean.h') ||
+  have_library('icui18n', 'u_init', 'unicode/uclean.h') ||
+  have_library('libicui18n', 'u_init', 'unicode/uclean.h') or
+  asplode('libicui18n')
+have_func('u_errorName')
+
 create_makefile('icu/icu')

data/ext/icu/icu_spoof_checker.c

@@ -156,19 +156,21 @@ VALUE spoof_checker_check(VALUE self, VALUE rb_str)
     UErrorCode status = U_ZERO_ERROR;
     int32_t result = 0;
 
+    // TODO: Migrate to uspoof_check2UTF8 once it's not draft
     if (icu_is_rb_str_as_utf_8(rb_str)) {
-       result = uspoof_check2UTF8(this->service,
-                                  RSTRING_PTR(rb_str),
-                                  RSTRING_LENINT(rb_str),
-                                  NULL,
-                                  &status);
+       result = uspoof_checkUTF8(this->service,
+                                 RSTRING_PTR(rb_str),
+                                 RSTRING_LENINT(rb_str),
+                                 NULL,
+                                 &status);
     } else {
         VALUE in = icu_ustring_from_rb_str(rb_str);
-        result = uspoof_check2(this->service,
-                               icu_ustring_ptr(in),
-                               icu_ustring_len(in),
-                               NULL,
-                               &status);
+        // TODO: Migrate to uspoof_check once it's not draft
+        result = uspoof_check(this->service,
+                              icu_ustring_ptr(in),
+                              icu_ustring_len(in),
+                              NULL,
+                              &status);
     }
     if (U_FAILURE(status)) {
         icu_rb_raise_icu_error(status);

data/lib/icu/version.rb

@@ -1,3 +1,3 @@
 module ICU
-  VERSION = "0.10.1"
+  VERSION = "0.10.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icu
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Erick Guan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler