web_stat 0.3.7 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5304507f8ce01a6a98717756927366005db0eceb89b3d22f29e4283c6eedb4d7
-  data.tar.gz: f561221644f98831867c2d853201a0312dcb75674ca4ae247b319b4f2a1ba085
+  metadata.gz: 2af80415014e94830b1e323f44e2e71732196bdfc535627295f1f6b7b2f44285
+  data.tar.gz: 85fc9facafff40063c434824ebc64fcd847f347bdfa0c928ee8c35b2b3e0c8b5
 SHA512:
-  metadata.gz: bec01871973e80dc46b9246a264791213b3bdd4cb20693fc0d51cc28c2d9bba28b40af65322dc2b0c950e9bb5aedd288ff8fd771adfbd5b2aee1564b98888cb0
-  data.tar.gz: 5cfce031ad779f347fae362ccff2deadb3711e4f9fcc06cafcd232b86e8c18aff63e40c430a330cfdf00d398aa5257457c5dc9f3bee492478359d3801e217f08
+  metadata.gz: 30870501431d61d5d90bdcfcf4f6ba339918b810fda48bd9a77abe183e341575bc9c7397aadb7494da1591d5d647fea7b17512ed24cea61471d4e112a0c17bd8
+  data.tar.gz: 8340739ddae12fd6a670d51e7fcd7e3987294bcb32219cde6e8dbcee2a067f064b2b632d102636471d0b7fd0ff27ca4f55c477eca94d88b7194a3cf17b1869c7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    web_stat (0.3.6)
+    web_stat (0.3.11)
       bundler (>= 2.0.2)
       cld (>= 0.8.0)
       mechanize (>= 2.7)

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,14 +5,29 @@ 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: [
           'headless',
           'no-sandbox',
-          'disable-gpu',
-          'start-maximized',
-          'window-size=1920,1080'
+          'disable-gpu'
           ])
         driver = Selenium::WebDriver.for(:chrome, options: options)
         driver.manage.timeouts.implicit_wait = 10
@@ -21,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,8 @@ module WebStat
           break
         end
       end
-      if path.nil? || path.empty?
-        path = @nokogiri.at('body').xpath('//img').first.attr('src')
+      if (path.nil? || path.empty?) && @nokogiri.xpath('//img')
+        path = @nokogiri.xpath('//img').attr('src')
       end
       if ! path.nil? && path.match(/^\//)
         "#{URI.parse(@url).scheme}://#{URI.parse(@url).host}#{path}"
@@ -78,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"]
+          body = WebStat::WebDriverHelper.get_source(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

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.7"
+  VERSION = "0.3.12"
 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.7
+  version: 0.3.12
 platform: ruby
 authors:
 - yusuke abe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-14 00:00:00.000000000 Z
+date: 2020-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler