ulysses 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94a96891b11b517de41e2a090402f02e12404b96
-  data.tar.gz: 894df84f95414f2b8e328439e05fc7c57447bd73
+  metadata.gz: 9b1b20c6d6d61c8638523318dc7da82510af3750
+  data.tar.gz: 22b91e891cb856c8951bfa1f9b4ec6083186a4e7
 SHA512:
-  metadata.gz: caa083c9df77861877daeb0b5fa3967de65dc3c2799fe57aaa40a2e1fdd6cfbf7f21fc70d051996536e079bb044fa539e597d15a0bbc661a088efaebccc631f5
-  data.tar.gz: ff82e2446f4dbe38300af87dd0a5509e4522c72d2d67899a6d72966576dc8ffc420b6e36ffbc1f82f5cc479fa297d79bffe47946ee5913e4754dd8038bb2ab9a
+  metadata.gz: ca03cee526afcf4da3524e79b82864fdf1f32642a46ddd7c2a7a5dd9064887b86c4019db1d3726402d1e4ed75e27360c8f4387a8b0831b4e0cf60bc1f74f76bd
+  data.tar.gz: 6428353c07a468d956121901d20e6f4f9aed5e2a13550f83fef024e75818d925b34634a2b056808f327c6680c1b2fa8932965cd54778ea538061484f7f7cb90e

data/lib/ulysses/printer.rb

@@ -1,8 +1,11 @@
 module Ulysses
   class Printer
 
-    INLINE_MARKUPS = %w(strong emph mark delete inlineComment code inlineNative)
     SHEET_CONTENT_XPATH = '/sheet/string[@xml:space="preserve"]'
+    SIMPLE_ELEMENTS = {strong: 'strong', emph: 'em', mark: 'mark',
+                       delete: 'del', code: 'code', inlineNative: 'span' }
+    HIDDEN_ELEMENTS = [:inlineComment]
+    HIDDEN_TAGS     = [:comment]
 
     def initialize(target)
       @target        = target
@@ -12,6 +15,12 @@ module Ulysses
     end
 
     def print
+      [print_body, print_footnotes].compact.join("\n")
+    end
+
+    private
+
+    def print_body
       if @target.is_a? Library
         print_library(@target)
       elsif @target.is_a? Group
@@ -23,16 +32,6 @@ module Ulysses
       end
     end
 
-    def footnotes
-      @footnotes
-    end
-
-    def annotations
-      @annotations
-    end
-
-    private
-
     def print_library(library)
       library.groups.map { |g| print_group(g) }.join("\n")
     end
@@ -43,31 +42,47 @@ module Ulysses
 
     def print_sheet(sheet)
       paragraphs = sheet.xml.xpath(SHEET_CONTENT_XPATH).children.select { |n| n.element? }
-      paragraphs.map{ |p| print_paragraph(p) }.join("\n")
+      paragraphs.map{ |p| print_paragraph(p) }.compact.join("\n")
+    end
+
+    def print_footnotes
+      return nil if @footnotes.empty?
+      html = '<ol class="footnotes">'
+      @footnotes.each_with_index do |fn, index|
+        html += "<li><a href=\"#fn-#{index+1}\">&#94;</a> #{fn}</li>"
+      end
+      html + '</ol>'
+    end
+
+    def print_annotations
+      return nil if @annotations.empty?
+      html = '<ol class="annotations">'
+      @annotations.each_with_index do |an, index|
+        html += "<li id=\"annotation-#{index + 1}\">#{an}</li>"
+      end
+      html + '</ol>'
     end
 
     def print_paragraph(p)
       children = p.children
       tags     = (children.any? && children.first.name === 'tags') ? parse_tags(children.shift) : []
-      content  = parse_content(children)
+      return nil if (tags & HIDDEN_TAGS).any?
 
-      tabs = tags.count('tab')
-      if tabs > 0
-        tags.delete('tab')
-        tags << "tabs_#{tabs}"
-      end
-      if tags.any?
-        tags = tags.uniq.map{|t| snake_case(t)}.join(' ')
-        "<p class=\"#{tags}\">#{content}</p>"
+      content = parse_content(children)
+
+      heading_tag = tags.find {|t| t.to_s.start_with? 'heading' }
+      if heading_tag
+        heading_level = /heading(\d)/.match(heading_tag)[1]
+        "<h#{heading_level}>#{content}</h#{heading_level}>"
       else
-        "<p>#{content}</p>"
+        "<p class=\"#{parse_line_class(tags)}\">#{content}</p>"
       end
     end
 
     def parse_content(nodes)
       nodes.map do |node|
         if node.text?
-          node.content
+          @html_entities.encode node.content
         else
           send("parse_#{node.name}", node)
         end
@@ -77,9 +92,9 @@ module Ulysses
     def parse_tags(tags)
       tags.children.map do |tag|
         if tag.attributes.has_key? 'kind'
-          tag.attributes['kind'].value
+          tag.attributes['kind'].value.to_sym
         elsif tag.content === "\t"
-          'tab'
+          :tab
         end
       end
     end
@@ -97,16 +112,20 @@ module Ulysses
     end
 
     def parse_element(node)
-      kind = node.attributes['kind'].value
-      if INLINE_MARKUPS.include?(kind)
-        parse_inline_style(kind, node)
-      else
-        send "parse_element_#{node.attributes['kind'].value}", node
-      end
+      kind = node.attributes['kind'].value.to_sym
+      return '' if HIDDEN_ELEMENTS.include? kind
+      return parse_simple_element(kind, node) if SIMPLE_ELEMENTS.has_key?(kind)
+
+      send("parse_element_#{kind}", node)
     end
 
-    def parse_inline_style(markup, node)
-      '<span class="' + snake_case(markup) + '">' + parse_content(node.children) + '</span>'
+    def parse_simple_element(kind, node)
+      content = parse_content(node.children)
+      if (html_tag = SIMPLE_ELEMENTS[kind]) === 'span'
+        '<span class="' + snake_case(kind) + '">' + content + '</span>'
+      else
+        "<#{html_tag}>#{content}</#{html_tag}>"
+      end
     end
 
     def parse_element_link(node)
@@ -128,7 +147,7 @@ module Ulysses
     def parse_element_footnote(node)
       attrs = parse_element_attributes(node)
       @footnotes << attrs['text']
-      '<sup class="footnote-ref"><a href="#fn' + @footnotes.size.to_s + '">' + @footnotes.size.to_s + '</a></sup>'
+      '<sup class="footnote-ref"><a href="#fn-' + @footnotes.size.to_s + '">' + @footnotes.size.to_s + '</a></sup>'
     end
 
     def parse_element_annotation(node)
@@ -146,7 +165,7 @@ module Ulysses
     end
 
     def snake_case(tag)
-      tag.gsub(/::/, '/')
+      tag.to_s.gsub(/::/, '/')
           .gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
           .gsub(/([a-z\d])([A-Z])/,'\1_\2')
           .gsub(/([a-z])(\d)/i, '\1_\2')
@@ -154,5 +173,15 @@ module Ulysses
           .downcase
     end
 
+    def parse_line_class(tags)
+      tabs = tags.count(:tab)
+      if tabs > 1
+        tags.delete(:tab)
+        tags << :"tabs_#{tabs}"
+      end
+      tags.unshift :line
+      tags.uniq.map{ |t| snake_case(t) }.join(' ')
+    end
+
   end
 end

data/lib/ulysses/version.rb

@@ -1,3 +1,3 @@
 module Ulysses
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/ulysses.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'nokogiri'
-  spec.add_dependency 'kramdown'
   spec.add_dependency 'htmlentities'
 
   spec.add_development_dependency "bundler", "~> 1.11"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ulysses
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Yaodong Zhao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-13 00:00:00.000000000 Z
+date: 2016-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: kramdown
-  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: htmlentities
   requirement: !ruby/object:Gem::Requirement