ooxml_parser 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55075222dad4d0ce0cf77c8ab837020b57efc21b
-  data.tar.gz: 05112c96435c30a772a2f500b880f81146a6c889
+  metadata.gz: f40b6ee146d2fa4c06246636b63931ec3c178a2c
+  data.tar.gz: 08e151b4a17546c6787000bac1d727687ff6f5b5
 SHA512:
-  metadata.gz: 92f9263595d5b62c828af76b8d24b455c4a49ae39651d0b04435c27f38581b5923190281bb4ea1bef5d10f381fa343af62daac0cb0bfbe396e5d5d48541ae044
-  data.tar.gz: 9085d35864ab845f360e6710d67a56994f33b10ed01b7437b1674fc87470ae10acd87326a9026622a0121fda37d633b67da7fb83336af87bd946266753851f71
+  metadata.gz: 15187c6a9a8ac851637a1d9bfaa1f69cb651f6d22533fa66cb3b1c97c6960494daa6e3a82a2c38fec149c9c7d117289dc946273ee5b2626927b60627986f9b67
+  data.tar.gz: a1bfd37779ec4e6003a71e90f5eaed425eeca04bfb7d849e523f21b567413ad958fb227acb55cf7a15d3d97590e391a590953207451b880751e7b0d4b70fb075

data/README.md

@@ -4,7 +4,7 @@ _ooxml_parser_ is a Ooxml files (docx, xlsx, pptx) parser written in Ruby.
 
 ## Installation
 
-    $ gem install parser
+    $ gem install ooxml_parser
     
 ## Usage
 
@@ -23,4 +23,4 @@ Default is `:centimeters`
 
     OoxmlParser.configure do |config|
       config.units = :points
-    end
+    end

data/lib/ooxml_parser.rb

@@ -9,6 +9,8 @@ require_relative 'ooxml_parser/common_parser/common_data/paragraph'
 require_relative 'ooxml_parser/common_parser/common_data/alternate_content/alternate_content'
 require_relative 'ooxml_parser/common_parser/common_data/colors/presentation_fill'
 require_relative 'ooxml_parser/common_parser/common_data/table'
+require_relative 'ooxml_parser/common_parser/common_data/relationships'
+require_relative 'ooxml_parser/common_parser/parser'
 require_relative 'ooxml_parser/common_parser/common_document_structure'
 require_relative 'ooxml_parser/configuration'
 require_relative 'ooxml_parser/helpers/string_helper'

data/lib/ooxml_parser/common_parser/common_data/alternate_content/chart/chart.rb

@@ -31,9 +31,10 @@ module OoxmlParser
           when :point, :bubble
             val = chart_props_node_child.xpath('c:yVal')[0]
           else
-            val = nil
+            next
           end
-          @data << ChartCellsRange.parse(val.xpath('c:numRef').first).dup unless val.nil?
+          next if val.xpath('c:numRef').empty?
+          @data << ChartCellsRange.parse(val.xpath('c:numRef').first).dup
         when 'dLbls'
           @display_labels = DisplayLabelsProperties.parse(chart_props_node_child)
         end

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/picture/docx_blip.rb

@@ -12,6 +12,7 @@ module OoxmlParser
     def self.parse(blip_fill_node)
       blip = DocxBlip.new
       blip_node = blip_fill_node.xpath('a:blip', 'xmlns:a' => 'http://schemas.openxmlformats.org/drawingml/2006/main').first
+      return blip if blip_node.nil?
       path_to_media_file = OOXMLDocumentObject.get_link_from_rels(blip_node.attribute('embed').value)
       raise LoadError, "Cant find path to media file by id: #{blip_node.attribute('embed').value}" if path_to_media_file.empty?
       blip_node.xpath('*').each do |blip_node_child|
@@ -20,7 +21,7 @@ module OoxmlParser
           blip.alpha_channel = (blip_node_child.attribute('amt').value.to_f / 1_000.0).round(0).to_f
         end
       end
-      blip.path_to_media_file = OOXMLDocumentObject.copy_media_file("#{OOXMLDocumentObject.root_subfolder}/#{path_to_media_file.gsub('..', '')}")
+      blip.path_to_media_file = OOXMLDocumentObject.copy_media_file("#{OOXMLDocumentObject.root_subfolder}/#{path_to_media_file.gsub('..', '')}") unless path_to_media_file == 'NULL'
       blip
     end
   end

data/lib/ooxml_parser/common_parser/common_data/alternate_content/picture/group/old_docx_group.rb

@@ -19,7 +19,7 @@ module OoxmlParser
           element.object = OldDocxShape.parse(group_node_child)
           group.elements << element
         when 'wrap'
-          group.properties.wrap = group_node_child.attribute('type').value.to_sym if group_node_child.attribute('type').value
+          group.properties.wrap = group_node_child.attribute('type').value.to_sym unless group_node_child.attribute('type').nil?
         when 'group'
           element = parse(group_node_child)
           group.elements << element

data/lib/ooxml_parser/common_parser/common_data/alternate_content/picture/shape/old_docx_shape.rb

@@ -12,7 +12,7 @@ module OoxmlParser
         when 'textbox'
           shape.text_box = TextBox.parse_list(shape_node_child)
         when 'imagedata'
-          path_to_image = OOXMLDocumentObject.copy_media_file("#{OOXMLDocumentObject.root_subfolder}/#{get_link_from_rels(shape_node_child.attribute('id').value, OOXMLDocumentObject.path_to_folder)}")
+          path_to_image = OOXMLDocumentObject.copy_media_file("#{OOXMLDocumentObject.root_subfolder}/#{get_link_from_rels(shape_node_child.attribute('id').value)}")
           shape.image = path_to_image
         when 'fill'
           shape.fill = OldDocxShapeFill.parse(shape_node_child)

data/lib/ooxml_parser/common_parser/common_data/borders_properties.rb

@@ -41,16 +41,19 @@ module OoxmlParser
     # @param [Nokogiri::XML:Element] node with BordersProperties
     # @return [BordersProperties] value of BordersProperties
     def self.parse(node)
+      return nil if node.attribute('val').value == 'nil'
       border_properties = BordersProperties.new
       border_properties.val = node.attribute('val').value.to_sym
-      border_properties.sz = node.attribute('sz').value.to_f / 8.0
-      border_properties.space = (node.attribute('space').value.to_f / 28.34).round(3)
-      border_properties.color = node.attribute('color').value
-      unless node.attribute('shadow').nil?
-        border_properties.shadow = node.attribute('shadow').value
-      end
-      if border_properties.color != 'auto'
-        border_properties.color = Color.from_int16(border_properties.color)
+      border_properties.sz = node.attribute('sz').value.to_f / 8.0 if node.attribute('sz')
+      border_properties.space = (node.attribute('space').value.to_f / 28.34).round(3) unless node.attribute('space').nil?
+      if node.attribute('color')
+        border_properties.color = node.attribute('color').value
+        unless node.attribute('shadow').nil?
+          border_properties.shadow = node.attribute('shadow').value
+        end
+        if border_properties.color != 'auto'
+          border_properties.color = Color.from_int16(border_properties.color)
+        end
       end
       border_properties
     end

data/lib/ooxml_parser/common_parser/common_data/colors/hsl_color.rb

@@ -31,12 +31,11 @@ module OoxmlParser
       unless max == min
         hls_color.s = delta / (255.0 - (255.0 - max - min).abs)
 
-        hls_color.h = case
-                      when max == red && green >= blue
+        hls_color.h = if max == red && green >= blue
                         60.0 * (green - blue) / delta
-                      when max == red && green < blue
+                      elsif max == red && green < blue
                         60.0 * (green - blue) / delta + 360.0
-                      when max == green
+                      elsif max == green
                         60.0 * (blue - red) / delta + 120.0
                       else
                         60.0 * (red - green) / delta + 240.0
@@ -52,18 +51,17 @@ module OoxmlParser
       x = chroma * (1 - ((@h / 60.0) % 2.0 - 1).abs)
       m = @l - chroma / 2.0
 
-      rgb = case
-            when @h == 0
+      rgb = if @h == 0
               Color.new(0, 0, 0)
-            when @h > 0 && @h < 60
+            elsif @h > 0 && @h < 60
               Color.new(chroma, x, 0)
-            when @h > 60 && @h < 120
+            elsif @h > 60 && @h < 120
               Color.new(x, chroma, 0)
-            when @h > 120 && @h < 180
+            elsif @h > 120 && @h < 180
               Color.new(0, chroma, x)
-            when @h > 180 && @h < 240
+            elsif @h > 180 && @h < 240
               Color.new(0, x, chroma)
-            when @h > 240 && @h < 300
+            elsif @h > 240 && @h < 300
               Color.new(x, 0, chroma)
             else
               Color.new(chroma, 0, x)
@@ -74,12 +72,11 @@ module OoxmlParser
     def set_color(t1, t2, t3)
       t3 += 1.0 if t3 < 0
       t3 -= 1.0 if t3 > 1
-      case
-      when 6.0 * t3 < 1 then
+      if 6.0 * t3 < 1
         t2 + (t1 - t2) * 6.0 * t3
-      when 2.0 * t3 < 1 then
+      elsif 2.0 * t3 < 1
         t1
-      when 3.0 * t3 < 2 then
+      elsif 3.0 * t3 < 2
         t2 + (t1 - t2) * ((2.0 / 3.0) - t3) * 6.0
       else
         t2

data/lib/ooxml_parser/common_parser/common_data/colors/image/stretching.rb

@@ -1,3 +1,4 @@
+require_relative 'stretching/fill_rectangle'
 module OoxmlParser
   class Stretching
     attr_accessor :fill_rectangle

data/lib/ooxml_parser/common_parser/common_data/colors/image_fill.rb

@@ -16,6 +16,7 @@ module OoxmlParser
       blip_fill_node.xpath('*').each do |blip_fill_node_child|
         case blip_fill_node_child.name
         when 'blip'
+          next unless blip_fill_node_child.attribute('embed')
           path_to_original_image = OOXMLDocumentObject.get_link_from_rels(blip_fill_node_child.attribute('embed').value)
           FileUtils.copy(dir + path_to_original_image, OOXMLDocumentObject.media_folder + File.basename(path_to_original_image))
           image.path = OOXMLDocumentObject.media_folder + File.basename(path_to_original_image)

data/lib/ooxml_parser/common_parser/common_data/colors/presentation_fill/gradient_color.rb

@@ -25,8 +25,7 @@ module OoxmlParser
         when 'path'
           gradient_color.path = gradient_fill_node_child.attribute('path').value.to_sym
         when 'lin'
-          gradient_color.path = LinearGradient.new(gradient_fill_node_child.attribute('ang').value.to_f / 100_000.0,
-                                                   gradient_fill_node_child.attribute('scaled').value.to_i)
+          gradient_color.path = LinearGradient.parse(gradient_fill_node_child)
         end
       end
       gradient_color

data/lib/ooxml_parser/common_parser/common_data/colors/presentation_fill/gradient_color/linear_gradient.rb

@@ -6,5 +6,15 @@ module OoxmlParser
       @angle = angle
       @scaled = scaled
     end
+
+    # Parse LinearGradient object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [LinearGradient] result of parsing
+    def self.parse(node)
+      gradient = LinearGradient.new
+      gradient.angle = node.attribute('ang').value.to_f / 100_000.0 if node.attribute('ang')
+      gradient.scaled = node.attribute('scaled').value.to_i if node.attribute('scaled')
+      gradient
+    end
   end
 end

data/lib/ooxml_parser/common_parser/common_data/hyperlink.rb

@@ -46,7 +46,12 @@ module OoxmlParser
           hyperlink.link_to = OOXMLDocumentObject.get_link_from_rels(on_click_hyperlink_node.attribute('id').value)
         end
       end
