regex_generator 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 481f895706d869e948bda4786af67e5c12940228c50cd53f33b7d2f84eb4a0f1
-  data.tar.gz: 847974b444d2a2d217fc042144e625c60c297dec1dbfcf60bc692c0b73e985e2
+  metadata.gz: 36f1ddb1d1da4bc572085278d85588d3fc085996faf614d3b1cf3b8d53305f9b
+  data.tar.gz: b78bb19b4795acde2be57a9bffa144cdb8c3633c100460d06f970889faeb4ed8
 SHA512:
-  metadata.gz: d7f8c8af1fb62b699fe599431e83f568fe51ea752feb1749c933c876ff76e4a7c16e8e16aeb3467add14eb9aac6f63c07984f6ad4c849a64b01beeff36467284
-  data.tar.gz: 9b1038527f6f696146eccbba4f9b4abc1a17e0c201e7d35d5d03bca8b971f80660c52509375481efe62666efc491f1dde101ead3f2368ffa2bc03f73cc14eb38
+  metadata.gz: 6ed312d16bd6576c419289f7a507bf538d3704a4ed33e17b84f46acd2650b02cdd277fb80206ef6ff94f71fe76336dc1285b38a5523e12de2c54e6e45410425a
+  data.tar.gz: 663fd4746c73451f047cb72deacb8a7301c99032193a7bcaa80f6ef3a0a48bb99f8b96d524f9977737c3534ac31253b9a7a5809200844b9484199c9e056071cd

data/README.md

@@ -31,9 +31,14 @@ You can use additional options to generate regex. For example:
 RegexGenerator.generate('45', 'some text 45', exact_target: true)
 ```
 
+Or use from command line:
+
+    $ generate_regex "target" "text or path/to/file" [options]
+
 Allowed options:
  - `:exact_target` - When it `true` regex will generated for exact target value
  - `:self_recognition` - Symbols that will be represented as itself. Can be string or array
+ - `:look` - `:ahead` or `:behind` (`:behind` by default). To generate regex with text after or before the value
 
 ## Contributing
 

data/bin/generate_regex

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+
+require 'regex_generator'
+require 'optparse'
+
+def text_content(args)
+  args.map do |arg|
+    File.exist?(arg) ? File.read(arg) : arg
+  end
+end
+
+params = {}
+
+OptionParser.new do |parser|
+  parser.banner = 'Usage: generate_regex "target or path/to/file" "text or path/to/file" [options]'
+
+  parser.on('--help', '-h', 'Displays this help message') do
+    puts parser
+    exit
+  end
+
+  parser.on('--self_recognition=CHARS', 'Recognizes chargs as itself') do |chars|
+    chars
+  end
+
+  parser.on('--exact_target', 'Generates regex with exact target value')
+end.parse!(into: params)
+
+unless ARGV.count.eql?(2)
+  error = ARGV.count < 2 ? 'target or text is missing' : "#{ARGV[2..-1].join(', ')}"
+
+  raise OptionParser::InvalidOption.new error
+end
+
+target, text = text_content(ARGV)
+puts RegexGenerator::Generator.new(target, text, params).generate

data/lib/regex_generator/exceptions.rb

@@ -4,4 +4,14 @@ module RegexGenerator
       'The target was not found in the provided text'
     end
   end
+
+  class InvalidOption < StandardError
+    def initialize(*options)
+      @options = options
+    end
+
+    def message
+      "Invalid option(s): #{@options}"
+    end
+  end
 end

data/lib/regex_generator/generator.rb

@@ -8,6 +8,8 @@ module RegexGenerator
     #   with exact target value
     # @option options [String, Array] :self_recognition to recognize chars as
     #   itself
+    # @option options [:ahead, :behind] :look to generate regex with text before
+    #   or after the target
     def initialize(target, text, options = {})
       @text = text
       @target = RegexGenerator::Target.new(target)
@@ -17,6 +19,7 @@ module RegexGenerator
 
     # @return [Regexp]
     # @raise [TargetNotFoundError] if target text was not found in the text
+    # @raise [InvalidOption] if :look option is not :ahead or :behind
     def generate
       raise RegexGenerator::TargetNotFoundError unless @target.present?(@text)
 
@@ -31,21 +34,24 @@ module RegexGenerator
 
     # Cuts nearest to target, text from the start of the string
     def cut_nearest_text
-      start_pattern = @text[/\n/] ? /\n/ : /^/
-
       if @target.kind_of? Hash
-        target_regex = /(?:#{@target.escape.join('|')})/
+        target_regex_str = "(?:#{@target.escape.join('|')})"
         text_regex_str = (1..@target_str.count).map do |step|
           all = step.eql?(1) ? '.' : '[\w\W]'
-          "#{all}+?#{target_regex}"
+          add_to("#{all}+?", target_regex_str)
         end.join
-        text_regex = Regexp.new "#{start_pattern}#{text_regex_str}"
 
-        return @text[text_regex]
+        return @text[Regexp.new(add_to('(?:\n|\A|\Z)', text_regex_str))]
       end
 
-      regex = /[\w\W]*(#{start_pattern}[\w\W]+?)#{Regexp.escape(@target_str)}/
-      @text[regex, 1]
+      @text[text_regex_for_string, 1]
+    end
+
+    def text_regex_for_string
+      {
+        behind: /[\w\W]*((?:\n|\A)[\w\W]+?)#{@target.escape}/,
+        ahead: /#{@target.escape}([\w\W]+?(?:\n|\Z))/
+      }[options[:look]]
     end
 
     # Slices array to subarrays with identical neighbor elements
@@ -73,12 +79,15 @@ module RegexGenerator
 
     # Prepares options
     def options
-      return @options unless @options.any?
-
       if @options[:self_recognition].kind_of? String
         @options[:self_recognition] = @options[:self_recognition].chars
       end
 
+      @options[:look] = @options[:look] ? @options[:look].to_sym : :behind
+      unless %i[ahead behind].include? @options[:look]
+        raise RegexGenerator::InvalidOption, :look
+      end
+
       @options
     end
 
@@ -88,19 +97,30 @@ module RegexGenerator
 
       if @target.kind_of? Hash
         @target_str.each_with_object({}) do |(key, value), patterns|
-          slices_patterns = slice_to_identicals(recognize(value))
+          slices_patterns = slice_to_identicals(recognize(value, options))
           patterns[key] = join_patterns(slices_patterns)
         end
       else
-        target_patterns_array = slice_to_identicals(recognize(@target))
+        target_patterns_array = slice_to_identicals(recognize(@target, options))
         join_patterns(target_patterns_array)
       end
     end
 
+    # Adds target to source depending on source type and :look option, i.e. when
+    # :look is :behind it adds target to the start of the source, otherwise adds
+    # target to the end of the source
+    def add_to(source, target)
+      actions = { array: { behind: :push, ahead: :unshift },
+                  string: { behind: :concat, ahead: :prepend } }
+      action = actions[source.class.name.downcase.to_sym][options[:look]]
+
+      source.public_send(action, target)
+    end
+
     # Recognizes text depending on target type
     def recognize_text(text, options = {})
       unless @target.kind_of? Hash
-        return recognize(text, options) << "(#{target_patterns})"
+        return add_to(recognize(text, options), "(#{target_patterns})")
       end
 
       target_regex = /#{@target.escape.join('|')}/

data/lib/regex_generator/version.rb

@@ -1,3 +1,3 @@
 module RegexGenerator
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/regex_generator.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir        = "bin"
+  spec.executables   = ["generate_regex"]
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", ">= 1.16"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regex_generator
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - o.vykhor
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2019-03-03 00:00:00.000000000 Z
+date: 2019-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,7 +55,8 @@ dependencies:
 description: 
 email:
 - o.vykhor@ukr.net
-executables: []
+executables:
+- generate_regex
 extensions: []
 extra_rdoc_files: []
 files:
@@ -67,6 +68,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/generate_regex
 - bin/setup
 - lib/regex_generator.rb
 - lib/regex_generator/characters_recognizer.rb
@@ -94,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Simple regex generator