doc2text 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 555e469e3b8ba226e8ffe20fa8052e377f037a74
-  data.tar.gz: 0ba30a01a5a55188202b3224a8ade79becf9099d
+  metadata.gz: 143e076cf52e7beda9fc90bf38f80b0695dac194
+  data.tar.gz: bc1c78cda02cd9ab1c5536a83b50ea89711b8b3d
 SHA512:
-  metadata.gz: a608fd6d8f606c6dd29669a50e6219ce0ca505bce2aa58ad7d6005e81b22bf34a6b9a9db59cade78fa66c04906f71fede4059f3e03666883dbd7cc6934c41d7f
-  data.tar.gz: 01e299c31d90f31c4cdaaadb2010ad50f67c305364a12e8afb826f2e9af93b7e7a93e49f77778366c1d8c40a138d8506846c3d65a1fa9c9ee31c3532c4d13414
+  metadata.gz: 9ebfe477ca9ca9da0b1784f929ead6f7729d8e626690562043d474debda3fd9209abf6862498569eca736d0ab8e21535b0a642cd47ed9e84e37b247b3cdacd0a
+  data.tar.gz: 5e826d5a707999eb81f1486d60b67cd7098fb1653f324f646bb4a83b4d8069c31f8395b38fbe5d500729ebc22871575e5684e2c991d176723e396ea970adb6e3

data/lib/doc2text/markdown_odt_parser.rb

@@ -19,24 +19,16 @@ module Doc2Text
       end
 
       def close_node(prefix, name)
-        if Odt::XmlNodes::Node.create_node(prefix, name, nil, [], self).eql? @current_node
-          return if !@current_node
-          if @current_node.delete_on_close?
-            # if @current_node.parent
-            #   @output << @current_node.parent.expand
-            #   @current_node.parent.un_delete
-            # else
-              @output << @current_node.expand
-            # end
-          end
-          @current_node = @current_node.parent
-          if @current_node && @current_node.delete_on_close?
+        # if Odt::XmlNodes::Node.create_node(prefix, name, nil, [], self).eql? @current_node
+          if @current_node.parent and @current_node.parent.office_text?
+            @output << @current_node.expand
             @current_node.delete
           end
-        else
-          # TODO remove this redundant(tree build algorithm) checks
-          raise Doc2Text::XmlError, "!Close node child #{prefix} #{name} IS NOT correct, CURRENT_ELEM #{@current_node}"
-        end
+          @current_node = @current_node.parent
+        # else
+        #   # TODO remove this redundant(tree build algorithm) checks
+        #   raise Doc2Text::XmlError, "!Close node child #{prefix} #{name} IS NOT correct, CURRENT_ELEM #{@current_node}"
+        # end
       end
 
       def text(string)

data/lib/doc2text/odt_xml_namespaces.rb

@@ -24,28 +24,16 @@ module Doc2Text
       module Office
         class AutomaticStyles
           include Node
-
-          def visit
-            :automatic_styles
-          end
-
-          def delete_on_close?
-            false
-          end
         end
 
         class DocumentContent
           include Node
-
-          def delete_on_close?
-            true
-          end
         end
 
         class Text
           include Node
 
-          def delete_on_close?
+          def office_text?
             true
           end
         end
@@ -69,7 +57,7 @@ module Doc2Text
 
           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}"
+            result = "\n#{@children.map(&:expand).join.strip.gsub "\n", ''} |#{header_delimiter}"
             delete
             result
           end
@@ -86,18 +74,10 @@ module Doc2Text
       module Style
         class Style
           include Node
-
-          def delete_on_close?
-            false
-          end
         end
 
         class TextProperties
           include Node
-
-          def delete_on_close?
-            false
-          end
         end
       end
       module XslFoCompatible; end
@@ -197,7 +177,7 @@ module Doc2Text
           include Text
 
           def expand
-            result = "* #{@children.select(&:not_deleted?).map(&:expand).join.strip.gsub /\n{2,}/, "\n"}\n"
+            result = "* #{@children.map(&:expand).join.strip.gsub /\n{2,}/, "\n"}\n"
             delete
             result.clone
           end
@@ -205,10 +185,6 @@ module Doc2Text
           def fetch_style?
             false
           end
-
-          def delete_on_close?
-            false
-          end
         end
 
         class List
@@ -232,10 +208,6 @@ module Doc2Text
               }
             end
           end
-
-          def delete_on_close?
-            false
-          end
         end
       end
     end

data/lib/doc2text/odt_xml_node.rb

@@ -42,22 +42,14 @@ module Doc2Text
           ''
         end
 
-        def delete_on_close?
+        def office_text?
           false
         end
 
-        def not_deleted?
-          !@deleted
-        end
-
         def delete
-          @deleted = true
-          # @children.each { |child| child.delete }
-          # @children = []
-        end
-
-        def un_delete
-          @deleted = false
+          return true unless @children
+          @children.each { |child| child.delete }
+          @children = []
         end
 
         def eql?(object)
@@ -78,7 +70,7 @@ module Doc2Text
         end
 
         def expand
-          expanded = "#{open}#{@children.select(&:not_deleted?).map(&:expand).join}#{close}"
+          expanded = "#{open}#{@children.map(&:expand).join}#{close}"
           delete
           expanded.clone
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doc2text
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Valentin Aitken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-11 00:00:00.000000000 Z
+date: 2014-10-18 00:00:00.000000000 Z
 dependencies: []
 description: Parses odt to markdown
 email: bostko@gmail.com