ndr_support 5.3.1 → 5.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32516de19ac1430b0cb34bbe3bb334cfc782c1f4
-  data.tar.gz: 561996469be148817ff80150a3bcd90e637dd14b
+  metadata.gz: b8389a60f126f8622e1a09a7afa394d671aa9aca
+  data.tar.gz: ec611876c575c20dd959b2e50daeefa84b8a743e
 SHA512:
-  metadata.gz: e8ff33a5d7f85ad3e32e424f227ad94e26ba93d1fa45a9461a48bb27208380bd614534b4fa8d7b3f8eb9fa1a3ef7cacf84a77d6550f932f827c51ac1ac3e9631
-  data.tar.gz: 400450cc5d245dda33005cabf8c8076aed790f6ab4a0722f03f60e149c82be31739520a4464d9e396de7389edbf3621ebc5737c60b2b7b800ece6d00f065d09b
+  metadata.gz: 899ef3a3b43c1bbbf74259ac61e9063c7c10612cd199f7f50e1898c241e5f128f0492d3288d9768b7594a644b08e586436d57d723a27b4dc9d6f4ff9d9292b7f
+  data.tar.gz: 2668ab82b59b43ce86370de1a40d13d4b8cd26c72d778a4460986a6091bad61f2a6ff35d87f296c9800d56e01276993ba368ad17e29329a901a58c6f8d364b57

data/.travis.yml

@@ -1,11 +1,11 @@
 language: ruby
 
 rvm:
-  - 2.2.5
-  - 2.3.1
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
 
 gemfile:
-  - gemfiles/Gemfile.rails41
   - gemfiles/Gemfile.rails42
   - gemfiles/Gemfile.rails50
   - gemfiles/Gemfile.rails51

data/README.md

@@ -26,7 +26,6 @@ Or install it yourself by cloning the project, then executing:
 ndr_support extends/overrides the following core classes/modules:
 
 - Array
-- Fixnum
 - Hash
 - Integer
 - NilClass

data/code_safety.yml

@@ -10,8 +10,8 @@ file safety:
     safe_revision: a02f14cbf1fc36fbaf820365fdedfdc9af326db1
   ".travis.yml":
     comments: diff failed; reviewed whole file
-    reviewed_by: brian.shand
-    safe_revision: fb10f9e24cfe0dde8bba65e61ff46d2b9fe2d7fb
+    reviewed_by: josh.pencheon
+    safe_revision: 2787caaeb45bf2d0b21a608f24cbc218c545de0b
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: timgentry
@@ -31,15 +31,11 @@ file safety:
   README.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 799d9fe4d76759958926c0385fc7f5d8e405d0d0
+    safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
   Rakefile:
     comments: 
     reviewed_by: timgentry
     safe_revision: e33e9dae7f38bc449ce9276515a539836dbbbd53
-  gemfiles/Gemfile.rails41:
-    comments: 
-    reviewed_by: pauleves
-    safe_revision: f76ad0fe72d42b1ff37553c8194935a8b93a6848
   gemfiles/Gemfile.rails42:
     comments: 
     reviewed_by: pauleves
@@ -54,8 +50,8 @@ file safety:
     safe_revision: 4e87fd9d64fc0f15b359ba60fc48cda54453c647
   lib/ndr_support.rb:
     comments: 
-    reviewed_by: brian.shand
-    safe_revision: 50a4293953f9ae227823c390b069a3ed4825074c
+    reviewed_by: josh.pencheon
+    safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
   lib/ndr_support/array.rb:
     comments: 
     reviewed_by: pauleves
@@ -66,28 +62,28 @@ file safety:
     safe_revision: 5f9c98dcad6f6889d2431eb98cf07b1f5c3e57be
   lib/ndr_support/date_and_time_extensions.rb:
     comments: 
-    reviewed_by: brian.shand
-    safe_revision: 0a06fed3e7530185497f786decdb77a62d35e101
+    reviewed_by: josh.pencheon
+    safe_revision: 3553509e52b3697d361cfa4c6f8a67754ed942d3
   lib/ndr_support/daterange.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 7c32f5a80c1fb7aaf6e850d4b0651a7b47640e15
-  lib/ndr_support/fixnum/calculations.rb:
-    comments: 
-    reviewed_by: pauleves
-    safe_revision: f7dbfe2acd1b067858867d58c77e49b03ea78a1d
-  lib/ndr_support/fixnum/julian_date_conversions.rb:
-    comments: 
-    reviewed_by: pauleves
-    safe_revision: 51b80457875c3916be6c8d6f5dab026143033d53
+    safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
   lib/ndr_support/hash.rb:
     comments: 
     reviewed_by: pauleves
     safe_revision: 506a317e59d0ccb5b32d813b74d822f35a55cea9
-  lib/ndr_support/integer.rb:
+  lib/ndr_support/integer/calculations.rb:
     comments: 
