validates_timeliness 6.0.1 → 7.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a72c9c656e7bb6b4987658858001d6654a591b12a2aa6322f2b38a932ef4c7b5
-  data.tar.gz: b8449806435f41af895a80c61a7e641f42d4581aaee40183781a222ea027876a
+  metadata.gz: 284d18473a0007c273fc4608579b619afac6a3809dfdcd12864d6aeea30c6f17
+  data.tar.gz: 12d2db9663bb6c80a643d7c7365fc4d44218a64a9b69feacb6d060dc737ddd93
 SHA512:
-  metadata.gz: 68e98f1017b315190106b17608ce8d5df1977f101154c91a89fea550b2546b10ec569b6ba79ff51ae4efd760bc61e91756e7561624b8e8da7ae281d407c012a4
-  data.tar.gz: bda2a3e5f833ed1e3467e5e3ee2c2030d964187e9c23611c2afa1265c76096590332ae1739d8196c429eca57a2f8720a1c2e67cb87e75ba8a777f1c7f8939e56
+  metadata.gz: 77eb167f597fe224c293b6a9e9143c0b5eb8b443ed54539dc89e34c28e5cb7c9517e826c25660641281d6b477451cb2ff4b1187f0332e33fd0d94d7618223204
+  data.tar.gz: de5c7cb989b1148acf4a7af524171c7eead44663b43088da99f79bb5af7c7b1c120f28ace62cb62bcfe533979fbe9975763e59aa463acccf7ed1a951496e1f39

data/.github/workflows/ci.yml

@@ -7,18 +7,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - gemfile: rails_6_0
-            ruby: 2.6
-          - gemfile: rails_6_0
+          - gemfile: rails_7_0
             ruby: 2.7
-          - gemfile: rails_6_0
-            ruby: 3.0
-          - gemfile: rails_6_1
-            ruby: 2.6
-          - gemfile: rails_6_1
-            ruby: 2.7
-          - gemfile: rails_6_1
+          - gemfile: rails_7_0
             ruby: 3.0
+          - gemfile: rails_7_0
+            ruby: 3.1
 
     name: ${{ matrix.gemfile }}, ruby ${{ matrix.ruby }}
     env:

data/README.md

@@ -6,13 +6,13 @@
 
 ## Description
 
-Complete validation of dates, times and datetimes for Rails 6.x and
-ActiveModel.
+Complete validation of dates, times and datetimes for Rails 7.x and ActiveModel.
 
-Old Rails versions:
+Older Rails versions:
 
 - Rails 4.x: [https://github.com/adzap/validates_timeliness/tree/4-0-stable]
 - Rails 5.x: [https://github.com/adzap/validates_timeliness/tree/5-0-stable]
+- Rails 6.x: [https://github.com/adzap/validates_timeliness/tree/6-0-stable]
 
 
 ## Features
@@ -30,7 +30,7 @@ Old Rails versions:
 
 In Gemfile
 ```ruby
-gem 'validates_timeliness', '~> 6.0.0'
+gem 'validates_timeliness', '~> 7.0.0.beta1'
 ```
 
 Run bundler:

data/gemfiles/{rails_6_0.gemfile → rails_7_0.gemfile}

@@ -2,9 +2,9 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 6.0.0"
+gem "rails", "~> 7.0.0"
 gem "rspec"
-gem "rspec-rails", "~> 3.7"
+gem "rspec-rails", "~> 6.0"
 gem "sqlite3"
 gem "byebug"
 gem "appraisal"

data/gemfiles/{rails_6_1.gemfile → rails_edge.gemfile}

@@ -2,11 +2,10 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 6.1.0"
+gem "rails", git: "https://github.com/rails/rails.git", branch: "main"
 gem "rspec"
 gem "rspec-rails", "~> 3.7"
 gem "sqlite3"
-gem "timecop"
 gem "byebug"
 gem "appraisal"
 gem "nokogiri", "~> 1.8"

data/lib/validates_timeliness/converter.rb

@@ -19,13 +19,12 @@ module ValidatesTimeliness
       when :date
         value.to_date
       when :datetime
-        value.is_a?(Time) ? value : (time_zone_aware? ? value.in_time_zone : value.to_time)
+        value.is_a?(Time) ? value : value.to_time
       else
         value
       end
-
       if ignore_usec && value.is_a?(Time)
-        value.change(usec: 0)
+        Timeliness::Parser.make_time(Array(value).reverse[4..9], (:current if time_zone_aware?))
       else
         value
       end

data/lib/validates_timeliness/helper_methods.rb

@@ -20,7 +20,7 @@ module ActiveModel
 
       def timeliness_validation_for(attr_names, type=nil)
         options = _merge_attributes(attr_names)
-        options.update(type: type) if type
+        options.update(:type => type) if type
         validates_with TimelinessValidator, options
       end
     end

data/lib/validates_timeliness/railtie.rb

@@ -2,7 +2,7 @@ module ValidatesTimeliness
   class Railtie < Rails::Railtie
     initializer "validates_timeliness.initialize_active_record", :after => 'active_record.initialize_timezone' do
       ActiveSupport.on_load(:active_record) do
-        ValidatesTimeliness.default_timezone = ActiveRecord::Base.default_timezone
+        ValidatesTimeliness.default_timezone = ActiveRecord.default_timezone
         ValidatesTimeliness.extend_orms << :active_record
         ValidatesTimeliness.load_orms
       end

data/lib/validates_timeliness/version.rb

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

data/spec/spec_helper.rb

@@ -57,7 +57,7 @@ class PersonWithShim < Person
   include TestModelShim
 end
 
-ActiveRecord::Base.default_timezone = :utc
+ActiveRecord.default_timezone = :utc
 ActiveRecord::Base.time_zone_aware_attributes = true
 ActiveRecord::Base.establish_connection({:adapter => 'sqlite3', :database => ':memory:'})
 ActiveRecord::Base.time_zone_aware_types = [:datetime, :time]

data/spec/validates_timeliness/converter_spec.rb

@@ -63,61 +63,30 @@ RSpec.describe ValidatesTimeliness::Converter do
 
     describe "for datetime type" do
       let(:type) { :datetime }
+      let(:time_zone_aware) { true }
 
-      it 'should return nil for invalid value types' do
-        expect(type_cast_value(12)).to eq(nil)
+      it "should return Date as Time value" do
+        expect(type_cast_value(Date.new(2010, 1, 1))).to eq(Time.local(2010, 1, 1, 0, 0, 0))
       end
 
-      context "time zone aware" do
-        let(:time_zone_aware) { true }
-
-        around { |example|
-          Time.use_zone("Perth", &example)
-        }
-
-        it "should return Date as Time value" do
-          Time.use_zone('London') do
-            result = type_cast_value(Date.new(2010, 1, 1))
-            expected = Time.zone.local(2010, 1, 1, 0, 0, 0)
-
-            expect(result).to eq(expected)
-            expect(result.zone).to eq(expected.zone)
-          end
-        end
-
-        it "should return same Time value" do
-          value = Time.utc(2010, 1, 1, 12, 34, 56)
-          expect(type_cast_value(value)).to eq(value)
-        end
-
-        it "should return as Time with same component values" do
-          expect(type_cast_value(DateTime.civil_from_format(:utc, 2010, 1, 1, 12, 34, 56))).to eq(Time.utc(2010, 1, 1, 12, 34, 56))
-        end
-
-        it "should return same Time in correct zone if timezone aware" do
-          value = Time.utc(2010, 1, 1, 12, 34, 56)
-          result = type_cast_value(value)
-
-          expect(result).to eq(Time.zone.local(2010, 1, 1, 20, 34, 56))
-          expect(result.zone).to eq('AWST')
-        end
+      it "should return same Time value" do
+        value = Time.utc(2010, 1, 1, 12, 34, 56)
+        expect(type_cast_value(Time.utc(2010, 1, 1, 12, 34, 56))).to eq(value)
       end
 
-      context "not time zone aware" do
-        let(:time_zone_aware) { false }
-
-        it "should return Date as Time value" do
-          expect(type_cast_value(Date.new(2010, 1, 1))).to eq(Time.local(2010, 1, 1, 0, 0, 0))
-        end
+      it "should return as Time with same component values" do
+        expect(type_cast_value(DateTime.civil_from_format(:utc, 2010, 1, 1, 12, 34, 56))).to eq(Time.utc(2010, 1, 1, 12, 34, 56))
+      end
 
-        it "should return same Time value" do
-          value = Time.utc(2010, 1, 1, 12, 34, 56)
-          expect(type_cast_value(Time.utc(2010, 1, 1, 12, 34, 56))).to eq(value)
-        end
+      it "should return same Time in correct zone if timezone aware" do
+        value = Time.utc(2010, 1, 1, 12, 34, 56)
+        result = type_cast_value(value)
+        expect(result).to eq(Time.zone.local(2010, 1, 1, 23, 34, 56))
+        expect(result.zone).to eq('AEDT')
+      end
 
-        it "should return as Time with same component values" do
-          expect(type_cast_value(DateTime.civil_from_format(:utc, 2010, 1, 1, 12, 34, 56))).to eq(Time.utc(2010, 1, 1, 12, 34, 56))
-        end
+      it 'should return nil for invalid value types' do
+        expect(type_cast_value(12)).to eq(nil)
       end
     end
 

data/validates_timeliness.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |s|
     "wiki_uri"        => "#{github_url}/wiki",
   }
 
-  s.add_runtime_dependency("activemodel", [">= 6.0.0", "< 7"])
+  s.add_runtime_dependency("activemodel", [">= 7.0.0", "< 8"])
   s.add_runtime_dependency("timeliness", [">= 0.3.10", "< 1"])
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validates_timeliness
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 7.0.0.beta1
 platform: ruby
 authors:
 - Adam Meehan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-12 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: timeliness
   requirement: !ruby/object:Gem::Requirement
@@ -66,8 +66,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails_6_0.gemfile
-- gemfiles/rails_6_1.gemfile
+- gemfiles/rails_7_0.gemfile
+- gemfiles/rails_edge.gemfile
 - init.rb
 - lib/generators/validates_timeliness/install_generator.rb
 - lib/generators/validates_timeliness/templates/en.yml
@@ -94,6 +94,7 @@ files:
 - spec/validates_timeliness/extensions/date_time_select_spec.rb
 - spec/validates_timeliness/extensions/multiparameter_handler_spec.rb
 - spec/validates_timeliness/helper_methods_spec.rb
+- spec/validates_timeliness/orm/active_model_spec.rb
 - spec/validates_timeliness/orm/active_record_spec.rb
 - spec/validates_timeliness/railtie_spec.rb
 - spec/validates_timeliness/validator/after_spec.rb
@@ -123,9 +124,9 @@ 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: []
 rubygems_version: 3.1.6
 signing_key:
@@ -142,6 +143,7 @@ test_files:
 - spec/validates_timeliness/extensions/date_time_select_spec.rb
 - spec/validates_timeliness/extensions/multiparameter_handler_spec.rb
 - spec/validates_timeliness/helper_methods_spec.rb
+- spec/validates_timeliness/orm/active_model_spec.rb
 - spec/validates_timeliness/orm/active_record_spec.rb
 - spec/validates_timeliness/railtie_spec.rb
 - spec/validates_timeliness/validator/after_spec.rb