cheepub 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb88e2dae0bf74523ce1e187024db8e8e3ec3a332480461e020ca76af1ccef5e
-  data.tar.gz: d56c9785adfca375b8892f960e4be9c2f9b3f3fc222d6953e70e7471a55279a3
+  metadata.gz: a95f6f76cecb9e8911a8e77f4a50a5da0743f0a02cdf8b49fe615b853378710c
+  data.tar.gz: 5e5615e7b17d70e35eb0a0e1b0b704d1b2ecd8fcdf5725f10e985d8c389833f3
 SHA512:
-  metadata.gz: 05a9ec137505b9b7fe6ee3777500a96b0e9b9305e244b143406dba78ae24cb857f369e6f709b6b460dc216c5eccf2d125fb2fc4d95d468616d8bd0f29177bd13
-  data.tar.gz: e01f312ba85bc5c318689d74efcc3dec662bbe5c7979f331167d999e6417f5b8b1ad64384a12e3bfadae74ae6226514d23511dd23a7c0d115fccdc75694e0626
+  metadata.gz: 68c648c08be8be16bab7d42729fe3685c7dcf8dba37c1b9d615b6e78d96faea50039412bcb2cd2891b43b74f810bbee28804fc51eee7a35a2855cb9f9b0529d2
+  data.tar.gz: a89df405a7ef050aa66b3cb717e10c61c352e400aa36fe1321a03e053f50b08e2ce6e3a4bcc7ca30abe182bc29358e3beefcd1c01da9aa0de704b5ab82d5294e

data/.travis.yml

@@ -2,7 +2,7 @@ sudo: false
 language: ruby
 env:
   global:
-    - CC_TEST_REPORTER_ID=787a2f89b15c637323c7340d65ec17e898ac44480706b4b4122ea040c2a88f1d
+    - CC_TEST_REPORTER_ID=d5331ce7fbbeb2ce680091143c984430e93910cf81cdb09cf6e60baeb2548c05
 rvm:
   - 2.4.1
   - 2.5.1

data/README.md

@@ -66,6 +66,11 @@ You can define configration with in front-matter or `--config` option.
 
 ## History
 
+### 0.4.0
+
+- fix writing-mode (pageDirection)
+- fix to generate nav.xhtml
+
 ### 0.3.0
 
 - add option `--out`

data/cheepub.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "gepub"
   spec.add_dependency "kramdown", "~> 1.16"
   spec.add_dependency "clamp", "~> 1.2"
+  spec.add_dependency "oga"
 
   spec.add_development_dependency "rufo", "~> 0.3"
   spec.add_development_dependency "bundler", "~> 1.16"

data/lib/cheepub.rb

@@ -7,7 +7,6 @@ require "cheepub/markdown/cheemarkdown"
 require "cheepub/cli"
 require "cheepub/generator"
 require "cheepub/content"
-
-module Cheepub
-  # Your code goes here...
-end
+require "cheepub/heading_parser"
+require "cheepub/heading_item"
+require "cheepub/nav"

data/lib/cheepub/content.rb

@@ -47,5 +47,10 @@ module Cheepub
       return header, body
     end
 
+    def each_html_with_filename
+      html_pages.each_with_index do |page, idx|
+        yield page, "bodymatter_#{idx}.xhtml"
+      end
+    end
   end
 end

data/lib/cheepub/ext_hash.rb

@@ -6,10 +6,14 @@ module Cheepub
           if self[key].kind_of? Hash
             self[key].symbolize_keys!
           end
-          self[(key.to_sym rescue nil) || key] = delete(key)
+          self[symbolize_key(key)] = delete(key)
         end
         self
       end
+
+      def symbolize_key(key)
+        (key.to_sym rescue nil) || key
+      end
     end
   end
 end

data/lib/cheepub/generator.rb

@@ -4,6 +4,8 @@ require 'gepub'
 module Cheepub
   class Generator
 
+    attr_reader :book
+
     ROLES = %i{aut edt trl ill cov cre pht cwt nrt}
 
     def initialize(src, params = Hash.new)
@@ -15,26 +17,26 @@ module Cheepub
         @content = Cheepub::Content.new(File.read(@src))
       end
       @params = params
+      @book = GEPUB::Book.new
     end
 
     def execute
       params = @params.merge(@content.header)
       check_params(params)
-      book = GEPUB::Book.new
-      apply_params(book, params)
+      apply_params(params)
       epubfile = params[:epubfile] || "book.epub"
-      book.generate_epub(epubfile)
+      @book.generate_epub(epubfile)
     end
 
-    def parse_creator(book, creator)
+    def parse_creator(creator)
       if creator.kind_of? String
-        book.add_creator(creator)
+        @book.add_creator(creator)
       else
         creator.each do |role, name|
           if !ROLES.include?(role)
             raise Cheepub::Error, "invalid role: '#{role}' for creator '#{name}'."
           end
-          book.add_creator(name, nil, role)
+          @book.add_creator(name, nil, role)
         end
       end
     end
@@ -45,30 +47,33 @@ module Cheepub
       end
     end
 
-    def apply_params(book, params)
-      book.identifier = params[:id] || "urn:uuid:#{SecureRandom.uuid}"
-      book.title = params[:title]
+    def apply_params(params)
+      @book.identifier = params[:id] || "urn:uuid:#{SecureRandom.uuid}"
+      @book.title = params[:title]
+      @book.add_creator(params[:author])
       if params[:creator]
-        parse_creator(book, params[:creator])
+        parse_creator(params[:creator])
       end
-      book.add_creator(params[:author])
-      book.language = params[:language] || 'ja'
-      book.version = '3.0'
-      book.publisher = params[:publisher]
+      @book.language = params[:language] || 'ja'
+      @book.version = '3.0'
+      @book.publisher = params[:publisher]
       ## book.date= params[:date] || Time.now
-      book.add_date(params[:date] || Time.now, nil)
-      book.lastmodified = params[:lastModified] || Time.now
+      @book.add_date(params[:date] || Time.now, nil)
+      @book.lastmodified = params[:lastModified] || Time.now
       if params[:pageDirection]
-        book.page_progression_direction = params[:pageDirection]
-      end
-      File.open(File.join(File.dirname(__FILE__), "templates/style.css.erb")) do |f|
-        item = book.add_item("style.css")
-        item.add_content(f)
+        @book.page_progression_direction = params[:pageDirection]
       end
-      book.ordered do
-        @content.html_pages.each_with_index do |page, idx|
-          item = book.add_item("bodymatter_0_#{idx}.xhtml")
-          item.add_content(StringIO.new(page))
+      template = File.read(File.join(File.dirname(__FILE__), "templates/style.css.erb"))
+      style_content = ERB.new(template).result(binding)
+      @book.add_item("style.css").add_content(StringIO.new(style_content))
+      @book.ordered do
+        nav = Cheepub::Nav.new(@content)
+        item = @book.add_item('nav.xhtml')
+        item.add_content(StringIO.new(nav.to_html))
+        item.add_property('nav')
+        @content.each_html_with_filename do |html, filename|
+          item = @book.add_item(filename)
+          item.add_content(StringIO.new(html))
         end
       end
     end

data/lib/cheepub/heading_item.rb

@@ -0,0 +1,73 @@
+module Cheepub
+  class HeadingItem
+
+    attr_reader :id, :level, :name, :filename, :content, :children
+    attr_accessor :parent
+
+    def initialize(id:nil, level:, name:nil, filename:nil, content:nil, children:nil, parent:nil)
+      @id = id
+      @level = level
+      @name = name
+      @filename = filename
+      @content = content
+      @children = children
+      @parent = parent
+    end
+
+    def add_child(node)
+      children << node
+      node.parent = self
+      node
+    end
+
+    def add_sibling(node)
+      parent.add_child(node)
+    end
+
+    def add_descendant(node)
+      current = self
+      while current.level + 1 != node.level
+        item = HeadingItem.new(level: current.level+1, children: [])
+        current.add_child(item)
+        current = item
+      end
+      current.add_child(node)
+    end
+
+    def add_ancestor(node)
+      current = self
+      while current.level != node.level
+        current = current.parent
+      end
+      current.add_sibling(node)
+    end
+
+    def dump
+      print "*" * level
+      print "{id:#{id}} content: #{content}\n"
+      children.each do |child|
+        child.dump
+      end
+    end
+
+    def to_html_ol
+      indent = "  " * (2 * level)
+      buf = ""
+      if level > 0
+        buf << "#{indent}<li>\n"
+      end
+      if id && content.length > 0
+        buf << "  #{indent}<a href=\"#{filename}\##{id}\">#{content}</a>\n"
+      end
+      if !children.empty?
+        buf << "  #{indent}<ol>\n" +
+               children.map(&:to_html_ol).join("") +
+               "  #{indent}</ol>\n"
+      end
+      if level > 0
+        buf << "#{indent}</li>\n"
+      end
+      buf
+    end
+  end
+end

data/lib/cheepub/heading_parser.rb

@@ -0,0 +1,73 @@
+require "oga"
+require "cheepub/heading_item"
+
+module Cheepub
+  class HeadingParser
+
+    class Handler
+
+      attr_reader :result
+
+      def initialize(filename)
+        @filename = filename
+        @stack = []
+        @result = []
+      end
+
+      def on_element(ns, name, attrs)
+        if name =~ /^h([1-6])/i
+          @stack.push({filename: @filename, name: name, level: $1.to_i, content: "", id: attrs["id"]})
+        end
+      end
+
+      def on_text(text)
+        last_elem = @stack[-1]
+        return if !last_elem
+        last_elem[:content] = last_elem[:content]+text
+      end
+
+      def after_element(ns, name)
+        return if @stack.empty?
+        @result.push(@stack.pop)
+      end
+    end
+
+    def initialize
+    end
+
+    def parse_files(files)
+      heading_list = files.map{ |filename, content| parse_html_heading(filename, content) }.flatten
+      root = layering_heading(heading_list)
+      root
+    end
+
+    def parse_html_heading(filename, content)
+      handler = Cheepub::HeadingParser::Handler.new(filename)
+      Oga::HTML::SaxParser.new(handler, content).parse
+      handler.result
+    end
+
+    def layering_heading(list)
+      root = HeadingItem.new(level: 0, children: [])
+      prev = root
+
+      list.each do |item|
+        next if !item[:id] || item[:content].empty?
+        node = HeadingItem.new(id: item[:id], level: item[:level], name: item[:name],
+                               content: item[:content], filename: item[:filename], children: [])
+        if node.level == prev.level + 1
+          prev.add_child(node)
+        elsif node.level == prev.level
+          prev.add_sibling(node)
+        elsif node.level > prev.level
+          prev.add_descendant(node)
+        else ## node.level < prev.level
+          prev.add_ancestor(node)
+        end
+        prev = node
+      end
+
+      root
+    end
+  end
+end

data/lib/cheepub/nav.rb

@@ -0,0 +1,35 @@
+require 'erb'
+
+module Cheepub
+  class Nav
+
+    attr_reader :root
+
+    def initialize(content)
+      @content = content
+      @root = @body = nil
+      parse
+    end
+
+    def to_html
+      template = File.read(File.join(File.dirname(__FILE__), "templates/nav.xhtml.erb"))
+      @body = @root.to_html_ol
+      erb = ERB.new(template)
+      str = erb.result(binding)
+      str
+    end
+
+
+    private
+
+    def parse
+      parser = HeadingParser.new()
+      list = make_file_list()
+      @root = parser.parse_files(list)
+    end
+
+    def make_file_list
+      @content.to_enum(:each_html_with_filename).map{|html,filename| [filename, html]}.to_a
+    end
+  end
+end

data/lib/cheepub/templates/nav.xhtml.erb

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xml:lang="ja" lang="ja">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="style.css" type="text/css" />
+    <title>nav</title>
+    <style type="text/css">
+      ol {
+        list-style-type: none;
+        margin-left: 0em;
+        padding-left: 0em;
+      }
+    </style>
+  </head>
+  <body class="frontmatter" epub:type="frontmatter">
+    <nav id="toc" class="toc" epub:type="toc">
+      <h2>目次</h2>
+      <%= @body %>  </nav>
+    <nav id="landmarks" class="landmarks" epub:type="landmarks" hidden="hidden">
+      <h2>ガイド</h2>
+       <ol>
+         <li><a epub:type="toc" href="nav.xhtml"><span>目次</span></a></li>
+         <li><a epub:type="bodymatter" href="bodymatter_0.xhtml"><span>本文</span></a></li>
+       </ol>
+    </nav>
+  </body>
+</html>

data/lib/cheepub/templates/style.css.erb

@@ -3,9 +3,11 @@
 @namespace epub "http://www.idpf.org/2007/ops";
 
 html {
+<% if @book.page_progression_direction == "rtl" %>
   -epub-writing-mode: vertical-rl;
   -webkit-writing-mode: vertical-rl;
   writing-mode: vertical-rl;
+<% end %>
 }
 
 body {

data/lib/cheepub/version.rb

@@ -1,3 +1,3 @@
 module Cheepub
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheepub
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - takahashim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-06 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gepub
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: oga
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rufo
   requirement: !ruby/object:Gem::Requirement
@@ -161,9 +175,13 @@ files:
 - lib/cheepub/error.rb
 - lib/cheepub/ext_hash.rb
 - lib/cheepub/generator.rb
+- lib/cheepub/heading_item.rb
+- lib/cheepub/heading_parser.rb
 - lib/cheepub/markdown.rb
 - lib/cheepub/markdown/cheemarkdown.rb
+- lib/cheepub/nav.rb
 - lib/cheepub/templates/bodymatter.html.erb
+- lib/cheepub/templates/nav.xhtml.erb
 - lib/cheepub/templates/style.css.erb
 - lib/cheepub/version.rb
 homepage: https://github.com/takahashim/cheepub