timeframe 0.0.9 → 0.0.10

data/lib/timeframe/version.rb

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

data/lib/timeframe.rb

@@ -1,11 +1,13 @@
 require 'date'
 require 'active_support/version'
 %w{
+  active_support/core_ext/hash
   active_support/core_ext/array/extract_options
   active_support/core_ext/string/conversions
   active_support/core_ext/date/conversions
   active_support/core_ext/integer/time
   active_support/core_ext/numeric/time
+  active_support/json
 }.each do |active_support_3_requirement|
   require active_support_3_requirement
 end if ActiveSupport::VERSION::MAJOR == 3
@@ -245,15 +247,13 @@ class Timeframe
   def last_year
     self.class.new((from - 1.year), (to - 1.year))
   end
-  
-  # Just a string that can be processed by Timeframe.interval... identical to #to_param
-  def to_json(*)
+    
+  def as_json(*)
     to_param
   end
   
-  # http://jonathanjulian.com/2010/04/rails-to_json-or-as_json/
-  # Not really interested in making a Hash representation.
-  def as_json(*)
+  # overriding this so that as_json is not used
+  def to_json(*)
     to_param
   end
   

data/spec/timeframe_spec.rb

@@ -262,14 +262,9 @@ describe Timeframe do
   end
   
   describe '#to_json' do
-    it 'should generate JSON' do
+    it 'should generate JSON (test fails on ruby 1.8)' do
       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
-      Timeframe.new(:year => 2009).to_json('hi').should == example
-      Timeframe.new(:year => 2009).to_json('hi', 'there').should == example
-    end
   end
   
   describe '#to_param' do

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: timeframe
 version: !ruby/object:Gem::Version 
-  hash: 13
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 9
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -17,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 -05:00
+date: 2011-04-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,9 +23,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
         version: "1"
   type: :development
   version_requirements: *id001
@@ -42,9 +34,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -56,11 +45,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 3
-        - 5
         version: 2.3.5
   type: :runtime
   version_requirements: *id003
@@ -72,9 +56,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -114,18 +95,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []