datebox 0.0.4 → 0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8f9797007395a67f85af5df4b2772f8cd19e261
-  data.tar.gz: bfe77be8897b4cd70ce2d84ca87c1c28843f034c
+  metadata.gz: 85d1a9e887e9af4219ad6816854c19b3142f70d0
+  data.tar.gz: 62cef3dbe4579ceb7309402f2e6917d6a1044c54
 SHA512:
-  metadata.gz: c9adf391fdc13d71f26192c9ed439b904dbb4d306961fb42e4ca2e1aa019ecaf7087a8457fc60dcfc1c899c8560e0e9aa134158154e9c5f49c7f0f3700457474
-  data.tar.gz: 9636eb62528967d2052ecc8e5f1c3e86213d4e20f3799c6aac25c3219901a7820b6522a826bbcb852a75f7520ec2c504d876d8fc330545c4de6cdb8b40ca0dde
+  metadata.gz: 731f49fc4373398eb10840785606e87b904e923e2a47579da37150200f58c36901440f6a211313b08c1f630e67503986e86599a400fb24f7d3c0e4ba60de7d83
+  data.tar.gz: e26b6327ad42596463a81b8d0e6efabd59c125c1ef5239cf63e8178668981cf8ebabcce597009853b0f21b0daf6675f9d615aa0309bed995e6af3bffd930549f

data/lib/datebox/period.rb

@@ -2,6 +2,8 @@ module Datebox
   class Period
     attr_reader :from, :to
     
+    PREDEFINED = [:day, :n_days, :week, :month, :year]
+    
     def initialize(from, to)
       @from = from.is_a?(Date) ? from : Date.parse(from)
       @to = to.is_a?(Date) ? to : Date.parse(to)
@@ -17,21 +19,34 @@ module Datebox
     end
     
     def split_dates(period, options = {})
-      self.class.split_dates(from, to, period, options)
+      raise "Expected one of: #{Period::PREDEFINED}" unless Period::PREDEFINED.include?(period.to_sym)
+      self.class.split_dates(from, to, period.to_sym, options)
     end
 
     class << self
       def split_dates(start_date, end_date, period, options = {})
-        return (start_date..end_date).to_a if period == "day"
-        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)
+        period = period.to_sym
+        
+        return (start_date..end_date).to_a                        if period == :day
+        return split_days_dates(start_date, end_date, options)    if period == :n_days
+        return split_weekly_dates(start_date, end_date, options)  if period == :week
+        return split_monthly_dates(start_date, end_date)          if period == :month
+        return split_yearly_dates(start_date, end_date)           if period == :year
+      end
+
+      def split_days_dates(start_date, end_date, options = {})
+        days = options[:days] || options['days']
+        raise "days must be specified" if days.nil?
+        
+        end_dates = []
+        (start_date..end_date).to_a.reverse.each_slice(days) do |range|
+          end_dates << range.first
         end
+        end_dates.sort
       end
 
       def split_weekly_dates(start_date, end_date, options = {})
-        last_weekday = options[:last_weekday] || "Sunday"
+        last_weekday = options[:last_weekday] || options['last_weekday'] || 'Sunday'
         end_dates = []
         end_of_week = (end_date.downto end_date - 6).to_a.find { |d| d.strftime("%A") == last_weekday }
         while end_of_week - 6 >= start_date
@@ -40,7 +55,7 @@ module Datebox
         end
         end_dates.sort
       end
-
+      
       def split_monthly_dates(start_date, end_date)
         end_dates = []
         beginning_of_month = ::Date.parse("#{end_date.year}-#{end_date.month}-01").next_month
@@ -52,6 +67,18 @@ module Datebox
         end
         end_dates.sort
       end
+
+      def split_yearly_dates(start_date, end_date)
+        end_dates = []
+        beginning_of_year = ::Date.parse("#{end_date.year}-01-01").next_year
+        end_of_year = (beginning_of_year - 1 == end_date) ? end_date : beginning_of_year.prev_year - 1
+        while beginning_of_year.prev_year >= start_date
+          end_dates << end_of_year
+          beginning_of_year = ::Date.parse("#{end_of_year.year}-01-01")
+          end_of_year =  beginning_of_year - 1
+        end
+        end_dates.sort
+      end
     end
 
   end

data/lib/datebox/relative.rb

@@ -1,7 +1,6 @@
 module Datebox
   class Relative
 
-      @period = nil
       @period_proc = nil
 
       def to(relative_to)
@@ -9,14 +8,12 @@ module Datebox
         @period_proc.call relative_to
       end
       
-      def last(period)
-        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
+      def last(period, options = {})
+        raise "Expected one of: #{Period::PREDEFINED}" unless Period::PREDEFINED.include?(period.to_sym)
+        case period.to_sym
           when :day then day_before
-          when :week then last_week
-          when :week_ms then last_week
-          when :week_ss then last_week("Saturday")
+          when :n_days then last_n_days(options)
+          when :week then last_week(options)
           when :month then last_month
           when :year then last_year
         end
@@ -31,8 +28,19 @@ module Datebox
         @period_proc = Proc.new {|relative_to| Period.new(relative_to - 1, relative_to - 1) }
         self
       end
+      
+      def last_n_days(options = {})
+        days = (options[:days] || options['days']).to_i
+        inclusive = (options[:exclusive] || options['exclusive']) ? false : true # inclusive by default
+        days = 1 if days.nil? || days <= 0 # days should always > 0 since it only return last x days
+        @period_proc = inclusive ?
+          Proc.new {|relative_to| Period.new(relative_to - days + 1, relative_to) } :
+          Proc.new {|relative_to| Period.new(relative_to - days, relative_to - 1) }
+        self
+      end
 
-      def last_week(last_weekday = "Sunday")
+      def last_week(options = {})
+        last_weekday = options[:last_weekday] || options['last_weekday'] || 'Sunday'
         @period_proc = Proc.new do |relative_to|
           end_date = (relative_to.downto relative_to - 6).to_a.find { |d| d.strftime("%A") == last_weekday }
           Period.new(end_date - 6, end_date)

data/lib/datebox/version.rb

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

data/test/unit/test_period.rb

@@ -6,17 +6,20 @@ class TestPeriod < Test::Unit::TestCase
     #day
     assert_equal [Date.today - 1], Datebox::Period.split_dates(Date.today - 1, Date.today - 1, "day")
     assert_equal [Date.today - 3, Date.today - 2, Date.today - 1], Datebox::Period.split_dates(Date.today - 3, Date.today - 1, "day")
+
     #week
     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("2014-02-15")], Datebox::Period.split_dates(Date.parse("2014-02-09"), Date.parse("2014-02-15"), "week", {:last_weekday => "Saturday"}) #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")
     assert_equal [Date.parse("2013-01-31")], Datebox::Period.split_dates(Date.parse("2013-01-01"), Date.parse("2013-01-31"), "month")
     assert_equal [Date.parse("2013-01-31")], Datebox::Period.split_dates(Date.parse("2012-12-02"), Date.parse("2013-02-02"), "month")
     assert_equal [Date.parse("2013-01-31"), Date.parse("2013-02-28")], Datebox::Period.split_dates(Date.parse("2012-12-10"), Date.parse("2013-03-03"), "month")
+
     #instance method test
     assert_equal [Date.parse("2013-06-16"), Date.parse("2013-06-23")], Datebox::Period.new("2013-06-10", "2013-06-27").split_dates("week") #mon to thu
   end

data/test/unit/test_relative.rb

@@ -7,15 +7,20 @@ class TestRelative < Test::Unit::TestCase
     assert_equal [Date.parse('2013-07-07')], Datebox::Relative.new.same_day.to('2013-07-07').dates
     assert_equal [Date.parse('2013-07-06')], Datebox::Relative.new.day_before.to('2013-07-07').dates
 
+    # n days
+    assert_equal Datebox::Period.new('2014-06-01', '2014-06-30'), Datebox::Relative.new.last(:n_days, {:days => 30}).to('2014-06-30')
+    assert_equal Datebox::Period.new('2014-06-01', '2014-06-30'), Datebox::Relative.new.last(:n_days, {days: 30, exclusive: true}).to('2014-07-01')
+
     # 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-06-30', '2013-07-06'), Datebox::Relative.new.last_week({:last_weekday => "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
 
     # month
     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('2013-07-01', '2013-07-09'), Datebox::Relative.new.month_to_date.to('2013-07-09')
+    assert_equal Datebox::Period.new('2013-02-01', '2013-02-28'), Datebox::Relative.new.last(:month).to('2013-03-02')
 
     # year
     assert_equal Datebox::Period.new('2012-01-01', '2012-12-31'), Datebox::Relative.new.last_year.to('2013-07-09')
@@ -25,7 +30,7 @@ class TestRelative < Test::Unit::TestCase
     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')
+    assert_equal Datebox::Period.new('2014-02-02', '2014-02-08'), Datebox::Relative.new.last(:week, {:last_weekday => "Saturday"}).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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datebox
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: '0.1'
 platform: ruby
 authors:
 - Robert Borkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies: []
 description: Offers help with managing dates and periods
 email: