regeng 0.2.1d → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc48c96f2816dc74555db0375be84de43f4b90ce4b3d2fee735169a0356641b6
-  data.tar.gz: 00307c3d2c33780afe803fcf3869f87a7f0d02b37bafaf4d47a8d568b5a09228
+  metadata.gz: 82fbddc2a548cfad016f21e2a160319e639ee75a16baf98a80dfbcc344c38c9a
+  data.tar.gz: 037510e387bf5f54ef32d96fcf379206ecd3bec53d33dbd0387dc6fdcc78d8fd
 SHA512:
-  metadata.gz: ad69acaec97a94da3bacbb836a6b72694b72deabdc0d8330543fe055016f85c3d5f44b99cb4a69e588328f5c87df3517215a4396fcbd2b44d6ac91a6c2966833
-  data.tar.gz: 6ff492642a080b6e54379dc92fb5ac1d9650e39f3698faf4af5f2f9a9eaab2b6887526c6086b9dacc717a83b819a5c6b516a8fcc183920f1a3f1e5bad188385c
+  metadata.gz: ef2c8bf1a06014aa12e38a827d54a831fb71f727c142871229b6004894a761acb85b1b1d6746ac2c69a9505d04a5634d7af683eac6603c04c86ccd4d6d31aab9
+  data.tar.gz: 8fd0d4389c1391b5cbf030ab7be8feab92d4fc75ae6d01c7e5e6be973ca38aa8d89f11620056f7b419e8ac38c8aab201ce7c6d0f8db44e29449d65cac5c8d02c

data/Gemfile.lock

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

data/changelog.md

@@ -1,3 +1,6 @@
+[12-11-18][0.2.2]: Now can use .new to mimic Regex behaviour.
+                    Slightly expanded functionality.
+
 [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.

data/lib/regeng.rb

@@ -10,10 +10,14 @@ module Regeng
   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
+  DIGIT_SIMPLE = /(any ((digit)|(number))(s)?){1}/.freeze
 
   AT_COND = /( at )((start)|(end))( of )((line)|(string))/.freeze
 
+  def self.new(string)
+    expression(string)
+  end
+
   def self.expression(string)
     expression = ''
     if CHARACTER_COND.match?(string)
@@ -39,6 +43,9 @@ module Regeng
     elsif /( ([a-z])(( through )|( to ))(([a-z])))/i.match?(string)
       unfiltered_mod = string.match(/(([a-z])(( through )|( to ))(([a-z])))/)
       character_mod = unfiltered_mod.to_s.sub(/( through )|( to )/, '-')
+    elsif /((between) ([a-z])( and )([a-z]))/.match?(string)
+      unfiltered_mod = string.match(/(([a-z])( and )([a-z]))/)
+      character_mod = unfiltered_mod.to_s.sub(/( and )/, '-')
     elsif /( ([a-z] )+(and )([a-z]))/.match?(string)
       unfiltered_mod = string.match(/( ([a-z] )+(and )([a-z]))/)
       character_mod = unfiltered_mod.to_s.gsub(/( )|(and )/, '')
@@ -68,9 +75,9 @@ module Regeng
     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 )/, '')
+    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 )/, '')
     end
     "[#{except}#{digit_mod}]#{multiples}"
   end

data/lib/regeng/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: regeng
 version: !ruby/object:Gem::Version
-  version: 0.2.1d
+  version: 0.2.2
 platform: ruby
 authors:
 - LucHighwalker
@@ -92,9 +92,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.8