coelacanth 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e367168c49a2f7f9b99dc3cca36a403aabc49c12b2ce7eed101d48846bc9d848
-  data.tar.gz: 46576f957bc34f8edc74638b2f5c7e26726726237d17f180fc8afe5f942bcaf8
+  metadata.gz: 29b00f207c71fb604269ddb59b70064509dce9a5abc189c5ba98a17fc3701815
+  data.tar.gz: fe1487e4f8b15ebbdc6312dce95d2e50b3338871fedb1cb5c49ec8098d97951c
 SHA512:
-  metadata.gz: e151df698b9e1c36e74c3a1228b45f81b0eeda2295bdc87a345e3bb04167d83f7a66cf2978256f2fe0f1cca90b4a34234d06c36087221693597709dadce2a86b
-  data.tar.gz: '03916c2ca92146938606668442fa06879e2847aa4fceb498d811ba5f3ddacac5b7fdb1072a29e6fea4a659d09d874218963ef50c96238e38898bab93e8e27d80'
+  metadata.gz: 462bbd1ee309ca534b42bdac616c4145f7fc3320971d391c025d7bd9080850b61fb773f8a84d5286e73321c90732f897c9b1760c68c6542d5bd3abdfba5b23d9
+  data.tar.gz: ec1071051319687f27e989871cc4cc78a90fbbf2e07c52310e7150fa651efd908a3a2cde8424ed7abfe03755afca3661a6b64477e37be8f7b81d8427caf02f07

data/Gemfile

@@ -9,3 +9,4 @@ gem "ferrum", "~> 0.15"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 gem "rubocop", "~> 1.21"
+gem "oga", "~> 3.4"

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    coelacanth (0.1.3)
+    coelacanth (0.1.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
+    ansi (1.5.0)
     ast (2.4.2)
     concurrent-ruby (1.3.4)
     diff-lcs (1.4.4)
@@ -18,6 +19,9 @@ GEM
       websocket-driver (~> 0.7)
     json (2.7.1)
     language_server-protocol (3.17.0.3)
+    oga (3.4)
+      ast
+      ruby-ll (~> 2.1)
     parallel (1.24.0)
     parser (3.3.0.5)
       ast (~> 2.4.1)
@@ -54,6 +58,9 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.2)
       parser (>= 3.3.0.4)
+    ruby-ll (2.1.3)
+      ansi
+      ast
     ruby-progressbar (1.13.0)
     unicode-display_width (2.5.0)
     webrick (1.8.1)
@@ -68,6 +75,7 @@ PLATFORMS
 DEPENDENCIES
   coelacanth!
   ferrum (~> 0.15)
+  oga (~> 3.4)
   rake (~> 13.0)
   rspec (~> 3.0)
   rubocop (~> 1.21)

data/lib/coelacanth/client.rb

@@ -1,46 +1,76 @@
 # frozen_string_literal: true
 
 require "ferrum"
+require "oga"
 
 module Coelacanth
   # Coelacanth::Client
   class Client
-    def initialize
-      @config = Configure.new
+    def initialize(url = nil)
+      @config = Coelacanth.config
+      @url = url if url && valid_url?(url)
     end
 
-    def valid_url?(url)
-      uri = URI.parse(url)
+    def valid_url?(url = nil)
+      @url = url if url
+      uri = URI.parse(@url)
       uri.is_a?(URI::HTTP) || uri.is_a?(URI::HTTPS)
     rescue URI::InvalidURIError
       false
     end
 
-    def resolve_redirect(url, limit = 10)
+    def resolve_redirect(url = nil, limit = 10)
+      @url = url if url && valid_url?(url)
       raise Coelacanth::DeepRedirectError, "Too many redirect" if limit.zero?
-      raise Coelacanth::RedirectError, "Url or location is nil" if url.nil?
+      raise Coelacanth::RedirectError, "Url or location is nil" if @url.nil?
 
-      response = get_response(url)
+      get_response(@url)
+      handle_response(@origin_response, limit)
+    end
 
-      case response
-      when Net::HTTPSuccess then url
-      when Net::HTTPRedirection then resolve_redirect(response["location"], limit - 1)
-      else
-        raise Coelacanth::RedirectError
-      end
+    def oga(url = nil)
+      @url = url if url && valid_url?(url)
+      Oga.parse_xml(get_response(@url))
     end
 
-    def get_response(url)
+    def get_response(url = nil)
+      @url = url if url && valid_url?(url)
       if @config.read("use_remote_client")
-        remote_client.goto(url)
-        remote_client.body
+        response_by_remote_client
       else
-        Net::HTTP.get_response(url)
+        response_by_net_http
       end
     end
 
     private
 
+    def handle_response(response, limit)
+      codes = Net::HTTPResponse::CODE_CLASS_TO_OBJ.invert
+      case @status_code.to_s
+      when /^#{codes[Net::HTTPSuccess]}\d\d$/
+        @url
+      when /^#{codes[Net::HTTPRedirection]}\d\d$/
+        @url = response["location"]
+        resolve_redirect(response["location"], limit - 1)
+      else
+        raise Coelacanth::RedirectError
+      end
+    end
+
+    def response_by_remote_client
+      remote_client.goto(@url)
+      @status_code = remote_client.network.status
+      @origin_response = remote_client
+      remote_client.body
+    end
+
+    def response_by_net_http
+      response = Net::HTTP.get_response(URI.parse(@url))
+      @status_code = response.code
+      @origin_response = response
+      response.body
+    end
+
     def remote_client
       if @remote_client.nil?
         headers = @config.read("remote_client.headers")

data/lib/coelacanth/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Coelacanth
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/lib/coelacanth.rb

@@ -12,9 +12,15 @@ module Coelacanth
   class DeepRedirectError < StandardError; end
 
   def self.analyze(url)
-    Client.get_response(url)
+    @client = Client.new(url)
+    @client.resolve_redirect
     {
-      todo: "implement me"
+      remote_client: @config.read("use_remote_client"),
+      oga: @client.oga
     }
   end
+
+  def self.config
+    @config ||= Configure.new
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coelacanth
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Yusuke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-28 00:00:00.000000000 Z
+date: 2024-08-29 00:00:00.000000000 Z
 dependencies: []
 description: |
   coelacanth is a gem that allows you to easily parse and analyze web pages,
@@ -41,7 +41,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/slidict/coelacanth
   source_code_uri: https://github.com/slidict/coelacanth
-  changelog_uri: https://github.com/slidict/coelacanth/blob/main/CHANGELOG.md
+  changelog_uri: https://github.com/slidict/coelacanth/releases
 post_install_message: 
 rdoc_options: []
 require_paths: