slideshow 1.1.0.beta5 → 1.1.0.beta6

data/Manifest.txt

@@ -13,6 +13,7 @@ lib/slideshow/filters/headers_filter.rb
 lib/slideshow/filters/slide_filter.rb
 lib/slideshow/filters/text_filter.rb
 lib/slideshow/gen.rb
+lib/slideshow/headers.rb
 lib/slideshow/helpers/analytics_helper.rb
 lib/slideshow/helpers/background_helper.rb
 lib/slideshow/helpers/capture_helper.rb
@@ -31,6 +32,7 @@ lib/slideshow/markup/rest.rb
 lib/slideshow/markup/textile.rb
 lib/slideshow/opts.rb
 lib/slideshow/slide.rb
+lib/slideshow/version.rb
 templates/s6.txt
 templates/s6.txt.gen
 templates/s6/jquery.js

data/Rakefile

@@ -1,5 +1,5 @@
 require 'hoe'
-require './lib/slideshow.rb'
+require './lib/slideshow/version.rb'
 
 Hoe.spec 'slideshow' do
   
@@ -8,6 +8,7 @@ Hoe.spec 'slideshow' do
   self.summary = 'Slide Show (S9) - A Free Web Alternative to PowerPoint and KeyNote in Ruby'
   self.urls     = ['http://slideshow.rubyforge.org']
   
+  
   self.author  = 'Gerald Bauer'
   self.email   = 'webslideshow@googlegroups.com'
   

data/config/slideshow.yml

@@ -25,14 +25,13 @@ headers:
   # gradient:
   #   theme: dark
   #   color1:
-  gradient-theme:  dark
-  gradient-color1:  red
-  gradient-color2:  black
+  gradient-theme:  diagonal
+  gradient-colors:  red orange
 
   # todo: use nested config??
   #
-  # ultraviolet (uv) | coderay (cr) 
-  code-engine:  uv
+  # SyntaxHighligher (sh) | ultraviolet (uv) | coderay (cr)
+  code-engine:  sh
   # Text Mate Hyperlink for Source?
   code-txmt:  false
   # todo: add code-linenumbers??

data/lib/slideshow.rb

@@ -38,7 +38,9 @@ require 'textutils'     # text filters and helpers
 
 
 # our own code
+require 'slideshow/version'
 require 'slideshow/opts'
+require 'slideshow/headers'
 require 'slideshow/config'
 require 'slideshow/gen'
 require 'slideshow/manifest'
@@ -70,8 +72,6 @@ require 'slideshow/filters/slide_filter'
 
 module Slideshow
 
-  VERSION = '1.1.0.beta5'
-  
   def self.root
     "#{File.expand_path( File.dirname(File.dirname(__FILE__)) )}"
   end

data/lib/slideshow/config.rb

@@ -36,8 +36,7 @@ class Config
       @props = @props_work = Props.load_file_with_erb( props_work_file, binding(), @props )
     end
   end
-  
-  
+    
   def header( key )
     @props.fetch_from_section( 'headers', normalize_key( key ), nil )
   end

data/lib/slideshow/filters/headers_filter.rb

@@ -4,7 +4,8 @@ module Slideshow
 
 def leading_headers( content_with_headers )
   
-  # todo: read headers before command line options (lets you override options using commandline switch)?
+  # todo: lets user override headers with command line options
+  #  that is, lets you override options using commandline switch
   
   # read source document; split off optional header from source
   # strip leading optional headers (key/value pairs) including optional empty lines
@@ -12,17 +13,17 @@ def leading_headers( content_with_headers )
   read_headers = true
   content = ""
 
-  headers = [] # track header keys for stats
+  keys = [] # track header keys for stats
   
   content_with_headers.each_line do |line|
     if read_headers && line =~ /^\s*(\w[\w-]*)[ \t]*:[ \t]*(.*)/
       key = $1.downcase
       value = $2.strip
       
-      headers << key
+      keys << key
     
-      logger.debug "  adding option: key=>#{key}< value=>#{value}<"
-      opts.put( key, value )
+      logger.debug "  adding header: key=>#{key}< value=>#{value}<"
+      headers.put( key, value )
     elsif line =~ /^\s*$/
       content << line  unless read_headers
     else
@@ -31,7 +32,7 @@ def leading_headers( content_with_headers )
     end
   end 
 
-  puts "  Reading #{headers.length} headers: #{headers.join(', ')}..."
+  puts "  Reading #{keys.length} headers: #{keys.join(', ')}..."
 
   content
 end

data/lib/slideshow/gen.rb

@@ -63,17 +63,20 @@ class Gen
   end
 
   # todo/fix: move to Config class
+  # - used in syntax/uv_helper (use config.cache_dir to access?)
+  
   def cache_dir
     File.join( Env.home, '.slideshow' )
   end
 
+
   def config_dir
     unless @config_dir  # first time? calculate config_dir value to "cache"
       
       if opts.config_path
         @config_dir = opts.config_path
       else
-        @config_dir = cache_dir
+        @config_dir = config.cache_dir
       end
     
       # make sure path exists

data/lib/slideshow/headers.rb

@@ -0,0 +1,87 @@
+module Slideshow
+
+class Headers
+
+  def initialize( config )
+    @hash   = {}
+    @config = config
+  end
+
+  ## todo: rename put to store like std hash method
+  def put( key, value )
+    key = normalize_key( key )
+    setter = "#{key}=".to_sym
+
+    if respond_to?( setter )
+      send( setter, value )
+    else
+      @hash[ key ] = value
+    end
+  end
+
+  def gradient=( line )
+    # split into theme (first value) and colors (everything else)
+    #  e.g.  diagonal red black
+    
+    # todo/check: translate value w/ v.tr( '-', '_' ) ??
+    
+    values = line.split( ' ' )
+      
+    put( 'gradient-theme', values.first )                 if values.size > 0
+    put( 'gradient-colors', values[ 1..-1].join( ' ' ) )  if values.size > 1
+  end
+  
+  def has_gradient?
+    # has user defined gradient (using headers)?  (default values do NOT count)
+    @hash.has_key?( :gradient_theme ) || @hash.has_key?( :gradient_colors )
+  end  
+    
+  def []( key )
+    value = get( key )
+     
+    if value.nil?
+      puts "** Warning: header '#{key}' undefined"
+      value = "- #{key} not found -"
+    end
+    value
+  end
+
+  def code_engine
+    get( 'code-engine' )
+  end
+  
+  def code_txmt
+    get( 'code-txmt' )
+  end
+
+
+## todo: rename get to fetch??
+  def get( key, default=nil )
+    key = normalize_key(key)
+    value = @hash.fetch( key, nil )
+    value = @config.header( key ) if value.nil?   # try lookup in config properties next
+    if value.nil?
+      default
+    else
+      value
+    end
+  end
+
+  def get_boolean( key, default )
+    value = get( key, default )
+    if value.nil?
+      default
+    else
+      (value == true || value =~ /t|true|yes|on/i) ? true : false
+    end
+  end
+
+private
+
+  def normalize_key( key )
+    key.to_s.downcase.tr('-', '_').to_sym
+  end
+      
+end  # class Headers
+
+end # module Slideshow

data/lib/slideshow/opts.rb

@@ -1,107 +1,8 @@
 module Slideshow
 
-# todo: split (command line) options and headers?
-# e.g. share (command line) options between slide shows (but not headers?)
-
-class Headers
-
-  def initialize( config )
-    @hash   = {}
-    @config = config
-  end
-
-  def put( key, value )
-    key = normalize_key( key )
-    setter = "#{key}=".to_sym
-
-    if respond_to? setter
-      send setter, value
-    else
-      @hash[ key ] = value
-    end
-  end
-
-  def gradient=( line )
-    # split into theme (first value) and colors (everything else)
-    #  e.g.  diagonal red black
-    
-    # todo/check: translate value w/ v.tr( '-', '_' ) ??
-    
-    values = line.split( ' ' )
-      
-    put( 'gradient-theme', values.first )                 if values.size > 0
-    put( 'gradient-colors', values[ 1..-1].join( ' ' ) )  if values.size > 1
-  end
-  
-  def has_gradient?
-    # has user defined gradient (using headers)?  (default values do NOT count)
-    @hash.has_key?( :gradient_theme ) || @hash.has_key?( :gradient_colors )
-  end  
-    
-  def []( key )
-    value = get( key )
-    value = @config.header( key ) if value.nil?   # try lookup in config properties next
-     
-    if value.nil?
-      puts "** Warning: header '#{key}' undefined"
-      value = "- #{key} not found -"
-    end
-    value
-  end
-
-  def code_engine
-    get( 'code-engine' )
-  end
-  
-  def code_txmt
-    get( 'code-txmt' )
-  end
-
-
-  DEFAULTS =
-  {
-    :title             => 'Untitled Slide Show',
-    :footer            => '',
-    :subfooter         => '',
-    :gradient_theme    => 'diagonal',
-    :gradient_colors   => 'red orange',
-
-    :code_engine       => 'sh',  # SyntaxHighligher (sh) | ultraviolet (uv) | coderay (cr)
-    :code_txmt         => 'false', # Text Mate Hyperlink for Source?
-  }
-
-## todo: rename get to fetch??
-  def get( key, default=nil )
-    key = normalize_key(key)
-    value = @hash.fetch( key, DEFAULTS[ key ] )
-    if value.nil?
-      default
-    else
-      value
-    end
-  end
-
-private
-
-  def normalize_key( key )
-    key.to_s.downcase.tr('-', '_').to_sym
-  end
-    
-  def get_boolean( key, default )
-    key = normalize_key( key )
-    value = @hash.fetch( key, DEFAULTS[ key ] )
-    if value.nil?
-      default
-    else
-      (value == true || value =~ /true|yes|on/i) ? true : false
-    end
-  end
-  
-end  # class Headers
-
 
 class Opts
-  
+
   def generate=(value)
     @generate = value
   end

data/lib/slideshow/version.rb

@@ -0,0 +1,3 @@
+module Slideshow
+  VERSION = '1.1.0.beta6'
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  hash: 689500001
+  hash: 570047004
   prerelease: 6
   segments: 
   - 1
   - 1
   - 0
   - beta
-  - 5
-  version: 1.1.0.beta5
+  - 6
+  version: 1.1.0.beta6
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -160,6 +160,7 @@ files:
 - lib/slideshow/filters/slide_filter.rb
 - lib/slideshow/filters/text_filter.rb
 - lib/slideshow/gen.rb
+- lib/slideshow/headers.rb
 - lib/slideshow/helpers/analytics_helper.rb
 - lib/slideshow/helpers/background_helper.rb
 - lib/slideshow/helpers/capture_helper.rb
@@ -178,6 +179,7 @@ files:
 - lib/slideshow/markup/textile.rb
 - lib/slideshow/opts.rb
 - lib/slideshow/slide.rb
+- lib/slideshow/version.rb
 - templates/s6.txt
 - templates/s6.txt.gen
 - templates/s6/jquery.js