ndr_support 4.2.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0431ff0d6477d4d32dee799661d6fb0479c86ea4
-  data.tar.gz: e21749dd5f104eb840870853d6081e7000526907
+  metadata.gz: 1530ced81e43a1b40b430d058e20c64bca5dc74b
+  data.tar.gz: c643aa8c37ad6ec743341fd3f523336b53142664
 SHA512:
-  metadata.gz: 3654651b6776bb76646c894df83598e9b8b1ef53c32b2a4b61986fac0c06fbda1d76489c25e8a42e090bf4b1b3dd3e1da3a539651378f3c1a8a6784a872afe2a
-  data.tar.gz: ed74b4c1ae7ab6156e92dfb4ec0bdd285a1978698e8c298fcb0e3bbf2d113ec3cb7803abcea86d7eb78bc954a5f763196afdcfc0a3ddd340ec54c74581ae70b0
+  metadata.gz: 75f7d12b42e3a782d0719423cf9d1a4a934cc2cc5121d32776107d6119497886766edab5f7404b060645090829f4a8a191ff82dc7530f4608286cfdf36cced3d
+  data.tar.gz: a5e4f8ab2400d49df9b8b9b527ed4fe50104734377a67aa27c739338ec527e4d19229286ec834875d0a28d5ffb17543c5a8fbeae1997d9e11227fd73203290bb

data/README.md

@@ -1,5 +1,3 @@
-*NOTICE: This is the `4.x` branch; please see `master` for the latest developments.*
-
 # NdrSupport [![Build Status](https://travis-ci.org/PublicHealthEngland/ndr_support.svg?branch=master)](https://travis-ci.org/PublicHealthEngland/ndr_support)
 
 This is the Public Health England (PHE) National Disease Registers (NDR) Support ruby gem, providing:

data/code_safety.yml

@@ -15,7 +15,7 @@ file safety:
   ".travis.yml":
     comments: diff failed; reviewed whole file
     reviewed_by: josh.pencheon
-    safe_revision: 9d1e8fd6d0e443cbe1a35fedc6d8efda653fb816
+    safe_revision: a832dfb2a9c96a46520a8b120632961fb8794aaf
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: timgentry
@@ -34,8 +34,8 @@ file safety:
     safe_revision: 90328cca8494539257e192a63b240a91c89f0616
   README.md:
     comments: 
-    reviewed_by: ollietulloch
-    safe_revision: d9690e3ebcd35c55ee65a8163e80988c1c140428
+    reviewed_by: timgentry
+    safe_revision: 874d5d63763769a65bba7336099d10b030794b75
   Rakefile:
     comments: 
     reviewed_by: timgentry
@@ -52,10 +52,14 @@ file safety:
     comments: 
     reviewed_by: pauleves
     safe_revision: f76ad0fe72d42b1ff37553c8194935a8b93a6848
+  gemfiles/Gemfile.rails50:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: 55ed1c2a18b9cc4d1d996ee69419f5ee38f87746
   lib/ndr_support.rb:
     comments: 
-    reviewed_by: pauleves
-    safe_revision: 92652deb1e16e6023408633648bd955d7936dbf4
+    reviewed_by: josh.pencheon
+    safe_revision: 7c32f5a80c1fb7aaf6e850d4b0651a7b47640e15
   lib/ndr_support/array.rb:
     comments: 
     reviewed_by: pauleves
@@ -66,12 +70,12 @@ file safety:
     safe_revision: 5f9c98dcad6f6889d2431eb98cf07b1f5c3e57be
   lib/ndr_support/date_and_time_extensions.rb:
     comments: 
-    reviewed_by: pauleves
-    safe_revision: 29595e6431587ff9b7db6e3ad3abbb3577bff99c
+    reviewed_by: josh.pencheon
+    safe_revision: 779e05742a473b06ce1301507b04337a7bb1e36b
   lib/ndr_support/daterange.rb:
     comments: 
-    reviewed_by: pauleves
-    safe_revision: 506a317e59d0ccb5b32d813b74d822f35a55cea9
+    reviewed_by: josh.pencheon
+    safe_revision: 7c32f5a80c1fb7aaf6e850d4b0651a7b47640e15
   lib/ndr_support/fixnum/calculations.rb:
     comments: 
     reviewed_by: pauleves
@@ -115,7 +119,7 @@ file safety:
   lib/ndr_support/string/cleaning.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 9eeed313d57206901bfe1bc0e2ec9c25dad0c996
+    safe_revision: 4958fb683115a5941e34a52410ef33d17ff75579
   lib/ndr_support/string/conversions.rb:
     comments: 
     reviewed_by: timgentry
@@ -124,10 +128,6 @@ file safety:
     comments: 
     reviewed_by: timgentry
     safe_revision: 62337584a32e5c30c2e9af7cd998a9df684885cc
-  lib/ndr_support/time/conversions.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 92652deb1e16e6023408633648bd955d7936dbf4
   lib/ndr_support/utf8_encoding.rb:
     comments: 
     reviewed_by: timgentry
@@ -147,7 +147,7 @@ file safety:
   lib/ndr_support/version.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 1325c04ab8f3bb6633e067bfbe81daef22238527
+    safe_revision: 65f01fdc12e3de67b7e486d43ac4931932fcd22c
   lib/ndr_support/yaml/serialization_migration.rb:
     comments: 
     reviewed_by: timgentry
@@ -155,7 +155,7 @@ file safety:
   ndr_support.gemspec:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 74d414793e914a45cbfd409357913ebfc9d99853
+    safe_revision: 9a2ce0c2cdefd4726df33199ca8f1a5ece6f3042
   test/array_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -166,8 +166,8 @@ file safety:
     safe_revision: 506a317e59d0ccb5b32d813b74d822f35a55cea9
   test/daterange_test.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 2a5d30674dc9dde336e1dbbbf3c8a98905647432
+    reviewed_by: josh.pencheon
+    safe_revision: 7c32f5a80c1fb7aaf6e850d4b0651a7b47640e15
   test/fixnum/calculations_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -186,8 +186,8 @@ file safety:
     safe_revision: 2a5d30674dc9dde336e1dbbbf3c8a98905647432
   test/ourdate_test.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 2a5d30674dc9dde336e1dbbbf3c8a98905647432
+    reviewed_by: josh.pencheon
+    safe_revision: 7c32f5a80c1fb7aaf6e850d4b0651a7b47640e15
   test/ourtime_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -211,7 +211,7 @@ file safety:
   test/string/cleaning_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 9eeed313d57206901bfe1bc0e2ec9c25dad0c996
+    safe_revision: 4958fb683115a5941e34a52410ef33d17ff75579
   test/string/conversions_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -220,10 +220,6 @@ file safety:
     comments: 
     reviewed_by: timgentry
     safe_revision: 506a317e59d0ccb5b32d813b74d822f35a55cea9
-  test/time/conversions_test.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 2a5d30674dc9dde336e1dbbbf3c8a98905647432
   test/utf8_encoding/control_characters_test.rb:
     comments: 
     reviewed_by: timgentry

data/gemfiles/Gemfile.rails50

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

data/lib/ndr_support.rb

@@ -11,7 +11,6 @@ require 'ndr_support/safe_file'
 require 'ndr_support/safe_path'
 require 'ndr_support/string/cleaning'
 require 'ndr_support/string/conversions'
-require 'ndr_support/time/conversions'
 require 'ndr_support/utf8_encoding'
 require 'ndr_support/version'
 require 'ndr_support/yaml/serialization_migration'

data/lib/ndr_support/date_and_time_extensions.rb

@@ -4,32 +4,15 @@ require 'ndr_support/concerns/working_days'
 [Time, Date, DateTime].each { |klass| klass.send(:include, WorkingDays) }
 
 class Date
-  # Note: default date format is specified in config/environment.rb
-  def to_verbose
-    strftime('%d %B %Y')
-  end # our long format
-
   # to_iso output must be SQL safe for security reasons
   def to_iso
     strftime('%Y-%m-%d')
   end # ISO date format
-
-  def to_ours
-    to_s
-  end
-
-  def to_YYYYMMDD # convert dates into format 'YYYYMMDD' - used in tracing
-    self.year.to_s + self.month.to_s.rjust(2, '0') + self.day.to_s.rjust(2, '0')
-  end
 end
 
 #-------------------------------------------------------------------------------
 
 class Time
-  def to_ours
-    strftime('%d.%m.%Y %H:%M')
-  end # Show times in our format
-
   # to_iso output must be SQL safe for security reasons
   def to_iso
     strftime('%Y-%m-%dT%H:%M:%S')
@@ -98,6 +81,3 @@ module NdrSupport
     end
   end
 end
-
-# Maintain API:
-NdrSupport.attempt_date_patch!

data/lib/ndr_support/daterange.rb

@@ -69,10 +69,10 @@ class Daterange
   def verbose
     return 'Bad date(s)' unless @date1 && @date2
     if @date1 == @date2 # single date
-      @date1.to_verbose
+      _verbose(@date1)
     else # range
-      'The period ' + @date1.to_verbose + ' to ' + @date2.to_verbose +
-        ' inclusive (' + (@date2 - @date1 + 1).to_s + ' days)'
+      'The period ' + _verbose(@date1) + ' to ' + _verbose(@date2) +
+        ' inclusive (' + (@date2 - @date1 + 1).to_i.to_s + ' days)'
     end
   end
 
@@ -117,6 +117,10 @@ class Daterange
 
   private
 
+  def _verbose(date)
+    date.strftime('%d %B %Y')
+  end
+
   def tidy_string_if_midnight(datetime)
     if datetime.hour == 0 && datetime.min == 0 && datetime.sec == 0
       # it's midnight

data/lib/ndr_support/string/cleaning.rb

@@ -50,14 +50,6 @@ class String
       postcodeize(:db)
     when :lpi
       upcase.delete('^0-9A-Z')
-    when :gender
-      if self =~ /\AM(ale)?/i
-        '1'
-      elsif self =~ /\AF(emale)?/i
-        '2'
-      else
-        self
-      end
     when :sex
       # SECURE: BNS 2012-10-09: But may behave oddly for multi-line input
       if self =~ /^M|1/i

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 = '4.2.0'
+  VERSION = '5.0.0'
 end

data/ndr_support.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '>= 3.2.18', '< 5.0.0'
-  spec.add_dependency 'activesupport', '>= 3.2.18', '< 5.0.0'
+  spec.add_dependency 'activerecord',  '>= 3.2.22', '< 5.1'
+  spec.add_dependency 'activesupport', '>= 3.2.22', '< 5.1'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'

data/test/daterange_test.rb

@@ -123,6 +123,16 @@ class DaterangeTest < Minitest::Test
     assert_equal '03.2010', dr.to_s # Ideally '03.2010'
   end
 
+  def test_verbose
+    dr = Daterange.new('01.03.2010')
+    assert_equal '01 March 2010', dr.verbose
+  end
+
+  def test_verbose_range
+    dr = Daterange.new('03.2010 to 2014')
+    assert_equal 'The period 01 March 2010 to 31 December 2014 inclusive (1767 days)', dr.verbose
+  end
+
   def test_year_intersection
     dr1 = Daterange.new('2001')
     dr2 = Daterange.new('2002')

data/test/ourdate_test.rb

@@ -4,9 +4,7 @@ require 'test_helper'
 class OurdateTest < Minitest::Test
   def test_date_and_time
     d = Ourdate.build_datetime(2003, 11, 30)
-    assert_equal '30 November 2003', d.to_verbose
     assert_equal '2003-11-30', d.to_iso
-    assert_equal '30.11.2003', d.to_ours
     assert_equal '30.11.2003', d.to_s
   end
 

data/test/string/cleaning_test.rb

@@ -94,19 +94,6 @@ class String
       assert_equal '', ''.clean(:lpi)
     end
 
-    test 'clean gender' do
-      assert_equal '1', 'M'.clean(:gender)
-      assert_equal '1', 'male'.clean(:gender)
-      assert_equal '1', '1'.clean(:gender)
-      assert_equal '2', 'F'.clean(:gender)
-      assert_equal '2', 'Female'.clean(:gender)
-      assert_equal '2', '2'.clean(:gender)
-      assert_equal '4000', '4000'.clean(:gender)
-      assert_equal '9', '9'.clean(:gender)
-      assert_equal 'UNK', 'UNK'.clean(:gender)
-      assert_equal '', ''.clean(:gender)
-    end
-
     test 'clean sex' do
       assert_equal '1', 'male'.clean(:sex)
       assert_equal '1', '1'.clean(:sex)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_support
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 5.0.0
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.18
+        version: 3.2.22
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.18
+        version: 3.2.22
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.18
+        version: 3.2.22
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.18
+        version: 3.2.22
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -244,6 +244,7 @@ files:
 - gemfiles/Gemfile.rails32
 - gemfiles/Gemfile.rails41
 - gemfiles/Gemfile.rails42
+- gemfiles/Gemfile.rails50
 - lib/ndr_support.rb
 - lib/ndr_support/array.rb
 - lib/ndr_support/concerns/working_days.rb
@@ -262,7 +263,6 @@ files:
 - lib/ndr_support/string/cleaning.rb
 - lib/ndr_support/string/conversions.rb
 - lib/ndr_support/tasks.rb
-- lib/ndr_support/time/conversions.rb
 - lib/ndr_support/utf8_encoding.rb
 - lib/ndr_support/utf8_encoding/control_characters.rb
 - lib/ndr_support/utf8_encoding/force_binary.rb
@@ -286,7 +286,6 @@ files:
 - test/string/cleaning_test.rb
 - test/string/conversions_test.rb
 - test/test_helper.rb
-- test/time/conversions_test.rb
 - test/utf8_encoding/control_characters_test.rb
 - test/utf8_encoding/force_binary_test.rb
 - test/utf8_encoding_test.rb
@@ -311,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.5
 signing_key: 
 specification_version: 4
 summary: NDR Support library
@@ -332,7 +331,6 @@ test_files:
 - test/string/cleaning_test.rb
 - test/string/conversions_test.rb
 - test/test_helper.rb
-- test/time/conversions_test.rb
 - test/utf8_encoding/control_characters_test.rb
 - test/utf8_encoding/force_binary_test.rb
 - test/utf8_encoding_test.rb

data/lib/ndr_support/time/conversions.rb

@@ -1,13 +0,0 @@
-class Time
-  # Ruby 1.9 defines Time#to_time natively (as part of the
-  # stdlib Time, rather than core Time), but it returns
-  # the time in the local timezone. ActiveSupport contains
-  # the following definition, but it is only actually used
-  # by Ruby 1.8.7. We wish to continue with that behaviour,
-  # as local time zones have caused problems with our
-  # Time#to_s format (which either formats as '%d.%m.%Y %H:%M'
-  # or '%d.%m.%Y').
-  def to_time
-    self
-  end
-end

data/test/time/conversions_test.rb

@@ -1,15 +0,0 @@
-require 'test_helper'
-
-class Time::ConversionsTest < Minitest::Test
-  test 'to_time should return same object' do
-    yaml  = '2015-08-06 00:00:00 Z'
-
-    time  = yaml.to_time
-    time2 = time.to_time
-
-    assert Time === time, 'time was not a Time'
-    assert Time === time2, 'time2 was not a Time'
-
-    assert_equal time.object_id, time2.object_id
-  end
-end