query_filter 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3b80f6ebbda9a72dbdf5006bacf0b86df4f31d7
-  data.tar.gz: 65b0caa32fc7b1d16b04e05765a11a0609649b08
+  metadata.gz: 4b6afc4d8301e89187a25929659d0bf700393759
+  data.tar.gz: f02b574cca6bb204af006029925294da51b8ea0b
 SHA512:
-  metadata.gz: e17a1e98a36c33e1d72334a256c2b81729fded4654e0c6dc7769a0d6c18834a7af5dafa9fc6b219b67215ca0403186ff8cd47cbf8bf04e61adb9e90bd02bebee
-  data.tar.gz: 051fba31c512c8cc5a62ea1f7af59cb1047c7d4d3cc0328ca351d2c563d5ad17f29205e21f59f0e789ea45b855b2ef66fe43c131d95b4bb44bb47f223fddee14
+  metadata.gz: 907332261dafbb301d9d59ab4cf50673dcb8b4fe08ce120b4a0e42f7fa5a4d12feca5dfb95bf40adc9682e3ef81f5a83d8d5dea817b540a2bc5a33669f9406cd
+  data.tar.gz: 4fd382934f56ffcc95722d9ac05c4e02a20575f29402e197b4c1518a6b7f697c9aa3caf8dc7402a8d4096f7ce5da9ca466deef646c86934a39e1aeae972e8511

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    query_filter (0.1.7)
+    query_filter (0.1.8)
       activesupport (>= 4.0)
 
 GEM

data/README.md

@@ -94,6 +94,23 @@ This gem support next types of filter params:
     orders.created_at BETWEEN '2017-06-24 04:00:00.000000' AND '2017-07-01 03:59:59.999999'
     ```
 
+    When we have date with custom time:
+    ```ruby
+    date_range :range, format: '%m/%d/%Y %H:%M'
+
+    def date_range_range(period)
+      query.where(created_at: period.range)
+    end
+    ```
+
+    `period.range` will ignore time and always return time start_of_day and end_of_day, but the method `period.range_original` will return dates without time modification
+
+    ```ruby
+    def date_range_range(period)
+      query.where(created_at: period.range_original)
+    end
+    ```
+
 * order by
     ```ruby
       order_by :sort_column, via: :sort_mode

data/lib/query_filter/utils/date_period.rb

@@ -3,7 +3,7 @@
 module QueryFilter
   module Utils
     class DatePeriod
-      attr_reader :date_from, :date_to, :format
+      attr_reader :date_from_raw, :date_to_raw, :format
 
       TIME_FORMAT = '%Y-%m-%d %H:%M:%S'
 
@@ -11,25 +11,42 @@ module QueryFilter
         @format = (format.blank? ? QueryFilter.date_period_format : format)
         @date_from_raw = date_from
         @date_to_raw = date_to
-
-        @date_from = normalize_date(date_from).beginning_of_day
-        @date_to = normalize_date(date_to).end_of_day
       end
 
       def range
         @range ||= date_from..date_to
       end
 
+      def range_original
+        @range_original ||= date_from_original..date_to_original
+      end
+
+      def date_from
+        @date_from ||= date_from_original.beginning_of_day
+      end
+
+      def date_to
+        @date_to ||= date_to_original.end_of_day
+      end
+
+      def date_from_original
+        @date_from_original ||= normalize_date(@date_from_raw)
+      end
+
+      def date_to_original
+        @date_to_original ||= normalize_date(@date_to_raw)
+      end
+
       def title
         @title ||= to_human
       end
 
       def datefrom
-        @datefrom ||= I18n.l(@date_from, format: @format)
+        @datefrom ||= I18n.l(date_from, format: @format)
       end
 
       def dateto
-        @dateto ||= I18n.l(@date_to, format: @format)
+        @dateto ||= I18n.l(date_to, format: @format)
       end
 
       def to_param

data/lib/query_filter/version.rb

@@ -1,3 +1,3 @@
 module QueryFilter
-  VERSION = '0.1.7'.freeze
+  VERSION = '0.1.8'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: query_filter
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Igor Galeta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler