web_stat 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f62b7ce2720dcd1851a3c0620af8da6e00313e1b5de918e8b1e23ceeeacee89
-  data.tar.gz: 1a52579415bf2a4f96efd39931ef41849751f693658f5cfbcd88202c680a446c
+  metadata.gz: bf6e7c6f1461adb76d15e934bbcb4866350dbef5ee45dc36ab5bac44cac88ce5
+  data.tar.gz: 3f788539423a476ba805b5cc023320fbd9e16b5ef3cffe476f8c7c9a9c6bcedf
 SHA512:
-  metadata.gz: 51b5d4fbc2e0969913cec3c1ae4b745cca8a790b4f9638d9a920d844840500424c69f18e7d3f58d2d870b8391e0817f06781699b302f36b2a68d81467608a867
-  data.tar.gz: 2d4ba4bfac9c5d5c76fcc48ba0202b7dbf223b4f42b7d6a649cce22c0742d6b7605c3386c93be2cb29487308714fc94fd2bf1063faf78bdcd5b7b6c5ab060d8b
+  metadata.gz: 77787d2811e56d7e7db5d78c378204ff83fb44252a38c41e5843e8abf98e5c06dc5e5763f5e877202557294ea480c065f541f05ae9bd944e28433d9f46be5520
+  data.tar.gz: ed612a3a5bb29330c08876736e834a166f658db6f4ca75c7d93c120a60ddeb25695f98416efaeb5d42693b2278b74ca22ab83b77235135b962ce0f9ed956fd6a

data/lib/helpers/web_drive_helper.rb

@@ -1,28 +1,30 @@
-class WebDriverHelper
-  class << self
-    # Get last url
-    # @param [String] url
-    # @param [Integer] delay
-    def get_last_url(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'
-        ])
-      driver = Selenium::WebDriver.for(:chrome, options: options)
-      driver.manage.timeouts.implicit_wait = 10
-      Selenium::WebDriver::Wait.new(timeout: 10)
-      driver.get(url)
-      if delay.is_a?(Integer)
-        sleep delay
+module WebStat
+  class WebDriverHelper
+    class << self
+      # Get last url
+      # @param [String] url
+      # @param [Integer] delay
+      def get_last_url(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'
+          ])
+        driver = Selenium::WebDriver.for(:chrome, options: options)
+        driver.manage.timeouts.implicit_wait = 10
+        Selenium::WebDriver::Wait.new(timeout: 10)
+        driver.get(url)
+        if delay.is_a?(Integer)
+          sleep delay
+        end
+        last_url = driver.current_url
+        driver.quit
+        last_url
       end
-      last_url = driver.current_url
-      driver.quit
-      last_url
     end
   end
 end

data/lib/web_stat/fetch.rb

@@ -122,7 +122,7 @@ module WebStat
     # Get original url
     # @param [String] url
     def original_url(url)
-      last_url = FinalRedirectUrl.final_redirect_url(url)
+      last_url = WebStat::FinalRedirectUrl.final_redirect_url(url)
       unless last_url.nil? || last_url.scrub('').empty?
         last_url
       else

data/lib/web_stat/final_redirect_url.rb

@@ -1,50 +1,50 @@
 # ref) https://github.com/indyarocks/final_redirect_url
 # customize
 #  Changed 
-
-module FinalRedirectUrl
-
-  def self.final_redirect_url(url, options={})
-    final_url = ''
-    if is_valid_url?(url)
-      begin
-        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
-        # nothing
+module WebStat
+  class FinalRedirectUrl
+    class << self
+      def final_redirect_url(url, options={})
+        final_url = ''
+        if is_valid_url?(url)
+          begin
+            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
+            # nothing
+          end
+        end
+        final_url
       end
-    end
-    final_url
-  end
-
-  private
-  def self.is_valid_url?(url)
-    url.to_s.match? URI::regexp(['http', 'https'])
-  end
-
-  def self.get_final_redirect_url(url, limit = 10)
-    return url if limit <= 0
-    uri = URI.parse(url)
-    response = ::Net::HTTP.get_response(uri)
-    if response.class == Net::HTTPOK
-      return URI.parse(WebDriverHelper.get_last_url(uri))
-    else
-      redirect_location = response['location']
-      location_uri = URI.parse(redirect_location)
-      if location_uri.host.nil?
-        redirect_location = uri.scheme + '://' + uri.host + redirect_location
+    
+      private
+      def is_valid_url?(url)
+        url.to_s.match? URI::regexp(['http', 'https'])
+      end
+      def get_final_redirect_url(url, limit = 10)
+        return url if limit <= 0
+        uri = URI.parse(url)
+        response = ::Net::HTTP.get_response(uri)
+        if response.class == Net::HTTPOK
+          return URI.parse(WebStat::WebDriverHelper.get_last_url(uri))
+        else
+          redirect_location = response['location']
+          location_uri = URI.parse(redirect_location)
+          if location_uri.host.nil?
+            redirect_location = uri.scheme + '://' + uri.host + redirect_location
+          end
+          warn "redirected to #{redirect_location}"
+          get_final_redirect_url(redirect_location, limit - 1)
+        end
+      end
+      def url_string_from_uri(uri)
+        url_str = "#{uri.scheme}://#{uri.host}#{uri.request_uri}"
+        if uri.fragment
+          url_str = url_str + "##{uri.fragment}"
+        end
+        url_str
       end
-      warn "redirected to #{redirect_location}"
-      get_final_redirect_url(redirect_location, limit - 1)
-    end
-  end
-
-  def self.url_string_from_uri(uri)
-    url_str = "#{uri.scheme}://#{uri.host}#{uri.request_uri}"
-    if uri.fragment
-      url_str = url_str + "##{uri.fragment}"
     end
-    url_str
   end
-end
+end

data/lib/web_stat/version.rb

@@ -1,3 +1,3 @@
 module WebStat
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

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