regeng 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ed0b6773d2d8d9fa35aafce95be9e7791a825afb9db98693cfc70cdb20a129a
-  data.tar.gz: 13c38505d60b9497796dfdc7068b6f08301ded0c03498af6a0e4e31993a6b7cd
+  metadata.gz: 793b1fe234f31d0436bd4897e1790b58866446ab38d26e7bafef3a2c259abaf2
+  data.tar.gz: 20b8ee94808bfa33dca2bebec6a370892f18aebdf545b949a5ca4797fb618d29
 SHA512:
-  metadata.gz: '06820b558828006ed09a74f4be4f6382c886bef6696cf1037d31cb61dbe03833a76568e7f68a50cc358633f4c4c38cc86cf7acea336a9f23f42ba8e375ac91ab'
-  data.tar.gz: 4e7d195e367f54d0b67baf20bd094a7dfe2f8ca39b1196cfdc775de98ae4a4178e37500e6489d2d0772f7c4a97314d16119f68ad863ad73400a46fbede91d314
+  metadata.gz: 8abc45f0202349ae23642cf86d5ce9ce03a7340dc757cce58f2449c092352874d1dbc1b315aa3ae8ef124b5f1ebc09e70ce5d5f59c6d9e227355e29c766709eb
+  data.tar.gz: 5a30c9135b3b2d6b662258c996bbc281603346d4d8380d6bfeeee8a168afeb4b892a8f8914de736af65224a730c942f86119d8ee7c4e81f646c9c36a796db8ef

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    regeng (0.2.3)
+    regeng (0.2.4)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -4,6 +4,8 @@
 
 Regeng or regular english, is a gem aimed to make regular expressions a bit more noob friendly.
 
+[Regeng Gem](https://rubygems.org/gems/regeng)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -25,7 +27,7 @@ Or install it yourself as:
 ```ruby
 require 'regeng'
 => true
-Regeng.expression('any character except e-z at start of string')
+Regeng.new 'any character except e-z at start of string'
 => /\A[^e-z]/
 ```
 

data/changelog.md

@@ -1,3 +1,5 @@
+[01-02-19][0.2.4]: Now processes more complex numbers.
+
 [12-11-18][0.2.3]: Now raises errors when expression fails to process. 
 
 [12-11-18][0.2.2]: Now can use .new to mimic Regex behaviour.

data/lib/regeng.rb

@@ -7,7 +7,7 @@ module Regeng
   CHARACTER_COND = /((any )?(character)(s)?( except)?( between)?( [a-zA-Z])+((-)|( through )|( to )|( and )){1}[a-zA-Z]){1}/.freeze
   CHARACTER_SIMP = /((any )?((uppercase )?|(lowercase )?)(character)(s)?){1}/.freeze
 
-  DIGIT_COND = /((any )?((digit)|(number))(s)?( except)?( between)?( [0-9])+((-)|( through )|( to )|( and )){1}[0-9]){1}/.freeze
+  DIGIT_COND = /((any )?((digit)|(number))(s)?( except)?( between)?( [0-9])(0)*((-)|( through )|( to )|( and )){1}([0-9])(0)*){1}/.freeze
   DIGIT_SIMPLE = /(any ((digit)|(number))(s)?){1}/.freeze
 
   AT_COND = /( at )((start)|(end))( of )((line)|(string))/.freeze
@@ -80,6 +80,7 @@ module Regeng
 
   # Processes conditional digit/number expressions.
   def self.digit_condition(string)
+    complex = false
     except = '^' if /(except)/.match?(string)
     multiples = '+' if /((digit)|(number))(s)/.match?(string)
     if /( ([0-9])(-)(([0-9])))/.match?(string)
@@ -93,11 +94,19 @@ module Regeng
     elsif /( ([0-9] )+(and )([0-9])+)/.match?(string)
       unfiltered_mod = string.match(/( ([0-9] )+(and )([0-9]))/)
       digit_mod = unfiltered_mod.to_s.gsub(/( )|(and )/, '')
+    elsif /( ([0-9](0)+ )((and )|(to ))([1-9](0)+))/.match?(string)
+      unfiltered_mod = string.match(/(([0-9](0)+ )((and )|(to ))([1-9](0)+))/)
+      digit_mod = complex_numbers(unfiltered_mod.to_s)
+      complex = true
     end
 
     Error.invalid_expression if digit_mod.nil? || digit_mod == '-'
 
-    "[#{except}#{digit_mod}]#{multiples}"
+    if complex
+      "#{digit_mod}"
+    else
+      "[#{except}#{digit_mod}]#{multiples}"
+    end
   end
 
   # Processes simple digit expressions.
@@ -115,4 +124,38 @@ module Regeng
     at_mod = '\z' if /(end of string)/.match?(string)
     at_mod
   end
+
+  # Helpers
+  def self.complex_numbers(string)
+    # extracts first number
+    first_number = string.match(/([0-9](0)* )((and )|(to ))/)
+    first_number = first_number.to_s.gsub(/( )|(and )/, '')
+
+    # extracts second number
+    second_number = string.match(/( [1-9](0)+)/)
+    second_number = second_number.to_s.sub(/( )/, '')
+
+    process_complex_numbers(first_number, second_number)
+  end
+
+  def self.process_complex_numbers(first_number, second_number)
+    mod_array = []
+
+    first_digit = first_number.sub(/(0)+/, '')
+    first_zeros = first_number.match(/(0)+/)
+    zeros_length = first_zeros.to_s.length
+
+    second_digit = second_number.sub(/(0)+/, '')
+
+    (first_digit...second_digit).to_a.each do |digit|
+      modifier = "(#{digit}"
+      zeros_length.times do |_|
+        modifier = "#{modifier}[0-9]"
+      end
+      modifier = "#{modifier})"
+      mod_array.push(modifier)
+    end
+
+    "#{mod_array.join('|')}|(#{second_number})"
+  end
 end

data/lib/regeng/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regeng
-  VERSION = "0.2.3"
+  VERSION = '0.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regeng
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - LucHighwalker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2019-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler