slideshow 1.1.0.beta4 → 1.1.0.beta5

data/lib/slideshow.rb

@@ -70,7 +70,7 @@ require 'slideshow/filters/slide_filter'
 
 module Slideshow
 
-  VERSION = '1.1.0.beta4'
+  VERSION = '1.1.0.beta5'
   
   def self.root
     "#{File.expand_path( File.dirname(File.dirname(__FILE__)) )}"

data/lib/slideshow/gen.rb

@@ -6,18 +6,13 @@ class Gen
     @logger = Logger.new(STDOUT)
     @logger.level = Logger::INFO
 
-    @config = Config.new
-    @opts   = Opts.new( @config )
+    @config  = Config.new
+    @opts    = Opts.new
+    @headers = Headers.new( @config )
   end
 
-  attr_reader :logger, :opts, :config
+  attr_reader :logger, :opts, :config, :headers
   attr_reader :session      # give helpers/plugins a session-like hash
-  
-  def headers
-    # give access to helpers to opts with a different name
-    ### fix/todo: use a headers wrapper?? delegation to opts.header(key) lookup??
-    @opts
-  end
 
   attr_reader :markup_type  # :textile, :markdown, :rest
   
@@ -58,7 +53,7 @@ class Gen
   end
   
    
-  def wrap_markup( text )    
+  def wrap_markup( text )
     if markup_type == :textile
       # saveguard with notextile wrapper etc./no further processing needed
       "<notextile>\n#{text}\n</notextile>"
@@ -66,24 +61,12 @@ class Gen
       text
     end
   end
-    
-  # todo/fix: move to Config class  
+
+  # todo/fix: move to Config class
   def cache_dir
-    RUBY_PLATFORM =~ /win32/ ? win32_cache_dir : File.join(File.expand_path("~"), ".slideshow")
+    File.join( Env.home, '.slideshow' )
   end
 
-  # todo/fix: move to Config class  
-  def win32_cache_dir
-    unless ENV['HOMEDRIVE'] && ENV['HOMEPATH'] && File.exists?(home = ENV['HOMEDRIVE'] + ENV['HOMEPATH'])
-      puts "No HOMEDRIVE or HOMEPATH environment variable.  Set one to save a" +
-           "local cache of stylesheets for syntax highlighting and more."
-      return false
-    else
-      return File.join(home, '.slideshow')
-    end
-  end
-  
-  # todo/fix: move to Config class    
   def config_dir
     unless @config_dir  # first time? calculate config_dir value to "cache"
       
@@ -346,8 +329,6 @@ class Gen
   @name        = basename
   @extname     = extname
 
-  @headers     = @opts  # deprecate/remove: use headers method in template
-
   @session     = {}  # reset session hash for plugins/helpers
 
   inname  =  "#{dirname}/#{basename}#{extname}"
@@ -436,13 +417,13 @@ def run( args )
     
     cmd.banner = "Usage: slideshow [options] name"
     
-    cmd.on( '-o', '--output PATH', 'Output Path' ) { |s| opts.put( 'output', s ) }
+    cmd.on( '-o', '--output PATH', 'Output Path' ) { |path| opts.output_path = path }
 
-    cmd.on( '-g', '--generate',  'Generate Slide Show Templates (Using Built-In S6 Pack)' ) { opts.put( 'generate', true ) }
+    cmd.on( '-g', '--generate',  'Generate Slide Show Templates (Using Built-In S6 Pack)' ) { opts.generate = true }
     
     cmd.on( "-t", "--template MANIFEST", "Template Manifest" ) do |t|
       # todo: do some checks on passed in template argument
-      opts.put( 'manifest', t )
+      opts.manifest = t
     end
 
     # ?? opts.on( "-s", "--style STYLE", "Select Stylesheet" ) { |s| $options[:style]=s }
@@ -450,15 +431,15 @@ def run( args )
         
     # ?? cmd.on( '-i', '--include PATH', 'Load Path' ) { |s| opts.put( 'include', s ) }
 
-    cmd.on( '-f', '--fetch URI', 'Fetch Templates' ) do |u|
-      opts.put( 'fetch_uri', u )
+    cmd.on( '-f', '--fetch URI', 'Fetch Templates' ) do |uri|
+      opts.fetch_uri = uri
     end
     
-    cmd.on( '-c', '--config PATH', 'Configuration Path (default is ~/.slideshow)' ) do |p|
-      opts.put( 'config_path', p )
+    cmd.on( '-c', '--config PATH', 'Configuration Path (default is ~/.slideshow)' ) do |path|
+      opts.config_path = path
     end
     
-    cmd.on( '-l', '--list', 'List Installed Templates' ) { opts.put( 'list', true ) }
+    cmd.on( '-l', '--list', 'List Installed Templates' ) { opts.list = true }
 
     # todo: find different letter for debug trace switch (use v for version?)
     cmd.on( "-v", "--verbose", "Show debug trace" )  do

data/lib/slideshow/opts.rb

@@ -3,13 +3,13 @@ module Slideshow
 # todo: split (command line) options and headers?
 # e.g. share (command line) options between slide shows (but not headers?)
 
-class Opts
-  
+class Headers
+
   def initialize( config )
     @hash   = {}
     @config = config
   end
-    
+
   def put( key, value )
     key = normalize_key( key )
     setter = "#{key}=".to_sym
@@ -20,7 +20,7 @@ class Opts
       @hash[ key ] = value
     end
   end
-  
+
   def gradient=( line )
     # split into theme (first value) and colors (everything else)
     #  e.g.  diagonal red black
@@ -49,43 +49,6 @@ class Opts
     value
   end
 
-  def generate?
-    get_boolean( 'generate', false )
-  end
-  
-  def list?
-    get_boolean( 'list', false )
-  end
-  
-  def fetch?
-    @hash.has_key?( :fetch_uri ) 
-  end
-  
-  def fetch_uri
-    get( 'fetch_uri', '-fetch uri required-' )
-  end
-  
-  def has_includes?
-    @hash.has_key?( :include )
-  end
-  
-  def includes
-    # fix: use os-agnostic delimiter (use : for Mac/Unix?)
-    has_includes? ? @hash[ :include ].split( ';' ) : []
-  end
-    
-  def manifest  
-    get( 'manifest', 's6.txt' )
-  end
-  
-  def config_path
-    get( 'config_path' )
-  end
-  
-  def output_path
-    get( 'output', '.' )
-  end
-
   def code_engine
     get( 'code-engine' )
   end
@@ -107,6 +70,7 @@ class Opts
     :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 ] )
@@ -132,7 +96,81 @@ private
       (value == true || value =~ /true|yes|on/i) ? true : false
     end
   end
+  
+end  # class Headers
+
+
+class Opts
+  
+  def generate=(value)
+    @generate = value
+  end
+
+  def generate?
+    return false if @generate.nil?   # default generate flag is false
+    @generate == true
+  end
+  
+  def list=(value)
+    @list = value
+  end
+  
+  def list?
+    return false if @list.nil?  # default list flag is false
+    @list == true
+  end
+
+
+  def fetch_uri=(value)
+    @fetch_uri = value
+  end
+
+  def fetch_uri
+    @fetch_uri || '-fetch uri required-'
+  end
+  
+  def fetch?
+    @fetch_uri.nil? ? false : true
+  end
+
+
+  def includes=(value)
+    @includes = value
+  end
+
+  def includes
+    # fix: use os-agnostic delimiter (use : for Mac/Unix?)
+    @includes.nil? ? [] : @includes.split( ';' )
+  end
+  
+  def has_includes?
+    @includes.nil? ? false : true
+  end
+  
+  def manifest=(value)
+    @manifest = value
+  end
+    
+  def manifest
+    @manifest || 's6.txt'
+  end
+  
+  def config_path=(value)
+    @config_path = value
+  end
+  
+  def config_path
+    @config_path
+  end
+    
+  def output_path=(value)
+    @output_path = value
+  end
+  
+  def output_path
+    @output_path || '.'
+  end
 
 end # class Opts
 
-end # module Slideshow
+end # module Slideshow

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  hash: -829632114
+  hash: 689500001
   prerelease: 6
   segments: 
   - 1
   - 1
   - 0
   - beta
-  - 4
-  version: 1.1.0.beta4
+  - 5
+  version: 1.1.0.beta5
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-10 00:00:00 Z
+date: 2012-06-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth