validates_timeliness 3.0.15 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a60055680e49760bf31b2a820e30d35c125701e5
-  data.tar.gz: 846e163f120d01337b2e55356cc1a01fca513ea7
+  metadata.gz: c730e7683c67e1fce0a8a2e0b6dcba331b812e36
+  data.tar.gz: 904f0cfe44ca9d764e051d1d656cf34cbb6a5dba
 SHA512:
-  metadata.gz: 46b5e4bfba055d99c8e6ba8dc3e122bc8e3dc872efb35ee957802f7b3f827b92ec5efd19d64f2054f2597656b91409432a7dcc731b48090cd91603e6323e5fb4
-  data.tar.gz: 93ed8ea91b878022a29aee4c5ad0b0586e4c1cff6cc531168c7bfe2aab4e8a232b26c4dfe683bdc99c7d3897dc97b4d91f2c4af0d5e4dffdf90f6362aea3f581
+  metadata.gz: fd5326ac226351463fab7d317fadfb96bab6858b0231cfa1ee2b3fb49b974e6aeacf9cff498a22088132cd675d823054db6f0b622ea6db034d0884f0cdfab1e1
+  data.tar.gz: fe62be44d7d398c17d5762f91335e11187afdd8e2cb3f15e69de95feb8b764b03773f038c009ca72e299a793378ee680e8ea7ebcb62aaec341ef17b02fa1f747

data/.travis.yml

@@ -0,0 +1,21 @@
+language: ruby
+cache: bundler
+
+gemfile:
+  - gemfiles/rails_4_0.gemfile
+  - gemfiles/rails_4_1.gemfile
+  - gemfiles/rails_4_2.gemfile
+
+rvm:
+  - "2.0.0"
+  - "2.2.0"
+  - "2.3.0"
+
+script: 'bundle exec rake'
+
+notifications:
+  email:
+    recipients:
+      - adam.meehan@gmail.com
+    on_failure: change
+    on_success: never

data/CHANGELOG.rdoc

@@ -1,8 +1,3 @@
-= 3.0.15 [2015-12-29]
-* Fixes mongoid 3 support and removes mongoid 2 support(johnnyshields)
-* Some documentation/comments tidying
-* Some general tidying up
-
 = 3.0.14 [2012-08-23]
 * Fix for using validates :timeliness => {} form to correctly add attributes to timeliness validated attributes.
 

data/README.rdoc

@@ -5,9 +5,9 @@
 
 == Description
 
-Complete validation of dates, times and datetimes for Rails 3.x and ActiveModel.
+Complete validation of dates, times and datetimes for Rails 4.x and ActiveModel.
 
-If you a looking for the old version for Rails 2.x go here[http://github.com/adzap/validates_timeliness/tree/v2.3].
+If you a looking for the old version for Rails 3.x go here[http://github.com/adzap/validates_timeliness/tree/v3.x].
 
 
 == Features
@@ -30,7 +30,7 @@ If you a looking for the old version for Rails 2.x go here[http://github.com/adz
 == Installation
 
   # in Gemfile
-  gem 'validates_timeliness', '~> 3.0'
+  gem 'validates_timeliness', '~> 4.0'
 
   # Run bundler
   $ bundle install
@@ -137,8 +137,8 @@ like so
 
   ValidatesTimeliness.setup do |config|
 
-    # Extend ORM/ODMs for full support (:active_record, :mongoid).
-    config.extend_orms = [ :mongoid ]
+    # Extend ORM/ODMs for full support (:active_record).
+    config.extend_orms = [ :active_record ]
 
   end
 

data/gemfiles/rails_4_0.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 4.0.0"
+gem "rspec", "~> 3.0.0"
+gem "rspec-rails", "~> 3.0.0"
+gem "timecop"
+gem "rspec_tag_matchers"
+gem "byebug"
+gem "appraisal"
+gem "sqlite3"
+gem "nokogiri", "1.6.7"
+
+group :active_record do
+  gem "sqlite3-ruby", :require => "sqlite3"
+end
+
+gemspec :path => "../"

data/gemfiles/rails_4_1.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 4.1.0"
+gem "rspec", "~> 3.0.0"
+gem "rspec-rails", "~> 3.0.0"
+gem "timecop"
+gem "rspec_tag_matchers"
+gem "byebug"
+gem "appraisal"
+gem "sqlite3"
+gem "nokogiri", "1.6.7"
+
+group :active_record do
+  gem "sqlite3-ruby", :require => "sqlite3"
+end
+
+gemspec :path => "../"

data/gemfiles/rails_4_2.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+gem "rspec", "~> 3.0.0"
+gem "rspec-rails", "~> 3.0.0"
+gem "timecop"
+gem "rspec_tag_matchers"
+gem "byebug"
+gem "appraisal"
+gem "sqlite3"
+gem "nokogiri", "1.6.7"
+
+group :active_record do
+  gem "sqlite3-ruby", :require => "sqlite3"
+end
+
+gemspec :path => "../"

data/lib/generators/validates_timeliness/templates/validates_timeliness.rb

@@ -1,6 +1,6 @@
 ValidatesTimeliness.setup do |config|
-  # Extend ORM/ODMs for full support (:active_record, :mongoid).
-  # config.extend_orms = [ :active_record ]
+  # Extend ORM/ODMs for full support (:active_record included).
+  config.extend_orms = [ :active_record ]
   #
   # Default timezone
   # config.default_timezone = :utc

data/lib/validates_timeliness.rb

@@ -28,7 +28,7 @@ module ValidatesTimeliness
     attr_accessor :extend_orms, :ignore_restriction_errors, :restriction_shorthand_symbols, :use_plugin_parser
   end
 
-  # Extend ORM/ODMs for full support (:active_record, :mongoid).
+  # Extend ORM/ODMs for full support (:active_record).
   self.extend_orms = []
 
   # Ignore errors when restriction options are evaluated

data/lib/validates_timeliness/attribute_methods.rb

@@ -20,13 +20,6 @@ module ValidatesTimeliness
         :datetime
       end
 
-      def undefine_attribute_methods
-        super
-        undefine_timeliness_attribute_methods
-      end
-
-      protected
-
       def define_timeliness_methods(before_type_cast=false)
         return if timeliness_validated_attributes.blank?
         timeliness_validated_attributes.each do |attr_name|
@@ -34,55 +27,62 @@ module ValidatesTimeliness
         end
       end
 
+      def generated_timeliness_methods
+        @generated_timeliness_methods ||= Module.new { |m| 
+          extend Mutex_m
+        }.tap { |mod| include mod }
+      end
+
+      def undefine_attribute_methods
+        super.tap { undefine_timeliness_attribute_methods }
+      end
+
+      def undefine_timeliness_attribute_methods
+        generated_timeliness_methods.synchronize do
+          generated_timeliness_methods.module_eval do
+            instance_methods.each { |m| undef_method(m) } 
+          end
+        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)
-        method_body, line = <<-EOV, __LINE__ + 1
+        generated_timeliness_methods.module_eval <<-STR, __FILE__, __LINE__ + 1
           def #{attr_name}=(value)
-            original_value = value
-            @timeliness_cache ||= {}
-            @timeliness_cache["#{attr_name}"] = original_value
-            #{ "if value.is_a?(String)\n#{timeliness_type_cast_code(attr_name, 'value')}\nend" if ValidatesTimeliness.use_plugin_parser }
-            
-            super(value)
+            write_timeliness_attribute('#{attr_name}', value)
           end
-        EOV
-        generated_timeliness_methods.module_eval(method_body, __FILE__, line)
+        STR
       end
 
       def define_timeliness_before_type_cast_method(attr_name)
-        method_body, line = <<-EOV, __LINE__ + 1
+        generated_timeliness_methods.module_eval <<-STR, __FILE__, __LINE__ + 1
           def #{attr_name}_before_type_cast
-            _timeliness_raw_value_for('#{attr_name}') || @attributes['#{attr_name}']
+            read_timeliness_attribute_before_type_cast('#{attr_name}')
           end
-        EOV
-        generated_timeliness_methods.module_eval(method_body, __FILE__, line)
+        STR
       end
+    end
 
-      def timeliness_type_cast_code(attr_name, var_name)
-        type = timeliness_attribute_type(attr_name)
-        timezone_aware = timeliness_attribute_timezone_aware?(attr_name)
-        timezone = :current if timezone_aware
-
-        "#{var_name} = Timeliness::Parser.parse(#{var_name}, :#{type}, :zone => #{timezone.inspect})"
-      end
+    def write_timeliness_attribute(attr_name, value)
+      @timeliness_cache ||= {}
+      @timeliness_cache[attr_name] = value
 
-      def generated_timeliness_methods
-        @generated_timeliness_methods ||= Module.new.tap { |m| include(m) }
+      if ValidatesTimeliness.use_plugin_parser
+        timezone = :current if self.class.timeliness_attribute_timezone_aware?(attr_name)
+        value = Timeliness::Parser.parse(value, self.class.timeliness_attribute_type(attr_name), :zone => timezone)
       end
 
-      def undefine_timeliness_attribute_methods
-        generated_timeliness_methods.module_eval do
-          instance_methods.each { |m| undef_method(m) }
-        end
-      end
+      @attributes[attr_name] = value
     end
 
-    def _timeliness_raw_value_for(attr_name)
-      @timeliness_cache && @timeliness_cache[attr_name]
+    def read_timeliness_attribute_before_type_cast(attr_name)
+      @timeliness_cache && @timeliness_cache[attr_name] || @attributes[attr_name]
     end
 
     def _clear_timeliness_cache

data/lib/validates_timeliness/extensions.rb

@@ -1,14 +1,13 @@
 module ValidatesTimeliness
   module Extensions
-    autoload :DateTimeSelect,        'validates_timeliness/extensions/date_time_select'
-    autoload :MultiparameterHandler, 'validates_timeliness/extensions/multiparameter_handler'
+    autoload :DateTimeSelect, 'validates_timeliness/extensions/date_time_select'
   end
 
   def self.enable_date_time_select_extension!
-    ::ActionView::Helpers::InstanceTag.send(:include, ValidatesTimeliness::Extensions::DateTimeSelect)
+    ::ActionView::Helpers::Tags::DateSelect.send(:include, ValidatesTimeliness::Extensions::DateTimeSelect)
   end
 
   def self.enable_multiparameter_extension!
-    ::ActiveRecord::Base.send(:include, ValidatesTimeliness::Extensions::MultiparameterHandler)
+    require 'validates_timeliness/extensions/multiparameter_handler'
   end
 end

data/lib/validates_timeliness/extensions/date_time_select.rb

@@ -9,7 +9,6 @@ module ValidatesTimeliness
       # It's a minor usability improvement which is rarely an issue for the user.
 
       included do
-        alias_method_chain :datetime_selector, :timeliness
         alias_method_chain :value, :timeliness
       end
 
@@ -33,15 +32,8 @@ module ValidatesTimeliness
         end
       end
 
-      def datetime_selector_with_timeliness(*args)
-        @timeliness_date_or_time_tag = true
-        datetime_selector_without_timeliness(*args)
-      end
-
       def value_with_timeliness(object)
-        unless @timeliness_date_or_time_tag && @template_object.params[@object_name]
-          return value_without_timeliness(object)
-        end
+        return value_without_timeliness(object) unless @template_object.params[@object_name]
 
         @template_object.params[@object_name]
 
@@ -56,6 +48,7 @@ module ValidatesTimeliness
 
         TimelinessDateTime.new(*values)
       end
+
     end
   end
 end

data/lib/validates_timeliness/extensions/multiparameter_handler.rb

@@ -1,80 +1,74 @@
-module ValidatesTimeliness
-  module Extensions
-    module MultiparameterHandler
-      extend ActiveSupport::Concern
+ActiveRecord::AttributeAssignment::MultiparameterAttribute.class_eval do
+  private
 
-      # Stricter handling of date and time values from multiparameter 
-      # assignment from the date/time select view helpers
+  # Yield if date values are valid
+  def validate_multiparameter_date_values(set_values)
+    if set_values[0..2].all?{ |v| v.present? } && Date.valid_civil?(*set_values[0..2])
+      yield
+    else
+      invalid_multiparameter_date_or_time_as_string(set_values)
+    end
+  end
 
-      included do
-        alias_method_chain :instantiate_time_object, :timeliness
-        alias_method :execute_callstack_for_multiparameter_attributes, :execute_callstack_for_multiparameter_attributes_with_timeliness
-        alias_method :read_value_from_parameter, :read_value_from_parameter_with_timeliness
-      end
+  def invalid_multiparameter_date_or_time_as_string(values)
+    value =  [values[0], *values[1..2].map {|s| s.to_s.rjust(2,"0")} ].join("-")
+    value += ' ' + values[3..5].map {|s| s.to_s.rjust(2, "0") }.join(":") unless values[3..5].empty?
+    value
+  end
 
-      private
+  def instantiate_time_object(set_values)
+    raise if set_values.any?(&:nil?)
 
-      def invalid_multiparameter_date_or_time_as_string(values)
-        value =  [values[0], *values[1..2].map {|s| s.to_s.rjust(2,"0")} ].join("-")
-        value += ' ' + values[3..5].map {|s| s.to_s.rjust(2, "0") }.join(":") unless values[3..5].empty?
-        value
-      end
+    validate_multiparameter_date_values(set_values) {
+      set_values = set_values.map {|v| v.is_a?(String) ? v.strip : v }
 
-      def instantiate_time_object_with_timeliness(name, values)
-        validate_multiparameter_date_values(values) {
-          instantiate_time_object_without_timeliness(name, values)
-        }
+      if object.class.send(:create_time_zone_conversion_attribute?, name, cast_type_or_column)
+        Time.zone.local(*set_values)
+      else
+        Time.send(object.class.default_timezone, *set_values)
       end
+    }
+  rescue
+    invalid_multiparameter_date_or_time_as_string(set_values)
+  end
 
-      def instantiate_date_object(name, values)
-        validate_multiparameter_date_values(values) {
-          Date.new(*values)
-        }
+  def read_time
+    # If column is a :time (and not :date or :timestamp) there is no need to validate if
+    # there are year/month/day fields
+    if cast_type_or_column.type == :time
+      # if the column is a time set the values to their defaults as January 1, 1970, but only if they're nil
+      { 1 => 1970, 2 => 1, 3 => 1 }.each do |key,value|
+        values[key] ||= value
       end
+    end
 
-      # Yield if date values are valid
-      def validate_multiparameter_date_values(values)
-        if values[0..2].all?{ |v| v.present? } && Date.valid_civil?(*values[0..2])
-          yield
-        else
-          invalid_multiparameter_date_or_time_as_string(values)
-        end
-      end
+    max_position = extract_max_param(6)
+    set_values   = values.values_at(*(1..max_position))
 
-      def read_value_from_parameter_with_timeliness(name, values_from_param)
-        klass = (self.class.reflect_on_aggregation(name.to_sym) || column_for_attribute(name)).klass
-        values = values_from_param.is_a?(Hash) ? values_from_param.to_a.sort_by(&:first).map(&:last) : values_from_param
+    instantiate_time_object(set_values)
+  end
 
-        if values.empty? || values.all?{ |v| v.nil? }
-          nil
-        elsif klass == Time
-          instantiate_time_object(name, values)
-        elsif klass == Date
-          instantiate_date_object(name, values)
-        else
-          if respond_to?(:read_other_parameter_value)
-            read_date_parameter_value(name, values_from_param)
-          else
-            klass.new(*values)
-          end
-        end
-      end
+  def read_date
+    set_values = values.values_at(1,2,3).map {|v| v.is_a?(String) ? v.strip : v }
+    
+    if set_values.any? { |v| v.is_a?(String) }
+      Timeliness.parse(set_values.join('-'), :date).try(:to_date) or raise TypeError
+    else
+      Date.new(*set_values)
+    end
+  rescue TypeError, ArgumentError, NoMethodError => ex # if Date.new raises an exception on an invalid date
+    # Date.new with nil values throws NoMethodError
+    raise ex if ex.is_a?(NoMethodError) && ex.message !~ /undefined method `div' for/
+    invalid_multiparameter_date_or_time_as_string(set_values)
+  end
 
-      def execute_callstack_for_multiparameter_attributes_with_timeliness(callstack)
-        errors = []
-        callstack.each do |name, values_with_empty_parameters|
-          begin
-            send(name + "=", read_value_from_parameter(name, values_with_empty_parameters))
-          rescue => ex
-            values = values_with_empty_parameters.is_a?(Hash) ? values_with_empty_parameters.values : values_with_empty_parameters 
-            errors << ActiveRecord::AttributeAssignmentError.new("error on assignment #{values.inspect} to #{name}", ex, name)
-          end
-        end
-        unless errors.empty?
-          raise ActiveRecord::MultiparameterAssignmentErrors.new(errors), "#{errors.size} error(s) on assignment of multiparameter attributes"
-        end
-      end
+  # Cast type is v4.2 and column before
+  def cast_type_or_column
+    @cast_type || @column
+  end
 
-    end
+  def timezone_conversion_attribute?
+    object.class.send(:create_time_zone_conversion_attribute?, name, column)
   end
+
 end