timeframe 0.2.0 → 0.2.1

data/.gitignore

@@ -21,3 +21,4 @@ pkg
 
 ## PROJECT::SPECIFIC
 Gemfile.lock
+*.gem

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.2.1 / 2012-04-24
+
+* Bug fixes
+
+  * Stop defining Timeframe#to_json... it's conventional to only define #as_json
+
 0.2.0 / 2012-04-24
 
 * Breaking changes

data/lib/timeframe.rb

@@ -278,10 +278,6 @@ class Timeframe
     self.class.new((start_date - 1.year), (end_date - 1.year))
   end
   
-  def to_json(*)
-    iso8601
-  end
-  
   def as_json(*)
     iso8601
   end

data/lib/timeframe/version.rb

@@ -1,3 +1,3 @@
 class Timeframe
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/test/test_timeframe.rb

@@ -275,7 +275,7 @@ describe Timeframe do
     end
     it 'understands JSON' do
       json =<<-EOS
-      2009-05-01/2009-06-01
+      "2009-05-01/2009-06-01"
 EOS
       Timeframe.parse(json).must_equal Timeframe.new(:year => 2009, :month => 5)
     end
@@ -286,13 +286,14 @@ EOS
     end
   end
 
-  describe '#to_json' do
+  describe '#as_json' do
     it 'should generate JSON (test fails on ruby 1.8)' do
-      Timeframe.new(:year => 2009).to_json.must_equal %{2009-01-01/2010-01-01}
+      Timeframe.new(:year => 2009).as_json.must_equal %{2009-01-01/2010-01-01}
+      MultiJson.dump(Timeframe.new(:year => 2009)).must_equal Timeframe.new(:year => 2009).as_json.inspect
     end
-    it 'understands its own #to_json' do
+    it 'understands its own JSON' do
       t = Timeframe.new(:year => 2009, :month => 5)
-      Timeframe.from_json(t.to_json).must_equal t
+      Timeframe.from_json(MultiJson.dump(t)).must_equal t
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timeframe
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors: