doc2text 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1821e833815ea821090507cea37fdec0c68dc2af
-  data.tar.gz: 7815dd2e3f7fbf1f822959e4a120ef0e0bcbef79
+  metadata.gz: 555e469e3b8ba226e8ffe20fa8052e377f037a74
+  data.tar.gz: 0ba30a01a5a55188202b3224a8ade79becf9099d
 SHA512:
-  metadata.gz: 5b3a0e9729eccccd888432527455336214d52ad996920593e30edab1d2e5f29bcdefdca19dfdbf9f7bf686bfabb8a6888cf706a386f058d7ee07b9bacac1e9e8
-  data.tar.gz: 6ffbb43bd9c8e4eac000b4733f3bcb149a6cee3b8cd608a22a0ca4516fbbc7317a2d30b4b0f15d8dee0c103df509ee24b029393503bd4bb40e16d22ed6c1543a
+  metadata.gz: a608fd6d8f606c6dd29669a50e6219ce0ca505bce2aa58ad7d6005e81b22bf34a6b9a9db59cade78fa66c04906f71fede4059f3e03666883dbd7cc6934c41d7f
+  data.tar.gz: 01e299c31d90f31c4cdaaadb2010ad50f67c305364a12e8afb826f2e9af93b7e7a93e49f77778366c1d8c40a138d8506846c3d65a1fa9c9ee31c3532c4d13414

data/lib/doc2text/content.rb

@@ -2,21 +2,21 @@ module Doc2Text
   module Odt
     module Content
       class Document < ::Nokogiri::XML::SAX::Document
-        def initialize(markdown_document)
-          @markdown_document = markdown_document
+        def initialize(markdown_odt_parser)
+          @markdown_odt_parser = markdown_odt_parser
         end
 
         def start_element_namespace(name ,attrs = [], prefix = nil, uri = nil, ns = [])
-          @markdown_document.new_node prefix, name, attrs
+          @markdown_odt_parser.new_node prefix, name, attrs
         end
 
         def end_element_namespace(name, prefix = nil, uri = nil)
-          @markdown_document.close_node prefix, name
+          @markdown_odt_parser.close_node prefix, name
         end
 
         def characters(string)
           unless string.strip.empty?
-            @markdown_document << string
+            @markdown_odt_parser.text string
           end
         end
       end

data/lib/doc2text/{markdown.rb → markdown_odt_parser.rb}

@@ -1,6 +1,8 @@
+require 'logger'
+
 module Doc2Text
   module Markdown
-    class Document
+    class OdtParser
       def initialize(output)
         @output = output
         @automatic_styles = {}
@@ -13,24 +15,23 @@ module Doc2Text
           new_node = Odt::XmlNodes::Node.create_node prefix, name, @current_node, attrs, self
           @current_node.children << new_node
           @current_node = new_node
-          self << @current_node.open
         end
       end
 
       def close_node(prefix, name)
-        if Odt::XmlNodes::Node.create_node(prefix, name).eql? @current_node
+        if Odt::XmlNodes::Node.create_node(prefix, name, nil, [], self).eql? @current_node
+          return if !@current_node
           if @current_node.delete_on_close?
-            remove_current_node!
-          else
-            remove_current_node! false
+            # if @current_node.parent
+            #   @output << @current_node.parent.expand
+            #   @current_node.parent.un_delete
+            # else
+              @output << @current_node.expand
+            # end
           end
-        elsif Odt::XmlNodes::Node.create_node(prefix, name).eql? @current_node.parent
-          if @current_node.parent.delete_on_close?
-            remove_current_node!
-            remove_current_node!
-          else
-            remove_current_node! false
-            remove_current_node! false
+          @current_node = @current_node.parent
+          if @current_node && @current_node.delete_on_close?
+            @current_node.delete
           end
         else
           # TODO remove this redundant(tree build algorithm) checks
@@ -38,19 +39,9 @@ module Doc2Text
         end
       end
 
-      def remove_current_node!(remove = true)
-        return if !@current_node
-        self << @current_node.close
-        node_for_deletion = @current_node
-        @current_node = @current_node.parent
-        return unless @current_node
-        if remove
-          @current_node.remove_last_child! node_for_deletion
-        end
-      end
-
-      def <<(string)
-        @output << string
+      def text(string)
+        plain_text = Odt::XmlNodes::PlainText.new(string)
+        @current_node.children << plain_text
       end
 
       def close
@@ -80,6 +71,10 @@ module Doc2Text
           raise Doc2Text::XmlError, 'it does not support this xpath syntax'
         end
       end
+
+      def logger
+        @logger ||= Logger.new(STDOUT)
+      end
     end
   end
 end

data/lib/doc2text/odt.rb

@@ -10,7 +10,7 @@ module Doc2Text
         begin
           odt.unpack
           output = File.open output_filename, 'w'
-          markdown = Markdown::Document.new output
+          markdown = Markdown::OdtParser.new output
           begin
             odt.parse markdown
           ensure

data/lib/doc2text/{namespaces.rb → odt_xml_namespaces.rb}

@@ -1,6 +1,18 @@
 module Doc2Text
   module Odt
     module XmlNodes
+      class PlainText
+        include Node
+
+        attr_accessor :text
+
+        alias_method :expand, :text
+
+        def initialize(text)
+          @text = text
+        end
+      end
+
       class Generic
         include Node
       end
@@ -26,7 +38,15 @@ module Doc2Text
           include Node
 
           def delete_on_close?
-            false # required for testing purposes. After a document has been parsed, some tests could be run against the tree built
+            true
+          end
+        end
+
+        class Text
+          include Node
+
+          def delete_on_close?
+            true
           end
         end
       end
@@ -43,7 +63,26 @@ module Doc2Text
       module DataStyle; end
       module Presentation; end
       module Script; end
-      module Table; end
+      module Table
+        class TableRow
+          include Node
+
+          def expand
+            header_delimiter = parent.children.count >= 2 && parent.children[1] == self ? "\n|---|---|" : ''
+            result = "\n#{@children.select(&:not_deleted?).map(&:expand).join.strip.gsub "\n", ''} |#{header_delimiter}"
+            delete
+            result
+          end
+        end
+
+        class TableCell
+          include Node
+
+          def open
+            ' | '
+          end
+        end
+      end
       module Style
         class Style
           include Node
@@ -67,19 +106,24 @@ module Doc2Text
       module Of; end
 
       module Text
-        def initialize(parent = nil, attrs = [], prefix = nil, name = nil, markdown_document = nil)
-          super parent, attrs, prefix, name, markdown_document
-          @markdown_document = markdown_document
+        def initialize(parent = nil, attrs = [], prefix = nil, name = nil, markdown_odt_parser = nil)
+          super parent, attrs, prefix, name
+          @markdown_odt_parser = markdown_odt_parser
           style_index = attrs.index { |attr| attr.prefix == 'text' && attr.localname == 'style-name' }
           @enclosing_style = []
-          if style_index
-            fetch_style attrs[style_index].value
+          if style_index and fetch_style?
+            elem_style = find_style attrs[style_index].value
+            fetch_style elem_style
           end
         end
 
-        def fetch_common_style(style)
-          if style
-            style.children.select { |style_property| style_property.xml_name == 'style:text-properties' }.each { |text_property|
+        def fetch_style?
+          true
+        end
+
+        def fetch_style(elem_style)
+          if elem_style
+            elem_style.children.select { |style_property| style_property.xml_name == 'style:text-properties' }.each { |text_property|
               text_property.attrs.each { |attr|
                 if attr.prefix == 'style'
                   if attr.localname == 'font-style-complex' && attr.value == 'italic'
@@ -93,11 +137,10 @@ module Doc2Text
           end
         end
 
-        def fetch_style(style_name)
-          styles = @markdown_document.xpath '/office:document-content/office:automatic-styles/style:style'
-          style = styles.find { |style| style.attrs.index { |attr| attr.prefix == 'style' && attr.localname == 'family' && attr.value == self.class.style_family } &&
+        def find_style(style_name)
+          styles = @markdown_odt_parser.xpath '/office:document-content/office:automatic-styles/style:style'
+          styles.find { |style| style.attrs.index { |attr| attr.prefix == 'style' && attr.localname == 'family' } &&
               style.attrs.index { |attr| attr.prefix == 'style' && attr.localname == 'name' && attr.value == style_name } }
-          fetch_common_style style
         end
 
         # http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part1.html#__RefHeading__1419256_253892949
@@ -105,8 +148,8 @@ module Doc2Text
           include Node
           include Text
 
-          def initialize(parent = nil, attrs = [], prefix = nil, name = nil, markdown_document = nil)
-            super parent, attrs, prefix, name, markdown_document
+          def initialize(parent = nil, attrs = [], prefix = nil, name = nil, markdown_odt_parser = nil)
+            super parent, attrs, prefix, name, markdown_odt_parser
           end
 
           def self.style_family
@@ -153,15 +196,46 @@ module Doc2Text
           include Node
           include Text
 
-          not_enclosing 'p'
+          def expand
+            result = "* #{@children.select(&:not_deleted?).map(&:expand).join.strip.gsub /\n{2,}/, "\n"}\n"
+            delete
+            result.clone
+          end
 
-          def open
-            '* '
+          def fetch_style?
+            false
           end
 
-          def close
+          def delete_on_close?
+            false
+          end
+        end
+
+        class List
+          include Node
+          include Text
+
+          def open
             "\n"
           end
+
+          def fetch_style(elem_style)
+            if elem_style
+              elem_style.children.select { |style_property| style_property.xml_name == 'style:text-properties' }.each { |text_property|
+                text_property.attrs.each { |attr|
+                  if attr.prefix == 'style'
+                    if attr.localname == 'list-level-style-number' && attr.value == 'Numbering_20_Symbols'
+                      @enclosing_style << '_'
+                    end
+                  end
+                }
+              }
+            end
+          end
+
+          def delete_on_close?
+            false
+          end
         end
       end
     end

data/lib/doc2text/odt_xml_node.rb

@@ -3,14 +3,16 @@ module Doc2Text
     module XmlNodes
       module Node
         attr_reader :parent, :children, :attrs, :prefix, :name
+        attr_accessor :text
 
-        def self.create_node(prefix, name, parent = nil, attrs = [], markdown_document = nil)
+        def self.create_node(prefix, name, parent = nil, attrs = [], markdown_odt_parser = nil)
           begin
             clazz = XmlNodes.const_get "#{titleize prefix}::#{titleize name}"
           rescue NameError => e
-            Generic.new(parent, attrs, prefix, name, markdown_document)
+            # markdown_odt_parser.logger.warn "No such <#{prefix}:#{name}> found"
+            Generic.new(parent, attrs, prefix, name, markdown_odt_parser)
           else
-            clazz.new(parent, attrs, prefix, name, markdown_document)
+            clazz.new(parent, attrs, prefix, name, markdown_odt_parser)
           end
         end
 
@@ -18,8 +20,8 @@ module Doc2Text
           tag.split('-').map(&:capitalize).join
         end
 
-        def initialize(parent = nil, attrs = [], prefix = nil, name = nil, markdown_document = nil)
-          @parent, @attrs, @prefix, @name = parent, attrs, prefix, name
+        def initialize(parent = nil, attrs = [], prefix = nil, name = nil, markdown_odt_parser = nil)
+          @parent, @attrs, @prefix, @name, @markdown_odt_parser = parent, attrs, prefix, name, markdown_odt_parser
           @children = []
           @has_text = false
         end
@@ -40,12 +42,22 @@ module Doc2Text
           ''
         end
 
-        def <<(child)
-          @children << child
+        def delete_on_close?
+          false
         end
 
-        def delete_on_close?
-          true
+        def not_deleted?
+          !@deleted
+        end
+
+        def delete
+          @deleted = true
+          # @children.each { |child| child.delete }
+          # @children = []
+        end
+
+        def un_delete
+          @deleted = false
         end
 
         def eql?(object)
@@ -57,15 +69,6 @@ module Doc2Text
           instance_of? Node
         end
 
-        def remove_last_child!(child)
-          unless child === @children.last
-            # TODO remove this redundant(tree build algorithm) checks
-            raise Doc2Text::XmlError, "!The child #{child} IS NOT among the children of #{self}"
-          else
-            @children.pop
-          end
-        end
-
         def xml_name
           "#{@prefix}:#{@name}"
         end
@@ -74,6 +77,12 @@ module Doc2Text
           "#{xml_name} : #{attrs}"
         end
 
+        def expand
+          expanded = "#{open}#{@children.select(&:not_deleted?).map(&:expand).join}#{close}"
+          delete
+          expanded.clone
+        end
+
         def not_enclosing?
           !root? && parent.class.not_enclosing_tags && parent.class.not_enclosing_tags.find do |tag|
             @prefix == parent.prefix && @name == tag

data/lib/doc2text.rb

@@ -4,8 +4,8 @@ require 'fileutils'
 
 require 'doc2text/odt'
 require 'doc2text/odt_xml_node'
-require 'doc2text/namespaces'
-require 'doc2text/markdown'
+require 'doc2text/odt_xml_namespaces'
+require 'doc2text/markdown_odt_parser'
 require 'doc2text/errors'
 
 require 'doc2text/content'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doc2text
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Valentin Aitken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-12 00:00:00.000000000 Z
+date: 2014-10-11 00:00:00.000000000 Z
 dependencies: []
 description: Parses odt to markdown
 email: bostko@gmail.com
@@ -19,9 +19,9 @@ files:
 - lib/doc2text.rb
 - lib/doc2text/content.rb
 - lib/doc2text/errors.rb
-- lib/doc2text/markdown.rb
-- lib/doc2text/namespaces.rb
+- lib/doc2text/markdown_odt_parser.rb
 - lib/doc2text/odt.rb
+- lib/doc2text/odt_xml_namespaces.rb
 - lib/doc2text/odt_xml_node.rb
 homepage: https://github.com/bostko/doc2text
 licenses:
@@ -43,7 +43,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Translates odt to markdown