regeng 0.2.0d → 0.2.1d

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f6cf6723927902dc4b3bc8dca7d87226f3b0f87ec1cc6470cd0fc988931bdb8
-  data.tar.gz: 4332481dc905c79166b87930e2132df9b220da8b85605162e56805084c070655
+  metadata.gz: dc48c96f2816dc74555db0375be84de43f4b90ce4b3d2fee735169a0356641b6
+  data.tar.gz: 00307c3d2c33780afe803fcf3869f87a7f0d02b37bafaf4d47a8d568b5a09228
 SHA512:
-  metadata.gz: 42a4ab3bb1ef46eb1f010c3afeed40baf42e22d7dc9a9e35b09fc9d8b8af922898211bde6f944e8a02f40237eff794dfd5971a7352bd258e80d0017390066072
-  data.tar.gz: c918cd089cadf976b29b34a6c94cf4299c94f2355f61fa096c639f2c721a737fe470774f121320348ba5c0d5cdceb8c5d7632ee662815825d1ee25bb9af43c51
+  metadata.gz: ad69acaec97a94da3bacbb836a6b72694b72deabdc0d8330543fe055016f85c3d5f44b99cb4a69e588328f5c87df3517215a4396fcbd2b44d6ac91a6c2966833
+  data.tar.gz: 6ff492642a080b6e54379dc92fb5ac1d9650e39f3698faf4af5f2f9a9eaab2b6887526c6086b9dacc717a83b819a5c6b516a8fcc183920f1a3f1e5bad188385c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    regeng (0.2.0d)
+    regeng (0.2.1d)
 
 GEM
   remote: https://rubygems.org/

data/changelog.md

@@ -1,3 +1,5 @@
+[12-11-18][0.2.1d]: Dev Build: At modifiers and simple digit expressions.
+
 [12-10-18][0.2.0d]: Dev Build: Refactored gem, refactored character functionality.
 
 [12-09-18][0.1.1]: Fixed changelog link... oops.

data/lib/regeng.rb

@@ -6,26 +6,34 @@ require 'regeng/version'
 module Regeng
   class Error < StandardError; end
 
-  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){1}/.freeze
+  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_SIMPLE = /(any ((digit)|(number))){1}/.freeze
+
+  AT_COND = /( at )((start)|(end))( of )((line)|(string))/.freeze
 
   def self.expression(string)
     expression = ''
     if CHARACTER_COND.match?(string)
-      puts string.match(CHARACTER_COND)
       expression = characters_condition(string)
     elsif CHARACTER_SIMP.match?(string)
-      puts string.match(CHARACTER_SIMP)
       expression = characters_simple(string)
+    elsif DIGIT_COND.match?(string)
+      expression = digit_condition(string)
+    elsif DIGIT_SIMPLE.match?(string)
+      expression = digit_simple(string)
     end
 
-    Regexp.new expression
+    at_mod = at_condition(string) if AT_COND.match?(string)
+
+    Regexp.new "#{at_mod}#{expression}"
   end
 
   def self.characters_condition(string)
-    result = ''
-    character_mod = ''
-    except = ''
+    except = '^' if /(except)/.match?(string)
+    multiples = '+' if /(character)(s)/.match?(string)
     if /( ([a-z])(-)(([a-z])))/i.match?(string)
       character_mod = string.match(/([a-z]-[a-z])/i)
     elsif /( ([a-z])(( through )|( to ))(([a-z])))/i.match?(string)
@@ -35,18 +43,49 @@ module Regeng
       unfiltered_mod = string.match(/( ([a-z] )+(and )([a-z]))/)
       character_mod = unfiltered_mod.to_s.gsub(/( )|(and )/, '')
     end
-    except = '^' if /(except)/.match?(string)
-    result = "#{result}[#{except}#{character_mod}]" if character_mod != ''
-    result
+    "[#{except}#{character_mod}]#{multiples}"
   end
 
   def self.characters_simple(string)
-    result = '[a-zA-Z]'
+    character_mod = 'a-zA-Z'
+    multiples = '+' if /(character)(s)/.match?(string)
     if /(uppercase)/.match?(string)
-      result = '[A-Z]'
+      character_mod = 'A-Z'
     elsif /(lowercase)/.match?(string)
-      result = '[a-z]'
+      character_mod = 'a-z'
     end
-    result
+    "[#{character_mod}]#{multiples}"
+  end
+
+  def self.digit_condition(string)
+    except = '^' if /(except)/.match?(string)
+    multiples = '+' if /((digit)|(number))(s)/.match?(string)
+    if /( ([0-9])(-)(([0-9])))/.match?(string)
+      digit_mod = string.match(/([0-9]-[0-9])/)
+    elsif /( ([0-9])(( through )|( to ))(([0-9])))/i.match?(string)
+      unfiltered_mod = string.match(/(([0-9])(( through )|( to ))(([0-9])))/)
+      digit_mod = unfiltered_mod.to_s.sub(/( through )|( to )/, '-')
+    elsif /((between) ([0-9])( and )([0-9]))/.match?(string)
+      unfiltered_mod = string.match(/(([0-9])( and )([0-9]))/)
+      digit_mod = unfiltered_mod.to_s.sub(/( and )/, '-')
+      # elsif /( ([a-z] )+(and )([a-z]))/.match?(string)
+      #   unfiltered_mod = string.match(/( ([a-z] )+(and )([a-z]))/)
+      #   digit_mod = unfiltered_mod.to_s.gsub(/( )|(and )/, '')
+    end
+    "[#{except}#{digit_mod}]#{multiples}"
+  end
+
+  def self.digit_simple(string)
+    digit_mod = '0-9'
+    multiples = '+' if /((digit)|(number))(s)/.match?(string)
+    "[#{digit_mod}]#{multiples}"
+  end
+
+  def self.at_condition(string)
+    at_mod = '^' if /(start of line)/.match?(string)
+    at_mod = '$' if /(end of line)/.match?(string)
+    at_mod = '\A' if /(start of string)/.match?(string)
+    at_mod = '\z' if /(end of string)/.match?(string)
+    at_mod
   end
 end

data/lib/regeng/version.rb

@@ -1,3 +1,3 @@
 module Regeng
-  VERSION = "0.2.0d"
+  VERSION = "0.2.1d"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: regeng
 version: !ruby/object:Gem::Version
-  version: 0.2.0d
+  version: 0.2.1d
 platform: ruby
 authors:
 - LucHighwalker