regex_generator 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfee60e3cfcb8a136e87fa00d7785edf2b3ae4d1c8726084ce034f1ca980c68d
-  data.tar.gz: 6bbc1cb7dceb4b7f1e16a7d7d4cb8825288fb46b60fba0a4c47bd49d41067053
+  metadata.gz: 1f17cdfbe4067e8ea3574bf6a2588a078347c52b6dd0797e244d1235f2469368
+  data.tar.gz: be13b4aa4cc21fb7fc679f82eba084f52069a4926134bef4ff7a51b7c08899da
 SHA512:
-  metadata.gz: 3816b3dd44f5754de3bb4f04eb835e927b9d92deb71447eb3333e8a12c01e604aaf8a0c8c66f2009dae61f7dc338034c649cafb1c9238d11a5ec5af8bbc0e58b
-  data.tar.gz: a57ebcee6e9f2ea089461ce2f73265a090207922d5baf3200b033e99c159499cadfb5efe8b9fe70da3acf4e38a93d5ba4bce54184161ebeaa84eb0133071a077
+  metadata.gz: 68acdc534ecb0e1753e645f312af3bfc6b52a972440907768d0c68dbee622dbb9044f1af7fca8d5062f3436a129d0eac05f9f596ece7da70ba0bc491ee3361da
+  data.tar.gz: e40ece7ba16ea77f36cc319c4c6bf1c7f7110b31fddad77e23eaa6e99292eb96ce3f920810347157d0bbef33c7a7ab953385bf3126061e10b05e407e8bdf848d

data/Gemfile

@@ -1,5 +1,4 @@
 source "https://rubygems.org"
-ruby '>= 2.3.0'
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 

data/README.md

@@ -23,10 +23,11 @@ Or install it yourself as:
 ```ruby
 RegexGenerator.generate('45', 'some text 45')
 ```
+You can pass target as hash to generate regex with named capturing groups.
 
 You can use additional options to generate regex. For example:
 
-```
+```ruby
 RegexGenerator.generate('45', 'some text 45', exact_target: true)
 ```
 
@@ -40,7 +41,7 @@ Allowed options:
 - Create your feature branch (git checkout -b my-new-feature)
 - Commit your changes (git commit -am 'Add some feature')
 - Push to the branch (git push origin my-new-feature)
-- Create new Pull Reques
+- Create new Pull Request
 
 ## License
 

data/lib/regex_generator/generator.rb

@@ -1,6 +1,6 @@
 module RegexGenerator
   class Generator
-    # @param target [String] what you want to find
+    # @param target [String, Hash] target string or hash with named targets
     # @param text [String] source text
     # @param options [Hash] options to generate regex with
     # @option options [true, false] :exact_target to generate regex
@@ -16,19 +16,13 @@ module RegexGenerator
     # @return [Regexp]
     # @raise [TargetNotFoundError] if target text was not found in the text
     def generate
-      raise RegexGenerator::TargetNotFoundError unless @text[@target]
+      raise RegexGenerator::TargetNotFoundError unless target_present?
 
-      string_regex_chars = recognize(cut_nearest_text, options)
+      string_regex_chars = recognize_text(cut_nearest_text, options)
       string_patterns_array = slice_to_identicals(string_regex_chars)
       string_regex_str = join_patterns(string_patterns_array)
-      target_regex_str = if @options[:exact_target]
-        Regexp.escape @target
-      else
-        target_patterns_array = slice_to_identicals(recognize(@target, options))
-        join_patterns(target_patterns_array)
-      end
 
-      Regexp.new("#{string_regex_str}(#{target_regex_str})")
+      Regexp.new string_regex_str
     end
 
     private
@@ -36,7 +30,17 @@ module RegexGenerator
     # Cuts nearest to target, text from the start of the string
     def cut_nearest_text
       start_pattern = @text[/\n/] ? /\n/ : /^/
-      @text[/[\w\W]*(#{start_pattern}[\w\W]+?)#{Regexp.escape(@target)}/, 1]
+      if @target.is_a? Hash
+        target_regex = /(?:#{escaped_target.join('|')})/
+        text_regex_str = (1..@target.count).map do |step|
+          all = step.eql?(1) ? '.' : '[\w\W]'
+          "#{all}+?#{target_regex}"
+        end.join
+        text_regex = Regexp.new "#{start_pattern}#{text_regex_str}"
+        @text[text_regex]
+      else
+        @text[/[\w\W]*(#{start_pattern}[\w\W]+?)#{Regexp.escape(@target)}/, 1]
+      end
     end
 
     # Slices array to subarrays with identical neighbor elements
@@ -73,7 +77,55 @@ module RegexGenerator
       @options
     end
 
-    def recognize(text, options)
+    # Checks if target is present in the text
+    def target_present?
+      return @target.values.all? { |t| @text[t] } if @target.is_a? Hash
+
+      !@text[@target].nil?
+    end
+
+    # If keys false, method returns array with escaped values, otherwise hash
+    # with escaped values (only if target is a hash)
+    def escaped_target(keys: false)
+      return Regexp.escape @target if @target.is_a? String
+      return @target.values.map { |v| Regexp.escape v } unless keys
+
+      @target.each_with_object({}) do |(key, value), result|
+        result[key] = Regexp.escape value
+      end
+    end
+
+    # Recognizes target depending on type (String or Hash)
+    def target_patterns
+      return escaped_target(keys: true) if @options[:exact_target]
+
+      if @target.is_a? Hash
+        @target.each_with_object({}) do |(key, value), patterns|
+          slices_patterns = slice_to_identicals(recognize(value))
+          patterns[key] = join_patterns(slices_patterns)
+        end
+      else
+        target_patterns_array = slice_to_identicals(recognize(@target))
+        join_patterns(target_patterns_array)
+      end
+    end
+
+    # Recognizes text depending on target type
+    def recognize_text(text, options = {})
+      unless @target.is_a? Hash
+        return recognize(text, options) << "(#{target_patterns})"
+      end
+
+      target_regex = /#{escaped_target.join('|')}/
+      text.split(/(#{target_regex})/).map do |str|
+        next recognize(str, options) unless str[target_regex]
+
+        key = @target.key(str)
+        "(?<#{key}>#{target_patterns[key]})"
+      end.flatten
+    end
+
+    def recognize(text, options = {})
       RegexGenerator::CharactersRecognizer.recognize(text, options)
     end
   end

data/lib/regex_generator/version.rb

@@ -1,3 +1,3 @@
 module RegexGenerator
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regex_generator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - o.vykhor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-20 00:00:00.000000000 Z
+date: 2019-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler