ulysses 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c7b1d519c285491fa42fda0e4f870252021883b
-  data.tar.gz: 38235905aa64dc7ead038ec120bbfb0daaf116c3
+  metadata.gz: 94a96891b11b517de41e2a090402f02e12404b96
+  data.tar.gz: 894df84f95414f2b8e328439e05fc7c57447bd73
 SHA512:
-  metadata.gz: 4ea24651011856c59aa05c7a6d6129b2c256c7b60b42d0a117d77273b772f044f85b32d7686549a6436383f57d2540c1061bd3a0f83bf3dda1450643de902e05
-  data.tar.gz: b64626d3d96e51b58d2e4be8fd58ea6c3ab081fb9f1ad44e9055c69d91a16086cde221d77b86882b7cec816b02dd2b1baa8f40fd2228cce961456a9ec30f9072
+  metadata.gz: caa083c9df77861877daeb0b5fa3967de65dc3c2799fe57aaa40a2e1fdd6cfbf7f21fc70d051996536e079bb044fa539e597d15a0bbc661a088efaebccc631f5
+  data.tar.gz: ff82e2446f4dbe38300af87dd0a5509e4522c72d2d67899a6d72966576dc8ffc420b6e36ffbc1f82f5cc479fa297d79bffe47946ee5913e4754dd8038bb2ab9a

data/README.md

@@ -39,10 +39,10 @@ Get Sheets:
 
     group.sheets
     
-Export sheet to HTML:
+Print sheet to HTML:
 
-    sheet = group.sheets.first
-    html  = sheet.to_html
+    printer = Ulysses::Printer.new(library) # also applies to group or sheet 
+    html = printer.print
 
 ## Development
 

data/lib/ulysses.rb

@@ -5,7 +5,6 @@ require 'ulysses/library'
 require 'ulysses/group'
 require 'ulysses/sheet'
 require 'ulysses/printer'
-require 'ulysses/printer/elements'
 require 'ulysses/version'
 
 module Ulysses

data/lib/ulysses/printer.rb

@@ -1,6 +1,7 @@
 module Ulysses
   class Printer
 
+    INLINE_MARKUPS = %w(strong emph mark delete inlineComment code inlineNative)
     SHEET_CONTENT_XPATH = '/sheet/string[@xml:space="preserve"]'
 
     def initialize(target)
@@ -55,8 +56,12 @@ module Ulysses
         tags.delete('tab')
         tags << "tabs_#{tabs}"
       end
-      tags = tags.uniq.map{|t| normalize_tag(t)}.join(' ')
-      "<p class=\"#{tags}\">#{content}</p>"
+      if tags.any?
+        tags = tags.uniq.map{|t| snake_case(t)}.join(' ')
+        "<p class=\"#{tags}\">#{content}</p>"
+      else
+        "<p>#{content}</p>"
+      end
     end
 
     def parse_content(nodes)
@@ -92,10 +97,55 @@ module Ulysses
     end
 
     def parse_element(node)
-      send "parse_element_#{node.attributes['kind'].value}", 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
+    end
+
+    def parse_inline_style(markup, node)
+      '<span class="' + snake_case(markup) + '">' + parse_content(node.children) + '</span>'
+    end
+
+    def parse_element_link(node)
+      attrs   = parse_element_attributes(node)
+      content = parse_content(node.children.select{ |child| !child.element? || child.name != 'attribute' })
+      '<a href="' + attrs.fetch('URL', '') + '" title="' + attrs.fetch('title', '') + '">' + content + '</a>'
+    end
+
+    def parse_element_image(node)
+      attrs = parse_element_attributes(node)
+      '<img src="' + attrs.fetch('URL', '') + '" alt="' + attrs.fetch('title', '') + '" />'
+    end
+
+    def parse_element_video(node)
+      attrs = parse_element_attributes(node)
+      '<video><source src="' + attrs['URL'] + '" /></video>'
+    end
+
+    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>'
+    end
+
+    def parse_element_annotation(node)
+      attrs = parse_element_attributes(node)
+      @annotations << attrs['text']
+      '<span class="annotation" data-id="' + @annotations.size.to_s + '">' + @annotations.size.to_s + '</span>'
+    end
+
+    def parse_element_attributes(element)
+      attributes = element.children.select { |child| child.element? && child.name === 'attribute' }
+      attributes.map! do |attr|
+        [attr.attributes['identifier'].value, parse_content(attr.children)]
+      end
+      Hash[attributes]
     end
 
-    def normalize_tag(tag)
+    def snake_case(tag)
       tag.gsub(/::/, '/')
           .gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
           .gsub(/([a-z\d])([A-Z])/,'\1_\2')

data/lib/ulysses/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ulysses
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Yaodong Zhao
@@ -115,7 +115,6 @@ files:
 - lib/ulysses/group.rb
 - lib/ulysses/library.rb
 - lib/ulysses/printer.rb
-- lib/ulysses/printer/elements.rb
 - lib/ulysses/sheet.rb
 - lib/ulysses/version.rb
 - ulysses.gemspec

data/lib/ulysses/printer/elements.rb

@@ -1,69 +0,0 @@
-module Ulysses
-  class Printer
-
-    def parse_element_strong(node)
-      '<strong>' + node.content + '</strong>'
-    end
-
-    def parse_element_emph(node)
-      '<em>' + node.content + '</em>'
-    end
-
-    def parse_element_mark(node)
-      '<span class="marked">' + node.content + '</span>'
-    end
-
-    def parse_element_delete(node)
-      '<del>' + node.content + '</del>'
-    end
-
-    def parse_element_inlineComment(node)
-      '<span class="inline-comment">' + node.content + '</span>'
-    end
-
-    def parse_element_code(node)
-      '<code>' + node.content + '</code>'
-    end
-
-    def parse_element_inlineNative(node)
-      '<span class="inline-native">' + node.content + '</span>'
-    end
-
-    def parse_element_link(node)
-      attrs   = parse_element_attributes(node)
-      content = parse_content(node.children.select{ |child| !child.element? || child.name != 'attribute' })
-      '<a href="' + attrs.fetch('URL', '') + '" title="' + attrs.fetch('title', '') + '">' + content + '</a>'
-    end
-
-    def parse_element_image(node)
-      attrs = parse_element_attributes(node)
-      '<img src="' + attrs.fetch('URL', '') + '" alt="' + attrs.fetch('title', '') + '" />'
-    end
-
-    def parse_element_video(node)
-      attrs = parse_element_attributes(node)
-      '<video><source src="' + attrs['URL'] + '" /></video>'
-    end
-
-    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>'
-    end
-
-    def parse_element_annotation(node)
-      attrs = parse_element_attributes(node)
-      @annotations << attrs['text']
-      '<span class="annotation" data-id="' + @annotations.size.to_s + '">' + @annotations.size.to_s + '</span>'
-    end
-
-    def parse_element_attributes(element)
-      attributes = element.children.select { |child| child.element? && child.name === 'attribute' }
-      attributes.map! do |attr|
-        [attr.attributes['identifier'].value, parse_content(attr.children)]
-      end
-      Hash[attributes]
-    end
-
-  end
-end