ffi-hunspell 0.3.0 → 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f1f146caea929efea0b2d0ea4853410c9693a271
+  data.tar.gz: 7f29da7a3b1a6e272a1f17aed2ff75b771128f56
+SHA512:
+  metadata.gz: 65c59a19ade6f500cfe8782699432efc0a28c573cd81a760982b8335db1d78fe740c521f8a5c526ae66d0fb7a2b94950f32a59d6fc347b9e6411ec14b5b342c8
+  data.tar.gz: 645580d8d22a25966345a86d5303130a801e6236120c02ca8314280f2b79e038ebb3ce68e21864685ca2e24d50807715e34bc6e45a7fcaedae30d8d6ef89c9b7

data/.travis.yml

@@ -4,11 +4,10 @@ before_install:
   - gem install ffi rubygems-tasks rspec yard
 rvm:
   - 1.9.3
-  - 2.0.0
-  - jruby-19mode
-  - rbx-19mode
+  - 2.3.0
+  - jruby
+  - rbx
 matrix:
   allow_failures:
-    - rvm: rbx-18mode
-    - rvm: rbx-19mode
-script: rake test
+    - rvm: rbx
+script: rake spec

data/ChangeLog.md

@@ -1,9 +1,14 @@
+### 0.3.1 / 2016-01-14
+
+* Prefer loading hunspell-1.3 over hunspell-1.2, if both are installed.
+* Support auto-detection of hunspell installed by homebrew (@forward3d).
+
 ### 0.3.0 / 2013-05-01
 
 * Detect Ubuntu's hunspell directory (`/usr/share/hunspell`).
 * {FFI::Hunspell::Dictionary#encoding} now returns an `Encoding` object.
 * Encode Strings returned from {FFI::Hunspell::Dictionary#stem} and
-  {FFI::Hunspell::Dictionary#suggestions} to match the dictionary's native
+  {FFI::Hunspell::Dictionary#suggest} to match the dictionary's native
   encoding.
 
 ### 0.2.6 / 2013-02-05

data/LICENSE.txt

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

@@ -58,7 +58,7 @@ Suggest alternate spellings for a word:
 
 ## License
 
-Copyright (c) 2010-2013 Hal Brodigan
+Copyright (c) 2010-2016 Hal Brodigan
 
 See {file:LICENSE.txt} for license information.
 

data/Rakefile

@@ -2,7 +2,6 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'rubygems-tasks', '~> 0.1'
   require 'rubygems/tasks'
 
   Gem::Tasks.new
@@ -12,7 +11,6 @@ rescue LoadError => e
 end
 
 begin
-  gem 'rspec', '~> 2.4'
   require 'rspec/core/rake_task'
 
   RSpec::Core::RakeTask.new
@@ -25,7 +23,6 @@ task :test => :spec
 task :default => :spec
 
 begin
-  gem 'yard', '~> 0.7'
   require 'yard'
 
   YARD::Rake::YardocTask.new  

data/gemspec.yml

@@ -1,5 +1,5 @@
 name: ffi-hunspell
-version: 0.3.0
+version: 0.3.1
 summary: FFI bindings for Hunspell
 description: Ruby FFI bindings for the Hunspell spell checker.
 license: MIT
@@ -17,5 +17,5 @@ dependencies:
 
 development_dependencies:
   rubygems-tasks: ~> 0.1
-  rspec: ~> 2.4
+  rspec: ~> 3.0
   yard: ~> 0.7

data/lib/ffi/hunspell/hunspell.rb

@@ -4,8 +4,11 @@ module FFI
   module Hunspell
     extend FFI::Library
 
-    ffi_lib ['hunspell-1.2', 'libhunspell-1.2.so.0',
-             'hunspell-1.3', 'libhunspell-1.3.so.0']
+    ffi_lib [
+      'hunspell-1.3', 'libhunspell-1.3.so.0',
+      'hunspell-1.2', 'libhunspell-1.2.so.0'
+    ]
+
 
     attach_function :Hunspell_create, [:string, :string], :pointer
     attach_function :Hunspell_create_key, [:string, :string, :string], :pointer
@@ -39,7 +42,7 @@ module FFI
     #
     # @since 0.2.0
     #
-    def Hunspell.lang
+    def self.lang
       @lang ||= DEFAULT_LANG
     end
 
@@ -54,7 +57,7 @@ module FFI
     #
     # @since 0.2.0
     #
-    def Hunspell.lang=(new_lang)
+    def self.lang=(new_lang)
       @lang = new_lang.to_s
     end
 
@@ -65,6 +68,9 @@ module FFI
     KNOWN_DIRECTORIES = [
       # User
       File.join(Gem.user_home,USER_DIR),
+      # OS X brew-instlled hunspell
+      File.join(Gem.user_home,'Library/Spelling'),
+      '/Library/Spelling',
       # Debian
       '/usr/local/share/myspell/dicts',
       '/usr/share/myspell/dicts',
@@ -86,12 +92,16 @@ module FFI
     #
     # @since 0.2.0
     #
-    def Hunspell.directories
+    def self.directories
       @directories ||= KNOWN_DIRECTORIES.select do |path|
         File.directory?(path)
       end
     end
 
+    def self.directories=(dirs)
+      @directories = dirs
+    end
+
     #
     # Opens a Hunspell dictionary.
     #
@@ -106,7 +116,7 @@ module FFI
     #
     # @return [nil]
     #
-    def Hunspell.dict(name=Hunspell.lang,&block)
+    def self.dict(name=Hunspell.lang,&block)
       Dictionary.open(name,&block)
     end
   end

data/spec/dictionary_spec.rb

@@ -2,30 +2,28 @@ require 'spec_helper'
 require 'ffi/hunspell/dictionary'
 
 describe Hunspell::Dictionary do
-  subject { Hunspell::Dictionary }
+  subject { described_class }
 
   let(:lang) { 'en_US' }
-
   let(:affix_path) { File.join(Hunspell.directories.last,"#{lang}.aff") }
-  let(:dic_path) { File.join(Hunspell.directories.last,"#{lang}.dic") }
+  let(:dic_path)   { File.join(Hunspell.directories.last,"#{lang}.dic") }
 
   describe "#initialize" do
-    subject { described_class }
+    subject { described_class.new(affix_path,dic_path) }
 
     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
+      expect(subject.to_ptr).to_not be_nil
     end
+
+    after { subject.close }
   end
 
-  describe "open" do
+  describe ".open" do
     subject { described_class }
 
     it "should find and open a dictionary file for a given language" do
       subject.open(lang) do |dict|
-        dict.should_not be_nil
+        expect(dict).to_not be_nil
       end
     end
 
@@ -33,69 +31,71 @@ describe Hunspell::Dictionary do
       dict = subject.open(lang)
       dict.close
 
-      dict.should be_closed
+      expect(dict).to be_closed
     end
 
     context "when given an unknown dictionary name" do
       it "should raise an ArgumentError" do
-        lambda {
+        expect {
           subject.open('foo')
-        }.should raise_error(ArgumentError)
+        }.to raise_error(ArgumentError)
       end
     end
   end
 
-  subject { described_class.new(affix_path,dic_path) }
+  context "when opened" do
+    subject { described_class.new(affix_path,dic_path) }
 
-  after(:all) { subject.close }
-
-  it "should provide the encoding of the dictionary files" do
-    subject.encoding.should == Encoding::ISO_8859_1
-  end
-
-  it "should check if a word is valid" do
-    subject.should be_valid('dog')
-    subject.should_not be_valid('dxg')
-  end
+    after { subject.close }
 
-  describe "#stem" do
-    it "should find the stems of a word" do
-      subject.stem('fishing').should == %w[fishing fish]
+    it "should provide the encoding of the dictionary files" do
+      expect(subject.encoding).to be Encoding::ISO_8859_1
     end
 
-    it "should force_encode all strings" do
-      subject.suggest('fishing').all? { |string|
-        string.encoding == subject.encoding
-      }.should be_true
+    it "should check if a word is valid" do
+      expect(subject.valid?('dog')).to be true
+      expect(subject.valid?('dxg')).to be false
     end
 
-    context "when there are no stems" do
-      it "should return []" do
-        subject.stem("zzzzzzz").should == []
+    describe "#stem" do
+      it "should find the stems of a word" do
+        expect(subject.stem('fishing')).to be == %w[fishing fish]
       end
-    end
-  end
 
-  describe "#suggest" do
-    it "should suggest alternate spellings for words" do
-      subject.suggest('arbitrage').should include(*[
-        'arbitrage',
-        'arbitrages',
-        'arbitrager',
-        'arbitraged',
-        'arbitrate'
-      ])
-    end
+      it "should force_encode all strings" do
+        expect(subject.suggest('fishing')).to all satisfy { |string|
+          string.encoding == subject.encoding
+        }
+      end
 
-    it "should force_encode all strings" do
-      subject.suggest('arbitrage').all? { |string|
-        string.encoding == subject.encoding
-      }.should be_true
+      context "when there are no stems" do
+        it "should return []" do
+          expect(subject.stem("zzzzzzz")).to be == []
+        end
+      end
     end
 
-    context "when there are no suggestions" do
-      it "should return []" do
-        subject.suggest("________").should == []
+    describe "#suggest" do
+      it "should suggest alternate spellings for words" do
+        expect(subject.suggest('arbitrage')).to include(
+          'arbitrage',
+          'arbitrages',
+          'arbitrager',
+          'arbitraged',
+          'arbitrate'
+        )
+      end
+
+      it "should force_encode all strings" do
+        expect(subject.suggest('arbitrage')).to all satisfy { |string|
+          string.encoding == subject.encoding
+        }
+      end
+
+      context "when there are no suggestions" do
+        it "should return []" do
+          expect(subject.suggest("________")).to be == []
+        end
       end
     end
   end

data/spec/hunspell_spec.rb

@@ -2,24 +2,34 @@ require 'spec_helper'
 require 'ffi/hunspell/hunspell'
 
 describe Hunspell do
-  it "should have a default language" do
-    subject.lang.should_not be_nil
-    subject.lang.should_not be_empty
-  end
+  describe ".lang" do
+    subject { super().lang }
 
-  it "should have directories to search within" do
-    subject.directories.should_not be_empty
+    it "should have a default language" do
+      expect(subject).to_not be_nil
+      expect(subject).to_not be_empty
+    end
   end
 
-  it "should open a dictionary file" do
-    subject.dict('en_US') do |dict|
-      dict.should_not be_nil
+  describe ".directories" do
+    subject { super().directories }
+
+    it "should have directories to search within" do
+      expect(subject).to_not be_empty
     end
   end
 
-  it "should open the dictionary file for the default language" do
-    subject.dict do |dict|
-      dict.should_not be_nil
+  describe ".dict" do
+    it "should open a dictionary file" do
+      subject.dict('en_US') do |dict|
+        expect(dict).to_not be_nil
+      end
+    end
+
+    it "should open the dictionary file for the default language" do
+      subject.dict do |dict|
+        expect(dict).to_not be_nil
+      end
     end
   end
 end

data/spec/spec_helper.rb

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

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: ffi-hunspell
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.3.1
 platform: ruby
 authors:
 - Postmodern
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 description: Ruby FFI bindings for the Hunspell spell checker.
@@ -84,11 +75,11 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .gemtest
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
+- ".gemtest"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - ChangeLog.md
 - LICENSE.txt
 - README.md
@@ -104,27 +95,26 @@ files:
 homepage: https://github.com/postmodern/ffi-hunspell#readme
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - libhunspell >= 1.2.0
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: FFI bindings for Hunspell
 test_files: []