slideshow 1.1.0.beta3 → 1.1.0.beta4

data/Rakefile

@@ -16,7 +16,7 @@ Hoe.spec 'slideshow' do
     ['markdown','>= 0.3.0'],
     ['textutils','>= 0.2.0'],
     ['fetcher','>= 0.1.0'],
-    ['props','>= 0.1.0']
+    ['props','>= 0.2.0']
   ]
   
   self.remote_rdoc_dir = 'doc'

data/config/slideshow.builtin.yml

@@ -1,38 +1,8 @@
-### builtin configuration for arrays
-#
-#  access or overwrite using nested builtin context e.g.
-#  builtin:
-#    textile:
-#        libs: [ whatever ]
+####################
+### builtin configuration (not configurable by user now)
 
 
 helper:
   unparsed: [ slide, style ]
   renames: [ include, class ]
   exprs: [ class, clear ]
-
-# text filters  
-filters:
-  - skip-end-directive
-  - directives_bang_style_to_percent_style
-  - directives_percent_style
-  - comments-percent-style 
-  - leading-headers
-  - erb-django-style
-  - erb-rename-helper-hack
-  - dump_content_to_file_debug_text_erb
-  - erb
-  - code-block-curly-style
-  - dump_content_to_file_debug_text
-
-
-# markup (textile, markdown, rest) config
-    
-textile:
-  extnames: [ .textile, .t ]
-  
-rest:  
-  extnames: [ .rst, .rest ]
-    
-markdown:
-  extnames: [ .markdown, .m, .mark, .mkdn, .md, .txt, .text ]

data/config/slideshow.yml

@@ -1,22 +1,25 @@
-# built-in slideshow configuration
+#########################################
+# slideshow configuration defaults
 #
-# override settings in:
-#  ~/.slideshow/slideshow.yml
-# or
-#  ./slideshow.yml or ./.slideshow.yml
+#   override settings in:
+#     ~/slideshow.yml in home folder
+#        or
+#     ./slideshow.yml in working folder
 
-#lets you define default/fallback headers
+
+######################
+# lets you define default/fallback headers
 
 headers:
-  generator: <%= Slideshow.generator %> 
+  generator: "<%= Slideshow.generator %>"
   author:  Your Name Here
   email:   Your Email Here
   company: Your Company Here
   title:   Your Title Here
   subtitle: Your Subtitle Here
   footer: Your Footer Here
-  subfooter: Your Subfooter Here 
-  date:  <%= Date.today %>
+  subfooter: Your Subfooter Here
+  date:  "<%= Date.today %>"
 
   # todo: use nested config?? eg.
   # gradient:
@@ -36,39 +39,54 @@ headers:
 
 
 
-# shortcuts for fetching template packs
-#   map shortcut to URI
-    
-fetch:
-    s6syntax: https://github.com/geraldb/slideshow-s6-syntax-highlighter/raw/master/s6syntax.txt
-    s6blank: https://github.com/geraldb/slideshow-s6-blank/raw/master/s6blank.txt
-    s5blank: https://github.com/geraldb/slideshow-s5-blank/raw/master/s5blank.txt
-    s5themes: https://github.com/geraldb/slideshow-s5-themes/raw/master/s5themes.txt
-    fullerscreen: https://github.com/geraldb/slideshow-fullerscreen/raw/master/fullerscreen.txt
-    slidy: https://github.com/geraldb/slideshow-slidy/raw/master/slidy.txt
-    g5: https://github.com/geraldb/slideshow-google-html5-slides/raw/master/g5.txt
-    slippy: https://github.com/geraldb/slideshow-slippy/raw/master/slippy.txt
-    csss: https://github.com/geraldb/slideshow-csss/raw/master/csss.txt
-    deck.js: https://github.com/geraldb/slideshow-deck.js/raw/master/deck.js.txt
-    impress.js: https://github.com/geraldb/slideshow-impress.js/raw/master/impress.js.txt
-    shower: https://github.com/geraldb/slideshow-shower/raw/master/shower.txt
 
 # your google analytics code  
 analytics:
-    google: UA-XXX
-    
+  google: UA-XXX
 
-helper:
-  renames: []
-  exprs: []
 
-### markup (textile, markdown) config
+########################################################3
+### text/markup (textile, markdown) processing config
 
 # filters to run before markup processing
-filters: []
-    
+filters:
+  - skip-end-directive
+  - directives_bang_style_to_percent_style
+  - directives_percent_style
+  - comments-percent-style 
+  - leading-headers
+  - erb-django-style
+  - erb-rename-helper-hack
+  - dump_content_to_file_debug_text_erb
+  - erb
+  - code-block-curly-style
+  - dump_content_to_file_debug_text
+
+
+# markup (textile, markdown, rest) config
+
 textile:
-  extnames: []
-  
-markdown:
-  extnames: []
+  extnames: [ .textile, .t ]
+
+rest:
+  extnames: [ .rst, .rest ]
+
+# NB: markdown now configured in markdown.yml (using markdown gem)
+
+
+#############################
+# shortcuts for fetching template packs
+#   map shortcut to URI
+fetch:
+  s6syntax: https://github.com/geraldb/slideshow-s6-syntax-highlighter/raw/master/s6syntax.txt
+  s6blank: https://github.com/geraldb/slideshow-s6-blank/raw/master/s6blank.txt
+  s5blank: https://github.com/geraldb/slideshow-s5-blank/raw/master/s5blank.txt
+  s5themes: https://github.com/geraldb/slideshow-s5-themes/raw/master/s5themes.txt
+  fullerscreen: https://github.com/geraldb/slideshow-fullerscreen/raw/master/fullerscreen.txt
+  slidy: https://github.com/geraldb/slideshow-slidy/raw/master/slidy.txt
+  g5: https://github.com/geraldb/slideshow-google-html5-slides/raw/master/g5.txt
+  slippy: https://github.com/geraldb/slideshow-slippy/raw/master/slippy.txt
+  csss: https://github.com/geraldb/slideshow-csss/raw/master/csss.txt
+  deck.js: https://github.com/geraldb/slideshow-deck.js/raw/master/deck.js.txt
+  impress.js: https://github.com/geraldb/slideshow-impress.js/raw/master/impress.js.txt
+  shower: https://github.com/geraldb/slideshow-shower/raw/master/shower.txt

data/lib/slideshow.rb

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

data/lib/slideshow/config.rb

@@ -3,69 +3,72 @@ module Slideshow
 class Config
   
   def initialize
-    @hash = {}
+    # do nothing for now
   end
 
-  def []( key )
-    value = @hash[ normalize_key( key ) ]
-    if value.nil?
-      puts "** Warning: config key '#{key}' undefined (returning nil)"
-    end
+  def load
     
-    value
-  end
-
-  def load   
     # load builtin config file @  <gem>/config/slideshow.yml
-    config_file         = "#{Slideshow.root}/config/slideshow.yml"
-    config_builtin_file = "#{Slideshow.root}/config/slideshow.builtin.yml"
+    #
+    # NB: builtin use a different hierachy (not linked to default/home/user/cli props)
+    #     for now builtin has no erb processing
+    #     user cannot override builtin settings (only defaults see below)
+    props_builtin_file  = File.join( Slideshow.root, 'config', 'slideshow.builtin.yml' )
+    @props_builtin = Props.load_file( props_builtin_file )
 
-    # run through erb        
-    config_txt = File.read( config_file )
-    config_txt = ERB.new( config_txt ).result( binding() )
-    
-    @hash = YAML.load( config_txt )
-    
-    # for now builtin has no erb processing; add builtin hash to main hash 
-    @hash[ 'builtin' ] = YAML.load_file( config_builtin_file )
-    
-    # todo/fix: merge config files
-    #   check more locations
 
-    # check for user settings in working folder (check for slideshow.yml)
+    props_default_file  = File.join( Slideshow.root, 'config', 'slideshow.yml' )
+    @props = @props_default = Props.load_file_with_erb( props_default_file, binding() )
+
+    # check for user settings (slideshow.yml) in home folder
+    
+    props_home_file = File.join( Env.home, 'slideshow.yml' )
+    if File.exists?( props_home_file )
+      puts "Loading settings from '#{props_home_file}'..."
+      @props = @props_home = Props.load_file_with_erb( props_home_file, binding(), @props )
+    end
+      
+    # check for user settings (slideshow.yml) in working folder
     
-    config_user_file = "./slideshow.yml"
-    if File.exists?( config_user_file )
-      puts "Loading settings from '#{config_user_file}'..."
-      @hash[ 'user' ] = YAML.load_file( config_user_file )   
-    end    
-     
+    props_work_file = File.join( '.', 'slideshow.yml' )
+    if File.exists?( props_work_file )
+      puts "Loading settings from '#{props_work_file}'..."
+      @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
+
   def markdown_post_processing?( lib )
-    @hash.fetch( 'user', {} ).fetch( lib, {} ).fetch( 'post-processing', true )
+    ## todo: normalize key/lib???
+    @props.fetch_from_section( lib, 'post-processing', true )
   end
   
   def known_rest_extnames
-    @hash[ 'builtin' ][ 'rest' ][ 'extnames' ]
+    @props.fetch_from_section( 'rest', 'extnames', [] )
   end
   
   def known_textile_extnames
-    # returns an array of known file extensions e.g.
-    # [ '.textile', '.t' ]
-    #
-    # using nested key
-    # textile:
-    #   extnames:  [ .textile, .t ]
-    
-    @hash[ 'textile' ][ 'extnames' ] + @hash[ 'builtin' ][ 'textile' ][ 'extnames' ] 
+    @props.fetch_from_section( 'textile', 'extnames', [] )
   end
 
   def known_markdown_extnames
-    @hash[ 'markdown' ][ 'extnames' ] + @hash[ 'builtin' ][ 'markdown' ][ 'extnames' ]   
+    ## delegate config to Markdown gem for now
+    ## todo/fix: how to pass on setting to Markdown gem??
+    Markdown.extnames
   end
   
   def known_extnames
+    # returns an array of known file extensions e.g.
+    # [ '.textile', '.t' ]
+    #
+    # using nested key
+    # textile:
+    #   extnames:  [ .textile, .t ]
+    #
     # ruby check: is it better self. ?? or more confusing
     #  possible conflict only with write access (e.g. prop=) 
     
@@ -73,32 +76,36 @@ class Config
   end
   
   def text_filters
-    @hash[ 'builtin' ][ 'filters' ] + @hash[ 'filters' ]
+    @props.fetch( 'filters', [] )
+  end
+  
+  def google_analytics_code
+    @props.fetch_from_section( 'analytics', 'google', nil )
   end
   
+  def map_fetch_shortcut( key )
+    ## todo: normalize key???
+    @props.fetch_from_section( 'fetch', key, nil )
+  end
+
   def helper_renames
-     @hash[ 'builtin' ][ 'helper' ][ 'renames' ] + @hash[ 'helper' ][ 'renames' ]
+    ## NB: for now user cannot override/extent renames
+    @props_builtin['helper']['renames']
   end
 
   def helper_unparsed
+    ## NB: for now user cannot override/extent unparsed helpers
     # use unparsed params (passed along a single string)
-    @hash[ 'builtin' ][ 'helper' ][ 'unparsed' ]
+    @props_builtin['helper']['unparsed']
   end
   
   def helper_exprs
+    ## NB: for now user cannot override/extent helper exprs
     # allow expression as directives (no need for %end block)
     # by default directives are assumed statements (e.g. %mydir  %end)
-    @hash[ 'builtin' ][ 'helper' ][ 'exprs' ] + @hash[ 'helper' ][ 'exprs' ]
+    @props_builtin['helper']['exprs']
   end
 
-  def google_analytics_code
-    @hash[ 'analytics' ][ 'google' ]
-  end
-  
-  def map_fetch_shortcut( key )
-    @hash[ 'fetch' ][ key ]
-  end
-  
 private
 
   def normalize_key( key )

data/lib/slideshow/gen.rb

@@ -5,8 +5,9 @@ class Gen
   def initialize
     @logger = Logger.new(STDOUT)
     @logger.level = Logger::INFO
-    @opts   = Opts.new
+
     @config = Config.new
+    @opts   = Opts.new( @config )
   end
 
   attr_reader :logger, :opts, :config
@@ -14,6 +15,7 @@ class Gen
   
   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
 

data/lib/slideshow/opts.rb

@@ -5,8 +5,9 @@ module Slideshow
 
 class Opts
   
-  def initialize
-    @hash = {}
+  def initialize( config )
+    @hash   = {}
+    @config = config
   end
     
   def put( key, value )
@@ -35,18 +36,17 @@ class Opts
   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
-  
-    
+  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"
-      "- #{key} not found -"
-    else
-      value 
+      value = "- #{key} not found -"
     end
+    value
   end
 
   def generate?

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  hash: 1059591029
+  hash: -829632114
   prerelease: 6
   segments: 
   - 1
   - 1
   - 0
   - beta
-  - 3
-  version: 1.1.0.beta3
+  - 4
+  version: 1.1.0.beta4
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-09 00:00:00 Z
+date: 2012-06-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
@@ -91,12 +91,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 23
         segments: 
         - 0
-        - 1
+        - 2
         - 0
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency