hyla 1.0.5 → 1.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDNjYTcyYThjMmIwMzgzZmEzNmU5YThkNTNmNjFlNmI2ZjM1ODhlMQ==
+    MDFkMzdiMWQyZmI5ODlhOWUwYzM5MDQ3NDViMTllOWEyMmNlMDBjNw==
   data.tar.gz: !binary |-
-    NDEwZDAzOGU1ODQxNmY3YzZlOGUyYzY1NGM3YmQwMTZlNDAzN2E5MA==
+    YzYyMjU2ZjRlOWExYzQ4YjA3YjdhNjExZjc2YzliNTA1ZDlkNjk3OQ==
 SHA512:
   metadata.gz: !binary |-
-    NDYxOTlmNjk4ZDQ5NjdkYWI4NWY4MDAxYTk5YWU4MDAxOWIwNTVmMzcxYWE0
-    OWNjYjYzODFhMDNkZDBmYzkwYzQzNjMyNTY4MmM2MDI3M2I5YWJhY2EyYjRk
-    ODMzZDc1MWU2MmI2YmI5ODE0ZDA4ZjVjYmU1MTdmNTU1NzI5NTg=
+    YzdkZGE4NmYzYWRiMDM4YmQ3ZjdhZDg2Y2YxN2ZiOTkyNWUxMTEzZGVkMGIw
+    M2E2YzlhNjlmYTMyMDZjZmFkMmY0NmI1NWM2MmNmMTNmMGQxODZlMmVjMmQ0
+    NTEyODY2ZWM5MmI5ZjVjMzE2NThjOTA4OGI3ODAyMGQ2YWRlODA=
   data.tar.gz: !binary |-
-    ZTc1NDRiMDIzZjNlMzJiZWIzZmUyZWUzYWRkOWJjMTdlNTkyYzMwNzhhMDJm
-    YTMxNzQ4MWIyMjI0MjcwNTBkMDA3MWFjNDhhMmEzYzVhZGI3MTg0MDQ0YjU5
-    ZWExZWU3NDkyNGJkNThjZWNkZTFiNGQzMDZiNjM5MGZjMWUyN2Q=
+    ZWQ3ZTFhYTliMDBmOWY0ODE1Yjk5ZjUzMjNmY2IxNDY0MjFmMTJlYjMyZmI0
+    MmVmOGI4ZGZlMzQ3YjRkZWZkNTM3MzBlNzk2YjY3ZWZjMGUyZWUxNmFhYzQx
+    OWQ3YWNjMmI1ZjMxMjM4ZDgyN2YzYTI2NmIxZjQ5MjI4ODA2MjI=

data/README.adoc

@@ -67,7 +67,7 @@ And then execute:
 
 **Or** install it yourself as:
 
-    $ gem install hyla -v 1.0.3
+    $ gem install hyla -v 1.0.6
 
 == For Developer's only
 
@@ -79,9 +79,23 @@ And then execute:
 
     gem build hyla.gemspec
     gem install hyla-1.0.x.gem -l
-    gem yank hyla -v 1.0.x
     gem push hyla-1.0.x.gem
 
+== To delete a release pushed to RubyGems (= yank)
+
+    gem yank hyla -v 1.0.x
+
+== To create a release, generate a tagged release and publish it to Gem Repo
+
+    gem build hyla.gemspec
+    gem install hyla-1.0.6.gem
+    git commit -m "Release Hyla 1.0.6" -a
+    git push
+    git tag -a hyla-1.0.6 -m "Release hyla 1.0.6"
+    git push origin hyla-1.0.6
+
+    gem push hyla-1.0.6.gem
+
 == Usage
 
 Open a terminal and move to the folder where you would like to create a new project or develop an existing. As Hyla is command line tool, it will be used with one of the following commands :
@@ -121,6 +135,20 @@ Issue tracker (GitHub):: {issues}
 
 == Changelog
 
+=== v1.0.6 - @cmoulliard
+
+Enhancements / Improvements::
+
+* Add attribute to include additional <scripts/> tags within the HTML generated(link:{issues}74[#74])
+* Exclude lab_assets & lab_assets_solution(link:{issues}73[#73])
+* Add data-state attribute to revealjs slim backend(link:{issues}72[#72])
+* Add possibility to definie the transition style for revealjs(link:{issues}69[#69])
+* It should be possible to define custom theme for revealjs(link:{issues}68[#68])
+
+Bug fixes::
+
+* Snippet tag is added to the parent include file bug(link:{issues}67[#67])
+
 === v1.0.5 - @cmoulliard
 
 New Features::

data/lib/hyla.rb

@@ -23,6 +23,10 @@ require 'safe_yaml'
 require 'asciidoctor'
 require 'asciidoctor/backends/html5'
 # require 'asciidoctor/backends/_stylesheets'
+
+# Added to fix issue with Ruby 2.0 on Windows machine
+require 'em/pure_ruby'
+
 require 'eventmachine'
 require 'em-websocket'
 require 'http/parser'

data/lib/hyla/commands/generate.rb

@@ -41,9 +41,10 @@ module Hyla
 
             merged_options = Configuration[options].deep_merge(new_asciidoctor_option)
 
-            extensions = 'adoc|ad|asciidoc'
+            extensions = 'adoc,ad,asciidoc'
+            excludes = 'lab_assets|lab_assets_solution|code|snippets|templates|generated_content|generated_content_instructor|generated_content_snippet|generated_slideshow|generated_content_pdf|generated_content_students'
 
-            self.asciidoc_to_html(@source, @destination, extensions, merged_options)
+            self.asciidoc_to_html(@source, @destination, extensions, excludes, merged_options)
 
           when 'index2html'
             Hyla.logger.info "Rendering : Asciidoctor Indexed Files to HTML"
@@ -62,10 +63,13 @@ module Hyla
 
             merged_options = Configuration[options].deep_merge(new_asciidoctor_option)
 
+            #
             # Extension(s) of the files containing include directives
+            #
             extensions = 'txt'
+            excludes = 'lab_assets|lab_assets_solution|code|snippets|templates|generated_content|generated_content_instructor|generated_content_snippet|generated_slideshow|generated_content_pdf|generated_content_students'
 
-            self.asciidoc_to_html(@source, @destination, extensions, merged_options)
+            self.asciidoc_to_html(@source, @destination, extensions, excludes, merged_options)
 
           when 'html2pdf'
 
@@ -144,7 +148,7 @@ module Hyla
       #
       # Call Asciidoctor.render function
       #
-      def self.asciidoc_to_html(source, destination, extensions, options)
+      def self.asciidoc_to_html(source, destination, extensions, excludes, options)
 
         # Move to Source directory & Retrieve Asciidoctor files to be processed
         source = File.expand_path source
@@ -173,74 +177,80 @@ module Hyla
         # Delete destination directory (generated_content, ...)
         # FileUtils.rm_rf(Dir.glob(@destination))
 
-        # Search for files using extensions parameter and do the rendering
         adoc_file_paths = []
-        Find.find(current_dir) do |f|
-          if f =~ /.*\.(?:#{extensions})$/
 
-            path_to_source = Pathname.new(source)
-            path_to_adoc_file = Pathname.new(f)
-            relative_path = path_to_adoc_file.relative_path_from(path_to_source).to_s
-            Hyla.logger.debug ">>       Relative path: #{relative_path}"
-            adoc_file_paths << relative_path
+        #
+        # Search for files into the current directory using extensions parameter as filter key
+        # Reject directory specified and do the rendering
+        #
+        files = Dir[current_dir + "/**/*.{" + extensions + "}"].reject { |f| f =~ /\/#{excludes}\// }
 
-            # Get asciidoc file name
-            file_name_processed = path_to_adoc_file.basename
+        #
+        # Check if companion parameter is defined
+        # as we have to modify the AllSlides.txt file
+        # containing as tag name this value [tag=snippet]
+        #
+        if options[:snippet_content] == true
+          files.each do |f|
+            add_tag_to_index_file(f)
+          end
+        end
 
-            #
-            # Create destination dir relative to the path calculated
-            #
-            html_dir = @destination + '/' + File.dirname(relative_path)
-            Hyla.logger.info ">>        Dir of html: #{html_dir}"
-            FileUtils.mkdir_p html_dir
-
-            # Copy Fonts
-            # TODO : Verify if we still need to do that as the FONTS liberation have been moved
-            # TODO : under local lib directory of revealjs
-            # self.cp_resources_to_dir(File.dirname(html_dir), 'fonts')
-
-            # Copy Resources for Slideshow
-            case options[:backend]
-              when 'deckjs'
-                # Copy css, js files to destination directory
-                self.cp_resources_to_dir(File.dirname(html_dir), 'deck.js')
-              when 'revealjs'
-                self.cp_resources_to_dir(File.dirname(html_dir), 'revealjs')
-            end
+        files.each do |f|
+          path_to_source = Pathname.new(source)
+          path_to_adoc_file = Pathname.new(f)
+          relative_path = path_to_adoc_file.relative_path_from(path_to_source).to_s
+          Hyla.logger.debug ">>       Relative path: #{relative_path}"
+          adoc_file_paths << relative_path
 
-            #
-            # Check if companion parameter is defined
-            # as we have to generate a new AllSlides.txt file
-            # containing as tag name this value [snippet]
-            #
-            if options[:snippet_content] == true
-              Hyla.logger.info "Snippet content has been selected. Index file will be modified and modifications will be reverted after asciidoctor processing"
-              add_tag_to_index_file(f)
-            end
+          # Get asciidoc file name
+          file_name_processed = path_to_adoc_file.basename
 
-            #
-            # Render asciidoc to HTML
-            #
-            Hyla.logger.info ">> File to be rendered : #{file_name_processed}"
+          #
+          # Create destination dir relative to the path calculated
+          #
+          html_dir = @destination + '/' + File.dirname(relative_path)
+          Hyla.logger.info ">>        Dir of html: #{html_dir}"
+          FileUtils.mkdir_p html_dir
+
+          # Copy Fonts
+          # TODO : Verify if we still need to do that as the FONTS liberation have been moved
+          # TODO : under local lib directory of revealjs
+          # self.cp_resources_to_dir(File.dirname(html_dir), 'fonts')
+
+          # Copy Resources for Slideshow
+          case options[:backend]
+            when 'deckjs'
+              # Copy css, js files to destination directory
+              self.cp_resources_to_dir(File.dirname(html_dir), 'deck.js')
+            when 'revealjs'
+              self.cp_resources_to_dir(File.dirname(html_dir), 'revealjs')
+          end
 
-            #
-            # Convert asciidoc file name to html file name
-            #
-            html_file_name = file_name_processed.to_s.gsub(/.adoc$|.ad$|.asciidoc$|.index$|.txt$/, '.html')
-            options[:to_dir] = html_dir
-            options[:to_file] = html_file_name
-            options[:attributes] = @attributes_bk
-            Asciidoctor.render_file(f, options)
+          #
+          # Render asciidoc to HTML
+          #
+          Hyla.logger.info ">> File to be rendered : #{file_name_processed}"
 
-            #
-            # Check if companion parameter is defined
-            # as we have to generate a new AllSlides.txt file
-            # containing as tag name this value [companion]
-            #
-            if options[:snippet_content] == true
-              remove_tag_from_index_file(f)
-            end
+          #
+          # Convert asciidoc file name to html file name
+          #
+          html_file_name = file_name_processed.to_s.gsub(/.adoc$|.ad$|.asciidoc$|.index$|.txt$/, '.html')
+          options[:to_dir] = html_dir
+          options[:to_file] = html_file_name
+          options[:attributes] = @attributes_bk
+          Asciidoctor.render_file(f, options)
 
+          # end
+        end
+
+        #
+        # Check if companion parameter is defined
+        # and remove the companion tag from indexed files
+        #
+        if options[:snippet_content] == true
+          files.each do |f|
+            remove_tag_from_index_file(f)
           end
         end
 
@@ -252,6 +262,7 @@ module Hyla
 
       end
 
+
       #
       # CSS Style to be used
       # Default is : asciidoctor.css
@@ -485,7 +496,7 @@ module Hyla
               file_to_processed = [File.expand_path(Dir.getwd), file_name] * '/'
               result = self.extract_file_names(file_to_processed, source)
 
-              result.each do | file_path |
+              result.each do |file_path|
                 if file_path.downcase.include?('title') || file_path.downcase.include?('cover')
                   @cover_path = file_path
                   next
@@ -562,21 +573,41 @@ module Hyla
       end
 
       #
-      # Add snippet tag index file
+      # Add snippet tag to index file with extension .ad[]
+      # as this is not yet the case
       #
       def self.add_tag_to_index_file(index_file)
-        text = File.read(index_file)
-        replace = text.gsub!('[]','[tag=' + Configuration::SNIPPET_TAG + ']')
-        File.open(index_file, "w") { |file| file.puts replace }
+        content = File.read(index_file)
+        #
+        # Modify the content of an index file if
+        # it contains include::file with extension .ad, .adoc or .asciidoc
+        #
+        if content =~ /(\.ad)|(\.adoc)|(\.asciidoc)/
+          replace = content.gsub(/\[/, '[tag=' + Configuration::SNIPPET_TAG)
+          replace_content(index_file, replace)
+        end
       end
 
       #
       # Remove snippet tag from index file
       #
       def self.remove_tag_from_index_file(index_file)
-        text = File.read(index_file)
-        replace = text.gsub!('[tag=' + Configuration::SNIPPET_TAG + ']', '[]')
-        File.open(index_file, "w") { |file| file.puts replace }
+        content = File.read(index_file)
+        #
+        # Modify the content of an index file if
+        # it contains include::file with extension .ad, .adoc or .asciidoc
+        #
+        if content =~ /(\.ad)|(\.adoc)|(\.asciidoc)/
+          replace = content.gsub('[tag=' + Configuration::SNIPPET_TAG, '[')
+          replace_content(index_file, replace)
+        end
+      end
+
+      #
+      # Replace content of a File
+      #
+      def self.replace_content(f, content)
+        File.open(f, "w") { |f| f.puts content } if !content.empty?
       end
 
       #

data/lib/hyla/project.rb

@@ -1,5 +1,5 @@
 module Hyla
-    VERSION = '1.0.5'
+    VERSION = '1.0.6'
     DESCRIPTION = 'Asciidoctor Hyla - Command Line tool to create new project, watch modifications, generate content, publish or consult it live !'
     SUMMARY = 'Asciidoctor Hyla - builder/generator of HTML5, slideshow. Watch modifications, generate content, publish or consult it live !'
 end

data/lib/resources/backends/slim/html5/document.html.slim

@@ -60,6 +60,8 @@ html lang=(attr :lang, 'en' unless attr? :nolang)
       script type='text/javascript' src='http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-MML-AM_HTMLorMML'
       script type='text/javascript'
         |document.addEventListener('DOMContentLoaded', MathJax.Hub.TypeSet)
+    - if attr? :script
+      script type='text/javascript' href=normalize_web_path((attr :script), (attr :scriptsdir, ''))
     - unless (docinfo_content = docinfo).empty?
       =docinfo_content
   body id=@id class=[(attr :doctype),((attr? 'toc-class') && (attr? :toc) && (attr? 'toc-placement', 'auto') ? "#{attr 'toc-class'} toc-#{attr 'toc-position', 'left'}" : nil)] style=("max-width: #{attr 'max-width'};" if attr? 'max-width')

data/lib/resources/backends/slim/revealjs/document.html.slim

@@ -1,6 +1,7 @@
 - slide_vertical_alignment = (attr? :revealjs_vertical_alignment) ? (attr :revealjs_vertical_alignment) : true
 - browser_history = (attr? :revealjs_history) ? (attr :revealjs_history) : true
 - display_slide_number = (attr? :revealjs_display_slide_number) ? (attr :revealjs_display_slide_number) : false
+- transition = (attr? :revealjs_transition) ? (attr :revealjs_transition) : 'default'
 doctype 5
 html lang=(attr :lang, 'en' unless attr? :nolang)
   head
@@ -18,6 +19,8 @@ html lang=(attr :lang, 'en' unless attr? :nolang)
 
     - if attr? :revealjs_theme
       link rel='stylesheet' href='revealjs/css/theme/#{attr :revealjs_theme}.css' id='theme'
+    - elsif attr? :revealjs_customtheme
+      link rel='stylesheet' href='#{attr :revealjs_customtheme}' id='theme'
     - else
       link rel='stylesheet' href='revealjs/css/theme/gpe.css' id='theme'
 
@@ -117,7 +120,7 @@ html lang=(attr :lang, 'en' unless attr? :nolang)
          theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
 
          // Transition style
-         transition: Reveal.getQueryHash().transition || 'none', // default/cube/page/concave/zoom/linear/fade/none
+         transition: Reveal.getQueryHash().transition || '#{transition}', // default/cube/page/concave/zoom/linear/fade/none
 
         // Parallax scrolling
         // parallaxBackgroundImage: 'https://s3.amazonaws.com/hakim-static/reveal-js/reveal-parallax-1.jpg',

data/lib/resources/backends/slim/revealjs/section.html.slim

@@ -1,7 +1,7 @@
 - resize_text = (attr? :resize_section) ? (attr :resize_section) : false
 - if resize_text == 'true'
   div style="position:absolute; top:150px; left:10px; right:10px;"
-    section id=@id data-transition=(attr 'data-transition') data-transition-speed=(attr 'data-transition-speed') data-background=(attr 'data-background') data-background-size=(attr 'data-background-size') data-background-repeat=(attr 'data-background-repeat') data-background-transition=(attr 'data-background-transition')
+    section id=@id class=(attr 'data-state') data-transition=(attr 'data-transition') data-transition-speed=(attr 'data-transition-speed') data-background=(attr 'data-background') data-background-size=(attr 'data-background-size') data-background-repeat=(attr 'data-background-repeat') data-background-transition=(attr 'data-background-transition')
       h2=title
       - if attr? :scrollbar
         .scrollbar
@@ -9,7 +9,7 @@
       - else
         =content.chomp
 - else
-  section id=@id data-transition=(attr 'data-transition') data-transition-speed=(attr 'data-transition-speed') data-background=(attr 'data-background') data-background-size=(attr 'data-background-size') data-background-repeat=(attr 'data-background-repeat') data-background-transition=(attr 'data-background-transition')
+  section id=@id class=(attr 'data-state') data-transition=(attr 'data-transition') data-transition-speed=(attr 'data-transition-speed') data-background=(attr 'data-background') data-background-size=(attr 'data-background-size') data-background-repeat=(attr 'data-background-repeat') data-background-transition=(attr 'data-background-transition')
     h2=title
     - if attr? :scrollbar
       .scrollbar

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyla
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Charles Mouliard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler