diabible-parser 0.1.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 285570dffa4f4b3492b5f7be27719b19fe8196d50cbb45a193691d4337dda79d
-  data.tar.gz: 9298c266d811c7703b82cd027a22797846999494760efdc562b3b8f0130415c3
+  metadata.gz: f864fedb03063a06330cbd7e774288991bcc2aaecd718765ab0630bdf82f5635
+  data.tar.gz: e90ebc75f456a7253effff38b109bff9ea75f0b890c276cc333a2e0dd20b5b08
 SHA512:
-  metadata.gz: 3c7c5d92029e832189797bb5776669b05bc294cee0c558a8809c8bdbe1401eb8bafbabdfc927e6e721728c2d27f5e3356979c34a33adf36f18d3de4a988f369a
-  data.tar.gz: ca8d01a2932ca13ffcc3a1f9f6ff6e51b8008abf520c5a8d21dc670ae4632798ee20b595bd72aae77391bce0ab3e98fef173cebf7ed8f03a72d5923e5b0bc92b
+  metadata.gz: 38a09e6764a4dd0f34fa41791e6d7e5835960177fe8fc0b0576c878a8e2ece210e783bdc08c1e4a83c0ea246cf185d875ed7f71071960363214114aa61593188
+  data.tar.gz: 5802a91df97212ab7489204ad3c7f1017279076dfb59b89f8b6985cd359b20bf144dc9c9d8094779ddfc1f25a92cd0975830535617695f6bcfcd284935445587

data/lib/diabible/parser/document.rb

@@ -29,11 +29,11 @@ module Diabible
 
     class Document
       include Helpers::Info
-      include Helpers::Notes
+      include Helpers::Metadata
       include Helpers::Text
 
       # default constructor
-      def initialize(document, info: true, notes: true, text: true, limit: 0)
+      def initialize(document, info: true, text: true, limit: 0)
         Zip::File.open(URI.open(document)) do |zip_file|
           # open content xml
           @document = Nokogiri::XML(zip_file.read("word/document.xml"))
@@ -46,7 +46,6 @@ module Diabible
         @limit = limit
         # parse
         parse_info if info
-        parse_notes if notes
         parse_text if text
       end
 
@@ -71,19 +70,9 @@ module Diabible
 
       private
 
-      def info_count
-        @info_count ||= 0
-        @info_count += 1
-      end
-
-      def note_count
-        @note_count ||= 0
-        @note_count += 1
-      end
-
-      def text_count
-        @text_count ||= 0
-        @text_count += 1
+      def count
+        @count ||= 0
+        @count += 1
       end
 
       # get text content of all nodes matched by xpath
@@ -97,18 +86,6 @@ module Diabible
         # return container
         content
       end
-
-      # add meta hash
-      def add_metadata(name, type, value, position = nil)
-        # firstly check if the last field is not a same type
-        if @metadata.last and @metadata.last[:type] != PARAGRAPH and @metadata.last[:type] == type
-          # merge fields together
-          @metadata.last[:value] += value
-        else
-          # normally add a new meta hash with uniqe namee
-          @metadata << { name: "#{name}_#{send("#{name}_count")}_#{type}", type: type, value: value, position: position }
-        end
-      end
     end
   end
 end

data/lib/diabible/parser/helpers.rb

@@ -19,8 +19,9 @@
 # Authors: Michal Mocnak <michal@marigan.net>
 #
 
+require 'diabible/parser/helpers/constants'
 require 'diabible/parser/helpers/info'
-require 'diabible/parser/helpers/notes'
+require 'diabible/parser/helpers/metadata'
 require 'diabible/parser/helpers/text'
 
 module Diabible

data/lib/diabible/parser/helpers/{notes.rb → constants.rb}

@@ -22,28 +22,10 @@
 module Diabible
   module Parser
     module Helpers
-      module Notes
+      module Constants
 
-        private
-
-        # parse notes box
-        def parse_notes
-          # iterate through all paragraphs with style
-          @document.xpath("//body/p").each do |p|
-            # store pStyle value
-            pStyle = p.xpath(".//pStyle/@val")
-            # process only those with pstyle
-            unless pStyle.empty? or ['Hlavicka', 'Incipit', 'Podnadpis', 'Podnadpis1'].include?(pStyle.first.value)
-              # iterate over r blocks
-              p.xpath(".//r").each do |r|
-                name = pStyle.first.value
-                value = content(r, ".//t")
-                # add into container
-                add_metadata("note", name, value)
-              end
-            end
-          end
-        end
+        NONE = 'none'
+        PARAGRAPH = 'paragraph'
       end
     end
   end

data/lib/diabible/parser/helpers/metadata.rb

@@ -0,0 +1,69 @@
+#
+# Copyright (C) 2021 diabible.com
+#
+# This file is part of Diabible Parser.
+#
+# Diabible Parser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Diabible Parser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Diabible Parser. If not, see <http://www.gnu.org/licenses/>.
+#
+# Authors: Michal Mocnak <michal@marigan.net>
+#
+
+module Diabible
+  module Parser
+    module Helpers
+      module Metadata
+
+        # add meta hash
+        def add_metadata(group, type, value, position = nil)
+          # get index
+          index = count
+          # normally add a new meta hash with uniqe name
+          @metadata << { name: "#{index}_#{group}_#{type}", group: group, type: type, index: index, value: value, position: position }
+        end
+
+        # get metadata array per group or type
+        def get_metadata(group: nil, type: nil, filter: :exclusive, filters: [])
+          if group and type
+            return metadata_query(filter: filter, filters: filters) do |m|
+              m[:group] == group and m[:type] == type
+            end
+          elsif group
+            return metadata_query(filter: filter, filters: filters) do |m|
+              m[:group] == group
+            end
+          elsif type
+            return metadata_query(filter: filter, filters: filters) do |m|
+              m[:type] == type
+            end
+          end
+          # empty when nothing selected
+          return []
+        end
+
+        def metadata_query(filter: :exclusive, filters: [])
+          return @metadata.select do |m|
+            if filters.empty?
+              yield m
+            else
+              # get filters intersection
+              filtered = filters & [m[:type], m[:group]]
+              # resolution
+              (yield m) and (filter == :exclusive ? filtered.empty? : !filtered.empty?)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/diabible/parser/helpers/text.rb

@@ -19,49 +19,50 @@
 # Authors: Michal Mocnak <michal@marigan.net>
 #
 
+require 'diabible/parser/helpers/constants'
+
 module Diabible
   module Parser
     module Helpers
       module Text
+        include Diabible::Parser::Helpers::Constants
 
         private
 
-        # paragraph type id
-        PARAGRAPH = 'paragraph'
-
         # parse main text entries
         def parse_text
           # iterate through all paragraphs without style
           @document.xpath("//body/p").each do |p|
             # store pStyle value
             pStyle = p.xpath(".//pStyle/@val")
-            # process only those without pstyle
-            if pStyle.empty? or (pStyle.size and ['Incipit', 'Podnadpis', 'Podnadpis1'].include?(pStyle.first.value))
-              # position in for paragraph
-              paragraph_in = @text.length
-              # iterate over r blocks
-              p.xpath(".//r").each do |r|
-                # store rstyle value
-                rStyle = r.xpath(".//rStyle/@val")
-                # if empty then it's a plain text without style
-                if rStyle.empty? or rStyle.first.value === 'Text'
-                  # update text object
-                  @text += content(r, ".//t")
-                else
-                  # otherwise create metadata field
-                  name = rStyle.first.value
-                  value = content(r, ".//t")
-                  # add into container
-                  add_metadata("text", name, value, { in: @text.length })
-                end
-              end
-              # position out for paragraph
-              paragraph_out = @text.length
-              # filter paragraphs without content
-              if paragraph_in != paragraph_out
-                add_metadata("text", PARAGRAPH, nil, { in: paragraph_in, out: paragraph_out })
+            # prepare group
+            group = pStyle.first.value unless pStyle.empty?
+            group ||= NONE
+            # position in for paragraph against plain text
+            paragraph_in = @text.length
+            # iterate over r blocks
+            p.xpath(".//r").each do |r|
+              # store rstyle value
+              rStyle = r.xpath(".//rStyle/@val")
+              # if empty then it's a plain text without style
+              if (rStyle.empty? or rStyle.first.value === 'Text') and pStyle.empty?
+                # update text object
+                @text += content(r, ".//t")
+              else
+                # otherwise create metadata field
+                # prepare type
+                type = rStyle.first.value unless rStyle.empty?
+                type ||= NONE
+                # prepare value
+                value = content(r, ".//t")
+                # add into container
+                add_metadata(group, type, value, { in: @text.length })
               end
             end
+            # position out for paragraph
+            paragraph_out = @text.length
+            # filter paragraphs without content
+            add_metadata(PARAGRAPH, group, NONE, { in: paragraph_in, out: paragraph_out })
             # limit check
             if @limit > 0
               if @metadata.size >= @limit

data/lib/diabible/parser/version.rb

@@ -21,6 +21,6 @@
 
 module Diabible
   module Parser
-    VERSION = "0.1.9"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diabible-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Michal Mocnak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -65,8 +65,9 @@ files:
 - lib/diabible/parser.rb
 - lib/diabible/parser/document.rb
 - lib/diabible/parser/helpers.rb
+- lib/diabible/parser/helpers/constants.rb
 - lib/diabible/parser/helpers/info.rb
-- lib/diabible/parser/helpers/notes.rb
+- lib/diabible/parser/helpers/metadata.rb
 - lib/diabible/parser/helpers/text.rb
 - lib/diabible/parser/version.rb
 - spec/spec_helper.rb