fetcher 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95db80b36d0be7460c96648620191047913fcec3
-  data.tar.gz: 4b6fa34c25e625ca71860da03a7831f26404d6d2
+  metadata.gz: 3377ac81daf3886db7fe5a5e02c4872dd2f0d3c3
+  data.tar.gz: 25a2bbed49a659c1e20651d8b5fd60d5ba163bab
 SHA512:
-  metadata.gz: 7fc927c713af888ef8049619fe0e368d3039119b57596091c6c8e02de21ae7800d741dd96df4da180807e1ad0df600f3a4fe1bc10ea31d0ca0a67540a7c8e2a0
-  data.tar.gz: 705e042295b9ca6bf8b8379145da4860f4e823f92ff0569573ba73959eea5dacc280db37f24389ecd7423e0ac2412e79b0640c9c9be06ce4c5219db2cc0a66e1
+  metadata.gz: ae2a87a082f30bbb076ed79df44debb5bee8e4c37fbb8807cd10b5b4364bbb8c7262f10eadd7d253fcb1e341c1ce9549832641fa5c3be00e822915e48406bdb9
+  data.tar.gz: fd217ff2d88cf4f6668ae608fccda34d5d64e075362f29a07d3aec7fb0150e8222e2ce2ca8cc3c2f5b1ad237d1c2d1a4cf1ffe17c0aca7fd3aec1f9205590638

data/Manifest.txt

@@ -10,3 +10,4 @@ lib/fetcher/version.rb
 lib/fetcher/worker.rb
 test/helper.rb
 test/test_get.rb
+test/test_read.rb

data/Rakefile

@@ -24,7 +24,7 @@ Hoe.spec 'fetcher' do
   self.licenses = ['Public Domain']
 
   self.spec_extras = {
-   :required_ruby_version => '>= 1.9.2'
+   required_ruby_version: '>= 1.9.2'
   }
   
 end

data/lib/fetcher.rb

@@ -7,16 +7,17 @@
 
 # core and stlibs
 
-require 'yaml'
-require 'pp'
-require 'logger'
-require 'fileutils'
+require 'yaml'              ### used ??? remove??
+require 'logger'            ### used ??? remove??
+
+require 'fileutils'         ### used ??? remove??
 require 'uri'
 require 'net/http'
 require 'net/https'
 require 'ostruct'
 require 'date'
 require 'cgi'
+require 'pp'
 
 
 # 3rd party gems
@@ -56,10 +57,20 @@ module Fetcher
     Worker.new.copy( src, dest, opts )
   end
 
+
   def self.read( src )
     Worker.new.read( src )
   end
 
+  def self.read_blob!( src )
+    Worker.new.read_blob!( src )
+  end
+
+  def self.read_utf8!( src )
+    Worker.new.read_utf8!( src )
+  end
+
+
   def self.get( src )
     Worker.new.get( src )
   end
@@ -70,5 +81,6 @@ end  # module Fetcher
 if __FILE__ == $0
   Fetcher.main
 else
-  puts Fetcher.banner    # say hello
+  # say hello
+  puts Fetcher.banner    if $DEBUG || (defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG)
 end

data/lib/fetcher/version.rb

@@ -3,7 +3,7 @@ module Fetcher
 
   MAJOR = 0    ## todo: namespace inside version or something - why? why not??
   MINOR = 4
-  PATCH = 4
+  PATCH = 5
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/lib/fetcher/worker.rb

@@ -58,15 +58,43 @@ module Fetcher
 
 
     def read( src )
-      # return contents (response body) a string
+      # return contents (response body) as (ascii/binary) string
       logger.debug "fetch - copy src: #{src} into string"
-      
+
       response = get_response( src )
-      
+
       # on error return empty string; - check: better return nil- why? why not??
-      return ''  if response.code != '200'
+      if response.code != '200'
+        raise HttpError.new( response.code, response.message )
+      end
+
+      response.body.dup  # return string copy - why? why not?? (use to_s?)
+    end
+
+    def read_blob!( src )
+      ## note: same as read for now
+      read( src )
+    end
+
+    def read_utf8!( src )
+      # return contents (response body) a string
+      logger.debug "fetch - copy src: #{src} into utf8 string"
+
+      response = get_response( src )
+
+      # on error throw exception - why? why not??
+      if response.code != '200'
+        raise HttpError.new( response.code, response.message )
+      end
+
+      ###
+      # Note: Net::HTTP will NOT set encoding UTF-8 etc.
+      # will be set to ASCII-8BIT == BINARY == Encoding Unknown; Raw Bytes Here
+      # thus, set/force encoding to utf-8
 
-      response.body.dup  # return string copy
+      txt = response.body.to_s
+      txt = txt.force_encoding( Encoding::UTF_8 )
+      txt
     end
 
 
@@ -131,7 +159,7 @@ module Fetcher
       
       http_proxy = Net::HTTP::Proxy( proxy.host, proxy.port, proxy.user, proxy.password )
 
-      redirect_limit = 4
+      redirect_limit = 6
       response = nil
 
       until false

data/test/test_get.rb

@@ -37,5 +37,4 @@ class TestGet < MiniTest::Test
     assert_equal '404', res.code
   end
 
-
-end # class TestCopy
+end # class TestGet

data/test/test_read.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+
+require 'helper'
+
+###
+# to run use
+#  ruby -I ./lib -I ./test test/test_read.rb
+
+class TestRead < MiniTest::Test
+
+  def test_read_not_found
+    url = 'http://blog.engineyard.com/category/ruby/feed'
+    worker = Fetcher::Worker.new
+
+    assert_raises( Fetcher::HttpError ) do
+      res = worker.read( url )
+      pp res
+    end
+  end
+
+end # class TestRead
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fetcher
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logutils
@@ -75,6 +75,7 @@ files:
 - lib/fetcher/worker.rb
 - test/helper.rb
 - test/test_get.rb
+- test/test_read.rb
 homepage: https://github.com/rubylibs/fetcher
 licenses:
 - Public Domain
@@ -103,3 +104,4 @@ specification_version: 4
 summary: fetcher - Fetch Text Documents or Binary Blobs via HTTP, HTTPS
 test_files:
 - test/test_get.rb
+- test/test_read.rb