datebox 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 534c7045625091172d8375d28ad40df3da50fda6
-  data.tar.gz: ff7ce2e3dca7fb342c1427b68d0e16f66b0ba7ab
+  metadata.gz: a8f9797007395a67f85af5df4b2772f8cd19e261
+  data.tar.gz: bfe77be8897b4cd70ce2d84ca87c1c28843f034c
 SHA512:
-  metadata.gz: 1780507857dd3e510748945757e95b5231280f786b0d3060c372369497e426bd5743599b1b5ad2f85d3d196a9a7fc1a995bfd6af6591e9414884c64d4af3d6d9
-  data.tar.gz: 045aa40f4ab00fab930882380dd2ac16651fb72dace765a128fee17e10067627ea5c7c0129baef20bc4147d3429b065487a6ce924f212a4d49937ed83706da4a
+  metadata.gz: c9adf391fdc13d71f26192c9ed439b904dbb4d306961fb42e4ca2e1aa019ecaf7087a8457fc60dcfc1c899c8560e0e9aa134158154e9c5f49c7f0f3700457474
+  data.tar.gz: 9636eb62528967d2052ecc8e5f1c3e86213d4e20f3799c6aac25c3219901a7820b6522a826bbcb852a75f7520ec2c504d876d8fc330545c4de6cdb8b40ca0dde

data/lib/datebox/period.rb

@@ -23,8 +23,11 @@ module Datebox
     class << self
       def split_dates(start_date, end_date, period, options = {})
         return (start_date..end_date).to_a if period == "day"
-        return split_weekly_dates(start_date, end_date, options) if period == "week"
         return split_monthly_dates(start_date, end_date) if period == "month"
+        if period =~ /week/
+          return split_weekly_dates(start_date, end_date, options.merge({last_weekday: "Saturday"})) if period == "week_ss"
+          return split_weekly_dates(start_date, end_date, options)
+        end
       end
 
       def split_weekly_dates(start_date, end_date, options = {})

data/lib/datebox/relative.rb

@@ -10,11 +10,13 @@ module Datebox
       end
       
       def last(period)
-        periods = [:day, :week, :month, :year]
+        periods = [:day, :week, :week_ms, :week_ss, :month, :year] # week monday-sunday & week sunday-saturday
         raise "Expected one of: #{periods}" unless periods.include?(period)
         case period
           when :day then day_before
           when :week then last_week
+          when :week_ms then last_week
+          when :week_ss then last_week("Saturday")
           when :month then last_month
           when :year then last_year
         end

data/lib/datebox/version.rb

@@ -1,3 +1,3 @@
 module Datebox
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/unit/test_period.rb

@@ -10,6 +10,7 @@ class TestPeriod < Test::Unit::TestCase
     assert_equal [], Datebox::Period.split_dates(Date.parse("2013-06-15"), Date.parse("2013-06-22"), "week") #sat to sat
     assert_equal [Date.parse("2013-06-23")], Datebox::Period.split_dates(Date.parse("2013-06-14"), Date.parse("2013-06-27"), "week") #fri to thu
     assert_equal [Date.parse("2013-06-23")], Datebox::Period.split_dates(Date.parse("2013-06-17"), Date.parse("2013-06-23"), "week") #mon to sun
+    assert_equal [Date.parse("2014-02-15")], Datebox::Period.split_dates(Date.parse("2014-02-09"), Date.parse("2014-02-15"), "week_ss") #sun to sat
     assert_equal [Date.parse("2013-06-16"), Date.parse("2013-06-23")], Datebox::Period.split_dates(Date.parse("2013-06-10"), Date.parse("2013-06-27"), "week") #mon to thu
     #month
     assert_equal [], Datebox::Period.split_dates(Date.parse("2013-01-02"), Date.parse("2013-01-31"), "month")

data/test/unit/test_relative.rb

@@ -9,6 +9,7 @@ class TestRelative < Test::Unit::TestCase
 
     # week
     assert_equal Datebox::Period.new('2013-07-01', '2013-07-07'), Datebox::Relative.new.last_week.to('2013-07-09') #tue
+    assert_equal Datebox::Period.new('2013-06-30', '2013-07-06'), Datebox::Relative.new.last_week("Saturday").to('2013-07-09') #tue
     assert_equal Datebox::Period.new('2013-07-01', '2013-07-05'), Datebox::Relative.new.last_weekdays_between("Monday", "Friday").to('2013-07-09') #tue
     assert_equal Datebox::Period.new('2013-07-08', '2013-07-09'), Datebox::Relative.new.last_weekdays_between("Monday", "Tuesday").to('2013-07-09') #tue
 
@@ -23,6 +24,8 @@ class TestRelative < Test::Unit::TestCase
     # anything
     assert_equal Datebox::Period.new('2013-06-01', '2013-06-01'), Datebox::Relative.new.last(:day).to('2013-06-02')
     assert_equal Datebox::Period.new('2013-06-01', '2013-06-30'), Datebox::Relative.new.last(:month).to('2013-07-09')
+    assert_equal Datebox::Period.new('2014-02-03', '2014-02-09'), Datebox::Relative.new.last(:week).to('2014-02-10')
+    assert_equal Datebox::Period.new('2014-02-02', '2014-02-08'), Datebox::Relative.new.last(:week_ss).to('2014-02-10')
 
     # the one that's different
     assert_equal [Date.parse('2013-07-01'), Date.parse('2013-07-03')], Datebox::Relative.new.last_weeks_weekdays_as!("Monday", "Wednesday").to('2013-07-05') #fri

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datebox
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Robert Borkowski