scoped_search 4.1.6 → 4.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c94c65fc191d2afdddd82f3177121d2ade7e6238
-  data.tar.gz: 36dd864d06aafd40bd3015184a17222a92d5627f
+  metadata.gz: 4d5d5ddd90a25434d39644b46bf7ff531a4c3b9f
+  data.tar.gz: c6f84e3fa52f86b25d03b0ec6a0cb61fb0be79e9
 SHA512:
-  metadata.gz: 2a41edacae0b5140f56dc60bc921c8afb3349132b9ad3453313fc407abbda58b251c08d1da8d56706f9307520882e9e8006f18147833c91b7e3d0995962d843e
-  data.tar.gz: 31932dcd317193df257a4d0fd0c46fea28866e7670a0cfbd1d840d4477ada8381906d5f83b9289b322de3bbc44048ec249d9bf6af67f605bfc76589be9ccc7e3
+  metadata.gz: e798cdc07468120499ae613122e4a96d6e300998cf3868af27e4df65204af23a28aed861cb3144a7b7bdf44097b5024684b91d0db1a9becdb0397c73d0e39cc6
+  data.tar.gz: 0da17cd812a2ca5f2802e3cff5835317117426530707d6af6dc1d1d093a9efac13378d1d781b8a1512fd86ca6ab969ef6fe10be6ac6e30356ec988a040cd49d4

data/.travis.yml

@@ -14,8 +14,10 @@ rvm:
 - "2.0"
 - "2.1"
 - "2.2.2"
-- "2.3.1"
+- "2.3.7"
 - "2.4.0"
+- "2.5.0"
+- "2.6.0"
 - ruby-head
 - jruby-19mode
 - jruby-head
@@ -24,6 +26,8 @@ gemfile:
 - Gemfile.activerecord42
 - Gemfile.activerecord50
 - Gemfile.activerecord51
+- Gemfile.activerecord52
+- Gemfile.activerecord52_with_activesupport52
 
 matrix:
   allow_failures:
@@ -39,3 +43,12 @@ matrix:
       gemfile: Gemfile.activerecord51
     - rvm: "2.1"
       gemfile: Gemfile.activerecord51
+    - rvm: "2.0"
+      gemfile: Gemfile.activerecord52
+    - rvm: "2.1"
+      gemfile: Gemfile.activerecord52
+    - rvm: "2.0"
+      gemfile: Gemfile.activerecord52_with_activesupport52
+    - rvm: "2.1"
+      gemfile: Gemfile.activerecord52_with_activesupport52
+

data/CHANGELOG.rdoc

@@ -8,6 +8,12 @@ Please add an entry to the "Unreleased changes" section in your pull requests.
 
 - Nothing yet
 