-      hyperlink.highlight_click = StringHelper.to_bool(on_click_hyperlink_node.attribute('highlightClick').value) unless on_click_hyperlink_node.attribute('highlightClick').nil?
+      return hyperlink unless on_click_hyperlink_node.attribute('highlightClick')
+      hyperlink.highlight_click = if on_click_hyperlink_node.attribute('highlightClick').value == '1'
+                                    true
+                                  else
+                                    false
+                                  end
       hyperlink
     end
   end

data/lib/ooxml_parser/common_parser/common_data/ooxml_document_object.rb

@@ -7,6 +7,15 @@ module OoxmlParser
   class OOXMLDocumentObject
     DEFAULT_DIRECTORY_FOR_MEDIA = '/tmp'.freeze
 
+    def ==(other)
+      instance_variables.each do |current_attribute|
+        unless instance_variable_get(current_attribute) == other.instance_variable_get(current_attribute)
+          return false
+        end
+      end
+      true
+    end
+
     class << self
       attr_accessor :namespace_prefix
       attr_accessor :root_subfolder
@@ -14,6 +23,20 @@ module OoxmlParser
       attr_accessor :xmls_stack
       attr_accessor :path_to_folder
 
+      # @param path_to_file [String] file
+      # @return [True, False] Check if file is protected by password on open
+      def encrypted_file?(path_to_file)
+        file_result = `file "#{path_to_file}"`
+        # Support of Encrtypted status in `file` util was introduced in file v5.20
+        # but LTS version of ubuntu before 16.04 uses older `file` and it return `Composite Document`
+        # https://github.com/file/file/blob/master/ChangeLog#L217
+        if file_result.include?('Encrypted') || file_result.include?('Composite Document File V2 Document, No summary info')
+          warn("File #{path_to_file} is encrypted. Can't parse it")
+          return true
+        end
+        false
+      end
+
       def copy_file_and_rename_to_zip(path)
         file_name = File.basename(path)
         tmp_folder = "/tmp/office_open_xml_parser_#{SecureRandom.uuid}"
@@ -78,8 +101,13 @@ module OoxmlParser
       def copy_media_file(path_to_file)
         folder_to_save_media = '/tmp/media_from_' + File.basename(OOXMLDocumentObject.path_to_folder)
         path_to_copied_file = folder_to_save_media + '/' + File.basename(path_to_file)
+        full_path_to_file = OOXMLDocumentObject.path_to_folder + path_to_file
+        unless File.exist?(full_path_to_file)
+          warn "Couldn't find #{full_path_to_file} file on filesystem. Possible problem in original document"
+          return nil
+        end
         FileUtils.mkdir(folder_to_save_media) unless File.exist?(folder_to_save_media)
-        FileUtils.copy_file(OOXMLDocumentObject.path_to_folder + path_to_file, path_to_copied_file)
+        FileUtils.copy_file(full_path_to_file, path_to_copied_file)
         path_to_copied_file
       end
     end

data/lib/ooxml_parser/common_parser/common_data/paragraph.rb

@@ -1,5 +1,6 @@
 require_relative 'paragraph/paragraph_properties'
 require_relative 'paragraph/paragraph_run'
+require_relative 'paragraph/text_field'
 module OoxmlParser
   class Paragraph
     attr_accessor :properties, :runs, :text_field, :formulas

data/lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties.rb

@@ -37,7 +37,7 @@ module OoxmlParser
           paragraph_properties.numbering.symbol = properties_element.attribute('char').value
         when 'buAutoNum'
           paragraph_properties.numbering.type = properties_element.attribute('type').value.to_sym
-          paragraph_properties.numbering.start_at = properties_element.attribute('startAt').value
+          paragraph_properties.numbering.start_at = properties_element.attribute('startAt').value if properties_element.attribute('startAt')
         when 'tabLst'
           paragraph_properties.tabs = ParagraphTab.parse(properties_element)
         end

data/lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_run/run_properties.rb

@@ -55,7 +55,7 @@ module OoxmlParser
         when 'i'
           character_properties.font_style.italic = OOXMLDocumentObject.option_enabled?(properties_element, 'i')
         when 'u'
