regeng 0.1.1 → 0.2.0d

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db6c7753dd058abc471673cf6857ef8d44b0e5e80957b57b7482261f825975ea
-  data.tar.gz: 994bdb33559c7ea9b494db747827077f8ebb4b64780cc43884db74a5f1863f3f
+  metadata.gz: 2f6cf6723927902dc4b3bc8dca7d87226f3b0f87ec1cc6470cd0fc988931bdb8
+  data.tar.gz: 4332481dc905c79166b87930e2132df9b220da8b85605162e56805084c070655
 SHA512:
-  metadata.gz: 1fc3b30e00305fdd76771827b05dc4aefd498e6b67ece638596a394bf8f917a40407a7d0a1d1ebcb747a4a63c03258299cada10851ffdc8e8e756bd4c0292efb
-  data.tar.gz: da14036bbf083639d96cd6614fc1ce3c2d7b49b7dfdde36bb0109ad612aae95bbcb9cb546e42e68907d5c18c47b19d1bff9e448098e98aa9f9b54171554ac52e
+  metadata.gz: 42a4ab3bb1ef46eb1f010c3afeed40baf42e22d7dc9a9e35b09fc9d8b8af922898211bde6f944e8a02f40237eff794dfd5971a7352bd258e80d0017390066072
+  data.tar.gz: c918cd089cadf976b29b34a6c94cf4299c94f2355f61fa096c639f2c721a737fe470774f121320348ba5c0d5cdceb8c5d7632ee662815825d1ee25bb9af43c51

data/Gemfile.lock

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

data/changelog.md

@@ -1,3 +1,6 @@
+[12-10-18][0.2.0d]: Dev Build: Refactored gem, refactored character functionality.
+
+[12-09-18][0.1.1]: Fixed changelog link... oops.
 
 [12-09-18][0.1.0]: Refactored prototype, now returns regular expressions.
 

data/lib/regeng.rb

@@ -1,61 +1,51 @@
+# frozen_string_literal: true
+
 require 'regeng/version'
 
 # A gem which creates regular expressions using plain english.
 module Regeng
   class Error < StandardError; end
 
-  def self.expression(string)
-    start = ''
-    middle = ''
-    ending = ''
+  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
 
-    start = process_start_of(string) if string =~ /( at ){1}/
-    middle = process_any(string) if string =~ /(any ){1}/
+  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)
+    end
 
-    expression = "#{start}#{middle}#{ending}"
     Regexp.new expression
   end
 
-  def self.process_start_of(string)
+  def self.characters_condition(string)
     result = ''
-    if string =~ /(start of){1}/
-      if string =~ /(line){1}/
-        result = '^'
-      elsif string =~ /(string){1}/
-        result = '\A'
-      end
-    elsif string =~ /(end of){1}/
-      if string =~ /(line){1}/
-        result = '$'
-      elsif string =~ /(string){1}/
-        result = '\z'
-      end
+    character_mod = ''
+    except = ''
+    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)
+      unfiltered_mod = string.match(/(([a-z])(( through )|( to ))(([a-z])))/)
+      character_mod = unfiltered_mod.to_s.sub(/( through )|( to )/, '-')
+    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 )/, '')
     end
+    except = '^' if /(except)/.match?(string)
+    result = "#{result}[#{except}#{character_mod}]" if character_mod != ''
     result
   end
 
-  def self.process_any(string)
-    result = ''
-    if string =~ /(character){1}/
-      if string =~ /([a-z]-[a-z])/i
-        character_mod = string.match(/([a-z]-[a-z])/i)
-        character_mod = "^#{character_mod}" if string =~ /(except){1}/
-        result = "[#{character_mod}]"
-      elsif string =~ /(uppercase){1}/
-        result = '[A-Z]'
-      elsif string =~ /(lowercase){1}/
-        result = '[a-z]'
-      else
-        result = '[A-Za-z]'
-      end
-    elsif string =~ /(digit){1}/
-      if string =~ /([0-9]+-[0-9]+){1}/
-        digit_mod = string.match(/([0-9]+-[0-9]+){1}/)
-        digit_mod = "^#{digit_mod}" if string =~ /(except){1}/
-        result = "[#{digit_mod}]"
-      else
-        result = '[0-9]+'
-      end
+  def self.characters_simple(string)
+    result = '[a-zA-Z]'
+    if /(uppercase)/.match?(string)
+      result = '[A-Z]'
+    elsif /(lowercase)/.match?(string)
+      result = '[a-z]'
     end
     result
   end

data/lib/regeng/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regeng
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0d
 platform: ruby
 authors:
 - LucHighwalker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2018-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.8