slideshow-models 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7c495dbff4118e7db27edcc657493e04f0da5c9
-  data.tar.gz: 2b4f190a814eb0cfbdf42f846d50e974e2e06487
+  metadata.gz: b621853de6619c00eb51f0ec88ad1ae89c9ddecb
+  data.tar.gz: b552e40f59f0524fde019ee3c85e8f1d5835aa38
 SHA512:
-  metadata.gz: 5daad9297ada4ec336eac0ac4bfe80a4bc3b300479c9ccca1cf11c42ac60bd3a38309a3ea61c77807b4cf0848963c74ff16ce8d0410814717c5d4299dfd5a95c
-  data.tar.gz: ce799acaa508fc3a185c6352b00718c5f030bbb1bbb0429b7eca9554530c831546f392ff17a346f9c5d6b454ffc1d4b2f3c26a47e53b26b8927d43dc863960b4
+  metadata.gz: 15234f03210c70adae3370017077e80fab96cba607b9476f0e5b100c73bcfda81a8a26d4046195525f31e9a96d8f4f63d31ed47a4ae0ebbe4eb3591a92f5eb0a
+  data.tar.gz: 90d8e8ab65594cf2b340ca9656aec522c695ce2d445c268bc09acf18019e939859d60b2135f8b0a9bd685d465f8b311c46829595f1451f3892ea7a316aed2a51

data/Manifest.txt

@@ -44,6 +44,7 @@ test/templates/test/test.html
 test/templates/test/test.txt
 test/test_build.rb
 test/test_build_deck.rb
+test/test_filter.rb
 test/test_kramdown.rb
 test/test_slide.rb
 test/test_version.rb

data/lib/slideshow/models/deck.rb

@@ -5,6 +5,14 @@ module Slideshow
 
 module DeckFilter
 
+
+##
+## note/todo: more alternatives/options for slide breaks
+##
+##  add a simple slide break rule for two or more blank lines
+
+
+
 # add slide directive before h1 (tells slideshow gem where to break slides)
 #
 # e.g. changes:
@@ -45,31 +53,23 @@ def add_slide_directive_before_h2( content )
 end
 
 
-
-# add slide directive before div h1 (for pandoc-generated html)
-#
-# e.g. changes:
-# <div id='header'>
-# <h1 id='optional' class='optional'>
-#  to
-#  html comment -> _S9SLIDE_ 
-# <div id='header'>
-# <h1 id='optional' class='optional'>
-
-
-def add_slide_directive_before_div_h1( content )
+def add_slide_directive_for_hr( content )
 
   slide_count = 0
 
-  content = content.gsub( /<div[^>]*>\s*<h1/ ) do |match|
+  ##  replace <hr> or <hr /> with slide directive/comment
+  ##  note: hr gets **replaced/removed**
+
+  content = content.gsub( /<hr(\s*\/)?>/ ) do |match|
     slide_count += 1
-    "\n<!-- _S9SLIDE_ -->\n#{Regexp.last_match(0)}" 
+    "\n<!-- _S9SLIDE_ -->\n"
   end
-
-  puts "  Adding #{slide_count} slide breaks (using div_h1 rule)..."
-
+  
+  puts "  Adding #{slide_count} slide breaks (using hr rule)..."
+  
   content
 end
+
     
 end # module DeckFilter
 
@@ -85,7 +85,7 @@ class Deck
   attr_accessor :slides
   
 
-  def initialize( source, header_level: 1, use_slide: false )
+  def initialize( source, header_level: 2, use_slide: false )
     @source = source  ## keep a copy of the original source (input)
 
     @header_level = header_level   # e.g. 1 or 2   -- todo/fix: allow more options e.g. 1..2 etc.
@@ -107,10 +107,17 @@ class Deck
     if @use_slide  # only allow !SLIDE directives fo slide breaks?
        # do nothing (no extra automagic slide breaks wanted)
     else  
-      if @header_level == 2
-        @content = add_slide_directive_before_h2( @content )
-      else # assume level 1
+
+      ## default rule for horizontal line/rule <hr> - gets replaced by slide directive
+      ##  - for now alway on/used  (use !SLIDE only if not wanted for now)
+      @content = add_slide_directive_for_hr( @content )
+
+      if @header_level == 1
         @content = add_slide_directive_before_h1( @content )
+      else # assume level 2
+        ## note: level 2 also turns level 1 into slide breaks
+        @content = add_slide_directive_before_h1( @content )
+        @content = add_slide_directive_before_h2( @content )
       end
     end
 

data/lib/slideshow/models/slide.rb

@@ -17,7 +17,7 @@ module Slideshow
      
     ### def to_drop() SlideDrop.new( self ); end  -- add - why? why not??
   
-    def initialize( content, header_level: 1 )
+    def initialize( content, header_level: 2 )
       ## options
       @header_level = header_level
       
@@ -66,16 +66,17 @@ module Slideshow
       # tip test regex online at rubular.com
       #  note/fix: needs to get improved to also handle case for h1 wrapped into div
 
-      if @header_level == 2
-        pattern = /^(.*?)(<h2.*?>.*?<\/h2>)(.*)/m
-      else # assume header level 1
+      if @header_level == 1
         pattern = /^(.*?)(<h1.*?>.*?<\/h1>)(.*)/m
+      else # assume header level 2
+        ## note: header_level 2 also incl. header_level 1 slides
+        pattern = /^(.*?)(<(?:h1|h2).*?>.*?<\/(?:h1|h2)>)(.*)/m
       end
 
       if @content =~ pattern
         @header  = $2
         @content_without_header = ($1 ? $1 : '') + ($3 ? $3 : '')
-        logger.debug "  adding slide with header (h1):\n#{@header}"
+        logger.debug "  adding slide with header:\n#{@header}"
       else
         @header = nil    # todo: set to '' empty string? why not?
         @content_without_header = @content

data/lib/slideshow/opts.rb

@@ -11,7 +11,7 @@ class Opts
   
   def header_level
     ## todo: check   0 is not nil?
-    @header_level || 1
+    @header_level || 2        ## note: (new) default is 2  -- note: 2 also breaks on 1 
   end
 
   def slide=(boolean)

data/lib/slideshow/version.rb

@@ -3,8 +3,8 @@
 module Slideshow
 
   MAJOR = 3
-  MINOR = 1
-  PATCH = 1
+  MINOR = 2
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/test_filter.rb

@@ -0,0 +1,49 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_filter.rb
+
+
+require 'helper'
+
+
+class TestFilter < MiniTest::Test
+
+include Slideshow::DeckFilter
+
+def test_slide_breaks_for_hr
+
+  content =<<EOS
+
+<p>some text</p>
+<hr />
+<p>some text</p>
+<hr>
+<p>some text</p>
+
+EOS
+
+  content_expected =<<EOS
+
+<p>some text</p>
+
+<!-- _S9SLIDE_ -->
+
+<p>some text</p>
+
+<!-- _S9SLIDE_ -->
+
+<p>some text</p>
+
+EOS
+
+
+  assert_equal content_expected, add_slide_directive_for_hr( content )
+
+end  # method test_slide_breaks_for_hr
+  
+
+
+end # class TestFilter
+

data/test/test_slide.rb

@@ -37,7 +37,37 @@ EOS
   assert_equal nil, slide.classes
   assert_equal nil, slide.data_attributes
   
-end  # method test_slide
+end  # method test_slide1
+
+
+def test_slide2
+  
+  content =<<EOS
+<h2 id="test-header-2">test header 2</h2>
+
+<p>test content 2</p>
+EOS
+  
+  slide = Slideshow::Slide.new( content, header_level: 2 )
+  
+  puts "header:"
+  pp slide.header
+  puts "content:"
+  pp slide.content
+  puts "content_without_header:"
+  pp slide.content_without_header
+  puts "classes:"
+  pp slide.classes
+  puts "data_attributes:"
+  pp slide.data_attributes
+  
+  assert_equal %Q{<h2 id="test-header-2">test header 2</h2>}, slide.header
+  assert_equal content, slide.content
+  assert_equal nil, slide.classes
+  assert_equal nil, slide.data_attributes
+  
+end  # method test_slide2
+
 
 
 end # class TestSlide

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slideshow-models
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-08 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -177,6 +177,7 @@ files:
 - test/templates/test/test.txt
 - test/test_build.rb
 - test/test_build_deck.rb
+- test/test_filter.rb
 - test/test_kramdown.rb
 - test/test_slide.rb
 - test/test_version.rb