timeframe 0.0.6 → 0.0.7

data/Rakefile

@@ -11,9 +11,7 @@ begin
     gem.homepage = "http://github.com/rossmeissl/timeframe"
     gem.authors = ["Andy Rossmeissl", "Seamus Abshere", "Derek Kastner"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_dependency 'activesupport', '>=2.3.8'
-    gem.add_dependency 'to_json_fix', '>=0.0.1'
-    gem.add_dependency 'andand'
+    gem.add_dependency 'activesupport', '>=2.3.5'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/timeframe.rb

@@ -6,12 +6,9 @@ require 'active_support/version'
   active_support/core_ext/date/conversions
   active_support/core_ext/integer/time
   active_support/core_ext/numeric/time
-  active_support/json/encoding
 }.each do |active_support_3_requirement|
   require active_support_3_requirement
 end if ActiveSupport::VERSION::MAJOR == 3
-require 'andand'
-require 'to_json_fix'
 require 'timeframe/ykk'
 
 # Encapsulates a timeframe between two dates. The dates provided to the class are always until the last date. That means
@@ -54,8 +51,8 @@ class Timeframe
       to   = Date.new(year+1, 1, 1)
     end
 
-    from ||= args.shift.andand.to_date
-    to ||= args.shift.andand.to_date
+    from = args.shift.to_date if from.nil? and args.any?
+    to = args.shift.to_date if to.nil? and args.any?
 
     raise ArgumentError, "Please supply a start and end date, `#{args.map(&:inspect).to_sentence}' is not enough" if from.nil? or to.nil?
     raise ArgumentError, "Start date #{from} should be earlier than end date #{to}" if from > to
@@ -248,7 +245,6 @@ class Timeframe
   end
   
   # Just a string that can be processed by Timeframe.interval... identical to #to_param
-  # accepts multiple arguments because of disagreements between active_support/json and json gem
   def to_json(*)
     to_param
   end
@@ -259,6 +255,10 @@ class Timeframe
   end
   
   class << self
+    def make_dates(from, to) # :nodoc:
+      return from.to_date, to.to_date
+    end
+    
     # Shortcut method to return the Timeframe representing the current year (as defined by Time.now)
     def this_year
       new :year => Time.now.year
@@ -266,7 +266,8 @@ class Timeframe
     
     # Construct a new Timeframe, but constrain it by another
     def constrained_new(from, to, constraint)
-      raise ArgumentError, 'Need Date, Date, Timeframe as args' unless from.is_a? Date and to.is_a? Date and constraint.is_a? Timeframe
+      from, to = make_dates from, to
+      raise ArgumentError, 'Constraint must be a Timeframe' unless constraint.is_a? Timeframe
       raise ArgumentError, "Start date #{from} should be earlier than end date #{to}" if from > to
       if to <= constraint.from or from >= constraint.to
         new constraint.from, constraint.from
@@ -281,8 +282,7 @@ class Timeframe
     
     # Shortcut for #new that automatically skips year boundary crossing checks
     def multiyear(from, to)
-      from = Date.parse(from) if from.is_a?(String)
-      to = Date.parse(to) if to.is_a?(String)
+      from, to = make_dates from, to
       new from, to, :skip_year_boundary_crossing_check => true
     end
     
@@ -298,8 +298,7 @@ class Timeframe
     def interval(str)
       raise ArgumentError, 'Intervals should be specified as a string' unless str.is_a? String
       raise ArgumentError, 'Intervals should be specified according to ISO 8601, method 1, eliding times' unless str =~ /^\d\d\d\d-\d\d-\d\d\/\d\d\d\d-\d\d-\d\d$/
-
-      new(*str.split('/').map { |date| Date.parse date })
+      multiyear *str.split('/')
     end
     alias :from_json :interval
   end

data/spec/timeframe_spec.rb

@@ -244,6 +244,11 @@ describe Timeframe do
     it 'should parse ISO 8601 interval format' do
       Timeframe.interval('2009-01-01/2010-01-01').should == Timeframe.new(:year => 2009)
     end
+    it 'should skip year boundary checking' do
+      lambda {
+        Timeframe.interval '2009-01-01/2011-01-01'
+      }.should_not raise_error
+    end
     it 'should understand its own #to_param' do
       t = Timeframe.new(:year => 2009)
       Timeframe.interval(t.to_param).should == t

data/timeframe.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{timeframe}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Rossmeissl", "Seamus Abshere", "Derek Kastner"]
-  s.date = %q{2010-07-16}
+  s.date = %q{2010-07-20}
   s.description = %q{A Ruby class for describing and interacting with timeframes.}
   s.email = %q{andy@rossmeissl.net}
   s.extra_rdoc_files = [
@@ -46,20 +46,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.8"])
-      s.add_runtime_dependency(%q<to_json_fix>, [">= 0.0.1"])
-      s.add_runtime_dependency(%q<andand>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<activesupport>, [">= 2.3.8"])
-      s.add_dependency(%q<to_json_fix>, [">= 0.0.1"])
-      s.add_dependency(%q<andand>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 2.3.5"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<activesupport>, [">= 2.3.8"])
-    s.add_dependency(%q<to_json_fix>, [">= 0.0.1"])
-    s.add_dependency(%q<andand>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 2.3.5"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: timeframe
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-16 00:00:00 -05:00
+date: 2010-07-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,44 +44,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 9
         segments: 
         - 2
         - 3
-        - 8
-        version: 2.3.8
+        - 5
+        version: 2.3.5
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: to_json_fix
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 0
-        - 1
-        version: 0.0.1
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: andand
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id004
 description: A Ruby class for describing and interacting with timeframes.
 email: andy@rossmeissl.net
 executables: []