slideshow 1.0.3 → 1.0.4

data/Rakefile

@@ -13,7 +13,8 @@ Hoe.spec 'slideshow' do
   
   self.extra_deps = [
     ['RedCloth','>= 4.2.9'],
-    ['markdown_select','>= 0.1.3']
+    ['markdown','>= 0.1.0'],
+    ['fetcher','>= 0.1.0']
   ]
   
   self.remote_rdoc_dir = 'doc'

data/lib/slideshow.rb

@@ -19,7 +19,8 @@ require 'cgi'
 
 # required gems
 require 'redcloth'          # default textile library
-require 'markdown_select'   # default markdown library 
+require 'markdown'          # default markdown library
+require 'fetcher'           # fetch docs and blogs via http, https, etc.
 
 # our own code
 require 'slideshow/opts'
@@ -54,13 +55,14 @@ require 'slideshow/filters/slide_filter'
 
 module Slideshow
 
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 
   # version string for generator meta tag (includes ruby version)
   def Slideshow.generator
     "Slide Show (S9) #{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
   end
 
+
   def Slideshow.main
     
     # allow env variable to set RUBYOPT-style default command line options

data/lib/slideshow/fetch.rb

@@ -2,84 +2,12 @@ module Slideshow
   module Fetch
   
   def fetch_file( dest, src )
-    logger.debug "fetch( dest: #{dest}, src: #{src})"
-
-    uri = URI.parse( src )
-  
-    # 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
-      
-    http_proxy = Net::HTTP::Proxy( proxy.host, proxy.port, proxy.user, proxy.password )
-
-    redirect_limit = 4
-    response = nil
-
-    until false
-      raise ArgumentError, 'HTTP redirect too deep' if redirect_limit == 0
-      redirect_limit -= 1
-      
-      http = http_proxy.new( uri.host, uri.port )
+     ## note: code moved to its own gem, that is, fetcher
+     ## see https://github.com/geraldb/fetcher
     
-      logger.debug "GET #{uri.request_uri} uri=#{uri}, redirect_limit=#{redirect_limit}"
-    
-      request    = Net::HTTP::Get.new( uri.request_uri, { 'User-Agent'=> 'slideshow'} )
-      if uri.instance_of? URI::HTTPS
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-    
-      response   = http.request( request )  
-  
-      if response.code == '200'
-        logger.debug "#{response.code} #{response.message}"
-        break
-      elsif (response.code == '301' || response.code == '302' || response.code == '303' || response.code == '307' )
-        # 301 = moved permanently
-        # 302 = found
-        # 303 = see other
-        # 307 = temporary redirect
-        logger.debug "#{response.code} #{response.message} location=#{response.header['location']}"
-        newuri = URI.parse( response.header['location'] )
-        if newuri.relative?
-          logger.debug "url relative; try to make it absolute"
-          newuri = uri + response.header['location']
-        end
-        uri = newuri
-      else
-        msg = "#{response.code} #{response.message}" 
-        puts "*** error: #{msg}"
-        return   # todo: throw StandardException?  
-      end
-    end
-
-
-    logger.debug "  content_type: #{response.content_type}, content_length: #{response.content_length}"
-  
-    # check for content type; use 'wb' for images
-    if response.content_type =~ /image/
-      logger.debug '  switching to binary'
-      flags = 'wb'
-    else
-      flags = 'w'
-    end
-  
-    File.open( dest, flags ) do |f|
-      f.write( response.body )	
-    end
+    # nb: in new method src comes first (and dest second - might be optional in the future)
+    Fetcher::Worker.new( logger ).copy( src, dest )
   end
   
   

data/lib/slideshow/gen.rb

@@ -464,28 +464,33 @@ def run( args )
        logger.level = Logger::DEBUG      
     end
  
+    usage =<<EOS
+
+Slide Show (S9) is a free web alternative to PowerPoint or KeyNote in Ruby
+
+#{cmd.help}
+
+Examples:
+  slideshow microformats
+  slideshow microformats.textile         # Process slides using Textile
+  slideshow microformats.text            # Process slides using Markdown
+  slideshow microformats.rst             # Process slides using reStructuredText
+  slideshow -o slides microformats       # Output slideshow to slides folder
+
+More examles:
+  slideshow -g                           # Generate slide show templates using built-in S6 pack
+
+  slideshow -l                           # List installed slide show templates
+  slideshow -f s5blank                   # Fetch (install) S5 blank starter template from internet
+  slideshow -t s5blank microformats      # Use your own slide show templates (e.g. s5blank)
+
+Further information:
+  http://slideshow.rubyforge.org
+EOS
+ 
+ 
     cmd.on_tail( "-h", "--help", "Show this message" ) do
-         puts 
-         puts "Slide Show (S9) is a free web alternative to PowerPoint or KeyNote in Ruby"
-         puts
-         puts cmd.help
-         puts
-         puts "Examples:"
-         puts "  slideshow microformats"
-         puts "  slideshow microformats.textile         # Process slides using Textile"
-         puts "  slideshow microformats.text            # Process slides using Markdown"
-         puts "  slideshow microformats.rst             # Process slides using reStructuredText"
-         puts "  slideshow -o slides microformats       # Output slideshow to slides folder"
-         puts
-         puts "More examles:"
-         puts "  slideshow -g                           # Generate slide show templates using built-in S6 pack"
-         puts
-         puts "  slideshow -l                           # List installed slide show templates"
-         puts "  slideshow -f s5blank                   # Fetch (install) S5 blank starter template from internet"
-         puts "  slideshow -t s5blank microformats      # Use your own slide show templates (e.g. s5blank)"
-         puts
-         puts "Further information:"
-         puts "  http://slideshow.rubyforge.org" 
+         puts usage
          exit
     end
   end
@@ -494,7 +499,7 @@ def run( args )
   
   config.load
 
-  puts "Slide Show (S9) Version: #{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+  puts Slideshow.generator
 
   if opts.list?
     list_slideshow_templates

data/lib/slideshow/markup/markdown.rb

@@ -1,13 +1,13 @@
 module Slideshow
   module MarkdownEngines
 
-  ## note: code move to its own gem, that is, markdown_select
-  ## see https://github.com/geraldb/markdown_select
+  ## note: code moved to its own gem, that is, markdown
+  ## see https://github.com/geraldb/markdown
   
   def markdown_to_html( content )
     ##  puts "  Converting Markdown-text (#{content.length} bytes) to HTML using library '#{@markdown_libs.first}' calling '#{mn}'..."
     
-    MarkdownSelect.new( content ).to_html
+    Markdown.new( content ).to_html
   end
 
 end   # module MarkdownEngines

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-26 00:00:00 Z
+date: 2012-06-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
@@ -34,25 +34,41 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: markdown_select
+  name: markdown
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 27
         segments: 
         - 0
         - 1
-        - 3
-        version: 0.1.3
+        - 0
+        version: 0.1.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: fetcher
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 1
+        - 0
+        version: 0.1.0
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,22 +79,22 @@ dependencies:
         - 10
         version: "3.10"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 7
         segments: 
-        - 2
-        - 15
-        version: "2.15"
+        - 3
+        - 0
+        version: "3.0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: |-
   The Slide Show (S9) Ruby gem lets you create slide shows and author slides in plain text
   using a wiki-style markup language that's easy-to-write and easy-to-read.
@@ -139,7 +155,7 @@ files:
 - templates/slides.html.erb
 - templates/slides.pdf.html.erb
 - templates/style.css.erb
-homepage: http://slideshow.rubyforge.org
+homepage: http://slideshow.rubyforge.org
 licenses: []
 
 post_install_message: |
@@ -176,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: slideshow
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Slide Show (S9) - A Free Web Alternative to PowerPoint and KeyNote in Ruby