scoped_search 4.1.10 → 4.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0f6f98982cba23ec69f2b1adaf0c44832abb19adad7a347d4d78c4b0fbb63a8
-  data.tar.gz: 114ea022f87208dc89b92247687d64c2a0146119afa33f2106b69507271ba210
+  metadata.gz: 0fe5811549cf2e222ac16ea429293269abdd0734793b9e83611e76527acd905b
+  data.tar.gz: 22463f4c28a03919dc7e42cd4942dcc3d66c0291bcb087fa5ad1688492726efd
 SHA512:
-  metadata.gz: 6a87832ba5990fd45b7116d374a9c2505c7f9fcf62b4364859986ae497b2aa6d3a0890b222b1ad6c07ea999d48b25fbc42303a63cdc8ce3f4ea3a23e1f049eeb
-  data.tar.gz: a5cd950d77712004cb649261f08a8e8e04169622b346de7c3b15b422dbae7343bf8211febbdb988cf390a43c5f4794c93e820b9bc440d4cc9130d7f3146464f9
+  metadata.gz: 3e36707917762b0f2759da997bceb96b2f91b91bcbdb920d03a1738e408bc72a545e380f55bd5c35b9448d2916ac7ddb5dcc0ec623b6a36726d464ac818e15cb
+  data.tar.gz: 1b0e4c026cffd08a3851a5929dd8ee7244c041c27d282789bac19fb7af77e2b0641e8d80cf52fcf8f8318190f15c647bcdf76ac98b3576c537a65a5250ec7784

data/lib/scoped_search/definition.rb

@@ -281,13 +281,13 @@ module ScopedSearch
     # 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
-      return 1.day.from_now.to_date if value =~ /\btomorrow\b/i
+      return date_with_timezone(Date.current) if value =~ /\btoday\b/i
+      return date_with_timezone(1.day.ago) if value =~ /\byesterday\b/i
+      return date_with_timezone(1.day.from_now) if value =~ /\btomorrow\b/i
       return (eval($1.strip.gsub(/\s+/,'.').downcase)).to_datetime if value =~ /\A\s*(\d+\s+\b(?:hours?|minutes?)\b\s+\bago)\b\s*\z/i
-      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 date_with_timezone(eval($1.strip.gsub(/\s+/,'.').downcase)) 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
+      return date_with_timezone(eval($1.strip.gsub(/from\s+now/i,'from_now').gsub(/\s+/,'.').downcase)) if value =~ /\A\s*(\d+\s+\b(?:days?|weeks?|months?|years?)\b\s+\bfrom\s+now)\b\s*\z/i
       if Time.respond_to?(:zone) && !Time.zone.nil?
         parsed = Time.zone.parse(value) rescue nil
         parsed && parsed.to_datetime
@@ -334,6 +334,14 @@ module ScopedSearch
 
         search_scope
       end
+
+      # This should get called only when the relative specifiers (1 day ago and
+      # so on), this code path is only viable when Rails are available
+      def date_with_timezone(datetime)
+        date = datetime.to_date
+        return datetime unless date.respond_to?(:in_time_zone)
+        date.in_time_zone.to_datetime
+      end
     end
 
     # Registers the complete_for method within the class that is used for searching.

data/lib/scoped_search/query_builder.rb

@@ -450,7 +450,9 @@ module ScopedSearch
           field = definition.field_by_name(value)
           if field && field.set? && field.complete_value.values.include?(true)
             key = field.complete_value.map{|k,v| k if v == true}.compact.first
-            return builder.set_test(field, :eq, key, &block)
+            sql, *params = builder.set_test(field, :eq, key, &block)
+            params.each { |p| yield(:parameter, p) }
+            return sql
           end
           # Search keywords found without context, just search on all the default fields
           fragments = definition.default_fields_for(value).map do |field|
@@ -507,7 +509,7 @@ module ScopedSearch
           raise ScopedSearch::QueryNotSupported, "Field '#{lhs.value}' not recognized for searching!" unless field
 
           # see if the value passes user defined validation
-          if operator == :in
+          if [:in, :notin].include?(operator)
             rhs.value.split(',').each { |v| validate_value(field, v) }
           else
             validate_value(field, rhs.value)

data/lib/scoped_search/version.rb

@@ -1,3 +1,3 @@
 module ScopedSearch
-  VERSION = "4.1.10"
+  VERSION = "4.1.12"
 end

data/spec/integration/ordinal_querying_spec.rb

@@ -210,6 +210,12 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         @class.search_for('timestamp > "3 hours ago"').length.should == 4
       end
 
+      it "should take timezone into consideration" do
+        now = Time.now
+        expected = DateTime.new(now.year, now.month, now.day, 0, 0, 0, now.zone).utc.strftime('%Y-%m-%d %H:%M:%S')
+        @class.search_for('timestamp > yesterday').to_sql.should include(expected)
+      end
+
       it "should accept 1 week from now as date format" do
         @class.search_for('date < "1 week from now"').length.should == 6
       end

data/spec/integration/rails_helper_spec.rb

@@ -9,54 +9,54 @@ describe ScopedSearch::RailsHelper do
   let(:params) { HashWithIndifferentAccess.new(:controller => "resources", :action => "search") }
 
   it "should generate a link with the order param set" do
-    should_receive(:url_for).with(
+    should_receive(:url_for).with({
       "controller" => "resources",
       "action" => "search",
       "order" => "field ASC"
-    ).and_return("/example")
+    }).and_return("/example")
 
     sort("field")
   end
 
   it "should generate a link with order param set to alternative default sorting order" do
-    should_receive(:url_for).with(
+    should_receive(:url_for).with({
       "controller" => "resources",
       "action" => "search",
       "order" => "field DESC"
-    ).and_return("/example")
+    }).and_return("/example")
 
     sort("field", :default => "DESC")
   end
 
   it "should generate a link with the order param inverted" do
-    should_receive(:url_for).with(
+    should_receive(:url_for).with({
       "controller" => "resources",
       "action" => "search",
       "order" => "field DESC"
-    ).and_return("/example")
+    }).and_return("/example")
 
     params[:order] = "field ASC"
     sort("field")
   end
 
   it "should generate a link with other parameters retained" do
-    should_receive(:url_for).with(
+    should_receive(:url_for).with({
       "controller" => "resources",
       "action" => "search",
       "walrus" => "unicorns",
       "order" => "field ASC"
-    ).and_return("/example")
+    }).and_return("/example")
 
     params[:walrus] = "unicorns"
     sort("field")
   end
 
   it "should replace the current sorting order" do
-    should_receive(:url_for).with(
+    should_receive(:url_for).with({
       "controller" => "resources",
       "action" => "search",
       "order" => "other ASC"
-    ).and_return("/example")
+    }).and_return("/example")
 
     params[:order] = "field ASC"
     sort("other")
@@ -83,12 +83,12 @@ describe ScopedSearch::RailsHelper do
     let(:ac_params) { double('ActionController::Parameters') }
 
     it "should call to_h on passed params object" do
-      should_receive(:url_for).with(
+      should_receive(:url_for).with({
         "controller" => "resources",
         "action" => "search",
         "walrus" => "unicorns",
         "order" => "field ASC"
-      ).and_return("/example")
+      }).and_return("/example")
 
       params[:walrus] = "unicorns"
 

data/spec/integration/set_query_spec.rb

@@ -12,6 +12,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       @class = ScopedSearch::RSpec::Database.create_model(:bool => :boolean, :status => :integer) do |klass|
         klass.scoped_search :on => :bool, :complete_value => {:yes => true, :no => false}
         klass.scoped_search :on => :status, :complete_value => {:unknown => 0, :up => 1, :down => 2}
+        klass.scoped_search :on => :bool, :rename => :bool2, :complete_value => {:true => true, :false => false}
       end
     end
 
@@ -71,6 +72,11 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       it "should find two record with bool = false" do
         @class.search_for('bool != yes').length.should == 2
       end
+
+      it "should be able to search without value" do
+        @class.search_for('bool').length.should == 1
+        @class.search_for('bool2').length.should == 1
+      end
     end
   end
 end

data/spec/unit/query_builder_spec.rb

@@ -68,6 +68,8 @@ describe ScopedSearch::QueryBuilder do
 
     lambda { ScopedSearch::QueryBuilder.build_query(@definition, 'test_field ^ (1,2)') }.should_not raise_error
     lambda { ScopedSearch::QueryBuilder.build_query(@definition, 'test_field ^ (1,a)') }.should raise_error(ScopedSearch::QueryNotSupported)
+    lambda { ScopedSearch::QueryBuilder.build_query(@definition, 'test_field !^ (1,2)') }.should_not raise_error
+    lambda { ScopedSearch::QueryBuilder.build_query(@definition, 'test_field !^ (1,a)') }.should raise_error(ScopedSearch::QueryNotSupported)
   end
 
   it "should display custom error from validator" do

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: scoped_search
 version: !ruby/object:Gem::Version
-  version: 4.1.10
+  version: 4.1.12
 platform: ruby
 authors:
 - Amos Benari
 - Willem van Bergen
 - Wes Hays
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2023-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -144,7 +144,7 @@ homepage: https://github.com/wvanbergen/scoped_search/wiki
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options:
 - "--title"
 - scoped_search
@@ -165,8 +165,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Easily search you ActiveRecord models with a simple query language using
   a named scope