From be87792382dc2ce6cf7ebee3ae433376b5c29693 Mon Sep 17 00:00:00 2001 From: Guillaume DOTT Date: Fri, 6 Sep 2013 10:39:14 +0200 Subject: [PATCH] Add timezone to DateTime format --- lib/biju/parser.rb | 2 +- lib/biju/sms.rb | 2 +- spec/biju/sms_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/biju/parser.rb b/lib/biju/parser.rb index d4210e5..b866fff 100644 --- a/lib/biju/parser.rb +++ b/lib/biju/parser.rb @@ -66,7 +66,7 @@ module Biju rule(empty_string: simple(:empty_string)) { '' } rule(int: simple(:int)) { int.to_i } rule(string: simple(:string)) { string.to_s } - rule(datetime: simple(:datetime)) { DateTime.strptime(datetime.to_s, "%y/%m/%d,%T") } + rule(datetime: simple(:datetime)) { DateTime.strptime(datetime.to_s, "%y/%m/%d,%T%Z") } rule(array: subtree(:array)) { array } rule(status: simple(:status)) { { status: status } } diff --git a/lib/biju/sms.rb b/lib/biju/sms.rb index d6b242c..7130b30 100644 --- a/lib/biju/sms.rb +++ b/lib/biju/sms.rb @@ -21,7 +21,7 @@ module Biju def datetime=(arg) @datetime = case arg when String - DateTime.strptime(arg, "%y/%m/%d,%T") + DateTime.strptime(arg, "%y/%m/%d,%T%Z") when DateTime arg else diff --git a/spec/biju/sms_spec.rb b/spec/biju/sms_spec.rb index 7a4c428..3478b19 100644 --- a/spec/biju/sms_spec.rb +++ b/spec/biju/sms_spec.rb @@ -12,6 +12,6 @@ describe Biju::Sms do its(:id) { should eq(1) } its(:phone_number) { should eq("144") } - its(:datetime) { should eq(DateTime.new(2011, 7, 28, 15, 34, 8)) } + its(:datetime) { should eq(DateTime.new(2011, 7, 28, 15, 34, 8, '-12')) } its(:message) { should eq("Some text here") } end