slideshow 0.8.3 → 0.8.4

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.8.4  / 2010-06-24
+
+* Added support for proxy via HTTP_PROXY env for fetching templates from the internet
+
 === 0.8.3  / 2010-06-23
 
 * Added support for @slides and @content variables in templates

data/lib/slideshow/gen.rb

@@ -252,9 +252,30 @@ class Gen
 
     uri = URI.parse( src )
   
-    # todo: add our own agent HTTP header for identification?
-    response = Net::HTTP.get_response( uri )
-
+    # new code: honor proxy env variable HTTP_PROXY
+    proxy = ENV['HTTP_PROXY']
+    proxy = ENV['http_proxy'] if proxy.nil?   # try possible lower/case env variable (for *nix systems) is this necessary??
+    
+    if proxy
+      proxy = URI.parse( proxy )
+      logger.debug "using net http proxy: proxy.host=#{proxy.host}, proxy.port=#{proxy.port}"
+      if proxy.user && proxy.password
+        logger.debug "  using credentials: proxy.user=#{proxy.user}, proxy.password=****"
+      else
+        logger.debug "  using no credentials"
+      end
+    else
+      logger.debug "using direct net http access; no proxy configured"
+      proxy = OpenStruct.new   # all fields return nil (e.g. proxy.host, etc.)
+    end
+    
+    # same as old code w/o proxy:   response = Net::HTTP.get_response( uri )
+    
+    response = Net::HTTP::Proxy(proxy.host,proxy.port,proxy.user,proxy.password).start( uri.host, uri.port ) do |http|
+      return http.request_get(uri.request_uri)
+    end
+  
+  
     unless response.code == '200'   # note: responsoe.code is a string
       msg = "#{response.code} #{response.message}" 
       puts "*** error: #{msg}"

data/lib/slideshow.rb

@@ -11,6 +11,7 @@ require 'fileutils'
 require 'pp'
 require 'uri'
 require 'net/http'
+require 'ostruct'
 
 # required gems
 require 'redcloth'  # default textile library
@@ -23,7 +24,7 @@ require 'slideshow/gen'
 
 module Slideshow
 
-  VERSION = '0.8.3'
+  VERSION = '0.8.4'
 
   def Slideshow.main
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 8
-  - 3
-  version: 0.8.3
+  - 4
+  version: 0.8.4
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-23 00:00:00 +02:00
+date: 2010-06-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency