time_of_day_attr 2.0.1 → 3.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaec6236cc4d2e7f298471e61ab3e58498dc416b
-  data.tar.gz: b53b39ebbbac6c4dcaad3df6bc0dbe163853911c
+  metadata.gz: 1ebf5cc4b7319eee277b898f9b1640ad146cdc50
+  data.tar.gz: 722d500c30a81146b81aee9b355c3d066c3930ae
 SHA512:
-  metadata.gz: 89de5c70a18f10db84f81ea5d40f4c0dbf8561194413b96b278184b37260d43f7ae02654b2a7f56374365fdc7c5f876cbfd063f516b2d5c96c9c5e43b13779bd
-  data.tar.gz: 58309d82945193823b4c48861cb16544ef03bd75eebad4641304f8a53680c57dc6d0a7c0417392e71aad1ca33ba29ec8b40ab27ae5c663a3f7e9c3c65eda7615
+  metadata.gz: 4881e6b3f944773742c51b4b397cfe62e421394edec77ee1b1e54612c41b7dc76c54ad25153243d83425b07407672867e212e1eea5c8500db252b45cd34480dc
+  data.tar.gz: e4b02170e78bb124882bdea0ddf4cbe6b6ab4d15502cefdf34806bd1ca25771f35942256d6c6dc39f726fecfe9b84927e228786b0ad773bc847610094a33fbe0

data/lib/time_of_day_attr/active_record_extension.rb

@@ -0,0 +1,38 @@
+module TimeOfDayAttr
+  module ActiveRecordExtension
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def time_of_day_attr(*attrs)
+        options = attrs.extract_options!
+
+        writers = AttrWriterModule.new(attrs, options)
+
+        if options[:prepend]
+          prepend writers
+        else
+          include writers
+        end
+      end
+    end
+  end
+
+  module AttrWriterModule
+    # rubocop:disable Metrics/MethodLength
+    def self.new(attrs, options)
+      Module.new do
+        attrs.each do |attr|
+          define_method("#{attr}=") do |value|
+            if value.is_a?(String)
+              delocalized_value = TimeOfDayAttr.delocalize(value, options)
+              super(delocalized_value)
+            else
+              super(value)
+            end
+          end
+        end
+      end
+    end
+    # rubocop:enable Metrics/MethodLength
+  end
+end

data/lib/time_of_day_attr/form_builder_ext.rb

@@ -1,18 +1,14 @@
-require 'action_view'
-
 module TimeOfDayAttr
-  module FormBuilderExt
+  module FormBuilderExtension
     extend ActiveSupport::Concern
 
     def time_of_day_field(method, options = {})
       options[:value] ||= begin
         value = object.public_send(method)
-        TimeOfDayAttr.localize(value, options.extract!(:format, :omit_minutes_at_full_hour))
+        localize_options = options.extract!(:format, :omit_minutes_at_full_hour)
+        TimeOfDayAttr.localize(value, localize_options)
       end
       text_field(method, options)
     end
   end
 end
-ActiveSupport.on_load :action_view do
-  ActionView::Helpers::FormBuilder.send(:include, TimeOfDayAttr::FormBuilderExt)
-end

data/lib/time_of_day_attr/railtie.rb

@@ -0,0 +1,12 @@
+module TimeOfDayAttr
+  class Railtie < ::Rails::Railtie
+    initializer 'time_of_day_attr.initialize' do
+      ActiveSupport.on_load(:active_record) do
+        include TimeOfDayAttr::ActiveRecordExtension
+      end
+      ActiveSupport.on_load(:action_view) do
+        ActionView::Helpers::FormBuilder.send(:include, TimeOfDayAttr::FormBuilderExtension)
+      end
+    end
+  end
+end

data/lib/time_of_day_attr/seconds.rb

@@ -1,9 +1,20 @@
 module TimeOfDayAttr
-  Seconds = Struct.new(:value) do
-    def to_time_of_day(time_format)
+  module Seconds
+    def self.convert_to_time_of_day(value, options = {})
+      return value unless value.respond_to?(:seconds)
+
+      format = options[:format] || DEFAULT_FORMATS.first
+      time_format = TimeFormat.translate_format(format)
+
+      time_of_day = seconds_to_time_of_day(value, time_format)
+
+      options[:omit_minutes_at_full_hour] ? TimeOfDay.omit_minutes_at_full_hour(time_of_day) : time_of_day
+    end
+
+    def self.seconds_to_time_of_day(value, time_format)
       # Switch to beginning of year to prevent wrong conversion 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 = Time.current.beginning_of_year.at_midnight + value.seconds
 
       time_of_day = time.strftime(time_format)
 
@@ -13,5 +24,6 @@ module TimeOfDayAttr
         time_of_day
       end
     end
+    private_class_method :seconds_to_time_of_day
   end
 end

data/lib/time_of_day_attr/time_format.rb

@@ -0,0 +1,8 @@
+module TimeOfDayAttr
+  module TimeFormat
+    def self.translate_format(format)
+      translate = format.is_a?(Symbol)
+      translate ? I18n.translate("time_of_day.formats.#{format}") : format
+    end
+  end
+end

data/lib/time_of_day_attr/time_of_day.rb

@@ -1,18 +1,48 @@
 module TimeOfDayAttr
-  TimeOfDay = Struct.new(:value) do
-    def to_seconds(time_format)
-      time = Time.strptime(value, time_format)
-      # Switch to beginning of year to prevent wrong conversion on the day of time change
-      # see https://en.wikipedia.org/wiki/Daylight_saving_time
-      time = time.change(month: 1, day: 1)
+  module TimeOfDay
+    def self.convert_to_seconds(time_of_day, options = {})
+      formats = options[:formats] || DEFAULT_FORMATS
+      catch(:out_of_range) do
+        formats.each do |format|
+          time_format = TimeFormat.translate_format(format)
+          seconds = time_of_day_to_seconds(time_of_day, time_format)
+          return seconds if seconds
+        end
+      end
+      nil
+    end
 
-      seconds = time.seconds_since_midnight.to_i
+    def self.omit_minutes_at_full_hour(time_of_day)
+      time_of_day.end_with?('00') ? time_of_day[0...-3] : time_of_day
+    end
 
-      if seconds.zero? && value.starts_with?('24')
-        24.hours.to_i
-      else
-        seconds
-      end
+    def self.seconds_since_midnight(time_of_day, time)
+      seconds = time.seconds_since_midnight
+      seconds = 24.hours if time_of_day_24_00?(time_of_day, seconds)
+      seconds.to_i
+    end
+    private_class_method :seconds_since_midnight
+
+    def self.time_of_day_24_00?(time_of_day, seconds)
+      time_of_day.starts_with?('24') && seconds.zero?
+    end
+    private_class_method :time_of_day_24_00?
+
+    def self.time_of_day_to_seconds(time_of_day, time_format)
+      time = time_of_day_to_time(time_of_day, time_format)
+      return unless time
+      seconds_since_midnight(time_of_day, time)
+    end
+    private_class_method :time_of_day_to_seconds
+
+    def self.time_of_day_to_time(time_of_day, time_format)
+      time = Time.strptime(time_of_day, time_format)
+      # Switch to beginning of year to prevent wrong conversion on the day of time change
+      # see https://en.wikipedia.org/wiki/Daylight_saving_time
+      time.change(month: 1, day: 1)
+    rescue ArgumentError => e
+      throw(:out_of_range) if e.message.include?('out of range')
     end
+    private_class_method :time_of_day_to_time
   end
 end

data/lib/time_of_day_attr.rb

@@ -1,51 +1,23 @@
-require 'time_of_day_attr/time_of_day'
-require 'time_of_day_attr/seconds'
-require 'time_of_day_attr/active_record_ext'
-require 'time_of_day_attr/form_builder_ext'
-
-formats = Dir[File.join(File.dirname(__FILE__), '../config/locales/*.yml')]
-I18n.load_path.concat(formats)
-
 module TimeOfDayAttr
-  DEFAULT_FORMATS = [:default, :hour].freeze
-
-  class << self
-    def delocalize(value, options = {})
-      time_of_day = TimeOfDay.new(value)
-
-      formats = options[:formats] || DEFAULT_FORMATS
-
-      delocalized_values = formats.map do |format|
-        begin
-          time_of_day.to_seconds(time_format(format))
-        rescue ArgumentError => e
-          return nil if e.message.include?('out of range')
-          next
-        end
-      end
-
-      delocalized_values.compact.first
-    end
+  DEFAULT_FORMATS = %i[default hour].freeze
 
-    def localize(value, options = {})
-      return value unless value.respond_to?(:seconds)
+  autoload :ActiveRecordExtension, 'time_of_day_attr/active_record_extension'
+  autoload :FormBuilderExtension, 'time_of_day_attr/form_builder_extension'
+  autoload :Seconds, 'time_of_day_attr/seconds'
+  autoload :TimeFormat, 'time_of_day_attr/time_format'
+  autoload :TimeOfDay, 'time_of_day_attr/time_of_day'
 
-      format = options[:format] || DEFAULT_FORMATS.first
+  require 'i18n'
+  I18n.load_path << File.expand_path('../config/locales/time_of_day.en.yml', __dir__)
+  I18n.load_path << File.expand_path('../config/locales/time_of_day.de.yml', __dir__)
 
-      time_of_day = Seconds.new(value).to_time_of_day(time_format(format))
-
-      omit_minutes = options[:omit_minutes_at_full_hour] && time_of_day.end_with?('00')
-
-      omit_minutes ? time_of_day[0...-3] : time_of_day
-    end
-    alias l localize
-
-    private
-
-    def time_format(format)
-      translate = format.is_a?(Symbol)
+  def self.delocalize(time_of_day, options = {})
+    TimeOfDay.convert_to_seconds(time_of_day, options)
+  end
 
-      translate ? I18n.translate("time_of_day.formats.#{format}") : format
-    end
+  def self.localize(seconds, options = {})
+    Seconds.convert_to_time_of_day(seconds, options)
   end
 end
+
+require 'time_of_day_attr/railtie' if defined?(Rails)

data/test/{active_record_ext_test.rb → active_record_extension_test.rb}

@@ -4,7 +4,7 @@ ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:'
 require_relative 'schema'
 require_relative 'models/business_hour'
 
-class ActiveRecordExtTest < ActiveSupport::TestCase
+class ActiveRecordExtensionTest < ActiveSupport::TestCase
   context 'time of day value' do
     setup do
       @business_hour = BusinessHour.new(opening: '9:00', closing: '17:00')

data/test/models/business_hour.rb

@@ -1,4 +1,8 @@
+# rubocop:disable Rails/ApplicationRecord
 class BusinessHour < ActiveRecord::Base
+  # rubocop:enable Rails/ApplicationRecord
+  include TimeOfDayAttr::ActiveRecordExtension
+
   attr_reader :tracked_opening, :tracked_closing
 
   time_of_day_attr :opening

data/test/time_of_day_attr/seconds_test.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+
+module TimeOfDayAttr
+  class TimeOfDayTest < ActiveSupport::TestCase
+    context '::convert_to_time_of_day' do
+      should 'convert seconds to time of day' do
+        assert_equal ' 9:00', Seconds.convert_to_time_of_day(32_400)
+        assert_equal '14:45', Seconds.convert_to_time_of_day(53_100)
+      end
+
+      should 'omit minutes at full hour' do
+        assert_equal ' 9',    Seconds.convert_to_time_of_day(32_400, omit_minutes_at_full_hour: true)
+        assert_equal '14',    Seconds.convert_to_time_of_day(50_400, omit_minutes_at_full_hour: true)
+        assert_equal '14:45', Seconds.convert_to_time_of_day(53_100, omit_minutes_at_full_hour: true)
+      end
+
+      should 'convert nil to nil' do
+        assert_nil Seconds.convert_to_time_of_day(nil)
+      end
+
+      should 'support 24 hours' do
+        assert_equal ' 0:00', Seconds.convert_to_time_of_day(0)
+        assert_equal '24:00', Seconds.convert_to_time_of_day(86_400)
+        assert_equal ' 0', Seconds.convert_to_time_of_day(0, omit_minutes_at_full_hour: true)
+        assert_equal '24', Seconds.convert_to_time_of_day(86_400, omit_minutes_at_full_hour: true)
+      end
+    end
+  end
+end

data/test/time_of_day_attr/time_of_day_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+module TimeOfDayAttr
+  class TimeOfDayTest < ActiveSupport::TestCase
+    context '::convert_to_seconds' do
+      should 'convert time of day to seconds' do
+        assert_equal 36_000, TimeOfDay.convert_to_seconds('10:00')
+        assert_equal 55_800, TimeOfDay.convert_to_seconds('15:30')
+        assert_equal 61_140, TimeOfDay.convert_to_seconds('16:59')
+        assert_equal 32_400, TimeOfDay.convert_to_seconds('9:00')
+        assert_equal 32_400, TimeOfDay.convert_to_seconds('09:00')
+        assert_equal 32_400, TimeOfDay.convert_to_seconds('9', formats: [:hour])
+      end
+
+      should 'convert out of range time of day to nil' do
+        assert_nil TimeOfDay.convert_to_seconds('25:00')
+        assert_nil TimeOfDay.convert_to_seconds('24:30')
+      end
+    end
+  end
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: time_of_day_attr
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0.beta.1
 platform: ruby
 authors:
 - Clemens Teichmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2018-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -39,8 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 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.
+  The value in seconds can be used for calculations and validations.
 email:
 - clemens_t@web.de
 executables: []
@@ -52,16 +51,18 @@ files:
 - config/locales/time_of_day.de.yml
 - config/locales/time_of_day.en.yml
 - lib/time_of_day_attr.rb
-- lib/time_of_day_attr/active_record_ext.rb
+- lib/time_of_day_attr/active_record_extension.rb
 - lib/time_of_day_attr/form_builder_ext.rb
+- lib/time_of_day_attr/railtie.rb
 - lib/time_of_day_attr/seconds.rb
+- lib/time_of_day_attr/time_format.rb
 - lib/time_of_day_attr/time_of_day.rb
-- lib/time_of_day_attr/version.rb
-- test/active_record_ext_test.rb
+- test/active_record_extension_test.rb
 - test/models/business_hour.rb
 - test/schema.rb
 - test/test_helper.rb
-- test/time_of_day_attr_test.rb
+- test/time_of_day_attr/seconds_test.rb
+- test/time_of_day_attr/time_of_day_test.rb
 homepage: https://github.com/clemenst/time_of_day_attr
 licenses:
 - MIT
@@ -77,18 +78,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Time of day attributes for your Rails model
 test_files:
-- test/schema.rb
-- test/models/business_hour.rb
-- test/active_record_ext_test.rb
-- test/time_of_day_attr_test.rb
 - test/test_helper.rb
+- test/time_of_day_attr/seconds_test.rb
+- test/time_of_day_attr/time_of_day_test.rb
+- test/models/business_hour.rb
+- test/schema.rb
+- test/active_record_extension_test.rb

data/lib/time_of_day_attr/active_record_ext.rb

@@ -1,35 +0,0 @@
-require 'active_record'
-
-module TimeOfDayAttr
-  module ActiveRecordExt
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      def time_of_day_attr(*attrs)
-        options = attrs.extract_options!
-
-        writers = Module.new do
-          attrs.each do |attr|
-            define_method("#{attr}=") do |value|
-              if value.is_a?(String)
-                delocalized_value = TimeOfDayAttr.delocalize(value, options)
-                super(delocalized_value)
-              else
-                super(value)
-              end
-            end
-          end
-        end
-
-        if options[:prepend]
-          prepend writers
-        else
-          include writers
-        end
-      end
-    end
-  end
-end
-ActiveSupport.on_load(:active_record) do
-  include TimeOfDayAttr::ActiveRecordExt
-end

data/lib/time_of_day_attr/version.rb

@@ -1,3 +0,0 @@
-module TimeOfDayAttr
-  VERSION = '2.0.1'.freeze
-end

data/test/time_of_day_attr_test.rb

@@ -1,43 +0,0 @@
-require 'test_helper'
-
-class TimeOfDayAttrTest < ActiveSupport::TestCase
-  context '::localize' do
-    should 'convert seconds to time of day' do
-      assert_equal ' 9:00', TimeOfDayAttr.localize(32_400)
-      assert_equal '14:45', TimeOfDayAttr.localize(53_100)
-    end
-
-    should 'omit minutes at full hour' do
-      assert_equal ' 9',      TimeOfDayAttr.localize(32_400, omit_minutes_at_full_hour: true)
-      assert_equal '14',      TimeOfDayAttr.localize(50_400, omit_minutes_at_full_hour: true)
-      assert_equal '14:45',   TimeOfDayAttr.localize(53_100, omit_minutes_at_full_hour: true)
-    end
-
-    should 'convert nil to nil' do
-      assert_nil TimeOfDayAttr.localize(nil)
-    end
-
-    should 'support 24 hours' do
-      assert_equal ' 0:00', TimeOfDayAttr.localize(0)
-      assert_equal '24:00', TimeOfDayAttr.localize(86_400)
-      assert_equal ' 0', TimeOfDayAttr.localize(0, omit_minutes_at_full_hour: true)
-      assert_equal '24', TimeOfDayAttr.localize(86_400, omit_minutes_at_full_hour: true)
-    end
-  end
-
-  context '::delocaize' do
-    should 'convert time of day to seconds' do
-      assert_equal 36_000, TimeOfDayAttr.delocalize('10:00')
-      assert_equal 55_800, TimeOfDayAttr.delocalize('15:30')
-      assert_equal 61_140, TimeOfDayAttr.delocalize('16:59')
-      assert_equal 32_400, TimeOfDayAttr.delocalize('9:00')
-      assert_equal 32_400, TimeOfDayAttr.delocalize('09:00')
-      assert_equal 32_400, TimeOfDayAttr.delocalize('9', formats: [:hour])
-    end
-
-    should 'convert out of range time of day to nil' do
-      assert_nil TimeOfDayAttr.delocalize('25:00')
-      assert_nil TimeOfDayAttr.delocalize('24:30')
-    end
-  end
-end