fuzzily 0.0.3 → 0.1.0

data/.travis.yml

@@ -0,0 +1,9 @@
+rvm:
+  - "1.8.7"
+  - "1.9.2"
+  - "1.9.3"
+gemfile:
+  - gemfiles/rails23.gemfile
+  - gemfiles/rails30.gemfile
+  - gemfiles/rails31.gemfile
+  - gemfiles/rails32.gemfile

data/Appraisals

@@ -0,0 +1,15 @@
+appraise "rails23" do
+  gem "activerecord", "~> 2.3.0"
+end
+
+appraise "rails30" do
+  gem "activerecord", "~> 3.0.0"
+end
+
+appraise "rails31" do
+  gem "activerecord", "~> 3.1.0"
+end
+
+appraise "rails32" do
+  gem "activerecord", "~> 3.2.0"
+end

data/Gemfile.lock

@@ -1,21 +1,33 @@
 PATH
   remote: .
   specs:
-    fuzzily (0.0.3)
-      activerecord (~> 2.3)
+    fuzzily (0.1.0)
+      activerecord (>= 2.3.17)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activerecord (2.3.17)
-      activesupport (= 2.3.17)
-    activesupport (2.3.17)
+    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.1.3)
+    i18n (0.6.1)
     method_source (0.8.1)
+    multi_json (1.6.1)
     pry (0.9.12)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -33,6 +45,7 @@ GEM
     rspec-mocks (2.12.2)
     slop (3.4.3)
     sqlite3 (1.3.7)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
@@ -42,5 +55,6 @@ DEPENDENCIES
   fuzzily!
   pry
   pry-nav
+  rake
   rspec
   sqlite3

data/README.md

@@ -4,6 +4,8 @@ A fast, [trigram](http://en.wikipedia.org/wiki/N-gram)-based, database-backed [f
 
 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.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/Rakefile

@@ -1,5 +1,6 @@
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
+require 'appraisal'
 
 RSpec::Core::RakeTask.new(:spec)
 

data/fuzzily.gemspec

@@ -12,9 +12,10 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{A fast, trigram-based, database-backed fuzzy string search/match engine for Rails.}
   gem.homepage      = ""
 
-  gem.add_runtime_dependency 'activerecord', '~> 2.3'
+  gem.add_runtime_dependency 'activerecord', '>= 2.3.17'
 
   gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'appraisal'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'pry-nav'

data/gemfiles/rails23.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 2.3.0"
+
+gemspec :path=>"../"

data/gemfiles/rails23.gemfile.lock

@@ -0,0 +1,48 @@
+PATH
+  remote: /Users/mezis/Dropbox/Development/fuzzily
+  specs:
+    fuzzily (0.1.0)
+      activerecord (>= 2.3.17)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activerecord (2.3.17)
+      activesupport (= 2.3.17)
+    activesupport (2.3.17)
+    appraisal (0.5.1)
+      bundler
+      rake
+    coderay (1.0.9)
+    diff-lcs (1.1.3)
+    method_source (0.8.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.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
+    slop (3.4.3)
+    sqlite3 (1.3.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 2.3.0)
+  appraisal
+  fuzzily!
+  pry
+  pry-nav
+  rake
+  rspec
+  sqlite3

data/gemfiles/rails30.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 3.0.0"
+
+gemspec :path=>"../"

data/gemfiles/rails30.gemfile.lock

@@ -0,0 +1,59 @@
+PATH
+  remote: /Users/mezis/Dropbox/Development/fuzzily
+  specs:
+    fuzzily (0.1.0)
+      activerecord (>= 2.3.17)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (3.0.20)
+      activesupport (= 3.0.20)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.20)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (2.0.10)
+    builder (2.1.2)
+    coderay (1.0.9)
+    diff-lcs (1.1.3)
+    i18n (0.5.0)
+    method_source (0.8.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.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
+    slop (3.4.3)
+    sqlite3 (1.3.7)
+    tzinfo (0.3.35)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.0.0)
+  appraisal
+  fuzzily!
+  pry
+  pry-nav
+  rake
+  rspec
+  sqlite3

data/gemfiles/rails31.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 3.1.0"
+
+gemspec :path=>"../"

data/gemfiles/rails31.gemfile.lock

@@ -0,0 +1,61 @@
+PATH
+  remote: /Users/mezis/Dropbox/Development/fuzzily
+  specs:
+    fuzzily (0.1.0)
+      activerecord (>= 2.3.17)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (3.1.11)
+      activesupport (= 3.1.11)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.11)
+      activemodel (= 3.1.11)
+      activesupport (= 3.1.11)
+      arel (~> 2.2.3)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.11)
+      multi_json (~> 1.0)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (2.2.3)
+    builder (3.0.4)
+    coderay (1.0.9)
+    diff-lcs (1.1.3)
+    i18n (0.6.1)
+    method_source (0.8.1)
+    multi_json (1.6.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.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
+    slop (3.4.3)
+    sqlite3 (1.3.7)
+    tzinfo (0.3.35)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.1.0)
+  appraisal
+  fuzzily!
+  pry
+  pry-nav
+  rake
+  rspec
+  sqlite3

data/gemfiles/rails32.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 3.2.0"
+
+gemspec :path=>"../"

data/gemfiles/rails32.gemfile.lock

@@ -0,0 +1,61 @@
+PATH
+  remote: /Users/mezis/Dropbox/Development/fuzzily
+  specs:
+    fuzzily (0.1.0)
+      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.1.3)
+    i18n (0.6.1)
+    method_source (0.8.1)
+    multi_json (1.6.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.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
+    slop (3.4.3)
+    sqlite3 (1.3.7)
+    tzinfo (0.3.35)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.2.0)
+  appraisal
+  fuzzily!
+  pry
+  pry-nav
+  rake
+  rspec
+  sqlite3

data/lib/fuzzily/model.rb

@@ -5,6 +5,9 @@ module Fuzzily
 
     def self.included(by)
       by.ancestors.include?(ActiveRecord::Base) or raise 'Not included in an ActiveRecord subclass'
+
+      scope_method = ActiveRecord::VERSION::MAJOR == 2 ? :named_scope : :scope
+
       by.class_eval do
         return if class_variable_defined?(:@@fuzzily_trigram_model)
 
@@ -15,13 +18,13 @@ module Fuzzily
         validates_presence_of     :score
         validates_presence_of     :fuzzy_field
 
-        named_scope :for_model,  lambda { |model| { 
+        send scope_method, :for_model,  lambda { |model| { 
           :conditions => { :owner_type => model.kind_of?(Class) ? model.name : model  } 
         }}
-        named_scope :for_field,  lambda { |field_name| {
+        send scope_method, :for_field,  lambda { |field_name| {
           :conditions => { :fuzzy_field => field_name }
         }}
-        named_scope :with_trigram, lambda { |trigrams| {
+        send scope_method, :with_trigram, lambda { |trigrams| {
           :conditions => { :trigram => trigrams }
         }}
 

data/lib/fuzzily/version.rb

@@ -1,3 +1,3 @@
 module Fuzzily
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/spec/fuzzily/model_spec.rb

@@ -4,6 +4,8 @@ describe Fuzzily::Model do
   subject do
     Class.new(ActiveRecord::Base).tap do |model|
       model.table_name = :trigrams
+
+      def model.name ; 'MyModel' ; end
     end
   end
 

data/spec/fuzzily/trigram_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 describe Fuzzily::String do

metadata

@@ -1,126 +1,153 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fuzzily
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-20 00:00:00 +00:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
-  prerelease: false
+date: 2013-03-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.17
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.17
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    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: appraisal
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    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: pry
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    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: pry-nav
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    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: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Fast fuzzy string matching for rails
-email: 
+email:
 - julien.letessier@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
+- .travis.yml
+- Appraisals
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - fuzzily.gemspec
+- gemfiles/rails23.gemfile
+- gemfiles/rails23.gemfile.lock
+- gemfiles/rails30.gemfile
+- gemfiles/rails30.gemfile.lock
+- gemfiles/rails31.gemfile
+- gemfiles/rails31.gemfile.lock
+- gemfiles/rails32.gemfile
+- gemfiles/rails32.gemfile.lock
 - lib/fuzzily.rb
 - lib/fuzzily/migration.rb
 - lib/fuzzily/model.rb
@@ -133,41 +160,38 @@ files:
 - spec/fuzzily/trigram_spec.rb
 - spec/meta_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3139686676920702806
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -3139686676920702806
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.9.5
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: A fast, trigram-based, database-backed fuzzy string search/match engine for Rails.
-test_files: 
+summary: A fast, trigram-based, database-backed fuzzy string search/match engine for
+  Rails.
+test_files:
 - spec/fuzzily/migration_spec.rb
 - spec/fuzzily/model_spec.rb
 - spec/fuzzily/searchable_spec.rb