ffi-hunspell 0.2.0 → 0.2.2

data/ChangeLog.md

@@ -1,3 +1,17 @@
+### 0.2.2 / 2011-01-25
+
+* Added {FFI::Hunspell::USER_DIR}.
+* Added {FFI::Hunspell::KNOWN_DIRECTORIES}, containing known dictionary
+  directories used by Debian, Fedora and Mac Ports.
+* Have {FFI::Hunspell.directories} return the dictionary directories found
+  on the system.
+
+### 0.2.1 / 2011-01-23
+
+* Require env ~> 0.1.2.
+  * Use `Env.lang` to get the default language.
+* Updated the Copyright years.
+
 ### 0.2.0 / 2011-01-22
 
 * Added {FFI::Hunspell.lang}.

data/LICENSE.txt

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

data/README.md

@@ -49,6 +49,7 @@ Suggest alternate spellings for a word:
 
 * [libhunspell](http://hunspell.sourceforge.net/) >= 1.2.0
 * [ffi](http://github.com/ffi/ffi) ~> 0.6.0
+* [env](http://github.com/postmodern/env) ~> 0.1.2
 
 ## Install
 
@@ -65,5 +66,6 @@ so that {FFI::Hunspell} can find the library:
 
 ## License
 
-See {file:LICENSE.txt} for license information.
+Copyright (c) 2010-2011 Hal Brodigan
 
+See {file:LICENSE.txt} for license information.

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'ore-tasks', '~> 0.2.0'
+  gem 'ore-tasks', '~> 0.3.0'
   require 'ore/tasks'
 
   Ore::Tasks.new
@@ -12,7 +12,7 @@ rescue LoadError => e
 end
 
 begin
-  gem 'rspec', '~> 2.0.0'
+  gem 'rspec', '~> 2.4.0'
   require 'rspec/core/rake_task'
 
   RSpec::Core::RakeTask.new

data/gemspec.yml

@@ -1,5 +1,5 @@
 name: ffi-hunspell
-version: 0.2.0
+version: 0.2.2
 summary: FFI bindings for Hunspell
 description: Ruby FFI bindings for Hunspell spell checker.
 license: MIT
@@ -12,8 +12,9 @@ requirements: libhunspell >= 1.2.0
 
 dependencies:
   ffi: ~> 0.6.0
+  env: ~> 0.1.2
 
 development_dependencies:
-  ore-tasks: ~> 0.2.0
-  rspec: ~> 2.0.0
+  ore-tasks: ~> 0.3.0
+  rspec: ~> 2.4.0
   yard: ~> 0.6.0

data/lib/ffi/hunspell/dictionary.rb

@@ -26,7 +26,7 @@ module FFI
       #   The optional key for encrypted dictionary files.
       #
       # @raise [RuntimeError]
-      #   Either the affix or dic files did not exist.
+      #   Either the `.aff` or `.dic` files did not exist.
       #
       def initialize(affix_path,dic_path,key=nil)
         unless File.file?(affix_path)

data/lib/ffi/hunspell/hunspell.rb

@@ -1,4 +1,5 @@
 require 'ffi'
+require 'env'
 
 module FFI
   module Hunspell
@@ -39,11 +40,7 @@ module FFI
     # @since 0.2.0
     #
     def Hunspell.lang
-      @lang ||= if ENV['LANG']
-                  ENV['LANG'].split('.',2).first
-                else
-                  DEFAULT_LANG
-                end
+      @lang ||= (Env.lang[0] || DEFAULT_LANG)
     end
 
     #
@@ -61,24 +58,36 @@ module FFI
       @lang = new_lang.to_s
     end
 
+    # The directory name used to store user installed dictionaries.
+    USER_DIR = '.hunspell_default'
+
+    # Known directories to search within for dictionaries.
+    KNOWN_DIRECTORIES = [
+      # User
+      Env.home.join(USER_DIR),
+      # Debian
+      '/usr/local/share/myspell/dicts',
+      '/usr/share/myspell/dicts',
+      # Fedora
+      '/usr/local/share/myspell',
+      '/usr/share/myspell',
+      # Mac Ports
+      '/opt/local/share/hunspell',
+      '/opt/share/hunspell'
+    ]
+
     #
-    # The directories to search for dictionary files.
+    # The dictionary directories to search for dictionary files.
     #
-    # @return [Array]
+    # @return [Array<String, Pathname>]
     #   The directory paths.
     #
     # @since 0.2.0
     #
     def Hunspell.directories
-      @directories ||= [
-        '/usr/local/share/myspell',
-        '/usr/share/myspell'
-      ]
-    end
-
-    # prepend the ~/.hunspell_default directory to DIRS
-    if (home = (ENV['HOME'] || ENV['HOMEPATH']))
-      directories.unshift(File.join(home,'.hunspell_default'))
+      @directories ||= KNOWN_DIRECTORIES.select do |path|
+        File.directory?(path)
+      end
     end
 
     #

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
+gem 'rspec', '~> 2.4.0'
 require 'rspec'
+
 require 'ffi/hunspell'
 
 include FFI

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Postmodern
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-22 00:00:00 -08:00
+date: 2011-01-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ore-tasks
+  name: env
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -42,13 +42,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
+        - 1
         - 2
-        - 0
-        version: 0.2.0
-  type: :development
+        version: 0.1.2
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: ore-tasks
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -56,16 +56,31 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
         - 0
+        - 3
         - 0
-        version: 2.0.0
+        version: 0.3.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 4
+        - 0
+        version: 2.4.0
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -76,7 +91,7 @@ dependencies:
         - 0
         version: 0.6.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: Ruby FFI bindings for Hunspell spell checker.
 email: postmodern.mod3@gmail.com
 executables: []