agilibox 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c47b5f9188e74619272d53f2f46dccaba3fbbdb4f36ff862a2fc42964d9272ad
-  data.tar.gz: db7e31ea1f12048dc3bee0a6483d74f54b041260372ceb9a43352dceaee3a189
+  metadata.gz: b42ef5b03fc57fe2ff9cb01ac9aaf7b784b574eafe4ee68859501e088ff39e88
+  data.tar.gz: 782675f5041b1e5b41690217b995fdcc0b1ef225ad81d25489ca0f1e9a0db5ee
 SHA512:
-  metadata.gz: 73b32e94afc159700b611ae0fb1363bcab445f5b12ad6cc89145b8ae4192581fd0977f14e94bb533cb2454b97f6286fbcd572bfdb1d10a0b4400d00f9a7de87d
-  data.tar.gz: 15636d5f9372df16d14ddfbbb076b564b25183cce1ffc80e55260e5df3e68e4d33e65d21fa471fdcf3669aa27a3f18960b94f2b029daaaafef2b2f3affe0a6ac
+  metadata.gz: 812c848c24e8e85dcf7da2b743fc7be4f2ea992fb5c77f2e352f5793e0a59b66127d07d4662f54563f879ad1061474e4e80bf6b6585ab8163f1f583cc44e699d
+  data.tar.gz: 83dfd77a0e25e0734e5294006a52def01817eb28c5fca6bddf36669454e0137cb29ff92321098890e5a95d3263dea9ac4829795a3c141ab03fecf53ad631296c

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.2.1
+
+- Fix flash partial
+- Filter by date/datetime period now allows custom periods
+- Sorter class improvements
+
 ## 1.2.0
 
 - Add `Agilibox::MiniFormObject`

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

@@ -0,0 +1,56 @@
+class Agilibox::SmallData::FilterStrategyByDateOrDatetimePeriod < ::Agilibox::SmallData::FilterStrategyByKeyValue
+  def initialize(*)
+    if self.class == Agilibox::SmallData::FilterStrategyByDateOrDatetimePeriod
+      raise "please use FilterStrategyByDatePeriod or FilterStrategyByDatetimePeriod"
+    end
+
+    super
+  end
+
+  def apply(query, value) # rubocop:disable Metrics/MethodLength
+    value = value.to_s
+
+    if value == "today"
+      a = now
+      b = now
+    elsif value == "yesterday"
+      a = (now - 1.day)
+      b = (now - 1.day)
+    elsif value == "this_week"
+      a = now.beginning_of_week
+      b = now.end_of_week
+    elsif value == "this_month"
+      a = now.beginning_of_month
+      b = now.end_of_month
+    elsif value == "this_year"
+      a = now.beginning_of_year
+      b = now.end_of_year
+    elsif value == "last_week"
+      a = (now - 1.week).beginning_of_week
+      b = (now - 1.week).end_of_week
+    elsif value == "last_month"
+      a = (now - 1.month).beginning_of_month
+      b = (now - 1.month).end_of_month
+    elsif value == "last_year"
+      a = (now - 1.year).beginning_of_year
+      b = (now - 1.year).end_of_year
+    elsif (m = value.match(/last\.([0-9]+)\.(days?|weeks?|months?|years?)/))
+      a = now - m[1].to_i.public_send(m[2])
+      b = now
+    else
+      return query
+    end
+
+    if now.is_a?(Time)
+      a = a.beginning_of_day if a
+      b = b.end_of_day       if b
+    end
+
+    column = key.is_a?(Symbol) ? "#{query.model.table_name}.#{key}" : key.to_s
+
+    query = query.where("#{column} >= ?", a) if a
+    query = query.where("#{column} <= ?", b) if b
+
+    query
+  end
+end

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

@@ -1,37 +1,5 @@
-class Agilibox::SmallData::FilterStrategyByDatePeriod < ::Agilibox::SmallData::FilterStrategyByKeyValue
-  def apply(query, value)
-    value = value.to_s
-
-    if value == "today"
-      a = Date.current
-      b = Date.current
-    elsif value == "yesterday"
-      a = (Date.current - 1.day)
-      b = (Date.current - 1.day)
-    elsif value == "this_week"
-      a = Date.current.beginning_of_week
-      b = Date.current.end_of_week
-    elsif value == "this_month"
-      a = Date.current.beginning_of_month
-      b = Date.current.end_of_month
-    elsif value == "this_year"
-      a = Date.current.beginning_of_year
-      b = Date.current.end_of_year
-    elsif value == "last_week"
-      a = (Date.current - 1.week).beginning_of_week
-      b = (Date.current - 1.week).end_of_week
-    elsif value == "last_month"
-      a = (Date.current - 1.month).beginning_of_month
-      b = (Date.current - 1.month).end_of_month
-    elsif value == "last_year"
-      a = (Date.current - 1.year).beginning_of_year
-      b = (Date.current - 1.year).end_of_year
-    else
-      return query
-    end
-
-    column = key.is_a?(Symbol) ? "#{query.model.table_name}.#{key}" : key.to_s
-
-    query.where("#{column} >= ? AND #{column} <= ?", a, b)
+class Agilibox::SmallData::FilterStrategyByDatePeriod < ::Agilibox::SmallData::FilterStrategyByDateOrDatetimePeriod
+  def now
+    Date.current
   end
 end

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

@@ -1,37 +1,5 @@
-class Agilibox::SmallData::FilterStrategyByDatetimePeriod < ::Agilibox::SmallData::FilterStrategyByKeyValue
-  def apply(query, value)
-    value = value.to_s
-
-    if value == "today"
-      a = Time.zone.now.beginning_of_day
-      b = Time.zone.now.end_of_day
-    elsif value == "yesterday"
-      a = (Time.zone.now - 1.day).beginning_of_day
-      b = (Time.zone.now - 1.day).end_of_day
-    elsif value == "this_week"
-      a = Time.zone.now.beginning_of_week
-      b = Time.zone.now.end_of_week
-    elsif value == "this_month"
-      a = Time.zone.now.beginning_of_month
-      b = Time.zone.now.end_of_month
-    elsif value == "this_year"
-      a = Time.zone.now.beginning_of_year
-      b = Time.zone.now.end_of_year
-    elsif value == "last_week"
-      a = (Time.zone.now - 1.week).beginning_of_week
-      b = (Time.zone.now - 1.week).end_of_week
-    elsif value == "last_month"
-      a = (Time.zone.now - 1.month).beginning_of_month
-      b = (Time.zone.now - 1.month).end_of_month
-    elsif value == "last_year"
-      a = (Time.zone.now - 1.year).beginning_of_year
-      b = (Time.zone.now - 1.year).end_of_year
-    else
-      return query
-    end
-
-    column = key.is_a?(Symbol) ? "#{query.model.table_name}.#{key}" : key.to_s
-
-    query.where("#{column} >= ? AND #{column} <= ?", a, b)
+class Agilibox::SmallData::FilterStrategyByDatetimePeriod < ::Agilibox::SmallData::FilterStrategyByDateOrDatetimePeriod
+  def now
+    Time.zone.now
   end
 end

data/app/sorters/agilibox/sorter.rb

@@ -3,7 +3,7 @@ class Agilibox::Sorter
 
   attr_reader :collection, :sort_param, :column, :direction
 
-  def initialize(collection, sort_param)
+  def initialize(collection, sort_param = nil)
     @collection         = collection
     @sort_param         = sort_param
     @column, @direction = sortable_column_order(sort_param.to_s)

data/app/views/agilibox/_flash.html.slim

@@ -1,4 +1,4 @@
-#flash.container
+#flash
   - flash.map do |type, message|
     - type = "success" if type == "notice"
     - type = "danger"  if type == "alert"

data/lib/agilibox/version.rb

@@ -1,3 +1,3 @@
 module Agilibox
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agilibox
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2018-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
@@ -87,6 +87,7 @@ files:
 - app/filters/agilibox/small_data/filter_strategy_by_date.rb
 - app/filters/agilibox/small_data/filter_strategy_by_date_begin.rb
 - app/filters/agilibox/small_data/filter_strategy_by_date_end.rb
+- app/filters/agilibox/small_data/filter_strategy_by_date_or_datetime_period.rb
 - app/filters/agilibox/small_data/filter_strategy_by_date_period.rb
 - app/filters/agilibox/small_data/filter_strategy_by_datetime_period.rb
 - app/filters/agilibox/small_data/filter_strategy_by_key_value.rb