docx_report 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fba6128858dc1881724b7334e94d2fa527979e2e
-  data.tar.gz: 2191d4a90ec26b96769b8d3b7870024d6200c81b
+  metadata.gz: e951d302c3b072bf8f06d91b83c86e2da9718530
+  data.tar.gz: 9dafad1a65092a86fa575c8e63229b2f65de2179
 SHA512:
-  metadata.gz: 7e4be5bff6c1c47b28913bd71028e25fd938eb82dbcb1d59daa6d3f53aaf09179d3b59c9583243930befad0851a6187cc1fcf645eadb0ea09b95f01067eff911
-  data.tar.gz: 84c3319c0f168a716213bdd11d88adef5f6654e926f85b87301babdc306e2d376cacafa9df91a4c626659a4a724ecb79f64267b07f92e7f750fbcb7d79f74321
+  metadata.gz: 2f93c2e8dde7e7a183951d700f1d10316493e3bb86b78550c50e2ccacfc95114d13d978d0827feac62e90f70ade5fe0b175a1ee1172dc8f9f096b708bb6a88bd
+  data.tar.gz: 40344c336a174ee3fa57c6256b5860db29c0e1a35e51ac109986edd15b2b10a90cb223271aa1882548540048ca94d0c06e94f3b2b6b5592d461e07953623dc6a

data/lib/docx_report/block_value.rb

@@ -2,10 +2,20 @@ module DocxReport
   module BlockValue
     def load_value(item)
       if @value.is_a? Proc
-        @value.call(item)
+        val = @value.call(item)
+        val.is_a?(Hash) ? val[:value] : val
       else
         item.is_a?(Hash) ? item[@value] : item.send(@value)
       end
     end
+
+    def load_text_direction(item)
+      if @value.is_a? Proc
+        val = @value.call(item)
+        val.is_a?(Hash) ? val[:text_direction] : :none
+      else
+        :none
+      end
+    end
   end
 end

data/lib/docx_report/data_item.rb

@@ -2,8 +2,8 @@ module DocxReport
   module DataItem
     attr_reader :fields, :images, :tables
 
-    def add_field(name, value, type = :text)
-      field = Field.new name, value, type
+    def add_field(name, value, type = :text, text_direction = :none)
+      field = Field.new name, value, type, text_direction
       raise 'duplicate field name' if @fields.any? { |f| f.name == field.name }
       @fields << field
     end

data/lib/docx_report/field.rb

@@ -4,11 +4,13 @@ require 'docx_report/block_value'
 module DocxReport
   class Field
     include BlockValue
-    attr_reader :name, :value, :type
+    attr_reader :name, :value, :type, :text_direction
 
-    def initialize(name, value = nil, type = :text, &block)
+    def initialize(name, value = nil, type = :text, text_direction = :none,
+                   &block)
       @name = "@#{name}@"
       @type = type
+      @text_direction = text_direction
       set_value(value || block)
     end
 
@@ -17,7 +19,7 @@ module DocxReport
     end
 
     def load_field(item)
-      Field.new(name[1..-2], load_value(item), type)
+      Field.new(name[1..-2], load_value(item), type, load_text_direction(item))
     end
   end
 end

data/lib/docx_report/parser.rb

@@ -26,6 +26,23 @@ module DocxReport
       parent_node.xpath(".//*[contains(text(), '#{name}')]")
     end
 
+    def apply_text_direction(name, parent_node, text_direction)
+      parent_node.xpath("//w:p[.//*[contains(text(), '#{name}')]]")
+                 .each do |node|
+        bidi = node.xpath('.//w:bidi').first
+        if text_direction == :ltr
+          bidi.remove if bidi
+        elsif bidi.nil?
+          p_pr = node.xpath('.//w:pPr').first
+          if p_pr.nil?
+            node.first_element_child.before('<w:pPr><w:bidi/></w:pPr>')
+          else
+            p_pr.first_element_child.before('<w:bidi/>')
+          end
+        end
+      end
+    end
+
     def find_hyperlink_nodes(name, parent_node, file)
       links = file.rels_xml.xpath "//*[@Target='#{name}']"
       parent_node.xpath(".//w:hyperlink[@r:id='#{find_by_id(links)}']")
@@ -42,8 +59,11 @@ module DocxReport
 
     def replace_node_fields(fields, parent_node)
       fields.select { |f| f.type == :text }.each do |field|
-        find_text_nodes(field.name, parent_node).map do |node|
-          node.content = node.content.gsub field.name, field.value
+        if field.text_direction != :none
+          apply_text_direction(field.name, parent_node, field.text_direction)
+        end
+        find_text_nodes(field.name, parent_node).each do |node|
+          node.content = node.content.gsub field.name, field.value.to_s
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docx_report
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Ahmed Abudaqqa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri