ffi-icu 0.0.7 → 0.0.8

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+before_script:
+  - sudo apt-get install -y libicu44

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2011 Jari Bakken
+Copyright (c) 2010-2012 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

@@ -3,6 +3,8 @@ ffi-icu
 
 Simple FFI wrappers for things I need from ICU. For the full thing, check out [ICU4R](http://icu4r.rubyforge.org/) instead.
 
+[![Build Status](https://secure.travis-ci.org/jarib/ffi-icu.png)](http://travis-ci.org/jarib/ffi-icu)
+
 Gem
 ---
 
@@ -113,4 +115,4 @@ Note on Patches/Pull Requests
 Copyright
 =========
 
-Copyright (c) 2010-2011 Jari Bakken. See LICENSE for details.
+Copyright (c) 2010-2012 Jari Bakken. See LICENSE for details.

data/Rakefile

@@ -14,14 +14,12 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-task :spec
-
 task :default => :spec
 
 begin
   require 'yard'
   YARD::Rake::YardocTask.new
-rescue
+rescue LoadError
   task :yardoc do
     abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
   end

data/ffi-icu.gemspec

@@ -1,8 +1,3 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
 require File.expand_path("../lib/ffi-icu/version", __FILE__)
 
 Gem::Specification.new do |s|
@@ -24,7 +19,8 @@ Gem::Specification.new do |s|
   s.rdoc_options              = ["--charset=UTF-8"]
   s.summary                   = %q{Simple Ruby FFI wrappers for things I need from ICU.}
 
-  s.add_runtime_dependency(%q<ffi>, ["~> 1.0.9"])
-  s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
+  s.add_runtime_dependency "ffi", ["~> 1.0.9"]
+  s.add_development_dependency "rspec", ["~> 2.5.0"]
+  s.add_development_dependency "rake", ["~> 0.9.2"]
 end
 

data/lib/ffi-icu.rb

@@ -10,6 +10,8 @@ module ICU
       :osx
     when /linux/
       :linux
+    when /bsd/
+      :bsd
     when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
       :windows
     else

data/lib/ffi-icu/lib.rb

@@ -8,60 +8,69 @@ module ICU
   module Lib
     extend FFI::Library
 
-    VERSIONS = {
-      "48" => "_48",
-      "46" => "_46",
-      "45" => "_45",
-      "44" => "_44",
-      "42" => "_4_2",
-    }
-
-    # FIXME: this is incredibly ugly, figure out some better way
-    def self.find_icu
-      suffix = ''
-
-      # let the user tell us where the lib is
-      if ENV['FFI_ICU_LIB']
-        libs = ENV['FFI_ICU_LIB'].split(",")
-        ffi_lib(*libs)
-
-        if ENV['FFI_ICU_VERSION_SUFFIX']
-          return ENV['FFI_ICU_VERSION_SUFFIX']
-        elsif num = libs.first[/\d+$/]
-          return num.split(//).join("_")
+    def self.search_paths
+      @search_paths ||= begin
+        if ENV['FFI_ICU_LIB']
+          [ ENV['FFI_ICU_LIB'] ]
+        elsif FFI::Platform::IS_WINDOWS
+          ENV['PATH'].split(File::PATH_SEPARATOR)
         else
-          return suffix
+          [ '/usr/local/{lib64,lib}', '/opt/local/{lib64,lib}', '/usr/{lib64,lib}' ]
         end
       end
+    end
+
+    def self.find_lib(lib)
+      Dir.glob(search_paths.map { |path|
+        File.expand_path(File.join(path, lib))
+      }).first
+    end
 
-      libs = nil
-      versions = VERSIONS.keys
-
-      # ok, try to find it
-      case ICU.platform
-      when :osx
-        ffi_lib "icucore"
-      when :linux
-        libs = ffi_lib versions.map { |v| "libicui18n.so.#{v}" },
-                       versions.map { |v| "libicutu.so.#{v}"   }
-
-      when :windows
-        libs = ffi_lib versions.map { |v| "icuin#{v}.dll" }
-      else
-        raise LoadError
+    def self.load_icu
+      # First find the library
+      lib_names = case ICU.platform
+                  when :osx
+                    [find_lib("libicucore.#{FFI::Platform::LIBSUFFIX}")]
+                  when :linux
+                    [find_lib("libicui18n.#{FFI::Platform::LIBSUFFIX}.??"),
+                     find_lib("libicutu.#{FFI::Platform::LIBSUFFIX}.??")]
+                  when :windows
+                    [find_lib("icuuc??.#{FFI::Platform::LIBSUFFIX}"),
+                     find_lib("icuin??.#{FFI::Platform::LIBSUFFIX}")]
+                  end
+
+      lib_names.compact! if lib_names
+
+      if not lib_names or lib_names.length == 0
+        raise LoadError, "Could not find ICU on #{ICU.platform.inspect}, patches appreciated!"
       end
 
-      if libs
-        lib_name = libs.first.name
-        version  = VERSIONS.find { |object, func| lib_name =~ /#{object}(\.dll)?$/ }
+      # And now try to load the library
+      begin
+        libs = ffi_lib(*lib_names)
+      rescue LoadError => ex
+        raise LoadError, "no idea how to load ICU on #{ICU.platform.inspect}, patches appreciated! (#{ex.message})"
+      end
 
-        version or raise "unable to find suffix in #{lib_name}"
-        suffix = version.last
+      # And last figure out the version we just loaded
+      icu_version(libs)
+    end
+
+    def self.icu_version(libs)
+      version = nil
+
+      libs.find do |lib|
+        # Get the version - sure would be nice if libicu exported this in a function
+        # we could just call cause this is super fugly!
+        match = lib.name.match(/(\d\d)\.#{FFI::Platform::LIBSUFFIX}/) ||
+                lib.name.match(/#{FFI::Platform::LIBSUFFIX}\.(\d\d)/)
+        if match
+          version = match[1]
+        end
       end
 
-      suffix
-    rescue LoadError => ex
-      raise LoadError, "no idea how to load ICU on #{ICU.platform.inspect}, patches appreciated! (#{ex.message})"
+      # Note this may return nil, like on OSX
+      version
     end
 
     def self.check_error
@@ -101,8 +110,8 @@ module ICU
       end
     end
 
-
-    suffix = find_icu()
+    version = load_icu
+    suffix = version ? "_#{version}" : ""
 
     attach_function :u_errorName,     "u_errorName#{suffix}",     [:int],      :string
     attach_function :uenum_count,     "uenum_count#{suffix}",     [:pointer,   :pointer], :int
@@ -190,7 +199,7 @@ module ICU
                                 :default, 4,
                                 :nfkc,    5,
                                 :fcd,     6
-                              ]
+    ]
 
     attach_function :unorm_normalize, "unorm_normalize#{suffix}", [:pointer, :int32_t, :normalization_mode, :int32_t, :pointer, :int32_t, :pointer], :int32_t
 
@@ -211,7 +220,7 @@ module ICU
                         :kana_limit,   400,
                         :ideo,         400,
                         :ideo_limit,   400
-                      ]
+    ]
 
     attach_function :ubrk_countAvailable, "ubrk_countAvailable#{suffix}", [],              :int32_t
     attach_function :ubrk_getAvailable,   "ubrk_getAvailable#{suffix}",   [:int32_t],      :string

data/lib/ffi-icu/version.rb

@@ -1,3 +1,3 @@
 module ICU
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/chardet_spec.rb

@@ -4,16 +4,16 @@ require 'spec_helper'
 
 describe ICU::CharDet::Detector do
 
-  before { @d = ICU::CharDet::Detector.new }
+  let(:detector) { ICU::CharDet::Detector.new }
 
   it "should recognize UTF-8" do
-    m = @d.detect("æåø")
+    m = detector.detect("æåø")
     m.name.should == "UTF-8"
     m.language.should be_kind_of(String)
   end
 
   it "has a list of detectable charsets" do
-    cs = @d.detectable_charsets
+    cs = detector.detectable_charsets
     cs.should be_kind_of(Array)
     cs.should_not be_empty
 
@@ -21,18 +21,17 @@ describe ICU::CharDet::Detector do
   end
 
   it "should disable / enable the input filter" do
-    @d.input_filter_enabled?.should be_false
-    @d.input_filter_enabled = true
-    @d.input_filter_enabled?.should be_true
+    detector.input_filter_enabled?.should be_false
+    detector.input_filter_enabled = true
+    detector.input_filter_enabled?.should be_true
   end
 
   it "should should set declared encoding" do
-    @d.declared_encoding = "UTF-8"
+    detector.declared_encoding = "UTF-8"
   end
 
   it "should detect several matching encodings" do
-    r = @d.detect_all("foo bar")
-    r.should be_instance_of(Array)
+    detector.detect_all("foo bar").should be_instance_of(Array)
   end
 
 end

data/spec/collation_spec.rb

@@ -11,15 +11,14 @@ module ICU
     end
 
     describe Collator do
-
-      before { @c = Collator.new("nb") }
+      let(:collator) { Collator.new("nb") }
 
       it "should collate an array of strings" do
-        @c.collate(%w[å ø æ]).should == %w[æ ø å]
+        collator.collate(%w[å ø æ]).should == %w[æ ø å]
       end
 
       it "raises an error if argument does not respond to :sort" do
-        lambda { @c.collate(1) }.should raise_error(ArgumentError)
+        lambda { collator.collate(1) }.should raise_error(ArgumentError)
       end
 
       it "should return available locales" do
@@ -30,30 +29,30 @@ module ICU
       end
 
       it "should return the locale of the collator" do
-        l = @c.locale
+        l = collator.locale
         l.should == "nb"
       end
 
       it "should compare two strings" do
-        @c.compare("blåbærsyltetøy", "blah").should == 1
-        @c.compare("blah", "blah").should == 0
-        @c.compare("baah", "blah").should == -1
+        collator.compare("blåbærsyltetøy", "blah").should == 1
+        collator.compare("blah", "blah").should == 0
+        collator.compare("baah", "blah").should == -1
       end
 
       it "should know if a string is greater than another" do
-        @c.should be_greater("z", "a")
-        @c.should_not be_greater("a", "z")
+        collator.should be_greater("z", "a")
+        collator.should_not be_greater("a", "z")
       end
 
       it "should know if a string is greater or equal to another" do
-        @c.should be_greater_or_equal("z", "a")
-        @c.should be_greater_or_equal("z", "z")
-        @c.should_not be_greater_or_equal("a", "z")
+        collator.should be_greater_or_equal("z", "a")
+        collator.should be_greater_or_equal("z", "z")
+        collator.should_not be_greater_or_equal("a", "z")
       end
 
       it "should know if a string is equal to another" do
-        @c.should be_equal("a", "a")
-        @c.should_not be_equal("a", "b")
+        collator.should be_equal("a", "a")
+        collator.should_not be_equal("a", "b")
       end
 
     end

data/spec/transliteration_spec.rb

@@ -5,17 +5,17 @@ require "spec_helper"
 module ICU
   describe Transliteration::Transliterator do
 
-    def transliterator(*args)
-      @t = Transliteration::Transliterator.new(*args)
+    def transliterator_for(*args)
+      Transliteration::Transliterator.new(*args)
     end
 
     [
-     { :id => "Any-Hex",     :input => "abcde",  :output => "\\u0061\\u0062\\u0063\\u0064\\u0065"  },
-     { :id => "Lower",       :input => "ABC",    :output => "abc"                                  },
-    ].each do |test|
-
-      it "should transliterate #{test[:id]}" do
-        transliterator(test[:id]).transliterate(test[:input]).should == test[:output]
+      ["Any-Hex", "abcde", "\\u0061\\u0062\\u0063\\u0064\\u0065"],
+      ["Lower", "ABC", "abc"]
+    ].each do |id, input, output|
+      it "should transliterate #{id}" do
+        tl = transliterator_for(id)
+        tl.transliterate(input).should == output
       end
 
     end

metadata

@@ -1,51 +1,76 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ffi-icu
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.8
   prerelease: 
-  version: 0.0.7
 platform: ruby
-authors: 
+authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-08-23 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2010-08-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ffi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.9
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !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
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !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
-  version_requirements: *id002
-description: Provides charset detection, locale sensitive collation and more. Depends on libicu.
+  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
+  on libicu.
 email: jari.bakken@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
 - .document
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -73,32 +98,30 @@ files:
 - test.c
 homepage: http://github.com/jarib/ffi-icu
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.2
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Simple Ruby FFI wrappers for things I need from ICU.
-test_files: 
+test_files:
 - spec/break_iterator_spec.rb
 - spec/chardet_spec.rb
 - spec/collation_spec.rb
@@ -106,3 +129,4 @@ test_files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/transliteration_spec.rb
+has_rdoc: