query_filter 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ff61e6a1116f9f3945907c8369903c79828ed79
-  data.tar.gz: 907e50842ca587c954365f506905a78bd255bd69
+  metadata.gz: 3be0d7ad318960b8718eb59befce928685961643
+  data.tar.gz: a78a2e95239421f221293bd64539c2b7112e1dbb
 SHA512:
-  metadata.gz: 37d2d592b08101e2fdc405ed6a4f1181796af6959d69d73e999c6b4b459011e9dd2c52d01bffe443b7b224a9213e5ae688edf326dfe9e3c64e390f92e53aa068
-  data.tar.gz: f25f30ed5d2e8226e5185c46b37e7652dfe3928bcb3dc45e7bf237168f85af76c0a46bc0ef0fc65f0bdd008c8798e81e4a283c46f1b2684beefbfbc51198f654
+  metadata.gz: f0a67510e6629f6f188c388ecdcdb70adf8527f2f43a14a23d4c364e6805dfc9a9d6f9a7092e98008c1c1df6b188aedd2e0a6a3fd006fd90f69d0387ce0e032d
+  data.tar.gz: 929fdde8fb5003292a4eb85d3af88d3eb361ba9628abcdfc89e27d75cb8658a39bf96639cdce79727b53a89718d7a5b2c8cae3c7316c2986c73419302ebf786c

data/Gemfile.lock

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

data/README.md

@@ -173,6 +173,21 @@ class OrderFilter < QueryFilter::Base
 end
 ```
 
+### Configuration
+
+You can set up some options in general
+
+```ruby
+# config/initializers/query_filter.rb
+QueryFilter.setup do |config|
+  # Date period format, by default: %m/%d/%Y
+  config.date_period_format = '%d-%m-%Y'
+
+  # Splitter to parse date period values, by default 'to'
+  config.date_period_splitter = 'until'
+end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/query_filter.rb

@@ -21,4 +21,23 @@ module QueryFilter
     autoload :ScopeRange, 'query_filter/utils/scope_range'
     autoload :UserConditions, 'query_filter/utils/user_conditions'
   end
+
+  # Configurable date period format
+  mattr_accessor :date_period_format
+  self.date_period_format = '%m/%d/%Y'
+
+  # Splitter to parse date period values
+  mattr_accessor :date_period_splitter
+  self.date_period_splitter = 'to'
+
+  # Default way to setup QueryFilter
+  # @example
+  #   QueryFilter.setup do |config|
+  #     config.date_period_format = '%d-%m-%Y'
+  #     config.date_period_splitter = 'until'
+  #   end
+  #
+  def self.setup
+    yield self
+  end
 end

data/lib/query_filter/utils/date_period.rb

@@ -1,46 +1,79 @@
-module QueryFilter::Utils
-  class DatePeriod
-    attr_reader :date_from, :date_to, :format
-
-    SPLITTER = 'to'.freeze
-    DATE_FORMAT = '%m/%d/%Y'.freeze
-
-    def initialize(date_from = nil, date_to = nil, format = nil)
-      @format = format || DATE_FORMAT
-      @default = (date_from.blank? && date_to.blank?)
-      @date_from = normalize_date(date_from || Time.zone.now).beginning_of_day
-      @date_to = normalize_date(date_to || Time.zone.now).end_of_day
-    end
+# frozen_string_literal: true
 
-    def range
-      @range ||= date_from..date_to
-    end
+module QueryFilter
+  module Utils
+    class DatePeriod
+      attr_reader :date_from, :date_to, :format
 
-    def default?
-      @default
-    end
+      TIME_FORMAT = '%Y-%m-%d %H:%M:%S'
 
-    def self.parse_from_string(value, format = DATE_FORMAT)
-      return value if value.is_a?(DatePeriod)
+      def initialize(date_from = nil, date_to = nil, format = nil)
+        @format = (format.blank? ? QueryFilter.date_period_format : format)
+        @date_from_raw = date_from
+        @date_to_raw = date_to
 
-      if value.blank?
-        new(nil, nil, format)
-      else
-        dates = value.to_s.split(SPLITTER).map(&:strip)
-        new(dates.first, dates.last, format)
+        @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 title
+        @title ||= to_human
+      end
+
+      def datefrom
+        @datefrom ||= I18n.l(@date_from, format: @format)
+      end
+
+      def dateto
+        @dateto ||= I18n.l(@date_to, format: @format)
+      end
+
+      def to_param
+        [datefrom, dateto].join(QueryFilter.date_period_splitter)
+      end
+
+      def to_human
+        [datefrom, dateto].join(" #{QueryFilter.date_period_splitter} ")
+      end
+
+      def default?
+        @date_from_raw.blank? && @date_to_raw.blank?
+      end
+
+      def as_json(options = nil)
+        {
+          date_from: datefrom,
+          date_to: dateto
+        }.merge(options || {})
+      end
+
+      def self.parse_from_string(value, format = nil)
+        return value if value.is_a?(DatePeriod)
+
+        if value.blank?
+          new(nil, nil, format)
+        else
+          dates = value.to_s.split(QueryFilter.date_period_splitter).map(&:strip)
+          new(dates[0], dates[1], format)
+        end
       end
-    end
 
-    private
+      private
 
-    def normalize_date(date)
-      return date if date.is_a?(Time) || date.is_a?(DateTime)
+      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('%Y-%m-%d %H:%M:%S'))
-      rescue StandardError => _e
-        Time.zone.today
+        begin
+          time = DateTime.strptime(date, @format)
+          Time.zone.parse(time.strftime(TIME_FORMAT))
+        rescue ArgumentError => _e
+          Time.zone.today
+        end
       end
     end
   end

data/lib/query_filter/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: query_filter
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Igor Galeta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler