agilibox 1.5.5 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d0a7833192d2c2cdd413fcd91fbeea277099a5eed266af261f42c3b64584b65
-  data.tar.gz: be55f55b5c5bc7a7158db2a35742e946b823df0d1080d7f88572cf445d45a9b5
+  metadata.gz: b89a1c4a5176d64607c6df1c179a5519858b7c7469bbbefd0d6c128ad1372e5c
+  data.tar.gz: 31e6c78eafb56b047a8c5af9df93067c3fbbd61958134e9fe36b22d56cdcf1fd
 SHA512:
-  metadata.gz: 9c7162d24df15b7c2e64ab4c15426c17f0ef39f8fc87ec9a41faa90febcd96b105cecc13662cbaf720b320b59a685897dc7d45555c650bd9034645151b3607c5
-  data.tar.gz: af43c646d359fefa89e3d9cd9212fe61e6cc33ed555a133150ffa138551347944fd1fdb4ef1bb255eda1b35d95c507f10822b1900bb0f4fee6a37c50823f7d72
+  metadata.gz: 1c01d71e66266e67e467c2359be424c6407136d15dd8fcf4eddfce790f10242d9dcb33c39e69192c8e55d87d85a58d21008ac830df418306ddd0be2eb555fa8b
+  data.tar.gz: c469f7c350ec36085b4976c728bac1713a567b163ae682b670282f4e38924c4cf7704a188151635534c4b76c3dbdc997c46b208116d18144f5c71177845d6da5

data/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Next version
 
+## 1.5.6
+- Various fixes on filters
+
 ## 1.5.5
 - Add ModelI18n::raise_on_missing_translations option
 

data/app/filters/agilibox/small_data/filter_strategy_by_date_begin.rb

@@ -1,6 +1,7 @@
 class Agilibox::SmallData::FilterStrategyByDateBegin < ::Agilibox::SmallData::FilterStrategyByKeyValue
   def apply(query, value)
     value = Time.zone.parse(value).beginning_of_day
-    query.where("#{key} >= ?", value)
+    column = column_for(query)
+    query.where("#{column} >= ?", value)
   end
 end

data/app/filters/agilibox/small_data/filter_strategy_by_date_end.rb

@@ -1,6 +1,7 @@
 class Agilibox::SmallData::FilterStrategyByDateEnd < ::Agilibox::SmallData::FilterStrategyByKeyValue
   def apply(query, value)
     value = Time.zone.parse(value).end_of_day
-    query.where("#{key} <= ?", value)
+    column = column_for(query)
+    query.where("#{column} <= ?", value)
   end
 end

data/app/filters/agilibox/small_data/filter_strategy_by_date_or_datetime_period.rb

@@ -46,7 +46,7 @@ class Agilibox::SmallData::FilterStrategyByDateOrDatetimePeriod < ::Agilibox::Sm
       b = b.end_of_day       if b
     end
 
-    column = key.is_a?(Symbol) ? "#{query.model.table_name}.#{key}" : key.to_s
+    column = column_for(query)
 
     query = query.where("#{column} >= ?", a) if a
     query = query.where("#{column} <= ?", b) if b

data/app/filters/agilibox/small_data/filter_strategy_by_key_value.rb

@@ -8,9 +8,19 @@ class Agilibox::SmallData::FilterStrategyByKeyValue < ::Agilibox::SmallData::Fil
   def apply(query, value)
     value = true  if value == "true"
     value = false if value == "false"
-    value = nil   if value == "nil"
-    value = nil   if value == "null"
 
-    query.where("#{key} = ?", value)
+    column = column_for(query)
+
+    if value.to_s.in?(%w(nil null))
+      query.where("#{column} IS NULL")
+    elsif value.to_s.in?(%w(not_nil not_null))
+      query.where("#{column} IS NOT NULL")
+    else
+      query.where("#{column} = ?", value)
+    end
+  end
+
+  def column_for(query)
+    key.is_a?(Symbol) ? "#{query.model.table_name}.#{key}" : key.to_s
   end
 end

data/app/filters/agilibox/small_data/filter_strategy_by_key_values.rb

@@ -1,16 +1,11 @@
-class Agilibox::SmallData::FilterStrategyByKeyValues < ::Agilibox::SmallData::FilterStrategy
-  attr_reader :key
-
-  def initialize(key = nil)
-    @key = key
-  end
-
+class Agilibox::SmallData::FilterStrategyByKeyValues < ::Agilibox::SmallData::FilterStrategyByKeyValue
   def apply(query, value)
     value = value.split(" ") if value.is_a?(String)
     value = value.select(&:present?)
+    column = column_for(query)
 
     if value.any?
-      query.where("#{key} IN (?)", value)
+      query.where("#{column} IN (?)", value)
     else
       query
     end

data/lib/agilibox/version.rb

@@ -1,3 +1,3 @@
 module Agilibox
-  VERSION = "1.5.5"
+  VERSION = "1.5.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agilibox
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.6
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-19 00:00:00.000000000 Z
+date: 2019-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n