funtimes 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/funtimes.gemspec

@@ -1,56 +1,54 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{funtimes}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Len Smith"]
-  s.date = %q{2010-07-25}
+  s.date = %q{2010-12-01}
   s.description = %q{Manage date ranges, months and quarters}
   s.email = %q{ignu.smith@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "funtimes.gemspec",
-     "lib/funtimes.rb",
-     "lib/funtimes/date_range.rb",
-     "lib/funtimes/month.rb",
-     "lib/funtimes/quarter.rb",
-     "spec/date_range_spec.rb",
-     "spec/month_spec.rb",
-     "spec/quarter_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "funtimes.gemspec",
+    "lib/funtimes.rb",
+    "lib/funtimes/date_range.rb",
+    "lib/funtimes/month.rb",
+    "lib/funtimes/quarter.rb",
+    "spec/date_range_spec.rb",
+    "spec/month_spec.rb",
+    "spec/quarter_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/ignu/fun-times}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Manage date ranges, months and quarters}
   s.test_files = [
     "spec/date_range_spec.rb",
-     "spec/month_spec.rb",
-     "spec/quarter_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/month_spec.rb",
+    "spec/quarter_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])

data/lib/funtimes/date_range.rb

@@ -1,5 +1,5 @@
-module DateRange 
- 
+module DateRange
+
   def days
     (_start)..(_end)
   end
@@ -15,10 +15,10 @@ module DateRange
   end
 
   def encompasses(other)
-    _start <= other.start_date && _end >= other.end_date 
+    _start <= other.start_date && _end >= other.end_date
   end
 
-  def intersects(other) 
+  def intersects(other)
     other.encompasses(self) || encompasses(other) || overlaps(other)
   end
 
@@ -30,7 +30,14 @@ module DateRange
     SimpleRange.new(_start, other.end_date)
   end
 
-  def same_range_as(other) 
+  def | (other)
+    return [] unless intersects other
+    return self if encompasses(other)
+    return other if other.encompasses(self)
+    SimpleRange.new([_start,other.start_date].min, [_end,other.end_date].max)
+  end
+
+  def same_range_as(other)
     other.start_date == _start && other.end_date == _end
   end
 
@@ -41,7 +48,7 @@ module DateRange
   end
 
   private
-   
+
   def overlaps(other)
     overlaps_left_side(other) || overlaps_right_side(other)
   end
@@ -60,7 +67,7 @@ module DateRange
     @start_date
   end
 
-  def _end 
+  def _end
     @end_date ||= end_date
     return @end_date.to_datetime if @end_date.respond_to? :to_datetime
     @end_date

data/spec/date_range_spec.rb

@@ -13,11 +13,11 @@ describe "DateRange" do
   let(:march)        { SimpleRange.new(firstOfMarch, endOfMarch)}
   let(:july)         { SimpleRange.new(firstOfJuly, endOfJuly)}
 
-  it "should be equal if start and end dates are the same" do 
-    year.same_range_as(year).should == true 
+  it "should be equal if start and end dates are the same" do
+    year.same_range_as(year).should == true
   end
 
-  it "should have the quarters in a range" do 
+  it "should have the quarters in a range" do
     year.quarters.first.number.should == 1
     year.quarters.to_a.length.should == 4
   end
@@ -25,20 +25,20 @@ describe "DateRange" do
   it "should count the days in the range" do
     range.days.to_a.length.should == 31+28+31+30+31+30+5
   end
- 
+
   it "should be able to get the number of months in a range" do
     range.months.to_a.length.should == 7
   end
 
-  describe DateRange, "intersecting dates" do 
+  describe DateRange, "intersecting dates" do
 
-    it "should tell if one date range encompasses another" do  
-      year.encompasses(march).should == true 
+    it "should tell if one date range encompasses another" do
+      year.encompasses(march).should == true
       march.encompasses(year).should == false
       march.encompasses(july).should == false
-    end 
+    end
 
-    it "should be able to tell if one date range intersects another" do 
+    it "should be able to tell if one date range intersects another" do
       year.intersects(march).should == true
       year.intersects(year).should == true
       march.intersects(year).should == true
@@ -47,28 +47,42 @@ describe "DateRange" do
       july.intersects(range).should == true
     end
 
-    it "can return the intersection" do 
+    it "can return the intersection" do
       (year & march).should == march
       (march & year).should == march
       (march & march).should == march
-      
+
       left = (range & july)
       left.start_date.should == firstOfJuly
       left.end_date.should == range.end_date
       left = (july & range)
       left.start_date.should == firstOfJuly
       left.end_date.should == range.end_date
-      
+
       (march & july).should == []
     end
 
+    it "can return the union" do
+      (year | march).should == year
+      (march | year).should == year
+      (march | march).should == march
+
+      union = (range | july)
+      union.start_date.should == range.start_date
+      union.end_date.should == endOfJuly
+      union = (july | range)
+      union.start_date.should == range.start_date
+      union.end_date.should == endOfJuly
+
+      (march | july).should == []
+    end
 
     it "can figure out the number of days in" do
       year.number_of_days_in(march).should == 30
       march.number_of_days_in(july).should == 0
     end
 
-    it "returns null collections when start or end date is not set" do 
+    it "returns null collections when start or end date is not set" do
       r = SimpleRange.new(nil, DateTime.new)
       r.months.length.should == 0
       r = SimpleRange.new(DateTime.new, nil)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: funtimes
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Len Smith
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-25 00:00:00 -04:00
+date: 2010-12-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -42,7 +45,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -62,28 +64,32 @@ homepage: http://github.com/ignu/fun-times
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Manage date ranges, months and quarters

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC