web_stat 0.3.3 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d27f9de72e744c0cff9c1876952b23d7dd86a3d8a8331ee95293ff06d0ad16a9
-  data.tar.gz: a9985bd6c7167e70bcffb0f215ce13afbdef85d34790a0a5486b72b7380b01fb
+  metadata.gz: bbf065f5482ee7bf68e14e41af1e48b855f4219b9f44a7e16440834c92f404d5
+  data.tar.gz: a16fc8b8a66cb534bb8ce61c6da28212faff44f2df6324772261f9b6847cfc7f
 SHA512:
-  metadata.gz: 2f2a7d199c6cd737bb6b6facd97fd94324898ccb14554e2497d44d567f19c06deb127da3db5be968737d8dffde25b0b498845ebb60661408810891a3c4eea142
-  data.tar.gz: 0c1b425aa39397ac13e68009b20c0015d7939ce4af1faabbb2716b22e2cb2c4776aaecd59ab6328113a270c3a4d545f9d2d2d1472373e3f53d083cbcd3833186
+  metadata.gz: 83b8b7d71a1047ec2614a9bfbc3c6305806cf7a616ba6b2568382b72ef91f5b0947e7aefb3d926b33c4970d291d2a34c99a86ba0f0e320a3e7fde9dd2b5bc154
+  data.tar.gz: aa4af6063d7dd81c7c78c0100ff5354d7c54f28d7b2fac7393656cb5bde932b7260c95d1fe08fc560784e85ead7bbf49134c4d56cb108cef522cef753e477032

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    web_stat (0.3.3)
+    web_stat (0.3.7)
       bundler (>= 2.0.2)
       cld (>= 0.8.0)
       mechanize (>= 2.7)
@@ -83,7 +83,7 @@ GEM
       nokogiri (>= 1.6.0)
     rubyzip (2.3.0)
     safe_yaml (1.0.5)
-    sanitize (5.2.0)
+    sanitize (5.2.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)

data/lib/web_stat/fetch.rb

@@ -47,6 +47,9 @@ module WebStat
           break
         end
       end
+      if path.nil? || path.empty? || @nokogiri.at('body').xpath('//img').first
+        path = @nokogiri.at('body').xpath('//img').first.attr('src')
+      end
       if ! path.nil? && path.match(/^\//)
         "#{URI.parse(@url).scheme}://#{URI.parse(@url).host}#{path}"
       else
@@ -57,7 +60,7 @@ module WebStat
     # Get local path to save url
     # @param [String] url
     def save_local_path(url)
-      return nil if url.nil?
+      return nil if url.nil? || ! url.match(%{^http})
       tmp_file = "/tmp/#{Digest::SHA1.hexdigest(url)}"
       agent = Mechanize.new { |_agent| _agent.user_agent = WebStat::Configure.get["user_agent"] }
       image = agent.get(url)
@@ -75,17 +78,25 @@ module WebStat
     # @param [String] url
     # @param [String] body
     def get_url(url)
-      agent = Mechanize.new { |_agent| _agent.user_agent = WebStat::Configure.get["user_agent"] }
+      mech = Mechanize.new { |_mech| _mech.user_agent = WebStat::Configure.get["user_agent"] }
       # Enable to read Robots.txt
-      agent.robots = true
+      mech.robots = true
       begin
-        document = agent.get(url, [], nil, { 'Accept-Language' => 'ja'})
-        if document.class == Mechanize::File
-          body = document.body
+        if mech.agent.robots_disallowed?(url)
+          raise Mechanize::RobotsDisallowedError.new(url)
+        end
+        if WebStat::Configure.get["use_chromedirver"]
+          document = WebStat::WebDriverHelper.get_last_url(url)
+          @status = 200
         else
-          body = document.body.encode('UTF-8', document.encoding)
+          document = mech.get(url, [], nil, { 'Accept-Language' => 'ja'})
+          if document.class == Mechanize::File
+            body = document.body
+          else
+            body = document.body.encode('UTF-8', document.encoding)
+          end
+          @status = document.code
         end
-        @status = document.code
       rescue Mechanize::ResponseCodeError => e
         body = e.page.body
         @status = e.page.code
@@ -96,7 +107,7 @@ module WebStat
     # Get the informations of @url
     # @param [Hash] Specify a dictionary for each language code. example ) {"ja": /***/**.dic, "other": /***/***.dic}
     def stat(userdics: nil)
-      clean_content = content.scrub('').gsub(/[\n\t\r　]/, "").gsub(/\s{2,}/, "\s")
+      clean_content = content.scrub('').gsub(/[\n\t\r　]/, "").gsub(/\s{2,}/, "\s").gsub(URI.regexp, "")
       language_code = CLD.detect_language(clean_content)[:code]
       if userdics && userdics.has_key?(language_code) && File.exists?(userdics[language_code])
         tag = WebStat::Tag.new("#{title} #{content}", userdic: userdics[language_code])

data/lib/web_stat/version.rb

@@ -1,3 +1,3 @@
 module WebStat
-  VERSION = "0.3.3"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web_stat
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.8
 platform: ruby
 authors:
 - yusuke abe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-13 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler