funtimes 0.2.1 → 0.3.0

data/Rakefile

@@ -10,22 +10,19 @@ begin
     gem.email = "ignu.smith@gmail.com"
     gem.homepage = "http://github.com/ignu/fun-times"
     gem.authors = ["Len Smith"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    gem.add_development_dependency "rspec", ">= 2.5.0"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/funtimes.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{funtimes}
-  s.version = "0.2.1"
+  s.name = "funtimes"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Len Smith"]
-  s.date = %q{2010-12-01}
-  s.description = %q{Manage date ranges, months and quarters}
-  s.email = %q{ignu.smith@gmail.com}
+  s.date = "2011-10-03"
+  s.description = "Manage date ranges, months and quarters"
+  s.email = "ignu.smith@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -27,34 +27,29 @@ Gem::Specification.new do |s|
     "lib/funtimes/date_range.rb",
     "lib/funtimes/month.rb",
     "lib/funtimes/quarter.rb",
+    "lib/funtimes/week.rb",
     "spec/date_range_spec.rb",
     "spec/month_spec.rb",
     "spec/quarter_spec.rb",
     "spec/spec.opts",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "spec/week_spec.rb"
   ]
-  s.homepage = %q{http://github.com/ignu/fun-times}
+  s.homepage = "http://github.com/ignu/fun-times"
   s.require_paths = ["lib"]
-  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"
-  ]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Manage date ranges, months and quarters"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<rspec>, [">= 2.5.0"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<rspec>, [">= 2.5.0"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<rspec>, [">= 2.5.0"])
   end
 end
 

data/lib/funtimes.rb

@@ -1,3 +1,4 @@
 require 'funtimes/month'
 require 'funtimes/date_range'
 require 'funtimes/quarter'
+require 'funtimes/week'

data/lib/funtimes/month.rb

@@ -1,10 +1,11 @@
 require 'date'
 require 'funtimes/date_range'
+
 class Month
   include Comparable
   include DateRange
   attr_accessor :year, :number, :start_date, :end_date
- 
+
   def self.from(date)
     Month.new(date.month, date.year)
   end
@@ -21,39 +22,38 @@ class Month
 
   def name
     @start_date.strftime("%B")
-  end 
+  end
 
   def <=> (other)
     return @year <=> other.year unless @year == other.year
     @number <=> other.number
   end
 
-  def succ 
+  def succ
     Month.from next_months_start
   end
 
-  def prev 
+  def prev
     return Month.new(12, @year-1) if (@number == 1)
     Month.new @number-1, @year
   end
-  
+
   def + (amount)
     rv = self
     amount.times {rv = rv.succ}
-    rv 
+    rv
   end
 
   def -(amount)
     rv = self
     amount.times {rv = rv.prev}
-    rv 
+    rv
   end
 
   private
 
   def next_months_start
     return DateTime.new(@year+1, 1, 1) if (@number == 12)
-    DateTime.new(@year, @number+1, 1) 
+    DateTime.new(@year, @number+1, 1)
   end
 end
-

data/lib/funtimes/week.rb

@@ -0,0 +1,32 @@
+require 'date'
+require 'funtimes/date_range'
+
+class Week
+  START_DAY = 0
+
+  include DateRange
+
+  def initialize(date)
+    start_date = get_start_date(date)
+    @start_date, @end_date = start_date, start_date + 6
+  end
+
+  def self.from(start_date)
+    Week.new start_date
+  end
+
+  def previous
+    Week.new(@start_date - 7)
+  end
+
+  def next
+    Week.new(@start_date + 7)
+  end
+
+  private
+
+    def get_start_date(date)
+      date = date -1 while date.wday != START_DAY
+      date
+    end
+end

data/spec/date_range_spec.rb

@@ -23,7 +23,7 @@ describe "DateRange" do
   end
 
   it "should count the days in the range" do
-    range.days.to_a.length.should == 31+28+31+30+31+30+5
+    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

data/spec/month_spec.rb

@@ -7,10 +7,10 @@ describe "Month" do
   it "can initialize the month of a date" do
     july.to_s.should == "July 1977"
     july.name.should == "July"
-    july.year.should == 1977 
+    july.year.should == 1977
     july.number.should == 7
-    july.start_date.should == Date.new(1977, 7, 1) 
-    july.end_date.should == Date.new(1977, 7, 31) 
+    july.start_date.should == Date.new(1977, 7, 1)
+    july.end_date.should == Date.new(1977, 7, 31)
   end
 
   it "can use the less than operator" do
@@ -29,13 +29,12 @@ describe "Month" do
     range.to_a.length.should == 7
   end
 
-  it "can add and subtract months" do 
+  it "can add and subtract months" do
     (july+1).to_s.should == "August 1977"
     (july-1).to_s.should == "June 1977"
   end
 
-  it "is a daterange" do 
+  it "is a daterange" do
     july.days.to_a.length.should == 31
   end
-
 end

data/spec/spec_helper.rb

@@ -1,9 +1,4 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'funtimes'
-require 'spec'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-  
-end
+require 'rspec'

data/spec/week_spec.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Week do
+  let(:first_week) { Week.from(DateTime.new(2011, 10, 5)) }
+
+  it "can initialize the week from a day" do
+    first_week.days.to_a.length.should == 7
+  end
+
+  it "starts the week on a sunday" do
+    first_week.days.first.should == Date.new(2011, 10, 2)
+  end
+
+  describe "#next" do
+    it "returns the next week" do
+      first_week.next.days.first.should == Date.new(2011, 10, 9)
+    end
+  end
+
+  describe "#previous" do
+    it "returns the previous week" do
+      first_week.previous.days.first.should == Date.new(2011, 9, 25)
+    end
+  end
+end

metadata

@@ -1,49 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: funtimes
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
+version: !ruby/object:Gem::Version
+  version: 0.3.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Len Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-01 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-03 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70267984884580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.0
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70267984884580
 description: Manage date ranges, months and quarters
 email: ignu.smith@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
 - LICENSE
 - README.rdoc
@@ -54,47 +40,35 @@ files:
 - lib/funtimes/date_range.rb
 - lib/funtimes/month.rb
 - lib/funtimes/quarter.rb
+- lib/funtimes/week.rb
 - spec/date_range_spec.rb
 - spec/month_spec.rb
 - spec/quarter_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
+- spec/week_spec.rb
 homepage: http://github.com/ignu/fun-times
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Manage date ranges, months and quarters
-test_files: 
-- spec/date_range_spec.rb
-- spec/month_spec.rb
-- spec/quarter_spec.rb
-- spec/spec_helper.rb
+test_files: []