web_grep 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3163f6e8b38d601244de947a2a915d60245ae6bd
-  data.tar.gz: 31ea7e0fa494d940af32d07afec2a2ca38d3c22c
+  metadata.gz: ae71de152641bb649f6005b6ecedd69f0ba1d9e5
+  data.tar.gz: 231a126eaa61a90283296710abaec4573b8cc56b
 SHA512:
-  metadata.gz: eb63d0c37f10d083f864222d29a11a5f4219aba9ec24f2ed1e7f62038abc4b8765e65f6ebd20aaf2e8128ebc82e3efcb6481f5d5427a2c8bddc1ef293b91ca3b
-  data.tar.gz: bb42430ce81efd10179d579bf983e8db39a4adef6cf5eca21a4a29a04a06b622fed0fa5972231c7bfe3a54bd3059848719d903444f47f47ca8c5d1b0470e502c
+  metadata.gz: 57650d0e7e4ee78641e1d5d23c7907a0ee67cf51b5d963cdd328686bcd1bd11d9275a722dfebd4c7b71235f516b362280d8d1d2a6e55084aa7cdbdd7c7067e88
+  data.tar.gz: da4cedd3d25dbe69d200a5f7a353b9f6727d6c9e51f0450c5f5b797cf58bdb265244c9cbec66263493f9f4a1de3c2efa2f2496653f537972d092a5d33d2d50fb

data/bin/web_grep

@@ -60,5 +60,5 @@ greped.each do |l|
   puts "\033[32;1m" + "CSS path: #{l.css_path}"       if options[:css]
   puts "\033[32;1m" + "XPath: #{l.path}"              if options[:xpath]
   puts "\033[0m"    + "Matched content: #{l.content}" unless options[:quite]
-end unless options[:only_count]
-puts "#{"\033[32;1m"}Found #{greped.count}#{"\033[0m"}"
+end if greped && !options[:only_count]
+puts "#{"\033[32;1m"}Found #{greped.to_a.count}#{"\033[0m"}"

data/lib/web_grep/grep.rb

@@ -1,26 +1,22 @@
 require 'nokogiri'
 require 'open-uri'
 
-require 'pry'
-
 module WebGrep
   class Grep
     def initialize(word:,url:,file:,quite:)
-      if file && url
-        raise 'Should set one of params, url or file!'
-      end
-      if url && !url.match('http://|https://')
-        url = "http://#{url}"
-      end
+      raise 'Should set one of params, url or file!' if file && url
+      url = "http://#{url}" if url && !url.match('http[s]{0,1}://')
+
       @word, @url, @file, @quite = word, url, file, quite
     end
 
     def grep!
-      Nokogiri::XML(open(@url || @file)).search('[text()*=""]').select do |e|
-        e.content
-          .encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
-          .match /#{@word}/
-      end
+      Nokogiri::XML(open(@url || @file)).
+        xpath ".//text()[regex(., '#{@word}')]", Class.new {
+          def regex(node_set, regex)
+            node_set.find_all { |node| node.content.match regex }
+          end
+        }.new
     rescue SocketError
       raise 'Bad url or connection!'
     end

data/lib/web_grep/version.rb

@@ -1,3 +1,3 @@
 module WebGrep
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web_grep
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Vladislav Petrov