validates_timeliness 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1b8043b997be8d2c2c20462ad6ff2569c36f361e831648e62afcdccfb34a9a9
-  data.tar.gz: 4fd9cdea497d79b06469b973669f961aca84fb876c0fdbc00b66d5eb0006f62d
+  metadata.gz: a72c9c656e7bb6b4987658858001d6654a591b12a2aa6322f2b38a932ef4c7b5
+  data.tar.gz: b8449806435f41af895a80c61a7e641f42d4581aaee40183781a222ea027876a
 SHA512:
-  metadata.gz: 103153fbfef87bbf3dabb2ec3bf1fe8c9178ad45dfda1d90948ca21802c40a7a70c41089e85bb717ed5f9861c163ce67058d9016c6e68e0aaa1bac4684e96971
-  data.tar.gz: de9ba7e8bb62fe6ccffb5e9e2507ec11fcbf8b30403ebf1c1d0e91ac25d1aa5377f2147d5b508ef0a2ce23ad71ce3ce440ce3282c011abeb7f1a47b3f63b9b17
+  metadata.gz: 68e98f1017b315190106b17608ce8d5df1977f101154c91a89fea550b2546b10ec569b6ba79ff51ae4efd760bc61e91756e7561624b8e8da7ae281d407c012a4
+  data.tar.gz: bda2a3e5f833ed1e3467e5e3ee2c2030d964187e9c23611c2afa1265c76096590332ae1739d8196c429eca57a2f8720a1c2e67cb87e75ba8a777f1c7f8939e56

data/lib/validates_timeliness/converter.rb

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

@@ -1,3 +1,3 @@
 module ValidatesTimeliness
-  VERSION = '6.0.0'
+  VERSION = '6.0.1'
 end

data/spec/validates_timeliness/converter_spec.rb

@@ -63,30 +63,61 @@ RSpec.describe ValidatesTimeliness::Converter do
 
     describe "for datetime type" do
       let(:type) { :datetime }
-      let(:time_zone_aware) { true }
 
-      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))
+      it 'should return nil for invalid value types' do
+        expect(type_cast_value(12)).to eq(nil)
       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 "time zone aware" do
+        let(:time_zone_aware) { true }
 
-      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
+        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, 23, 34, 56))
-        expect(result.zone).to eq('AEDT')
+        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
       end
 
-      it 'should return nil for invalid value types' do
-        expect(type_cast_value(12)).to eq(nil)
+      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 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 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
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validates_timeliness
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Adam Meehan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-20 00:00:00.000000000 Z
+date: 2023-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -68,7 +68,6 @@ files:
 - Rakefile
 - 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

data/gemfiles/rails_edge.gemfile

@@ -1,13 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", git: "https://github.com/rails/rails.git", branch: "main"
-gem "rspec"
-gem "rspec-rails", "~> 3.7"
-gem "sqlite3"
-gem "byebug"
-gem "appraisal"
-gem "nokogiri", "~> 1.8"
-
-gemspec path: "../"