uk_account_validator 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72c9a0ad1d2060616cecd95633d65e00465cc5c3
-  data.tar.gz: e000a86c002c5c869e70594fd6df4d00e73e8a00
+  metadata.gz: 06b6904edebd4d278f6e985ec8f8393bb2553c4a
+  data.tar.gz: 52648d7abd5a27a2ee24e82d870e524c5a15b4b3
 SHA512:
-  metadata.gz: cce9293340964b404053561439ca77ce80d99e3df787269f00920b22cd8e3f27a0286483d348b5de3021c65a6b4939e416396cdade37159391d35194ea7acb8a
-  data.tar.gz: a4ae9458a37d0bd2c3164fa13574c65bd924c5b53259e114c8f46eac814164d8c84bb0723aea6fa36e9783f3eb8525315372f22f328176077eb774fe26be1e5d
+  metadata.gz: 80627f545c2d711fac360c6fa954c160ba320eba4bb4038279f4df0e5aa4c3b517012604e3154d534459536b46c31decbdc564537a4d14514d3c827e4f2f49cc
+  data.tar.gz: 8b9f289f57826746f929394d13c2a85ac5686d21e70d8763d057a6c1258ce19de57057ba67d6cec1aeef2914d05d08225b09957b69136e8e2cd75ca0d8de3739

data/.travis.yml

@@ -5,6 +5,8 @@ rvm:
   - 2.0.0
   - 2.1.6
   - 2.2.1
+  - 2.3.4
+  - 2.4.1
 
 bundler_args: --without development
 

data/lib/uk_account_validator.rb

@@ -1,3 +1,5 @@
+require 'uk_account_validator/backports/array_bsearch_index'
+
 require 'uk_account_validator/number_indices.rb'
 require 'uk_account_validator/validator.rb'
 require 'uk_account_validator/modulus_weight.rb'

data/lib/uk_account_validator/backports/array_bsearch_index.rb

@@ -0,0 +1,33 @@
+# Copied from backports gem
+unless Array.method_defined? :bsearch_index
+  class Array
+    def bsearch_index
+      return to_enum(__method__) unless block_given?
+      from = 0
+      to   = size - 1
+      satisfied = nil
+      while from <= to do
+        midpoint = (from + to).div(2)
+        result = yield(self[midpoint])
+        case result
+        when Numeric
+          return midpoint if result == 0
+          result = result < 0
+        when true
+          satisfied = midpoint
+        when nil, false
+          # nothing to do
+        else
+          raise TypeError, "wrong argument type #{result.class} (must be numeric, true, false or nil)"
+        end
+
+        if result
+          to = midpoint - 1
+        else
+          from = midpoint + 1
+        end
+      end
+      satisfied
+    end
+  end
+end

data/lib/uk_account_validator/modulus_weights_table.rb

@@ -8,24 +8,28 @@ module UkAccountValidator
         @weights << ModulusWeight.from_line(line)
       end
 
-      @weights.sort! { |weight| weight.sort_code_start.to_i }
+      @weights.sort_by! { |weight| -weight.sort_code_start.to_i }
     end
 
-    def find(sort_code, found_weights = [], exclude = [])
+    def find(sort_code)
       sort_code = sort_code.to_i
 
-      weight = @weights.bsearch do |w|
-        w.sort_code_start.to_i <= sort_code && !exclude.include?(w)
+      min_found_weight_index = @weights.bsearch_index do |w|
+        w.sort_code_start.to_i <= sort_code
       end
 
-      return found_weights if weight.nil?
-      return found_weights unless
-        weight.sort_code_start.to_i <= sort_code &&
-        sort_code <= weight.sort_code_end.to_i
+      return [] if min_found_weight_index.nil?
 
-      found_weights << weight
+      found_weights = []
+      index = min_found_weight_index
+      while index < @weights.size &&
+              @weights[index].sort_code_start.to_i <= sort_code &&
+              sort_code <= @weights[index].sort_code_end.to_i
+        found_weights << @weights[index]
+        index += 1
+      end
 
-      find(sort_code, found_weights, exclude + [weight])
+      found_weights
     end
   end
 end

data/lib/uk_account_validator/version.rb

@@ -1,3 +1,3 @@
 module UkAccountValidator
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uk_account_validator
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Hayden Ball
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-08-05 00:00:00.000000000 Z
 dependencies: []
 description: Validate UK Account Numbers and Sort Codes
 email:
@@ -39,6 +39,7 @@ files:
 - features/support/env.rb
 - features/two_modulus_check.feature
 - lib/uk_account_validator.rb
+- lib/uk_account_validator/backports/array_bsearch_index.rb
 - lib/uk_account_validator/exceptions/base_exception.rb
 - lib/uk_account_validator/exceptions/exception_1.rb
 - lib/uk_account_validator/exceptions/exception_10.rb
@@ -82,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Validate UK Account Numbers and Sort Codes