url_reader 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a62965c93752bca06a55622072fc71aff8681b30
-  data.tar.gz: 102822219a522114a1ffd8ec67068d2b7742c1bf
+  metadata.gz: dd9aa78d32f98dd3a32fb0a753a2f5e76e532888
+  data.tar.gz: 37f67aaa0104ba239aa8f3bbb4a23a76cb6451d9
 SHA512:
-  metadata.gz: e165bf66d90c434054f4437f44068ce98ddae35deea0e79aadd5e562405939160a48bd85bc338fc00df66e45f36f4913a3c5052275bc6cbfaa455112f399ab1d
-  data.tar.gz: e04333113bf35f831db105fdc1be3d61feee9ff79b80f661f0e71aa4800491398f2fc34a58f608fc968c1851a495bd48224a4e242a9998c5ec8fee0772320861
+  metadata.gz: 26cc4e1fa5f9f0aaeca59a9d1302fd92f2ded2637da696d735705ab21e343e4da46c1381a499bcef919c5eb219389232c4bc36e32af69328661004b44fef2e36
+  data.tar.gz: ccad250a781ae2f303add07fe627a6d2266cc2f2c5bf472a9f3c2c7e7a2d2dc7177f28b595c9e48c5ad88ec0d7e6edf7d61329474210b6c0ce195ba7fd07d146

data/lib/url_reader.rb

@@ -10,12 +10,21 @@ module UrlReader
   REQUEST_TIMEOUT = 10
   REQUEST_OPEN_TIMEOUT = 10
 
+  cattr_accessor :last_response_headers, :last_response_cookies, :last_cache_used
+
   def read_url(url, options = {})
+    self.class.last_response_headers = nil
+    self.class.last_response_cookies = nil
+    self.class.last_cache_used = false
     if defined?(Rails) && Rails.env.development?
       if ENV['READ_URL_CACHE_NOT_USE'] != 'true'
         ckey = cache_key(url, options)
-        res = cache.read_entry(ckey)
-        res || read_url_core_with_cache_write(url, options, ckey)
+        if res = cache.read_entry(ckey)
+          self.class.last_cache_used = true
+          res
+        else
+          read_url_core_with_cache_write(url, options, ckey)
+        end
       else
         read_url_core_with_cache_write(url, options)
       end
@@ -48,12 +57,16 @@ module UrlReader
   def read_url_core(url, options)
     valid_url = fixed_url(url)
     headers = {}
+    headers.merge!(options[:headers]) if options[:headers]
     headers[:user_agent] = options[:user_agent] if options[:user_agent]
+    cookies = {}
+    cookies.merge!(options[:cookies]) if options[:cookies]
     hash = {
       url: valid_url,
       timeout: options[:request_timeout] || REQUEST_TIMEOUT,
       open_timeout: options[:request_open_timeout] || REQUEST_OPEN_TIMEOUT,
-      headers: headers
+      headers: headers,
+      cookies: cookies
     }
     response =
       begin
@@ -76,6 +89,8 @@ module UrlReader
         raise ne
       end
     return nil unless response
+    self.class.last_response_headers = response.headers
+    self.class.last_response_cookies = response.cookies
     image_content_type = options[:image_content_type]
     return resolve_encoding(response) unless response.headers[:content_type] =~ /^image\// || (image_content_type && response.headers[:content_type] == image_content_type)
     response.to_str

data/url_reader.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'url_reader'
-  s.version = '0.2.3'
+  s.version = '0.2.4'
   s.authors = ['Tetsuri Moriya']
   s.email = ['tetsuri.moriya@gmail.com']
   s.summary = 'Url reader'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: url_reader
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Tetsuri Moriya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec