regeng 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82fbddc2a548cfad016f21e2a160319e639ee75a16baf98a80dfbcc344c38c9a
-  data.tar.gz: 037510e387bf5f54ef32d96fcf379206ecd3bec53d33dbd0387dc6fdcc78d8fd
+  metadata.gz: 6ed0b6773d2d8d9fa35aafce95be9e7791a825afb9db98693cfc70cdb20a129a
+  data.tar.gz: 13c38505d60b9497796dfdc7068b6f08301ded0c03498af6a0e4e31993a6b7cd
 SHA512:
-  metadata.gz: ef2c8bf1a06014aa12e38a827d54a831fb71f727c142871229b6004894a761acb85b1b1d6746ac2c69a9505d04a5634d7af683eac6603c04c86ccd4d6d31aab9
-  data.tar.gz: 8fd0d4389c1391b5cbf030ab7be8feab92d4fc75ae6d01c7e5e6be973ca38aa8d89f11620056f7b419e8ac38c8aab201ce7c6d0f8db44e29449d65cac5c8d02c
+  metadata.gz: '06820b558828006ed09a74f4be4f6382c886bef6696cf1037d31cb61dbe03833a76568e7f68a50cc358633f4c4c38cc86cf7acea336a9f23f42ba8e375ac91ab'
+  data.tar.gz: 4e7d195e367f54d0b67baf20bd094a7dfe2f8ca39b1196cfdc775de98ae4a4178e37500e6489d2d0772f7c4a97314d16119f68ad863ad73400a46fbede91d314

data/Gemfile.lock

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

data/changelog.md

@@ -1,3 +1,5 @@
+[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.
                     Slightly expanded functionality.
 

data/lib/regeng.rb

@@ -4,8 +4,6 @@ require 'regeng/version'
 
 # A gem which creates regular expressions using plain english.
 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)(s)?){1}/.freeze
 
@@ -14,12 +12,20 @@ module Regeng
 
   AT_COND = /( at )((start)|(end))( of )((line)|(string))/.freeze
 
+  # Regeng's error raiser.
+  class Error < StandardError
+    def self.invalid_expression(string)
+      raise self, "Invalid expression: (#{string})"
+    end
+  end
+
+  # Returns a new regular expression using plain english.
   def self.new(string)
     expression(string)
   end
 
+  # Processes plain english into a regular expression.
   def self.expression(string)
-    expression = ''
     if CHARACTER_COND.match?(string)
       expression = characters_condition(string)
     elsif CHARACTER_SIMP.match?(string)
@@ -30,11 +36,15 @@ module Regeng
       expression = digit_simple(string)
     end
 
+    # Adds a 'at' modifier if one is present.
     at_mod = at_condition(string) if AT_COND.match?(string)
 
+    Error.invalid_expression if expression.nil?
+
     Regexp.new "#{at_mod}#{expression}"
   end
 
+  #  Processes conditional character expressions.
   def self.characters_condition(string)
     except = '^' if /(except)/.match?(string)
     multiples = '+' if /(character)(s)/.match?(string)
@@ -50,9 +60,13 @@ module Regeng
       unfiltered_mod = string.match(/( ([a-z] )+(and )([a-z]))/)
       character_mod = unfiltered_mod.to_s.gsub(/( )|(and )/, '')
     end
+
+    Error.invalid_expression if character_mod.nil? || character_mod == '-'
+
     "[#{except}#{character_mod}]#{multiples}"
   end
 
+  # Processes simple character expressions.
   def self.characters_simple(string)
     character_mod = 'a-zA-Z'
     multiples = '+' if /(character)(s)/.match?(string)
@@ -64,6 +78,7 @@ module Regeng
     "[#{character_mod}]#{multiples}"
   end
 
+  # Processes conditional digit/number expressions.
   def self.digit_condition(string)
     except = '^' if /(except)/.match?(string)
     multiples = '+' if /((digit)|(number))(s)/.match?(string)
@@ -79,15 +94,20 @@ module Regeng
       unfiltered_mod = string.match(/( ([0-9] )+(and )([0-9]))/)
       digit_mod = unfiltered_mod.to_s.gsub(/( )|(and )/, '')
     end
+
+    Error.invalid_expression if digit_mod.nil? || digit_mod == '-'
+
     "[#{except}#{digit_mod}]#{multiples}"
   end
 
+  # Processes simple digit expressions.
   def self.digit_simple(string)
     digit_mod = '0-9'
     multiples = '+' if /((digit)|(number))(s)/.match?(string)
     "[#{digit_mod}]#{multiples}"
   end
 
+  # Processes 'at end/start of' expression modifier.
   def self.at_condition(string)
     at_mod = '^' if /(start of line)/.match?(string)
     at_mod = '$' if /(end of line)/.match?(string)

data/lib/regeng/version.rb

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

metadata

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