kakasi 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e7c7cc9b276f00033e2586df340602f1ea7612a
-  data.tar.gz: 751cc756a4096e797e9654ce03d17fd89be64f0b
+  metadata.gz: d07c817b6d00ce7eb000d93d9e9762b792ace073
+  data.tar.gz: b8130607990cd6249715a192ae7e4bed52ddf31a
 SHA512:
-  metadata.gz: 8f541fdd5d2da31548f83f80238a8f9a4f89075f238f76c2e3f4e5feb6aeac6b857fbc341eefc02d3e3740a601a919bc0a12471b89a0609879a51af3b9ff204f
-  data.tar.gz: 153726de54a4ae4778528988f270f8b0b38cd79960263c770fb57f827cf48b4819d0327fda9a48e030b34c5111e51f2430e27b5e7f3e97180ebe7ee2a4cea61b
+  metadata.gz: 48184c68e9d538bd79ffd63b8e8413b4f3f71ad8538db2cb523ec12e888ad2aa822101d5bc1d1c66b1784451e641670f5fc3f450452ec406bf9774d60e36b84e
+  data.tar.gz: 91d0cc0e73b284d0baff1eccfbf02d0613b2a5f16adeab3a131295354b64f859066aa40a5719d7594179a5712b4b22bd150eb77dc26d6506ff27a6faada67f9e

data/.travis.yml

@@ -0,0 +1,20 @@
+---
+language: ruby
+rvm:
+- 1.9.3
+- 2.0.0
+- 2.1.2
+- ruby-head
+- jruby-19mode
+- jruby-head
+- rbx-2
+script: rake test
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -y libkakasi2 libkakasi2-dev
+before_script:
+  - rake compile

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Akinori MUSHA
+Copyright (c) 2013, 2014 Akinori MUSHA
 
 All rights reserved.
 

data/Rakefile

@@ -18,3 +18,12 @@ Rake::RDocTask.new do |rdoc|
 end
 
 task :default => :test
+
+task :compile do
+  gemspec.extensions.each { |ext|
+    dir, extconf = File.split(ext)
+    chdir(dir) {
+      ruby extconf
+    }
+  }
+end

data/ext/kakasi-config/extconf.rb

@@ -19,7 +19,11 @@ module KakasiExtConf
     },
 
     ffi: ->{
-      require 'ffi'
+      if defined?(Rubinius)
+        FFI = Rubinius::FFI
+      else
+        require 'ffi'
+      end
       extend FFI::Library
     },
   }.find { |impl, code|
@@ -36,46 +40,31 @@ module KakasiExtConf
 
   print 'checking for kakasi... '
 
-  libkakasi = Enumerator.new { |y|
-    libfilename = RbConfig::CONFIG['LIBRUBY_SO'].tap { |so|
-      prefix = so[/\A(?:lib|)/]
-      suffix = so[/\.(?![0-9]+(?:\.|\z))[^.]+/] or raise 'failed to detect the file extension for dynamic libraries'
-      break prefix + 'kakasi' + suffix
-    }
+  require '../../lib/kakasi/platform.rb'
 
-    $LIBPATH.each { |dir|
-      y << File.join(dir, libfilename)
-    }
-    y << 'kakasi'
-    y << 'libkakasi'
-    y << libfilename
-  }.find { |lib|
-    begin
+  begin
+    libkakasi = Kakasi::Lib.try_load($LIBPATH) { |lib|
       case default_impl
       when :fiddle, :dl
         dlload lib
       when :ffi
         ffi_lib lib
       else
-        next false
+        raise LoadError, 'NOTREACHED'
       end
-      puts lib
-      true
-    rescue LoadError, StandardError
-      false
-    end
-  } or
-    begin
-      puts 'FAILED!'
-      exit false
-    end
+    }
+    puts libkakasi
+  rescue LoadError
+    puts 'FAILED!'
+    exit false
+  end
 
   '../../lib/kakasi/config.rb'.tap { |rb|
     puts 'creating %s' % rb
     File.open(File.expand_path(rb, File.dirname(__FILE__)), 'wt') { |f|
-      f.print <<-'EOF' % [libkakasi.inspect, default_impl.inspect]
+      f.print <<-'EOF' % [$LIBPATH.inspect, default_impl.inspect]
 module Kakasi
-  LIBKAKASI = %s unless defined?(LIBKAKASI)
+  LIBPATH = %s unless defined?(LIBPATH)
   IMPL = %s unless defined?(IMPL)
 end
       EOF

data/kakasi.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rdoc", ["> 2.4.2"]
   spec.add_development_dependency "bundler", [">= 1.2"]
+  spec.add_development_dependency "test-unit"
 end

data/lib/kakasi.rb

@@ -3,19 +3,14 @@ require 'kakasi/version'
 module Kakasi
   case RUBY_ENGINE
   when 'jruby'
-    LIBKAKASI = 'kakasi' unless defined?(LIBKAKASI)
-    IMPL = :ffi unless defined?(IMPL)
+    LIBPATH = [].freeze
+    IMPL = :ffi unless defined?(::Kakasi::IMPL)
   else
     begin
       require 'kakasi/config'
     rescue LoadError
-      require 'rbconfig'
-      LIBKAKASI = RbConfig::CONFIG['LIBRUBY_SO'].tap { |so|
-        prefix = so[/\A(?:lib|)/]
-        suffix = so[/\.(?![0-9]+(?:\.|\z))[^.]+/] or raise 'failed to detect the file extension for dynamic libraries'
-        break prefix + 'kakasi' + suffix
-      } unless defined?(LIBKAKASI)
-      IMPL = :ffi unless defined?(IMPL)
+      LIBPATH = [].freeze
+      IMPL = :ffi unless defined?(::Kakasi::IMPL)
     end
   end
 

data/lib/kakasi/ffi.rb

@@ -7,7 +7,11 @@ module Kakasi
     end
     extend FFI::Library
 
-    ffi_lib LIBKAKASI
+    require 'kakasi/platform'
+
+    try_load { |lib|
+      ffi_lib lib
+    }
 
     attach_function 'kakasi_getopt_argv', [:int, :pointer], :int
     attach_function 'kakasi_do', [:string], :pointer

data/lib/kakasi/fiddle.rb

@@ -14,7 +14,11 @@ module Kakasi
       raise 'Unsupported pointer size: %u' % SIZEOF_VOIDP
     end
 
-    dlload LIBKAKASI
+    require 'kakasi/platform'
+
+    try_load { |lib|
+      dlload lib
+    }
 
     extern 'int kakasi_getopt_argv(int, char **)'
     extern 'char *kakasi_do(char *)'

data/lib/kakasi/platform.rb

@@ -0,0 +1,59 @@
+module Kakasi
+  module Lib
+    if defined?(::FFI::Platform)
+      LIBPREFIX = ::FFI::Platform::LIBPREFIX
+      LIBSUFFIX = ::FFI::Platform::LIBSUFFIX
+    else
+      LIBPREFIX =
+        case RbConfig::CONFIG['host_os']
+        when /mingw|mswin/i
+          ''.freeze
+        when /cygwin/i
+          'cyg'.freeze
+        else
+          'lib'.freeze
+        end
+
+      LIBSUFFIX =
+        case RbConfig::CONFIG['host_os']
+        when /darwin/i
+          'dylib'.freeze
+        when /mingw|mswin|cygwin/i
+          'dll'.freeze
+        else
+          'so'.freeze
+        end
+    end
+
+    DEFLIBPATH =
+      begin
+        [RbConfig::CONFIG['libir']] |
+          case RbConfig::CONFIG['host_os']
+          when /mingw|mswin/i
+            []
+          else
+            %w[/lib /usr/lib]
+          end
+      end.freeze
+
+    def self.map_library_name(name)
+      "#{LIBPREFIX}#{name}.#{LIBSUFFIX}"
+    end
+
+    def self.try_load(libpath = LIBPATH)
+      basename = map_library_name('kakasi')
+      (libpath | DEFLIBPATH).each { |dir|
+        begin
+          filename = File.join(dir, basename)
+          yield filename
+          return filename
+        rescue LoadError, StandardError
+          next
+        end
+      }
+
+      yield basename
+      return basename
+    end
+  end
+end

data/lib/kakasi/version.rb

@@ -1,4 +1,4 @@
 module Kakasi
   KAKASI_VERSION = '2002-09-28'
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kakasi
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Akinori MUSHA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby binding for KAKASI implemented with Fiddle/DL/FFI
 email:
 - knu@idaemons.org
@@ -61,6 +75,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -71,6 +86,7 @@ files:
 - lib/kakasi/dl.rb
 - lib/kakasi/ffi.rb
 - lib/kakasi/fiddle.rb
+- lib/kakasi/platform.rb
 - lib/kakasi/version.rb
 - test/helper.rb
 - test/test_kakasi.rb
@@ -94,10 +110,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Ruby binding for KAKASI implemented with FFI
 test_files:
 - test/helper.rb
 - test/test_kakasi.rb
+has_rdoc: