time_of_day_attr 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89598098237c1f05d5e43ddd93cab45dd9dac493
-  data.tar.gz: 8d777ae07c21629d8ede0408356e864295a5ab83
+  metadata.gz: 918454e7a1335742ab83a0756f6a736976f997a1
+  data.tar.gz: 5c8561a4f1d40431c167c1b75eed948bf56e1043
 SHA512:
-  metadata.gz: 08051c9d5b9c057fcfed48111cca292b6695815383dd12eb818931f8130fd0805b1621b6961d59d174c215204e516d0fa02a0744079d6f9d1da9c9ac910cb652
-  data.tar.gz: 8b3f4cce1f11cb6207aee0d3485774023ce3e25fb4827b28b6a1a82df01789f724d6ef54506cc18cc0025925b59fee7161440f0bb59a901c0aa4bb4bd479db01
+  metadata.gz: e27f14a0adf5295b5d0681963d932e40ae79f1999e4055e8ae497bd63be7809c084d37e3489b51a0319774136105ce4ba05206829502a2b7d0fa11ff1aaea871
+  data.tar.gz: 967e0f9f3f3e5ef2f459112fdb3652dbea0eed12e96d506b381fc08a5b9d3e70e86b0d01cf271bfd3518cead2e8beebf3c792fb1a2a08cb4903b9a9d44630969

data/lib/time_of_day_attr.rb

@@ -6,13 +6,13 @@ files = Dir[File.join(File.dirname(__FILE__), '../config/locales/*.yml')]
 I18n.load_path.concat(files)
 
 module TimeOfDayAttr
-  
+
   class << self
 
     def delocalize(value, options = {})
       format  = options[:format] || :default
       format  = translate_format(format) if format.is_a?(Symbol)
-      time    = Time.strptime(value, format)
+      time    = Time.strptime(value, format).change(month: 1, day: 1)
       time.seconds_since_midnight.to_i
     end
 
@@ -20,17 +20,19 @@ module TimeOfDayAttr
       return value unless value.respond_to?(:seconds)
       format  = options[:format] || :default
       format  = translate_format(format) if format.is_a?(Symbol)
-      time    = Time.now.at_midnight + value.seconds
+      time    = Time.now.beginning_of_year.at_midnight + value.seconds
       time_of_day = time.strftime(format)
       if options[:omit_minutes_at_full_hour]
         if time_of_day.end_with?('00')
-          time_of_day = time_of_day[0...-3]   
+          time_of_day = time_of_day[0...-3]
         end
       end
       time_of_day
     end
     alias :l :localize
 
+    private
+
     def translate_format(format)
       I18n.translate("time_of_day.formats.#{format}")
     end

data/lib/time_of_day_attr/active_record_ext.rb

@@ -4,16 +4,23 @@ module TimeOfDayAttr
 
     module ClassMethods
 
-      def time_of_day_attr *attrs
+      def time_of_day_attr(*attrs)
         options = attrs.extract_options!
         options[:formats] ||= [:default, :hour]
         attrs.each do |attr|
           define_method("#{attr}=") do |value|
             if value.is_a?(String)
-              delocalized_values = options[:formats].map { |format| TimeOfDayAttr.delocalize(value, format: format) rescue nil }
-              value = delocalized_values.compact.first || send(attr)
+              delocalized_values = options[:formats].map do |format|
+                begin
+                  TimeOfDayAttr.delocalize(value, format: format)
+                rescue ArgumentError
+                  nil
+                end
+              end
+              delocalized_value = delocalized_values.compact.first
+              raise(ArgumentError, "invalid time of day #{value} for formats #{options[:formats].join(', ')}") unless delocalized_value
             end
-            super(value)
+            super(delocalized_value || value)
           end
         end
       end

data/lib/time_of_day_attr/version.rb

@@ -1,3 +1,3 @@
 module TimeOfDayAttr
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/test/schema.rb

@@ -4,6 +4,6 @@ ActiveRecord::Schema.define do
   
   create_table :business_hours, :force => true do |t|
     t.integer :opening
-    t.string  :closing
+    t.integer :closing
   end
 end

data/test/time_of_day_attr_test.rb

@@ -40,13 +40,18 @@ class TimeOfDayAttrTest < ActiveSupport::TestCase
     assert_equal 61200, business_hour.closing
   end
 
-  test 'time of day attr setter should ignore invalid formats' do
-    business_hour = BusinessHour.new(opening: 'Nine', closing: 'Five')
+  test 'time of day attr setter should raise invalid formats' do
+    assert_raise ArgumentError do
+      business_hour = BusinessHour.new(opening: 'Nine', closing: 'Five')
+    end
+    business_hour = BusinessHour.new
     assert_nil business_hour.opening
     assert_nil business_hour.closing
     business_hour.opening = '9'
     assert_equal 32400, business_hour.opening
-    business_hour.opening = 'Nine'
+    assert_raise ArgumentError do
+      business_hour.opening = 'Nine'
+    end
     assert_equal 32400, business_hour.opening
     business_hour.opening = '9:30'
     assert_equal 34200, business_hour.opening

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_of_day_attr
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Clemens Teichmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2015-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails