scoped_search 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7053f29622ce510229c05ba561ce8a1e275942cf
-  data.tar.gz: e28a7d2541cc4e586b2bcbde23ea4742fa7a5671
+  metadata.gz: b1847a5debfd78493233e7bb02f6ab09e7f97716
+  data.tar.gz: 1956d02a802a331f3ee7b8e6a555b09d49104942
 SHA512:
-  metadata.gz: 7e3fac5a915408137d1ae6eb7194ddb43f75501407e13dd7203da779dc8e23fc011b0f55f2b7a1b6c461fb799e3afd376881bd001d6cc7276443d96ce8f2e7cd
-  data.tar.gz: 7b8643f0e611d089409b34f87f0102ef856ec9079d2f07e0ce1458ded6402f1d7c08d251ab4d609c29489e4eb5d5a673390e99948ce429eea663c3ef1638c85b
+  metadata.gz: 26c1ffaeb3af331ff878db933bebec8c7e56066801ba5c94fc2771c3d07f8c1da6699bf4ec14b932ef318b42ecfc576eb17c984f8f1bdae450658cb5adb2c720
+  data.tar.gz: 34a33ccb2d74cecc67ea7fca254f9d4ab05e3f00c355bca71772104128b6c7b0f625fe866623c8353b1e9e8dcbd09483a23e1f848d4ea20e5814880949bd449e

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2013 Willem van Bergen & contributors
+Copyright (c) 2008-2014 Willem van Bergen & contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/scoped_search/auto_complete_builder.rb

@@ -140,9 +140,10 @@ module ScopedSearch
       # for dotted field names compact the suggestions list to be one suggestion
       # unless the user has typed the relation name entirely or the suggestion list
       # is short.
-      if (suggestions.size > 10 && (tokens.empty? || !tokens.last.to_s.include?('.')) && !is_value)
+      last_token = tokens.last.to_s
+      if (suggestions.size > 10 && (tokens.empty? || !last_token.include?('.')) && !is_value)
         suggestions = suggestions.map  do |s|
-          s.to_s.split('.')[0].end_with?(tokens.last.to_s) ? s.to_s : s.to_s.split('.')[0]
+          !last_token.empty? && s.to_s.split('.')[0].end_with?(last_token) ? s.to_s : s.to_s.split('.')[0]
         end
       end
 
@@ -196,16 +197,16 @@ module ScopedSearch
       return complete_date_value if field.temporal?
       return complete_key_value(field, token, val) if field.key_field
 
-      table = field.klass.connection.quote_table_name(field.klass.table_name)
-      opts = value_conditions("#{table}.#{field.field}", val)
-      opts.merge!(:limit => 20, :select => "DISTINCT #{table}.#{field.field}")
+      opts = value_conditions(field.quoted_field, val)
+      opts.merge!(:limit => 20, :select => "DISTINCT #{field.quoted_field}")
 
-      return completer_scope(field.klass).all(opts).map(&field.field).compact.map{|v| v.to_s =~ /\s+/ ? "\"#{v}\"" : v}
+      return completer_scope(field).all(opts).map(&field.field).compact.map{|v| v.to_s =~ /\s+/ ? "\"#{v}\"" : v}
     end
 
-    def completer_scope(klass)
-      return klass unless klass.respond_to?(:completer_scope)
-      klass.completer_scope(@options)
+    def completer_scope(field)
+      klass = field.klass
+      scope =  klass.respond_to?(:completer_scope) ? klass.completer_scope(@options) : klass
+      scope.respond_to?(:reorder) ? scope.reorder(field.quoted_field) : scope.scoped(:order => field.quoted_field)
     end
 
     # set value completer
@@ -232,11 +233,11 @@ module ScopedSearch
     # complete values in a key-value schema
     def complete_key_value(field, token, val)
       key_name = token.sub(/^.*\./,"")
-      key_opts = value_conditions(field.field,val).merge(:conditions => {field.key_field => key_name})
+      key_opts = value_conditions(field.quoted_field,val).merge(:conditions => {field.key_field => key_name})
       key_klass = field.key_klass.first(key_opts)
       raise ScopedSearch::QueryNotSupported, "Field '#{key_name}' not recognized for searching!" if key_klass.nil?
 
-      opts = {:select => "DISTINCT #{field.field}"}
+      opts = {:limit => 20, :select => "DISTINCT #{field.quoted_field}"}
       if(field.key_klass != field.klass)
         key  = field.key_klass.to_s.gsub(/.*::/,'').underscore.to_sym
         fk   = field.klass.reflections[key].association_foreign_key.to_sym
@@ -244,7 +245,7 @@ module ScopedSearch
       else
         opts.merge!(key_opts)
       end
-      return completer_scope(field.klass).all(opts.merge(:limit => 20)).map(&field.field).compact.map{|v| v.to_s =~ /\s+/ ? "\"#{v}\"" : v}
+      return completer_scope(field).all(opts).map(&field.field).compact.map{|v| v.to_s =~ /\s+/ ? "\"#{v}\"" : v}
     end
 
     #this method returns conditions for selecting completion from partial value

data/lib/scoped_search/definition.rb

@@ -139,6 +139,12 @@ module ScopedSearch
         order = (options[:default_order].to_s.downcase.include?('desc')) ? "DESC" : "ASC"
         return "#{field_name} #{order}"
       end
+
+      # Return 'table'.'column' with the correct database quotes
+      def quoted_field
+        c = klass.connection
+        "#{c.quote_table_name(klass.table_name)}.#{c.quote_column_name(field)}"
+      end
     end
 
     attr_reader :klass

data/lib/scoped_search/version.rb

@@ -1,3 +1,3 @@
 module ScopedSearch
-  VERSION = "2.7.0"
+  VERSION = "2.7.1"
 end

data/spec/integration/auto_complete_spec.rb

@@ -12,6 +12,9 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       ActiveRecord::Migration.create_table(:bars, :force => true) do |t|
         t.integer :foo_id
         t.string :related
+        t.string :other_a
+        t.string :other_b
+        t.string :other_c
       end
 
       ActiveRecord::Migration.create_table(:foos, :force => true) do |t|
@@ -30,12 +33,16 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
 
       class ::Foo < ActiveRecord::Base
         has_many :bars
+        default_scope { order(:string) }
 
         scoped_search :on => [:string, :int, :date]
         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
         scoped_search :on => :related, :in => :bars, :rename => 'bars.related'.to_sym
+        scoped_search :on => :other_a, :in => :bars, :rename => 'bars.other_a'.to_sym
+        scoped_search :on => :other_b, :in => :bars, :rename => 'bars.other_b'.to_sym
+        scoped_search :on => :other_c, :in => :bars, :rename => 'bars.other_c'.to_sym
       end
 
       class ::Infoo < ::Foo
@@ -187,5 +194,24 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         Foo.complete_for('bars.related = ').should eql([])
       end
     end
+
+    # When options list is long (>10) and some of the options are in the format 'common.detail'
+    # the list should be shorten to include only 'common', the details part should be unfolded
+    # when the 'common.' part is typed or the options list size is reduced by typing part of
+    # the string.
+    context 'dotted options in the completion list' do
+      it "query that starts with space should not include the dotted options" do
+        Foo.complete_for(' ').should have(9).items
+      end
+
+      it "query that starts with the dotted string should include the dotted options" do
+        Foo.complete_for('bars.').should have(4).items
+      end
+
+      it "query that starts with part of the dotted string should include the dotted options" do
+        Foo.complete_for('b').should have(4).items
+      end
+
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoped_search
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Amos Benari
@@ -10,48 +10,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: "    Scoped search makes it easy to search your ActiveRecord-based models.\n
@@ -74,8 +74,8 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.activerecord2
 - Gemfile.activerecord3
@@ -127,27 +127,27 @@ licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--title"
+- --title
 - scoped_search
-- "--main"
+- --main
 - README.rdoc
-- "--line-numbers"
-- "--inline-source"
+- --line-numbers
+- --inline-source
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Easily search you ActiveRecord models with a simple query language using