-    reviewed_by: pauleves
-    safe_revision: 4a4ed24d2cfe7e1736baadf4cf6e0fece6823be1
+    reviewed_by: josh.pencheon
+    safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
+  lib/ndr_support/integer/julian_date_conversions.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
+  lib/ndr_support/integer/rounding.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
   lib/ndr_support/nil.rb:
     comments: 
     reviewed_by: pauleves
@@ -118,8 +114,8 @@ file safety:
     safe_revision: f9341d1c7f797f9fe81af937c383d41c23872b2f
   lib/ndr_support/safe_file.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: '033819a6ada448551c71a72bbbef4652be3d9c40'
+    reviewed_by: josh.pencheon
+    safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
   lib/ndr_support/safe_path.rb:
     comments: 
     reviewed_by: timgentry
@@ -154,8 +150,8 @@ file safety:
     safe_revision: f7adf44fc2772e1926df37abfd9041d41c303328
   lib/ndr_support/version.rb:
     comments: 
-    reviewed_by: brian.shand
-    safe_revision: b27cf809b06814e6c1373e7b069b6537eaae3e15
+    reviewed_by: josh.pencheon
+    safe_revision: 76a88bd80e3553e85d0055dbadde1ca6c4638de8
   lib/ndr_support/yaml/serialization_migration.rb:
     comments: 
     reviewed_by: timgentry
@@ -176,18 +172,18 @@ file safety:
     comments: 
     reviewed_by: brian.shand
     safe_revision: 9a61389244a4e8e271515ab792aa5a9f8674eb1f
-  test/fixnum/calculations_test.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 2a5d30674dc9dde336e1dbbbf3c8a98905647432
   test/hash_test.rb:
     comments: 
     reviewed_by: timgentry
     safe_revision: 2a5d30674dc9dde336e1dbbbf3c8a98905647432
-  test/integer_test.rb:
+  test/integer/calculations_test.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 2a5d30674dc9dde336e1dbbbf3c8a98905647432
+    reviewed_by: josh.pencheon
+    safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
+  test/integer/rounding_test.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
   test/nil_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -250,5 +246,5 @@ file safety:
     safe_revision: 2a5d30674dc9dde336e1dbbbf3c8a98905647432
   test/yaml/serialization_test.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 862d95310b59b38d3dad1b906253981049a854bd
+    reviewed_by: josh.pencheon
+    safe_revision: 4daf43bf8cb48761471b32ad45c4d1cf97aab476

data/lib/ndr_support.rb

@@ -1,8 +1,8 @@
 require 'ndr_support/array'
 require 'ndr_support/daterange'
-require 'ndr_support/fixnum/calculations'
 require 'ndr_support/hash'
-require 'ndr_support/integer'
+require 'ndr_support/integer/calculations'
+require 'ndr_support/integer/rounding'
 require 'ndr_support/nil'
 require 'ndr_support/obfuscator'
 require 'ndr_support/ourdate'

data/lib/ndr_support/date_and_time_extensions.rb

@@ -52,13 +52,10 @@ module NdrSupport
     private
 
     def apply_date_patch!
-      # With YAML's crazy engine switching, it seems we
-      # can't rely including a module to define this method:
-      Date.module_eval do
-        def to_yaml(opts = {})
-          ::YAML.quick_emit(object_id, opts) do |out|
-            out.scalar('tag:yaml.org,2002:timestamp', to_s(:yaml), :plain)
-          end
+      # Ensure we emit "yaml-formatted" string, instead of the revised default format.
+      Psych::Visitors::YAMLTree.class_eval do
+        def visit_Date o
+          @emitter.scalar o.to_s(:yaml), nil, nil, true, false, Psych::Nodes::Scalar::ANY
         end
       end
     end

data/lib/ndr_support/daterange.rb

@@ -1,5 +1,5 @@
 require 'active_support/time'
-require 'ndr_support/fixnum/julian_date_conversions'
+require 'ndr_support/integer/julian_date_conversions'
 
 # Our "vague date" class, which can represent a single date or a date range.
 class Daterange

data/lib/ndr_support/{fixnum → integer}/calculations.rb

@@ -1,4 +1,4 @@
-class Fixnum
+class Integer
   # Gets binomial coefficients:
   #
   #   4.choose(2) #=> 6

data/lib/ndr_support/{fixnum → integer}/julian_date_conversions.rb

@@ -1,7 +1,7 @@
 require 'ndr_support/ourdate'
 
-# Extend Fixnum for use in our Daterange class
-class Fixnum
+# Extend Integer for use in our Daterange class
+class Integer
   # Julian date number to Ruby Date
   def jd_to_date
     Date.jd(self)

data/lib/ndr_support/safe_file.rb

@@ -163,9 +163,9 @@ class SafeFile
       prms = nil
 
     when 2
-      fail ArgumentError if args[1].class != Fixnum and args[1].class != String
+      fail ArgumentError unless args[1].is_a?(Integer) || args[1].is_a?(String)
 
-      if args[1].class == Fixnum
+      if args[1].is_a?(Integer)
         verify_mode(args[0], 'r')
         mode = 'r'
         prms = args[1]
@@ -178,7 +178,7 @@ class SafeFile
       fname = args[0]
 
     when 3
-      fail ArgumentError if args[1].class != String or args[2].class != Fixnum
+      fail ArgumentError unless args[1].is_a?(String) && args[2].is_a?(Integer)
       verify_mode(args[0], args[1])
 
       fname = args[0]

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.3.1'
+  VERSION = '5.3.2'
 end

data/test/{fixnum → integer}/calculations_test.rb

@@ -1,22 +1,22 @@
 require 'test_helper'
 
-# This tests our Fixnum calculations extension
-class Fixnum::CalculationsTest < Minitest::Test
-  test 'Fixnums should be extended with #factorial' do
+# This tests our Integer calculations extension
+class Integer::CalculationsTest < Minitest::Test
+  test 'Integer should be extended with #factorial' do
     assert 1.respond_to?(:factorial)
   end
 
-  test 'Fixnums#factorial should behave correctly' do
+  test 'Integer#factorial should behave correctly' do
     assert_equal 1, 0.factorial
     assert_equal 24, 4.factorial
     assert_raises(RuntimeError) { -1.factorial }
   end
 
-  test 'Fixnums should be extended with #choose' do
+  test 'Integer should be extended with #choose' do
     assert 1.respond_to?(:choose)
   end
 
-  test 'Fixnum#choose should behave correctly' do
+  test 'Integer#choose should behave correctly' do
     pascal_row = [1, 5, 10, 10, 5, 1]
     pascal_row.each_with_index do |target, index|
       assert_equal target, 5.choose(index)

data/test/{integer_test.rb → integer/rounding_test.rb}

@@ -1,7 +1,7 @@
 require 'test_helper'
 
-# This tests our Integer extension
-class IntegerTest < Minitest::Test
+# This tests our rounding extension
+class Integer::RoundingTest < Minitest::Test
   def test_rounding
     assert_equal 124_000, 123_221.round_up_to(3)
     assert_equal 123_300, 123_221.round_up_to(4)

data/test/yaml/serialization_test.rb

@@ -83,6 +83,10 @@ class SerializationTest < Minitest::Test
     # Dumped by 1.8.7 syck, within era.
     loaded = YAML.load("--- 2014-03-01\n")
     assert_equal date, loaded, '1.8.7 era date'
+
+    # Check default formatting does not affect serialisation:
+    assert_equal '01.03.2014', date.to_s
+    assert_equal date, YAML.load(date.to_yaml)
   end
 
   def assert_datetimes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_support
 version: !ruby/object:Gem::Version
-  version: 5.3.1
+  version: 5.3.2
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -234,7 +234,6 @@ files:
 - README.md
 - Rakefile
 - code_safety.yml
-- gemfiles/Gemfile.rails41
 - gemfiles/Gemfile.rails42
 - gemfiles/Gemfile.rails50
 - gemfiles/Gemfile.rails51
@@ -243,10 +242,10 @@ files:
 - lib/ndr_support/concerns/working_days.rb
 - lib/ndr_support/date_and_time_extensions.rb
 - lib/ndr_support/daterange.rb
-- lib/ndr_support/fixnum/calculations.rb
-- lib/ndr_support/fixnum/julian_date_conversions.rb
 - lib/ndr_support/hash.rb
-- lib/ndr_support/integer.rb
+- lib/ndr_support/integer/calculations.rb
+- lib/ndr_support/integer/julian_date_conversions.rb
+- lib/ndr_support/integer/rounding.rb
 - lib/ndr_support/nil.rb
 - lib/ndr_support/obfuscator.rb
 - lib/ndr_support/ourdate.rb
@@ -269,9 +268,9 @@ files:
 - test/array_test.rb
 - test/concerns/working_days_test.rb
 - test/daterange_test.rb
-- test/fixnum/calculations_test.rb
 - test/hash_test.rb
-- test/integer_test.rb
+- test/integer/calculations_test.rb
+- test/integer/rounding_test.rb
 - test/nil_test.rb
 - test/obfuscator_test.rb
 - test/ourdate_test.rb
@@ -316,9 +315,9 @@ test_files:
 - test/array_test.rb
 - test/concerns/working_days_test.rb
 - test/daterange_test.rb
-- test/fixnum/calculations_test.rb
 - test/hash_test.rb
-- test/integer_test.rb
+- test/integer/calculations_test.rb
+- test/integer/rounding_test.rb
 - test/nil_test.rb
 - test/obfuscator_test.rb
 - test/ourdate_test.rb

data/gemfiles/Gemfile.rails41

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'activerecord',  '~> 4.1.0'
-gem 'activesupport', '~> 4.1.0'