datebox 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85d1a9e887e9af4219ad6816854c19b3142f70d0
-  data.tar.gz: 62cef3dbe4579ceb7309402f2e6917d6a1044c54
+  metadata.gz: 987247b0d89fd90410e93d3c0474ed9872ee3fef
+  data.tar.gz: 6f5f3555c722c186ba548f13728c8e6fa3e2ef44
 SHA512:
-  metadata.gz: 731f49fc4373398eb10840785606e87b904e923e2a47579da37150200f58c36901440f6a211313b08c1f630e67503986e86599a400fb24f7d3c0e4ba60de7d83
-  data.tar.gz: e26b6327ad42596463a81b8d0e6efabd59c125c1ef5239cf63e8178668981cf8ebabcce597009853b0f21b0daf6675f9d615aa0309bed995e6af3bffd930549f
+  metadata.gz: a6edab522ecc2b28c1a0b7261e2bbb85aefc7ec95f788dc235bda73795b883686d4b59cd78d7e82d214577f7abdf86965a697cac2f806e280b9a7f8faf58f74d
+  data.tar.gz: 0d8a4330cc658a23616e899349e54be21132dca95d1271f05e4c94cbaff5b3d07e190e10cd26d7ac8ec148d2479c3c3c9d81993782c2820a1a349cb4da8a16d6

data/CHANGELOG.txt

@@ -0,0 +1,4 @@
+2014-03-14 Robert Borkowski
+
+  * Version 0.2
+  * Changed Datebox::Relative methods from instance methods to class methods. This requires changes in code.

data/README.md

@@ -26,7 +26,7 @@ Allows splitting periods (returns ending dates of periods)
 
 It's also possible to calculate periods relative to given dates
 
-    period_month = Datebox::Relative.new.last_month.to('2013-07-09')
-    preiod_week = Datebox::Relative.new.last_week.to('2013-07-09')
+    period_month = Datebox::Relative.last_month.to('2013-07-09') # uses period method
+    preiod_week = Datebox::Relative.last(:week).to('2013-07-09') # uses peiod symbol
 
 It's best to have a look at code & tests

data/lib/datebox/relative.rb

@@ -1,13 +1,19 @@
 module Datebox
   class Relative
 
-      @period_proc = nil
+    @period_proc = nil
+    
+    def initialize(proc)
+      @period_proc = proc
+    end
+
+    def to(relative_to)
+      relative_to = (relative_to.is_a?(Date) ? relative_to : Date.parse(relative_to))
+      @period_proc.call relative_to
+    end
+
+    class << self
 
-      def to(relative_to)
-        relative_to = (relative_to.is_a?(Date) ? relative_to : Date.parse(relative_to))
-        @period_proc.call relative_to
-      end
-      
       def last(period, options = {})
         raise "Expected one of: #{Period::PREDEFINED}" unless Period::PREDEFINED.include?(period.to_sym)
         case period.to_sym
@@ -20,86 +26,78 @@ module Datebox
       end
 
       def same_day
-        @period_proc = Proc.new {|relative_to| Period.new(relative_to, relative_to) }
-        self
+        new Proc.new {|relative_to| Period.new(relative_to, relative_to) }
       end
 
       def day_before
-        @period_proc = Proc.new {|relative_to| Period.new(relative_to - 1, relative_to - 1) }
-        self
+        new Proc.new {|relative_to| Period.new(relative_to - 1, relative_to - 1) }
       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 = 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
+        new proc
       end
 
       def last_week(options = {})
         last_weekday = options[:last_weekday] || options['last_weekday'] || 'Sunday'
-        @period_proc = Proc.new do |relative_to|
+        new Proc.new { |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)
-        end
-        self
+        }
       end
 
       def last_weekdays_between(start_day, end_day)
-        @period_proc = Proc.new do |relative_to|
+        new Proc.new { |relative_to|
           end_date = (relative_to.downto relative_to - 6).to_a.find { |d| d.strftime("%A") == end_day }
           start_date = (end_date - 7 .. end_date).to_a.find { |d| d.strftime("%A") == start_day }
           Period.new(start_date, end_date)
-        end
-        self
+        }
       end
 
       def last_weeks_weekdays_as!(*days) #this one returns array!
-        @period_proc = Proc.new do |relative_to|
+        new Proc.new { |relative_to|
           days.map do |p|
             (relative_to.downto relative_to - 6).to_a.find { |d| d.strftime("%A") == p }
           end
-        end
-        self
+        }
       end
 
       def last_month
-        @period_proc = Proc.new do |relative_to| 
+        new Proc.new { |relative_to| 
           previous_month_start = Date.parse("#{relative_to.prev_month.strftime('%Y-%m')}-01")
           previous_month_end = previous_month_start.next_month - 1
           Period.new(previous_month_start, previous_month_end)
-        end
-        self
+        }
       end
 
       def month_to_date
-        @period_proc = Proc.new do |relative_to|
+        new Proc.new { |relative_to|
           month_start = Date.parse("#{relative_to.strftime('%Y-%m')}-01")
           Period.new(month_start, relative_to)
-        end
-        self
+        }
       end
 
       def last_year
-        @period_proc = Proc.new do |relative_to|
+        new Proc.new { |relative_to|
           previous_year_start = Date.parse("#{relative_to.prev_year.year}-01-01")
           previous_year_end = previous_year_start.next_year - 1
           Period.new(previous_year_start, previous_year_end)
-        end
-        self
+        }
       end
 
       def year_to_date
-        @period_proc = Proc.new do |relative_to|
+        new Proc.new { |relative_to|
           year_start = Date.parse("#{relative_to.year}-01-01")
           Period.new(year_start, relative_to)
-        end
-        self
+        }
       end
 
+    end
   end
   
 end

data/lib/datebox/version.rb

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

data/test/unit/test_relative.rb

@@ -4,36 +4,36 @@ class TestRelative < Test::Unit::TestCase
   
   def test_calculates_correctly
     # day
-    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
+    assert_equal [Date.parse('2013-07-07')], Datebox::Relative.same_day.to('2013-07-07').dates
+    assert_equal [Date.parse('2013-07-06')], Datebox::Relative.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')
+    assert_equal Datebox::Period.new('2014-06-01', '2014-06-30'), Datebox::Relative.last(:n_days, {:days => 30}).to('2014-06-30')
+    assert_equal Datebox::Period.new('2014-06-01', '2014-06-30'), Datebox::Relative.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({: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
+    assert_equal Datebox::Period.new('2013-07-01', '2013-07-07'), Datebox::Relative.last_week.to('2013-07-09') # tue
+    assert_equal Datebox::Period.new('2013-06-30', '2013-07-06'), Datebox::Relative.last_week({:last_weekday => "Saturday"}).to('2013-07-09') #tue
+    assert_equal Datebox::Period.new('2013-07-01', '2013-07-05'), Datebox::Relative.last_weekdays_between("Monday", "Friday").to('2013-07-09') # tue
+    assert_equal Datebox::Period.new('2013-07-08', '2013-07-09'), Datebox::Relative.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')
+    assert_equal Datebox::Period.new('2013-06-01', '2013-06-30'), Datebox::Relative.last_month.to('2013-07-09')
+    assert_equal Datebox::Period.new('2013-07-01', '2013-07-09'), Datebox::Relative.month_to_date.to('2013-07-09')
+    assert_equal Datebox::Period.new('2013-02-01', '2013-02-28'), Datebox::Relative.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')
-    assert_equal Datebox::Period.new('2013-01-01', '2013-07-09'), Datebox::Relative.new.year_to_date.to('2013-07-09')
+    assert_equal Datebox::Period.new('2012-01-01', '2012-12-31'), Datebox::Relative.last_year.to('2013-07-09')
+    assert_equal Datebox::Period.new('2013-01-01', '2013-07-09'), Datebox::Relative.year_to_date.to('2013-07-09')
 
     # 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, {:last_weekday => "Saturday"}).to('2014-02-10')
+    assert_equal Datebox::Period.new('2013-06-01', '2013-06-01'), Datebox::Relative.last(:day).to('2013-06-02')
+    assert_equal Datebox::Period.new('2013-06-01', '2013-06-30'), Datebox::Relative.last(:month).to('2013-07-09')
+    assert_equal Datebox::Period.new('2014-02-03', '2014-02-09'), Datebox::Relative.last(:week).to('2014-02-10')
+    assert_equal Datebox::Period.new('2014-02-02', '2014-02-08'), Datebox::Relative.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
+    assert_equal [Date.parse('2013-07-01'), Date.parse('2013-07-03')], Datebox::Relative.last_weeks_weekdays_as!("Monday", "Wednesday").to('2013-07-05') #fri
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datebox
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Robert Borkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies: []
 description: Offers help with managing dates and periods
 email:
@@ -18,6 +18,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.txt
 - Gemfile
 - LICENSE
 - README.md