fuzzily 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c1f0be1e0222fd105f14a6021e65e0b92ecf154
-  data.tar.gz: a96c50991cf0d5f180960b2f81086dd22038bec7
+  metadata.gz: d04543358e6ec800df190db5551d6c0b1d54c724
+  data.tar.gz: 444c4b642b6adbb9e7cae708e8499d3e4649583a
 SHA512:
-  metadata.gz: 95b1281eba8a4898f740d2b5a2038ba05f8a83ada3766a136c9d468ab8d3091970d9ad26103f7fdb186001d0dbf67f6556d1c99bc53603d6389f901d1bc9a732
-  data.tar.gz: 0dedbefc9d1f58f78ee76e7b9777056d83b82f53396b5f4dd3edd647ccd6cf33d998959e10e5f5192b800a51bead6ba06516d0193f1e1254d3d3fe56f83ad08f
+  metadata.gz: 49349a79e620091a9284072812e6b4f335eceece513751146af68f004a1fabe4b901afd7811a5de2adc4c494adb5b1339529fa641daca382011a111c8382f3de
+  data.tar.gz: e975d27be885f3d98c64c11c6e7e2eaf036402b5a2301c2cd6ff2dffda9ae9bf8d7d14dd2c3b52ae78e1dc747b69fb5385198bc7aad33e0687953aa8981aeb7b

data/.gitignore

@@ -1,6 +1,5 @@
 *.gem
 *.rbc
-.bundle
 .config
 .yardoc
 InstalledFiles
@@ -21,3 +20,7 @@ tmp
 # Data
 *.gz
 *.bz2
+
+# Bundler
+.bundle
+vendor/bundle

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "rebund"]
+	path = rebund
+	url = https://github.com/mezis/rebund.git

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p247
+2.0.0-p353

data/.travis.yml

@@ -11,8 +11,13 @@ gemfile:
   - gemfiles/rails32_pg.gemfile
   - gemfiles/rails32_mysql.gemfile
   - gemfiles/rails40.gemfile
-before_install: bundle install
-bundler_args:
+before_install:
+  - if ruby --version | fgrep -q 'ruby 1.8.7' ; then gem update --system 1.8.25 ; fi
+install:
+  - ./rebund/run download
+  - bundle install --path ../vendor/bundle
+after_script:
+  - ./rebund/run upload
 matrix:
   exclude:
     - rvm: 2.0.0
@@ -27,3 +32,4 @@ before_script:
 env:
   global:
     - TRAVIS=TRUE
+    - secure: bXHSygHAYQtuVj+rZSaXOQJFWVQEwnOm3HOivKfh+0CADtHJ3TxWSPHpwWPDx/+GDqad4eU/9qfhb5GBr1lJMRJmSi5iJ53KOZxilHqL0fo070mSsLEvOSnT6fKwIe30+3LTYVR6oKEwdyt9EI/yP5aGO4klncZkvI2zqAoy6YI=

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    fuzzily (0.3.1)
+    fuzzily (0.3.2)
       activerecord (>= 2.3.17)
 
 GEM
-  remote: https://rubygems.org/
+  remote: http://yarp.dev/
   specs:
     activemodel (3.2.14)
       activesupport (= 3.2.14)

data/README.md

@@ -109,7 +109,7 @@ end
 
 class AddTrigramsModel < ActiveRecord::Migration
   extend Fuzzily::Migration
-  trigrams_table_name = :custom_trigrams
+  self.trigrams_table_name = :custom_trigrams
 end
 
 class MyStuff < ActiveRecord::Base
@@ -123,7 +123,7 @@ For large data sets (millions of rows to index), the "compatible" storage
 used by default will typically no longer be enough to keep the index small
 enough.
 
-Users have reported **major improvements** (2 order of magniture) when turning
+Users have reported **major improvements** (2 order of magnitude) when turning
 the `owner_type` and `fuzzy_field` columns of the `trigrams` table from
 `VARCHAR` (the default) into `ENUM`. This is particularly efficient with
 MySQL and pgSQL.
@@ -142,6 +142,10 @@ class AddTrigramsModel < ActiveRecord::Migration
 end
 ```
 
+## Model primary key (id) is VARCHAR
+
+If you set your Model primary key (id) AS `VARCHAR` instead of `INT`, you will need to change the `owner_id` column type from `INT` to `VARCHAR` in the trigrams table.
+
 ## Searching virtual attributes
 
 Your searchable fields do not have to be stored, they can be dynamic methods

data/gemfiles/rails23.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.3.1)
+    fuzzily (0.3.2)
       activerecord (>= 2.3.17)
 
 GEM

data/gemfiles/rails30.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.3.1)
+    fuzzily (0.3.2)
       activerecord (>= 2.3.17)
 
 GEM

data/gemfiles/rails31.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.3.1)
+    fuzzily (0.3.2)
       activerecord (>= 2.3.17)
 
 GEM

data/gemfiles/rails32.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.3.1)
+    fuzzily (0.3.2)
       activerecord (>= 2.3.17)
 
 GEM

data/gemfiles/rails32_mysql.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.3.1)
+    fuzzily (0.3.2)
       activerecord (>= 2.3.17)
 
 GEM

data/gemfiles/rails32_pg.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.3.1)
+    fuzzily (0.3.2)
       activerecord (>= 2.3.17)
 
 GEM

data/gemfiles/rails40.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.3.1)
+    fuzzily (0.3.2)
       activerecord (>= 2.3.17)
 
 GEM

data/lib/fuzzily/searchable.rb

@@ -17,7 +17,12 @@ module Fuzzily
     def _update_fuzzy!(_o)
       self.send(_o.trigram_association).delete_all
       String.new(self.send(_o.field)).scored_trigrams.each do |trigram, score|
-        self.send(_o.trigram_association).create!(:score => score, :trigram => trigram, :owner_type => self.class.name)
+        self.send(_o.trigram_association).build.tap do |record|
+          record.score       = score
+          record.trigram     = trigram
+          record.fuzzy_field = _o.field.to_s
+          record.save!
+        end
       end
     end
 

data/lib/fuzzily/version.rb

@@ -1,3 +1,3 @@
 module Fuzzily
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/fuzzily/searchable_spec.rb

@@ -2,8 +2,11 @@ require 'spec_helper'
 
 describe Fuzzily::Searchable do
   # Prepare ourselves a Trigram repository
-  class Trigram < ActiveRecord::Base
-    include Fuzzily::Model
+  before do
+    silence_warnings do
+      Trigram = Class.new(ActiveRecord::Base)
+    end
+    Trigram.class_eval { include Fuzzily::Model }
   end
 
   before(:each) { prepare_trigrams_table }
@@ -83,6 +86,16 @@ describe Fuzzily::Searchable do
       subject.last.update_fuzzy_name!
       Trigram.all.should be_empty
     end
+
+    if ActiveRecord::VERSION::MAJOR <= 3
+      let(:fields) {[ :score, :fuzzy_field, :trigram ]}
+      before { Trigram.attr_protected  fields }
+
+      it 'tolerates mass assignment security' do
+        subject.create!(:name => 'Paris')
+        subject.last.update_fuzzy_name!
+      end
+    end
   end
 
   describe '.bulk_update_fuzzy_<field>' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuzzily
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2014-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -158,6 +158,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .gitmodules
 - .rspec
 - .ruby-version
 - .travis.yml
@@ -214,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A fast, trigram-based, database-backed fuzzy string search/match engine for