siefca-httpage 0.2.2 → 0.2.4

data/lib/httpage.rb

@@ -17,3 +17,6 @@ require 'uri'
 require 'bufferaffects'
 require 'httpage/httpage'
 
+pag = HTTPage.new('http://www.wykop.pl/')
+
+puts pag.real_url

data/lib/httpage/httpage.rb

@@ -9,7 +9,6 @@ class HTTPage
   attr_affects_buffers  :url, :encoding
 
   attr_accessor :redir_retry, :conn_retry, :timeout, :url
-  attr_reader   :real_url
   attr_writer   :encoding
   
   def initialize(url,redir_retry=5,conn_retry=8,timeout=40)
@@ -59,13 +58,17 @@ class HTTPage
     return [default_content_type, default_encoding] if self.response.nil?
     
     # try meta-tag header
-    header  = self.response.body.scan(/<meta http-equiv\s*=\s*['"]*content-type['"]*\s*content\s*=\s*['"]*\s*(.*?)\s*['"]*\s*\/?>/i)
-    header  = header.flatten.first
-    enc     = extract_encoding(header)
-    ctype   = extract_content_type(header)
+    enc     = nil
+    ctype   = nil
+    unless self.body.nil?
+      header  = body.scan(/<meta http-equiv\s*=\s*['"]*content-type['"]*\s*content\s*=\s*['"]*\s*(.*?)\s*['"]*\s*\/?>/i)
+      header  = header.flatten.first
+      enc     = extract_encoding(header)
+      ctype   = extract_content_type(header)
+    end
 
     # try server header
-    if ctype.nil?
+    if ctype.nil? && response.respond_to?(:header)
       header = response.header['content-type']
       ctype = extract_content_type(header)
       enc = extract_encoding(header)
@@ -178,6 +181,11 @@ class HTTPage
     return r.respond_to?(:body) ? r.body : nil
   end
 
+  def real_url
+    return nil if self.response.nil?
+    return @real_url
+  end
+
   # Strips HTML tags from document.
 
   def strip_html(text=nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: siefca-httpage
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors: 
 - "Pawe\xC5\x82 Wilk"