fonetica 0.1.1 → 0.2.0

data/Gemfile.lock

@@ -1,13 +1,24 @@
 PATH
   remote: .
   specs:
-    fonetica (0.1.0)
+    fonetica (0.1.1)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    abstract (1.0.0)
+    actionpack (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4.1)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.12)
+      rack-test (~> 0.5.4)
+      tzinfo (~> 0.3.23)
     activemodel (3.0.1)
       activesupport (= 3.0.1)
       builder (~> 2.1.2)
@@ -22,7 +33,20 @@ GEM
       activesupport (~> 3.0.0)
     builder (2.1.2)
     diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
     i18n (0.4.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.6)
+      rack (>= 1.0)
+    railties (3.0.1)
+      actionpack (= 3.0.1)
+      activesupport (= 3.0.1)
+      rake (>= 0.8.4)
+      thor (~> 0.14.0)
+    rake (0.8.7)
     rspec (2.0.0)
       rspec-core (= 2.0.0)
       rspec-expectations (= 2.0.0)
@@ -33,6 +57,8 @@ GEM
     rspec-mocks (2.0.0)
       rspec-core (= 2.0.0)
       rspec-expectations (= 2.0.0)
+    sqlite3-ruby (1.3.1)
+    thor (0.14.3)
     tzinfo (0.3.23)
 
 PLATFORMS
@@ -42,4 +68,6 @@ DEPENDENCIES
   activerecord (>= 3.0.0)
   activesupport (>= 3.0.0)
   fonetica!
-  rspec (~> 2.0.0)
+  railties (>= 3.0.0)
+  rspec (>= 2.0.0)
+  sqlite3-ruby (>= 1.3.1)

data/fonetica.gemspec

@@ -16,5 +16,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.add_dependency(%q<activesupport>, [">= 3.0.0"])
   s.add_dependency(%q<activerecord>, [">= 3.0.0"])
-  s.add_development_dependency(%q<rspec>, ["~> 2.0.0"])
+  s.add_development_dependency(%q<railties>, [">= 3.0.0"])
+  s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
+  s.add_development_dependency(%q<sqlite3-ruby>, [">= 1.3.1"])
 end

data/lib/fonetica.rb

@@ -1,8 +1,6 @@
-require 'fonetica/string'
+require 'fonetica/core_ext/string'
+require 'fonetica/railtie' if defined?(Rails)
 
 module Fonetica
-end
-
-if defined?(::Rails::Railtie)
-  require 'fonetica/railtie'
+  autoload :ActiveRecord, 'fonetica/active_record'
 end

data/lib/fonetica/active_record.rb

@@ -7,7 +7,7 @@ module Fonetica
         cattr_accessor :fonetica_column, :fonetica_cache_column
         
         self.fonetica_column = column
-        self.fonetica_cache_column = "#{column}_fonetica"
+        self.fonetica_cache_column = :"fonetica_#{column}"
         
         scope :fonetica, lambda { |fonetica|
           {

data/lib/fonetica/{string.rb → core_ext/string.rb}

@@ -1,3 +1,5 @@
+require 'active_support'
+
 class String
   FONETICA = [
     [/Y/, 'I'],
@@ -7,7 +9,7 @@ class String
     [/G[EI]|[RMN]J/, 'J'],
     [/G[RL]/, 'G'],
     [/C[EIH]/, 'S'],
-    [/CT/, 'T'],
+    [/[PC]T/, 'T'],
     [/CS/, 'S'],
     [/Q|C[AOUK]?/, 'K'],
     [/LH/, 'L'],

data/lib/fonetica/railtie.rb

@@ -1,8 +1,7 @@
 module Fonetica
   class Railtie < Rails::Railtie
     initializer 'fonetica.active_record' do
-      ActiveSupport.on_load :active_record do
-        require 'fonetica/active_record'
+      ActiveSupport.on_load(:active_record) do
         include Fonetica::ActiveRecord
       end
     end

data/lib/fonetica/version.rb

@@ -1,8 +1,8 @@
 module Fonetica
   module Version #:nodoc:
     MAJOR = 0
-    MINOR = 1
-    TINY  = 1
+    MINOR = 2
+    TINY  = 0
     
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/active_record_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe 'ActiveRecord' do
+  it 'should respond to has_fonetica_for' do
+    Person.should respond_to :has_fonetica_for
+  end
+  
+  context 'with fonetica' do
+    before do
+      Person.has_fonetica_for :name
+    end
+
+    it 'should create a scope named fonetica' do
+      Person.should respond_to :fonetica
+    end
+  
+    it 'should set fonetica_column and fonetica_cache_column' do
+      Person.fonetica_column.should == :name
+      Person.fonetica_cache_column.should == :fonetica_name
+    end
+    
+    it 'should find records using first name' do
+      Person.create(:name => 'iara santos')
+      Person.create(:name => 'yara santos')
+      
+      Person.fonetica('iara').should have(2).records
+    end
+    
+    it 'should find records using first and last name' do
+      Person.create(:name => 'joao baptista')
+      Person.create(:name => 'joao batista')
+      
+      Person.fonetica('joao batista').should have(2).records
+    end
+  end
+end

data/spec/{string_spec.rb → fonetica_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe String do
+describe 'Fonetica' do
   context 'BR = BL = B' do
     it '"broco" and "bloco" should fonetica to "BK"' do
       'broco'.fonetica.should == 'BK'
@@ -63,6 +63,13 @@ describe String do
     end
   end
   
+  context 'BT = T' do
+    it '"batista" and "baptista" should fonetica to "BT"' do
+      'batista'.fonetica.should == 'BT'
+      'baptista'.fonetica.should == 'BT'
+    end
+  end
+  
   context 'GA = GO = GU = GL = GR = G' do
     it '"gana" should fonetica to "KMPT"' do
       'gana'.fonetica.should == 'GM'
@@ -131,7 +138,7 @@ describe String do
     end
   end
   
-  context 'PH = F and PR = P' do
+  context 'PH = F' do
     it '"philipe" and "felipe" should fonetica to "FRP"' do
       'philipe'.fonetica.should == 'FRP'
       'felipe'.fonetica.should == 'FRP'

data/spec/spec_helper.rb

@@ -1,3 +1,22 @@
 require 'rubygems'
-require 'active_support'
-require 'fonetica'
+require 'bundler/setup'
+require 'active_record'
+require 'fonetica'
+require 'fonetica/active_record'
+
+ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:'
+ActiveRecord::Migration.verbose = false
+
+ActiveRecord::Schema.define(:version => 0) do
+  create_table :people do |t|
+    t.string :name
+    t.string :fonetica_name
+  end
+  
+  add_index :people, :fonetica_name
+end
+
+class Person < ActiveRecord::Base
+end
+
+ActiveRecord::Base.send(:include, Fonetica::ActiveRecord)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fonetica
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Gabriel Sobrinho
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-16 00:00:00 -03:00
+date: 2010-10-18 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,12 +52,28 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: railties
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 15
         segments: 
@@ -66,7 +82,23 @@ dependencies:
         - 0
         version: 2.0.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
+  type: :development
+  version_requirements: *id005
 description: 
 email: 
 - gabriel.sobrinho@gmail.com
@@ -88,11 +120,12 @@ files:
 - fonetica.gemspec
 - lib/fonetica.rb
 - lib/fonetica/active_record.rb
+- lib/fonetica/core_ext/string.rb
 - lib/fonetica/railtie.rb
-- lib/fonetica/string.rb
 - lib/fonetica/version.rb
+- spec/active_record_spec.rb
+- spec/fonetica_spec.rb
 - spec/spec_helper.rb
-- spec/string_spec.rb
 has_rdoc: true
 homepage: http://github.com/sobrinho/fonetica
 licenses: []
@@ -128,5 +161,6 @@ signing_key:
 specification_version: 3
 summary: Phonetic finder for ActiveRecord using BUSCABR algorithm
 test_files: 
+- spec/active_record_spec.rb
+- spec/fonetica_spec.rb
 - spec/spec_helper.rb
-- spec/string_spec.rb