date_range_covers 0.0.2 → 0.0.3

data/date_range_covers.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rails", "~> 2.3"
+  spec.add_development_dependency "activesupport", "~> 3.2"
 end

data/lib/date_range_covers/version.rb

@@ -1,3 +1,3 @@
 module DateRangeCovers
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/date_range_covers.rb

@@ -1,7 +1,6 @@
 require "date_range_covers/version"
 require 'date'
-require 'active_support'
-require 'a_date'
+require 'active_support/all'
 
 module DateRangeCovers
   class DateRange
@@ -140,21 +139,21 @@ module DateRangeCovers
       unless options.empty?
         case options[:include]
         when :both
-          s_date = ADate.beginning_of_week(s_date, beginning_of_week_day)
-          e_date = ADate.end_of_week(e_date, beginning_of_week_day)
+          s_date = s_date.beginning_of_week(beginning_of_week_day)
+          e_date = e_date.end_of_week(beginning_of_week_day)
 
-          start_of_e_week = ADate.beginning_of_week(e_date, beginning_of_week_day)
+          start_of_e_week = e_date.beginning_of_week(beginning_of_week_day)
 
           weeks << s_date unless is_covered?(s_date)         
           weeks << start_of_e_week unless is_covered?(start_of_e_week)         
 
         when :start_week
-          s_date = ADate.beginning_of_week(s_date, beginning_of_week_day)
+          s_date = s_date.beginning_of_week(beginning_of_week_day)
           weeks << s_date unless is_covered?(s_date)
 
         when :end_week 
-          e_date = ADate.end_of_week(e_date, beginning_of_week_day)
-          start_of_e_week = ADate.beginning_of_week(e_date, beginning_of_week_day)
+          e_date = e_date.end_of_week(beginning_of_week_day)
+          start_of_e_week = e_date.beginning_of_week(beginning_of_week_day)
           
           weeks << start_of_e_week unless is_covered?(start_of_e_week)         
         end
@@ -163,16 +162,16 @@ module DateRangeCovers
       #We need to iterate through every week and 
       #see if the week is wholly contained in the 
       #date range
-      bottom_of_week = ADate.beginning_of_week(s_date, beginning_of_week_day)
-      top_of_week = bottom_of_week + 6
+      bottom_of_week = s_date.beginning_of_week(beginning_of_week_day)
+      top_of_week = s_date.end_of_week(beginning_of_week_day)
 
       while bottom_of_week < e_date do
         if (s_date..e_date).include?(bottom_of_week..top_of_week)\
             and !date_range_flows_into_selected_months?(bottom_of_week, top_of_week) # if part of a week already belongs to a covered month, we should not add that week to the list
           weeks << bottom_of_week unless is_covered?(bottom_of_week)
         end
-        bottom_of_week += 7
-        top_of_week = bottom_of_week + 6
+        bottom_of_week = bottom_of_week.next_week(beginning_of_week_day)
+        top_of_week = bottom_of_week.end_of_week(beginning_of_week_day)
       end
 
       covs[:weeks] = weeks.compact.uniq.sort
@@ -259,8 +258,8 @@ module DateRangeCovers
 
       if !is_covered and covs[:weeks] and !covs[:weeks].empty?
         covs[:weeks].each do |week_date|
-          start_week = ADate.beginning_of_week(week_date, beginning_of_week_day)
-          end_week = ADate.end_of_week(week_date, beginning_of_week_day)
+          start_week = week_date.beginning_of_week(beginning_of_week_day)
+          end_week = week_date.end_of_week(beginning_of_week_day)
           is_covered = (start_week..end_week).include?(dates) ? true : false
           break if is_covered
         end

data/spec/date_range_covers_spec.rb

@@ -481,7 +481,8 @@ describe DateRangeCovers do
     context "when dates in the same week" do
       context 'when dates are the same' do
         let(:date) { Date.today }
-        let(:drange) { DateRangeCovers::DateRange.new(date, date, :sunday) }
+        let(:start_of_week) { :sunday }
+        let(:drange) { DateRangeCovers::DateRange.new(date, date, start_of_week) }
        
         context 'when include is nil' do
           let(:weeks) { drange.weeks_covered }
@@ -494,7 +495,7 @@ describe DateRangeCovers do
           let(:weeks) { drange.weeks_covered(:include => :start_week) }
           it 'should return week containing the start date' do
             weeks.should_not be_empty
-            weeks.should include ADate.beginning_of_week(date)
+            weeks.should include date.beginning_of_week(start_of_week)
           end
         end
  
@@ -502,7 +503,7 @@ describe DateRangeCovers do
           let(:weeks) { drange.weeks_covered(:include => :end_week) }
           it 'should return week containing the end date' do
             weeks.should_not be_empty
-            weeks.should include ADate.beginning_of_week(date)
+            weeks.should include date.beginning_of_week(start_of_week)
           end
         end
  
@@ -510,7 +511,7 @@ describe DateRangeCovers do
           let(:weeks) { drange.weeks_covered(:include => :both) }
           it 'should return weeks containing the start date and the end date' do
             weeks.should_not be_empty
-            weeks.should include ADate.beginning_of_week(date)
+            weeks.should include date.beginning_of_week(start_of_week)
           end
         end
      end
@@ -520,7 +521,8 @@ describe DateRangeCovers do
       context '2013-03-02(Saturday) to 2013-03-03(Sunday)' do 
         let(:start_date) { Date.parse('2013-03-02') }
         let(:end_date) { Date.parse('2013-03-03') }
-        let(:drange) { DateRangeCovers::DateRange.new(start_date, end_date, :sunday) }
+        let(:start_of_week) { :sunday }
+        let(:drange) { DateRangeCovers::DateRange.new(start_date, end_date, start_of_week) }
         
         context 'when include is nil' do
           let(:weeks) { drange.weeks_covered }
@@ -533,7 +535,7 @@ describe DateRangeCovers do
           let(:weeks) { drange.weeks_covered(:include => :start_week) }
           it 'should return beginning of start week' do
             weeks.should_not be_empty
-            weeks.should include ADate.beginning_of_week(start_date)
+            weeks.should include start_date.beginning_of_week(start_of_week)
           end
         end
  
@@ -541,7 +543,7 @@ describe DateRangeCovers do
           let(:weeks) { drange.weeks_covered(:include => :end_week) }
           it 'should return beginning of end week' do
             weeks.should_not be_empty
-            weeks.should include ADate.beginning_of_week(end_date)
+            weeks.should include end_date.beginning_of_week(start_of_week)
           end
         end
  
@@ -549,8 +551,8 @@ describe DateRangeCovers do
           let(:weeks) { drange.weeks_covered(:include => :both) }
           it 'should return beginning of start week and end week' do
             weeks.should_not be_empty
-            weeks.should include ADate.beginning_of_week(end_date)
-            weeks.should include ADate.beginning_of_week(start_date)
+            weeks.should include start_date.beginning_of_week(start_of_week)
+            weeks.should include end_date.beginning_of_week(start_of_week)
           end
         end
       end
@@ -558,12 +560,13 @@ describe DateRangeCovers do
       context '2013-03-03(Sunday) to 2013-03-09(Saturday)' do 
         let(:start_date) { Date.parse('2013-03-03') }
         let(:end_date) { Date.parse('2013-03-09') }
-        let(:drange) { DateRangeCovers::DateRange.new(start_date, end_date, :sunday) }
+        let(:start_of_week) { :sunday }
+        let(:drange) { DateRangeCovers::DateRange.new(start_date, end_date, start_of_week) }
         context 'when include is nil' do
           let(:weeks) { drange.weeks_covered }
           it 'should return week with 2013-03-03 as the date' do
             weeks.should_not be_empty
-            weeks.should include ADate.beginning_of_week(start_date)
+            weeks.should include start_date.beginning_of_week(start_of_week)
           end
         end
 
@@ -571,7 +574,7 @@ describe DateRangeCovers do
           let(:weeks) { drange.weeks_covered(:include => :start_week) }
           it 'should return beginning of start week' do
             weeks.should_not be_empty
-            weeks.should include ADate.beginning_of_week(start_date)
+            weeks.should include start_date.beginning_of_week(start_of_week)
           end
         end
  
@@ -579,7 +582,7 @@ describe DateRangeCovers do
           let(:weeks) { drange.weeks_covered(:include => :end_week) }
           it 'should return beginning of end week' do
             weeks.should_not be_empty
-            weeks.should include ADate.beginning_of_week(end_date)
+            weeks.should include end_date.beginning_of_week(start_of_week)
           end
         end
  
@@ -587,8 +590,8 @@ describe DateRangeCovers do
           let(:weeks) { drange.weeks_covered(:include => :both) }
           it 'should return beginning of start week and end week' do
             weeks.should_not be_empty
-            weeks.should include ADate.beginning_of_week(end_date)
-            weeks.should include ADate.beginning_of_week(start_date)
+            weeks.should include end_date.beginning_of_week(start_of_week)
+            weeks.should include start_date.beginning_of_week(start_of_week)
           end
         end
       end
@@ -596,13 +599,14 @@ describe DateRangeCovers do
       context '2013-03-03(Sunday) to 2013-03-10(Sunday)' do 
         let(:start_date) { Date.parse('2013-03-03') }
         let(:end_date) { Date.parse('2013-03-10') }
-        let(:drange) { DateRangeCovers::DateRange.new(start_date, end_date, :sunday) }
+        let(:start_of_week) { :sunday }
+        let(:drange) { DateRangeCovers::DateRange.new(start_date, end_date, start_of_week) }
         context 'when include is nil' do
           let(:weeks) { drange.weeks_covered }
           it 'should return week with 2013-03-03 as the date' do
             weeks.should_not be_empty
-            weeks.should include ADate.beginning_of_week(start_date)
-            weeks.should_not include ADate.beginning_of_week(end_date)
+            weeks.should include start_date.beginning_of_week(start_of_week)
+            weeks.should_not include end_date.beginning_of_week(start_of_week)
           end
         end
 
@@ -610,8 +614,8 @@ describe DateRangeCovers do
           let(:weeks) { drange.weeks_covered(:include => :start_week) }
           it 'should return beginning of start week' do
             weeks.should_not be_empty
-            weeks.should include ADate.beginning_of_week(start_date)
-            weeks.should_not include ADate.beginning_of_week(end_date)
+            weeks.should include start_date.beginning_of_week(start_of_week)
+            weeks.should_not include end_date.beginning_of_week(start_of_week)
           end
         end
  
@@ -619,8 +623,8 @@ describe DateRangeCovers do
           let(:weeks) { drange.weeks_covered(:include => :end_week) }
           it 'should return beginning of end week' do
             weeks.should_not be_empty
-            weeks.should include ADate.beginning_of_week(end_date)
-            weeks.should include ADate.beginning_of_week(start_date)
+            weeks.should include end_date.beginning_of_week(start_of_week)
+            weeks.should include start_date.beginning_of_week(start_of_week)
           end
         end
  
@@ -628,8 +632,8 @@ describe DateRangeCovers do
           let(:weeks) { drange.weeks_covered(:include => :both) }
           it 'should return beginning of start week and end week' do
             weeks.should_not be_empty
-            weeks.should include ADate.beginning_of_week(end_date)
-            weeks.should include ADate.beginning_of_week(start_date)
+            weeks.should include end_date.beginning_of_week(start_of_week)
+            weeks.should include start_date.beginning_of_week(start_of_week)
           end
         end
       end
@@ -637,7 +641,8 @@ describe DateRangeCovers do
       context '2013-03-05(Tuesday) to 2013-03-31(Sunday)' do 
         let(:start_date) { Date.parse('2013-03-05') }
         let(:end_date) { Date.parse('2013-03-31') }
-        let(:drange) { DateRangeCovers::DateRange.new(start_date, end_date, :sunday) }
+        let(:start_of_week) { :sunday }
+        let(:drange) { DateRangeCovers::DateRange.new(start_date, end_date, start_of_week) }
         context 'when include is nil' do
           let(:weeks) { drange.weeks_covered }
           it 'should return weeks of 10, 17 and 24' do
@@ -652,11 +657,11 @@ describe DateRangeCovers do
           let(:weeks) { drange.weeks_covered(:include => :start_week) }
           it 'should return beginning of start week' do
             weeks.length.should == 4
-            weeks.should include ADate.beginning_of_week(start_date)
+            weeks.should include start_date.beginning_of_week(start_of_week)
             weeks.should include Date.parse('2013-03-10')
             weeks.should include Date.parse('2013-03-17')
             weeks.should include Date.parse('2013-03-24')
-            weeks.should_not include ADate.beginning_of_week(end_date)
+            weeks.should_not include end_date.beginning_of_week(start_of_week)
           end
         end
  
@@ -664,11 +669,11 @@ describe DateRangeCovers do
           let(:weeks) { drange.weeks_covered(:include => :end_week) }
           it 'should return beginning of end week' do
             weeks.length.should == 4
-            weeks.should_not include ADate.beginning_of_week(start_date)
+            weeks.should_not include start_date.beginning_of_week(start_of_week)
             weeks.should include Date.parse('2013-03-10')
             weeks.should include Date.parse('2013-03-17')
             weeks.should include Date.parse('2013-03-24')
-            weeks.should include ADate.beginning_of_week(end_date)
+            weeks.should include end_date.beginning_of_week(start_of_week)
           end
         end
  
@@ -676,11 +681,11 @@ describe DateRangeCovers do
           let(:weeks) { drange.weeks_covered(:include => :both) }
           it 'should return beginning of start week and end week' do
             weeks.length.should == 5
-            weeks.should include ADate.beginning_of_week(start_date)
+            weeks.should include start_date.beginning_of_week(start_of_week)
             weeks.should include Date.parse('2013-03-10')
             weeks.should include Date.parse('2013-03-17')
             weeks.should include Date.parse('2013-03-24')
-            weeks.should include ADate.beginning_of_week(end_date)
+            weeks.should include end_date.beginning_of_week(start_of_week)
           end
         end
       end
@@ -690,7 +695,8 @@ describe DateRangeCovers do
   describe "#dates_covered" do
     context "when start_date and end_date are the same" do
       let(:date) { Date.today }
-      let(:drange) { DateRangeCovers::DateRange.new(date, date, :sunday) }
+      let(:start_of_week) { :sunday }
+      let(:drange) { DateRangeCovers::DateRange.new(date, date, start_of_week) }
 
       context 'when include is nil' do
         let(:dates)  { drange.dates_covered }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: date_range_covers
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Antall Fernandes
@@ -61,18 +61,18 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: activesupport
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
-        - 2
         - 3
-        version: "2.3"
+        - 2
+        version: "3.2"
   type: :development
   version_requirements: *id004
 description: The gem helps find the years, months, weeks and days covered by a date range
@@ -92,10 +92,8 @@ files:
 - README.md
 - Rakefile
 - date_range_covers.gemspec
-- lib/a_date.rb
 - lib/date_range_covers.rb
 - lib/date_range_covers/version.rb
-- spec/a_date_spec.rb
 - spec/date_range_covers_spec.rb
 homepage: ""
 licenses: 
@@ -131,5 +129,4 @@ signing_key:
 specification_version: 3
 summary: ""
 test_files: 
-- spec/a_date_spec.rb
 - spec/date_range_covers_spec.rb

data/lib/a_date.rb

@@ -1,26 +0,0 @@
-module ADate
-
-  @@DAYS_OF_WEEK = [
-    :sunday, 
-    :monday,
-    :tuesday,
-    :wednesday,
-    :thursday,
-    :friday,
-    :saturday
-  ]
-
-  def self.beginning_of_week(date, beginning_of_week_day = :sunday)
-    beginning_of_week_adj = @@DAYS_OF_WEEK.index beginning_of_week_day
-   
-    current_day_number = 0
-    current_day_number = date.wday if date.wday != 0
-    current_day_number = 7 if date.wday == 0 and beginning_of_week_adj == 1
-    
-    date = date - current_day_number + beginning_of_week_adj
-  end
-
-  def self.end_of_week(date, beginning_of_week_day = :sunday)
-    beginning_of_week(date, beginning_of_week_day) + 6
-  end
-end

data/spec/a_date_spec.rb

@@ -1,86 +0,0 @@
-require 'lib/a_date'
-require 'date'
-
-describe Date do
-  describe '#beginning_of_week and #end_of_week' do
-
-    context 'when beginning_of_week day is sunday' do
-      context 'when date is a sunday' do
-        let(:date) { Date.parse('2013-03-03') }
-
-        it 'should return 2013-03-03' do
-          ADate.beginning_of_week(date).should == date
-        end
-        
-        it 'should return 2013-03-09' do
-          ADate.end_of_week(date).should == Date.parse('2013-03-09')
-        end
-      end
- 
-      context 'when date is a monday' do
-        let(:date) { Date.parse('2013-03-04') }
-
-        it 'should return 2013-03-03' do
-          ADate.beginning_of_week(date).should == Date.parse('2013-03-03')
-        end
-        
-        it 'should return 2013-03-09' do
-          ADate.end_of_week(date).should == Date.parse('2013-03-09')
-        end
-      end
- 
-      context 'when date is a saturday' do
-        let(:date) { Date.parse('2013-03-09') }
-
-        it 'should return 2013-03-03' do
-          ADate.beginning_of_week(date).should == Date.parse('2013-03-03')
-        end
-        
-        it 'should return 2013-03-09' do
-          ADate.end_of_week(date).should == Date.parse('2013-03-09')
-        end
-      end
-    end
- 
-    context 'when beginning_of_week day is monday' do
-      context 'when date is a sunday' do
-        let(:date) { Date.parse('2013-03-03') }
-
-        it 'should return 2013-02-25' do
-          ADate.beginning_of_week(date, :monday).should == Date.parse('2013-02-25')
-        end
- 
-        it 'should return 2013-03-03' do
-          ADate.end_of_week(date, :monday).should == Date.parse('2013-03-03')
-        end
-      end
- 
-      context 'when date is a monday' do
-        let(:date) { Date.parse('2013-03-04') }
-
-        it 'should return 2013-03-04' do
-          ADate.beginning_of_week(date, :monday).should == Date.parse('2013-03-04')
-        end
-        
-        it 'should return 2013-03-10' do
-          ADate.end_of_week(date, :monday).should == Date.parse('2013-03-10')
-        end
-      end
- 
-      context 'when date is a saturday' do
-        let(:date) { Date.parse('2013-03-09') }
-
-        it 'should return 2013-03-04' do
-          ADate.beginning_of_week(date, :monday).should == Date.parse('2013-03-04')
-        end
-        
-        it 'should return 2013-03-10' do
-          ADate.end_of_week(date, :monday).should == Date.parse('2013-03-10')
-        end
-      end
-    end
-  
-  end
-end
-
-