dm_filter 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b49e9765e8e98b0bc8ad18f24bd18a14b8ca6e807ec1743a5b6c98b84087f36
-  data.tar.gz: 1da5786d8475a5718fcc714534d8b0d6fd113ca4afca0d66c61284b085ea4a06
+  metadata.gz: 385b280f8c6d2531e62477ad4a7449039a4f815efcd0454402921f619b9855a3
+  data.tar.gz: ceae093070645ef1c9f2b555644b840d32e46c2c0cdee51f31c6d1e3a0dda36d
 SHA512:
-  metadata.gz: 0be1175f6f9983d22be4a67ed38d39fc6c7fa12797dc92a67745394fd5e603bb25911e54eef7acdcb08a3d55ff6dc40c6d923621826ade57d457fd933a4c123c
-  data.tar.gz: '054619d31f1ab1fd73373537f4f71579131d08380e77e990cc76dbbbe9124b35e8290ce294982cda5c652a5555569dd01081818039f987ba8a0360b64464cf1e'
+  metadata.gz: 42a1aa7197d06e5e21000a6d6ba101d2ea2690f9eee6dc3a16e405dbad05bbb51686bfd9ce63fe4fa994812efa2ad3304f9d5a77592a5d378dc78c84b92bda80
+  data.tar.gz: cc104e1e194a3a14ba64bb15dfd69a7aaf1388151c303b5c2a4c40f06d06b07612620703750757f69397d2ff0775ecd5bdf239f38a89dcb6b8670be0246fa69a

data/.gitignore

@@ -9,4 +9,4 @@
 /tmp/
 .byebug_history
 .rspec_status
-dm_filter-0.0.4.gem
+*.gem

data/Gemfile

@@ -6,7 +6,7 @@ gemspec
 group :test do
   gem 'activerecord'
   gem 'byebug'
-  gem 'mysql2', '>= 0.3.13', '< 0.4.0'
+  gem 'mysql2'
   gem 'rubocop'
   gem 'simplecov'
   gem 'simplecov-console'

data/lib/dm_filter.rb

@@ -9,23 +9,22 @@ module DmFilter
     def dm_get(options)
       options[:column_date] = 'created_at' unless options[:column_date].present?
 
-      from = options[:from].blank? ? Time.current : options[:from].to_datetime
-      to = options[:to].blank? ? Time.current : options[:to].to_datetime
-
       case options[:duration]
       when 'all'
         all
       when 'today'
-        where(options[:column_date] => from.beginning_of_day..to.end_of_day)
+        where(options[:column_date] => Time.current.beginning_of_day..Time.current.end_of_day)
       when 'yesterday'
-        where(options[:column_date] => from.yesterday.beginning_of_day..to.yesterday.end_of_day)
+        where(options[:column_date] => Time.current.yesterday.beginning_of_day..Time.current.yesterday.end_of_day)
       when 'this_week'
-        where(options[:column_date] => from.beginning_of_week..to.end_of_week)
+        where(options[:column_date] => Time.current.beginning_of_week..Time.current.end_of_week)
       when 'this_month'
-        where(options[:column_date] => from.beginning_of_month..to.end_of_month)
+        where(options[:column_date] => Time.current.beginning_of_month..Time.current.end_of_month)
       when 'last_month'
-        where(options[:column_date] => from.last_month.beginning_of_month..to.last_month.end_of_month)
+        where(options[:column_date] => Time.current.last_month.beginning_of_month..Time.current.last_month.end_of_month)
       when 'period', 'custom'
+        from = options[:from].blank? ? Time.current : options[:from].to_datetime
+        to = options[:to].blank? ? Time.current : options[:to].to_datetime
         where(options[:column_date] => from.beginning_of_day..to.end_of_day)
       else
         all

data/lib/dm_filter/version.rb

@@ -1,3 +1,3 @@
 module DmFilter
-  VERSION = '0.0.5'.freeze
+  VERSION = '0.0.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dm_filter
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Nujian Den Mark Meralpis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-31 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -85,6 +85,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- builds/dm_filter-0.0.5.gem
 - dm_filter.gemspec
 - lib/dm_filter.rb
 - lib/dm_filter/version.rb