ffi-icu 0.1.0 → 0.1.1

data/.travis.yml

@@ -3,4 +3,4 @@ rvm:
   - 1.9.2
   - 1.9.3
 before_script:
-  - sudo apt-get install -y libicu44
+  - sudo apt-get install -y libicu48

data/lib/ffi-icu/lib.rb

@@ -129,14 +129,6 @@ module ICU
       ret
     end
 
-    def self.cldr_version
-      result = FFI::MemoryPointer.new(:char, 64)
-      version_info = FFI::MemoryPointer.new(:uint8, 4)
-      check_error { |status| ulocdata_getCLDRVersion(version_info, status) }
-      u_versionToString(version_info, result)
-      result.read_string_to_null
-    end
-
     def self.enum_ptr_to_array(enum_ptr)
       length = check_error do |status|
         uenum_count(enum_ptr, status)
@@ -155,16 +147,55 @@ module ICU
       end
     end
 
+    class VersionInfo < FFI::MemoryPointer
+      extend FFI::DataConverter
+
+      MaxLength = 4
+      MaxStringLength = 20
+
+      def self.native_type
+        FFI::Type::POINTER
+      end
+
+      def initialize
+        super :uint8, MaxLength
+      end
+
+      def to_a
+        read_array_of_uint8(MaxLength)
+      end
+
+      def to_s
+        buffer = FFI::MemoryPointer.new(:char, MaxStringLength)
+        Lib.u_versionToString(self, buffer)
+        buffer.read_string_to_null
+      end
+    end
+
+    def self.cldr_version
+      @cldr_version ||= VersionInfo.new.tap do |version|
+        check_error { |status| ulocdata_getCLDRVersion(version, status) }
+      end
+    end
+
+    def self.version
+      @version ||= VersionInfo.new.tap { |version| u_getVersion(version) }
+    end
+
     version = load_icu
     suffix = figure_suffix(version)
 
+    typedef VersionInfo, :version
+
     attach_function :u_errorName,     "u_errorName#{suffix}",     [:int],      :string
     attach_function :uenum_count,     "uenum_count#{suffix}",     [:pointer,   :pointer], :int
     attach_function :uenum_close,     "uenum_close#{suffix}",     [:pointer], :void
     attach_function :uenum_next,      "uenum_next#{suffix}",      [:pointer,  :pointer,  :pointer], :string
     attach_function :u_charsToUChars, "u_charsToUChars#{suffix}", [:string,    :pointer,  :int32_t], :void
     attach_function :u_UCharsToChars, "u_UCharsToChars#{suffix}", [:pointer,   :string,   :int32_t], :void
-    attach_function :u_versionToString, "u_versionToString#{suffix}", [:pointer, :pointer], :void
+
+    attach_function :u_getVersion,      "u_getVersion#{suffix}",      [:version], :void
+    attach_function :u_versionToString, "u_versionToString#{suffix}", [:version, :pointer], :void
 
     #
     # Locale
@@ -174,10 +205,8 @@ module ICU
 
     enum :layout_type, [:ltr, :rtl, :ttb, :btt, :unknown]
 
-    attach_function :uloc_addLikelySubtags, "uloc_addLikelySubtags#{suffix}", [:string, :pointer, :int32_t, :pointer], :int32_t
     attach_function :uloc_canonicalize,     "uloc_canonicalize#{suffix}",     [:string, :pointer, :int32_t, :pointer], :int32_t
     attach_function :uloc_countAvailable,   "uloc_countAvailable#{suffix}",   [], :int32_t
-    attach_function :uloc_forLanguageTag,   "uloc_forLanguageTag#{suffix}",   [:string, :pointer, :int32_t, :pointer, :pointer], :int32_t
     attach_function :uloc_getAvailable,     "uloc_getAvailable#{suffix}",     [:int32_t], :string
     attach_function :uloc_getBaseName,      "uloc_getBaseName#{suffix}",      [:string, :pointer, :int32_t, :pointer], :int32_t
     attach_function :uloc_getCountry,       "uloc_getCountry#{suffix}",       [:string, :pointer, :int32_t, :pointer], :int32_t
@@ -188,19 +217,15 @@ module ICU
     attach_function :uloc_getISOLanguages,  "uloc_getISOLanguages#{suffix}",  [], :pointer
     attach_function :uloc_getKeywordValue,  "uloc_getKeywordValue#{suffix}",  [:string, :string, :pointer, :int32_t, :pointer], :int32_t
     attach_function :uloc_getLanguage,      "uloc_getLanguage#{suffix}",      [:string, :pointer, :int32_t, :pointer], :int32_t
-    attach_function :uloc_getLocaleForLCID, "uloc_getLocaleForLCID#{suffix}", [:uint32, :pointer, :int32_t, :pointer], :int32_t
     attach_function :uloc_getLCID,          "uloc_getLCID#{suffix}",          [:string], :uint32
     attach_function :uloc_getName,          "uloc_getName#{suffix}",          [:string, :pointer, :int32_t, :pointer], :int32_t
     attach_function :uloc_getParent,        "uloc_getParent#{suffix}",        [:string, :pointer, :int32_t, :pointer], :int32_t
     attach_function :uloc_getScript,        "uloc_getScript#{suffix}",        [:string, :pointer, :int32_t, :pointer], :int32_t
     attach_function :uloc_getVariant,       "uloc_getVariant#{suffix}",       [:string, :pointer, :int32_t, :pointer], :int32_t
-    attach_function :uloc_minimizeSubtags,  "uloc_minimizeSubtags#{suffix}",  [:string, :pointer, :int32_t, :pointer], :int32_t
     attach_function :uloc_openKeywords,     "uloc_openKeywords#{suffix}",     [:string, :pointer], :pointer
     attach_function :uloc_setDefault,       "uloc_setDefault#{suffix}",       [:string, :pointer], :void
     attach_function :uloc_setKeywordValue,  "uloc_setKeywordValue#{suffix}",  [:string, :string, :pointer, :int32_t, :pointer], :int32_t
-    attach_function :uloc_toLanguageTag,    "uloc_toLanguageTag#{suffix}",    [:string, :pointer, :int32_t, :int8_t, :pointer], :int32_t
 
-    attach_function :uloc_getCharacterOrientation,  "uloc_getCharacterOrientation#{suffix}",  [:string, :pointer], :layout_type
     attach_function :uloc_getDisplayCountry,        "uloc_getDisplayCountry#{suffix}",        [:string, :string, :pointer, :int32_t, :pointer], :int32_t
     attach_function :uloc_getDisplayKeyword,        "uloc_getDisplayKeyword#{suffix}",        [:string, :string, :pointer, :int32_t, :pointer], :int32_t
     attach_function :uloc_getDisplayKeywordValue,   "uloc_getDisplayKeywordValue#{suffix}",   [:string, :string, :string, :pointer, :int32_t, :pointer], :int32_t
@@ -208,9 +233,24 @@ module ICU
     attach_function :uloc_getDisplayName,           "uloc_getDisplayName#{suffix}",           [:string, :string, :pointer, :int32_t, :pointer], :int32_t
     attach_function :uloc_getDisplayScript,         "uloc_getDisplayScript#{suffix}",         [:string, :string, :pointer, :int32_t, :pointer], :int32_t
     attach_function :uloc_getDisplayVariant,        "uloc_getDisplayVariant#{suffix}",        [:string, :string, :pointer, :int32_t, :pointer], :int32_t
-    attach_function :uloc_getLineOrientation,       "uloc_getLineOrientation#{suffix}",       [:string, :pointer], :layout_type
 
-    attach_function :ulocdata_getCLDRVersion, "ulocdata_getCLDRVersion#{suffix}", [:pointer, :pointer], :void
+    if Gem::Version.new('3.8') <= Gem::Version.new(self.version)
+      attach_function :uloc_getLocaleForLCID, "uloc_getLocaleForLCID#{suffix}", [:uint32, :pointer, :int32_t, :pointer], :int32_t
+    end
+
+    if Gem::Version.new('4.0') <= Gem::Version.new(self.version)
+      attach_function :uloc_addLikelySubtags, "uloc_addLikelySubtags#{suffix}", [:string, :pointer, :int32_t, :pointer], :int32_t
+      attach_function :uloc_minimizeSubtags,  "uloc_minimizeSubtags#{suffix}",  [:string, :pointer, :int32_t, :pointer], :int32_t
+      attach_function :uloc_getCharacterOrientation,  "uloc_getCharacterOrientation#{suffix}",  [:string, :pointer], :layout_type
+      attach_function :uloc_getLineOrientation,       "uloc_getLineOrientation#{suffix}",       [:string, :pointer], :layout_type
+    end
+
+    if Gem::Version.new('4.2') <= Gem::Version.new(self.version)
+      attach_function :uloc_forLanguageTag, "uloc_forLanguageTag#{suffix}", [:string, :pointer, :int32_t, :pointer, :pointer], :int32_t
+      attach_function :uloc_toLanguageTag,  "uloc_toLanguageTag#{suffix}",  [:string, :pointer, :int32_t, :int8_t, :pointer], :int32_t
+
+      attach_function :ulocdata_getCLDRVersion, "ulocdata_getCLDRVersion#{suffix}", [:version, :pointer], :void
+    end
 
     # CharDet
     #

data/lib/ffi-icu/lib/util.rb

@@ -5,7 +5,7 @@ module ICU
         offset = 0
         result = []
 
-        while (ptr = pointer.get_pointer(offset)) != FFI::Pointer::NULL do
+        until (ptr = pointer.get_pointer(offset)).null?
           result << ptr.read_string
           offset += FFI::Pointer.size
         end

data/lib/ffi-icu/version.rb

@@ -1,3 +1,3 @@
 module ICU
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/lib/version_info_spec.rb

@@ -0,0 +1,15 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+module ICU
+  module Lib
+    describe VersionInfo do
+      its(:to_a) { should be_an Array }
+      its(:to_s) do
+        should be_a String
+        should match /^[0-9.]+$/
+      end
+    end
+  end
+end

data/spec/lib_spec.rb

@@ -43,5 +43,21 @@ module ICU
         end
       end
     end
+
+    if Gem::Version.new('4.2') <= Gem::Version.new(Lib.version)
+      describe 'CLDR version' do
+        subject { Lib.cldr_version }
+
+        it { should be_a Lib::VersionInfo }
+        it('is populated') { subject.to_a.should_not == [0,0,0,0] }
+      end
+    end
+
+    describe 'ICU version' do
+      subject { Lib.version }
+
+      it { should be_a Lib::VersionInfo }
+      it('is populated') { subject.to_a.should_not == [0,0,0,0] }
+    end
   end
 end

data/spec/locale_spec.rb

@@ -59,21 +59,23 @@ module ICU
       end
     end
 
-    describe 'BCP 47 language tags' do
-      it 'converts a language tag to a locale' do
-        Locale.for_language_tag('en-us').should == Locale.new('en_US')
-        Locale.for_language_tag('nan-Hant-tw').should == Locale.new('nan_Hant_TW')
-      end
+    if Gem::Version.new('4.2') <= Gem::Version.new(Lib.version)
+      describe 'BCP 47 language tags' do
+        it 'converts a language tag to a locale' do
+          Locale.for_language_tag('en-us').should == Locale.new('en_US')
+          Locale.for_language_tag('nan-Hant-tw').should == Locale.new('nan_Hant_TW')
+        end
 
-      it 'returns a language tag for a locale' do
-        if Gem::Version.new(Lib.cldr_version) < Gem::Version.new('1.8')
-          Locale.new('en_US').to_language_tag.should == 'en-us'
-          Locale.new('zh_TW').to_language_tag.should == 'zh-tw'
-          Locale.new('zh_Hans_CH_PINYIN').to_language_tag.should == 'zh-hans-ch-u-co-pinyin'
-        else
-          Locale.new('en_US').to_language_tag.should == 'en-US'
-          Locale.new('zh_TW').to_language_tag.should == 'zh-TW'
-          Locale.new('zh_Hans_CH_PINYIN').to_language_tag.should == 'zh-Hans-CH-u-co-pinyin'
+        it 'returns a language tag for a locale' do
+          if Gem::Version.new('4.4') <= Gem::Version.new(Lib.version)
+            Locale.new('en_US').to_language_tag.should == 'en-US'
+            Locale.new('zh_TW').to_language_tag.should == 'zh-TW'
+            Locale.new('zh_Hans_CH_PINYIN').to_language_tag.should == 'zh-Hans-CH-u-co-pinyin'
+          else
+            Locale.new('en_US').to_language_tag.should == 'en-us'
+            Locale.new('zh_TW').to_language_tag.should == 'zh-tw'
+            Locale.new('zh_Hans_CH_PINYIN').to_language_tag.should == 'zh-hans-ch-u-co-pinyin'
+          end
         end
       end
     end
@@ -113,11 +115,8 @@ module ICU
         end
 
         it 'returns the variant' do
-          Locale.new('zh_Hans_CH_PINYIN').display_variant('en').should == 'Pinyin Romanization'
-
-          if Gem::Version.new(Lib.cldr_version) > Gem::Version.new('1.8')
-            Locale.new('zh_Hans_CH_PINYIN').display_variant('es').should == 'Romanización pinyin'
-          end
+          Locale.new('be_BY_TARASK').display_variant('de').should == 'Taraskievica-Orthographie'
+          Locale.new('zh_CH_POSIX').display_variant('en').should == 'Computer'
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-icu
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -93,6 +93,7 @@ files:
 - spec/break_iterator_spec.rb
 - spec/chardet_spec.rb
 - spec/collation_spec.rb
+- spec/lib/version_info_spec.rb
 - spec/lib_spec.rb
 - spec/locale_spec.rb
 - spec/normalization_spec.rb
@@ -130,6 +131,7 @@ test_files:
 - spec/break_iterator_spec.rb
 - spec/chardet_spec.rb
 - spec/collation_spec.rb
+- spec/lib/version_info_spec.rb
 - spec/lib_spec.rb
 - spec/locale_spec.rb
 - spec/normalization_spec.rb