charlock_holmes 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57e54315a83df12c843ea67de7213128f74f2a7e
-  data.tar.gz: f773e478f37f51fe159787964aadf794c25d347a
+  metadata.gz: 7500e422c42f6d71a4c5f9636aacd33b08b18e6b
+  data.tar.gz: e5b90461b236138f959f2f228c507ecab06f06da
 SHA512:
-  metadata.gz: cc59faffae9eacb3515fbc653b326f26fde8b607177f11ba64fcbcdd4033f06b03531c2f3e388d4d66ce09433f39164583b024beb189b8b37adc9a26eaf2586d
-  data.tar.gz: 7e7cbe1bb7d7bc8bfbae5417ce1c8047aa9e324fdfa528952c848f3180ac90c3ea3c81bfe74829352a1e81ac3648ac195d0f02f38ad4935876a5af20615396a3
+  metadata.gz: a29314ed7ad3d8afa68c461d08ef3b6cc09f73d590b35f90200ad93f675288890f40a0d24f7c4d54a8e99792891b58e76d36aa6e476a392b378182fb8dd32537
+  data.tar.gz: a12c6bc1823c037a6b7b2a2fba7f1531072fc192e5411aa14de8eda041a1e5e92057b81b6344d27fd44f8dc63d81fceb092b1b9ab407ae2c04a158dcd3f87958

data/ext/charlock_holmes/extconf.rb

@@ -25,18 +25,20 @@ dir_config 'icu'
 
 rubyopt = ENV.delete("RUBYOPT")
 
+icuconfig = ""
 icu4c = "/usr"
 # detect homebrew installs
 if !have_library 'icui18n'
   base = if !`which brew`.empty?
-    `brew --prefix`.strip
+    `brew --cellar`.strip
   elsif File.exists?("/usr/local/Cellar/icu4c")
     '/usr/local/Cellar'
   end
 
-  if base and icu4c = Dir[File.join(base, 'Cellar/icu4c/*')].sort.last
+  if base and icu4c = Dir[File.join(base, 'icu4c/*')].sort.last
     $INCFLAGS << " -I#{icu4c}/include "
     $LDFLAGS  << " -L#{icu4c}/lib "
+    icuconfig = "#{icu4c}/bin/icu-config"
   end
 end
 
@@ -53,8 +55,7 @@ have_library 'icuuc' or abort 'libicuuc missing'
 have_library 'icudata' or abort 'libicudata missing'
 
 # icu4c might be built in C++11 mode, but it also might not have been
-icuconfig = `which icu-config`.chomp
-icuconfig = "#{icu4c}/bin/icu-config" if icuconfig.empty?
+icuconfig = `which icu-config`.chomp if icuconfig.empty?
 if File.exist?(icuconfig) && `#{icuconfig} --cxxflags`.include?("c++11")
   $CXXFLAGS << ' -std=c++11'
 end

data/ext/charlock_holmes/transliterator.cpp

@@ -36,7 +36,7 @@ static VALUE rb_cTransliterator;
 
 static VALUE rb_transliterator_id_list(VALUE self) {
   UErrorCode status = U_ZERO_ERROR;
-  StringEnumeration *id_list;
+  icu::StringEnumeration *id_list;
   int32_t id_list_size;
   const char *curr_id;
   int32_t curr_id_len;
@@ -44,7 +44,7 @@ static VALUE rb_transliterator_id_list(VALUE self) {
   VALUE rb_curr_id;
 
   id_list_size = 0;
-  id_list = Transliterator::getAvailableIDs(status);
+  id_list = icu::Transliterator::getAvailableIDs(status);
   if(!U_SUCCESS(status)) {
     rb_raise(rb_eArgError, "%s", u_errorName(status));
   }
@@ -78,12 +78,12 @@ static VALUE rb_transliterator_id_list(VALUE self) {
 static VALUE rb_transliterator_transliterate(VALUE self, VALUE rb_txt, VALUE rb_id) {
   UErrorCode status = U_ZERO_ERROR;
   UParseError p_error;
-  Transliterator *trans;
+  icu::Transliterator *trans;
   const char *txt;
   size_t txt_len;
   const char *id;
   size_t id_len;
-  UnicodeString *u_txt;
+  icu::UnicodeString *u_txt;
   std::string result;
   VALUE rb_out;
 
@@ -98,14 +98,14 @@ static VALUE rb_transliterator_transliterate(VALUE self, VALUE rb_txt, VALUE rb_
   id = RSTRING_PTR(rb_id);
   id_len = RSTRING_LEN(rb_id);
 
-  trans = Transliterator::createInstance(UnicodeString(id, id_len), UTRANS_FORWARD, p_error, status);
+  trans = icu::Transliterator::createInstance(icu::UnicodeString(id, id_len), UTRANS_FORWARD, p_error, status);
   if(!U_SUCCESS(status)) {
     rb_raise(rb_eArgError, "%s", u_errorName(status));
   }
 
-  u_txt = new UnicodeString(txt, txt_len);
+  u_txt = new icu::UnicodeString(txt, txt_len);
   trans->transliterate(*u_txt);
-  StringByteSink<std::string> sink(&result);
+  icu::StringByteSink<std::string> sink(&result);
   u_txt->toUTF8(sink);
 
   delete u_txt;

data/lib/charlock_holmes/version.rb

@@ -1,3 +1,3 @@
 module CharlockHolmes
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: charlock_holmes
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Brian Lopez
@@ -9,50 +9,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.11'
 - !ruby/object:Gem::Dependency
   name: chardet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 description: charlock_holmes provides binary and text detection as well as text transcoding
   using libicu
 email: seniorlopez@gmail.com