ffi-aspell 0.0.2 → 0.0.3

data/.gitignore

@@ -1,2 +1,3 @@
 pkg/*.gem
 doc
+Gemfile.lock

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3-p194

data/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec

data/README.md

@@ -8,6 +8,7 @@ the main author as of April 2012.
 
 * FFI: `gem install ffi`
 * Aspell (`sudo pacman -S aspell` if you're on Arch Linux)
+* Dutch and Greek language packs for Aspell.
 
 ## Usage
 
@@ -37,7 +38,7 @@ For more information see the YARD documentation.
 1. Make sure that Aspell and the English and Dutch dictionaries for it are
    installed as well. On Arch Linux this can be done by running `sudo pacman -S
    aspell aspell-en aspell-nl`.
-2. Import the gems using RVM: `rvm gemset import .gems`.
+2. Install the gems: `bundle install`
 3. Run the tests to see if everything is working: `rake test`
 4. Hack away!
 

data/ffi-aspell.gemspec

@@ -3,7 +3,7 @@ require File.expand_path('../lib/ffi/aspell/version', __FILE__)
 Gem::Specification.new do |s|
   s.name        = 'ffi-aspell'
   s.version     = FFI::Aspell::VERSION
-  s.date        = '2012-04-26'
+  s.date        = '2012-07-07'
   s.authors     = ['Yorick Peterse']
   s.email       = 'yorickpeterse@gmail.com'
   s.summary     = 'FFI bindings for Aspell'

data/lib/ffi/aspell/speller.rb

@@ -118,7 +118,11 @@ module FFI
         end
 
         speller = Aspell.speller_new(@config)
-        correct = Aspell.speller_check(speller, word.to_s, word.length)
+        correct = Aspell.speller_check(
+          speller,
+          handle_input(word.to_s),
+          word.bytesize
+        )
 
         Aspell.speller_delete(speller)
 
@@ -139,12 +143,16 @@ module FFI
         end
 
         speller     = Aspell.speller_new(@config)
-        list        = Aspell.speller_suggest(speller, word, word.length)
+        list        = Aspell.speller_suggest(
+          speller,
+          handle_input(word),
+          word.bytesize
+        )
         suggestions = []
         elements    = Aspell.word_list_elements(list)
 
         while word = Aspell.string_enumeration_next(elements)
-          suggestions << word
+          suggestions << handle_output(word)
         end
 
         Aspell.string_enumeration_delete(elements)
@@ -267,6 +275,40 @@ module FFI
           )
         end
       end
+
+      ##
+      # Converts word to encoding expected in aspell
+      # from current ruby encoding
+      #
+      # @param [String] word The word to convert
+      # return [String] word
+      #
+      def handle_input(word)
+        if defined?(Encoding)
+          enc = get('encoding')
+          word.encode!(enc)
+        end
+
+        word
+      end
+      private :handle_input
+
+      ##
+      # Converts word from aspell encoding to what ruby expects
+      #
+      # @param [String] word The word to convert
+      # return [String] word
+      #
+      def handle_output(word)
+        if defined?(Encoding)
+          enc = get('encoding')
+          word.force_encoding(enc).encode!
+        end
+
+        word
+      end
+      private :handle_output
+
     end # Speller
   end # Aspell
 end # FFI

data/lib/ffi/aspell/version.rb

@@ -1,5 +1,5 @@
 module FFI
   module Aspell
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end # Aspell
 end # FFI

data/spec/ffi/aspell/speller.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require File.expand_path('../../../helper', __FILE__)
 
 describe 'FFI::Aspell::Speller' do
@@ -60,6 +62,13 @@ describe 'FFI::Aspell::Speller' do
     speller.correct?('huis').should   == true
   end
 
+  it 'Validate some UTF-8 (Greek) words' do
+    speller = FFI::Aspell::Speller.new('el')
+
+    speller.correct?('χταπόδι').should == true
+    speller.correct?('οιρανός').should  == false
+  end
+
   it 'Change the language of an existing speller object' do
     speller = FFI::Aspell::Speller.new
 

data/spec/ffi/aspell/suggestions.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require File.expand_path('../../../helper', __FILE__)
 
 describe 'FFI::Aspell::Speller#suggestions' do
@@ -10,6 +12,16 @@ describe 'FFI::Aspell::Speller#suggestions' do
     suggestions.include?('cooked').should == true
   end
 
+  it 'Return a list of UTF-8 words' do
+    with_internal_encoding('UTF-8') do
+      speller     = FFI::Aspell::Speller.new('el')
+      suggestions = speller.suggestions('χταπίδι')
+
+      suggestions.include?('χταπόδι').should  == true
+      suggestions.include?('απίδι').should    == true
+    end
+  end
+
   it 'Return a list of word suggestions using the "bad-spellers" mode' do
     speller = FFI::Aspell::Speller.new
 

data/spec/helper.rb

@@ -5,3 +5,20 @@ Bacon.extend(Bacon::TapOutput)
 Bacon.summary_on_exit
 
 FIXTURES = File.expand_path('../fixtures', __FILE__)
+
+##
+# Used to change default internal encoding for certain tests.
+# Ruby uses default_internal (amongst others) when presenting
+# strings and when calling encode! without argument.
+# Rails explicitly sets it to UTF-8 on bootup
+#
+# @param [String] enc The encoding to switch to
+#
+def with_internal_encoding(enc)
+  if defined?(Encoding)
+    old_enc = Encoding.default_internal
+    Encoding.default_internal = enc
+    yield
+    Encoding.default_internal = old_enc
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-aspell
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-26 00:00:00.000000000 Z
+date: 2012-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -97,10 +97,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gems
 - .gitignore
-- .rvmrc
+- .ruby-version
 - .yardopts
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile

data/.gems

@@ -1,5 +0,0 @@
-ffi
-rake
-redcarpet
-yard
-bacon

data/.rvmrc

@@ -1 +0,0 @@
-rvm use --create 1.9.3@ffi-aspell