datebox 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8973e5e78c939fdc2aed702c51b3569fc246db78
-  data.tar.gz: 824c632d4044104e6f9a996f11999352f4e8e397
+  metadata.gz: f867ee46d817fd7925ee67d2b7da65c77e9a0b3d
+  data.tar.gz: 765f0d7e2873bd6196baa5d2215e1c0128796f84
 SHA512:
-  metadata.gz: da95609365d0055017a0f9dbe807ae0179bddd0c8142f524c00fddc6babd03bf3d6d85a370eed12b45f5c8994e1aca2bd82f1265b9cf1cd080bfba09be82cd7b
-  data.tar.gz: e49e7a934141d7f3ba9d06000db5815792f42a7720d632595bc13dbf5187f956676a4c5e52ffc15e015beb8fd311ab03f497f6d96d30c003862bff8e764731dd
+  metadata.gz: 1ea5e6dc0cb49ac0ba631177595f1a20b84c32d2f726f0a5abfa79377f40158dcb83b92a5ff8eaadbc5ceb42f2a88c081419ebd3b13af3c9807568137b91e76d
+  data.tar.gz: 404b27cd4d7d1938ae8cc47e3df2bb6e57b8ea52a3a690b3af79f865ab8b51d6758c97cf960cc521d033e4e1e98ad7acb039cb946af5f613730049d58588c048

data/CHANGELOG.txt

@@ -1,4 +1,5 @@
-2014-03-14 Robert Borkowski
+0.4.3
+Changed behaviour of last_week to be more consistent with other last_ methods particularly on Sunday
 
-  * Version 0.2
-  * Changed Datebox::Relative methods from instance methods to class methods. This requires changes in code.
+0.2.0
+Changed Datebox::Relative methods from instance methods to class methods. This requires changes in code.

data/lib/datebox/relative.rb

@@ -3,7 +3,7 @@ module Datebox
 
     @period_proc = nil
     attr_reader :period_name
-    
+
     def initialize(proc, name = nil)
       @period_proc = proc
       @period_name = name
@@ -44,12 +44,12 @@ module Datebox
       def day_before
         new Proc.new {|relative_to| Period.new(relative_to - 1, relative_to - 1) }, __method__.to_s
       end
-      
+
       def day_apart(difference)
         new Proc.new {|relative_to| Period.new(relative_to + difference, relative_to + difference) }, __method__.to_s
       end
-      
-      def method_missing(m, *args, &block)  
+
+      def method_missing(m, *args, &block)
         if (m.to_s =~ /^day_ago_\d+$/) or (m.to_s =~ /^day_in_\d+$/)
           days = m.to_s.split('_').last.to_i
           if m.to_s =~ /^day_ago_\d+$/
@@ -62,8 +62,8 @@ module Datebox
         else
           super
         end
-      end  
-      
+      end
+
       def last_n_days(options = {})
         days = (options[:days] || options['days']).to_i
         inclusive = (options[:exclusive] || options['exclusive']) ? false : true # inclusive by default
@@ -77,6 +77,7 @@ module Datebox
       def last_week(options = {})
         last_weekday = options[:last_weekday] || options['last_weekday'] || 'Sunday'
         new Proc.new { |relative_to|
+          relative_to -= 1
           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
@@ -110,8 +111,20 @@ module Datebox
         }, __method__.to_s
       end
 
+      def same_week(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, end_date + 7)
+          end
+        }, __method__.to_s
+      end
+
       def last_month
-        new Proc.new { |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)
@@ -125,6 +138,14 @@ module Datebox
         }, __method__.to_s
       end
 
+      def same_month
+        new Proc.new { |relative_to|
+          same_month_start = Date.parse("#{relative_to.strftime('%Y-%m')}-01")
+          same_month_end = same_month_start.next_month - 1
+          Period.new(same_month_start, same_month_end)
+        }, __method__.to_s
+      end
+
       def last_year
         new Proc.new { |relative_to|
           previous_year_start = Date.parse("#{relative_to.prev_year.year}-01-01")
@@ -142,5 +163,5 @@ module Datebox
 
     end
   end
-  
-end
+
+end

data/lib/datebox/version.rb

@@ -1,3 +1,3 @@
 module Datebox
-  VERSION = "0.4.1"
+  VERSION = "0.4.3"
 end

data/test/unit/test_relative.rb

@@ -5,7 +5,7 @@ class TestRelative < Test::Unit::TestCase
   def test_gives_back_correct_period_name_in_proc
     assert_equal :day_in_19, Datebox::Relative.day_in_19.period_name
   end
-  
+
   def test_calculates_correctly
     # day
     assert_equal [Date.parse('2013-07-07')], Datebox::Relative.same_day.to('2013-07-07').dates
@@ -24,6 +24,7 @@ class TestRelative < Test::Unit::TestCase
     # week
     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('2015-10-26', '2015-11-01'), Datebox::Relative.last_week.to('2015-11-08') # sun
     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
 
@@ -51,6 +52,13 @@ class TestRelative < Test::Unit::TestCase
 
     # 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
+
+    assert_equal Datebox::Period.new('2015-11-02', '2015-11-08'), Datebox::Relative.same_week.to('2015-11-02') # mon
+    assert_equal Datebox::Period.new('2015-11-02', '2015-11-08'), Datebox::Relative.same_week.to('2015-11-03') # tue
+    assert_equal Datebox::Period.new('2015-11-02', '2015-11-08'), Datebox::Relative.same_week.to('2015-11-08') # sun
+
+
+    assert_equal Datebox::Period.new('2015-11-01', '2015-11-30'), Datebox::Relative.same_month.to('2015-11-30')
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datebox
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Robert Borkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2017-09-12 00:00:00.000000000 Z
 dependencies: []
 description: Offers help with managing dates and periods
 email:
@@ -51,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Got fed up with implementing date related functionality everywhere