+=== Version 4.1.7
+
+- When Active Support is available, we parse time respecting current time zone
+- Allow dots in rename definitions
+- Accept extra value_filter in `complete_for`
+
 === Version 4.1.6
 
 - Support for UUID columns on PostgreSQL (#184)

data/Gemfile.activerecord52

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+gemspec
+
+gem 'actionview', '~> 5.2.0'
+gem 'activerecord', '~> 5.2.0'
+
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'activerecord-jdbcmysql-adapter'
+  gem 'activerecord-jdbcpostgresql-adapter'
+end
+
+platforms :ruby do
+  gem 'sqlite3', '~> 1.3.6'
+  gem 'mysql2', '>= 0.3.18', '< 0.5'
+  gem 'pg', '~> 0.18'
+end

data/Gemfile.activerecord52_with_activesupport52

@@ -0,0 +1,18 @@
+source 'https://rubygems.org'
+gemspec
+
+gem 'actionview', '~> 5.2.0'
+gem 'activerecord', '~> 5.2.0'
+gem 'activesupport', '~> 5.2.0'
+
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'activerecord-jdbcmysql-adapter'
+  gem 'activerecord-jdbcpostgresql-adapter'
+end
+
+platforms :ruby do
+  gem 'sqlite3', '~> 1.3.6'
+  gem 'mysql2', '>= 0.3.18', '< 0.5'
+  gem 'pg', '~> 0.18'
+end

data/lib/scoped_search/auto_complete_builder.rb

@@ -208,6 +208,7 @@ module ScopedSearch
     def complete_value_from_db(field, special_values, val)
       count = 20 - special_values.count
       completer_scope(field)
+        .where(@options[:value_filter])
         .where(value_conditions(field.quoted_field, val))
         .select(field.quoted_field)
         .limit(count)

data/lib/scoped_search/definition.rb

@@ -238,6 +238,9 @@ module ScopedSearch
       if field.nil?
         dotted = name.to_s.split('.')[0]
         field = fields[dotted.to_sym] unless dotted.blank?
+        if field && field.key_relation.nil?
+          return nil
+        end
       end
       field
     end
@@ -275,6 +278,8 @@ module ScopedSearch
     # Try to parse a string as a datetime.
     # Supported formats are Today, Yesterday, Sunday, '1 day ago', '2 hours ago', '3 months ago', '4 weeks from now', 'Jan 23, 2004'
     # And many more formats that are documented in Ruby DateTime API Doc.
+    # In case Time responds to #zone, we know this is Rails environment and we can use Time.zone.parse. The benefit is that the
+    # current timezone is respected and does not have to be specified explicitly. That way even relative dates work as expected.
     def parse_temporal(value)
       return Date.current if value =~ /\btoday\b/i
       return 1.day.ago.to_date if value =~ /\byesterday\b/i
@@ -283,7 +288,12 @@ module ScopedSearch
       return (eval($1.strip.gsub(/\s+/,'.').downcase)).to_date     if value =~ /\A\s*(\d+\s+\b(?:days?|weeks?|months?|years?)\b\s+\bago)\b\s*\z/i
       return (eval($1.strip.gsub(/from\s+now/i,'from_now').gsub(/\s+/,'.').downcase)).to_datetime if value =~ /\A\s*(\d+\s+\b(?:hours?|minutes?)\b\s+\bfrom\s+now)\b\s*\z/i
       return (eval($1.strip.gsub(/from\s+now/i,'from_now').gsub(/\s+/,'.').downcase)).to_date     if value =~ /\A\s*(\d+\s+\b(?:days?|weeks?|months?|years?)\b\s+\bfrom\s+now)\b\s*\z/i
-      DateTime.parse(value, true) rescue nil
+      if Time.respond_to?(:zone) && !Time.zone.nil?
+        parsed = Time.zone.parse(value) rescue nil
+        parsed && parsed.to_datetime
+      else
+        DateTime.parse(value, true) rescue nil
+      end
     end
 
     # Returns a list of fields that should be searched on by default.

data/lib/scoped_search/version.rb

@@ -1,3 +1,3 @@
 module ScopedSearch
-  VERSION = "4.1.6"
+  VERSION = "4.1.7"
 end

data/spec/integration/auto_complete_spec.rb

@@ -17,6 +17,13 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         t.string :other_c
       end
 
+      ActiveRecord::Migration.create_table(:quxes, :force => true) do |t|
+        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|
         t.string  :string
         t.string  :another
@@ -25,6 +32,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         t.integer :int
         t.date    :date
         t.integer :unindexed
+        t.integer :qux_id
 
         if on_postgresql?
           t.uuid :uuid
@@ -37,8 +45,13 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         belongs_to :foo
       end
 
+      class ::Qux < ActiveRecord::Base
+        has_many :foos
+      end
+
       class ::Foo < ActiveRecord::Base
         has_many :bars
+        belongs_to :qux
         default_scope { order(:string) }
 
         scoped_search :on => [:string, :date, :uuid]
@@ -55,7 +68,10 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       class ::Infoo < ::Foo
       end
 
-      @foo_1 = Foo.create!(:string => 'foo', :another => 'temp 1', :explicit => 'baz', :int => 9  , :date => 'February 8, 2011' , :unindexed => 10)
+      @qux_1 = Qux.create!()
+      @qux_2 = Qux.create!()
+      @foo_1 = Foo.create!(:string => 'foo', :another => 'temp 1', :explicit => 'baz', :int => 9  , :date => 'February 8, 2011' , :unindexed => 10, :qux => @qux_1)
+      @foo_2 = Foo.create!(:string => 'foo', :another => 'temp 2', :explicit => 'baz', :int => 10  , :date => 'February 8, 2011' , :unindexed => 10, :qux => @qux_2)
       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)
       20.times { Foo.create!(:explicit => "aaa") }
@@ -242,5 +258,14 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         Foo.complete_for('int > 2').first.should match(/22/)
       end
     end
+
+    context 'autocompleting with value_filter' do
+      it 'should return filtered values' do
+        Foo.complete_for('int =', value_filter: { qux_id: @qux_1.id }).should == ['int = 9']
+      end
+      it 'should return filtered for invalid value' do
+        Foo.complete_for('int =', value_filter: { qux_id: 99 }).should == []
+      end
+    end
   end
 end

data/spec/integration/key_value_querying_spec.rb

@@ -33,6 +33,7 @@ require "spec_helper"
             has_many :keys, :through => :facts
 
             scoped_search :relation => :facts, :on => :value, :rename => :facts, :in_key => :keys, :on_key => :name, :complete_value => true
+            scoped_search :relation => :facts, :on => :value, :rename => 'myfacts.value', :aliases => ['prefixed', 'prefixed.value']
           end
           class ::MyItem < ::Item
           end
@@ -102,6 +103,20 @@ require "spec_helper"
         it "should find all bars with a fact name color and fact value gold of descendant class" do
           MyItem.search_for('facts.color = gold').first.name.should eql('barbary')
         end
+
+        describe 'with prefixed aliases' do
+          it 'should search by the prefix' do
+            Item.search_for('prefixed = green').length.should == 1
+          end
+
+          it 'should search by the full length variant' do
+            Item.search_for('prefixed.value = green').length.should == 1
+          end
+
+          it 'should not search by just any key with common prefix' do
+            proc { Item.search_for('prefixed.something_which_is_not_defined = green') }.should raise_error(ScopedSearch::QueryNotSupported)
+          end
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoped_search
 version: !ruby/object:Gem::Version
-  version: 4.1.6
+  version: 4.1.7
 platform: ruby
 authors:
 - Amos Benari
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2019-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -85,6 +85,8 @@ files:
 - Gemfile.activerecord42
 - Gemfile.activerecord50
 - Gemfile.activerecord51
+- Gemfile.activerecord52
+- Gemfile.activerecord52_with_activesupport52
 - LICENSE
 - README.rdoc
 - Rakefile