-          character_properties.font_style.underlined = Underline.parse(properties_element.attribute('val').value)
+          character_properties.font_style.underlined = Underline.new(:single)
         when 'vertAlign'
           character_properties.vertical_align = properties_element.attribute('val').value.to_sym
         when 'rFont'

data/lib/ooxml_parser/common_parser/common_data/relationships.rb

@@ -0,0 +1,31 @@
+require_relative 'relationships/relationship'
+module OoxmlParser
+  # Class for describing list of relationships
+  class Relationships
+    # @return [Array, Relationship] array of relationships
+    attr_accessor :relationship
+
+    def initialize
+      @relationship = []
+    end
+
+    # @return [Array, Column] accessor for relationship
+    def [](key)
+      @relationship[key]
+    end
+
+    # Parse Relationships
+    # @param [Nokogiri::XML:Node] node with Relationships
+    # @return [Relationships] result of parsing
+    def self.parse(node)
+      rels = Relationships.new
+      node.xpath('*').each do |node_children|
+        case node_children.name
+        when 'Relationship'
+          rels.relationship << Relationship.parse(node_children)
+        end
+      end
+      rels
+    end
+  end
+end

data/lib/ooxml_parser/common_parser/common_data/relationships/relationship.rb

@@ -0,0 +1,22 @@
+module OoxmlParser
+  # Class for single relationship
+  class Relationship
+    # @return [String] id of relation
+    attr_accessor :id
+    # @return [String] type of relation
+    attr_accessor :type
+    # @return [String] target of relation
+    attr_accessor :target
+
+    # Parse Relationship
+    # @param [Nokogiri::XML:Node] node with Relationship
+    # @return [Relationship] result of parsing
+    def self.parse(node)
+      rel = Relationship.new
+      rel.id = node.attribute('Id').value
+      rel.type = node.attribute('Type').value
+      rel.target = node.attribute('Target').value
+      rel
+    end
+  end
+end

data/lib/ooxml_parser/common_parser/common_data/table.rb

@@ -4,7 +4,7 @@ require_relative 'table/table_grid'
 require_relative 'table/margins/table_margins'
 require_relative 'table/margins/paragraph_margins'
 module OoxmlParser
-  class Table
+  class Table < OOXMLDocumentObject
     attr_accessor :grid, :rows, :properties, :number
 
     def initialize(rows = [])

data/lib/ooxml_parser/common_parser/common_data/table/properties/table_style.rb

@@ -27,6 +27,7 @@ module OoxmlParser
       table_style = TableStyle.new
       if !style_id.nil?
         nodes = get_style_node(style_id)
+        return nil if nodes.nil?
         xpath = '*'
         attributes = 'style_node_child.name'
       elsif !table_style_node.nil?

data/lib/ooxml_parser/common_parser/common_data/table/properties/table_style_elements.rb

@@ -1,6 +1,6 @@
 # Table Style in XLSX
 module OoxmlParser
-  class TableStyleElement
+  class TableStyleElement < OOXMLDocumentObject
     attr_accessor :cell_properties
 
     def initialize

data/lib/ooxml_parser/common_parser/common_data/table/row/cell/cell_properties.rb

@@ -30,111 +30,54 @@ module OoxmlParser
         end
       end
       cell_borders = Borders.new
-      parse_w_namespace = true
-      begin
-        cell_properties_node.xpath('w:vMerge') # TODO: Perform not so stupit check
-      rescue Nokogiri::XML::XPath::SyntaxError
-        parse_w_namespace = false
+      cell_properties_node.xpath("#{OOXMLDocumentObject.namespace_prefix}:vMerge").each do |v_merge|
+        cell_properties.merge = CellMerge.parse(v_merge)
       end
