timeframe 0.0.10 → 0.0.11

data/lib/timeframe.rb

@@ -75,17 +75,6 @@ class Timeframe
     (to - from).to_i
   end
   
-  # Returns a string representation of the timeframe
-  def to_s
-    if (from.year == to.year - 1) and [from.day, from.month, to.day, to.month].uniq == [1]
-      from.year.to_s
-    elsif from.year == to.year and from.day == 1 and to.day == 1 and to.month - from.month == 1
-      "#{Date::MONTHNAMES[from.month]} #{from.year}"
-    else
-      "the period from #{from.strftime('%d %B')} to #{to.yesterday.strftime('%d %B %Y')}"
-    end
-  end
-
   # Returns true when a Date or other Timeframe is included in this Timeframe
   def include?(obj)
     # puts "checking to see if #{date} is between #{from} and #{to}" if Emitter::DEBUG
@@ -257,11 +246,16 @@ class Timeframe
     to_param
   end
   
-  # URL-friendly like "2008-10-25/2009-11-12"
+  # An ISO 8601 "time interval" like YYYY-MM-DD/YYYY-MM-DD
   def to_param
     "#{from}/#{to}"
   end
   
+  # The String representation is equivalent to its ISO 8601 form
+  def to_s
+    to_param
+  end
+  
   class << self
     def make_dates(from, to) # :nodoc:
       return from.to_date, to.to_date

data/lib/timeframe/version.rb

@@ -1,3 +1,3 @@
 class Timeframe
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

data/spec/timeframe_spec.rb

@@ -275,7 +275,7 @@ describe Timeframe do
   
   describe '#to_s' do
     it 'should not only look at month numbers when describing multi-year timeframes' do
-      Timeframe.multiyear(Date.parse('2008-01-01'), Date.parse('2010-01-01')).to_s.should == "the period from 01 January to 31 December 2009"
+      Timeframe.multiyear(Date.parse('2008-01-01'), Date.parse('2010-01-01')).to_s.should == "2008-01-01/2010-01-01"
     end
   end
 end

metadata

@@ -1,74 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: timeframe
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.11
   prerelease: 
-  version: 0.0.10
 platform: ruby
-authors: 
+authors:
 - Andy Rossmeissl
 - Seamus Abshere
 - Derek Kastner
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-22 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-05 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2162728480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: home_run
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2162728480
+- !ruby/object:Gem::Dependency
+  name: home_run
+  requirement: &2162728060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2162728060
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2162727520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.5
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2162727520
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &2162727100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *2162727100
 description: A Ruby class for describing and interacting with timeframes.
-email: 
+email:
 - andy@rossmeissl.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
 - Gemfile
@@ -81,35 +76,31 @@ files:
 - spec/spec_helper.rb
 - spec/timeframe_spec.rb
 - timeframe.gemspec
-has_rdoc: true
 homepage: http://github.com/rossmeissl/timeframe
 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 
-      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 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: timeframe
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Date intervals
-test_files: 
+test_files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/timeframe_spec.rb