RubyGems - ndr_support - Versions diffs - 4.1.1 → 4.1.2 - Mend

ndr_support 4.1.1 → 4.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

checksums.yaml +4 -4
data/.gitignore +1 -0
data/code_safety.yml +10 -22
data/lib/ndr_support/string/cleaning.rb +16 -4
data/lib/ndr_support/version.rb +1 -1
data/ndr_support.gemspec +1 -0
data/test/string/cleaning_test.rb +4 -0
metadata +16 -5
data/gemfiles/Gemfile.rails32.lock +0 -108
data/gemfiles/Gemfile.rails41.lock +0 -111
data/gemfiles/Gemfile.rails42.lock +0 -111

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dbd286ab4f1123812eb61b3374febfb81668841
-  data.tar.gz: 88a77bdc779fc4f782a83070c3bcb905b5f611fc
+  metadata.gz: 7eeb48b2853f7a8bc827a7d0a9e385f3d0056c4e
+  data.tar.gz: 9fc468f932f12111580979b1e66af05ac413acbc
 SHA512:
-  metadata.gz: c78c653bea20723eab61d9d20b199195bbcde0f6c7e561e1f80bab72c20deba6705ac3c8281fc703f60ceee5db5735bb0d6c022a86fcc8405abc722eba1d14e1
-  data.tar.gz: 51113cb130b185681213eaf89441ecdef91bc8b261207569407378d427bcfc4226ff47f50fd63822db5e77ed6b1b33d37084dc565f9f7e98a2fa3d09379a9bae
+  metadata.gz: cd79980fa3490e26a3c1d552ffa36ec08b445b73e329f1f4ac049fe18472bba9dd0c91b4b9a45be8a8a61ed70246ed4fab86b042895229abac3a6f8870928523
+  data.tar.gz: d5c36a79610d1b52d3157d98b3b64d5da1dfb128f0a55fa8a038a978d4860b3ccceb09b78499e6369287efbcec045f072e3b29b64876d6ba8e3eca6458a7ba18

data/.gitignore CHANGED Viewed

@@ -4,6 +4,7 @@
 /_yardoc/
 /coverage/
 /doc/
+/gemfiles/*.lock
 /pkg/
 /spec/reports/
 /tmp/

data/code_safety.yml CHANGED Viewed

@@ -2,8 +2,8 @@
 file safety:
   ".gitignore":
     comments:
-    reviewed_by: timgentry
-    safe_revision: 2590c1c28a8ca9cfb20ad3fe3ee65a12190a5810
+    reviewed_by: josh.pencheon
+    safe_revision: 412c86abb7b5fa545c1d4895aad4fe50cbc41faf
   ".hound.yml":
     comments:
     reviewed_by: timgentry
@@ -13,9 +13,9 @@ file safety:
     reviewed_by: timgentry
     safe_revision: bd7dbaf2c72eb4a8f74db498f4dea67e02c8cb60
   ".travis.yml":
-    comments:
-    reviewed_by: timgentry
-    safe_revision: 41cea330c8de42e4080c40143eaa15a225be7c5a
+    comments: diff failed; reviewed whole file
+    reviewed_by: josh.pencheon
+    safe_revision: e22a3dd275ef7e9416c30e75679237053ec474d9
   CODE_OF_CONDUCT.md:
     comments:
     reviewed_by: timgentry
@@ -44,26 +44,14 @@ file safety:
     comments:
     reviewed_by: pauleves
     safe_revision: f76ad0fe72d42b1ff37553c8194935a8b93a6848
-  gemfiles/Gemfile.rails32.lock:
-    comments:
-    reviewed_by: pauleves
-    safe_revision: 0455a5dd9685aff2e3ce56963932b132067afc71
   gemfiles/Gemfile.rails41:
     comments:
     reviewed_by: pauleves
     safe_revision: f76ad0fe72d42b1ff37553c8194935a8b93a6848
-  gemfiles/Gemfile.rails41.lock:
-    comments:
-    reviewed_by: pauleves
-    safe_revision: 0455a5dd9685aff2e3ce56963932b132067afc71
   gemfiles/Gemfile.rails42:
     comments:
     reviewed_by: pauleves
     safe_revision: f76ad0fe72d42b1ff37553c8194935a8b93a6848
-  gemfiles/Gemfile.rails42.lock:
-    comments:
-    reviewed_by: pauleves
-    safe_revision: 0455a5dd9685aff2e3ce56963932b132067afc71
   lib/ndr_support.rb:
     comments:
     reviewed_by: pauleves
@@ -127,7 +115,7 @@ file safety:
   lib/ndr_support/string/cleaning.rb:
     comments:
     reviewed_by: josh.pencheon
-    safe_revision: 3d9cb572458ab1b9ae88fe9aba36a160c881694c
+    safe_revision: 4958fb683115a5941e34a52410ef33d17ff75579
   lib/ndr_support/string/conversions.rb:
     comments:
     reviewed_by: timgentry
@@ -159,15 +147,15 @@ file safety:
   lib/ndr_support/version.rb:
     comments:
     reviewed_by: josh.pencheon
-    safe_revision: 2d147b3de8c8819feb278fa44328878370ace124
+    safe_revision: 0cab8a5b04539914556d3aef0d863ff4e051638b
   lib/ndr_support/yaml/serialization_migration.rb:
     comments:
     reviewed_by: timgentry
     safe_revision: 29595e6431587ff9b7db6e3ad3abbb3577bff99c
   ndr_support.gemspec:
     comments:
-    reviewed_by: timgentry
-    safe_revision: a6685b972e64c61c62ba1f82883b149b0c4181c2
+    reviewed_by: josh.pencheon
+    safe_revision: 74d414793e914a45cbfd409357913ebfc9d99853
   test/array_test.rb:
     comments:
     reviewed_by: timgentry
@@ -223,7 +211,7 @@ file safety:
   test/string/cleaning_test.rb:
     comments:
     reviewed_by: josh.pencheon
-    safe_revision: 0f2ba63edf73284d26709c129027bc27dcc1d3a3
+    safe_revision: 4958fb683115a5941e34a52410ef33d17ff75579
   test/string/conversions_test.rb:
     comments:
     reviewed_by: timgentry

data/lib/ndr_support/string/cleaning.rb CHANGED Viewed

@@ -4,6 +4,18 @@ class String
   INVALID_CONTROL_CHARS = /[\x00-\x08\x0b-\x0c\x0e-\x1f]/
   ROMAN_ONE_TO_FIVE_MAPPING = { 'I' => '1', 'II' => '2', 'III' => '3', 'IIII' => '4', 'IV' => '4', 'V' => '5' }
+  POSTCODE_REGEXP = /
+    ^(
+      [A-Z][0-9]           |
+      [A-Z][0-9][0-9]      |
+      [A-Z][0-9][A-Z]      |
+      [A-Z][A-Z][0-9]      |
+      [A-Z][A-Z][0-9][0-9] |
+      [A-Z][A-Z][0-9][A-Z]
+    )
+    [0-9][A-Z][A-Z]
+  $/x
   # Used for comparing addresses
   def squash
     upcase.delete('^A-Z0-9')
@@ -12,9 +24,9 @@ class String
   # Show postcode in various formats.
   # Parameter "option" can be :user, :compact, :db
   def postcodeize(option = :user)
-    nspce = delete(' ').upcase
-    unless nspce.blank? || /([A-Z][0-9]|[A-Z][0-9][0-9]|[A-Z][0-9][A-Z]|[A-Z][A-Z][0-9]|[A-Z][A-Z][0-9][0-9]|[A-Z][A-Z][0-9][A-Z])[0-9][A-Z][A-Z]$/ =~ nspce
-      return self  # Don't change old-style or malformed postcodes
+    nspce = gsub(/[[:space:]]/, '').upcase
+    unless nspce.blank? || POSTCODE_REGEXP =~ nspce
+      return self # Don't change old-style or malformed postcodes
     end
     case option
     when :compact
@@ -97,7 +109,7 @@ class String
       cleaned_codes.join(' ')
     when :icd
       codes = upcase.squish.split_on_separators.reject(&:blank?)
-      codes.map { |code| code.gsub(/[.X]/, '') }.join(' ')
+      codes.map { |code| code.gsub(/(?<=\d)(\.?X?)/, '') }.join(' ')
     when :code_opcs
       clean_code_opcs
     when :hospitalnumber

data/lib/ndr_support/version.rb CHANGED Viewed

@@ -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.1.1'
+  VERSION = '4.1.2'
 end

data/ndr_support.gemspec CHANGED Viewed

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'ndr_dev_support', '~> 1.1', '>= 1.1.3'
   spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'listen', '< 3.1' # Bundle 1.12 should be (but isn't) resolving Ruby 2.1 issue
   spec.add_development_dependency 'guard-rubocop'
   spec.add_development_dependency 'guard-shell'
   spec.add_development_dependency 'guard-minitest'

data/test/string/cleaning_test.rb CHANGED Viewed

@@ -6,9 +6,11 @@ class String
     test 'postcodeize' do
       assert_equal 'CB22 3AD', 'CB223AD'.postcodeize
+      assert_equal 'NOTCB223AD', 'NOTCB223AD'.postcodeize
       assert_equal 'CB2 2QQ', 'CB22QQ'.postcodeize
       assert_equal 'CB2 2QQ', 'CB22QQ  '.postcodeize
       assert_equal 'CB2 2QQ', 'C   B   22QQ  '.postcodeize
+      assert_equal 'CB2 2QQ', "CB2\u00a02QQ".postcodeize # Unicode non-breaking space
       assert_equal 'CB22QQ', 'CB2 2QQ'.postcodeize(:compact)
       assert_equal 'CB2 2QQ', 'CB22QQ  '.postcodeize(:db)
       assert_equal 'CB2A2QQ', 'CB2A 2QQ  '.postcodeize(:db)
@@ -143,6 +145,8 @@ class String
       assert_equal 'C50 C509', ' C50X, c50.9; '.clean(:icd)
       assert_equal 'D04', 'd04'.clean(:icd)
       assert_equal 'C32', ';C32.X'.clean(:icd)
+      assert_equal 'C32', ';C32X'.clean(:icd)
+      assert_equal 'X32 X901A', ';X32.X;x90.1.a'.clean(:icd)
     end
     test 'clean code_opcs' do

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_support
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -140,6 +140,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -228,11 +242,8 @@ files:
 - Rakefile
 - code_safety.yml
 - gemfiles/Gemfile.rails32
-- gemfiles/Gemfile.rails32.lock
 - gemfiles/Gemfile.rails41
-- gemfiles/Gemfile.rails41.lock
 - gemfiles/Gemfile.rails42
-- gemfiles/Gemfile.rails42.lock
 - lib/ndr_support.rb
 - lib/ndr_support/array.rb
 - lib/ndr_support/concerns/working_days.rb

data/gemfiles/Gemfile.rails32.lock DELETED Viewed

@@ -1,108 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    ndr_support (3.0.0)
-      activerecord (>= 3.2.18, < 5.0.0)
-      activesupport (>= 3.2.18, < 5.0.0)
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (3.2.22)
-      activesupport (= 3.2.22)
-      builder (~> 3.0.0)
-    activerecord (3.2.22)
-      activemodel (= 3.2.22)
-      activesupport (= 3.2.22)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.22)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.3)
-    ast (2.0.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
-    builder (3.0.4)
-    coderay (1.1.0)
-    docile (1.1.5)
-    ffi (1.9.10)
-    formatador (0.2.5)
-    guard (2.13.0)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, <= 4.0)
-      lumberjack (~> 1.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-minitest (2.4.4)
-      guard-compat (~> 1.2)
-      minitest (>= 3.0)
-    guard-rubocop (1.2.0)
-      guard (~> 2.0)
-      rubocop (~> 0.20)
-    i18n (0.7.0)
-    json (1.8.3)
-    listen (3.0.3)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.9)
-    metaclass (0.0.4)
-    method_source (0.8.2)
-    minitest (5.7.0)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.11.2)
-    nenv (0.2.0)
-    notiffany (0.0.7)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    parser (2.2.2.6)
-      ast (>= 1.1, < 3.0)
-    powerpack (0.1.1)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rainbow (2.0.0)
-    rake (10.4.2)
-    rb-fsevent (0.9.5)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    rubocop (0.32.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.2.5, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.5)
-    shellany (0.0.1)
-    simplecov (0.10.0)
-      docile (~> 1.1.0)
-      json (~> 1.8)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    slop (3.6.0)
-    terminal-notifier-guard (1.6.4)
-    thor (0.19.1)
-    tzinfo (0.3.44)
-PLATFORMS
-  ruby
-DEPENDENCIES
-  activerecord (~> 3.2.18)
-  activesupport (~> 3.2.18)
-  bundler (~> 1.7)
-  guard
-  guard-minitest
-  guard-rubocop
-  minitest (>= 5.0.0)
-  mocha (~> 1.1)
-  ndr_support!
-  rake (~> 10.0)
-  simplecov
-  terminal-notifier-guard

data/gemfiles/Gemfile.rails41.lock DELETED Viewed

@@ -1,111 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    ndr_support (3.0.0)
-      activerecord (>= 3.2.18, < 5.0.0)
-      activesupport (>= 3.2.18, < 5.0.0)
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (4.1.12)
-      activesupport (= 4.1.12)
-      builder (~> 3.1)
-    activerecord (4.1.12)
-      activemodel (= 4.1.12)
-      activesupport (= 4.1.12)
-      arel (~> 5.0.0)
-    activesupport (4.1.12)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
-    ast (2.0.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
-    builder (3.2.2)
-    coderay (1.1.0)
-    docile (1.1.5)
-    ffi (1.9.10)
-    formatador (0.2.5)
-    guard (2.13.0)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, <= 4.0)
-      lumberjack (~> 1.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-minitest (2.4.4)
-      guard-compat (~> 1.2)
-      minitest (>= 3.0)
-    guard-rubocop (1.2.0)
-      guard (~> 2.0)
-      rubocop (~> 0.20)
-    i18n (0.7.0)
-    json (1.8.3)
-    listen (3.0.3)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.9)
-    metaclass (0.0.4)
-    method_source (0.8.2)
-    minitest (5.7.0)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    nenv (0.2.0)
-    notiffany (0.0.7)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    parser (2.2.2.6)
-      ast (>= 1.1, < 3.0)
-    powerpack (0.1.1)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rainbow (2.0.0)
-    rake (10.4.2)
-    rb-fsevent (0.9.5)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    rubocop (0.32.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.2.5, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.5)
-    shellany (0.0.1)
-    simplecov (0.10.0)
-      docile (~> 1.1.0)
-      json (~> 1.8)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    slop (3.6.0)
-    terminal-notifier-guard (1.6.4)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-PLATFORMS
-  ruby
-DEPENDENCIES
-  activerecord (~> 4.1.0)
-  activesupport (~> 4.1.0)
-  bundler (~> 1.7)
-  guard
-  guard-minitest
-  guard-rubocop
-  minitest (>= 5.0.0)
-  mocha (~> 1.1)
-  ndr_support!
-  rake (~> 10.0)
-  simplecov
-  terminal-notifier-guard

data/gemfiles/Gemfile.rails42.lock DELETED Viewed

@@ -1,111 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    ndr_support (3.0.0)
-      activerecord (>= 3.2.18, < 5.0.0)
-      activesupport (>= 3.2.18, < 5.0.0)
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (4.2.3)
-      activesupport (= 4.2.3)
-      builder (~> 3.1)
-    activerecord (4.2.3)
-      activemodel (= 4.2.3)
-      activesupport (= 4.2.3)
-      arel (~> 6.0)
-    activesupport (4.2.3)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    arel (6.0.2)
-    ast (2.0.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
-    builder (3.2.2)
-    coderay (1.1.0)
-    docile (1.1.5)
-    ffi (1.9.10)
-    formatador (0.2.5)
-    guard (2.13.0)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, <= 4.0)
-      lumberjack (~> 1.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-minitest (2.4.4)
-      guard-compat (~> 1.2)
-      minitest (>= 3.0)
-    guard-rubocop (1.2.0)
-      guard (~> 2.0)
-      rubocop (~> 0.20)
-    i18n (0.7.0)
-    json (1.8.3)
-    listen (3.0.3)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.9)
-    metaclass (0.0.4)
-    method_source (0.8.2)
-    minitest (5.7.0)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    nenv (0.2.0)
-    notiffany (0.0.7)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    parser (2.2.2.6)
-      ast (>= 1.1, < 3.0)
-    powerpack (0.1.1)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rainbow (2.0.0)
-    rake (10.4.2)
-    rb-fsevent (0.9.5)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    rubocop (0.32.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.2.5, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.5)
-    shellany (0.0.1)
-    simplecov (0.10.0)
-      docile (~> 1.1.0)
-      json (~> 1.8)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    slop (3.6.0)
-    terminal-notifier-guard (1.6.4)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-PLATFORMS
-  ruby
-DEPENDENCIES
-  activerecord (~> 4.2.0)
-  activesupport (~> 4.2.0)
-  bundler (~> 1.7)
-  guard
-  guard-minitest
-  guard-rubocop
-  minitest (>= 5.0.0)
-  mocha (~> 1.1)
-  ndr_support!
-  rake (~> 10.0)
-  simplecov
-  terminal-notifier-guard