validates_timeliness 4.1.1 → 5.0.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 942eb4506928d381dae7a7356206a045a57d8085cc9ef8ea6e96801186274bea
-  data.tar.gz: 6991d619ce2c4872c16e1c757f6de78c8f1761c6b5194f10b0312158431aba15
+  metadata.gz: 66a4ad3b4dbb1cda9d19921e18b17bf30029679689d331aafa699a2a3bb447a5
+  data.tar.gz: 1877d86f268f923d7dd344f2fc6965fbf8d5a207d3d669e3255f094709520a72
 SHA512:
-  metadata.gz: abf74b01270b55f495fd10ca1e5abcdfe899742499dcb8c7af17b11f68aa04143b843d3b65c9cbafbd6eae1f56a4a9d4959b9bd8af6ec42a1c7bcc65055689d1
-  data.tar.gz: afb9c7e4657292e244749548a8669222da167410d7a28831c665f6a86fa88e0415e3daecbd4580f8c2eec24e754c59cfe7ba2a232256c7a769b0ff2805aea6a5
+  metadata.gz: a3df0f1b7817dbf16b3d9c502488974a2acbbe858d65641a186cf73afb2499d10de484918ff20097396cf2f9295dd88c083de64328510bed53b112e058439663
+  data.tar.gz: 1c9a48cdc41249bed2e75b9087b848e30dd5d9743489bac304aa4a255c374053437f397495b2447ceea1f2af1ae383e5e1b421055d68a86d0abbcde335c7fc46

data/.travis.yml

@@ -1,18 +1,14 @@
 language: ruby
-before_install:
-  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
-  - gem install bundler -v '< 2'
-before_script:
-  - bundle install
+before_install: gem install bundler
 cache: bundler
-bundler_args: --verbose
 
-matrix:
-  include:
-    - rvm: "2.4.6"
-      gemfile: gemfiles/rails_4_2.gemfile
-    - rvm: "2.5.5"
-      gemfile: gemfiles/rails_4_2.gemfile
+gemfile:
+  - gemfiles/rails_5_0.gemfile
+  - gemfiles/rails_5_1.gemfile
+  - gemfiles/rails_5_2.gemfile
+
+rvm:
+  - "2.5.1"
 
 script: 'bundle exec rspec'
 

data/CHANGELOG.rdoc

@@ -1,14 +1,10 @@
-= 4.1.1 [2019-08-06]
-* Add initializer to ensure Timeliness default ambigiuous date handling config
-  in Timeliness v0.4.1+ is set correctly when using `use_us_formats` or
-  `use_euro_formats` switcher to set default.
-* Removed build support for Ruby 2.3 and Rails 4.0 and 4.1 to EOL official
-  support for those.
-
-= 4.1.0 [2019-06-11]
-* Relaxed Timeliness dependency version to >= 0.3.10 and < 1, which allows
-  version 0.4 with threadsafety fix for use_us_formats and use_euro_formats
-  hot switching in a request.
+= [UNRELEASED]
+* Fix DateTimeSelect extension support (AquisTech)
+
+Breaking Changes
+* Update Multiparameter extension to use ActiveRecord type classes with multiparameter handling
+  which stores a hash of multiparamter values as the value before type cast, no longer a mushed datetime string
+* Removed all custom plugin attribute methods and method overrides in favour using ActiveModel type system
 
 = 4.0.2 [2016-01-07]
 * Fix undefine_generated_methods ivar guard setting to false

data/README.rdoc

@@ -1,14 +1,13 @@
-= ValidatesTimeliness
+= ValidatesTimeliness {<img src="https://travis-ci.org/adzap/validates_timeliness.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/adzap/validates_timeliness]
 
 * Source:  http://github.com/adzap/validates_timeliness
 * Issues:  http://github.com/adzap/validates_timeliness/issues
 
 == Description
 
-Complete validation of dates, times and datetimes for Rails 4.2.x and ActiveModel. Rails 4.0.x and 4.1.x may
-still work but official support has ended.
+Complete validation of dates, times and datetimes for Rails 5.0.x and ActiveModel.
 
-If you a looking for the old version for Rails 3.x go here[http://github.com/adzap/validates_timeliness/tree/v3.x].
+If you a looking for the old version for Rails 4.x go here [https://github.com/adzap/validates_timeliness/tree/4-0-stable].
 
 
 == Features
@@ -31,7 +30,7 @@ If you a looking for the old version for Rails 3.x go here[http://github.com/adz
 == Installation
 
   # in Gemfile
-  gem 'validates_timeliness', '~> 4.1'
+  gem 'validates_timeliness', '~> 5.0.0.pre'
 
   # Run bundler
   $ bundle install

data/gemfiles/rails_5_0.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 5.0.0"
+gem "rspec"
+gem "rspec-rails", "~> 3.7"
+gem "timecop"
+gem "byebug"
+gem "appraisal"
+gem "sqlite3"
+gem "nokogiri", "~> 1.8"
+
+group :active_record do
+  gem "sqlite3-ruby", require: "sqlite3"
+end
+
+gemspec path: "../"

data/gemfiles/rails_5_1.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 5.1.0"
+gem "rspec"
+gem "rspec-rails", "~> 3.7"
+gem "timecop"
+gem "byebug"
+gem "appraisal"
+gem "sqlite3"
+gem "nokogiri", "~> 1.8"
+
+group :active_record do
+  gem "sqlite3-ruby", require: "sqlite3"
+end
+
+gemspec path: "../"

data/gemfiles/rails_5_2.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 5.2.0"
+gem "rspec"
+gem "rspec-rails", "~> 3.7"
+gem "timecop"
+gem "byebug"
+gem "appraisal"
+gem "sqlite3"
+gem "nokogiri", "~> 1.8"
+
+group :active_record do
+  gem "sqlite3-ruby", require: "sqlite3"
+end
+
+gemspec path: "../"

data/lib/validates_timeliness.rb

@@ -62,7 +62,7 @@ module ValidatesTimeliness
   def self.parser; Timeliness end
 end
 
-require 'validates_timeliness/conversion'
+require 'validates_timeliness/converter'
 require 'validates_timeliness/validator'
 require 'validates_timeliness/helper_methods'
 require 'validates_timeliness/attribute_methods'

data/lib/validates_timeliness/attribute_methods.rb

@@ -6,83 +6,44 @@ module ValidatesTimeliness
       class_attribute :timeliness_validated_attributes
       self.timeliness_validated_attributes = []
     end
+  end
+end
 
-    module ClassMethods
-
-      public
-      # Override in ORM shim
-      def timeliness_attribute_timezone_aware?(attr_name)
-        false
-      end
-
-      # Override in ORM shim
-      def timeliness_attribute_type(attr_name)
-        :datetime
-      end
-
-      def define_timeliness_methods(before_type_cast=false)
-        return if timeliness_validated_attributes.blank?
-        timeliness_validated_attributes.each do |attr_name|
-          define_attribute_timeliness_methods(attr_name, before_type_cast)
-        end
-      end
-
-      def generated_timeliness_methods
-        @generated_timeliness_methods ||= Module.new { |m| 
-          extend Mutex_m
-        }.tap { |mod| include mod }
-      end
-
-      def undefine_timeliness_attribute_methods
-        generated_timeliness_methods.module_eval do
-          instance_methods.each { |m| undef_method(m) } 
-        end
-      end
-
-      protected
-
-      def define_attribute_timeliness_methods(attr_name, before_type_cast=false)
-        define_timeliness_write_method(attr_name)
-        define_timeliness_before_type_cast_method(attr_name) if before_type_cast
-      end
-
-      def define_timeliness_write_method(attr_name)
-        generated_timeliness_methods.module_eval <<-STR, __FILE__, __LINE__ + 1
-          def #{attr_name}=(value)
-            write_timeliness_attribute('#{attr_name}', value)
-          end
-        STR
-      end
-
-      def define_timeliness_before_type_cast_method(attr_name)
-        generated_timeliness_methods.module_eval <<-STR, __FILE__, __LINE__ + 1
-          def #{attr_name}_before_type_cast
-            read_timeliness_attribute_before_type_cast('#{attr_name}')
-          end
-        STR
-      end
-    end
-
-    def write_timeliness_attribute(attr_name, value)
-      @timeliness_cache ||= {}
-      @timeliness_cache[attr_name] = value
+ActiveModel::Type::Date.class_eval do
+  # Module.new do |m|
+    def cast_value(value)
+      return super unless ValidatesTimeliness.use_plugin_parser
 
-      if ValidatesTimeliness.use_plugin_parser
-        type = self.class.timeliness_attribute_type(attr_name)
-        timezone = :current if self.class.timeliness_attribute_timezone_aware?(attr_name)
-        value = Timeliness::Parser.parse(value, type, :zone => timezone)
-        value = value.to_date if value && type == :date
+      if value.is_a?(::String)
+        return if value.empty?
+        value = Timeliness::Parser.parse(value, :date)
+        value.to_date if value
+      elsif value.respond_to?(:to_date)
+        value.to_date
+      else
+        value
       end
-
-      @attributes[attr_name] = value
     end
+  # end.tap { |mod| include mod }
+end
 
-    def read_timeliness_attribute_before_type_cast(attr_name)
-      @timeliness_cache && @timeliness_cache[attr_name] || @attributes[attr_name]
+ActiveModel::Type::Time.class_eval do
+  def user_input_in_time_zone(value)
+    if value.is_a?(String) && ValidatesTimeliness.use_plugin_parser
+      dummy_time_value = value.sub(/\A(\d\d\d\d-\d\d-\d\d |)/, Date.current.to_s + ' ')
+      Timeliness::Parser.parse(dummy_time_value, :datetime, zone: :current)
+    else
+      value.in_time_zone
     end
+  end
+end
 
-    def _clear_timeliness_cache
-      @timeliness_cache = {}
+ActiveModel::Type::DateTime.class_eval do
+  def user_input_in_time_zone(value)
+    if value.is_a?(String) && ValidatesTimeliness.use_plugin_parser
+      Timeliness::Parser.parse(value, :datetime, zone: :current)
+    else
+      value.in_time_zone
     end
   end
-end
+end

data/lib/validates_timeliness/{conversion.rb → converter.rb}

@@ -1,10 +1,18 @@
 module ValidatesTimeliness
-  module Conversion
+  class Converter
+    attr_reader :type, :format, :ignore_usec
 
-    def type_cast_value(value, type)
+    def initialize(type:, format: nil, ignore_usec: false, time_zone_aware: false)
+      @type = type
+      @format = format
+      @ignore_usec = ignore_usec
+      @time_zone_aware = time_zone_aware
+    end
+
+    def type_cast_value(value)
       return nil if value.nil? || !value.respond_to?(:to_time)
 
-      value = value.in_time_zone if value.acts_like?(:time) && @timezone_aware
+      value = value.in_time_zone if value.acts_like?(:time) && time_zone_aware?
       value = case type
       when :time
         dummy_time(value)
@@ -15,8 +23,8 @@ module ValidatesTimeliness
       else
         value
       end
-      if options[:ignore_usec] && value.is_a?(Time)
-        Timeliness::Parser.make_time(Array(value).reverse[4..9], (:current if @timezone_aware))
+      if ignore_usec && value.is_a?(Time)
+        Timeliness::Parser.make_time(Array(value).reverse[4..9], (:current if time_zone_aware?))
       else
         value
       end
@@ -24,30 +32,30 @@ module ValidatesTimeliness
 
     def dummy_time(value)
       time = if value.acts_like?(:time)
-        value = value.in_time_zone if @timezone_aware
+        value = value.in_time_zone if time_zone_aware?
         [value.hour, value.min, value.sec]
       else
         [0,0,0]
       end
       values = ValidatesTimeliness.dummy_date_for_time_type + time
-      Timeliness::Parser.make_time(values, (:current if @timezone_aware))
+      Timeliness::Parser.make_time(values, (:current if time_zone_aware?))
     end
 
-    def evaluate_option_value(value, record)
+    def evaluate(value, scope=nil)
       case value
       when Time, Date
         value
       when String
         parse(value)
       when Symbol
-        if !record.respond_to?(value) && restriction_shorthand?(value)
+        if !scope.respond_to?(value) && restriction_shorthand?(value)
           ValidatesTimeliness.restriction_shorthand_symbols[value].call
         else
-          evaluate_option_value(record.send(value), record)
+          evaluate(scope.send(value))
         end
       when Proc
-        result = value.arity > 0 ? value.call(record) : value.call
-        evaluate_option_value(result, record)
+        result = value.arity > 0 ? value.call(scope) : value.call
+        evaluate(result, scope)
       else
         value
       end
@@ -59,14 +67,18 @@ module ValidatesTimeliness
 
     def parse(value)
       return nil if value.nil?
+
       if ValidatesTimeliness.use_plugin_parser
-        Timeliness::Parser.parse(value, @type, :zone => (:current if @timezone_aware), :format => options[:format], :strict => false)
+        Timeliness::Parser.parse(value, type, zone: (:current if time_zone_aware?), format: format, strict: false)
       else
-        @timezone_aware ? Time.zone.parse(value) : value.to_time(ValidatesTimeliness.default_timezone)
+        time_zone_aware? ? Time.zone.parse(value) : value.to_time(ValidatesTimeliness.default_timezone)
       end
     rescue ArgumentError, TypeError
       nil
     end
 
+    def time_zone_aware?
+      @time_zone_aware
+    end
   end
 end

data/lib/validates_timeliness/extensions.rb

@@ -1,10 +1,10 @@
 module ValidatesTimeliness
   module Extensions
-    autoload :DateTimeSelect, 'validates_timeliness/extensions/date_time_select'
+    autoload :TimelinessDateTimeSelect, 'validates_timeliness/extensions/date_time_select'
   end
 
   def self.enable_date_time_select_extension!
-    ::ActionView::Helpers::Tags::DateSelect.send(:include, ValidatesTimeliness::Extensions::DateTimeSelect)
+    ::ActionView::Helpers::Tags::DateSelect.send(:prepend, ValidatesTimeliness::Extensions::TimelinessDateTimeSelect)
   end
 
   def self.enable_multiparameter_extension!

data/lib/validates_timeliness/extensions/date_time_select.rb

@@ -1,54 +1,50 @@
 module ValidatesTimeliness
   module Extensions
-    module DateTimeSelect
-      extend ActiveSupport::Concern
-
+    module TimelinessDateTimeSelect
       # Intercepts the date and time select helpers to reuse the values from
       # the params rather than the parsed value. This allows invalid date/time
       # values to be redisplayed instead of blanks to aid correction by the user.
       # It's a minor usability improvement which is rarely an issue for the user.
+      attr_accessor :object_name, :method_name, :template_object, :options, :html_options
 
-      included do
-        alias_method_chain :value, :timeliness
-      end
+      POSITION = {
+        :year => 1, :month => 2, :day => 3, :hour => 4, :min => 5, :sec => 6
+      }.freeze
 
-      class TimelinessDateTime
+      class DateTimeValue
         attr_accessor :year, :month, :day, :hour, :min, :sec
 
-        def initialize(year, month, day, hour, min, sec)
+        def initialize(year:, month:, day: nil, hour: nil, min: nil, sec: nil)
           @year, @month, @day, @hour, @min, @sec = year, month, day, hour, min, sec
         end
 
-        # adapted from activesupport/lib/active_support/core_ext/date_time/calculations.rb, line 36 (3.0.7)
         def change(options)
-          TimelinessDateTime.new(
-            options[:year]  || year,
-            options[:month] || month,
-            options[:day]   || day,
-            options[:hour]  || hour,
-            options[:min]   || (options[:hour] ? 0 : min),
-            options[:sec]   || ((options[:hour] || options[:min]) ? 0 : sec)
+          self.class.new(
+            year:  options.fetch(:year, year),
+            month: options.fetch(:month, month),
+            day:   options.fetch(:day, day),
+            hour:  options.fetch(:hour, hour),
+            min:   options.fetch(:min) { options[:hour] ? 0 : min },
+            sec:   options.fetch(:sec) { options[:hour] || options[:min] ? 0 : sec }
           )
         end
       end
 
-      def value_with_timeliness(object)
-        return value_without_timeliness(object) unless @template_object.params[@object_name]
-
-        @template_object.params[@object_name]
+      # Splat args to support Rails 5.0 which expects object, and 5.2 which doesn't
+      def value(*object)
+        return super unless @template_object.params[@object_name]
 
         pairs = @template_object.params[@object_name].select {|k,v| k =~ /^#{@method_name}\(/ }
-        return value_without_timeliness(object) if pairs.empty?
+        return super if pairs.empty?
 
-        values = [nil] * 6
-        pairs.map do |(param, value)|
-          position = param.scan(/\((\d+)\w+\)/).first.first
-          values[position.to_i-1] = value.to_i
+        values = {}
+        pairs.each_pair do |key, value|
+          position = key[/\((\d+)\w+\)/, 1]
+          values[POSITION.key(position.to_i)] = value.to_i
         end
 
-        TimelinessDateTime.new(*values)
+        DateTimeValue.new(values)
       end
-
     end
   end
 end