date_period_parser 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2cc2b66070f88f331001dd3b95385080879170b
-  data.tar.gz: df96c926644370e4b15a5a340cc47e3bcefb50ab
+  metadata.gz: 50f01a223cc9dd3cc0aa207a58574c52c1bf8d55
+  data.tar.gz: d377682cd50e84844206f31f71f2d12615e5a1ec
 SHA512:
-  metadata.gz: ba8a5a733a4a683a4f4a3ede9ac33fe97c81350cd69ec5079bc74d36ebc1e5d5457b6cf06528c2ff9ccf6f097e0d46a8ecc4b28580a4b160440d349fb6a8e005
-  data.tar.gz: da0ed0c9deb1bd8290d27ba9582329ad30c1d590a1562f288fe0a11c6b9b474593651abad10781ec29321879ae2fe703537886119d0354a85746f0f6df3d4f74
+  metadata.gz: b025ae4f53aa7a07d64f7f40d7490e7c88663096af413e8c686a18006ceabeccb8ab4924df79192b00d589974caf02eb55733fc980f0c6e801509cf5d6c62239
+  data.tar.gz: 92d85586e7ee87b2cdec6cf7c0d99e58f2fd323f07a40e9a91dd6f314908d8a7c1a6fed0c4566bafc02d3ef1f8b7121f0f7e9130389510d4f7bba5799a041efe

data/README.md

@@ -13,7 +13,7 @@ class PostsController
   # GET /posts?period=2015-08
   def index
     date_range = DatePeriodParser.range(params["period"])
-    date_range ||= DatePeriodParser.range("today") # default
+    date_range ||= DatePeriodParser.range("current-month") # default
     @posts = Posts.where(created_at: date_range)
   end
 end
@@ -66,10 +66,10 @@ Or install it yourself as:
 
 See examples above. Currently supported are:
 
-* years  "2014"
-* months "2014-01"
-* dates  "2014-01-01"
-* shorcuts "today"
+* years  `YYYY`
+* months `YYYY-MM`
+* dates  `YYYY-MM-DD`
+* shorcuts `today`, `yesterday` and `yday`, `current-month`, `previous-month`, `current-year`, `previous-year`
 
 It currently requires the year to have 4 digits.
 

data/lib/date_period_parser.rb

@@ -58,6 +58,12 @@ module DatePeriodParser
     def parse
       case @value
       when /\Atoday\Z/                then parse_date(Date.today)
+      when /\Ayesterday\Z/            then parse_date(Date.today - 1)
+      when /\Ayday\Z/                 then parse_date(Date.today - 1)
+      when /\Acurrent-month\Z/        then parse_month(Date.today)
+      when /\Aprevious-month\Z/       then parse_month(Date.today << 1)
+      when /\Acurrent-year\Z/        then parse_year(Date.today)
+      when /\Aprevious-year\Z/       then parse_year(Date.today << 12)
       when /\A\d\d\d\d\Z/             then parse_year
       when /\A\d\d\d\d\-\d\d\Z/       then parse_month
       when /\A\d\d\d\d\-\d\d\-\d\d\Z/ then parse_date
@@ -82,20 +88,28 @@ module DatePeriodParser
       ]
     end
 
-    def parse_month
-      year, month = @value.split("-")
+    def parse_month(date = nil)
+      if date.nil?
+        year, month = @value.split("-").map(&:to_i)
+      else
+        year, month = date.year, date.month
+      end
 
-      first = DateTime.new(year.to_i, month.to_i, 1, 0, 0, 0, offset)
+      first = DateTime.new(year, month, 1, 0, 0, 0, offset)
       [
         first,
         last_date_time_of_month(first)
       ]
     end
 
-    def parse_year
-      year = @value
+    def parse_year(date = nil)
+      if date.nil?
+        year = @value.to_i
+      else
+        year = date.year
+      end
 
-      first = DateTime.new(year.to_i, 1,1,0,0,0,offset)
+      first = DateTime.new(year, 1,1,0,0,0,offset)
       [
         first,
         last_date_time_of_month(first >> 11)

data/lib/date_period_parser/version.rb

@@ -1,3 +1,3 @@
 module DatePeriodParser
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/date_period_parser_spec.rb

@@ -51,6 +51,61 @@ describe DatePeriodParser do
     assert_equal DateTime.new(t.year, t.month, t.day,23,59,59.999, "+0000"),  parse("today").last
   end
 
+  # https://en.wikipedia.org/wiki/ISO_8601#Week_dates
+  it '2015-W01' do
+  end
+
+  it '2015-Q1' do
+  end
+
+  it 'yesterday' do
+    t = Date.today - 1
+    assert_equal DateTime.new(t.year, t.month, t.day, 0, 0, 0.000, "+0000"),  parse("yesterday").first
+    assert_equal DateTime.new(t.year, t.month, t.day,23,59,59.999, "+0000"),  parse("yesterday").last
+  end
+
+  it 'yday' do
+    t = Date.today - 1
+    assert_equal DateTime.new(t.year, t.month, t.day, 0, 0, 0.000, "+0000"),  parse("yday").first
+    assert_equal DateTime.new(t.year, t.month, t.day,23,59,59.999, "+0000"),  parse("yday").last
+  end
+
+
+  it 'ytd' do
+  end
+  it 'mtd' do
+  end
+  it 'wtd' do
+  end
+
+  it 'current-month' do
+    t = Date.today
+    last = t >> 1 # same day, next month
+    last = Date.new(last.year, last.month, 1) - 1
+    assert_equal DateTime.new(t.year, t.month, 1, 0, 0, 0.000, "+0000"),        parse("current-month").first
+    assert_equal DateTime.new(t.year, t.month, last.day,23,59,59.999, "+0000"), parse("current-month").last
+  end
+
+  it 'previous-month' do
+    t = Date.today << 1
+    last = t >> 1 # same day, next month
+    last = Date.new(last.year, last.month, 1) - 1
+    assert_equal DateTime.new(t.year, t.month, 1, 0, 0, 0.000, "+0000"),        parse("previous-month").first
+    assert_equal DateTime.new(t.year, t.month, last.day,23,59,59.999, "+0000"), parse("previous-month").last
+  end
+
+  it 'current-year' do
+    t = Date.today
+    assert_equal DateTime.new(t.year,  1,  1, 0, 0, 0.000, "+0000"), parse("current-year").first
+    assert_equal DateTime.new(t.year, 12, 31,23,59,59.999, "+0000"), parse("current-year").last
+  end
+
+  it 'previous-year' do
+    t = Date.today << 12
+    assert_equal DateTime.new(t.year,  1,  1, 0, 0, 0.000, "+0000"), parse("previous-year").first
+    assert_equal DateTime.new(t.year, 12, 31,23,59,59.999, "+0000"), parse("previous-year").last
+  end
+
   describe "with offsets" do
     it '2014' do
       assert_equal DateTime.new(2014, 1, 1,  0,  0,  0.000, "+0700"),  parse("2014", "+0700").first
@@ -74,6 +129,8 @@ describe DatePeriodParser do
     end
   end
 
+
+
   it 'invalid pattern 2014-01-01-01' do
     from, to = parse("2014-01-01-01")
     assert_equal nil,  from

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: date_period_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - hasclass