mongoid_time_field 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4aa27455f08c761fe705a87ae8fc0e7a0c012f2
-  data.tar.gz: 939108e24667ca9df64395eb85afac6a6a5425fe
+  metadata.gz: cf1d3359c89fdf7bb3fe0ee40e431e28d1875ab5
+  data.tar.gz: ceb9ba4afc6e5f4f5c72314a16840858d093a6a1
 SHA512:
-  metadata.gz: dee99307d2610efff356221896ac621530561309e16d14a490ea6e4534bb851d788f8162ec9e0a5e3e2f41ceb253d4a8d805a5fff08efed5e298f76cf44321c1
-  data.tar.gz: 3b30f2cfa92355c60ddc0f9662f1557ada278b7a9004bc62c21aeb76a5160ac4ad13051d4da989f32bd757cecf9eb22b0e8ca490bbf777cbe1359745562fe889
+  metadata.gz: 3db4fdc546994c28a1cca9db4fa40c4c5f1f4ac664f2c871fc55807caa5c2f55464f882d66caf0f2b069734fea897d895b905263a178cc2a5fdb58b68d848805
+  data.tar.gz: b8c09be48119c85f2039ad02bb3d29fd2d39808f0dfff8d42ce29c354cf225428cf8f4e96b68dcf5441fabe99ff2cf06edd408c67499a2272ed56f1b664760d7

data/lib/mongoid_time_field/time_field.rb

@@ -65,7 +65,7 @@ class TimeField
   # Takes any possible object and converts it to how it would be
   # stored in the database.
   def mongoize(object)
-    case object
+    case object 
     when Mongoid::TimeField::Value then object.mongoize
     when String then parse(object).mongoize
     else object

data/lib/mongoid_time_field/value.rb

@@ -1,5 +1,8 @@
 module Mongoid::TimeField
   class Value
+    YEARS_FACTOR = ((365 * 303 + 366 * 97) / 400) * 86400
+    MONTHS_FACTOR = (((365 * 303 + 366 * 97) / 400) * 86400) / 12
+
     attr_accessor :seconds
 
     def initialize(seconds, options = {})
@@ -65,6 +68,30 @@ module Mongoid::TimeField
     end
     alias_method :to_str, :to_s
 
+    # source: https://github.com/arnau/ISO8601/blob/master/lib/iso8601/duration.rb (MIT)
+    def iso8601
+      duration = @seconds
+      sign = '-' if (duration < 0)
+      duration = duration.abs
+      years, y_mod = (duration / YEARS_FACTOR).to_i, (duration % YEARS_FACTOR)
+      months, m_mod = (y_mod / MONTHS_FACTOR).to_i, (y_mod % MONTHS_FACTOR)
+      days, d_mod = (m_mod / 86400).to_i, (m_mod % 86400)
+      hours, h_mod = (d_mod / 3600).to_i, (d_mod % 3600)
+      minutes, mi_mod = (h_mod / 60).to_i, (h_mod % 60)
+      seconds = mi_mod.div(1) == mi_mod ? mi_mod.to_i : mi_mod.to_f # Coerce to Integer when needed (`PT1S` instead of `PT1.0S`)
+
+      seconds = (seconds != 0 or (years == 0 and months == 0 and days == 0 and hours == 0 and minutes == 0)) ? "#{seconds}S" : ""
+      minutes = (minutes != 0) ? "#{minutes}M" : ""
+      hours = (hours != 0) ? "#{hours}H" : ""
+      days = (days != 0) ? "#{days}D" : ""
+      months = (months != 0) ? "#{months}M" : ""
+      years = (years != 0) ? "#{years}Y" : ""
+
+      date = %[#{sign}P#{years}#{months}#{days}]
+      time = (hours != "" or minutes != "" or seconds != "") ? %[T#{hours}#{minutes}#{seconds}] : ""
+      date + time
+    end
+
     def minutes
       @seconds / 60
     end

data/lib/mongoid_time_field/version.rb

@@ -1,3 +1,3 @@
 module MongoidTimeField
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/v2_spec.rb

@@ -13,9 +13,39 @@ describe Mongoid::TimeField do
       dummy.open_minutes.should eq 600
     end
   end
-
+  describe 'iso8601' do
+    it 'hh:mm' do
+      dummy = DummyV2.new
+      dummy.open = '10:00'
+      dummy.open.iso8601.should eq 'PT10H'
+    end
+    it 'seconds' do
+      dummy = DummyV2.new
+      dummy.open = '10:10'
+      dummy.open.iso8601.should eq 'PT10H10M'
+    end
+    it 'hh:mm' do
+      dummy = DummyV2.new
+      dummy.def = '10:00'
+      dummy.def.iso8601.should eq 'PT10M'
+    end
+    it 'seconds' do
+      dummy = DummyV2.new
+      dummy.def = '10:10'
+      dummy.def.iso8601.should eq 'PT10M10S'
+    end
+    it 'date' do
+      dummy = DummyV2.new
+      dummy.open = '12000:00'
+      dummy.open.iso8601.should eq 'P1Y4M13DT8H'
+    end
+    it 'date' do
+      dummy = DummyV2.new
+      dummy.def = '120:00:00'
+      dummy.def.iso8601.should eq 'P5D'
+    end
+  end
   describe 'datatype' do
-
     it 'is persisted normally' do
       dummy = DummyV2.new
       dummy.open = '10:00'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_time_field
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-24 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid