slideshow 0.8.4 → 0.8.5

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.8.5  / 2010-06-25
+
+* Added workaround for RedCloth 4 (Java-only) multi-byte character bug 
+
 === 0.8.4  / 2010-06-24
 
 * Added support for proxy via HTTP_PROXY env for fetching templates from the internet

data/lib/slideshow.rb

@@ -24,7 +24,7 @@ require 'slideshow/gen'
 
 module Slideshow
 
-  VERSION = '0.8.4'
+  VERSION = '0.8.5'
 
   def Slideshow.main
     

data/lib/slideshow/gen.rb

@@ -67,6 +67,15 @@ class Gen
 
   # todo: move to filter (for easier reuse)  
   def textile_to_html( content )
+    
+    # JRuby workaround for RedCloth 4 multi-byte character bug
+    #  see http://jgarber.lighthouseapp.com/projects/13054/tickets/149-redcloth-4-doesnt-support-multi-bytes-content
+    # basically convert non-ascii chars (>127) to html entities
+    
+    if RedCloth::EXTENSION_LANGUAGE == "Java"
+      content = content.chars.map{ |x| x.size > 1 ? "&##{x.unpack("U*")};" : x }.join 
+    end
+    
     # turn off hard line breaks
     # turn off span caps (see http://rubybook.ca/2008/08/16/redcloth)
     red = RedCloth.new( content, [:no_span_caps] )
@@ -269,12 +278,8 @@ class Gen
       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
-  
+    http = Net::HTTP::Proxy( proxy.host, proxy.port, proxy.user, proxy.password )
+    response = http.get_response( uri )  
   
     unless response.code == '200'   # note: responsoe.code is a string
       msg = "#{response.code} #{response.message}" 
@@ -286,15 +291,15 @@ class Gen
   
     # check for content type; use 'wb' for images
     if response.content_type =~ /image/
-		  logger.debug '  switching to binary'
-		  flags = 'wb'
+      logger.debug '  switching to binary'
+      flags = 'wb'
     else
       flags = 'w'
     end
   
     File.open( dest, flags ) do |f|
-		  f.write( response.body )	
-	  end
+      f.write( response.body )	
+    end
   end
   
   

metadata

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