time_of_day_attr 0.0.8 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab0ac090f636ee04c329736bd7f775f40fd65ba4
-  data.tar.gz: d7feee73d836a73b72f857b474b0489bea6a9e5c
+  metadata.gz: eada9ab6b9945f028e72aa4335e1bcfbf6227238
+  data.tar.gz: f5f0071ce565c37812395a7bd055c8d2b223ed0d
 SHA512:
-  metadata.gz: 1110a3aec230b82a7483d0cc31d410e61a7f9c294a44f22b7d34bf1463fd5ae36e9ca78932672ca0dd623f72b49359efb5aaadeed1eec64c4a8775edc8d47079
-  data.tar.gz: 9867243a77fbc695403ddee5b8c8e55d49ea14df4ae5bb9967fd327e2860ad3201ba64c4840c4861f82ec6f3db19e3e5e6ca68d1790310c231f4c94fae0a1e1d
+  metadata.gz: f9ce89c3c480c445091ae538c7426cf417d70a7d1bcb2c02a17d4c861af6d946a593e91262567eec414319cf8185268ede8c14a32bf8b3881ceabaddf533ce59
+  data.tar.gz: 18cd51daf9d5c0f90f86c6f6b3c6ee5987738aa6a8b54d56a9a7d1c6af859715744c65685c0add7c6ac5c0ff157de624b996baf37ae763be8019eb310785cff2

data/README.md

@@ -1,7 +1,7 @@
-# time_of_day_attr
+# Time of day attributes for your Rails model
 [![Gem Version](https://badge.fury.io/rb/time_of_day_attr.png)](http://badge.fury.io/rb/time_of_day_attr) [![Code Climate](https://codeclimate.com/github/clemenst/time_of_day_attr.png)](https://codeclimate.com/github/clemenst/time_of_day_attr) [![License](https://img.shields.io/npm/l/express.svg?style=flat)](http://clemenst.mit-license.org)
 
-Convert time of day to seconds since midnight and back.
+This ruby gem converts time of day to seconds since midnight and back. The seconds value is stored in the database and can be used for calculations and validations. 
 
 ## Installation
 
@@ -43,7 +43,7 @@ TimeOfDayAttr.l(business_hour.opening, omit_minutes_at_full_hour: true)
 
 ### Formats
 
-The standard formats for conversation are 'default' and 'hour'.
+The standard formats for conversion are 'default' and 'hour'.
 ```yml
 en:
   time_of_day:
@@ -60,7 +60,7 @@ en:
       custom: '%H-%M'
 ```
 
-Pass the formats you want for conversation:
+Pass the formats you want for conversion:
 ```ruby
 class BusinessHour < ActiveRecord::Base
   time_of_day_attr :opening, formats: [:custom]

data/lib/time_of_day_attr.rb

@@ -13,15 +13,25 @@ module TimeOfDayAttr
       format  = options[:format] || :default
       format  = translate_format(format) if format.is_a?(Symbol)
       time    = Time.strptime(value, format).change(month: 1, day: 1)
-      time.seconds_since_midnight.to_i
+      seconds = time.seconds_since_midnight.to_i
+      if seconds.zero? && value.starts_with?('24')
+        24.hours.to_i
+      else
+        seconds
+      end
     end
 
     def localize(value, options = {})
       return value unless value.respond_to?(:seconds)
       format  = options[:format] || :default
       format  = translate_format(format) if format.is_a?(Symbol)
+      # Switch to beginning of year to prevent wrong time on the day of time change
+      # see https://en.wikipedia.org/wiki/Daylight_saving_time
       time    = Time.now.beginning_of_year.at_midnight + value.seconds
       time_of_day = time.strftime(format)
+      if 24.hours.to_i == value
+        time_of_day.gsub!(' 0', '24')
+      end
       if options[:omit_minutes_at_full_hour]
         if time_of_day.end_with?('00')
           time_of_day = time_of_day[0...-3]

data/lib/time_of_day_attr/active_record_ext.rb

@@ -13,7 +13,11 @@ module TimeOfDayAttr
               delocalized_values = options[:formats].map do |format|
                 begin
                   TimeOfDayAttr.delocalize(value, format: format)
-                rescue ArgumentError
+                rescue ArgumentError => e
+                  if 'argument out of range' == e.message
+                    super(nil)
+                    return
+                  end
                   nil
                 end
               end

data/lib/time_of_day_attr/version.rb

@@ -1,3 +1,3 @@
 module TimeOfDayAttr
-  VERSION = '0.0.8'
+  VERSION = '1.0.0'
 end

data/test/time_of_day_attr_test.rb

@@ -14,14 +14,12 @@ class TimeOfDayAttrTest < ActiveSupport::TestCase
   test 'localize time of day' do
     assert_equal ' 9:00', TimeOfDayAttr.localize(32400)
     assert_equal '14:45', TimeOfDayAttr.localize(53100)
-    assert_equal ' 0:00', TimeOfDayAttr.localize(86400)
   end
 
   test 'localize time of day and omit minutes at full hour' do
     assert_equal ' 9',      TimeOfDayAttr.localize(32400, omit_minutes_at_full_hour: true)
     assert_equal '14',      TimeOfDayAttr.localize(50400, omit_minutes_at_full_hour: true)
     assert_equal '14:45',   TimeOfDayAttr.localize(53100, omit_minutes_at_full_hour: true)
-    assert_equal ' 0',      TimeOfDayAttr.localize(86400, omit_minutes_at_full_hour: true)
   end
 
   test 'localizing nil should return nil' do
@@ -54,5 +52,21 @@ class TimeOfDayAttrTest < ActiveSupport::TestCase
     assert_equal 55800, business_hour.opening
     business_hour.opening = nil
     assert_nil business_hour.opening
+    business_hour.opening = '25:00'
+    assert_nil business_hour.opening
+    business_hour.opening = '24:30'
+    assert_nil business_hour.opening
+  end
+
+
+  test '24 should be usable' do
+    business_hour = BusinessHour.new(opening: '0', closing: '24')
+    assert_equal 0, business_hour.opening
+    assert_equal 86400, business_hour.closing
+    assert_equal ' 0:00', TimeOfDayAttr.localize(business_hour.opening)
+    assert_equal '24:00', TimeOfDayAttr.localize(business_hour.closing)
+    assert_equal ' 0', TimeOfDayAttr.localize(business_hour.opening, omit_minutes_at_full_hour: true)
+    assert_equal '24', TimeOfDayAttr.localize(business_hour.closing, omit_minutes_at_full_hour: true)
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_of_day_attr
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 1.0.0
 platform: ruby
 authors:
 - Clemens Teichmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-29 00:00:00.000000000 Z
+date: 2015-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,10 +38,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Adds time_of_day_attr to your models. Will try to convert time of day
-  to seconds since midnight when a string was set. Localized formats for conversation
-  can be added to your translation files. TimeOfDayAttr.localize converts seconds
-  since midnight back to time of day.
+description: This ruby gem converts time of day to seconds since midnight and back.
+  The seconds value is stored in the database and can be used for calculations and
+  validations.
 email:
 - clemens_t@web.de
 executables: []
@@ -79,12 +78,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: Convert time of day to seconds since midnight and back.
+summary: Time of day attributes for your Rails model
 test_files:
+- test/time_of_day_attr_test.rb
 - test/models/business_hour.rb
-- test/schema.rb
 - test/test_helper.rb
-- test/time_of_day_attr_test.rb
+- test/schema.rb