query_filter 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3be0d7ad318960b8718eb59befce928685961643
-  data.tar.gz: a78a2e95239421f221293bd64539c2b7112e1dbb
+  metadata.gz: 771bf13989125a877c71bcd021ff7c62e2305beb
+  data.tar.gz: e025be80ed04257e7cda86b7ebdbde529fa10831
 SHA512:
-  metadata.gz: f0a67510e6629f6f188c388ecdcdb70adf8527f2f43a14a23d4c364e6805dfc9a9d6f9a7092e98008c1c1df6b188aedd2e0a6a3fd006fd90f69d0387ce0e032d
-  data.tar.gz: 929fdde8fb5003292a4eb85d3af88d3eb361ba9628abcdfc89e27d75cb8658a39bf96639cdce79727b53a89718d7a5b2c8cae3c7316c2986c73419302ebf786c
+  metadata.gz: 89074e901c443dc535ff7ccea18b85376ad552bd590ed0a6a2632facd230abd164040b8debdd789278f786b1c035a738cd897ea3c564eb754104e1191792615c
+  data.tar.gz: b2e68c03728bea9f0b818bc5d87404ab67273ef065bc29a5c398fdc5879e472d57322766b4b07343ba0f1ef02c893621a9c7624d5f9f8a613e9be85c15d8cffe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    query_filter (0.1.5)
+    query_filter (0.1.6)
       activesupport (>= 4.0)
 
 GEM
@@ -94,4 +94,4 @@ DEPENDENCIES
   sqlite3 (~> 1.3, >= 1.3.13)
 
 BUNDLED WITH
-   1.15.1
+   1.15.3

data/lib/query_filter.rb

@@ -17,6 +17,7 @@ module QueryFilter
   end
 
   module Utils
+    autoload :DateNormalizer, 'query_filter/utils/date_normalizer'
     autoload :DatePeriod, 'query_filter/utils/date_period'
     autoload :ScopeRange, 'query_filter/utils/scope_range'
     autoload :UserConditions, 'query_filter/utils/user_conditions'

data/lib/query_filter/utils/date_normalizer.rb

@@ -0,0 +1,46 @@
+module QueryFilter
+  module Utils
+    class DateNormalizer
+      TIME_FORMAT = '%Y-%m-%d %H:%M:%S'
+      PG_MIN_YEAR = -4713
+      PG_MAX_YEAR = 294276
+
+      attr_reader :date, :format
+
+      def initialize(date, format)
+        @date = date
+        @format = format
+        @parsed_value = parse
+      end
+
+      def normalize
+        valid?(@parsed_value) ? @parsed_value : default_date
+      end
+
+      private
+
+      def date?
+        date.is_a?(Time) || date.is_a?(DateTime)
+      end
+
+      def valid?(value)
+        return false unless Date.valid_date?(value.year, value.month, value.day)
+
+        value.year > PG_MIN_YEAR && value.year < PG_MAX_YEAR
+      end
+
+      def parse
+        return date if date?
+
+        time = DateTime.strptime(date, format)
+        Time.zone.parse(time.strftime(TIME_FORMAT))
+      rescue StandardError => _e
+        default_date
+      end
+
+      def default_date
+        Time.zone.today
+      end
+    end
+  end
+end

data/lib/query_filter/utils/date_period.rb

@@ -65,15 +65,7 @@ module QueryFilter
       private
 
       def normalize_date(date)
-        return date if date.is_a?(Time) || date.is_a?(DateTime)
-        return Time.zone.today if date.blank?
-
-        begin
-          time = DateTime.strptime(date, @format)
-          Time.zone.parse(time.strftime(TIME_FORMAT))
-        rescue ArgumentError => _e
-          Time.zone.today
-        end
+        QueryFilter::Utils::DateNormalizer.new(date, @format).normalize
       end
     end
   end

data/lib/query_filter/version.rb

@@ -1,3 +1,3 @@
 module QueryFilter
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.1.6'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: query_filter
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Igor Galeta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -162,6 +162,7 @@ files:
 - lib/query_filter/rules/range.rb
 - lib/query_filter/rules/scope.rb
 - lib/query_filter/rules/splitter_range.rb
+- lib/query_filter/utils/date_normalizer.rb
 - lib/query_filter/utils/date_period.rb
 - lib/query_filter/utils/scope_range.rb
 - lib/query_filter/utils/user_conditions.rb