web_stat 0.3.9 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff258b9a50e224dfb465ad698871b2dc95dc2aaf028f5e966b0b920ca127f5f6
-  data.tar.gz: 0fe37dff66de85ac77137f95e94ef2e3a2e42ae1931b3b138017481c3cda9734
+  metadata.gz: 549db2077648ce028b556a72126335f05336155f86c4b18d47856f219c71fff0
+  data.tar.gz: be8e0cee272fc20013659346608bf9a50a69dc48e777a46214c29f5c1865232d
 SHA512:
-  metadata.gz: c2158946ad78a192e902e6b74b9fd72ecfc001afe2c3b531c2e8cea9d7b37239d280174066329e3f908d843c0173ddc03181bf8af529870326f29bd19bf5ee06
-  data.tar.gz: eea91e8addd528e53989c94385c9d339895d138fea4fa911383b6c8157ade28a9c1c75566f2f40ca40d0f5c3b73267188b3695a573bc155a14150b22e3bebb47
+  metadata.gz: c78fa085f475c7cdf0747b4c777e357503ce41929bbe5462ccda7b28a6cf4f20a5394deb7853ee11570a4b3338573e392f8697e61484649fe06beadc54aa38a8
+  data.tar.gz: 941f0de20548a37899ac7610bd95b381ac18ca71761ccfb7f7788c299dd41ff521ae7eea283df64ee624044f919d2951f396ec38c3c4a15ded378ee0acbd0a20

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    web_stat (0.3.7)
+    web_stat (0.3.12)
       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.1)
+    sanitize (5.2.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)

data/README.md

@@ -55,12 +55,10 @@ And then execute:
 
 ### spec
 
-  $ bundle exec rake spec
-  
-or
-
-  $ bundle exec rspec
+  $ docker/start -d
+  $ docker/exec ENV=development bundle exec rspec
 
 Test a file
 
-  $ bundle exec rspec spec/web_stat/fetch_spec.rb 
+  $ docker/start -d
+  $ docker/exec ENV=development bundle exec rspec spec/web_stat/fetch_spec.rb 

data/lib/helpers/web_drive_helper.rb

@@ -5,6 +5,23 @@ module WebStat
       # @param [String] url
       # @param [Integer] delay
       def get_last_url(url, delay=nil)
+        driver = get_driver(url, delay)
+        last_url = driver.current_url
+        driver.quit
+        last_url
+      end
+      # Get source of html
+      # @param [String] url
+      # @param [Integer] delay
+      def get_source(url, delay=nil)
+        driver = get_driver(url, delay)
+        source = driver.page_source
+        driver.quit
+        source
+      end
+      
+      private
+      def get_driver(url, delay=nil)
         Selenium::WebDriver.logger.output = File.join("/tmp", "selenium.log")
         Selenium::WebDriver.logger.level = :info
         options = Selenium::WebDriver::Chrome::Options.new(args: [
@@ -19,9 +36,10 @@ module WebStat
         if delay.is_a?(Integer)
           sleep delay
         end
-        last_url = driver.current_url
+        driver
+      rescue => e
         driver.quit
-        last_url
+        raise e
       end
     end
   end

data/lib/web_stat/configure.rb

@@ -9,7 +9,7 @@ module WebStat
         if defined? Rails
           YAML.load_file(get_configure_path)[Rails.env]
         else
-          YAML.load_file(get_configure_path)["production"]
+          YAML.load_file(get_configure_path)[ENV["ENV"] || "production"]
         end
       end
       

data/lib/web_stat/fetch.rb

@@ -47,8 +47,12 @@ 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')
+      readability_content = ::Nokogiri::HTML(Readability::Document.new(@nokogiri.at('body')).content)
+      if (path.nil? || path.empty?) && readability_content.xpath('//img').first
+        path = readability_content.xpath('//img').first.attr('src')
+      end
+      if (path.nil? || path.empty?) && @nokogiri.xpath('//img').first
+        path = @nokogiri.xpath('//img').first.attr('src')
       end
       if ! path.nil? && path.match(/^\//)
         "#{URI.parse(@url).scheme}://#{URI.parse(@url).host}#{path}"
@@ -86,7 +90,7 @@ module WebStat
           raise Mechanize::RobotsDisallowedError.new(url)
         end
         if WebStat::Configure.get["use_chromedirver"]
-          document = WebStat::WebDriverHelper.get_last_url(url)
+          body = WebStat::WebDriverHelper.get_source(url)
           @status = 200
         else
           document = mech.get(url, [], nil, { 'Accept-Language' => 'ja'})

data/lib/web_stat/final_redirect_url.rb

@@ -11,7 +11,7 @@ module WebStat
             redirect_lookup_depth = options[:depth].to_i > 0 ? options[:depth].to_i : 10
             response_uri = get_final_redirect_url(url, redirect_lookup_depth)
             final_url =  url_string_from_uri(response_uri)
-          rescue Exception => ex
+          rescue => e
             # nothing
           end
         end

data/lib/web_stat/version.rb

@@ -1,3 +1,3 @@
 module WebStat
-  VERSION = "0.3.9"
+  VERSION = "0.3.14"
 end

data/spec/spec_helper.rb

@@ -7,12 +7,7 @@ require "web_stat"
 require 'webmock'
 include WebMock::API
 WebMock.enable!
-
-WebMock.disable_net_connect!({
-  allow_localhost: true,
-  allow: 'chromedriver.storage.googleapis.com'
-})
-
+  
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure
   config.example_status_persistence_file_path = ".rspec_status"

metadata

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