mongoid_time_field 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 675c1a0fb1ddddd399518a3984b3575f5203186e
-  data.tar.gz: 254095769b5f2c6cb8b67889d2e9e7aea3211c05
+  metadata.gz: 7180a86b7f2a54f680b0da5bb2388896749519b8
+  data.tar.gz: 7ade24dc09af27c8f37f5df045f13eef2fa14fb2
 SHA512:
-  metadata.gz: 54b63521baaccff3b95eb6d7075d6ae58e0e342ea95c87d710a380a439c8adfa7af5983e1ce7fd15279bbb9692afc1a6b0fa0b2eef05f001984251541d0c4182
-  data.tar.gz: 93944c906019a1a619b3cc77fd35f592112f7b9645d0b46da9c1402d563e84c5c72da52b84eb41e865db67335f5d6277a9cf43962c018c8d12149e1bbf6205c0
+  metadata.gz: 820f40c21a377b967fad550d1664562d3ceceb1ac5d8dc19dcdc4098929fd08f78c1fd45e26941343aad08db2c367c2188918ce0a8dd1c5dc73888f99ffaf9cc
+  data.tar.gz: 6e009f5bb2d6ac3fa56836cfdd21806585955094a045ef9cb2dc1946eaf214a5e51b055d6959aaf3035577f0019f241b79761bc71aad230637c336f8ca7a9d0a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongoid_time_field (0.2.1)
+    mongoid_time_field (0.2.2)
       mongoid (>= 3.0.0)
 
 GEM

data/README.rdoc

@@ -18,10 +18,26 @@ Include the gem in your Gemfile
       field :duration, type: TimeField.new(format: 'mm:SS')
     end
 
+== Format tokens:
+
+  SS - Seconds (always two digits)
+  MM - Minutes, zero-padded
+  mm - minutes, no padding
+  HH - hours, zero-padded to two
+  hh - hours, no padding
+  hh? - hours, displays hours only if they are present (non-zero)
+
+  Default format is 'hh?:mm:SS'.
+
+Leftmost value in format is of arbitrary length (i.e. format 'HH:MM' is not limited to 24 hours, 'mm:SS' is not limited to 60 minutes and should not overflow)
+
+== changes since v.0.1.0
+Default format for deprecated time_field syntax is 'mm:SS' for compatibility (If you stored HH:MM with 0.1.0 it should still just keep working with 'mm:SS' format, with seconds stored in DB, but if you change to new syntax and use 'HH:MM' format, you need to multiply all stored values by 60)
+
 All time values are converted and stored in mongodb as seconds.
 
 == Contributing to mongoid_time_field
- 
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
 * Fork the project.

data/lib/mongoid_time_field/time_field.rb

@@ -2,12 +2,13 @@ class TimeField
   def initialize(options = {})
     @options = options
 
-    @options[:format] = 'mm:SS' unless options[:format]
+    @options[:format] = 'hh?:mm:SS' unless options[:format]
     @options[:regexp] = build_regexp(options[:format]) unless options[:regexp]
   end
 
   def build_regexp(format)
     s = '^' + Regexp.escape(format) + '$'
+    s.gsub!('hh\?', '(?<h>\d*?)')
     s.gsub!(':', ':?')
     s.gsub!('-', '-?')
     s.gsub!('_', '_?')

data/lib/mongoid_time_field/value.rb

@@ -18,13 +18,22 @@ module Mongoid::TimeField
       if @seconds.nil?
         nil
       else
-        format = @options[:format]
+        format = @options[:format].dup
 
         fm, ss = @seconds.divmod(60)
         hh, mm = fm.divmod(60)
 
+        if !format.match(/hh\?/).nil?
+          if hh > 0
+            format.gsub!('hh?', 'hh')
+            format.gsub!('mm', 'MM')
+          else
+            format.gsub!(/hh\?[:\-_ ]?/, '')
+          end
+        end
+
         if format.match(/hh/i).nil?
-          replaces = {
+          replaces  = {
             'mm' => fm,
             'MM' => fm.to_s.rjust(2, '0'),
             'SS' => ss.to_s.rjust(2, '0'),
@@ -33,7 +42,7 @@ module Mongoid::TimeField
             replaces[match]
           end
         else
-          replaces = {
+          replaces  = {
             'hh' => hh,
             'HH' => hh.to_s.rjust(2, '0'),
             'mm' => mm,

data/lib/mongoid_time_field/version.rb

@@ -1,3 +1,3 @@
 module MongoidTimeField
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/support/dummy_v2.rb

@@ -3,6 +3,8 @@ class DummyV2
 
   field :description
 
+  field :def, type: TimeField.new()
+
   field :open, type: TimeField.new(format: "hh:MM")
   field :close, type: TimeField.new(format: 'hh:MM')
 

data/spec/v2_spec.rb

@@ -172,4 +172,18 @@ describe Mongoid::TimeField do
       dummy.time_of_day.minutes.should eq (130)
     end
   end
+
+  describe 'optional hours' do
+    it 'parses hours' do
+      dummy = DummyV2.new
+      dummy.def = '1:02:03'
+      dummy.def.should eq '1:02:03'
+    end
+
+    it 'formats without hours when no hours are present' do
+      dummy = DummyV2.new
+      dummy.def = '02:03'
+      dummy.def.should eq '2:03'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_time_field
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid