carta 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a68752796acf26b2906954735cfaa00fe7fb81d9
-  data.tar.gz: 41a3a26bf86e760a090699556e7cbfa132d80480
+  metadata.gz: 45dde63c7083042b1838f16713a79bf4d92c7b08
+  data.tar.gz: 66a564f43517c7fcee5b1b18482e4e4d97c4a35d
 SHA512:
-  metadata.gz: 882c2e1a31e963fe62d7dbcada5a3098578ef171fba40fc92e23f9749ed038ea1cc94e6d616c82afcaa7b3a210541273b005188d42971e9208e4ef1c6ffa96b4
-  data.tar.gz: dab5bfb8515a9ce1cc29917c1d3767326db17d340966f988bbe66effe386792d3e48e67bfd247fd4322ab2218e3456b955916711f2d5a9f6cbfe5601c981c85c
+  metadata.gz: e0de778da2ade591568fb4ea46c5726fc81b414041ec5f40efa0d7cb934e34d4d2cf311a16d8ec7f1718e1fa8838230b291ff34cfe903b1e9413e872f19fa167
+  data.tar.gz: 4ef74bc8d82009a48efc8117f9a9d9ed9180a67350c53ef1a59fa5b36dff287b4404e2012d1bd7d5142ddcdc7e137cdd9a0820db98090babe05aa436610baae9

data/lib/carta/cli/compile.rb

@@ -16,6 +16,8 @@ module Carta
                 :FIGURE_DIR,
                 :ASSET_DIR,
                 :BUILD_DIR,
+                :EPUB_DIR,
+                :HTML_DIR,
                 :ASSET_FILES
 
     def initialize(thor)
@@ -27,6 +29,8 @@ module Carta
         @MANUSCRIPT_DIR = "#{@PROJECT_DIR}/manuscript"
         @FIGURE_DIR     = "#{@MANUSCRIPT_DIR}/figures"
         @ASSET_DIR      = "#{@PROJECT_DIR}/assets"
+        @EPUB_DIR       = "#{@PROJECT_DIR}/assets"
+        @HTML_DIR       = "#{@PROJECT_DIR}/assets"
         @ASSET_FILES    = 'css,otf,woff,mov,m4v,mp4,mp3,jpeg,jpg,png,svg,gif'
         @book = YAML.load_file("#{@MANUSCRIPT_DIR}/book.yaml")
       else
@@ -38,22 +42,25 @@ module Carta
       clean
       generate_html if Dir.exists?('manuscript')
     end
+
     def clean
       thor.remove_dir "#{@PROJECT_DIR}/build"
     end
+    
     # Generates our HTML from markdown files and creates an outline
     def generate_html
       html_renderer = Carta::CLI::HTMLRenderer.new(@PROJECT_DIR)
       # puts @MANUSCRIPT_DIR
       book['html']      = html_renderer.manuscript_html
       book['outline']   = html_renderer.outline
-      book['toc_html']  = html_renderer.toc_html
+      book['epub_toc_html']  = html_renderer.epub_toc_html
+      book['html_toc_html']  = html_renderer.html_toc_html
 
-      generate_manifest
+      generate_epub_manifest
     end
 
     # Runs through our ERBs
-    def render_layouts
+    def render_epub_layouts
       FileList.new("#{@LAYOUT_DIR}/epub/**/*.erb").each do |layout|
         filename = layout.pathmap("%{^#{@LAYOUT_DIR},#{@BUILD_DIR}}X")
         path = filename.pathmap('%d')
@@ -65,9 +72,21 @@ module Carta
           handle.write template.result(binding)
         end
       end
+
+      FileList.new("#{@LAYOUT_DIR}/html/**/*.erb").each do |layout|
+        filename = layout.pathmap("%{^#{@LAYOUT_DIR},#{@BUILD_DIR}}X")
+        path = filename.pathmap('%d')
+
+        FileUtils.mkpath(path) unless File.exists? path
+
+        template = ERB.new(File.read(layout), nil, '-')
+        File.open(filename, 'w+') do |handle|
+          handle.write template.result(binding)
+        end
+      end
     end
 
-    def generate_manifest
+    def generate_epub_manifest
       files   = FileList.new("#{@LAYOUT_DIR}/epub/EPUB/*.erb")
                         .pathmap("%{^#{@LAYOUT_DIR}/epub/EPUB/,}X")
                         .exclude('**/*.opf*')
@@ -90,7 +109,7 @@ module Carta
         end
       end
       copy_files
-      render_layouts
+      render_epub_layouts
       generate_epub
     end
 

data/lib/carta/cli/html_renderer.rb

@@ -4,12 +4,14 @@ module Carta
   class CLI::HTMLRenderer
     attr_accessor :markdown,
                   :manuscript_html,
-                  :toc_html,
+                  :epub_toc_html,
+                  :html_toc_html,
                   :outline
 
     def initialize(path)
       @markdown = ''
-      @toc_html = ''
+      @epub_toc_html = ''
+      @html_toc_html = ''
       @manuscript_html = ''
       @outline = nil
       load_markdown(path)
@@ -28,28 +30,41 @@ module Carta
       r = Redcarpet::Markdown.new(renderer)
       manuscript_html << r.render(markdown)
       @outline = renderer.outline
-      render_outline
+      @epub_toc_html = render_outline
+      @html_toc_html = render_outline('toc',true)
+
+
     end
 
-    def render_outline(html_class='toc')
+    def render_outline(html_class = 'toc', for_html = false)
       final_class = "class='#{html_class}'"
+      html = ''
       outline.each_with_index do |data, i|
         level, text, link, *children = data
-        toc_html << "<ol #{final_class}>" if i == 0
-        toc_html << "\n  <li><a href='content.xhtml##{link}'>#{text}</a>"
+        html << "<ol #{final_class}>" if i == 0
+        if for_html
+          html << "\n  <li><a href='##{link}'>#{text}</a>"
+        else
+          html << "\n  <li><a href='content.xhtml##{link}'>#{text}</a>"
+        end
 
         if children.empty?
-          toc_html << '</li>'
+          html << '</li>'
         else
           children.each_with_index do |child, j|
             level, text, link = child
-            toc_html << "\n    <ol>" if j == 0
-            toc_html << "\n      <li><a href='content.xhtml##{link}'>#{text}</a></li>"
-            toc_html << "\n    </ol>\n  </li>" if j == children.length - 1
+            html << "\n    <ol>" if j == 0
+            if for_html
+              html << "\n      <li><a href='##{link}'>#{text}</a></li>"
+            else
+              html << "\n      <li><a href='content.xhtml##{link}'>#{text}</a></li>"
+            end
+            html << "\n    </ol>\n  </li>" if j == children.length - 1
           end
         end
-        toc_html << "\n</ol>" if i == outline.length - 1
+        html << "\n</ol>" if i == outline.length - 1
       end
+      return html
     end
   end
 end

data/lib/carta/util.rb

@@ -9,7 +9,7 @@ module Carta::Util
        .gsub(/[^0-9A-z.\-]/, '')
   end
 
-  # Pads at number so that it's 2 digits wide with leading
+  # Pads a number so that it's 2 digits wide with leading
   # zeros if needed.
   # 1 -> 01
   def self.pad(number)

data/lib/carta/version.rb

@@ -1,3 +1,3 @@
 module Carta
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carta
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Dylan Wreggelsworth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler