validates_timeliness 7.0.0.beta1 → 7.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 284d18473a0007c273fc4608579b619afac6a3809dfdcd12864d6aeea30c6f17
-  data.tar.gz: 12d2db9663bb6c80a643d7c7365fc4d44218a64a9b69feacb6d060dc737ddd93
+  metadata.gz: 291ec2c50666a8ce39654fb9c065ca22a27cc91413039a41faa1045e5143ee7e
+  data.tar.gz: 8ec042268f1524503c5daf4e0038769d64b0be9b0329281137a569579a5d991a
 SHA512:
-  metadata.gz: 77eb167f597fe224c293b6a9e9143c0b5eb8b443ed54539dc89e34c28e5cb7c9517e826c25660641281d6b477451cb2ff4b1187f0332e33fd0d94d7618223204
-  data.tar.gz: de5c7cb989b1148acf4a7af524171c7eead44663b43088da99f79bb5af7c7b1c120f28ace62cb62bcfe533979fbe9975763e59aa463acccf7ed1a951496e1f39
+  metadata.gz: 0f7fd09d93f725dcbda325d6d681f1f68fd765ea75a5ae8d3206fe369fd9647f1ae6cb1be36d353c790482e310bd4f8cd4cc749fbb75a8aafc8b4653f7e76025
+  data.tar.gz: 433b16c8be0034ca7e9d8f6349ee9423a1437df4183e47efd623116b634287833f7b57f7f7a456bff06a1bbb9eb19df14c5cf73a0a6bb1e46d52f3ff112522df

data/lib/validates_timeliness/orm/active_model.rb

@@ -6,30 +6,54 @@ module ValidatesTimeliness
       module ClassMethods
         public
 
+        # Hook into bulk method definitions for non-attribute based methods validated.
         def define_attribute_methods(*attr_names)
-          super.tap { define_timeliness_methods }
+          super.tap {
+            define_timeliness_methods
+          }
+        end
+
+        # Called when `attribute` methods is called and the timeliness overrides are defined here
+        def define_attribute_method(attr_name)
+          super.tap {
+            define_attribute_timeliness_methods(attr_name)
+          }
         end
 
         def undefine_attribute_methods
-          super.tap { undefine_timeliness_attribute_methods }
+          super.tap {
+            undefine_timeliness_attribute_methods
+          }
         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)
+            unless timeliness_method_already_implemented?(attr_name)
+              define_attribute_timeliness_methods(attr_name, before_type_cast)
+            end
           end
         end
 
+        def define_timeliness_method(attr_name, before_type_cast=false)
+          define_attribute_timeliness_methods(attr_name, before_type_cast)
+        end
+
+        # Lazy instantiate module as container of timeliness methods included in the model
         def generated_timeliness_methods
           @generated_timeliness_methods ||= Module.new { |m|
             extend Mutex_m
           }.tap { |mod| include mod }
         end
 
+        def timeliness_method_already_implemented?(method_name)
+          generated_timeliness_methods.method_defined?(method_name)
+        end
+
         def undefine_timeliness_attribute_methods
           generated_timeliness_methods.module_eval do
-            instance_methods.each { |m| undef_method(m) }
+            undef_method(*instance_methods)
           end
         end
 
@@ -44,7 +68,7 @@ module ValidatesTimeliness
               @timeliness_cache ||= {}
               @timeliness_cache['#{attr_name}'] = value
 
-              @attributes['#{attr_name}'] = super
+              super
             end
           STR
         end
@@ -59,7 +83,7 @@ module ValidatesTimeliness
       end
 
       def read_timeliness_attribute_before_type_cast(attr_name)
-        @timeliness_cache && @timeliness_cache[attr_name] || @attributes[attr_name]
+        @timeliness_cache && @timeliness_cache[attr_name] || @attributes[attr_name].value_before_type_cast
       end
 
       def _clear_timeliness_cache

data/lib/validates_timeliness/version.rb

@@ -1,3 +1,3 @@
 module ValidatesTimeliness
-  VERSION = '7.0.0.beta1'
+  VERSION = '7.0.0.beta2'
 end

data/spec/spec_helper.rb

@@ -33,8 +33,6 @@ I18n.available_locales = ['en', 'es']
 # Extend TestModel as you would another ORM/ODM module
 module TestModelShim
   extend ActiveSupport::Concern
-  include ValidatesTimeliness::AttributeMethods
-  include ValidatesTimeliness::ORM::ActiveModel
 
   module ClassMethods
     # Hook into native time zone handling check, if any
@@ -46,11 +44,10 @@ end
 
 class Person
   include TestModel
+
   attribute :birth_date, :date
   attribute :birth_time, :time
   attribute :birth_datetime, :datetime
-
-  define_attribute_methods model_attributes.keys
 end
 
 class PersonWithShim < Person

data/spec/support/model_helpers.rb

@@ -1,22 +1,29 @@
 module ModelHelpers 
 
   # Some test helpers from Rails source 
-  def invalid!(attr_name, values, error = nil)
-    with_each_person_value(attr_name, values) do |record, value|
-      expect(record).to be_invalid
+  def invalid!(attr_name, values, error = nil, model_class = Person)
+    with_each_model_value(attr_name, values, model_class) do |record, value|
+      expect(record).to_not be_valid
       expect(record.errors[attr_name].size).to be >= 1
-      expect(record.errors[attr_name].first).to eq(error) if error
+
+      return unless error
+
+      if error.is_a?(Regexp)
+        expect(record.errors[attr_name].first).to match(error)
+      else
+        expect(record.errors[attr_name].first).to eq(error)
+      end
     end
   end
 
-  def valid!(attr_name, values)
-    with_each_person_value(attr_name, values) do |record, value|
+  def valid!(attr_name, values, model_class = Person)
+    with_each_model_value(attr_name, values, model_class) do |record, value|
       expect(record).to be_valid
     end
   end
 
-  def with_each_person_value(attr_name, values)
-    record = Person.new
+  def with_each_model_value(attr_name, values, model_class)
+    record = model_class.new
     Array.wrap(values).each do |value|
       record.send("#{attr_name}=", value)
       yield record, value

data/spec/support/test_model.rb

@@ -1,61 +1,13 @@
 module TestModel
   extend ActiveSupport::Concern
-  extend ActiveModel::Translation
+  include ActiveModel::Model
+  include ActiveModel::Attributes
   include ActiveModel::Validations
-  include ActiveModel::AttributeMethods
+  include ValidatesTimeliness::AttributeMethods
+  include ValidatesTimeliness::ORM::ActiveModel
 
   included do
     attribute_method_suffix "="
-    cattr_accessor :model_attributes
-  end
-
-  module ClassMethods
-    def attribute(name, type)
-      self.model_attributes ||= {}
-      self.model_attributes[name] = type
-    end
-
-    def define_method_attribute=(attr_name, owner: nil)
-      generated_attribute_methods.module_eval("def #{attr_name}=(new_value); @attributes['#{attr_name}']=self.class.type_cast('#{attr_name}', new_value); end", __FILE__, __LINE__)
-    end
-
-    def define_method_attribute(attr_name, owner: nil)
-      generated_attribute_methods.module_eval("def #{attr_name}; @attributes['#{attr_name}']; end", __FILE__, __LINE__)
-    end
-
-    def type_cast(attr_name, value)
-      return value unless value.is_a?(String)
-      type_name = model_attributes[attr_name.to_sym]
-      type = ActiveModel::Type.lookup(type_name)
-      type.cast(value)
-    end
-  end
-
-  def initialize(attributes = nil)
-    @attributes = self.class.model_attributes.keys.inject({}) do |hash, column|
-      hash[column.to_s] = nil
-      hash
-    end
-    self.attributes = attributes unless attributes.nil?
-  end
-
-  def attributes
-    @attributes
-  end
-
-  def attributes=(new_attributes={})
-    new_attributes.each do |key, value|
-      send "#{key}=", value
-    end
-  end
-
-  def method_missing(method_id, *args, &block)
-    if !matched_attribute_method(method_id.to_s).nil?
-      self.class.define_attribute_methods self.class.model_attributes.keys
-      send(method_id, *args, &block)
-    else
-      super
-    end
   end
 end
 

data/spec/validates_timeliness/attribute_methods_spec.rb

@@ -44,9 +44,11 @@ RSpec.describe ValidatesTimeliness::AttributeMethods do
       class PersonWithParser
         include TestModel
         include TestModelShim
+
         attribute :birth_date, :date
         attribute :birth_time, :time
         attribute :birth_datetime, :datetime
+
         validates_date :birth_date
         validates_time :birth_time
         validates_datetime :birth_datetime
@@ -54,8 +56,10 @@ RSpec.describe ValidatesTimeliness::AttributeMethods do
 
       it 'should parse a string value' do
         expect(Timeliness::Parser).to receive(:parse)
+
         r = PersonWithParser.new
         r.birth_date = '2010-01-01'
+        r.birth_date # parsing happens on read not write
       end
 
     end

data/spec/validates_timeliness/validator/format_spec.rb

@@ -0,0 +1,57 @@
+RSpec.describe ValidatesTimeliness::Validator, ":format option" do
+  with_config(:use_plugin_parser, true)
+
+  describe "for date type" do
+    before do
+      Person.validates_date :birth_date, format: "yyyy-mm-dd"
+    end
+
+    it "should not be valid for string given in the wrong format" do
+      invalid!(:birth_date, '23/12/2023', /is not a valid date/)
+    end
+
+    it "should be valid for string given in the right format" do
+      valid!(:birth_date, '2023-12-23')
+    end
+
+    it "should be valid for date instance" do
+      valid!(:birth_date, Date.new(2022,12,23))
+    end
+  end
+
+  describe "for time type" do
+    before do
+      Person.validates_time :birth_time, format: "hh:nn:ss"
+    end
+
+    it "should not be valid for string given in the wrong format" do
+      invalid!(:birth_time, "00-00-00", /is not a valid time/)
+    end
+
+    it "should be valid for string given in the right format" do
+      valid!(:birth_time, "00:00:00")
+    end
+
+    it "should be valid for date instance" do
+      valid!(:birth_time, Time.new(2010, 1, 1, 0, 0, 0))
+    end
+  end
+
+  describe "for datetime type" do
+    before do
+      Person.validates_datetime :birth_datetime, format: "yyyy-mm-dd hh:nn:ss"
+    end
+
+    it "should not be valid for string given in the wrong format" do
+      invalid!(:birth_datetime, "01-01-2010 00-00-00", /is not a valid datetime/)
+    end
+
+    it "should be valid for string given in the right format" do
+      valid!(:birth_datetime, "2010-01-01 00:00:00")
+    end
+
+    it "should be valid for date instance" do
+      valid!(:birth_datetime, DateTime.new(2010, 1, 1, 0, 0, 0))
+    end
+  end
+end

data/validates_timeliness.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ["README.md", "CHANGELOG.md", "LICENSE"]
 
   s.metadata = {
+    "rubygems_mfa_required" => "true",
     "bug_tracker_uri" => "#{github_url}/issues",
     "changelog_uri"   => "#{github_url}/blob/master/CHANGELOG.md",
     "source_code_uri" => "#{github_url}",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validates_timeliness
 version: !ruby/object:Gem::Version
-  version: 7.0.0.beta1
+  version: 7.0.0.beta2
 platform: ruby
 authors:
 - Adam Meehan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-21 00:00:00.000000000 Z
+date: 2023-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -99,6 +99,7 @@ files:
 - spec/validates_timeliness/railtie_spec.rb
 - spec/validates_timeliness/validator/after_spec.rb
 - spec/validates_timeliness/validator/before_spec.rb
+- spec/validates_timeliness/validator/format_spec.rb
 - spec/validates_timeliness/validator/is_at_spec.rb
 - spec/validates_timeliness/validator/on_or_after_spec.rb
 - spec/validates_timeliness/validator/on_or_before_spec.rb
@@ -109,6 +110,7 @@ homepage: https://github.com/adzap/validates_timeliness
 licenses:
 - MIT
 metadata:
+  rubygems_mfa_required: 'true'
   bug_tracker_uri: https://github.com/adzap/validates_timeliness/issues
   changelog_uri: https://github.com/adzap/validates_timeliness/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/adzap/validates_timeliness
@@ -148,6 +150,7 @@ test_files:
 - spec/validates_timeliness/railtie_spec.rb
 - spec/validates_timeliness/validator/after_spec.rb
 - spec/validates_timeliness/validator/before_spec.rb
+- spec/validates_timeliness/validator/format_spec.rb
 - spec/validates_timeliness/validator/is_at_spec.rb
 - spec/validates_timeliness/validator/on_or_after_spec.rb
 - spec/validates_timeliness/validator/on_or_before_spec.rb