scoped_search 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8f3158e1d95aa30c3129d1f93fd908c7a52c8d4
-  data.tar.gz: db5a65eeebd58513c499ea3b6bbfb3a8723702d8
+  metadata.gz: fa5c8206f13488ac53e60199ef5a08fc825c8654
+  data.tar.gz: ad9258a231663b704d4bc28728059c19f1846fb5
 SHA512:
-  metadata.gz: 34c8500136d8d3baf89313d09a9cfeb817798790ce27d16009745ed6af40dbc9ec47f3c2532dab44945c266cb491973179506b5e0a2950d02db5f64c337716f0
-  data.tar.gz: bf5ea94257096ead71261964695ba7fed482cbca7c5b5acfd5afed3653884312e5fda2d9c8d11262f3c7f7b710c78ce9c75b060b3ba5391bfa182eefd738fcf4
+  metadata.gz: d9201e227813757d3fb3cba025d2692ab946f74206912c95b5b04db74932b2a350a7323085084a99ee7560afb584de91eb5cd931cad515403662170486121c53
+  data.tar.gz: 29db95daea73ad5e2f4fa789dec6029d685ae2360a36d2063d6c58004191e1e202e25ab16f38a98d6dce3d5eb1b8b1ca0e74838a91892927254a366f4f7fce1e

data/CHANGELOG.rdoc

@@ -8,6 +8,13 @@ Please add an entry to the "Unreleased changes" section in your pull requests.
 
 *Nothing yet*
 
+=== Version 3.2.0
+
+- In MySQL, case sensitivity is now determined by the collation of the column, and
+  is no longer enforced in the SQL query. This allows MySQL to use indices for
+  queries.
+- Fix auto-completer for numeric fields.
+
 === Version 3.1.0
 
 - Add support for ActiveRecord 4.2.

data/lib/scoped_search/auto_complete_builder.rb

@@ -128,7 +128,7 @@ module ScopedSearch
     def build_suggestions(suggestions, is_value)
       return [] if (suggestions.blank?)
 
-      q=query
+      q = query
       unless q =~ /(\s|\)|,)$/ || last_token_is(COMPARISON_OPERATORS)
         val = Regexp.escape(tokens.last.to_s).gsub('\*', '.*')
         suggestions = suggestions.map {|s| s if s.to_s =~ /^"?#{val}"?/i}.compact
@@ -201,7 +201,7 @@ module ScopedSearch
       return complete_key_value(field, token, val) if field.key_field
 
       completer_scope(field)
-        .where(value_conditions(field.quoted_field, val))
+        .where(value_conditions(field, val))
         .select("DISTINCT #{field.quoted_field}")
         .limit(20)
         .map(&field.field)
@@ -261,7 +261,7 @@ module ScopedSearch
 
     # This method returns conditions for selecting completion from partial value
     def value_conditions(field, val)
-      val.blank? ? nil : "#{field.quoted_field} LIKE '#{val.gsub("'","''")}%'".tr_s('%*', '%')
+      val.blank? ? nil : "CAST(#{field.quoted_field} as CHAR(50)) LIKE '#{val.gsub("'","''")}%'".tr_s('%*', '%')
     end
 
     # This method complete infix operators by field type

data/lib/scoped_search/query_builder.rb

@@ -478,24 +478,6 @@ module ScopedSearch
       end
     end
 
-    # The MysqlAdapter makes sure that case sensitive comparisons are used
-    # when using the (not) equals operator, regardless of the field's
-    # collation setting.
-    class Mysql2Adapter < ScopedSearch::QueryBuilder
-       # Patches the default <tt>sql_operator</tt> method to add
-      # <tt>BINARY</tt> after the equals and not equals operator to force
-      # case-sensitive comparisons.
-      def sql_operator(operator, field)
-        if [:ne, :eq].include?(operator) && field.textual?
-          "#{SQL_OPERATORS[operator]} BINARY"
-        else
-          super(operator, field)
-        end
-      end
-    end
-
-    MysqlAdapter = Mysql2Adapter
-
     # The PostgreSQLAdapter make sure that searches are case sensitive when
     # using the like/unlike operators, by using the PostrgeSQL-specific
     # <tt>ILIKE operator</tt> instead of <tt>LIKE</tt>.
@@ -505,7 +487,7 @@ module ScopedSearch
       # method if full text searching is enabled and a text search is being
       # performed.
       def sql_test(field, operator, value, lhs, &block)
-        if [:like, :unlike].include?(operator) and field.full_text_search
+        if [:like, :unlike].include?(operator) && field.full_text_search
           yield(:parameter, value)
           negation = (operator == :unlike) ? "NOT " : ""
           locale = (field.full_text_search == true) ? 'english' : field.full_text_search
@@ -519,7 +501,7 @@ module ScopedSearch
       # method for ILIKE or @@ if full text searching is enabled.
       def sql_operator(operator, field)
         raise ScopedSearch::QueryNotSupported, "the operator '#{operator}' is not supported for field type '#{field.type}'" if [:like, :unlike].include?(operator) and !field.textual?
-        return '@@' if [:like, :unlike].include?(operator) and field.full_text_search
+        return '@@' if [:like, :unlike].include?(operator) && field.full_text_search
         case operator
           when :like   then 'ILIKE'
           when :unlike then 'NOT ILIKE'

data/lib/scoped_search/version.rb

@@ -1,3 +1,3 @@
 module ScopedSearch
-  VERSION = "3.1.0"
+  VERSION = "3.2.0"
 end

data/scoped_search.gemspec

@@ -9,6 +9,7 @@ Gem::Specification.new do |gem|
   gem.authors       = ['Amos Benari', 'Willem van Bergen', 'Wes Hays']
   gem.email         = ['abenari@redhat.com', 'willem@railsdoctors.com', 'weshays@gbdev.com']
   gem.homepage      = "https://github.com/wvanbergen/scoped_search/wiki"
+  gem.license       = "MIT"
   gem.summary       = %q{Easily search you ActiveRecord models with a simple query language using a named scope}
   gem.description   = <<-EOS
     Scoped search makes it easy to search your ActiveRecord-based models.

data/spec/integration/auto_complete_spec.rb

@@ -35,7 +35,8 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         has_many :bars
         default_scope { order(:string) }
 
-        scoped_search :on => [:string, :int, :date]
+        scoped_search :on => [:string, :date]
+        scoped_search :on => [:int], :complete_value => true
         scoped_search :on => :another,  :default_operator => :eq, :alias => :alias
         scoped_search :on => :explicit, :only_explicit => true, :complete_value => true
         scoped_search :on => :deprecated, :complete_enabled => false
@@ -49,7 +50,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
       @foo_1 = Foo.create!(:string => 'foo', :another => 'temp 1', :explicit => 'baz', :int => 9  , :date => 'February 8, 2011' , :unindexed => 10)
-      Foo.create!(:string => 'bar', :another => 'temp 2', :explicit => 'baz', :int => 9  , :date => 'February 10, 2011', :unindexed => 10)
+      Foo.create!(:string => 'bar', :another => 'temp 2', :explicit => 'baz', :int => 22  , :date => 'February 10, 2011', :unindexed => 10)
       Foo.create!(:string => 'baz', :another => nil,      :explicit => nil  , :int => nil, :date => nil                 , :unindexed => nil)
 
       Bar.create!(:related => 'lala',         :foo => @foo_1)
@@ -176,6 +177,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
     end
 
+
     context 'exceptional search strings' do
 
       it "query that starts with 'or'" do
@@ -213,5 +215,11 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
     end
+
+    context 'autocompleting integer comparisons' do
+      it 'should autocomplete numerical fields' do
+        Foo.complete_for('int > 2').first.should match(/22/)
+      end
+    end
   end
 end

data/spec/integration/string_querying_spec.rb

@@ -88,14 +88,6 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         @class.search_for('string ~ FOO').length.should == 1
       end
 
-      it "should not find records without case sensitivity when using the = operator" do
-        @class.search_for('string = FOO').length.should == 0
-      end
-
-      it "should find records without case sensitivity when using the != operator" do
-        @class.search_for('string != FOO').length.should == 3
-      end
-
       it "should find records without case sensitivity when using the NOT LIKE operator" do
         @class.search_for('string !~ FOO').length.should == 2
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoped_search
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Amos Benari
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -128,7 +128,8 @@ files:
 - spec/unit/rails_helper_spec.rb
 - spec/unit/tokenizer_spec.rb
 homepage: https://github.com/wvanbergen/scoped_search/wiki
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: