Merge 097cc2f into efefacb

mezis · Dec 9, 2013 · 9945dd3 · 9945dd3
2 parents efefacb + 097cc2f
commit 9945dd3
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 33 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fuzzily (0.3.0)
+    fuzzily (0.3.1)
       activerecord (>= 2.3.17)
 
 GEM

diff --git a/gemfiles/rails23.gemfile.lock b/gemfiles/rails23.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.3.0)
+    fuzzily (0.3.1)
       activerecord (>= 2.3.17)
 
 GEM

diff --git a/gemfiles/rails30.gemfile.lock b/gemfiles/rails30.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.3.0)
+    fuzzily (0.3.1)
       activerecord (>= 2.3.17)
 
 GEM

diff --git a/gemfiles/rails31.gemfile.lock b/gemfiles/rails31.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.3.0)
+    fuzzily (0.3.1)
       activerecord (>= 2.3.17)
 
 GEM

diff --git a/gemfiles/rails32.gemfile.lock b/gemfiles/rails32.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.3.0)
+    fuzzily (0.3.1)
       activerecord (>= 2.3.17)
 
 GEM

diff --git a/gemfiles/rails32_mysql.gemfile.lock b/gemfiles/rails32_mysql.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.3.0)
+    fuzzily (0.3.1)
       activerecord (>= 2.3.17)
 
 GEM

diff --git a/gemfiles/rails32_pg.gemfile b/gemfiles/rails32_pg.gemfile
@@ -1,10 +1,10 @@
 # This file was generated by Appraisal
 
-source "https://rubygems.org"
+source "http://yarp.dev"
 
 gem "activerecord", "~> 3.2.0"
 
 gemspec :path=>"../"
 
 ENV['FUZZILY_ADAPTER'] = 'postgresql'
-ENV['FUZZILY_DB_USER'] = ENV['TRAVIS'] ? 'postgres' : ENV['USER']
+ENV['FUZZILY_DB_USER'] = ENV['TRAVIS'] ? 'postgres' : ENV['USER']
diff --git a/gemfiles/rails32_pg.gemfile.lock b/gemfiles/rails32_pg.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.3.0)
+    fuzzily (0.3.1)
       activerecord (>= 2.3.17)
 
 GEM

diff --git a/gemfiles/rails40.gemfile.lock b/gemfiles/rails40.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.3.0)
+    fuzzily (0.3.1)
       activerecord (>= 2.3.17)
 
 GEM

diff --git a/lib/fuzzily/searchable.rb b/lib/fuzzily/searchable.rb
@@ -134,15 +134,7 @@ def make_field_fuzzily_searchable(field, options={})
       end
     end
 
-    module Rails2ClassMethods
-      include ClassMethods
-
-      def self.extended(base)
-        base.class_eval do
-          named_scope :offset, lambda { |*args| { :offset => args.first } }
-        end
-      end
-
+    module Rails2Rails3ClassMethods
       private
 
       def _add_trigram_association(_o)
@@ -159,23 +151,20 @@ def _with_included_trigrams(_o)
       end
     end
 
-    module Rails3ClassMethods
+    module Rails2ClassMethods
       include ClassMethods
+      include Rails2Rails3ClassMethods
 
-      private
-
-      def _add_trigram_association(_o)
-        has_many _o.trigram_association,
-          :class_name => _o.trigram_class_name,
-          :as         => :owner,
-          :conditions => { :fuzzy_field => _o.field.to_s },
-          :dependent  => :destroy,
-          :autosave   => true
+      def self.extended(base)
+        base.class_eval do
+          named_scope :offset, lambda { |*args| { :offset => args.first } }
+        end
       end
+    end
 
-      def _with_included_trigrams(_o)
-        self.scoped(:include => _o.trigram_association)
-      end
+    module Rails3ClassMethods
+      include ClassMethods
+      include Rails2Rails3ClassMethods
     end
 
 

diff --git a/lib/fuzzily/version.rb b/lib/fuzzily/version.rb
@@ -1,3 +1,3 @@
 module Fuzzily
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end