ffi-icu 0.1.2 → 0.1.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f2a47f5a65ad78641ecce2ffbbbe66ece2f1f176
+  data.tar.gz: 6b6843b7b398a028e98b1254c22392bfa2ff7394
+SHA512:
+  metadata.gz: 70c720e7259427e54f4157f3ed0dafd868547a943a07348bbd91936927b64887b5b23fa73e1a29428a48266c70134e9872c846d2d1a947749cd19a00742aaec7
+  data.tar.gz: 74a4c5a488584a3eee26b880c7af78a308fb4a3fc4d544cc4c3a903f67858e140f90e192bce1bafdfd73929fc4a10ec937b9f79391517962f58985abd46b2dfe

data/.travis.yml

@@ -1,6 +1,7 @@
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - ruby-head
 before_script:
   - sudo apt-get install -y libicu48

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gemspec
+gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2012 Jari Bakken
+Copyright (c) 2010-2014 Jari Bakken
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -15,13 +15,13 @@ Gem
 Dependencies
 ------------
 
-ICU. 
+ICU.
 
 If you get messages that the library or functions are not found, you can
 set some environment varibles to tell ffi-icu where to find it, e.g.:
-  
+
     $ export FFI_ICU_LIB="icui18n.so"
-    $ export FFI_ICU_VERSION_SUFFIX="_3_8" 
+    $ export FFI_ICU_VERSION_SUFFIX="_3_8"
     $ ruby -r ffi-icu program.rb
 
 Features
@@ -44,7 +44,7 @@ or
 ```ruby
     detector = ICU::CharDet::Detector.new
     detector.detect(str) => #<struct ICU::CharDet::Detector::Match ...>
-```      
+```
 
 Why not just use rchardet?
 
@@ -68,7 +68,7 @@ or
     collator.greater?("z", "a") #=> true
     collator.collate(%w[å æ ø]) #=> ["æ", "ø", "å"]
 ```
-  
+
 Text Boundary Analysis
 ----------------------
 
@@ -115,4 +115,4 @@ Note on Patches/Pull Requests
 Copyright
 =========
 
-Copyright (c) 2010-2012 Jari Bakken. See LICENSE for details.
+Copyright (c) 2010-2014 Jari Bakken. See LICENSE for details.

data/lib/ffi-icu/collation.rb

@@ -76,6 +76,14 @@ module ICU
 
         sortable.sort { |a, b| compare a, b }
       end
+
+      def rules
+        @rules ||= begin
+          length = FFI::MemoryPointer.new(:int)
+          ptr = ICU::Lib.ucol_getRules(@c, length)
+          ptr.read_array_of_uint16(length.read_int).pack("U*")
+        end
+      end
     end # Collator
 
   end # Collate

data/lib/ffi-icu/lib.rb

@@ -286,6 +286,7 @@ module ICU
     attach_function :ucol_greater,          "ucol_greater#{suffix}",          [:pointer,   :pointer,  :int32_t,  :pointer, :int32_t], :bool
     attach_function :ucol_greaterOrEqual,   "ucol_greaterOrEqual#{suffix}",   [:pointer,   :pointer,  :int32_t,  :pointer, :int32_t], :bool
     attach_function :ucol_equal,            "ucol_equal#{suffix}",            [:pointer,   :pointer,  :int32_t,  :pointer, :int32_t], :bool
+    attach_function :ucol_getRules,         "ucol_getRules#{suffix}",         [:pointer,   :pointer], :pointer
 
     # Transliteration
     #

data/lib/ffi-icu/transliteration.rb

@@ -33,7 +33,6 @@ module ICU
         parse_error = Lib::UParseError.new
         begin
           Lib.check_error do |status|
-            # couldn't get utrans_openU to work properly, so using deprecated utrans_open for now
             ptr = Lib.utrans_openU(UCharPointer.from_string(id), id.jlength, direction, rules, rules_length, @parse_error, status)
             @tr = FFI::AutoPointer.new(ptr, Lib.method(:utrans_close))
           end
@@ -69,9 +68,13 @@ module ICU
           raise BufferOverflowError, "needed #{new_size}" if retried
 
           capacity = new_size + 1
-          buf      = buf.resized_to capacity
-          retried  = true
 
+          # create a new buffer with more capacity instead of resizing,
+          # since the old buffer now has result data
+          buf.free
+          buf = UCharPointer.from_string(from, capacity)
+
+          retried = true
           retry
         end
 
@@ -81,4 +84,3 @@ module ICU
     end # Transliterator
   end # Translit
 end # ICU
-

data/lib/ffi-icu/uchar.rb

@@ -4,11 +4,21 @@ module ICU
     UCHAR_TYPE = :uint16 # not sure how platform-dependent this is..
     TYPE_SIZE  = FFI.type_size(UCHAR_TYPE)
 
-    def self.from_string(str)
+    def self.from_string(str, capacity = nil)
       str   = str.encode("UTF-8") if str.respond_to? :encode
       bytes = str.unpack("U*")
 
-      ptr = new bytes.size
+      if capacity
+        capacity *= TYPE_SIZE
+        if capacity < bytes.size
+          raise ArgumentError, "capacity is too small for string of #{bytes.size} bytes"
+        end
+
+        ptr = new capacity
+      else
+        ptr = new bytes.size
+      end
+
       ptr.write_array_of_uint16 bytes
 
       ptr
@@ -20,6 +30,7 @@ module ICU
 
     def resized_to(new_size)
       raise "new_size must be larger than current size" if new_size < size
+
       resized = self.class.new new_size
       resized.put_bytes(0, get_bytes(0, size))
 

data/lib/ffi-icu/version.rb

@@ -1,3 +1,3 @@
 module ICU
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/collation_spec.rb

@@ -55,6 +55,12 @@ module ICU
         collator.should_not be_equal("a", "b")
       end
 
+      it "should return rules" do
+        collator.rules.should_not be_empty
+        # ö sorts before Ö
+        collator.rules.include?('ö<<<Ö').should be_true
+      end
+
     end
   end # Collate
 end # ICU

data/spec/spec_helper.rb

@@ -8,4 +8,3 @@ require 'rspec'
 RSpec.configure do |config|
 
 end
-

data/spec/transliteration_spec.rb

@@ -4,14 +4,14 @@ require "spec_helper"
 
 module ICU
   describe Transliteration::Transliterator do
-
     def transliterator_for(*args)
       Transliteration::Transliterator.new(*args)
     end
 
     [
       ["Any-Hex", "abcde", "\\u0061\\u0062\\u0063\\u0064\\u0065"],
-      ["Lower", "ABC", "abc"]
+      ["Lower", "ABC", "abc"],
+      ["en", "雙屬性集合之空間分群演算法-應用於地理資料", "shuāng shǔ xìng jí hé zhī kōng jiān fēn qún yǎn suàn fǎ-yīng yòng yú de lǐ zī liào"]
     ].each do |id, input, output|
       it "should transliterate #{id}" do
         tl = transliterator_for(id)

data/spec/uchar_spec.rb

@@ -15,6 +15,11 @@ module ICU
       ptr.read_array_of_uint16(3).should == [0x61, 0x62, 0x63]
     end
 
+    it 'takes an optional capacity' do
+      ptr = UCharPointer.from_string('abc', 5)
+      ptr.size.should == 20
+    end
+
     describe 'converting to string' do
       let(:ptr) { UCharPointer.new(3).write_array_of_uint16 [0x78, 0x0, 0x79] }
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-icu
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.1.3
 platform: ruby
 authors:
 - Jari Bakken
@@ -14,55 +13,49 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
 description: Provides charset detection, locale sensitive collation and more. Depends
@@ -74,9 +67,9 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .document
-- .gitignore
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -110,31 +103,27 @@ files:
 - test.c
 homepage: http://github.com/jarib/ffi-icu
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2331794964690554851
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple Ruby FFI wrappers for things I need from ICU.
 test_files:
 - spec/break_iterator_spec.rb
@@ -148,3 +137,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/transliteration_spec.rb
 - spec/uchar_spec.rb
+has_rdoc: