datebox 0.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 987247b0d89fd90410e93d3c0474ed9872ee3fef
-  data.tar.gz: 6f5f3555c722c186ba548f13728c8e6fa3e2ef44
+  metadata.gz: 5ba421c57845a9e337de05fdd2d99cdcdba0c711
+  data.tar.gz: 5b4a07576517473b413a7fdc22a34b99a84919fe
 SHA512:
-  metadata.gz: a6edab522ecc2b28c1a0b7261e2bbb85aefc7ec95f788dc235bda73795b883686d4b59cd78d7e82d214577f7abdf86965a697cac2f806e280b9a7f8faf58f74d
-  data.tar.gz: 0d8a4330cc658a23616e899349e54be21132dca95d1271f05e4c94cbaff5b3d07e190e10cd26d7ac8ec148d2479c3c3c9d81993782c2820a1a349cb4da8a16d6
+  metadata.gz: 88524a579dae051b9270608d25d7cf0a966e8ae3d76d44d5e623fbf2e51be63d79393abb56f07d125727610194ad9d5c41631b4361fcda0818e20396bd302860
+  data.tar.gz: 364f4bddd066f02dc929c90ed528565ff1d04914d6c620507d52c14552e77cee31611ae17ee6f11c9a1dec7bd54503722d11399653815cca17347b2c4504ff15

data/lib/datebox/relative.rb

@@ -2,9 +2,11 @@ module Datebox
   class Relative
 
     @period_proc = nil
+    attr_reader :period_name
     
-    def initialize(proc)
+    def initialize(proc, name = nil)
       @period_proc = proc
+      @period_name = name
     end
 
     def to(relative_to)
@@ -25,12 +27,22 @@ module Datebox
         end
       end
 
+      def to_date(period, options = {})
+        raise "Expected one of: #{Period::PREDEFINED}" unless Period::PREDEFINED.include?(period.to_sym)
+        raise "Current doesn't make sense for parameter: #{period}" if [:day, :n_days].include?(period)
+        case period.to_sym
+          when :week then week_to_date(options)
+          when :month then month_to_date
+          when :year then year_to_date
+        end
+      end
+
       def same_day
-        new Proc.new {|relative_to| Period.new(relative_to, relative_to) }
+        new Proc.new {|relative_to| Period.new(relative_to, relative_to) }, __method__.to_s
       end
 
       def day_before
-        new Proc.new {|relative_to| Period.new(relative_to - 1, relative_to - 1) }
+        new Proc.new {|relative_to| Period.new(relative_to - 1, relative_to - 1) }, __method__.to_s
       end
       
       def last_n_days(options = {})
@@ -40,7 +52,7 @@ module Datebox
         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) }
-        new proc
+        new proc, __method__.to_s
       end
 
       def last_week(options = {})
@@ -48,7 +60,7 @@ module Datebox
         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)
-        }
+        }, __method__.to_s
       end
 
       def last_weekdays_between(start_day, end_day)
@@ -56,7 +68,7 @@ module Datebox
           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)
-        }
+        }, __method__.to_s
       end
 
       def last_weeks_weekdays_as!(*days) #this one returns array!
@@ -64,7 +76,19 @@ module Datebox
           days.map do |p|
             (relative_to.downto relative_to - 6).to_a.find { |d| d.strftime("%A") == p }
           end
-        }
+        }, __method__.to_s
+      end
+
+      def week_to_date(options = {})
+        last_weekday = options[:last_weekday] || options['last_weekday'] || 'Sunday'
+        new Proc.new { |relative_to|
+          if relative_to.strftime("%A") == last_weekday
+            Period.new(relative_to - 6, relative_to)
+          else
+            end_date = (relative_to.downto relative_to - 6).to_a.find { |d| d.strftime("%A") == last_weekday }
+            Period.new(end_date + 1, relative_to)
+          end
+        }, __method__.to_s
       end
 
       def last_month
@@ -72,14 +96,14 @@ module Datebox
           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)
-        }
+        }, __method__.to_s
       end
 
       def month_to_date
         new Proc.new { |relative_to|
           month_start = Date.parse("#{relative_to.strftime('%Y-%m')}-01")
           Period.new(month_start, relative_to)
-        }
+        }, __method__.to_s
       end
 
       def last_year
@@ -87,14 +111,14 @@ module Datebox
           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)
-        }
+        }, __method__.to_s
       end
 
       def year_to_date
         new Proc.new { |relative_to|
           year_start = Date.parse("#{relative_to.year}-01-01")
           Period.new(year_start, relative_to)
-        }
+        }, __method__.to_s
       end
 
     end

data/lib/datebox/version.rb

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

data/test/unit/test_relative.rb

@@ -26,12 +26,19 @@ class TestRelative < Test::Unit::TestCase
     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
+    # anything, past
     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')
 
+    # andything, up to date
+    assert_equal Datebox::Period.new('2015-03-15', '2015-03-21'), Datebox::Relative.to_date(:week, {:last_weekday => "Saturday"}).to('2015-03-21')
+    assert_equal Datebox::Period.new('2015-03-15', '2015-03-20'), Datebox::Relative.to_date(:week, {:last_weekday => "Saturday"}).to('2015-03-20')
+    assert_equal Datebox::Period.new('2015-03-01', '2015-03-20'), Datebox::Relative.to_date(:month).to('2015-03-20')
+    assert_equal Datebox::Period.new('2015-01-01', '2015-03-20'), Datebox::Relative.to_date(:year).to('2015-03-20')
+    assert_equal Datebox::Period.new('2015-01-01', '2015-03-20'), Datebox::Relative.year_to_date.to('2015-03-20')
+
     # the one that's different
     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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datebox
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.3.0
 platform: ruby
 authors:
 - Robert Borkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies: []
 description: Offers help with managing dates and periods
 email:
@@ -17,7 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.txt
 - Gemfile
 - LICENSE
@@ -41,17 +41,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Got fed up with implementing date related functionality everywhere