validates_timeliness 4.1.1 → 6.0.0.beta2

data/spec/validates_timeliness/orm/active_record_spec.rb

@@ -1,5 +1,4 @@
 RSpec.describe ValidatesTimeliness, 'ActiveRecord' do
-
   context "validation methods" do
     let(:record) { Employee.new }
 
@@ -26,6 +25,7 @@ RSpec.describe ValidatesTimeliness, 'ActiveRecord' do
       record.birth_date = 'not a date'
 
       record.valid?
+      expect(record.birth_date_before_type_cast).to eq 'not a date'
       expect(record.errors[:birth_date]).not_to be_empty
     end
 
@@ -37,10 +37,6 @@ RSpec.describe ValidatesTimeliness, 'ActiveRecord' do
     end
   end
 
-  it 'should determine type for attribute' do
-    expect(Employee.timeliness_attribute_type(:birth_date)).to eq :date
-  end
-
   context 'attribute timezone awareness' do
     let(:klass) {
       Class.new(ActiveRecord::Base) do
@@ -53,22 +49,6 @@ RSpec.describe ValidatesTimeliness, 'ActiveRecord' do
         validates_datetime :some_datetime
       end
     }
-
-    context 'for column attribute' do
-      it 'should be detected from column type' do
-        expect(klass.timeliness_attribute_timezone_aware?(:birth_date)).to be_falsey
-        expect(klass.timeliness_attribute_timezone_aware?(:birth_time)).to be_falsey
-        expect(klass.timeliness_attribute_timezone_aware?(:birth_datetime)).to be_truthy
-      end
-    end
-
-    context 'for non-column attribute' do
-      it 'should be detected from the validation type' do
-        expect(klass.timeliness_attribute_timezone_aware?(:some_date)).to be_falsey
-        expect(klass.timeliness_attribute_timezone_aware?(:some_time)).to be_falsey
-        expect(klass.timeliness_attribute_timezone_aware?(:some_datetime)).to be_truthy
-      end
-    end
   end
   
   context "attribute write method" do
@@ -79,34 +59,6 @@ RSpec.describe ValidatesTimeliness, 'ActiveRecord' do
       validates_datetime :birth_datetime, :allow_blank => true
     end
 
-    context 'value cache' do
-      let(:record) { EmployeeWithCache.new }
-
-      context 'for datetime column' do
-        it 'should store raw value' do
-          record.birth_datetime = datetime_string = '2010-01-01 12:30'
-
-          expect(record.read_timeliness_attribute_before_type_cast('birth_datetime')).to eq datetime_string
-        end
-      end
-
-      context 'for date column' do
-        it 'should store raw value' do
-          record.birth_date = date_string = '2010-01-01'
-
-          expect(record.read_timeliness_attribute_before_type_cast('birth_date')).to eq date_string
-        end
-      end
-
-      context 'for time column' do
-        it 'should store raw value' do
-          record.birth_time = time_string = '12:12'
-
-          expect(record.read_timeliness_attribute_before_type_cast('birth_time')).to eq time_string
-        end
-      end
-    end
-
     context "with plugin parser" do
       with_config(:use_plugin_parser, true)
       let(:record) { EmployeeWithParser.new }
@@ -118,17 +70,23 @@ RSpec.describe ValidatesTimeliness, 'ActiveRecord' do
         validates_datetime :birth_datetime, :allow_blank => true
       end
 
+      before do
+        allow(Timeliness::Parser).to receive(:parse).and_call_original
+      end
+
       context "for a date column" do
         it 'should parse a string value' do
-          expect(Timeliness::Parser).to receive(:parse)
-
           record.birth_date = '2010-01-01'
+          expect(record.birth_date).to eq(Date.new(2010, 1, 1))
+
+          expect(Timeliness::Parser).to have_received(:parse)
         end
 
         it 'should parse a invalid string value as nil' do
-          expect(Timeliness::Parser).to receive(:parse)
-
           record.birth_date = 'not valid'
+          expect(record.birth_date).to be_nil
+
+          expect(Timeliness::Parser).to have_received(:parse)
         end
 
         it 'should store a Date value after parsing string' do
@@ -140,45 +98,85 @@ RSpec.describe ValidatesTimeliness, 'ActiveRecord' do
       end
 
       context "for a time column" do
-        it 'should parse a string value' do
-          expect(Timeliness::Parser).to receive(:parse)
-
-          record.birth_time = '12:30'
+        around do |example|
+          time_zone_aware_types = ActiveRecord::Base.time_zone_aware_types.dup
+          example.call
+          ActiveRecord::Base.time_zone_aware_types = time_zone_aware_types
         end
 
-        it 'should parse a invalid string value as nil' do
-          expect(Timeliness::Parser).to receive(:parse)
+        context 'timezone aware' do
+          with_config(:default_timezone, 'Australia/Melbourne')
+
+          before do
+            unless ActiveRecord::Base.time_zone_aware_types.include?(:time)
+              ActiveRecord::Base.time_zone_aware_types.push(:time)
+            end
+          end
+
+          it 'should parse a string value' do
+            record.birth_time = '12:30'
+
+            expect(record.birth_time).to eq('12:30'.in_time_zone)
+            expect(Timeliness::Parser).to have_received(:parse)
+          end
+
+          it 'should parse a invalid string value as nil' do
+            record.birth_time = 'not valid'
 
-          record.birth_time = 'not valid'
+            expect(record.birth_time).to be_nil
+            expect(Timeliness::Parser).to have_received(:parse)
+          end
+
+          it 'should store a Time value after parsing string' do
+            record.birth_time = '12:30'
+
+            expect(record.birth_time).to eq('12:30'.in_time_zone)
+            expect(record.birth_time.utc_offset).to eq '12:30'.in_time_zone.utc_offset
+          end
         end
 
-        it 'should store a Time value after parsing string' do
-          record.birth_time = '12:30'
+        skip 'not timezone aware' do
+          before do
+            ActiveRecord::Base.time_zone_aware_types.delete(:time)
+          end
+
+          it 'should parse a string value' do
+            record.birth_time = '12:30'
+
+            expect(record.birth_time).to eq(Time.utc(2000,1,1,12,30))
+            expect(Timeliness::Parser).to have_received(:parse)
+          end
+
+          it 'should parse a invalid string value as nil' do
+            record.birth_time = 'not valid'
 
-          expect(record.birth_time).to be_kind_of(Time)
-          expect(record.birth_time).to eq Time.utc(2000, 1, 1, 12, 30)
+            expect(record.birth_time).to be_nil
+            expect(Timeliness::Parser).to have_received(:parse)
+          end
+
+          it 'should store a Time value in utc' do
+            record.birth_time = '12:30'
+
+            expect(record.birth_time.utc_offset).to eq Time.now.utc.utc_offset
+          end
         end
       end
 
       context "for a datetime column" do
         with_config(:default_timezone, 'Australia/Melbourne')
 
-        it 'should parse a string value' do
-          expect(Timeliness::Parser).to receive(:parse)
-
+        it 'should parse a string value into Time value' do
           record.birth_datetime = '2010-01-01 12:00'
+
+          expect(record.birth_datetime).to eq Time.zone.local(2010,1,1,12,00)
+          expect(Timeliness::Parser).to have_received(:parse)
         end
 
         it 'should parse a invalid string value as nil' do
-          expect(Timeliness::Parser).to receive(:parse)
-
           record.birth_datetime = 'not valid'
-        end
-
-        it 'should parse string into Time value' do
-          record.birth_datetime = '2010-01-01 12:00'
 
-          expect(record.birth_datetime).to be_kind_of(Time)
+          expect(record.birth_datetime).to be_nil
+          expect(Timeliness::Parser).to have_received(:parse)
         end
 
         it 'should parse string as current timezone' do
@@ -189,66 +187,4 @@ RSpec.describe ValidatesTimeliness, 'ActiveRecord' do
       end
     end
   end
-
-  context "reload" do
-    it 'should clear cache value' do
-      record = Employee.create!
-      record.birth_date = '2010-01-01'
-      
-      record.reload
-
-      expect(record.read_timeliness_attribute_before_type_cast('birth_date')).to be_nil
-    end
-  end
-
-  context "before_type_cast method" do
-    let(:record) { Employee.new }
-
-    it 'should be defined on class if ORM supports it' do
-      expect(record).to respond_to(:birth_datetime_before_type_cast)
-    end
-
-    it 'should return original value' do
-      record.birth_datetime = date_string = '2010-01-01'
-
-      expect(record.birth_datetime_before_type_cast).to eq date_string
-    end
-
-    it 'should return attribute if no attribute assignment has been made' do
-      datetime = Time.zone.local(2010,01,01)
-      Employee.create(:birth_datetime => datetime)
-
-      record = Employee.last
-      expect(record.birth_datetime_before_type_cast).to match(/#{datetime.utc.to_s[0...-4]}/)
-    end
-
-    context "with plugin parser" do
-      with_config(:use_plugin_parser, true)
-
-      it 'should return original value' do
-        record.birth_datetime = date_string = '2010-01-31'
-
-        expect(record.birth_datetime_before_type_cast).to eq date_string
-      end
-    end
-
-  end
-
-  context "define_attribute_methods" do
-    it "returns a falsy value if the attribute methods have already been generated" do
-      expect(Employee.define_attribute_methods).to be_falsey
-    end
-  end
-
-  context "undefine_attribute_methods" do
-    it "returns remove attribute methods that have already been generated" do
-      Employee.define_attribute_methods
-
-      expect(Employee.instance_methods).to include(:birth_datetime)
-
-      Employee.undefine_attribute_methods
-
-      expect(Employee.instance_methods).to_not include(:birth_datetime)
-    end
-  end
 end

data/validates_timeliness.gemspec

@@ -13,9 +13,10 @@ Gem::Specification.new do |s|
   s.license     = "MIT"
 
   s.require_paths    = ["lib"]
-  s.files            = `git ls-files`.split("\n") - %w{ .gitignore .rspec Gemfile Gemfile.lock autotest/discover.rb Appraisals Travis.yml } - Dir['gemsfiles/*']
+  s.files            = `git ls-files`.split("\n") - %w{ .gitignore .rspec Gemfile Gemfile.lock autotest/discover.rb Appraisals } - Dir['gemsfiles/*']
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.extra_rdoc_files = ["README.rdoc", "CHANGELOG.rdoc", "LICENSE"]
+  s.extra_rdoc_files = ["README.md", "CHANGELOG.rdoc", "LICENSE"]
 
-  s.add_runtime_dependency(%q<timeliness>, [">= 0.3.10", "< 1"])
+  s.add_runtime_dependency("activemodel", [">= 6.0.0", "< 7"])
+  s.add_runtime_dependency("timeliness", [">= 0.3.10", "< 1"])
 end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: validates_timeliness
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 6.0.0.beta2
 platform: ruby
 authors:
 - Adam Meehan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2021-12-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: timeliness
   requirement: !ruby/object:Gem::Requirement
@@ -36,23 +56,26 @@ email: adam.meehan@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- README.md
 - CHANGELOG.rdoc
 - LICENSE
 files:
-- ".travis.yml"
+- ".github/dependabot.yml"
+- ".github/workflows/ci.yml"
 - CHANGELOG.rdoc
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
-- gemfiles/rails_4_2.gemfile
+- gemfiles/rails_6_0.gemfile
+- gemfiles/rails_6_1.gemfile
+- gemfiles/rails_edge.gemfile
 - init.rb
 - lib/generators/validates_timeliness/install_generator.rb
 - lib/generators/validates_timeliness/templates/en.yml
 - lib/generators/validates_timeliness/templates/validates_timeliness.rb
 - lib/validates_timeliness.rb
 - lib/validates_timeliness/attribute_methods.rb
-- lib/validates_timeliness/conversion.rb
+- lib/validates_timeliness/converter.rb
 - lib/validates_timeliness/extensions.rb
 - lib/validates_timeliness/extensions/date_time_select.rb
 - lib/validates_timeliness/extensions/multiparameter_handler.rb
@@ -68,7 +91,7 @@ files:
 - spec/support/tag_matcher.rb
 - spec/support/test_model.rb
 - spec/validates_timeliness/attribute_methods_spec.rb
-- spec/validates_timeliness/conversion_spec.rb
+- spec/validates_timeliness/converter_spec.rb
 - spec/validates_timeliness/extensions/date_time_select_spec.rb
 - spec/validates_timeliness/extensions/multiparameter_handler_spec.rb
 - spec/validates_timeliness/helper_methods_spec.rb
@@ -86,7 +109,7 @@ homepage: http://github.com/adzap/validates_timeliness
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -97,13 +120,12 @@ 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.7.6.2
-signing_key: 
+rubygems_version: 3.0.3.1
+signing_key:
 specification_version: 4
 summary: Date and time validation plugin for Rails which allows custom formats
 test_files:
@@ -113,7 +135,7 @@ test_files:
 - spec/support/tag_matcher.rb
 - spec/support/test_model.rb
 - spec/validates_timeliness/attribute_methods_spec.rb
-- spec/validates_timeliness/conversion_spec.rb
+- spec/validates_timeliness/converter_spec.rb
 - spec/validates_timeliness/extensions/date_time_select_spec.rb
 - spec/validates_timeliness/extensions/multiparameter_handler_spec.rb
 - spec/validates_timeliness/helper_methods_spec.rb

data/.travis.yml

@@ -1,24 +0,0 @@
-language: ruby
-before_install:
-  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
-  - gem install bundler -v '< 2'
-before_script:
-  - bundle install
-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
-
-script: 'bundle exec rspec'
-
-notifications:
-  email:
-    recipients:
-      - adam.meehan@gmail.com
-    on_failure: change
-    on_success: never