ndr_support 5.8.2 → 5.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3f90df368cddc8835eb228b45b2e03088caf7ff494c6dd71538a255ed81ee17
-  data.tar.gz: b7efe09d5283db3ee78934b727893817c772bb1564c02eaa453e216d562e23b1
+  metadata.gz: 528b4fe69aceac0e252cab457de3d2b01436ef6f188308858e014a4ceee43299
+  data.tar.gz: c15d6e7487920ccf74d4ff1711cbc062346de5c6457c7d9552b216536428e5e3
 SHA512:
-  metadata.gz: 3b5dd0eeb3aec3bf88b4bc71620a661f3fe8a76eb9deef2c6dd8ec8e4d42faf9328f4934531fc0b36e65947f62d7163e4d0165324c8f17df8a1dfa042d942dc1
-  data.tar.gz: ba3cad435e924c140fd528a1cee8bd2e1aa8ccc2431f852d093e01bf7d16e8db21ceecdde3bd3cc53aed7465ffcaa0568f67b0226cbce1f957ced9d35a221ba8
+  metadata.gz: 5759f651f4ddea307afb890f7163972da66d3704b8d904b77ff60a88ffd77704419a1347ee96425c3fe5a60f1c4e558cc69c9411630d6e6121e54ad03148b842
+  data.tar.gz: 5837a1948066929be0486edc36f3571bffefb7b086f88a7d2f9c1bb047a3df1970221d97e683a3dcb89517f17822d60967f2f25381b85a18384e09d444860b7f

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 5.8.3 / 2021-11-25
+## Fixed
+* remove circular dependencies between Ourdate and Daterange
+
 ## 5.8.2 / 2021-10-11
 ## Fixed
 * fix issue with blank date causing error for dateranges

data/code_safety.yml

@@ -22,8 +22,8 @@ file safety:
     safe_revision: a02f14cbf1fc36fbaf820365fdedfdc9af326db1
   CHANGELOG.md:
     comments: 
-    reviewed_by: ollietulloch
-    safe_revision: de292b8dd286a0164a67cda49bbbbc8ba75409cc
+    reviewed_by: brian.shand
+    safe_revision: efa8b316f7ee8169baf8b74b4d8e9d3bf02499d5
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: timgentry
@@ -74,8 +74,8 @@ file safety:
     safe_revision: c1158eccb843b637b4dd82815dc7c081f12b93e4
   lib/ndr_support/daterange.rb:
     comments: 
-    reviewed_by: ollietulloch
-    safe_revision: fc52184297e0a3bcd52b119e2e0add952c8ab7f1
+    reviewed_by: brian.shand
+    safe_revision: 9d19593cc45a9f1724c4b34a1a05a5ff48003084
   lib/ndr_support/hash.rb:
     comments: 
     reviewed_by: pauleves
@@ -84,10 +84,6 @@ file safety:
     comments: 
     reviewed_by: josh.pencheon
     safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
-  lib/ndr_support/integer/julian_date_conversions.rb:
-    comments: 
-    reviewed_by: ollietulloch
-    safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
   lib/ndr_support/integer/rounding.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -106,8 +102,12 @@ file safety:
     safe_revision: 50a4293953f9ae227823c390b069a3ed4825074c
   lib/ndr_support/ourdate.rb:
     comments: 
-    reviewed_by: ollietulloch
-    safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
+    reviewed_by: brian.shand
+    safe_revision: 9d19593cc45a9f1724c4b34a1a05a5ff48003084
+  lib/ndr_support/ourdate/build_datetime.rb:
+    comments: 
+    reviewed_by: brian.shand
+    safe_revision: 9d19593cc45a9f1724c4b34a1a05a5ff48003084
   lib/ndr_support/ourtime.rb:
     comments: 
     reviewed_by: ollietulloch
@@ -166,8 +166,8 @@ file safety:
     safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
   lib/ndr_support/version.rb:
     comments: 
-    reviewed_by: ollietulloch
-    safe_revision: de292b8dd286a0164a67cda49bbbbc8ba75409cc
+    reviewed_by: brian.shand
+    safe_revision: efa8b316f7ee8169baf8b74b4d8e9d3bf02499d5
   lib/ndr_support/working_days.rb:
     comments: 
     reviewed_by: josh.pencheon

data/lib/ndr_support/daterange.rb

@@ -1,6 +1,6 @@
 require 'active_support/core_ext/enumerable'
 require 'active_support/time'
-require 'ndr_support/integer/julian_date_conversions'
+require 'ndr_support/ourdate/build_datetime'
 
 # Our "vague date" class, which can represent a single date or a date range.
 class Daterange
@@ -188,7 +188,10 @@ class Daterange
       j1 = j2 = Date.new(parts[0], parts[1], parts[2]).jd
     end
 
-    [j1.jd_to_datetime, j2.jd_to_datetime]
+    [j1, j2].collect do |jd|
+      date = Date.jd(jd) # Julian date number to Ruby Date
+      Ourdate.build_datetime(date.year, date.month, date.day)
+    end
   rescue
     nil
   end

data/lib/ndr_support/ourdate/build_datetime.rb

@@ -0,0 +1,36 @@
+require 'active_record'
+require 'active_support/time'
+
+class Ourdate
+  # Construct a daylight saving time safe datetime, with arguments
+  #--
+  # FIXME: Note that the arguments should be numbers, not strings -- it works
+  # with strings arguments only after the 1970 epoch; before, it returns nil.
+  #++
+  def self.build_datetime(year, month = 1, day = 1, hour = 0, min = 0, sec = 0, usec = 0)
+    return nil if year.nil?
+
+    if ActiveRecord::Base.default_timezone == :local
+      # Time.local_time(year, month, day, hour, min, sec, usec).to_datetime
+      # Behave like oracle_adapter.rb
+      seconds = sec + Rational(usec, 10**6)
+      time_array = [year, month, day, hour, min, seconds]
+      begin
+        #--
+        # TODO: Fails unit tests unless we .to_datetime here
+        #       but the risk is we lose the usec component unnecesssarily.
+        #       Investigate removing .to_datetime below.
+        #++
+        Time.send(ActiveRecord::Base.default_timezone, *time_array).to_datetime
+      rescue
+        zone_offset = ActiveRecord::Base.default_timezone == :local ? DateTime.now.offset : 0
+        # Append zero calendar reform start to account for dates skipped by calendar reform
+        DateTime.new(*time_array[0..5] << zone_offset << 0) rescue nil
+      end
+    else
+      # Only supports fake GMT time -- needs improvement
+      # Maybe use Time.zone.local or Time.local_time(year, month, day)
+      Time.utc(year, month, day, hour, min, sec, usec).to_datetime
+    end
+  end
+end

data/lib/ndr_support/ourdate.rb

@@ -1,5 +1,6 @@
 require 'active_record'
 require 'active_support/time'
+require 'ndr_support/ourdate/build_datetime'
 require 'ndr_support/date_and_time_extensions'
 require 'ndr_support/daterange'
 
@@ -25,38 +26,6 @@ class Ourdate
     end
   end
 
-  # Construct a daylight saving time safe datetime, with arguments
-  #--
-  # FIXME: Note that the arguments should be numbers, not strings -- it works
-  # with strings arguments only after the 1970 epoch; before, it returns nil.
-  #++
-  def self.build_datetime(year, month = 1, day = 1, hour = 0, min = 0, sec = 0, usec = 0)
-    return nil if year.nil?
-
-    if ActiveRecord::Base.default_timezone == :local
-      # Time.local_time(year, month, day, hour, min, sec, usec).to_datetime
-      # Behave like oracle_adapter.rb
-      seconds = sec + Rational(usec, 10**6)
-      time_array = [year, month, day, hour, min, seconds]
-      begin
-        #--
-        # TODO: Fails unit tests unless we .to_datetime here
-        #       but the risk is we lose the usec component unnecesssarily.
-        #       Investigate removing .to_datetime below.
-        #++
-        Time.send(ActiveRecord::Base.default_timezone, *time_array).to_datetime
-      rescue
-        zone_offset = ActiveRecord::Base.default_timezone == :local ? DateTime.now.offset : 0
-        # Append zero calendar reform start to account for dates skipped by calendar reform
-        DateTime.new(*time_array[0..5] << zone_offset << 0) rescue nil
-      end
-    else
-      # Only supports fake GMT time -- needs improvement
-      # Maybe use Time.zone.local or Time.local_time(year, month, day)
-      Time.utc(year, month, day, hour, min, sec, usec).to_datetime
-    end
-  end
-
   def initialize(x = nil)
     if x.is_a?(Date)
       @thedate = x

data/lib/ndr_support/version.rb

@@ -3,5 +3,5 @@
 # This defines the NdrSupport version. If you change it, rebuild and commit the gem.
 # Use "rake build" to build the gem, see rake -T for all bundler rake tasks.
 module NdrSupport
-  VERSION = '5.8.2'
+  VERSION = '5.8.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_support
 version: !ruby/object:Gem::Version
-  version: 5.8.2
+  version: 5.8.3
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-11 00:00:00.000000000 Z
+date: 2021-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -249,12 +249,12 @@ files:
 - lib/ndr_support/daterange.rb
 - lib/ndr_support/hash.rb
 - lib/ndr_support/integer/calculations.rb
-- lib/ndr_support/integer/julian_date_conversions.rb
 - lib/ndr_support/integer/rounding.rb
 - lib/ndr_support/integer/working_days.rb
 - lib/ndr_support/nil.rb
 - lib/ndr_support/obfuscator.rb
 - lib/ndr_support/ourdate.rb
+- lib/ndr_support/ourdate/build_datetime.rb
 - lib/ndr_support/ourtime.rb
 - lib/ndr_support/password.rb
 - lib/ndr_support/password/constants.rb
@@ -316,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: NDR Support library

data/lib/ndr_support/integer/julian_date_conversions.rb

@@ -1,12 +0,0 @@
-# Extend Integer for use in our Daterange class
-class Integer
-  # Julian date number to Ruby Date
-  def jd_to_date
-    Date.jd(self)
-  end
-
-  def jd_to_datetime
-    date = jd_to_date
-    Ourdate.build_datetime(date.year, date.month, date.day)
-  end
-end