webinspector 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ad37cd905f72b0d7b6a9e12253b65dd2a48e94a
-  data.tar.gz: efddee40c1b9505a43b96085e2f7ff93dfb678ea
+  metadata.gz: ab3cfc405792d46d5ad89038e2f81d4ae2d45793
+  data.tar.gz: 52958fc3132b4cb97e548ac6dd0b1187a3e95755
 SHA512:
-  metadata.gz: 6e208ec285ed76abaaca8b16f8a76a1323343ace86ee44cd5bb23a94148468841c63e28e5dcc14d04f0dfae580019d2b92194311f4e34bdb0e7c5b56f3e06978
-  data.tar.gz: bbd316683c9ea289975ad12d7d039ace65e3ffca109d71c25f54f61347032729e775d93f29b4a3dd341d66d7ee8e7b32af0ca8c6708981d1d068088839c8425b
+  metadata.gz: 01e3855519d7d01e264462950994c18096686566f8876cf1a18c23753a2a0ac33cf0611ddea9fb4a4a4012168ebb520c7e516387deb285589306943c55ddfbbc
+  data.tar.gz: a0b8c97245e009cc54865779c05597daa8ffee067d90d67d193c1d84ce5d446936720cd679b67f42fe98c164a5f1adbf26ee4fef73c16525cc5aad490b486d90

data/lib/web_inspector/page.rb

@@ -5,7 +5,7 @@ require 'open_uri_redirections'
 require 'faraday'
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'inspector'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'uri'))
+require File.expand_path(File.join(File.dirname(__FILE__), 'request'))
 
 module WebInspector
   class Page
@@ -14,7 +14,7 @@ module WebInspector
     def initialize(url, options = {})
       @url = url
       @options = options
-      @uri = WebInspector::Uri.new(url)
+      @request = WebInspector::Request.new(url)
       @inspector = WebInspector::Inspector.new(page)
     end
 
@@ -39,19 +39,19 @@ module WebInspector
     end
 
     def url
-      @uri.url
+      @request.url
     end
 
     def host
-      @uri.host
+      @request.host
     end
 
     def scheme
-      @uri.scheme
+      @request.scheme
     end
 
     def port
-      @uri.port
+      @request.port
     end
 
     def to_hash
@@ -107,7 +107,7 @@ module WebInspector
     end
 
     def page
-      Nokogiri::HTML(open(@uri.url, :allow_redirections => :safe))
+      Nokogiri::HTML(open(@request.url, :allow_redirections => :safe))
     end
   end
 end

data/lib/web_inspector/request.rb

@@ -0,0 +1,35 @@
+require 'addressable/uri'
+
+module WebInspector
+  class Request
+  	def initialize(url)
+  		@url = url
+  	end
+
+  	def url
+      normalized_uri
+    end
+
+    def host
+      uri.host
+    end
+
+    def scheme
+      uri.scheme
+    end
+
+    def port
+      URI(normalized_uri).port
+    end 
+
+    private
+
+    def uri
+      Addressable::URI.parse(@url)
+    end
+
+    def normalized_uri
+      uri.normalize.to_s
+    end
+  end
+end

data/lib/web_inspector/version.rb

@@ -1,3 +1,3 @@
 module WebInspector
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webinspector
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Davide Santangelo
@@ -185,6 +185,7 @@ files:
 - lib/web_inspector/inspector.rb
 - lib/web_inspector/meta.rb
 - lib/web_inspector/page.rb
+- lib/web_inspector/request.rb
 - lib/web_inspector/version.rb
 - lib/webinspector.rb
 - webinspector.gemspec