timeframe 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/timeframe.rb

@@ -247,8 +247,10 @@ class Timeframe
     self.class.new((from - 1.year), (to - 1.year))
   end
   
-  def to_json(*) # :nodoc:
-    { :from => from, :to => to }.to_json
+  # 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
   
   # URL-friendly like "2008-10-25/2009-11-12"
@@ -293,11 +295,12 @@ class Timeframe
     
     # Construct a new Timeframe by parsing an ISO 8601 time interval string
     # http://en.wikipedia.org/wiki/ISO_8601#Time_intervals
-    def interval(interval)
-      raise ArgumentError, 'Intervals should be specified as a string' unless interval.is_a? String
-      raise ArgumentError, 'Intervals should be specified according to ISO 8601, method 1, eliding times' unless interval =~ /^\d\d\d\d-\d\d-\d\d\/\d\d\d\d-\d\d-\d\d$/
+    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(*interval.split('/').map { |date| Date.parse date })
+      new(*str.split('/').map { |date| Date.parse date })
     end
+    alias :from_json :interval
   end
 end

data/spec/timeframe_spec.rb

@@ -250,9 +250,16 @@ describe Timeframe do
     end
   end
   
+  describe 'Timeframe:class#from_json' do
+    it 'should understand its own #to_json' do
+      t = Timeframe.new(:year => 2009)
+      Timeframe.from_json(t.to_json).should == t
+    end
+  end
+  
   describe '#to_json' do
     it 'should generate JSON' do
-      Timeframe.new(:year => 2009).to_json.should == "{\"from\":\"2009-01-01\",\"to\":\"2010-01-01\"}"
+      Timeframe.new(:year => 2009).to_json.should == "2009-01-01/2010-01-01"
     end
     it 'should ignore any arguments you give it' do
       example = Timeframe.new(:year => 2009).to_json

data/timeframe.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{timeframe}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Rossmeissl", "Seamus Abshere", "Derek Kastner"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: timeframe
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Andy Rossmeissl