couch_potato 0.2.25 → 0.2.26

data/CHANGES.md

@@ -1,5 +1,8 @@
 ## Changes
 
+### master
+* added to_s(:json) to Date and Time to be able to get properly formatted dates/times for searching with dates/times (langalex)
+
 ### 0.2.25
 * automatic view updates: when you change the definition of a view couch potato will now update the design document in the database (langalex)
 * support for properties of type Date, better support for Time (langalex)

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:major: 0
-:minor: 2
-:patch: 25
 :build: 
+:minor: 2
+:patch: 26
+:major: 0

data/lib/core_ext/date.rb

@@ -1,8 +1,19 @@
 class Date
   def to_json(*a)
-    %("#{strftime("%Y/%m/%d")}")
+    %("#{to_s(:json)}")
   end
   
+  def to_s_with_json(*args)
+    if args[0] == :json
+      strftime("%Y/%m/%d")
+    else
+      to_s_without_json *args
+    end
+  end
+  alias_method :to_s_without_json, :to_s
+  alias_method :to_s, :to_s_with_json
+  
+  
   def self.json_create string
     return nil if string.nil?
     Date.parse(string)

data/lib/core_ext/time.rb

@@ -1,8 +1,18 @@
 class Time
   def to_json(*a)
-    %("#{strftime("%Y/%m/%d %H:%M:%S %z")}")
+    %("#{to_s(:json)}")
   end
   
+  def to_s_with_json(*args)
+    if args[0] == :json
+      getutc.strftime("%Y/%m/%d %H:%M:%S +0000")
+    else
+      to_s_without_json *args
+    end
+  end
+  alias_method :to_s_without_json, :to_s
+  alias_method :to_s, :to_s_with_json
+  
   def self.json_create string
     return nil if string.nil?
     d = DateTime.parse(string).new_offset

data/spec/property_spec.rb

@@ -145,11 +145,12 @@ describe 'properties' do
       w.time.to_s.should == time.utc.to_s
     end
     
-    it "should parse a string and persist it as time" do
-      w = Watch.new :time => '2009-01-01 13:25 UTC'
+    it "should parse a string and persist it as utc time" do
+      w = Watch.new :time => '2009-01-01 13:25 +0100'
       CouchPotato.database.save_document! w
       w = CouchPotato.database.load_document w.id
       w.time.should be_a(Time)
+      w.time.should == Time.parse('2009-01-01 12:25 +0000')
     end
     
     it "should store nil" do

data/spec/unit/date_spec.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Date, 'to_json' do
+  it "should format the date in a way that i can use it for sorting in couchdb" do
+    date = Date.parse('2009-01-01')
+    date.to_json.should == "\"2009/01/01\""
+  end
+end
+
+describe Date, 'to_s(:json)' do
+  it "should format it in the same way as to_json does so i can use this to do queries over date attributes" do
+    date = Date.parse('2009-01-01')
+    date.to_s(:json).should == "2009/01/01"
+  end
+end
+
+describe Date, 'to_s' do
+  it "should leave the original to_s untouched" do
+    date = Date.parse('2009-01-01')
+    date.to_s.should == "2009-01-01"
+  end
+end

data/spec/unit/time_spec.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Time, 'to_json' do
+  it "should convert to utc and format the time in a way that i can use it for sorting in couchdb" do
+    time = Time.parse('2009-01-01 11:12:23 +0200')
+    time.to_json.should == "\"2009/01/01 09:12:23 +0000\""
+  end
+end
+
+describe Time, 'to_s(:json)' do
+  it "should format it in the same way as to_json does so i can use this to do queries over time attributes" do
+    time = Time.parse('2009-01-01 11:12:23 +0200')
+    time.to_s(:json).should == "2009/01/01 09:12:23 +0000"
+  end
+end
+
+describe Time, 'to_s' do
+  it "should leave the original to_s untouched" do
+    time = Time.parse('2009-01-01 10:12:23 +0100').getutc
+    time.to_s.should include("09:12:23")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: couch_potato
 version: !ruby/object:Gem::Version 
-  version: 0.2.25
+  version: 0.2.26
 platform: ruby
 authors: 
 - Alexander Lang
@@ -111,11 +111,13 @@ files:
 - spec/unit/create_spec.rb
 - spec/unit/customs_views_spec.rb
 - spec/unit/database_spec.rb
+- spec/unit/date_spec.rb
 - spec/unit/dirty_attributes_spec.rb
 - spec/unit/json_create_id_spec.rb
 - spec/unit/model_view_spec_spec.rb
 - spec/unit/rspec_matchers_spec.rb
 - spec/unit/string_spec.rb
+- spec/unit/time_spec.rb
 - spec/unit/validation_spec.rb
 - spec/unit/view_query_spec.rb
 - spec/update_spec.rb
@@ -168,11 +170,13 @@ test_files:
 - spec/unit/create_spec.rb
 - spec/unit/customs_views_spec.rb
 - spec/unit/database_spec.rb
+- spec/unit/date_spec.rb
 - spec/unit/dirty_attributes_spec.rb
 - spec/unit/json_create_id_spec.rb
 - spec/unit/model_view_spec_spec.rb
 - spec/unit/rspec_matchers_spec.rb
 - spec/unit/string_spec.rb
+- spec/unit/time_spec.rb
 - spec/unit/validation_spec.rb
 - spec/unit/view_query_spec.rb
 - spec/update_spec.rb