mongoid-time_with_named_zone 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47c61ecde1e0577a2e05de0fd9eec9fcc5d88826
-  data.tar.gz: dba4846f6b9cbac1566827f62da6f99095060676
+  metadata.gz: f73cc1515f962a4f7b277a17338b4d4a3439c547
+  data.tar.gz: 6d63ec9f1e9f71815106d9bccd054f75e6b1f9a1
 SHA512:
-  metadata.gz: 1aa8c656e02b29a268e230246d3016f4cc5166bb2afe975de582bb673c7eb7c5222bddff0fce61b922abfad7e5bff63e5a70f8a012f283cb96450a50d74db7e4
-  data.tar.gz: e57395d13a27a7f28d6cc7efefb5f7c4be2c080da58deaa2f0135a325e2df4c8050724885d83c30bb4903b42f027ec77ab3e58a8a85c2d08f108d443fc2f5e25
+  metadata.gz: 91a6d4c816197825b2845cd230362e647f707a597b6bc797195ca02bd8b4a17b0e56bd95c01f6644f37c2f7a0086c3046539e781ac46aabd22ed176b95135cce
+  data.tar.gz: 867a786d45e980689b993ada146a13b4dd56cc583c5916d5c9c020e92214920a028a9e691f211662f35080bf1ea2f3481df7af77932772175b82922a3bf63542

data/README.md

@@ -1,4 +1,4 @@
-# Mongoid Time With Zone
+# Mongoid Time With Named Zone
 
 Timezones can be a developer's worst nightmare and introduce subtle bugs.
 

data/lib/mongoid/time_with_named_zone.rb

@@ -1,51 +1,42 @@
+require 'mongoid'
 require 'mongoid/time_with_named_zone/version'
 
 # Mongoid namespace from the Mongoid gem
 module Mongoid
   # Object that stores time and tz information as embedded object
   # transparently works with AS:TwZ, supports mongoid serialization
-  class TimeWithNamedZone
-    attr_reader :time, :zone
-
-    def initialize(time, zone = 'UTC')
-      @time, @zone = time, zone
-    end
-
-    # Converts an object of this instance into a database friendly value.
-    def mongoize
-      TimeWithNamedZone.mongoize(self)
-    end
-
+  module TimeWithNamedZone
     class << self
-      # Get the object as it was stored in the database, and instantiate`
-      # this custom class from it.
+      # Convert the object from its mongo friendly ruby type to this type
       def demongoize(object)
-        return nil unless object && object[:time] && object[:zone]
-        object[:time].in_time_zone(object[:zone])
+        return nil unless object && object['time'] && object['zone']
+        object['time'].in_time_zone(object['zone'])
       end
 
+      # Turn the object from the ruby type we deal with to a Mongo friendly type
       def mongoize(object)
-        hash = case object
-               when self
-                 {
-                   time: object.time,
-                   zone: ActiveSupport::TimeZone.new(object.zone).name
-                 }
-               when ActiveSupport::TimeWithZone
-                 {
-                   time: object.utc,
-                   zone: object.time_zone
-                 }
-               when Time
-                 {
-                   time: object.utc,
-                   zone: 'UTC'
-                 }
-               else
-                 nil
-               end
-        hash.mongoize
+        case object
+        when ActiveSupport::TimeWithZone
+          {
+            time: object.utc.mongoize,
+            zone: object.time_zone.name.mongoize
+          }
+        when Time || DateTime
+          {
+            time: object.utc.mongoize,
+            zone: 'UTC'.mongoize
+          }
+        when Date
+          {
+            time: object.mongoize,
+            zone: 'UTC'.mongoize
+          }
+        else
+          nil
+        end
       end
+
+      alias_method :evolve, :mongoize
     end
   end
 end

data/lib/mongoid/time_with_named_zone/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
-  class TimeWithNamedZone
-    VERSION = '0.1.4'.freeze
+  module TimeWithNamedZone
+    VERSION = '0.2.0'.freeze
   end
 end

data/spec/time_with_zone_spec.rb

@@ -1,41 +1,33 @@
-require 'mongoid'
 require 'mongoid/time_with_named_zone'
 
 describe Mongoid::TimeWithNamedZone do
   describe '#mongoize' do
-    context 'TimeWithNamedZone' do
-      let(:time) { Mongoid::TimeWithNamedZone.new(Time.utc(2010, 11, 19), 'Pacific/Auckland') }
-      let(:time_with_invalid_zone) { Mongoid::TimeWithNamedZone.new(Time.utc(2010, 11, 19), 'Invalid_timezone') }
+    subject { Mongoid::TimeWithNamedZone.mongoize(time) }
 
-      it 'returns hash with utc time and zone' do
-        expect(Mongoid::TimeWithNamedZone.mongoize(time)).to eq(time: Time.utc(2010, 11, 19), zone: 'Pacific/Auckland')
-      end
-
-      it 'raise an error for invalid timezone' do
-        expect { Mongoid::TimeWithNamedZone.mongoize(time_with_invalid_zone) }.to raise_error
-      end
+    context 'time in Lima zone' do
+      let(:time) { Time.utc(2010, 11, 19).in_time_zone 'Lima' }
+      it { is_expected.to eq(time: Time.utc(2010, 11, 19), zone: 'Lima') }
     end
 
-    context 'ActiveSupport::TimeWithZone' do
-      let(:time) { ActiveSupport::TimeWithZone.new(Time.utc(2010, 11, 19), 'Pacific/Auckland') }
-
-      it 'returns hash with utc time and zone' do
-        expect(Mongoid::TimeWithNamedZone.mongoize(time)).to eq(time: Time.utc(2010, 11, 19), zone: 'Pacific/Auckland')
-      end
+    context 'Time object' do
+      let(:time) { Time.utc(2010, 11, 19) }
+      it { is_expected.to eq(time: Time.utc(2010, 11, 19), zone: 'UTC') }
     end
 
-    context 'Time' do
-      let(:time) { Time.utc(2010, 11, 19) }
+    context 'Date object' do
+      let(:time) { Date.new(2010, 11, 29) }
+      it { is_expected.to eq(time: Time.utc(2010, 11, 29), zone: 'UTC') }
+    end
 
-      it 'returns hash with utc time and utc zone' do
-        expect(Mongoid::TimeWithNamedZone.mongoize(time)).to eq(time: Time.utc(2010, 11, 19), zone: 'UTC')
-      end
+    context 'DateTime object' do
+      let(:time) { DateTime.new(2010, 11, 29) }
+      it { is_expected.to eq(time: Time.utc(2010, 11, 29), zone: 'UTC') }
     end
   end
 
   describe '.demongoize' do
     it 'returns time in saved zone' do
-      hash = { time: Time.utc(2010, 11, 19), zone: 'Pacific/Auckland' }
+      hash = { 'time' => Time.utc(2010, 11, 19), 'zone' => 'Pacific/Auckland' }
       demongoized_value = Mongoid::TimeWithNamedZone.demongoize(hash)
       expect(demongoized_value).to eq(Time.new(2010, 11, 19, '+13:00'))
     end
@@ -43,5 +35,13 @@ describe Mongoid::TimeWithNamedZone do
     it 'returns nil for blank object' do
       expect(Mongoid::TimeWithNamedZone.demongoize(nil)).to eq(nil)
     end
+
+    it 'returns nil for empty hash' do
+      expect(Mongoid::TimeWithNamedZone.demongoize({})).to eq(nil)
+    end
+
+    it 'returns nil for hash without time' do
+      expect(Mongoid::TimeWithNamedZone.demongoize('zone' => 'UTC')).to eq(nil)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-time_with_named_zone
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Carnival Mobile
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid