slideshow 0.9.9 → 0.9.10

data/bin/slideshow

@@ -2,4 +2,4 @@
 require 'rubygems'
 require 'slideshow'
 
-Slideshow.main
+Slideshow.main

data/lib/slideshow.rb

@@ -55,7 +55,7 @@ require 'slideshow/filters/slide_filter'
 
 module Slideshow
 
-  VERSION = '0.9.9'
+  VERSION = '0.9.10'
 
   # version string for generator meta tag (includes ruby version)
   def Slideshow.generator

data/lib/slideshow/filters/headers_filter.rb

@@ -28,14 +28,11 @@ def leading_headers( content_with_headers )
       read_headers = false
       content << line
     end
-  end
-
-  # fix: do a merge w/ config instead, possible??
-  opts.set_defaults  
+  end 
 
   puts "  Reading #{headers.length} headers: #{headers.join(', ')}..."
 
-  content  
+  content
 end
   
 end  # module HeadersFilter
@@ -43,4 +40,4 @@ end # module Slideshow
 
 class Slideshow::Gen
   include Slideshow::HeadersFilter
-end
+end

data/lib/slideshow/helpers/background_helper.rb

@@ -1,6 +1,33 @@
 module Slideshow
   module BackgroundHelper
 
+def gradient_from_headers( *args )
+
+  return "" unless headers.has_gradient?   # do nothing if use hasn't set gradient headers (ignore defaults)
+
+  # lets you use headers (gradient, gradient-theme, gradient-colors)
+  #  to define gradient (see http://slideshow.rubyforge.org/themes.html for predefined themes)
+  
+  theme  = headers[ :gradient_theme ]
+  colors = headers[ :gradient_colors ].split( ' ' )  # colors as space separated all-in-one string
+  
+  # fix: first version - ignore theme for now
+  # todo: add support for theme
+
+  buf = "linear-gradient( #{colors.join(',') } )"
+ 
+
+  # todo: add value for headers to puts
+  puts "  Adding CSS for gradient background style rule using headers..."
+  content_for( :css, <<-EOS )
+    .slide    { background-image: -webkit-#{buf};
+                background-image: -mozilla-#{buf};
+                background-image: -ms-#{buf};
+                background-image: -o-#{buf};
+                background-image: #{buf};
+              }
+  EOS
+end
 
 def gradient( *args )
 

data/lib/slideshow/opts.rb

@@ -20,24 +20,27 @@ class Opts
     end
   end
   
-  def gradient=( value )
-    put_gradient( value, :theme, :color1, :color2 )
-  end
-  
-  def gradient_colors=( value )
-    put_gradient( value, :color1, :color2 )
-  end
-
-  def gradient_color=( value )
-    put_gradient( value, :color1 )
+  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 gradient_theme=( value )
-    put_gradient( value, :theme )
+  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 = @hash[ normalize_key( key ) ]
+    value = get( key )
     if value.nil?
       puts "** Warning: header '#{key}' undefined"
       "- #{key} not found -"
@@ -55,7 +58,7 @@ class Opts
   end
   
   def fetch?
-    get( 'fetch_uri', nil ) != nil
+    @hash.has_key?( :fetch_uri ) 
   end
   
   def fetch_uri
@@ -63,7 +66,7 @@ class Opts
   end
   
   def has_includes?
-    @hash[ :include ]
+    @hash.has_key?( :include )
   end
   
   def includes
@@ -76,7 +79,7 @@ class Opts
   end
   
   def config_path
-    get( 'config_path', nil )
+    get( 'config_path' )
   end
   
   def output_path
@@ -84,11 +87,11 @@ class Opts
   end
 
   def code_engine
-    get( 'code-engine', DEFAULTS[ :code_engine ] )
+    get( 'code-engine' )
   end
   
   def code_txmt
-    get( 'code-txmt', DEFAULTS[ :code_txmt ])
+    get( 'code-txmt' )
   end
 
 
@@ -97,41 +100,32 @@ class Opts
     :title             => 'Untitled Slide Show',
     :footer            => '',
     :subfooter         => '',
-    :gradient_theme    => 'dark',
-    :gradient_color1   => 'red',
-    :gradient_color2   => 'black',
+    :gradient_theme    => 'diagonal',
+    :gradient_colors   => 'red black',
 
     :code_engine       => 'sh',  # SyntaxHighligher (sh) | ultraviolet (uv) | coderay (cr)
     :code_txmt         => 'false', # Text Mate Hyperlink for Source?
   }
 
-  def set_defaults      
-    DEFAULTS.each_pair do | key, value |
-      @hash[ key ] = value if @hash[ key ].nil?
+  def get( key, default=nil )
+    key = normalize_key(key)
+    value = @hash.fetch( key, DEFAULTS[ key ] )
+    if value.nil?
+      default
+    else
+      value
     end
   end
 
-  def get( key, default )
-    @hash.fetch( normalize_key(key), default )
-  end
-
 private
 
   def normalize_key( key )
     key.to_s.downcase.tr('-', '_').to_sym
   end
-  
-  # Assigns the given gradient-* keys to the values in the given string.
-  def put_gradient( string, *keys )
-    values = string.split( ' ' )
-
-    values.zip(keys).each do |v, k|
-      @hash[ normalize_key( "gradient-#{k}" ) ] = v.tr( '-', '_' )
-    end
-  end
-  
+    
   def get_boolean( key, default )
-    value = @hash[ normalize_key( key ) ]
+    key = normalize_key( key )
+    value = @hash.fetch( key, DEFAULTS[ key ] )
     if value.nil?
       default
     else

data/templates/slides.html.erb

@@ -7,6 +7,11 @@
 <meta name="generator" content="<%= @headers['generator'] %>">
 <meta name="author"    content="<%= @headers['author']%>" >
 
+<!-- helper/macro that lets you add (CSS3) gradient using headers
+     see http://slideshow.rubyforge.org/themes.html
+     
+  <%=  gradient_from_headers() %>   -->
+
 <!-- S6 style sheet links -->
 <link rel="stylesheet" href="<%= "#{@name}.css" %>" media="projection" id="styleProjection">
 <link rel="stylesheet" href="s6/screen.css"         media="screen"     id="styleScreen">

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 47
   prerelease: false
   segments: 
   - 0
   - 9
-  - 9
-  version: 0.9.9
+  - 10
+  version: 0.9.10
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-06 00:00:00 +01:00
+date: 2012-02-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency