fuzzily 0.2.1 → 0.2.2

data/.travis.yml

@@ -7,3 +7,6 @@ gemfile:
   - gemfiles/rails30.gemfile
   - gemfiles/rails31.gemfile
   - gemfiles/rails32.gemfile
+  - gemfiles/rails32_pg.gemfile
+before_script:
+  - psql -c 'create database fuzzily_test;' -U postgres

data/Appraisals

@@ -13,3 +13,7 @@ end
 appraise "rails32" do
   gem "activerecord", "~> 3.2.0"
 end
+
+appraise "rails32-pg" do
+  gem "activerecord", "~> 3.2.0"
+end

data/Gemfile.lock

@@ -1,41 +1,42 @@
 PATH
   remote: .
   specs:
-    fuzzily (0.2.1)
+    fuzzily (0.2.2)
       activerecord (>= 2.3.17)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.12)
-      activesupport (= 3.2.12)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.12)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    appraisal (0.5.1)
+    appraisal (0.5.2)
       bundler
       rake
     arel (3.0.2)
     builder (3.0.4)
     coderay (1.0.9)
-    diff-lcs (1.2.1)
-    i18n (0.6.4)
+    diff-lcs (1.2.4)
+    i18n (0.6.1)
     method_source (0.8.1)
-    multi_json (1.6.1)
+    multi_json (1.7.2)
     mysql2 (0.3.11)
-    pry (0.9.12)
+    pg (0.15.1)
+    pry (0.9.12.1)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
     pry-nav (0.2.3)
       pry (~> 0.9.10)
-    rake (10.0.3)
+    rake (10.0.4)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -43,7 +44,7 @@ GEM
     rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
+    rspec-mocks (2.13.1)
     slop (3.4.4)
     sqlite3 (1.3.7)
     tzinfo (0.3.37)
@@ -55,6 +56,7 @@ DEPENDENCIES
   appraisal
   fuzzily!
   mysql2
+  pg
   pry
   pry-nav
   rake

data/README.md

@@ -1,13 +1,25 @@
-# Fuzzily
+# Fuzzily - fuzzy string matching for ActiveRecord
 
+[![Gem Version](https://badge.fury.io/rb/fuzzily.png)](http://badge.fury.io/rb/fuzzily)
 [![Build Status](https://travis-ci.org/mezis/fuzzily.png?branch=master)](https://travis-ci.org/mezis/fuzzily)
 [![Dependency Status](https://gemnasium.com/mezis/fuzzily.png)](https://gemnasium.com/mezis/fuzzily)
+[![Code Climate](https://codeclimate.com/github/mezis/fuzzily.png)](https://codeclimate.com/github/mezis/fuzzily)
 
-A fast, [trigram](http://en.wikipedia.org/wiki/N-gram)-based, database-backed [fuzzy](http://en.wikipedia.org/wiki/Approximate_string_matching) string search/match engine for Rails.
+> Show me photos of **Marakech** !
+>
+> Here aresome photos of **Marrakesh**, Morroco.
+> Did you mean **Martanesh**, Albania, **Marakkanam**, India, or **Marasheshty**, Romania?
 
+Blurrily finds misspelled, prefix, or partial needles in a haystack of
+strings. It's a fast, [trigram](http://en.wikipedia.org/wiki/N-gram)-based, database-backed [fuzzy](http://en.wikipedia.org/wiki/Approximate_string_matching) string search/match engine for Rails.
 Loosely inspired from an [old blog post](http://unirec.blogspot.co.uk/2007/12/live-fuzzy-search-using-n-grams-in.html).
 
-Compatible with ActiveRecord 2.3, 3.0, 3.1, 3.2.
+Works with ActiveRecord 2.3, 3.0, 3.1, 3.2 on various Rubies.
+
+If your dateset is big, if you need yet more speed, or do not use ActiveRecord,
+check out [blurrily](http://github.com/mezis/blurrily), another gem (backed with a C extension)
+with the same intent.  
+
 
 ## Installation
 
@@ -100,7 +112,7 @@ the `owner_type` and `fuzzy_field` columns of the `trigrams` table from
 MySQL and pgSQL.
 
 This is not the default in the gem as ActiveRecord does not suport `ENUM`
-columns in any version
+columns in any version.
 
 
 ## License

data/fuzzily.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'pry-nav'
   gem.add_development_dependency 'sqlite3'
+  gem.add_development_dependency 'pg'
   gem.add_development_dependency 'mysql2'
 
   gem.files         = `git ls-files`.split($/)

data/gemfiles/rails23.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.1.0)
+    fuzzily (0.2.2)
       activerecord (>= 2.3.17)
 
 GEM
@@ -16,6 +16,8 @@ GEM
     coderay (1.0.9)
     diff-lcs (1.1.3)
     method_source (0.8.1)
+    mysql2 (0.3.11)
+    pg (0.14.1)
     pry (0.9.12)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -41,6 +43,8 @@ DEPENDENCIES
   activerecord (~> 2.3.0)
   appraisal
   fuzzily!
+  mysql2
+  pg
   pry
   pry-nav
   rake

data/gemfiles/rails30.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.1.0)
+    fuzzily (0.2.2)
       activerecord (>= 2.3.17)
 
 GEM
@@ -26,6 +26,8 @@ GEM
     diff-lcs (1.1.3)
     i18n (0.5.0)
     method_source (0.8.1)
+    mysql2 (0.3.11)
+    pg (0.15.1)
     pry (0.9.12)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -52,6 +54,8 @@ DEPENDENCIES
   activerecord (~> 3.0.0)
   appraisal
   fuzzily!
+  mysql2
+  pg
   pry
   pry-nav
   rake

data/gemfiles/rails31.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.1.0)
+    fuzzily (0.2.2)
       activerecord (>= 2.3.17)
 
 GEM
@@ -28,6 +28,8 @@ GEM
     i18n (0.6.1)
     method_source (0.8.1)
     multi_json (1.6.1)
+    mysql2 (0.3.11)
+    pg (0.15.1)
     pry (0.9.12)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -54,6 +56,8 @@ DEPENDENCIES
   activerecord (~> 3.1.0)
   appraisal
   fuzzily!
+  mysql2
+  pg
   pry
   pry-nav
   rake

data/gemfiles/rails32.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.1.0)
+    fuzzily (0.2.2)
       activerecord (>= 2.3.17)
 
 GEM
@@ -28,6 +28,8 @@ GEM
     i18n (0.6.1)
     method_source (0.8.1)
     multi_json (1.6.1)
+    mysql2 (0.3.11)
+    pg (0.15.1)
     pry (0.9.12)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -54,6 +56,8 @@ DEPENDENCIES
   activerecord (~> 3.2.0)
   appraisal
   fuzzily!
+  mysql2
+  pg
   pry
   pry-nav
   rake

data/gemfiles/rails32_pg.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 3.2.0"
+
+gemspec :path=>"../"
+
+ENV['FUZZILY_USE_PG'] = 'YES'

data/gemfiles/rails32_pg.gemfile.lock

@@ -0,0 +1,65 @@
+PATH
+  remote: /Users/mezis/Dropbox/Development/fuzzily
+  specs:
+    fuzzily (0.2.2)
+      activerecord (>= 2.3.17)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
+      builder (~> 3.0.0)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.12)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (3.0.2)
+    builder (3.0.4)
+    coderay (1.0.9)
+    diff-lcs (1.2.2)
+    i18n (0.6.4)
+    method_source (0.8.1)
+    multi_json (1.7.2)
+    mysql2 (0.3.11)
+    pg (0.15.1)
+    pry (0.9.12)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    pry-nav (0.2.3)
+      pry (~> 0.9.10)
+    rake (10.0.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    slop (3.4.4)
+    sqlite3 (1.3.7)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.2.0)
+  appraisal
+  fuzzily!
+  mysql2
+  pg
+  pry
+  pry-nav
+  rake
+  rspec
+  sqlite3

data/lib/fuzzily/model.rb

@@ -38,8 +38,8 @@ module Fuzzily
       def matches_for(text)
         trigrams = Fuzzily::String.new(text).trigrams
         self.
-          scoped(:select => 'owner_id, owner_type, count(*) AS matches, score').
-          scoped(:group => :owner_id).
+          scoped(:select => 'owner_id, owner_type, count(*) AS matches, MAX(score) AS score').
+          scoped(:group => 'owner_id, owner_type').
           scoped(:order => 'matches DESC, score ASC').
           with_trigram(trigrams).
           map(&:owner)

data/lib/fuzzily/version.rb

@@ -1,3 +1,3 @@
 module Fuzzily
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/fuzzily/migration_spec.rb

@@ -19,7 +19,7 @@ describe Fuzzily::Migration do
     subject.trigrams_table_name = :foobars
     silence_stream(STDOUT) { subject.up }
     expect {
-      ActiveRecord::Base.connection.execute('INSERT INTO `foobars` (score) VALUES (1)')
+      ActiveRecord::Base.connection.execute('INSERT INTO foobars (score) VALUES (1)')
     }.to_not raise_error
   end
 

data/spec/meta_spec.rb

@@ -3,6 +3,6 @@ require 'spec_helper'
 
 describe 'Test suite' do
   it 'has a working ActiveRecord connection' do
-    ActiveRecord::Base.connection.execute('SELECT * FROM `sqlite_master`')
+    ActiveRecord::Base.connection.execute('SELECT(1)')
   end
 end

data/spec/spec_helper.rb

@@ -23,10 +23,24 @@ end
 RSpec.configure do |config|
   config.before(:each) do
     # Setup test database
-    ActiveRecord::Base.establish_connection(
-      :adapter  => 'sqlite3',
-      :database => Database.to_s
-    )
+
+    if ENV['FUZZILY_USE_PG']
+      ActiveRecord::Base.establish_connection(
+        :adapter  => 'postgresql',
+        :database => 'fuzzily_test',
+        :host => 'localhost',
+        :username => 'postgres'
+      )
+
+      ActiveRecord::Base.connection.execute 'DROP TABLE IF EXISTS trigrams;'
+      ActiveRecord::Base.connection.execute 'DROP TABLE IF EXISTS stuffs;'
+      ActiveRecord::Base.connection.execute 'DROP TABLE IF EXISTS foobars;'
+    else
+      ActiveRecord::Base.establish_connection(
+        :adapter  => 'sqlite3',
+        :database => Database.to_s
+      )
+    end
 
     def prepare_trigrams_table
       silence_stream(STDOUT) do
@@ -43,6 +57,8 @@ RSpec.configure do |config|
   end
 
   config.after(:each) do
-    Database.delete if Database.exist?
+    unless ENV['FUZZILY_USE_PG']
+      Database.delete if Database.exist?
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuzzily
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -123,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +181,8 @@ files:
 - gemfiles/rails31.gemfile.lock
 - gemfiles/rails32.gemfile
 - gemfiles/rails32.gemfile.lock
+- gemfiles/rails32_pg.gemfile
+- gemfiles/rails32_pg.gemfile.lock
 - lib/fuzzily.rb
 - lib/fuzzily/migration.rb
 - lib/fuzzily/model.rb
@@ -191,7 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2813832546497713737
+      hash: 2078821306338560416
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -200,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2813832546497713737
+      hash: 2078821306338560416
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23