ndr_support 5.4.1 → 5.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77ad0f720a4aab0df38d540c85a3049c5713c61f
-  data.tar.gz: 61501939a91bc87d0f8d8620bd29d35f8cf7f51a
+  metadata.gz: 07ba3c21f982adf4857b352bf87e1046dd393090
+  data.tar.gz: 5dd49f19587d0071d82565e1912a775ec065d986
 SHA512:
-  metadata.gz: 2169e7247a0d6ae3c2489571dc092bad511740ddf38c8f79b948bb5d946945ced8da3dba2e212ebeece92f67a78fefb884b47af71e68bef7bfe37a39f51999b2
-  data.tar.gz: 2b2e58b3fd266661f94539f9dcf5a715237438f4f1f3dcdd7e999c8f551b8bc67553f0986ddd3c9f17a43ad943245f2e5a7095b09c2ce6b24501b4b900bd5897
+  metadata.gz: 58504a8eabba9ab32fb4ab2a0e6f935101614f92c7bcd7eb6db606d3404394290cd8f6f8d7921d7606ca42c1924e1183a7301882558a912c15c39c5644484088
+  data.tar.gz: cdcbd43264a63a9427bfdca4c5e0f57e51a8d29fb3273e247d7c06004dba86d98b788effc60823b33e8ba1950ef60ab78217cb4cdba6b67ff2b6d5174c99ce67

data/code_safety.yml

@@ -9,8 +9,10 @@ file safety:
     reviewed_by: josh.pencheon
     safe_revision: a02f14cbf1fc36fbaf820365fdedfdc9af326db1
   ".travis.yml":
-    comments: diff failed; reviewed whole file
-    reviewed_by: josh.pencheon
+    comments: 'diff failed; reviewed whole file. Revision c88f5ac8c12fd657bb142144e0d3afaa7f9bc361:
+      Slack notification secret is public/private key encrypted, so not a disclosure
+      risk. As a secondary protection, it''s excluded from the .gem file by ndr_support.gemspec'
+    reviewed_by: brian.shand
     safe_revision: c88f5ac8c12fd657bb142144e0d3afaa7f9bc361
   CODE_OF_CONDUCT.md:
     comments: 
@@ -70,8 +72,8 @@ file safety:
     safe_revision: 3553509e52b3697d361cfa4c6f8a67754ed942d3
   lib/ndr_support/daterange.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: e43b6e6fa52c267abf51a9f119b24ca7645d4077
+    reviewed_by: brian.shand
+    safe_revision: c7ed8bc16be8ec803dfaeb3473fbc538b54587ec
   lib/ndr_support/hash.rb:
     comments: 
     reviewed_by: pauleves
@@ -154,16 +156,16 @@ file safety:
     safe_revision: f7adf44fc2772e1926df37abfd9041d41c303328
   lib/ndr_support/version.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: f7e1eb75323e5675b532cdef04516cc877d15e9f
+    reviewed_by: brian.shand
+    safe_revision: a4ba32dcdab4a08db5851767282008ca3e7d8672
   lib/ndr_support/yaml/serialization_migration.rb:
     comments: 
     reviewed_by: timgentry
     safe_revision: 29595e6431587ff9b7db6e3ad3abbb3577bff99c
   ndr_support.gemspec:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 4cad594a94f334c7928457eb21a53096cdb63d0d
+    reviewed_by: brian.shand
+    safe_revision: e8d08f6466acbdd4cbd6cbf90f1cfa45ffd656ec
   test/array_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -175,7 +177,7 @@ file safety:
   test/daterange_test.rb:
     comments: 
     reviewed_by: brian.shand
-    safe_revision: 9a61389244a4e8e271515ab792aa5a9f8674eb1f
+    safe_revision: c7ed8bc16be8ec803dfaeb3473fbc538b54587ec
   test/hash_test.rb:
     comments: 
     reviewed_by: timgentry

data/lib/ndr_support/daterange.rb

@@ -100,7 +100,9 @@ class Daterange
   end
 
   def ==(other)
-    self.date1 == other.date1 && self.date2 == other.date2
+    date1 == other.date1 && date2 == other.date2
+  rescue NoMethodError # Comparing to things that don't work like Dateranges, e.g. nil, integer
+    false
   end
 
   def intersects?(other)

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.4.1'
+  VERSION = '5.4.2'
 end

data/ndr_support.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ndr_support/version'
@@ -15,6 +14,8 @@ Gem::Specification.new do |spec|
 
   # Exclude older versions of this gem from the package.
   spec.files         = `git ls-files -z`.split("\x0").reject { |s| s =~ /^pkg\// }
+  # SECURE BNS 2018-08-06: Minimise sharing of (public-key encrypted) slack secrets in .travis.yml
+  spec.files         -= %w[.travis.yml] # Not needed in the gem
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']

data/test/daterange_test.rb

@@ -209,4 +209,15 @@ class DaterangeTest < Minitest::Test
     dr = Daterange.merge('2001, 30.04.2005, 2003,,')
     assert_equal '01.01.2001 to 30.04.2005', dr.to_s
   end
+
+  def test_comparison
+    dr1 = Daterange.new('01.04.2000')
+    dr2 = Daterange.new('01.04.2000 to 01.04.2000')
+    assert_equal dr1, dr2
+    assert_equal dr1, dr1.to_s
+    refute_equal nil, dr1
+    refute_equal 0, dr1
+    refute_equal dr1, nil
+    refute_equal dr1, 0
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_support
 version: !ruby/object:Gem::Version
-  version: 5.4.1
+  version: 5.4.2
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2018-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -226,7 +226,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Guardfile

data/.travis.yml

@@ -1,19 +0,0 @@
-language: ruby
-rvm:
-- 2.3
-- 2.4
-- 2.5
-gemfile:
-- gemfiles/Gemfile.rails42
-- gemfiles/Gemfile.rails50
-- gemfiles/Gemfile.rails51
-- gemfiles/Gemfile.rails52
-sudo: false
-cache: bundler
-before_install: rm -f ${BUNDLE_GEMFILE}.lock
-before_script: bundle update
-script: bundle exec rake test
-notifications:
-  slack:
-    rooms:
-      secure: q8ctt0jGlGS70M0VpxfnYO/sHLIzSr0IgBNh0sv5EjR9ZQhyY6LLd+QVoBV9CV4p1V213c+SfKEtA32VLVCW4jq3pznDrDxJgCknAoooyQlRR2a/rrCV2ihGJWc1WAE5CWqxnT4Xd3lGnw/Y0dHkt9tAZIozgJM/5g0FXgNklsJSpmFntjl0Z4353K4F+FhqZPqjiLzyKAgtn0gQxM86ywaQahNyWTqSLm8F4+9DToqp31VN0IIlUWkiVWgBml3VV15JvunkRrBWio8AqPbuMKixJXQN5tLjX3/j3ETRLouvOvzMJ0P/HcQ7VH/wDyO/HqLyaToUBST/RnlAKMa/WSNiLkfJ0YUTZXl5DDcyzMh7lkskTar9yFNHeo4vxqcE2ZoNOMMLItT4AYtuKzkbGaJyxqEJHlRqUL0CAjLf6wrAobKdeVwQxEZRRVXHcIvoZu7ahtMuwZNJsqNFxUAGySk1rKeBC4eVvPur16f6+4+dz4NKwCIQ/vU/Ge8a2vQD0AnMIhH+SGQ2nGGtNDD2Svb2TKYQumUwD8ekb6J+J361BkWnMw9LfPGki5C1dG5EChDB26PWQjtU/A99HVqt8xJiai60dvhVqfV6vJ30uKZq1bPyCfRk5SMdUBexO3SXgSoFbEv1HnPmBCfbLnzXADZfH0Mqr4mXTQExmqT871k=