-      if parse_w_namespace
-        cell_properties_node.xpath('w:vMerge').each do |v_merge|
-          merge = v_merge.attribute('count_rows_in_span').nil? ? nil : v_merge.attribute('count_rows_in_span').value
-          cell_properties.merge = CellMerge.new('vertical', v_merge.attribute('val').value, merge)
-        end
-        cell_properties_node.xpath('w:vAlign').each do |valign_node|
-          cell_properties.vertical_align = valign_node.attribute('val').value.to_sym
-        end
-        cell_properties_node.xpath('w:gridSpan').each do |grid_span|
-          cell_properties.merge = CellMerge.new('horizontal', grid_span.attribute('val').value)
+      cell_properties_node.xpath("#{OOXMLDocumentObject.namespace_prefix}:vAlign").each do |valign_node|
+        cell_properties.vertical_align = valign_node.attribute('val').value.to_sym
+      end
+      cell_properties_node.xpath("#{OOXMLDocumentObject.namespace_prefix}:gridSpan").each do |grid_span|
+        cell_properties.merge = CellMerge.new('horizontal', grid_span.attribute('val').value)
+      end
+      cell_properties_node.xpath("#{OOXMLDocumentObject.namespace_prefix}:tcW").each do |table_cell_width|
+        cell_properties.table_cell_width = table_cell_width.attribute('w').value.to_f / 567.5
+      end
+      cell_properties_node.xpath("#{OOXMLDocumentObject.namespace_prefix}:tcMar").each do |cell_margins_node|
+        cell_properties.table_cell_margin = TableMargins.parse(cell_margins_node)
+      end
+      cell_properties_node.xpath("#{OOXMLDocumentObject.namespace_prefix}:textDirection").each do |text_direction|
+        cell_properties.text_direction = Alignment.parse(text_direction.attribute('val'))
+      end
+      cell_properties_node.xpath("#{OOXMLDocumentObject.namespace_prefix}:tcBorders").each do |tc_boders|
+        tc_boders.xpath("#{OOXMLDocumentObject.namespace_prefix}:top").each do |top|
+          cell_borders.top = BordersProperties.parse(top)
         end
-        cell_properties_node.xpath('w:tcW').each do |table_cell_width|
-          cell_properties.table_cell_width = table_cell_width.attribute('w').value.to_f / 567.5
+        tc_boders.xpath("#{OOXMLDocumentObject.namespace_prefix}:right").each do |right|
+          cell_borders.right = BordersProperties.parse(right)
         end
-        cell_properties_node.xpath('w:tcMar').each do |cell_margins_node|
-          cell_properties.table_cell_margin = TableMargins.parse(cell_margins_node)
+        tc_boders.xpath("#{OOXMLDocumentObject.namespace_prefix}:left").each do |left|
+          cell_borders.left = BordersProperties.parse(left)
         end
-        cell_properties_node.xpath('w:textDirection').each do |text_direction|
-          cell_properties.text_direction = Alignment.parse(text_direction.attribute('val'))
+        tc_boders.xpath("#{OOXMLDocumentObject.namespace_prefix}:bottom").each do |bottom|
+          cell_borders.bottom = BordersProperties.parse(bottom)
         end
-        cell_properties_node.xpath('w:tcBorders').each do |tc_boders|
-          tc_boders.xpath('w:top').each do |top|
-            top_border = BordersProperties.new
-            top_border.color = top.attribute('color').value
-            if !top.attribute('color').nil? && top.attribute('color').value != 'auto'
-              top_border.color = Color.from_int16(top.attribute('color').value)
-            end
-            top_border.sz = top.attribute('sz').value.to_f / 8.0
-            top_border.val = top.attribute('val').value
-            top_border.space = top.attribute('space').value
-            cell_borders.top = top_border
-          end
-          tc_boders.xpath('w:right').each do |right|
-            right_border = BordersProperties.new
-            right_border.color = right.attribute('color').value
-            if !right.attribute('color').nil? && right.attribute('color').value != 'auto'
-              right_border.color = Color.from_int16(right.attribute('color').value)
-            end
-            right_border.sz = right.attribute('sz').value.to_f / 8.0
-            right_border.val = right.attribute('val').value
-            right_border.space = right.attribute('space').value
-            cell_borders.right = right_border
-          end
-          tc_boders.xpath('w:left').each do |left|
-            left_border = BordersProperties.new
-            left_border.color = left.attribute('color').value
-            if !left.attribute('color').nil? && left.attribute('color').value != 'auto'
-              left_border.color = Color.from_int16(left.attribute('color').value)
-            end
-            left_border.sz = left.attribute('sz').value.to_f / 8.0
-            left_border.val = left.attribute('val').value
-            left_border.space = left.attribute('space').value
-            cell_borders.left = left_border
-          end
-          tc_boders.xpath('w:bottom').each do |bottom|
-            bottom_border = BordersProperties.new
-            bottom_border.color = bottom.attribute('color').value
-            if !bottom.attribute('color').nil? && bottom.attribute('color').value != 'auto'
-              bottom_border.color = Color.from_int16(bottom.attribute('color').value)
-            end
-            bottom_border.sz = bottom.attribute('sz').value.to_f / 8.0
-            bottom_border.val = bottom.attribute('val').value
-            bottom_border.space = bottom.attribute('space').value
-            cell_borders.bottom = bottom_border
-          end
-          tc_boders.xpath('w:tl2br').each do |tl2br|
-            top_left_to_bottom_right = BordersProperties.new
-            top_left_to_bottom_right.color = tl2br.attribute('color').value
-            if !tl2br.attribute('color').nil? && tl2br.attribute('color').value != 'auto'
-              top_left_to_bottom_right.color = Color.from_int16(tl2br.attribute('color').value)
-            end
-            top_left_to_bottom_right.sz = tl2br.attribute('sz').value.to_f / 8.0
-            top_left_to_bottom_right.val = tl2br.attribute('val').value
-            top_left_to_bottom_right.space = tl2br.attribute('space').value
-            cell_borders.top_left_to_bottom_right = top_left_to_bottom_right
-          end
-          tc_boders.xpath('w:tr2bl').each do |tr2bl|
-            top_right_to_bottom_left = BordersProperties.new
-            top_right_to_bottom_left.color = tr2bl.attribute('color').value
-            if !tr2bl.attribute('color').nil? && tr2bl.attribute('color').value != 'auto'
-              top_right_to_bottom_left.color = Color.from_int16(tr2bl.attribute('color').value)
-            end
-            top_right_to_bottom_left.sz = tr2bl.attribute('sz').value.to_f / 8.0
-            top_right_to_bottom_left.val = tr2bl.attribute('val').value
-            top_right_to_bottom_left.space = tr2bl.attribute('space').value
-            cell_borders.top_right_to_bottom_left = top_right_to_bottom_left
-          end
+        tc_boders.xpath("#{OOXMLDocumentObject.namespace_prefix}:tl2br").each do |tl2br|
+          cell_borders.top_left_to_bottom_right = BordersProperties.parse(tl2br)
         end
-        cell_properties_node.xpath('w:shd').each do |shd|
-          cell_properties.shd = shd.attribute('fill').value
-          if !shd.attribute('fill').nil? && shd.attribute('fill').value != 'auto'
-            cell_properties.shd = Color.from_int16(shd.attribute('fill').value)
-          end
+        tc_boders.xpath("#{OOXMLDocumentObject.namespace_prefix}:tr2bl").each do |tr2bl|
+          cell_borders.top_right_to_bottom_left = BordersProperties.parse(tr2bl)
         end
-      else
-        cell_properties_node.xpath('a:fill').each do |fill|
-          cell_properties.fill = DocxColorScheme.parse(fill)
+      end
+      cell_properties_node.xpath("#{OOXMLDocumentObject.namespace_prefix}:shd").each do |shd|
+        next if shd.attribute('val').value == 'nil'
+        cell_properties.shd = shd.attribute('fill').value
+        if !shd.attribute('fill').nil? && shd.attribute('fill').value != 'auto'
+          cell_properties.shd = Color.from_int16(shd.attribute('fill').value)
         end
       end
+      cell_properties_node.xpath("#{OOXMLDocumentObject.namespace_prefix}:fill").each do |fill|
+        cell_properties.fill = DocxColorScheme.parse(fill)
+      end
       cell_properties.borders_properties = cell_borders
       cell_properties
     end