hyla 1.0.3 → 1.0.4

data/lib/hyla/commands/new.rb

@@ -2,17 +2,29 @@ module Hyla
   module Commands
     class New < Command
 
+      @readme_content = <<-EOS
+== Readme Asciidoctor Project
+
+This is an empty Asciidoctor readme file.
+
+To create **asciidoc(tor)** content, more info is available http://asciidoctor.org/docs/user-manual[here]
+
+Otherwise, you can add content to this newly project created using this hyla command :
+
+  hyla add --t asciidoc --a xxx  --d pathToProjectCreated
+
+where xxx can be article, book, source, audio, video, ...
+EOS
+
       def self.process(args, options = {})
-        # raise ArgumentError.new('You must specify a project name to be created.') if args.empty?
+
         out_dir = options[:destination] if self.check_mandatory_option?('-d / --destination', options[:destination])
 
         #
         # Calculate project path (rel/absolute)
         #
-        #new_project_path = File.expand_path(args[0], Dir.pwd)
         new_project_path = File.expand_path(out_dir, Dir.pwd)
 
-
         if Dir.exist? new_project_path
 
           Hyla.logger.debug("Dir exists: #{new_project_path}")
@@ -73,12 +85,7 @@ module Hyla
       def self.create_blank_project(path)
         Dir.chdir(path) do
           f = File.open('readme.ad', 'w')
-          f.puts "= Readme Asciidoctor Project"
-          f.puts "This is an empty Asciidoctor readme file."
-          f.puts "To create **asciidoc(tor)** content, more info are available http://asciidoctor.org/docs/user-manual[here]"
-          f.puts "otherwise, you can add content to this newly project created using this hyla command :"
-          f.puts "hyla create --t asciidoc --a xxx  --d pathToProjectCreated"
-          f.puts "where xxx can be article, book, source, audio, video, ..."
+          f.puts @readme_content
         end
       end
 

data/lib/hyla/commands/sendmail.rb

@@ -4,9 +4,10 @@ module Hyla
 
       def self.process(args, options)
 
-        location = options[:location] if check_mandatory_option?('-s / --location', options[:location])
+        location = options[:source] if self.check_mandatory_option?('-s / --source', options[:source])
         file_name = options[:file] if check_mandatory_option?('-f / --file', options[:file])
         email_attributes = options[:email_attributes] if check_mandatory_option?('-e / --email_attributes', options[:email_attributes])
+        attachment = options[:attachment]
 
         sender = email_attributes[:from]
         recipients = email_attributes[:to]
@@ -46,20 +47,22 @@ module Hyla
         </html>
         EOS
 
-        mail = Mail.new do
-          to recipients
-          from sender
-          subject subject
-          content_type 'multipart/related'
-        end
+        mail = populate_email(recipients, sender, subject)
+
+        case attachment
+          when true
 
-        attachment = File.read(file_path)
-        mail.attachments[file_name] = {
-            :mime_type => 'application/x-html',
-            :content   => attachment,
-            :Content_Transfer_Encoding => 'quoted-printable'}
+            attachment = File.read(file_path)
+            mail.attachments[file_name] = {
+                :mime_type => 'application/x-html',
+                :content => attachment,
+                :Content_Transfer_Encoding => 'quoted-printable'}
 
-        inline_html = inline_body_with_attachments(body, mail.attachments)
+            inline_html = inline_body_with_attachments(body, mail.attachments)
+
+          when false
+            inline_html = File.read(file_path)
+        end
 
         html_part = Mail::Part.new do
           content_type 'text/html; charset=UTF-8'
@@ -73,6 +76,24 @@ module Hyla
         Hyla.logger.info "Email send to SMTP server from #{sender} with this subject : #{subject}"
       end
 
+      #
+      # Create Mail using
+      # Recipients, Sender and subject
+      #
+      def self.populate_email(recipients, sender, subject)
+        mail = Mail.new do
+          to recipients
+          from sender
+          subject subject
+          content_type 'multipart/related'
+        end
+        return mail
+      end
+
+      #
+      # Generate the Hash of the parameters
+      # used by mail compoent nto send email
+      #
       def self.parameters()
         parameters = {}
         parameters[:address] = @smtp_server unless @smtp_server.nil?
@@ -84,6 +105,9 @@ module Hyla
         return parameters
       end
 
+      #
+      # Substitute filename with cid
+      #
       def self.inline_body_with_attachments(html, attachments)
         attachments.each do |attachment|
           if (html =~ /#{attachment.filename}/)

data/lib/hyla/commands/serve.rb

@@ -5,18 +5,18 @@ module Hyla
       def self.process(args, options)
         include WEBrick
 
-        my_opts = options
+        my_opts = {}
 
         destination = options[:destination]  if self.check_mandatory_option?('-d / --destination', options[:destination])
 
         my_opts[:Port] = options[:port]
         my_opts[:BindAddress] = options[:host]
+        my_opts[:baseurl] = options[:baseurl]
         my_opts[:MimeTypes] = self.mime_types
         my_opts[:DoNotReverseLookupmy_opts] = true
         my_opts[:StartCallback] = start_callback(options[:detach])
         my_opts[:AccessLog] = []
         my_opts[:Logger] = Log::new([], Log::WARN)
-        my_opts[:baseurl] = options[:baseurl]
 
         # recreate NondisclosureName under utf-8 circumstance
         fh_option = WEBrick::Config::FileHandler

data/lib/hyla/configuration.rb

@@ -3,33 +3,43 @@ module Hyla
 
     attr_reader :HEADER, :INDEX_SUFFIX, :HEADER_INDEX, :INCLUDE_PREFIX, :INCLUDE_SUFFIX, :LEVEL_1, :LEVEL_2, :SKIP_CHARACTERS,
                 :ADOC_EXT, :PREFIX_ARTEFACT, :YAML_CONFIG_FILE_NAME, :DEFAULTS,
-                :templates, :samples, :resources, :styles, :backends
+                :templates, :cover_template, :samples, :resources, :styles, :fonts, :backends
 
     DEFAULTS = {
-        'source'        => Dir.pwd,
-        'destination'   => File.join(Dir.pwd, 'generated_content'),
-        'watch_dir'     => '.',
-        'watch_ext'     => %w(ad adoc asc asciidoc txt index),
+        'source' => Dir.pwd,
+        'destination' => File.join(Dir.pwd, 'generated_content'),
+        'watch_dir' => '.',
+        'watch_ext' => %w(ad adoc asc asciidoc txt index),
 
         # Asciidoctor
-        'backend'       => 'html5',
-        'eruby'         => 'erb',
-        'doctype'       => 'article',
-        'compact'       => false,
-        'to_dir'        => '.',
-        'to_file'       => '',
-        'attributes'    => {
+        'backend' => 'html5',
+        'eruby' => 'erb',
+        'doctype' => 'article',
+        'compact' => false,
+        'to_dir' => '.',
+        'to_file' => '',
+        'attributes' => {
             'source-highlighter' => 'coderay',
-            'linkcss!'           => 'true',
-            'data-uri'           => 'true',
-            'stylesheet'         => 'asciidoctor.css',
-            'stylesdir'          => 'styles'
+            'linkcss!' => 'true',
+            'data-uri' => 'true',
+            'stylesheet' => 'asciidoctor.css',
+            'stylesdir' => 'styles'
         },
-        'safe'          => 'unsafe',
+        'safe' => 'unsafe',
         'header_footer' => true
 
     }
 
+    #
+    # Matches an include preprocessor directive.
+    #
+    # Examples
+    #
+    #   include::chapter1.ad[]
+    #   include::example.txt[lines=1;2;5..10]
+    #
+    IncludeDirectiveRx = /^\\?include::([^\[]+)\[(.*?)\]$/
+
     INCLUDE_PREFIX = 'include::'
 
     INCLUDE_SUFFIX = '[]'
@@ -42,11 +52,12 @@ module Hyla
         ":source-highlighter: coderay\n"
 
     HEADER_INDEX = ":data-uri:\n" +
-        ":navigation:\n" +
-        ":menu:\n" +
-        ":status:\n" +
-        ":goto:\n" +
-        ":notitle:\n"
+        ":navigation: # navigation attribute used for DeckJS Slideshow\n" +
+        ":menu: # navigation attribute used for DeckJS Slideshow\n" +
+        ":status: # navigation attribute used for DeckJS Slideshow\n" +
+        ":goto: # navigation attribute used for DeckJS Slideshow\n" +
+        ":notitle: \n" +
+        ":toc: left # Comment or uncomment this attribute if you don't need to display left part of the HTML page a table of content\n"
 
     LEVEL_1 = '= '
 
@@ -54,7 +65,7 @@ module Hyla
 
     SKIP_CHARACTERS = '>>'
 
-    ADOC_EXT = '.adoc'
+    ADOC_EXT = '.ad'
 
     PREFIX_ARTEFACT = 'asciidoc_'
 
@@ -66,10 +77,21 @@ module Hyla
 
     STYLES = '../../lib/resources/styles'
 
+    FONTS = '../../lib/resources/fonts'
+
     BACKENDS = '../../lib/resources/backends'
 
+    COVER_TEMPLATE = '../../lib/resources/cover.slim'
+
     YAML_CONFIG_FILE_NAME = '_config.yaml'
 
+    #
+    # Cover Slim Template
+    #
+    def self.cover_template
+      File.expand_path(COVER_TEMPLATE, File.dirname(__FILE__))
+    end
+
     #
     # Templates Location
     #
@@ -91,6 +113,13 @@ module Hyla
       File.expand_path(STYLES, File.dirname(__FILE__))
     end
 
+    #
+    # Fonts Location
+    #
+    def self.fonts
+      File.expand_path(FONTS, File.dirname(__FILE__))
+    end
+
     #
     # Backends Location
     #
@@ -133,13 +162,21 @@ module Hyla
       config = DEFAULTS
       Hyla::logger.debug("DEFAULTS Keys: #{config.inspect}")
 
-      # Read YAML config file IF it exists and
-      # Merge content with DEFAULT config
-      new_config = read_config_file(YAML_CONFIG_FILE_NAME)
-      Hyla::logger.debug("OVERRIDE Keys: #{new_config.inspect}") if !new_config.nil?
-      config = config.deep_merge(new_config) if !new_config.nil?
+      #
+      # Read the config file passed as parameter if it exists
+      # otherwise read default _config.yaml file if it exists and
+      # merge content with DEFAULT config
+      #
+      alt_config = read_config_file(override['config']) if override['config']
+      if !alt_config.nil?
+        config = config.deep_merge(alt_config)
+      else
+        new_config = read_config_file(YAML_CONFIG_FILE_NAME)
+        Hyla::logger.debug("OVERRIDE Keys: #{new_config.inspect}") if !new_config.nil?
+        config = config.deep_merge(new_config) if !new_config.nil?
+      end
 
-      # Merge DEFAULTS < _config.yaml < override
+      # Merge DEFAULTS < _config.yaml or your_config.yaml file < override
       config = config.deep_merge(override)
       # Convert String Keys to Symbols Keys
       config = Configuration[].transform_keys_to_symbols(config)
@@ -156,7 +193,7 @@ module Hyla
       config = safe_load_file(f)
       config
     rescue SystemCallError
-      Hyla::logger.warn "No _config.yaml file retrieved"
+      Hyla::logger.warn "No configuration file retrieved for the name : #{filename}"
     end
 
     #
@@ -180,8 +217,10 @@ module Hyla
       return hash if not hash.is_a?(Hash)
       hash.inject({}) { |result, (key, value)|
         new_key = case key
-                    when String then key.to_sym
-                    else key
+                    when String then
+                      key.to_sym
+                    else
+                      key
                   end
         new_value = case value
                       when Hash
@@ -190,7 +229,8 @@ module Hyla
                         else
                           transform_keys_to_symbols(value)
                         end
-                      else value
+                      else
+                        value
                     end
         result[new_key] = new_value
         result

data/lib/hyla/core_ext.rb

@@ -1,4 +1,3 @@
-
 class Hash
 
   # Merges self with another hash, recursively.
@@ -21,4 +20,15 @@ class Hash
 
     target
   end
+end
+
+class String
+
+  #
+  # Get the first position
+  #
+  def initial
+    self[0,1]
+  end
+
 end

data/lib/hyla/project.rb

@@ -1,5 +1,5 @@
 module Hyla
-    VERSION = '1.0.3'
+    VERSION = '1.0.4'
     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/haml/revealjs/document.html.haml

@@ -19,11 +19,18 @@
       %meta(name='keywords'){:content=>(attr :keywords)}
     - if attr? :author
       %meta(name='author'){:content=>(attr :author)}
-
+    :javascript
+      document.write( '<link rel="stylesheet" href="revealjs/css/print/' +
+      ( window.location.search.match( /print-pdf/gi ) ? 'pdf' : 'paper' ) +
+      '.css" type="text/css" media="print">' );
   %body{:id=>@id, :class=>['reveal-container',(attr :doctype)]}
     .reveal
+      .header
+        %img(src='image/rhheader_thin.png' alt='RedHat Corporate Logo')
       .slides
         =content
+      .footer
+        Copyright ©2014 Red Hat, Inc.
     %script(src='lib/js/head.min.js')
     %script(src='reveal.js/js/reveal.min.js')
     :javascript
@@ -53,7 +60,7 @@
         // Apply a 3D roll to links on hover
         rollingLinks: true,
         // Transition style
-        transition: 'default', // default/cube/page/concave/zoom/linear/fade/none
+        transition: 'none', // default/cube/page/concave/zoom/linear/fade/none
         // Transition speed
         transitionSpeed: 'default', // default/fast/slow
         // Transition style for full page backgrounds

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

@@ -8,3 +8,4 @@
       img src=image_uri(attr :target) alt=(attr :alt) width=(attr :width) height=(attr :height)
   - if title?
     .title=captioned_title
+x

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

@@ -67,6 +67,8 @@ html lang=(attr :lang, 'en' unless attr? :nolang)
       / AsciiDoc leaves an empty header div even if there's no doctitle
       #header
         - if has_header?
+          - if attr? :header_image_path
+            img src=image_uri(attr :header_image_path)
           - unless notitle
             h1=@header.title
           - if attr? :author
@@ -89,6 +91,9 @@ html lang=(attr :lang, 'en' unless attr? :nolang)
           - if attr? :revremark
             br
             span#revremark=attr :revremark
+        - else
+          - if attr? :header_image_path
+            img src=image_uri(attr :header_image_path)
         - if (attr? :toc) && (attr? 'toc-placement', 'auto')
           #toc class=(attr 'toc-class', 'toc')
             #toctitle=attr 'toc-title'
@@ -101,12 +106,16 @@ html lang=(attr :lang, 'en' unless attr? :nolang)
         - footnotes.each do |fn|
           .footnote id='_footnote_#{fn.index}'
             <a href="#_footnoteref_#{fn.index}">#{fn.index}</a>. #{fn.text}
-    #footer
-      #footer-text
-        - if attr? :revnumber
-          | #{attr 'version-label'} #{attr :revnumber}
-        - if attr? 'last-update-label'
-          br
-          | #{attr 'last-update-label'} #{attr :docdatetime}
-      - unless (docinfo_content = (docinfo :footer)).empty?
-        =docinfo_content
+    - if attr? :footer_copyright
+      .footer-copyright
+        =attr :footer_copyright
+    - unless attr? :nofooter
+      #footer
+        #footer-text
+          - if attr? :revnumber
+            | #{attr 'version-label'} #{attr :revnumber}
+          - if attr? 'last-update-label'
+            br
+            | #{attr 'last-update-label'} #{attr :docdatetime}
+        - unless (docinfo_content = (docinfo :footer)).empty?
+          =docinfo_content

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

@@ -1,5 +1,5 @@
-.sidebarblock id=@id class=role
-  .content
-    - if title?
-      .title=title
-    =content
+aside id=@id class='notes'
+  - if title?
+    .title=title
+  =content
+