slideshow 0.9.11 → 1.0.0

data/config/slideshow.yml

@@ -40,16 +40,19 @@ headers:
 #   map shortcut to URI
     
 fetch:
-    s6gradients: http://github.com/geraldb/slideshow-s6-gradients/raw/master/s6gradients.txt
-    s6syntax: http://github.com/geraldb/slideshow-s6-syntax-highlighter/raw/master/s6syntax.txt
-    s6blank: http://github.com/geraldb/slideshow-s6-blank/raw/master/s6blank.txt
-    s5blank: http://github.com/geraldb/slideshow-s5-blank/raw/master/s5blank.txt
-    s5themes: http://github.com/geraldb/slideshow-s5-themes/raw/master/s5themes.txt
-    fullerscreen: http://github.com/geraldb/slideshow-fullerscreen/raw/master/fullerscreen.txt
-    slidy: http://github.com/geraldb/slideshow-slidy/raw/master/slidy.txt
-    g5: http://github.com/geraldb/slideshow-google-html5-slides/raw/master/g5.txt
-    slippy: http://github.com/geraldb/slideshow-slippy/raw/master/slippy.txt
-  
+    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

data/lib/slideshow.rb

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

data/lib/slideshow/filters/debug_filter.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Slideshow
   module DebugFilter
 

data/lib/slideshow/filters/headers_filter.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Slideshow
   module HeadersFilter
 

data/lib/slideshow/filters/slide_filter.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Slideshow
   module SlideFilter
 

data/lib/slideshow/filters/text_filter.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # builtin text filters
 # called before text_to_html
 #

data/lib/slideshow/gen.rb

@@ -203,25 +203,37 @@ class Gen
       slide_source = ""            # reset slide source buffer 
     end
 
+
     ## split slide source into header (optional) and content/body
-    ## plus check for (css style) classes
+    ## plus check for (css style) classes and data attributes
 
     slides2 = []
     slides.each do |slide_source|
       slide = Slide.new
 
-      ## check for css style classes    
+      ## check for css style classes
       from = 0
       while (pos = slide_source.index( /<!-- _S9(SLIDE|STYLE)_(.*?)-->/m, from ))
         logger.debug "  adding css classes from pi #{$1.downcase}: #{$2.strip}"
 
+        from = Regexp.last_match.end(0)  # continue search later from here
+        
+        values = $2.strip.dup
+        
+        # remove data values (eg. x=-20 scale=4) and store in data hash
+        values.gsub!( /([-\w]+)[ \t]*=[ \t]*([-\w\.]+)/ ) do |_|
+          logger.debug "    adding data pair: key=>#{$1.downcase}< value=>#{$2}<"
+          slide.data[ $1.downcase.dup ] = $2.dup
+          " "  # replace w/ space
+        end
+        
+        values.strip!  # remove spaces  # todo: use squish or similar and check for empty string
+                
         if slide.classes.nil?
-          slide.classes = $2.strip
+          slide.classes = values
         else
-          slide.classes << " #{$2.strip}"
+          slide.classes << " #{values}"
         end
-      
-        from = Regexp.last_match.end(0)
       end
        
        # try to cut off header using non-greedy .+? pattern; tip test regex online at rubular.com

data/lib/slideshow/helpers/background_helper.rb

@@ -20,34 +20,30 @@ def gradient_from_headers( *args )
   elsif theme == 'left-right'
     buf << "linear-gradient( left, #{colors.join(', ')} )"
   elsif theme == 'repeat'
-    buf << "repeating-linear-gradient( -60deg, "
-    # quick and dirty hack - for now repeat colors 10 times
-    9.times { buf << "#{colors.join(', ')}, " }
-    buf << "#{colors.join(', ')} )"
+    buf << "repeating-linear-gradient( -60deg, #{colors.join(', ')} 10% )"
   elsif theme == 'radial'
     buf << "radial-gradient( #{colors.join(', ')} )"
   elsif theme == 'radial-off-center'
     buf << "radial-gradient( 70% 70%, ellipse, #{colors.join(', ')} )"
   elsif theme == 'radial-repeat'
-    buf << "repeating-radial-gradient( 60% 60%, ellipse, "
-    # quick and dirty hack - for now repeat colors 10 times
-    9.times { buf << "#{colors.join(', ')}, " }
-    buf << "#{colors.join(', ')} )"
+    buf << "repeating-radial-gradient( 60% 60%, ellipse, #{colors.join(', ')} 10% )"
   else
     buf << "linear-gradient( #{colors.join(', ')} )"
     puts "warning: unknown gradient themes #{theme} - falling back to default"
   end
 
-  # todo: add value for headers to puts
   puts "  Adding CSS for gradient background style rule using headers..."
+  puts "    gradient-theme: #{theme}"
+  puts "    gradient-colors: #{colors.join(' ')}"
+  
   content_for( :css, <<-EOS )
      /****
-       * generated by gradient_from_headers helper 
+       * generated by gradient_from_headers helper; using headers: 
        *   gradient-theme: #{theme}
        *   gradient-colors: #{colors.join(' ')}
        */
     .slide    { background-image: -webkit-#{buf};
-                background-image: -mozilla-#{buf};
+                background-image: -moz-#{buf};
                 background-image: -ms-#{buf};
                 background-image: -o-#{buf};
                 background-image: #{buf};
@@ -64,38 +60,19 @@ def gradient( *args )
 
   clazz = opts[:class] || ( 's9_gradient_linear_'+colors.join('_').gsub( /[(), ]/, '_' ).gsub( /_{2,}/, '_').gsub( /[^-\w]/, '' ) )
 
-  ## generate code for webkit
 
-  webkit  = ""
-  webkit << "-webkit-gradient(linear, 0% 0%, 0% 100%, "
-  webkit << "from(#{colors.first}), to(#{colors.last})"
+  ## generate code
   
-  # check for additional stop colors
-  more_colors = colors[ 1..-2 ] 
-  more_colors.each_with_index do |color, i|
-    webkit << ", color-stop(#{(1.0/(more_colors.size+1))*(i+1)},#{color})"     
-  end 
-  webkit  << ")"
-
-  ## generate code for mozilla
-
-  mozilla  = ""
-  mozilla << "-moz-linear-gradient(top, "
-  mozilla << "#{colors.first}, "  
-
-  # check for additional stop colors
-  more_colors = colors[ 1..-2 ] 
-  more_colors.each do |color|
-    mozilla << "#{color}, "     
-  end 
-
-  mozilla << "#{colors.last})"
+  buf  = "linear-gradient(top, #{colors.join(', ')} )"
  
 
   puts "  Adding CSS for background style rule..."  
   content_for( :css, <<-EOS )
-    .#{clazz} { background: #{webkit};
-                background: #{mozilla};
+    .#{clazz} { background-image: -webkit-#{buf};
+                background-image: -moz-#{buf};
+                background-image: -ms-#{buf};
+                background-image: -o-#{buf};
+                background-image: #{buf};
               }
   EOS
 

data/lib/slideshow/slide.rb

@@ -1,6 +1,26 @@
 module Slideshow
 
-  class Slide < Struct.new(:header, :content, :classes)
+  class Slide
+  
+    attr_accessor :header
+    attr_accessor :content
+    attr_accessor :classes
+    attr_accessor :data
+  
+    def initialize
+      @header  = nil
+      @content = nil
+      @classes = nil
+      @data    = {}
+    end
+
+    def data_attributes
+      buf = ""
+      @data.each do | key,value |
+        buf << "data-#{key}='#{value}' "
+      end
+      buf
+    end 
   
     def to_classic_html
        
@@ -19,14 +39,14 @@ module Slideshow
     def to_google_html5
       
       buf  = ""
-      buf << "<div class='slide'>\n"      
+      buf << "<div class='slide'>\n"
 
       if header
         buf << "<header>#{header}</header>\n"
       end
       
       buf << "<section class='"
-      buf << classes      if classes      
+      buf << classes      if classes
       buf << "'>\n"
       
       buf << content      if content

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 23
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 9
-  - 11
-  version: 0.9.11
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-21 00:00:00 +01:00
+date: 2012-03-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency