scoped_search 2.6.4 → 2.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0066af8348f2ba11b7310b6c475996faff7a1f7e
-  data.tar.gz: 39e85b56318542dfa45acfff2256e7deefe2e6aa
+  metadata.gz: 3bb6838588ce385873a180ec0e875deedde5fcde
+  data.tar.gz: efbe17ef6dd34eadea7ac3251b3fbf5225e4e2c5
 SHA512:
-  metadata.gz: 9c04341bb812bab19637c629feb0ffa831f8f344ceb327521a5925ae811a944fffd513060f8b0c7af5801ba24ee7c3a1cb2aaac3898ae2d58ab4da945ee87915
-  data.tar.gz: 6392df7d7cbab370fff4bd8092ec497fa08e14ce767305ab7ea612daf5842b4938100cc27db42134e15f2db1da6ca70b442e21f91808c50fc7c07ed4dff37f2b
+  metadata.gz: aa3ed52f60b294fba0ef10b2299882e820d985b26dd03dfdcb0c91b93fb2445c5fe21817e80a4d452eb5f169f68626f4a672e7abb8f7e542a94516a794bcd979
+  data.tar.gz: c43a5e3d499f854bf01ae594387650bf46deaf4e4770ed44047949b2fcd0ca46bcd8ab8312970430fbe58ff9bebea86125a5862c9e840bde4821c94d960bfb05

data/lib/scoped_search/auto_complete_builder.rb

@@ -154,6 +154,7 @@ module ScopedSearch
     def complete_keyword
       keywords = []
       definition.fields.each do|f|
+        next unless f[1].complete_enabled
         if (f[1].key_field)
           keywords += complete_key(f[0], f[1], tokens.last)
         else
@@ -178,7 +179,7 @@ module ScopedSearch
       field.key_klass.all(opts).map(&field.key_field).compact.map{ |f| "#{name}.#{f} "}
     end
 
-    # this method auto-completes values of fields that have a :complete_value marker 
+    # this method auto-completes values of fields that have a :complete_value marker
     def complete_value
       if last_token_is(COMPARISON_OPERATORS)
         token = tokens[tokens.size-2]

data/lib/scoped_search/definition.rb

@@ -16,7 +16,7 @@ module ScopedSearch
     class Field
 
       attr_reader :definition, :field, :only_explicit, :relation, :key_relation, :full_text_search,
-                  :key_field, :complete_value, :offset, :word_size, :ext_method, :operators
+                  :key_field, :complete_value, :complete_enabled, :offset, :word_size, :ext_method, :operators
 
       # Initializes a Field instance given the definition passed to the
       # scoped_search call on the ActiveRecord-based model class.
@@ -43,6 +43,7 @@ module ScopedSearch
           @only_explicit    = !!options[:only_explicit]
           @full_text_search = options[:full_text_search]
           @default_operator = options[:default_operator] if options.has_key?(:default_operator)
+          @complete_enabled = options[:complete_enabled].nil? ? true : options[:complete_enabled]
         end
 
         # Store this field is the field array

data/lib/scoped_search/query_builder.rb

@@ -221,16 +221,15 @@ module ScopedSearch
       elsif field.set?
         return set_test(field, operator, value, &block)
       elsif field.definition.klass.reflections[field.relation].try(:macro) == :has_many
+        value = value.to_i if field.offset
+        yield(:parameter, value)
+        primary_key = "#{field.definition.klass.quoted_table_name}.#{field.definition.klass.primary_key}"
         if field.definition.klass.reflections[field.relation].options.has_key?(:through)
-          value = value.to_i if field.offset
-          yield(:parameter, value)
           join = has_many_through_join(field)
-          middle_table = field.definition.klass.reflections[field.relation].options[:through]
-          return "#{field.definition.klass.table_name}.id IN (SELECT #{field.reflection_keys(field.definition.klass.reflections[middle_table])[1]} FROM #{join} WHERE #{field.to_sql(operator, &block)} #{self.sql_operator(operator, field)} ? )"
+          return "#{primary_key} IN (SELECT #{primary_key} FROM #{join} WHERE #{field.to_sql(operator, &block)} #{self.sql_operator(operator, field)} ? )"
         else
-          value = value.to_i if field.offset
-          yield(:parameter, value)
-          return "#{field.definition.klass.table_name}.id IN (SELECT #{field.reflection_keys(field.definition.klass.reflections[field.relation])[1]} FROM #{field.klass.table_name} WHERE #{field.to_sql(operator, &block)} #{self.sql_operator(operator, field)} ? )"
+          foreign_key = field.reflection_keys(field.definition.klass.reflections[field.relation])[1]
+          return "#{primary_key} IN (SELECT #{foreign_key} FROM #{field.klass.quoted_table_name} WHERE #{field.to_sql(operator, &block)} #{self.sql_operator(operator, field)} ? )"
         end
       else
         value = value.to_i if field.offset
@@ -247,10 +246,10 @@ module ScopedSearch
       many_table_name = many_class.table_name
       middle_table_name = many_class.reflections[through].klass.table_name
       #primary and foreign keys + optional condition for the many to middle join
-      pk1, fk1 = field.reflection_keys(many_class.reflections[through])
+      pk1, fk1   = field.reflection_keys(many_class.reflections[through])
       condition1 = field.reflection_conditions(field.klass.reflections[many_table_name.to_sym])
       #primary and foreign keys + optional condition for the endpoint to middle join
-      pk2, fk2 =    field.reflection_keys(field.klass.reflections[middle_table_name.to_sym])
+      pk2, fk2   = field.reflection_keys(field.klass.reflections[middle_table_name.to_sym])
       condition2 = field.reflection_conditions(many_class.reflections[field.relation])
 
       <<-SQL
@@ -310,7 +309,7 @@ module ScopedSearch
         key_table = klass.reflections[key].table_name
         value_table = klass.table_name.to_s
 
-        key_table_pk, value_table_fk_key = reflection_keys(klass.reflections[key])
+        value_table_fk_key, key_table_pk = reflection_keys(klass.reflections[key])
 
         main_reflection = definition.klass.reflections[relation]
         if main_reflection
@@ -350,7 +349,7 @@ module ScopedSearch
         fk = reflection.options[:foreign_key]
         # activerecord prior to 3.1 doesn't respond to foreign_key method and hold the key name in the reflection primary key
         fk ||= reflection.respond_to?(:foreign_key) ? reflection.foreign_key : reflection.primary_key_name
-        [pk, fk]
+        reflection.macro == :belongs_to ? [fk, pk] : [pk, fk]
       end
 
       def reflection_conditions(reflection)

data/lib/scoped_search/rails_helper.rb

@@ -134,7 +134,7 @@ module ScopedSearch
 				      .append( "<a>" + "<strong class='ui-autocomplete-completed'>" + item.completed + "</strong>" + item.part + "</a>" )
 				      .appendTo( ul );
             } else {
-              if(jQuery.ui.version>='1.9') {
+              if(typeof(self._renderItemData) === "function") {
                 self._renderItemData( ul, item );
               } else {
                 self._renderItem( ul, item );

data/lib/scoped_search/version.rb

@@ -1,3 +1,3 @@
 module ScopedSearch
-  VERSION = "2.6.4"
+  VERSION = "2.6.5"
 end

data/spec/integration/auto_complete_spec.rb

@@ -9,30 +9,32 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
     before(:all) do
       ScopedSearch::RSpec::Database.establish_named_connection(db)
 
-      ActiveRecord::Migration.create_table(:bars, :force => true) do |t| 
+      ActiveRecord::Migration.create_table(:bars, :force => true) do |t|
         t.integer :foo_id
         t.string :related
       end
 
-      ActiveRecord::Migration.create_table(:foos, :force => true) do |t| 
+      ActiveRecord::Migration.create_table(:foos, :force => true) do |t|
         t.string  :string
         t.string  :another
         t.string  :explicit
+        t.string  :deprecated
         t.integer :int
-        t.date    :date 
+        t.date    :date
         t.integer :unindexed
       end
 
       class ::Bar < ActiveRecord::Base
         belongs_to :foo
       end
-      
+
       class ::Foo < ActiveRecord::Base
         has_many :bars
-        
+
         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
       end
 
@@ -41,13 +43,13 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       Foo.create!(:string => 'baz', :another => nil,      :explicit => nil  , :int => nil, :date => nil                 , :unindexed => nil)
 
       Bar.create!(:related => 'lala',         :foo => @foo_1)
-      Bar.create!(:related => 'another lala', :foo => @foo_1)      
+      Bar.create!(:related => 'another lala', :foo => @foo_1)
     end
 
     after(:all) do
       ActiveRecord::Migration.drop_table(:foos)
       ActiveRecord::Migration.drop_table(:bars)
-      
+
       Object.send :remove_const, :Foo
       Object.send :remove_const, :Bar
 
@@ -98,6 +100,11 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       it "should not repeat logical operators" do
         Foo.complete_for('string = foo and ').should_not contain("string = foo and and", "string = foo and or")
       end
+
+      it "should not contain deprecated field in autocompleter" do
+        Foo.complete_for(' ').should_not contain("  deprecated")
+      end
+
     end
 
     context 'using an aliased field' do

data/spec/integration/relation_querying_spec.rb

@@ -278,6 +278,56 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
     end
 
+    context 'querying a :has_many => :through many relation' do
+
+      before do
+
+        # Create some tables
+        ActiveRecord::Migration.create_table(:zars) { |t| t.integer :baz_id }
+        ActiveRecord::Migration.create_table(:bazs) { |t| t.string :related }
+        ActiveRecord::Migration.create_table(:zoos) { |t| t.integer :zar_id; t.string :foo }
+
+        # The related classes
+        class Zar < ActiveRecord::Base; belongs_to :baz; has_many :zoos; end
+        class Baz < ActiveRecord::Base; has_many :zars; end
+
+        # The class on which to call search_for
+        class Zoo < ActiveRecord::Base
+          belongs_to :zar
+          has_many :bazs, :through => :zar
+
+          scoped_search :in => :bazs, :on => :related
+        end
+
+        baz_1 = Baz.create(:related => 'baz')
+        baz_2 = Baz.create(:related => 'baz too!')
+
+        zar_1 = Zar.create!( :baz => baz_1)
+        zar_2 = Zar.create!( :baz => baz_2)
+
+        Zoo.create!(:zar => zar_1, :foo => 'foo')
+        Zoo.create!(:zar => zar_1, :foo => 'foo too')
+        Zoo.create!(:zar => zar_2, :foo => 'foo three')
+      end
+
+      after do
+        ActiveRecord::Migration.drop_table(:bazs)
+        ActiveRecord::Migration.drop_table(:zars)
+        ActiveRecord::Migration.drop_table(:zoos)
+      end
+
+      # This table schema is not supported in activerecord 2, skip the tests
+      if ActiveRecord::VERSION::MAJOR > 2
+        it "should find the three records that are related to a baz record" do
+          Zoo.search_for('baz').should have(3).items
+        end
+
+        it "should find no records that are related to a baz record" do
+          Zoo.search_for('related=baz AND related="baz too!"').should have(0).items
+        end
+      end
+    end
+
     context 'querying a :has_many => :through :polymorphic relation' do
 
       before do

metadata

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