string_to_number 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1529435ca326617af2103ea0e602fa592b6b6d8b
-  data.tar.gz: 13a49542ece3604da2e20cc5fc5e3196ca1c6ab2
+  metadata.gz: 344ba3e9aaef1e44c05dd7e76f4ba19f0f10ad1c
+  data.tar.gz: 531faee1be5f9feb4935389f74aa47f84ca5fa44
 SHA512:
-  metadata.gz: 5bb7ebf2501371113385f20ee0ace0dd97a78a647d10bbafddf3c89462b90f85f03e3fc4f99bb1eff7f6a4504c96220d20a5753a711d65f02cdff417e70e25d3
-  data.tar.gz: 0ee4819962593291d193b75ad5ba8f28d0b8001b71f94b13bdb4d4012e3518e561094bd4ce276538569b5c4335203bab6f76585278469811787dfdb8db748be2
+  metadata.gz: df3acb7157af2369badd36fb71a956159a90f7b711ba6b04afdc7c23b71124429d27ee9a8510d99abf4d129c2288119f45459044b6bda7669c77d0e544d5b977
+  data.tar.gz: 702f06ab46ff773541df886c4a1ad074572bbbc5c02c38b22b95622d130ae4d39d01a8eb6bac8444853ed885c65a0c9a3625e25c0988dd7ea95560d553721af0

data/lib/string_to_number/to_number.rb

@@ -89,28 +89,45 @@ module StringToNumber
 
     private
 
-    def extract(sentence, keys)
+    def extract(sentence, keys, detail: false)
       return 0 if sentence.nil? || sentence.empty?
       return EXCEPTIONS[sentence] unless EXCEPTIONS[sentence].nil?
 
-      if m = /(\w+)?\s?(#{keys})/.match(sentence)
-        m1_length = if !EXCEPTIONS[m[1]].nil?
-                      m[1].length
-                    else
-                      0
-                    end
+      if result = /(?<f>.*?)\s?(?<m>#{keys})/.match(sentence)
+        # Deleting matching element
+        sentence.gsub!($&, '') if $&
 
-        sentence[m.offset(1)[0], m[1].length] = '' unless EXCEPTIONS[m[1]].nil?
-        sentence[(m.offset(2)[0] - m1_length), m[2].length] = '' unless POWERS_OF_TEN[m[2]].nil?
+        # Extract matching element
+        factor          = EXCEPTIONS[result[:f]] || match(result[:f])
+        factor          = 1 if factor.zero?
+        multiple_of_ten = 10**(POWERS_OF_TEN[result[:m]] || 0)
 
-        return extract(sentence, keys) +
-               (EXCEPTIONS[m[1]] || 1) * (10**(POWERS_OF_TEN[m[2]] || 0))
+        # Check if this multiple is over
+        if /#{higher_multiple(result[:m]).keys.join('|')}/.match(sentence)
+          details = extract(sentence, keys, detail: true)
+
+          factor          = (factor * multiple_of_ten) + details[:factor]
+          multiple_of_ten = details[:multiple_of_ten]
+          sentence        = details[:sentence]
+        end
+
+        if detail
+          return {
+            factor: factor,
+            multiple_of_ten: multiple_of_ten,
+            sentence: sentence
+          }
+        end
+
+        return extract(sentence, keys) + factor * multiple_of_ten
 
       elsif m = /(quatre(-|\s)vingt(s?)((-|\s)dix)?)((-|\s)?)(\w*)/.match(sentence)
         normalize_str = m[1].tr(' ', '-')
         normalize_str = normalize_str[0...-1] if normalize_str[normalize_str.length] == 's'
 
-        return extract(sentence.gsub!(m[0], ''), keys) +
+        sentence.gsub!(m[0], '')
+
+        return extract(sentence, keys) +
                EXCEPTIONS[normalize_str] + (EXCEPTIONS[m[8]] || 0)
       else
         return match(sentence)
@@ -118,12 +135,20 @@ module StringToNumber
     end
 
     def match(sentence)
-      sentence.tr('-', ' ').split(' ').reverse.inject(0) do |sum, word|
-        sum += if EXCEPTIONS[word].nil? && POWERS_OF_TEN[word].nil?
-                 0
-               else
-                 (EXCEPTIONS[word] || (10 * POWERS_OF_TEN[word]))
-               end
+      return if sentence.nil?
+
+      sentence.tr('-', ' ').split(' ').reverse.sum do |word|
+        if EXCEPTIONS[word].nil? && POWERS_OF_TEN[word].nil?
+          0
+        else
+          (EXCEPTIONS[word] || (10 * POWERS_OF_TEN[word]))
+        end
+      end
+    end
+
+    def higher_multiple(multiple)
+      POWERS_OF_TEN.select do |_k, v|
+        v > POWERS_OF_TEN[multiple]
       end
     end
   end

data/lib/string_to_number/version.rb

@@ -1,3 +1,3 @@
 module StringToNumber
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: string_to_number
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Fabien Piette
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler