scoped_search 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b15c18415944dcdf767c8ab154ac00186290c2b
-  data.tar.gz: ca8384a89a6887ae0335b02fe7d8e0341654c063
+  metadata.gz: ed2cb536ff3e9eb2ae79adb69c0d16deded93503
+  data.tar.gz: d71fcf06f4526cca6f0f74c674b700c63cc53710
 SHA512:
-  metadata.gz: 3534f6ce7a7c2d0edc4c3d5ca1fe5c43bf21ef51491861d298da837dcb949d86a237df26680f1273a9f8ec88a0bf6b139efd8e801747e9c994435628f66dd343
-  data.tar.gz: 7fedaf4f620b8f77b5dd3594a77810f51632ac7a8d0d5ac33ea946c34ae4b085eb85ca7502ebe2c8955b93d1f9c5940ba76422ef180fe4177709d1290878d13e
+  metadata.gz: 574ce08bfd3a7e6910c52b814c5c0b977e6de7675a80dc53b971915e2fe4619a9e82453dcdafa547d66ff9a6464737a0b26e935ebd4f2f78121ff0061a5096b2
+  data.tar.gz: 0adcf62f38857c13dd4e49c835b4cfe33821ddf273f5e190ccd557b279ca49512d35700a05549ca9b8eb2c332e73c0ae501daa7fbbccb10da4b5b8720f30429a

data/CHANGELOG.rdoc

@@ -8,6 +8,11 @@ Please add an entry to the "Unreleased changes" section in your pull requests.
 
 *Nothing yet*
 
+=== Version 4.1.1
+
+- Bugfix related to quoting when building autocomplete queries for date fields (#167)
+- Bugfix related to using polymorphic relations (#168)
+
 === Version 4.1.0
 
 - Add support for ActiveRecord and ActionView 5.1

data/lib/scoped_search/auto_complete_builder.rb

@@ -236,7 +236,7 @@ module ScopedSearch
       options << 5.days.ago.strftime('%A')
       options << '"6 days ago"'
       options << 7.days.ago.strftime('"%b %d,%Y"')
-      options << '2 weeks from now'
+      options << '"2 weeks from now"'
       options
     end
 

data/lib/scoped_search/query_builder.rb

@@ -262,6 +262,7 @@ module ScopedSearch
     def has_many_through_join(field)
       many_class = field.definition.klass
       through = definition.reflection_by_name(many_class, field.relation).options[:through]
+
       connection = many_class.connection
 
       # table names
@@ -269,9 +270,10 @@ module ScopedSearch
       many_table_name = many_class.table_name
       middle_table_name = definition.reflection_by_name(many_class, through).klass.table_name
 
-      # primary and foreign keys + optional condition for the many to middle join
+      # primary and foreign keys + optional conditions for the joins
       pk1, fk1   = field.reflection_keys(definition.reflection_by_name(many_class, through))
-      condition1 = field.reflection_conditions(definition.reflection_by_name(field.klass, middle_table_name))
+      condition_many_to_middle = field.reflection_conditions(definition.reflection_by_name(field.klass, many_table_name))
+      condition_middle_to_end = field.reflection_conditions(definition.reflection_by_name(field.klass, middle_table_name))
 
       # primary and foreign keys + optional condition for the endpoint to middle join
       middle_table_association = find_has_many_through_association(field, through) || middle_table_name
@@ -281,7 +283,7 @@ module ScopedSearch
       <<-SQL
         #{connection.quote_table_name(many_table_name)}
         INNER JOIN #{connection.quote_table_name(middle_table_name)}
-        ON #{connection.quote_table_name(many_table_name)}.#{connection.quote_column_name(pk1)} = #{connection.quote_table_name(middle_table_name)}.#{connection.quote_column_name(fk1)} #{condition1}
+        ON #{connection.quote_table_name(many_table_name)}.#{connection.quote_column_name(pk1)} = #{connection.quote_table_name(middle_table_name)}.#{connection.quote_column_name(fk1)} #{condition_many_to_middle} #{condition_middle_to_end}
         INNER JOIN #{connection.quote_table_name(endpoint_table_name)}
         ON #{connection.quote_table_name(middle_table_name)}.#{connection.quote_column_name(fk2)} = #{connection.quote_table_name(endpoint_table_name)}.#{connection.quote_column_name(pk2)} #{condition2}
       SQL

data/lib/scoped_search/version.rb

@@ -1,3 +1,3 @@
 module ScopedSearch
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 end

data/spec/integration/relation_querying_spec.rb

@@ -479,11 +479,11 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         ActiveRecord::Migration.create_table(:user_groups) { |t| t.integer :user_id; t.integer :group_id }
         ActiveRecord::Migration.create_table(:conflicts) { |t| t.integer :group_id; t.integer :user_id }
         ActiveRecord::Migration.create_table(:groups) { |t| t.string :related; t.integer :user_id }
-        ActiveRecord::Migration.create_table(:users) { |t| t.string :foo }
+        ActiveRecord::Migration.create_table(:users) { |t| t.string :foo; t.string :user_type }
 
         # The related classes
         class UserGroup < ActiveRecord::Base; belongs_to :user; belongs_to :group; end
-        class Conflict < ActiveRecord::Base; belongs_to :user; belongs_to :group; end
+        class Conflict < ActiveRecord::Base; belongs_to :user, :polymorphic => true; belongs_to :group; end
         class Group < ActiveRecord::Base
           has_many :user_groups
           has_many :users, :through => :conflicts, :source_type => 'User', :source => :user
@@ -497,9 +497,9 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
           scoped_search :relation => :groups, :on => :related
         end
 
-        @user_1 = User.create!(:foo => 'foo')
-        @user_2 = User.create!(:foo => 'foo too')
-        @user_3 = User.create!(:foo => 'foo three')
+        @user_1 = User.create!(:foo => 'foo', :user_type => 'User')
+        @user_2 = User.create!(:foo => 'foo too', :user_type => 'User')
+        @user_3 = User.create!(:foo => 'foo three',  :user_type => 'User')
 
         @group_1 = Group.create(:related => 'value')
         @group_2 = Group.create(:related => 'value too!')
@@ -524,7 +524,6 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
     end
 
-
     context 'querying a :has_many => :through relation with modules' do
 
       before do
@@ -578,5 +577,63 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         Zan::Koo.search_for('related=baz AND related="baz too!"').length.should == 1
       end
     end
+
+    context 'querying a :has_many => :through with polymorphism' do
+      before do
+        ActiveRecord::Migration.create_table(:subnets) { |t| t.string :name }
+        ActiveRecord::Migration.create_table(:taxable_taxonomies) { |t| t.integer :taxable_id; t.integer :taxonomy_id; t.string :taxable_type }
+        ActiveRecord::Migration.create_table(:taxonomies) { |t| t.string :type; t.string :name }
+
+        class Subnet < ActiveRecord::Base
+          has_many :taxable_taxonomies, :as => :taxable
+          has_many :locations, -> { where(:type => 'Location') }, :through => :taxable_taxonomies, :source => :taxonomy
+          has_many :organizations, -> { where(:type => 'Organization') }, :through => :taxable_taxonomies, :source => :taxonomy
+
+          scoped_search :relation => :locations, :on => :id, :rename => :location_id
+          scoped_search :relation => :organizations, :on => :id, :rename => :organization_id
+        end
+
+        class TaxableTaxonomy < ActiveRecord::Base
+          belongs_to :taxonomy
+          belongs_to :taxable, :polymorphic => true
+        end
+
+        class Taxonomy < ActiveRecord::Base
+          has_many :taxable_taxonomies
+          has_many :subnets, :through => :taxable_taxonomies, :source => :taxable, :source_type => 'Subnet'
+        end
+
+        class Organization < Taxonomy; end
+        class Location < Taxonomy; end
+
+        @loc_a = Location.create!(:name => 'Location A')
+        @loc_b = Location.create!(:name => 'Location B')
+        @org_a = Organization.create!(:name => 'Organization A')
+        @org_b = Organization.create!(:name => 'Organization B')
+
+        @subnet_a = Subnet.create!(:name => 'Subnet A')
+        @subnet_b = Subnet.create!(:name => 'Subnet B')
+
+
+        TaxableTaxonomy.create!(:taxable_id => @subnet_a.id, :taxonomy_id => @loc_a.id, :taxable_type => 'Subnet')
+        TaxableTaxonomy.create!(:taxable_id => @subnet_b.id, :taxonomy_id => @loc_b.id, :taxable_type => 'Subnet')
+        TaxableTaxonomy.create!(:taxable_id => @subnet_a.id, :taxonomy_id => @org_a.id, :taxable_type => 'Subnet')
+        TaxableTaxonomy.create!(:taxable_id => @subnet_b.id, :taxonomy_id => @loc_b.id, :taxable_type => 'Subnet')
+      end
+
+      after do
+        ActiveRecord::Migration.drop_table :subnets
+        ActiveRecord::Migration.drop_table :taxable_taxonomies
+        ActiveRecord::Migration.drop_table :taxonomies
+      end
+
+      it "should find the records based on location id" do
+        Subnet.search_for("location_id = #{@loc_a.id}").length.should == 1
+      end
+
+      it "should find the records based on organization id" do
+        Subnet.search_for("organization_id = #{@org_a.id}").length.should == 1
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoped_search
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Amos Benari
@@ -10,48 +10,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.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: |2
@@ -77,8 +77,8 @@ extra_rdoc_files:
 - CONTRIBUTING.rdoc
 - LICENSE
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG.rdoc
 - CONTRIBUTING.rdoc
 - Gemfile
@@ -137,27 +137,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: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Easily search you ActiveRecord models with a simple query language using