docxi 0.0.2 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c090f48de3b5f08211cfcf6772bede9af088528
-  data.tar.gz: 0dda1273cb0c9cdd092a36db7a9448538828dbe6
+  metadata.gz: 5076084e490ded4f975883817964681a11cb0020
+  data.tar.gz: 8e6c401e687f6eaad1c5a1c23060481f0e552576
 SHA512:
-  metadata.gz: 2ada27ba61335c8421b4d8e2dd65757afb79a960b8ffdb20d121d48d3310c042bc9264dd882f3568918c9ca689f9edec5c52beee4a68c70fa3480ac07f843a48
-  data.tar.gz: ba26ae7dfe72ad1e40ce4bfb64602965d31e67e3240a9d9501817d70230442740be4c2e80ab434a4ac549bd03cad1082f0445968a1cd6c5e2ce50f3be2c82845
+  metadata.gz: 2b1f94d68e5d454c5703c9c26ab851bd4a886a2c7c7c27f8162d7fa2ef3599dd0eb179e02f18a1bef9065b4df27c31bff15f3383d0e99e0e95279f184b152a52
+  data.tar.gz: 7e714bdd0ccbfb487180beb5ef57f3fbb84c3ff6661d929d0750d9bc2f336cbf6af9b5b8ff4a14b962cd299ec7942cf181664e8feef9f3bcd6318bc30086f396

data/README.md

@@ -11,11 +11,16 @@ Docxi gem provides ability to create docx documents using Ruby.
 7. Page Numbering
 
 At the moment, the gem supports a limited number of functions, but the development of the gem is still in progress, and perhaps functionality will be expanded in the future. First of all, try to add documentation for the code and tests.
-
+## NOTE
+ Use Latest version of Gem. Old Version has bugs.
 ## Usage
 
 ```ruby
-word = Docxi::Document.new
+# default attributes (top: 720,right: 1440,left: 1440,bottom: 720,footer: 200, header: 190)
+word = Docxi::Document.new 
+# or change margins
+# word = Docxi::Document.new(top: 0,right: 0,left: 0,bottom: 0)
+
 document = word.document
 
 # Creates Header
@@ -39,8 +44,8 @@ end
 document.add_footer(footer)
 
 # Creates paragraph
-document.p(size: 16, align: "center") do |p|
-  p.text "Title"
+document.p(size: 12, bold: true, align: "center", color: "000000", fill: "AAAAAA") do |p|
+  p.text "Title", size: 12, bold: true, align: "center", color: "000000"
   # Adds 3 break lines
   p.br times: 3
 end
@@ -103,14 +108,50 @@ document.table( columns_width: [ 316, 160, 135 ] ) do |table|
   end
 end
 
+# Adds table with row height and column indentation
+document.table( columns_width: [ 316, 160, 135 ], height: 268, iwidth: 108) do |table|
+  # Adds row with specific styles
+  table.tr(fill: "FBD4B4", bold: true, align: 'center' ) do |tr|
+    # Adds cells
+    tr.tc(borders: { top: 1, right: nil, bottom: 1, left: 1 }) do |tc|
+      tc.text "Header 1"
+    end
+    tr.tc(borders: { top: 1, right: nil, bottom: 1, left: nil }) do |tc|
+      tc.text "Header 2"
+    end
+    tr.tc(borders: { top: 1, right: 1, bottom: 1, left: nil }) do |tc|
+      tc.text "Header 3"
+    end
+  end
+end
+
+
 # Adds image
 document.p do |p|
   p.text "Image Example", size: 16, bold: true, italic: true, underline: true, br: true
 
   # Adds image to container
   media = document.add_media File.open('image.png')
+  # Or add image URL
+  media = document.add_media image_url 
   # Insert media into paragraph
   p.image media, style: { width: '200pt', height: '200pt' }
+
+  # Add Hyperlink
+  hyper = document.add_hyperlink("http://google.com")
+  p.hyperlink "Go to Google", "http://google.com", hyper
+
+end
+
+# Add Underline 
+document.p(bottom: true) do |p|
+  p.text "Example text"
+end
+
+# Set position of Paragraph
+document.p(fill: "d7d7d7",align: "center", right: -1000, left: -1000) do |p| 
+  p.text "Example Text 2"
+  p.br
 end
 
 # Creates Word Document

data/lib/docxi/content_types.rb

@@ -11,6 +11,7 @@ module Docxi
       add(:default, "rels", "application/vnd.openxmlformats-package.relationships+xml")
       add(:default, "xml", "application/xml")
       add(:default, "png", "image/png")
+      add(:override, "/_rels/.rels","application/vnd.openxmlformats-package.relationships+xml")
       add(:override, "/word/document.xml", "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml")
       add(:override, "/word/styles.xml", "application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml")
       add(:override, "/word/stylesWithEffects.xml", "application/vnd.ms-word.stylesWithEffects+xml")
@@ -24,7 +25,11 @@ module Docxi
       add(:override, "/word/footnotes.xml", "application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml")
       add(:override, "/word/endnotes.xml", "application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml")
       add(:override, "/word/footer1.xml", "application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml")
+      add(:override, "/word/footer2.xml", "application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml")
       add(:override, "/word/header1.xml", "application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml")
+      add(:override, "/word/header2.xml", "application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml")
+      add(:override, "/word/_rels/header2.xml.rels", "application/vnd.openxmlformats-package.relationships+xml")
+      add(:override, "/word/_rels/document.xml.rels", "application/vnd.openxmlformats-package.relationships+xml")
     end
 
     def add(type, attr, content)

data/lib/docxi/document.rb

@@ -1,10 +1,10 @@
 module Docxi
   class Document
 
-    attr_accessor :document, :properties, :relationships, :content_types
+    attr_accessor :document, :properties, :relationships, :content_types, :options
 
-    def initialize
-      
+    def initialize(options = {top: 720,right: 1440,left: 1440,bottom: 720,footer: 200, header: 190})
+      @options = options
     end
 
     def relationships
@@ -20,7 +20,7 @@ module Docxi
     end
 
     def document
-      @document ||= Word::Document.new({})
+      @document ||= Word::Document.new(options)
     end
 
     def render

data/lib/docxi/version.rb

@@ -1,3 +1,3 @@
 module Docxi
-  VERSION = "0.0.2"
+  VERSION = "0.0.6"
 end

data/lib/docxi/word/contents/frame.rb

@@ -0,0 +1,84 @@
+module Docxi
+  module Word
+    module Contents
+
+      class Frame
+
+        attr_accessor :content, :options
+        def initialize(options={})
+          @content = []
+          @options = options
+          if block_given?
+            yield self
+          else
+
+          end
+        end
+
+        def render(xml)
+          xml['w'].r do
+            xml['w'].pict do
+              xml['v'].rect("fillcolor"=>"#bfbfbf[2412]", "strokecolor"=>"000000","strokeweight"=>"0pt", "style"=> @options[:style]) do
+                xml['v'].fill("opacity" =>"52429f")
+                xml['v'].textbox("inset" => "0in,0in,0in,0in") do 
+                  xml['w'].txbxContent do
+                    xml['w'].p do
+                      xml['w'].pPr do
+                      xml['w'].pStyle('w:val'=>"Normal")
+                        xml['w'].pBdr do
+                          xml['w'].top('w:val'=>"nil")
+                          xml['w'].left('w:val'=>"nil")
+                          xml['w'].bottom('w:val'=>"nil")
+                          xml['w'].right('w:val'=>"nil")
+                        end
+                        if @options[:spacing]
+                          xml['w'].spacing('w:before'=>"240")
+                        end
+                      end
+                      @content.each do |element|
+                        element.render(xml)
+                      end
+                    end
+                  end
+                end
+              xml['w10'].wrap('type'=>"topAndBottom")
+              end
+            end
+          end
+        end
+
+        def br(options={})
+          br = Docxi::Word::Contents::Break.new(options)
+          @content << br
+          br
+        end
+
+        def tab(options={})
+          tab = Docxi::Word::Contents::Tab.new(options)
+          @content << tab
+          tab
+        end
+
+        def frame(options={}, &block)
+          element = Docxi::Word::Contents::Frame.new(options, &block)
+          @content << element
+          element
+        end
+
+        def text(text, options={})
+          options = @options.merge(options)
+          text = Docxi::Word::Contents::Text.new(text, options)
+          @content << text
+          text
+        end
+
+        def image(image, options={})
+          img = Docxi::Word::Contents::Image.new(image, options)
+          @content << img
+          img
+        end
+
+      end
+    end
+  end
+end

data/lib/docxi/word/contents/image.rb

@@ -7,7 +7,7 @@ module Docxi
         attr_accessor :media, :options
         def initialize(media, options={})
           @media = media
-          @media.file.rewind
+          # @media.file.rewind
           @options = options
         end
 
@@ -19,16 +19,80 @@ module Docxi
 
         def render(xml)
           xml['w'].r do
-            xml['w'].rPr do
-              xml['w'].noProof
-            end
-            xml['w'].pict do
-              xml['v'].shape( 'id' => @media.uniq_id, 'type' => @media.type, 'style' => styles ) do
-                xml['v'].imagedata( 'r:id' => @media.sequence, 'o:title' => @options[:title] )
+            if options[:pH] and options[:pV] and options[:wrap]
+              xml['w'].drawing do
+                xml['wp'].anchor( "behindDoc" => 1 ,"distT" => 0,"distB" => 0, "distL" => 0, "distR" => 0 ,"simplePos" => 0 ,"locked" => 0, "layoutInCell" => 1, "allowOverlap" => 1, "relativeHeight" => 3) do
+                  xml['wp'].simplePos('x'=> 0 , 'y' => 0 )
+                  xml['wp'].positionH("relativeFrom" => "column") do
+                    xml['wp'].posOffset options[:pH] 
+                  end
+                  xml['wp'].positionV("relativeFrom" => "paragraph") do
+                    xml['wp'].posOffset options[:pV] 
+                  end
+                  xml['wp'].extent( 'cx' => ( options[:width] * options[:height] * 14.92 ).to_i, 'cy' => ( options[:width] * options[:height] * 14.92 ).to_i ) if options[:width] && options[:height]
+                  xml['wp'].effectExtent( 'l' => 0, 't' => 0, 'r' => 0, 'b' => 0 )
+                  xml['wp'].wrapNone
+                  xml['wp'].docPr( 'id' => 1, 'name'=> "Image", 'descr' => "image")
+                  xml['wp'].cNvGraphicFramePr do
+                    xml.graphicFrameLocks( 'xmlns:a' => "http://schemas.openxmlformats.org/drawingml/2006/main", 'noChangeAspect' => "1" ) do
+                      xml.parent.namespace = xml.parent.namespace_definitions.find{|ns| ns.prefix == "a" }
+                    end
+                  end
+                  xml.graphic( 'xmlns:a' => "http://schemas.openxmlformats.org/drawingml/2006/main" ) do
+                    xml.parent.namespace = xml.parent.namespace_definitions.find{|ns| ns.prefix == "a" }
+                    xml['a'].graphicData( 'uri' => "http://schemas.openxmlformats.org/drawingml/2006/picture") do
+                      xml.pic( 'xmlns:pic' => "http://schemas.openxmlformats.org/drawingml/2006/picture") do
+                        xml.parent.namespace = xml.parent.namespace_definitions.find{|ns| ns.prefix == "pic" }
+                        xml['pic'].nvPicPr do
+                          xml['pic'].cNvPr( 'id' => 0, 'name' => "Image" )
+                          xml['pic'].cNvPicPr do
+                            xml['a'].picLocks( 'noChangeAspect' => "1", 'noChangeArrowheads' => "1" )
+                          end
+                        end
+                        xml['pic'].blipFill do
+                          xml['a'].blip( 'r:embed' => @media.sequence )
+                          xml['a'].stretch do
+                            xml['a'].fillRect
+                          end
+                        end
+                        xml['pic'].spPr( 'bwMode' => "auto" ) do
+                          xml['a'].xfrm do
+                            xml['a'].off( 'x' => 0, 'y' => 0 )
+                            xml['a'].ext( 'cx' => ( options[:width] * options[:height] * 14.92 ).to_i, 'cy' => ( options[:width] * options[:height] * 14.92).to_i ) if options[:width] && options[:height]
+                          end
+                          xml['a'].prstGeom( 'prst' => "rect" ) do
+                            xml['a'].avLst
+                          end
+                          xml['a'].noFill
+                          xml['a'].ln('w' => "9525") do
+                            xml['a'].noFill
+                            xml['a'].miter('lim'=>"800000")
+                            xml['a'].headEnd
+                            xml['a'].tailEnd
+                          end
+                        end
+                      end
+                    end
+                  end
+                end
+              end
+            else  
+              xml['w'].pict do
+                unless options[:fill_color]
+                  xml['v'].rect( 'id' => @media.uniq_id, 'type' => @media.type, 'style' => styles, :stroked => "f" ) do
+                    xml['v'].imagedata( 'r:id' => @media.sequence, 'o:title' => @options[:title] )
+                    xml['v'].wrap('v:type' => 'none') if options[:wrap]
+                  end
+                else
+                  xml['v'].rect("fillcolor"=> options[:fill_color], 'id' => @media.uniq_id, 'type' => @media.type, 'style' => styles, :stroked => "f" ) do
+                    if options[:opacity].present?
+                      xml['v'].fill("opacity" => options[:opacity])
+                    end
+                    xml['v'].imagedata( 'r:id' => @media.sequence, 'o:title' => @options[:title] )
+                    xml['v'].wrap('v:type' => 'none') if options[:wrap]
+                  end
+                end
               end
-            end
-            xml['w'].rPr do
-              xml['w'].noProof
             end
           end
         end

data/lib/docxi/word/contents/paragraph.rb

@@ -4,10 +4,11 @@ module Docxi
 
       class Paragraph
 
-        attr_accessor :content, :options
+        attr_accessor :content, :options, :relationships, :id
         def initialize(options={})
           @content = []
           @options = options
+          @relationships = []
 
           if block_given?
             yield self
@@ -16,16 +17,70 @@ module Docxi
           end
         end
 
+        def content_type
+          "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink"
+        end
+
+        def target
+          "document.xml"
+        end
+
+
+        def hyperlink(text,link,id)
+          text = Hyperlink.new(text, link, id)
+          @content << text
+        end
+
+        class Hyperlink
+          attr_accessor :text, :link, :id 
+          def initialize(text, link, id )
+            @text = text
+            @link = link
+            @id = id
+          end
+
+          def content_type
+            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink"
+          end
+
+          def render(xml)
+            xml['w'].pPr do
+              xml['w'].pStyle('w:val' => "Normal")
+              xml['w'].rPr do 
+                xml['w'].rStyle('w:val' => "InternetLink")
+              end
+            end
+            xml['w'].hyperlink('r:id' => @id) do 
+              xml['w'].r do
+                xml['w'].rPr do
+                  xml['w'].rStyle( 'w:val' => "InternetLink")
+                end
+                xml['w'].t @text
+              end
+            end
+          end
+        end
+        
         def render(xml)
           xml['w'].p do
             xml['w'].pPr do
               xml['w'].jc( 'w:val' => @options[:align]) if @options[:align]
+              xml['w'].shd( 'w:val' => 'clear','w:fill' => @options[:fill] ) if @options[:fill]
+              xml['w'].ind( 'w:left' => @options[:left], 'w:right' => @options[:right] ) if @options[:left] and @options[:right]
               if options[:ul]
                 xml['w'].numPr do
                   xml['w'].ilvl( 'w:val' => 0 )
                   xml['w'].numId( 'w:val' => 1 )
                 end
               end
+              if options[:bottom]
+                xml['w'].pBdr do
+                  xml['w'].top( 'w:val' => "nil")
+                  xml['w'].left('w:val' => "nil")
+                  xml['w'].bottom('w:val'=>"single", 'w:sz'=>"4", 'w:space'=>"1", 'w:color'=>"000000")
+                  xml['w'].right('w:val'=>"nil")
+                end
+              end
             end
             @content.each do |element|
               element.render(xml)
@@ -40,12 +95,24 @@ module Docxi
           text
         end
 
+        def frame(options={}, &block)
+          element = Docxi::Word::Contents::Frame.new(options, &block)
+          @content << element
+          element
+        end
+
         def br(options={})
           br = Docxi::Word::Contents::Break.new(options)
           @content << br
           br
         end
 
+        def tab(options={})
+          tab = Docxi::Word::Contents::Tab.new(options)
+          @content << tab
+          tab
+        end
+
         def image(image, options={})
           img = Docxi::Word::Contents::Image.new(image, options)
           @content << img

data/lib/docxi/word/contents/tab.rb

@@ -0,0 +1,33 @@
+module Docxi
+  module Word
+    module Contents
+
+      class Tab
+
+        attr_accessor :options
+        def initialize(options={})
+          @options = options
+          @options[:times] ||= 1
+        end
+
+        def render(xml)
+          if @options[:page]
+            xml['w'].p do
+              xml['w'].r do
+                xml['w'].tab
+              end
+            end
+          else
+            @options[:times].times do
+              xml['w'].r do
+                xml['w'].tab
+              end
+            end
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/docxi/word/contents/table.rb

@@ -28,6 +28,8 @@ module Docxi
             xml['w'].tblPr do
               xml['w'].tblStyle( 'w:val' => options[:style] ) if options[:style]
               xml['w'].tblW( 'w:w' => options[:width], 'w:type' => "auto" ) if options[:width]
+              xml['w'].jc( 'w:val' => options[:align] ) if options[:align]
+              xml['w'].tblInd( 'w:w' => options[:iwidth], 'w:type' => "dxa" ) if options[:iwidth]
               xml['w'].tblLook( 'w:val' => "04A0", 'w:firstRow' => 1, 'w:lastRow' => 0, 'w:firstColumn' => 1, 'w:lastColumn' => 0, 'w:noHBand' => 0, 'w:noVBand' => 1 )
               if @options[:borders]
                 xml['w'].tblBorders do
@@ -40,6 +42,15 @@ module Docxi
                   end
                 end
               end
+              if @options[:padding]
+                xml['w'].tblCellMar do
+                  xml['w'].top( 'w:w' => "288", 'w:type' => "dxa" )
+                  xml['w'].left( 'w:w' => "573", 'w:type' => "dxa" )
+                  xml['w'].bottom( 'w:w' => "288", 'w:type' => "dxa" )
+                  xml['w'].right( 'w:w' => "573", 'w:type' => "dxa" )
+                end
+              end
+
             end
             xml['w'].tblGrid do
               if options[:columns_width]
@@ -81,6 +92,12 @@ module Docxi
 
           def render(xml)
             xml['w'].tr do
+              if options[:height].present?
+                xml['w'].trPr do
+                  xml['w'].trHeight('w:val' => options[:height], 'w:hRule' => 'atLeast')
+                  xml['w'].cantSplit('w:val' => 'false')
+                end
+              end
               @cells.each do |cell|
                 cell.render(xml)
               end
@@ -102,6 +119,9 @@ module Docxi
             end
 
             def render(xml)
+              if options[:fill].blank?
+                options[:fill] = 'FFFFFF'
+              end
               xml['w'].tc do
                 xml['w'].tcPr do
                   xml['w'].tcW( 'w:w' => ( options[:width].to_i * 14.92 ).to_i, 'w:type' => "dxa" ) if options[:width]
@@ -150,6 +170,18 @@ module Docxi
               img
             end
 
+            def page_numbers
+              numbers = PageNumbers.new
+              @content << numbers
+              numbers
+            end
+
+            def p(options={}, &block)
+              element = Docxi::Word::Contents::Paragraph.new(options, &block)
+              @content << element
+              element
+            end
+
             class Image
               attr_accessor :media, :options
               def initialize(media, options={})
@@ -215,6 +247,54 @@ module Docxi
                 end
               end
             end
+
+            class PageNumbers
+
+              attr_accessor :options
+              def initialize(options={})
+                @options = options
+              end
+
+              def render(xml)
+                xml['w'].sdt do
+                  xml['w'].sdtPr do
+                    xml['w'].id( 'w:val' => "-472213903" )
+                    xml['w'].docPartObj do
+                      xml['w'].docPartGallery( 'w:val' => "Page Numbers (Bottom of Page)" )
+                      xml['w'].docPartUnique
+                    end
+                  end
+                  xml['w'].sdtContent do
+                    xml['w'].p do
+                      xml['w'].pPr do
+                        xml['w'].jc( 'w:val' => @options[:align] || 'right' )
+                      end
+                      xml['w'].r do
+                        xml['w'].rPr do
+                          xml['w'].rFonts( 'w:cs'=> 'Arial', 'w:ascii'=> 'Arial', 'w:hAnsi' => 'Arial' )
+                          xml['w'].color( 'w:val' => '404040')
+                          xml['w'].sz( 'w:val' => '20' )
+                        end
+                        xml['w'].t 'GlobalOptions   '
+                      end
+                      xml['w'].r do
+                        xml['w'].fldChar( 'w:fldCharType' => "begin" )
+                      end
+                      xml['w'].r do
+                        xml['w'].instrText "PAGE   \* MERGEFORMAT"
+                      end
+                      xml['w'].r do
+                        xml['w'].fldChar( 'w:fldCharType' => "separate" )
+                      end
+                      xml['w'].r do
+                        xml['w'].fldChar( 'w:fldCharType' => "end" )
+                      end
+                    end
+                  end
+                end
+              end
+            end
+
           end
         end
       end

data/lib/docxi/word/contents/text.rb

@@ -14,13 +14,19 @@ module Docxi
           if !@text.nil?
             xml['w'].r do
               xml['w'].rPr do
+                xml['w'].rFonts( 'w:cs'=> @options[:font], 'w:ascii'=> @options[:font], 'w:hAnsi' => @options[:font] ) if @options[:font]
                 xml['w'].b if @options[:bold]
                 xml['w'].i if @options[:italic]
                 xml['w'].u( 'w:val' => "single" ) if options[:underline]
                 xml['w'].color( 'w:val' => @options[:color] ) if @options[:color]
                 xml['w'].sz( 'w:val' => @options[:size].to_i * 2 ) if @options[:size]
+                xml['w'].shd( 'w:val' => 'clear','w:fill' => @options[:fill] ) if @options[:fill]
+              end
+              if @options[:space]
+                xml['w'].t( @text, 'xml:space' => "preserve" )
+              else
+                xml['w'].t @text
               end
-              xml['w'].t @text
             end
             if options[:br]
               br = Docxi::Word::Contents::Break.new

data/lib/docxi/word/document.rb

@@ -1,10 +1,12 @@
+require_relative 'hyperlinks/hyperlink.rb'
+require_relative 'hyperlinks.rb'
 module Docxi
   module Word
     class Document
 
       include Helpers
 
-      attr_accessor :options, :fonts, :setings, :styles, :numbering, :effects, :web_settings, :themes, :relationships, :footnotes, :endnotes, :footers, :headers
+      attr_accessor :options, :fonts, :setings, :styles, :numbering, :effects, :web_settings, :themes, :relationships, :footnotes, :endnotes, :footers, :headers, :hyperlinks
 
       def initialize(options)
         @options = options
@@ -26,6 +28,22 @@ module Docxi
         @footer = footer
       end
 
+      def add_first_footer(footer, options={})
+        footer.id = footers.sequence
+        rel = relationships.add(footer.content_type, footer.target)
+        footer.sequence = rel.id
+        footers.add(footer)
+        @first_footer = footer
+      end
+
+      def add_first_header(header, options={})
+        header.id = headers.sequence
+        rel = relationships.add(header.content_type, header.target)
+        header.sequence = rel.id
+        headers.add(header)
+        @first_header = header
+      end
+
       def add_header(header, options={})
         header.id = headers.sequence
         rel = relationships.add(header.content_type, header.target)
@@ -34,6 +52,14 @@ module Docxi
         @header = header
       end
 
+      def add_hyperlink(link, options={})
+        hyperlink = Hyperlinks::Hyperlink.new(hyperlinks.sequence, options)
+        rel = relationships.add(hyperlink.content_type, link, 'External')
+        hyperlink.set_sequence(rel.id)
+        hyperlinks.add(hyperlink)
+        return rel.id
+      end 
+
       def fonts
         @fonts ||= Fonts.new
       end
@@ -82,10 +108,22 @@ module Docxi
         @footers ||= Footers.new
       end
 
+      def first_footer
+        @first_footer ||= Footers.new
+      end
+
+      def first_header
+        @first_header ||= Headers.new
+      end
+
       def headers
         @headers ||= Headers.new
       end
 
+      def hyperlinks
+        @hyperlinks ||= Hyperlinks.new
+      end
+
       def render(zip)
         zip.put_next_entry('word/document.xml')
         zip.write(Docxi.to_xml(document))
@@ -108,7 +146,7 @@ module Docxi
       private
       def document
         Nokogiri::XML::Builder.with(Nokogiri::XML('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>')) do |xml|
-          xml.document('xmlns:wpc' => "http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas", 'xmlns:mc' => "http://schemas.openxmlformats.org/markup-compatibility/2006", 'xmlns:o' => "urn:schemas-microsoft-com:office:office", 'xmlns:r' => "http://schemas.openxmlformats.org/officeDocument/2006/relationships", 'xmlns:m' => "http://schemas.openxmlformats.org/officeDocument/2006/math", 'xmlns:v' => "urn:schemas-microsoft-com:vml", 'xmlns:wp14' => "http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing", 'xmlns:wp' => "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing", 'xmlns:w10' => "urn:schemas-microsoft-com:office:word", 'xmlns:w' => "http://schemas.openxmlformats.org/wordprocessingml/2006/main", 'xmlns:w14' => "http://schemas.microsoft.com/office/word/2010/wordml", 'xmlns:wpg' => "http://schemas.microsoft.com/office/word/2010/wordprocessingGroup", 'xmlns:wpi' => "http://schemas.microsoft.com/office/word/2010/wordprocessingInk", 'xmlns:wne' => "http://schemas.microsoft.com/office/word/2006/wordml", 'xmlns:wps' => "http://schemas.microsoft.com/office/word/2010/wordprocessingShape", 'mc:Ignorable' => "w14 wp14") do
+          xml.document('xmlns:o' => 'urn:schemas-microsoft-com:office:office', 'xmlns:r' => 'http://schemas.openxmlformats.org/officeDocument/2006/relationships' ,'xmlns:v' => 'urn:schemas-microsoft-com:vml', 'xmlns:w' => 'http://schemas.openxmlformats.org/wordprocessingml/2006/main', 'xmlns:w10' =>'urn:schemas-microsoft-com:office:word', 'xmlns:wp' =>'http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing') do
             xml.parent.namespace = xml.parent.namespace_definitions.find{|ns| ns.prefix == "w" }
 
             xml['w'].body do
@@ -122,11 +160,13 @@ module Docxi
                 xml['w'].bookmarkEnd('w:id' => "0")
               end
               xml['w'].sectPr do
-                xml['w'].footerReference( 'w:type' => "default", 'r:id' => @footer.sequence ) if @footer
                 xml['w'].headerReference( 'w:type' => "default", 'r:id' => @header.sequence ) if @header
+                xml['w'].headerReference( 'w:type' => "first", 'r:id' => @first_header.sequence ) if @first_header                
+                xml['w'].footerReference( 'w:type' => "default", 'r:id' => @footer.sequence ) if @footer
+                xml['w'].footerReference( 'w:type' => "first", 'r:id' => @first_footer.sequence ) if @first_footer
                 xml['w'].titlePg
                 xml['w'].pgSz( 'w:w' => 12240, 'w:h' => 15840 )
-                xml['w'].pgMar( 'w:top' => 800, 'w:right' => 940, 'w:bottom' => 1000, 'w:left' => 940, 'w:header' => 190, 'w:footer' => 200, 'w:gutter' => 0)
+                xml['w'].pgMar( 'w:top' => @options[:top], 'w:right' => @options[:right], 'w:bottom' => @options[:bottom], 'w:left' => @options[:left], 'w:header' => @options[:header].present? ? @options[:header] : 190, 'w:footer' => @options[:footer].present? ? @options[:footer] : 200 , 'w:gutter' => 0)
                 xml['w'].cols( 'w:space' => 720)
                 xml['w'].docGrid( 'w:linePitch' => "360")
               end

data/lib/docxi/word/footers/footer.rb

@@ -18,6 +18,12 @@ module Docxi
           end
         end
 
+        def br(options={})
+          br = Docxi::Word::Contents::Break.new(options)
+          @content << br
+          br
+        end
+
         def content_type
           "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer"
         end
@@ -45,12 +51,18 @@ module Docxi
           element
         end
 
-        def page_numbers
-          numbers = PageNumbers.new
+        def page_numbers(options={})
+          numbers = PageNumbers.new(options)
           @content << numbers
           numbers
         end
 
+        def table(options={}, &block)
+          table = Docxi::Word::Contents::Table.new(options, &block)
+          @content << table
+          table
+        end
+
         class PageNumbers
 
           attr_accessor :options
@@ -72,6 +84,14 @@ module Docxi
                   xml['w'].pPr do
                     xml['w'].jc( 'w:val' => @options[:align] || 'right' )
                   end
+                  xml['w'].r do
+                    xml['w'].rPr do
+                      xml['w'].rFonts( 'w:cs'=> 'Arial', 'w:ascii'=> 'Arial', 'w:hAnsi' => 'Arial' )
+                      xml['w'].color( 'w:val' => '404040')
+                      xml['w'].sz( 'w:val' => '20' )
+                    end
+                    xml['w'].t @options[:name].to_s+'   '
+                  end
                   xml['w'].r do
                     xml['w'].fldChar( 'w:fldCharType' => "begin" )
                   end

data/lib/docxi/word/headers/header.rb

@@ -43,11 +43,38 @@ module Docxi
           img
         end
 
+        def text(text, options={})
+          options = @options.merge(options)
+          element = Docxi::Word::Contents::Paragraph.new(options) do |p|
+            p.text(text)
+          end
+          @content << element
+          element
+        end
+
+        def page_numbers
+          numbers = PageNumbers.new
+          @content << numbers
+          numbers
+        end
+
+        def br(options={})
+          br = Docxi::Word::Contents::Break.new(options)
+          @content << br
+          br
+        end
+
+        def table(options={}, &block)
+          table = Docxi::Word::Contents::Table.new(options, &block)
+          @content << table
+          table
+        end
+
         class Image
           attr_accessor :media, :options
           def initialize(media, options={})
             @media = media
-            @media.file.rewind
+            # @media.file.rewind
             @options = options
           end
 
@@ -69,23 +96,35 @@ module Docxi
                   xml['w'].noProof
                 end
                 xml['w'].drawing do
-                  xml['wp'].inline( 'distT' => 0, 'distB' => 0, 'distL' => 0, 'distR' => 0 ) do
-                    xml['wp'].extent( 'cx' => ( width * 9250 ).to_i, 'cy' => ( height * 9250 ).to_i )
-                    xml['wp'].effectExtent( 'l' => 0, 't' => 0, 'r' => 0, 'b' => 1905 )
+                  xml['wp'].anchor( "behindDoc" => options[:behind] ,"distT" => 0,"distB" => 0, "distL" => 0, "distR" => 0 ,"simplePos" => 0 ,"locked" => 0, "layoutInCell" => 1, "allowOverlap" => 1, "relativeHeight" => 4) do
+                    xml['wp'].simplePos('x'=> 0 , 'y' => 0 )
+                    xml['wp'].positionH("relativeFrom" => "column") do
+                      xml['wp'].posOffset options[:pH] 
+                    end
+                    xml['wp'].positionV("relativeFrom" => "paragraph") do
+                      xml['wp'].posOffset options[:pV] 
+                    end
+                    xml['wp'].extent( 'cx' => ( options[:width] * options[:height] * 14.92 ).to_i, 'cy' => ( options[:width] * options[:height] * 14.92 ).to_i ) if options[:width] && options[:height]
+                    xml['wp'].effectExtent( 'l' => 0, 't' => 0, 'r' => 0, 'b' => 0 )
+                    if options[:wrap] == "none"
+                      xml['wp'].wrapNone
+                    else
+                      xml['wp'].wrapSquare("wrapText"=> "bothSides")
+                    end
                     xml['wp'].docPr( 'id' => 1, 'name'=> "Image", 'descr' => "image")
                     xml['wp'].cNvGraphicFramePr do
-                      xml.graphicFrameLocks( 'xmlns:a' => "http://schemas.openxmlformats.org/drawingml/2006/main", 'noChangeAspect' => 1 ) do
+                      xml.graphicFrameLocks( 'xmlns:a' => "http://schemas.openxmlformats.org/drawingml/2006/main", 'noChangeAspect' => "1" ) do
                         xml.parent.namespace = xml.parent.namespace_definitions.find{|ns| ns.prefix == "a" }
                       end
                     end
                     xml.graphic( 'xmlns:a' => "http://schemas.openxmlformats.org/drawingml/2006/main" ) do
                       xml.parent.namespace = xml.parent.namespace_definitions.find{|ns| ns.prefix == "a" }
                       xml['a'].graphicData( 'uri' => "http://schemas.openxmlformats.org/drawingml/2006/picture") do
-                        xml.pic( 'xmlns:pic' => "http://schemas.openxmlformats.org/drawingml/2006/picture" ) do
+                        xml.pic( 'xmlns:pic' => "http://schemas.openxmlformats.org/drawingml/2006/picture") do
                           xml.parent.namespace = xml.parent.namespace_definitions.find{|ns| ns.prefix == "pic" }
                           xml['pic'].nvPicPr do
                             xml['pic'].cNvPr( 'id' => 0, 'name' => "Image" )
-                            xml['pic'].cNvPicPr
+                            xml['pic'].cNvPicPr 
                           end
                           xml['pic'].blipFill do
                             xml['a'].blip( 'r:embed' => @media.sequence ) do
@@ -95,14 +134,21 @@ module Docxi
                               xml['a'].fillRect
                             end
                           end
-                          xml['pic'].spPr do
+                          xml['pic'].spPr( 'bwMode' => "auto" ) do
                             xml['a'].xfrm do
                               xml['a'].off( 'x' => 0, 'y' => 0 )
-                              xml['a'].ext( 'cx' => ( width * 50 ).to_i, 'cy' => ( height * 50 ).to_i )
+                              xml['a'].ext( 'cx' => ( options[:width] * options[:height] * 14.92 ).to_i, 'cy' => ( options[:width] * options[:height] * 14.92).to_i ) if options[:width] && options[:height]
                             end
                             xml['a'].prstGeom( 'prst' => "rect" ) do
                               xml['a'].avLst
                             end
+                            # xml['a'].noFill
+                            # xml['a'].ln('w' => "9525") do
+                            #   xml['a'].noFill
+                            #   xml['a'].miter('lim'=>"800000")
+                            #   xml['a'].headEnd
+                            #   xml['a'].tailEnd
+                            # end
                           end
                         end
                       end

data/lib/docxi/word/helpers.rb

@@ -8,12 +8,24 @@ module Docxi
         end
       end
 
+      def frame(text, options={})
+        p(options) do |p|
+          p.frame text
+        end
+      end
+
       def br(options={})
         element = Docxi::Word::Contents::Break.new(options)
         @content << element
         element
       end
 
+      def tab(options={})
+        element = Docxi::Word::Contents::Tab.new(options)
+        @content << element
+        element
+      end
+
       def p(options={}, &block)
         element = Docxi::Word::Contents::Paragraph.new(options, &block)
         @content << element

data/lib/docxi/word/hyperlinks.rb

@@ -0,0 +1,30 @@
+require 'docxi/word/hyperlinks/hyperlink'
+
+module Docxi
+  module Word
+    class Hyperlinks
+
+      attr_accessor :hyperlinks, :counter
+      def initialize
+        @hyperlinks = []
+        @counter = 0
+      end
+
+      def add(hyperlink)
+        @hyperlinks << hyperlink
+        hyperlink
+      end
+
+      def sequence
+        @counter += 1
+      end
+
+      def render(zip)
+        @hyperlinks.each do |hyperlink|
+          hyperlink.render(zip)
+        end
+      end
+
+    end
+  end
+end

data/lib/docxi/word/hyperlinks/hyperlink.rb

@@ -0,0 +1,96 @@
+#encoding: utf-8
+
+module Docxi
+  module Word
+    class Hyperlinks
+      class Hyperlink
+
+        attr_accessor :id, :sequence
+        def initialize(id,options={})
+          @options = options
+          @id = id
+
+          if block_given?
+            yield self
+          else
+
+          end
+        end
+
+        def set_sequence(sequence)
+          @sequence = sequence
+          self
+        end
+
+        def content_type
+          "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink"
+        end
+
+        def target
+          "document.xml"
+        end
+
+        def render(zip)
+          zip.put_next_entry("word/#{target}")
+          zip.write(Docxi.to_xml(document))
+          if !@relationships.empty?
+            zip.put_next_entry("word/_rels/#{target}.rels")
+            zip.write(Docxi.to_xml(relationships))
+          end
+        end
+
+        def hyperlink(text,link)
+          text = Hyperlink.new(text, link, id)
+          @content << text
+        end
+
+        class Hyperlink
+          attr_accessor :text, :link
+          def initialize(text, link )
+            @text = text
+            @link = link
+          end
+
+          def content_type
+            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink"
+          end
+
+          def render(xml)
+            xml['w'].hyperlink('w:id' => '1') do 
+              xml['w'].r do
+                xml['w'].pPr do
+                  xml['w'].rStyle( 'w:val' => "InternetLink")
+                end
+                xml['w'].t @text
+              end
+            end
+          end
+        end
+
+
+        private
+        def document
+          Nokogiri::XML::Builder.with(Nokogiri::XML('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>')) do |xml|
+            xml.hdr( 'xmlns:wpc' => "http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas", 'xmlns:mc' => "http://schemas.openxmlformats.org/markup-compatibility/2006", 'xmlns:o' => "urn:schemas-microsoft-com:office:office", 'xmlns:r' => "http://schemas.openxmlformats.org/officeDocument/2006/relationships", 'xmlns:m' => "http://schemas.openxmlformats.org/officeDocument/2006/math", 'xmlns:v' => "urn:schemas-microsoft-com:vml", 'xmlns:wp14' => "http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing", 'xmlns:wp' => "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing", 'xmlns:w10' => "urn:schemas-microsoft-com:office:word", 'xmlns:w' => "http://schemas.openxmlformats.org/wordprocessingml/2006/main", 'xmlns:w14' => "http://schemas.microsoft.com/office/word/2010/wordml", 'xmlns:wpg' => "http://schemas.microsoft.com/office/word/2010/wordprocessingGroup", 'xmlns:wpi' => "http://schemas.microsoft.com/office/word/2010/wordprocessingInk", 'xmlns:wne' => "http://schemas.microsoft.com/office/word/2006/wordml", 'xmlns:wps' => "http://schemas.microsoft.com/office/word/2010/wordprocessingShape", 'mc:Ignorable' => "w14 wp14" ) do
+              xml.parent.namespace = xml.parent.namespace_definitions.find{|ns| ns.prefix == "w" }
+              @content.each do |element|
+                element.render(xml)
+              end
+            end
+          end
+        end
+
+        def relationships
+          Nokogiri::XML::Builder.with(Nokogiri::XML('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>')) do |xml|
+            xml.Relationships(xmlns: 'http://schemas.openxmlformats.org/package/2006/relationships') do
+              @relationships.each do |relationship|
+                xml.Relationship('Id' => relationship.sequence, 'Type' => relationship.content_type, 'Target' => relationship.target)
+              end
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/docxi/word/medias.rb

@@ -22,7 +22,13 @@ module Docxi
       def render(zip)
         @medias.each do |media|
           zip.put_next_entry("word/#{media.target}")
-          zip.write(media.file.read)
+          if media.file.class == String
+            file = open(media.file)
+            zip.write(file.read)
+            file.close
+          else
+            zip.write(media.file.read)
+          end
         end
       end
 

data/lib/docxi/word/relationships.rb

@@ -21,8 +21,8 @@ module Docxi
         add("http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering", "numbering.xml")
       end
 
-      def add(type, target)
-        relationship = create_relationship(sequence, type, target)
+      def add(type, target, tm = '')
+        relationship = create_relationship(sequence, type, target,tm)
         @relationships << relationship if relationship
         relationship
       end
@@ -43,8 +43,8 @@ module Docxi
         end
       end
 
-      def create_relationship(id, type, target)
-        Relationship.new(id, type, target)
+      def create_relationship(id, type, target, tm = '')
+        Relationship.new(id, type, target, tm)
       end
 
       def sequence

data/lib/docxi/word/relationships/relationship.rb

@@ -3,16 +3,21 @@ module Docxi
     class Relationships
       class Relationship
 
-        attr_accessor :id, :type, :target
+        attr_accessor :id, :type, :target, :tm
 
-        def initialize(id, type, target)
+        def initialize(id, type, target, tm = '')
           @id = id
           @type = type
           @target = target
+          @tm = tm
         end
 
         def build(xml)
-          xml.Relationship('Id' => @id, 'Type' => @type, 'Target' => @target)
+          if @tm.blank?
+            xml.Relationship('Id' => @id, 'Type' => @type, 'Target' => @target)
+          else
+            xml.Relationship('Id' => @id, 'Type' => @type, 'Target' => @target, 'TargetMode' => @tm)
+          end
         end
 
       end

data/lib/docxi/word/styles.rb

@@ -20,15 +20,16 @@ module Docxi
             xml['w'].docDefaults do
               xml['w'].rPrDefault do
                 xml['w'].rPr do
-                  xml['w'].rFonts('w:asciiTheme' => "minorHAnsi", 'w:eastAsiaTheme' => "minorHAnsi", 'w:hAnsiTheme' => "minorHAnsi", 'w:cstheme' => "minorBidi")
-                  xml['w'].sz('w:val' => 22)
-                  xml['w'].szCs('w:val' => 22)
+                  # xml['w'].rFonts('w:asciiTheme' => "minorHAnsi", 'w:eastAsiaTheme' => "minorHAnsi", 'w:hAnsiTheme' => "minorHAnsi", 'w:cstheme' => "minorBidi")
+                  xml['w'].rFonts( 'w:cs'=> 'Arial', 'w:ascii'=> 'Arial', 'w:hAnsi' => 'Arial' )
+                  xml['w'].sz('w:val' => 24)
+                  xml['w'].szCs('w:val' => 24)
                   xml['w'].lang('w:val' => "en-US", 'w:eastAsia' => "en-US", 'w:bidi' => "ar-SA")
                 end
               end
               xml['w'].pPrDefault do
                 xml['w'].pPr do
-                  xml['w'].spacing('w:after' => 200, 'w:line' => 276, 'w:lineRule' => "auto")
+                  xml['w'].spacing("w:lineRule"=>"atLeast", "w:line"=>"240")
                 end
               end
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docxi
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.6
 platform: ruby
 authors:
 - Irfan Babar
@@ -67,8 +67,10 @@ files:
 - lib/docxi/word.rb
 - lib/docxi/word/contents.rb
 - lib/docxi/word/contents/break.rb
+- lib/docxi/word/contents/frame.rb
 - lib/docxi/word/contents/image.rb
 - lib/docxi/word/contents/paragraph.rb
+- lib/docxi/word/contents/tab.rb
 - lib/docxi/word/contents/table.rb
 - lib/docxi/word/contents/table_of_content.rb
 - lib/docxi/word/contents/text.rb
@@ -83,6 +85,8 @@ files:
 - lib/docxi/word/headers.rb
 - lib/docxi/word/headers/header.rb
 - lib/docxi/word/helpers.rb
+- lib/docxi/word/hyperlinks.rb
+- lib/docxi/word/hyperlinks/hyperlink.rb
 - lib/docxi/word/medias.rb
 - lib/docxi/word/medias/media.rb
 - lib/docxi/word/numbering.rb