ffi-hunspell 0.2.5 → 0.2.6

data/ChangeLog.md

@@ -1,3 +1,11 @@
+### 0.2.6 / 2013-02-05
+
+* Removed the env dependency.
+* Check the returned count from `Hunsepll_stem` in
+  {FFI::Hunspell::Dictionary#stem}.
+* Check the returned count from `Hunspell_suggest` in
+  {FFI::Hunspell::Dictionary#suggest}.
+
 ### 0.2.5 / 2012-05-11
 
 * Load `libhunspell-1.2.so.0` if `libhunspell-1.2.so` cannot be found.

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2012 Hal Brodigan
+Copyright (c) 2010-2013 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

@@ -7,7 +7,7 @@
 
 ## Description
 
-Ruby FFI bindings for [Hunspell](http://hunspell.sourceforge.net/).
+Ruby FFI bindings for [Hunspell][libhunspell].
 
 ## Examples
 
@@ -47,9 +47,8 @@ Suggest alternate spellings for a word:
 
 ## Requirements
 
-* [libhunspell](http://hunspell.sourceforge.net/) >= 1.2.0
-* [ffi](https://github.com/ffi/ffi) ~> 1.0
-* [env](https://github.com/postmodern/env) ~> 0.2
+* [libhunspell] >= 1.2.0
+* [ffi] ~> 1.0
 
 ## Install
 
@@ -66,6 +65,9 @@ so that {FFI::Hunspell} can find the library:
 
 ## License
 
-Copyright (c) 2010-2012 Hal Brodigan
+Copyright (c) 2010-2013 Hal Brodigan
 
 See {file:LICENSE.txt} for license information.
+
+[libhunspell]: http://hunspell.sourceforge.net/
+[ffi]: https://github.com/ffi/ffi

data/gemspec.yml

@@ -1,5 +1,5 @@
 name: ffi-hunspell
-version: 0.2.5
+version: 0.2.6
 summary: FFI bindings for Hunspell
 description: Ruby FFI bindings for Hunspell spell checker.
 license: MIT
@@ -12,7 +12,6 @@ requirements: libhunspell >= 1.2.0
 
 dependencies:
   ffi: ~> 1.0
-  env: ~> 0.2
 
 development_dependencies:
   rubygems-tasks: ~> 0.1

data/lib/ffi/hunspell/dictionary.rb

@@ -19,7 +19,7 @@ module FFI
       # @param [String] affix_path
       #   The path to the `.aff` file.
       #
-      # @param [String] dict_path
+      # @param [String] dic_path
       #   The path to the `.dic` file.
       #
       # @param [String] key
@@ -165,7 +165,9 @@ module FFI
           count = Hunspell.Hunspell_stem(self,output,word.to_s)
           ptr = output.get_pointer(0)
 
-          stems = ptr.get_array_of_string(0,count)
+          if count > 0
+            stems = ptr.get_array_of_string(0,count)
+          end
         end
 
         return stems
@@ -187,7 +189,9 @@ module FFI
           count = Hunspell.Hunspell_suggest(self,output,word.to_s)
           ptr = output.get_pointer(0)
 
-          suggestions = ptr.get_array_of_string(0,count)
+          if count > 0
+            suggestions = ptr.get_array_of_string(0,count)
+          end
         end
 
         return suggestions

data/lib/ffi/hunspell/hunspell.rb

@@ -1,5 +1,4 @@
 require 'ffi'
-require 'env'
 
 module FFI
   module Hunspell
@@ -30,7 +29,7 @@ module FFI
     #
 
     # The language to default to, if no 'LANG' env variable was set.
-    DEFAULT_LANG = 'en_US'
+    DEFAULT_LANG = ENV.fetch('LANG','en_US.UTF-8').split('.',2).first
 
     #
     # The default language.
@@ -41,13 +40,13 @@ module FFI
     # @since 0.2.0
     #
     def Hunspell.lang
-      @lang ||= (Env.lang[0] || DEFAULT_LANG)
+      @lang ||= DEFAULT_LANG
     end
 
     #
     # Sets the default language.
     #
-    # @param [String] name
+    # @param [String] new_lang
     #   The new language name.
     #
     # @return [String]
@@ -65,7 +64,7 @@ module FFI
     # Known directories to search within for dictionaries.
     KNOWN_DIRECTORIES = [
       # User
-      Env.home.join(USER_DIR),
+      File.join(Gem.user_home,USER_DIR),
       # Debian
       '/usr/local/share/myspell/dicts',
       '/usr/share/myspell/dicts',

data/spec/dictionary_spec.rb

@@ -9,48 +9,62 @@ describe Hunspell::Dictionary do
   let(:affix_path) { File.join(Hunspell.directories.last,"#{lang}.aff") }
   let(:dic_path) { File.join(Hunspell.directories.last,"#{lang}.dic") }
 
-  it "should find and open a dictionary file for a given language" do
-    subject.open(lang) do |dict|
+  describe "#initialize" do
+    subject { described_class }
+
+    it "should create a dictionary from '.aff' and '.dic' files" do
+      dict = subject.new(affix_path,dic_path)
       dict.should_not be_nil
+
+      dict.close
     end
   end
 
-  it "should create a dictionary from '.aff' and '.dic' files" do
-    dict = subject.new(affix_path,dic_path)
-    dict.should_not be_nil
+  describe "open" do
+    subject { described_class }
 
-    dict.close
-  end
+    it "should find and open a dictionary file for a given language" do
+      subject.open(lang) do |dict|
+        dict.should_not be_nil
+      end
+    end
 
-  it "should close the dictionary" do
-    dict = subject.open(lang)
-    dict.close
+    it "should close the dictionary" do
+      dict = subject.open(lang)
+      dict.close
 
-    dict.should be_closed
+      dict.should be_closed
+    end
   end
 
+  subject { described_class.new(affix_path,dic_path) }
+
+  after(:all) { subject.close }
+
   it "should provide the encoding of the dictionary files" do
-    subject.open(lang) do |dict|
-      dict.encoding.should_not be_empty
-    end
+    subject.encoding.should_not be_empty
   end
 
   it "should check if a word is valid" do
-    subject.open(lang) do |dict|
-      dict.should be_valid('dog')
-      dict.should_not be_valid('dxg')
-    end
+    subject.should be_valid('dog')
+    subject.should_not be_valid('dxg')
   end
 
-  it "should find the stems of a word" do
-    subject.open(lang) do |dict|
-      dict.stem('fishing').should == %w[fishing fish]
+  describe "#stem" do
+    it "should find the stems of a word" do
+      subject.stem('fishing').should == %w[fishing fish]
+    end
+
+    context "when there are no stems" do
+      it "should return []" do
+        subject.stem("zzzzzzz").should == []
+      end
     end
   end
 
-  it "should suggest alternate spellings for words" do
-    subject.open(lang) do |dict|
-      dict.suggest('arbitrage').should == %w[
+  describe "#suggest" do
+    it "should suggest alternate spellings for words" do
+      subject.suggest('arbitrage').should == %w[
         arbitrage
         arbitrages
         arbitrager
@@ -58,5 +72,11 @@ describe Hunspell::Dictionary do
         arbitrate
       ]
     end
+
+    context "when there are no suggestions" do
+      it "should return []" do
+        subject.suggest("________").should == []
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-hunspell
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-12 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -27,22 +27,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: env
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement