scoped_search 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa5c8206f13488ac53e60199ef5a08fc825c8654
-  data.tar.gz: ad9258a231663b704d4bc28728059c19f1846fb5
+  metadata.gz: f8e91bf7d864d576d7020bd56184d9ed7173e5c3
+  data.tar.gz: 502a182f6303fb040a4b3e77f54d984a85d54093
 SHA512:
-  metadata.gz: d9201e227813757d3fb3cba025d2692ab946f74206912c95b5b04db74932b2a350a7323085084a99ee7560afb584de91eb5cd931cad515403662170486121c53
-  data.tar.gz: 29db95daea73ad5e2f4fa789dec6029d685ae2360a36d2063d6c58004191e1e202e25ab16f38a98d6dce3d5eb1b8b1ca0e74838a91892927254a366f4f7fce1e
+  metadata.gz: ce108bace0ec727d852a4e0d9db9d330bab9d157a4dd985d0bb77e88eff186553462451beaee8fc532ac8d0b95361174b60772511ee7e1016be5c6f3640fe16e
+  data.tar.gz: c5dcd4e411820161628a61cf0485bf457121ba4ab8338f12d3723f83d8a2938bb1b85469eab096bce6f96f9b76bfb65af58723973de9d63f8e996692cfa4c3b4

data/lib/scoped_search/auto_complete_builder.rb

@@ -176,11 +176,12 @@ module ScopedSearch
 
       field.key_klass
         .where(value_conditions(field_name, val))
-        .select("DISTINCT #{field_name}")
+        .select(field_name)
         .limit(20)
         .map(&field.key_field)
         .compact
         .map { |f| "#{name}.#{f} " }
+        .uniq
     end
 
     # this method auto-completes values of fields that have a :complete_value marker
@@ -201,12 +202,13 @@ module ScopedSearch
       return complete_key_value(field, token, val) if field.key_field
 
       completer_scope(field)
-        .where(value_conditions(field, val))
-        .select("DISTINCT #{field.quoted_field}")
+        .where(value_conditions(field.quoted_field, val))
+        .select(field.quoted_field)
         .limit(20)
         .map(&field.field)
         .compact
         .map { |v| v.to_s =~ /\s/ ? "\"#{v}\"" : v }
+        .uniq
     end
 
     def completer_scope(field)
@@ -251,7 +253,7 @@ module ScopedSearch
       end
 
       query
-        .where(value_conditions(field, val))
+        .where(value_conditions(field.quoted_field, val))
         .select("DISTINCT #{field.quoted_field}")
         .limit(20)
         .map(&field.field)
@@ -260,8 +262,8 @@ module ScopedSearch
     end
 
     # This method returns conditions for selecting completion from partial value
-    def value_conditions(field, val)
-      val.blank? ? nil : "CAST(#{field.quoted_field} as CHAR(50)) LIKE '#{val.gsub("'","''")}%'".tr_s('%*', '%')
+    def value_conditions(field_name, val)
+      val.blank? ? nil : "CAST(#{field_name} as CHAR(50)) LIKE '#{val.gsub("'","''")}%'".tr_s('%*', '%')
     end
 
     # This method complete infix operators by field type

data/lib/scoped_search/definition.rb

@@ -250,7 +250,7 @@ module ScopedSearch
     def register_named_scope! # :nodoc
       definition = self
       @klass.scope(:search_for, proc { |query, options|
-        search_scope = ActiveRecord::VERSION::MAJOR == 3 ? @klass.scoped : @klass
+        search_scope = ActiveRecord::VERSION::MAJOR == 3 ? @klass.scoped : (ActiveRecord::VERSION::MINOR < 1 ? @klass.where(nil) : @klass.all)
 
         find_options = ScopedSearch::QueryBuilder.build_query(definition, query || '', options || {})
         search_scope = search_scope.where(find_options[:conditions])   if find_options[:conditions]

data/lib/scoped_search/query_builder.rb

@@ -83,17 +83,21 @@ module ScopedSearch
       return find_attributes
     end
 
-    def order_by(order, &block)
+    def find_field_for_order_by(order, &block)
       order ||= definition.default_order
-      return nil if order.blank?
+      return [nil, nil] if order.blank?
       field_name, direction_name = order.to_s.split(/\s+/, 2)
       field = definition.field_by_name(field_name)
       raise ScopedSearch::QueryNotSupported, "the field '#{field_name}' in the order statement is not valid field for search" unless field
+      return field, direction_name
+    end
+
+    def order_by(order, &block)
+      field, direction_name = find_field_for_order_by(order, &block)
+      return nil if field.nil?
       sql = field.to_sql(&block)
       direction = (!direction_name.nil? && direction_name.downcase.eql?('desc')) ? " DESC" : " ASC"
-      order = sql + direction
-
-      return order
+      return sql + direction
     end
 
     # A hash that maps the operators of the query language with the corresponding SQL operator.
@@ -516,7 +520,10 @@ module ScopedSearch
 
       def order_by(order, &block)
         sql = super(order, &block)
-        sql += sql.include?('DESC') ? ' NULLS LAST ' : ' NULLS FIRST ' if sql
+        if sql
+          field, _ = find_field_for_order_by(order, &block)
+          sql += sql.include?('DESC') ? ' NULLS LAST ' : ' NULLS FIRST ' if !field.nil? && field.column.null
+        end
         sql
       end
     end

data/lib/scoped_search/rails_helper.rb

@@ -22,7 +22,7 @@ module ScopedSearch
 
       ascend  = "#{field} ASC"
       descend = "#{field} DESC"
-      selected = [ascend, descend].include?(params[:order])
+      selected_sort = [ascend, descend].find { |o| o == params[:order] }
 
       case params[:order]
         when ascend
@@ -33,9 +33,9 @@ module ScopedSearch
           new_sort = ["ASC", "DESC"].include?(options[:default]) ? "#{field} #{options[:default]}" : ascend
       end
 
-      if selected
+      unless selected_sort.nil?
         css_classes = html_options[:class] ? html_options[:class].split(" ") : []
-        if new_sort == ascend
+        if selected_sort == ascend
           options[:as] = "▲ #{options[:as]}"
           css_classes << "ascending"
         else

data/lib/scoped_search/version.rb

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

data/spec/integration/auto_complete_spec.rb

@@ -89,6 +89,10 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         Foo.complete_for('date ').should =~ (["date  = ", "date  < ", "date  > "])
       end
 
+      it "should complete when query is already distinct" do
+        Foo.uniq.complete_for('int =').length.should > 0
+      end
+
       it "should raise error for unindexed field" do
         lambda { Foo.complete_for('unindexed = 10 ')}.should raise_error(ScopedSearch::QueryNotSupported)
       end

data/spec/integration/key_value_querying_spec.rb

@@ -91,6 +91,10 @@ require "spec_helper"
           Item.complete_for('facts.').length.should == 2
         end
 
+        it "should complete facts names with partial name" do
+          Item.complete_for('facts.c').length.should == 1
+        end
+
         it "should complete values for fact name = color" do
           Item.complete_for('facts.color = ').length.should == 2
         end

data/spec/integration/string_querying_spec.rb

@@ -31,6 +31,51 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       ScopedSearch::RSpec::Database.close_connection
     end
 
+    context 'with no scoped_search defaults' do
+
+      before(:all) do
+        @class2 = ScopedSearch::RSpec::Database.create_model(
+            :string => :string,
+            :another => :string,
+            ) do |klass|
+          klass.scoped_search :on => :string
+          klass.scoped_search :on => :another
+        end
+
+        @class2.create!(:string => 'foo', :another => 'foo')
+        @class2.create!(:string => 'bar', :another => 'foo')
+        @class2.create!(:string => 'baz', :another => 'bar')
+      end
+
+      after(:all) do
+        ScopedSearch::RSpec::Database.drop_model(@class2)
+      end
+
+      context '#search_for with an empty string' do
+
+        it 'should not remove previous scope' do
+          @class2.where(another: 'foo').search_for('').count.should == 2
+        end
+
+        it 'should return an ActiveRecord::Relation' do
+          @class2.search_for('').should be_a(ActiveRecord::Relation)
+        end
+
+      end
+
+      context '#search_for with nil' do
+        it 'should not remove previous scope' do
+          @class2.where(another: 'foo').search_for(nil).count.should == 2
+        end
+
+        it 'should return an ActiveRecord::Relation' do
+          @class2.search_for(nil).should be_a(ActiveRecord::Relation)
+        end
+
+      end
+
+    end
+
     context 'in an implicit string field' do
       it "should find the record with an exact string match" do
         @class.search_for('foo').length.should == 1

data/spec/unit/rails_helper_spec.rb

@@ -70,4 +70,26 @@ describe ScopedSearch::RailsHelper do
     params[:order] = "field ASC"
     sort("other")
   end
+
+  it "should add no styling by default" do
+    should_receive(:url_for)
+    should_receive(:a_link).with('Field', anything, hash_excluding(:class))
+    sort("field")
+  end
+
+  it "should add ascending style for current ascending sort order " do
+    should_receive(:url_for)
+    should_receive(:a_link).with('▲ Field', anything, hash_including(:class => 'ascending'))
+
+    params[:order] = "field ASC"
+    sort("field")
+  end
+
+  it "should add descending style for current descending sort order " do
+    should_receive(:url_for)
+    should_receive(:a_link).with('▼ Field', anything, hash_including(:class => 'descending'))
+
+    params[:order] = "field DESC"
+    sort("field")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoped_search
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Amos Benari
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord