ydocx 1.0.8 → 1.0.9

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.0.9 / 04.05.2012
+
+* Added image reference option
+
 === 1.0.8 / 04.05.2012
 
 * Removed unnecessary when

data/lib/ydocx/builder.rb

@@ -9,11 +9,12 @@ module YDocx
   class Builder
     include MarkupMethod
     attr_accessor :contents, :container, :indecies,
-                  :files, :style, :title
+                  :block, :files, :style, :title
     def initialize(contents)
       @contents = contents
       @container = {}
       @indecies = []
+      @block = :div
       @files = Pathname.new('.')
       @style = false
       @title = ''
@@ -59,25 +60,20 @@ module YDocx
     end
     private
     def compile(contents, mode)
-      if mode == :xml
-        block_tag = :chapter
-      else
-        block_tag = :div
-      end
       result = ''
       headings = 0
       contents.each do |element|
         if element[:tag].to_s =~ /^h[1-9]$/ # block
           if headings == 0
-            result << "<#{block_tag}>"
+            result << "<#{@block}>"
           else
-            result << "</#{block_tag}><#{block_tag}>"
+            result << "</#{@block}><#{@block}>"
           end
           headings += 1
         end
         result << build_tag(element[:tag], element[:content], element[:attributes], mode)
       end
-      result << "</#{block_tag}>"
+      result << "</#{@block}>"
     end
     def build_after_content
       nil

data/lib/ydocx/command.rb

@@ -68,7 +68,8 @@ Usage: #{self.command} file [options]
               elsif option =~ @@help
                 self.help
               else
-                self.error "#{self.command}: exit with #{option}: Unknown option"
+                # added image reference support for fachinfo format
+                #self.error "#{self.command}: exit with #{option}: Unknown option"
               end
             else
               # default fachinfo

data/lib/ydocx/document.rb

@@ -14,20 +14,25 @@ require 'ydocx/builder'
 module YDocx
   class Document
     attr_reader :contents, :indecies, :pictures
-    def self.open(file)
-      self.new(file)
+    def self.open(file, options={})
+      self.new(file, options)
     end
-    def initialize(file)
+    def initialize(file, options={})
       @contents = nil
       @indecies = nil
       @pictures = []
+      @options = options
       @path = nil
       @files = nil
       @zip = nil
+      init
       read(file)
     end
+    def init
+    end
     def to_html(file='', options={})
       html = ''
+      options = @options.merge(options)
       @files = @path.dirname.join(@path.basename('.docx').to_s + '_files')
       Builder.new(@contents) do |builder|
         builder.title = @path.basename
@@ -50,7 +55,9 @@ module YDocx
     end
     def to_xml(file='', options={})
       xml = ''
+      options = @options.merge(options)
       Builder.new(@contents) do |builder|
+        builder.block = options.has_key?(:block) ? options[:block] : :chapter
         xml = builder.build_xml
       end
       unless file.empty?
@@ -63,9 +70,6 @@ module YDocx
       end
     end
     private
-    def has_picture?
-      !@pictures.empty?
-    end
     def create_files
       FileUtils.mkdir @files unless @files.exist?
       @zip = Zip::ZipFile.open(@path.realpath)
@@ -74,26 +78,32 @@ module YDocx
         source_path = Pathname.new pic[:source] # id/filename.ext
         dir = @files.join source_path.dirname
         FileUtils.mkdir dir unless dir.exist?
-        binary = @zip.find_entry("word/#{origin_path}").get_input_stream
-        if source_path.extname != origin_path.extname # convert
-          if defined? Magick::Image
-            image = Magick::Image.from_blob(binary.read).first
-            image.format = source_path.extname[1..-1].upcase
-            @files.join(source_path).open('w') do |f|
-              f.puts image.to_blob
-            end
-          else # copy original image
-            @files.join(dir, origin_path.basename).open('w') do |f|
-              f.puts binary.read
-            end
-          end
-       else
+        organize_image(origin_path, source_path)
+      end
+      @zip.close
+    end
+    def organize_image(origin_path, source_path)
+      binary = @zip.find_entry("word/#{origin_path}").get_input_stream
+      if source_path.extname != origin_path.extname # convert
+        if defined? Magick::Image
+          image = Magick::Image.from_blob(binary.read).first
+          image.format = source_path.extname[1..-1].upcase
           @files.join(source_path).open('w') do |f|
+            f.puts image.to_blob
+          end
+        else # copy original image
+          @files.join(dir, origin_path.basename).open('w') do |f|
             f.puts binary.read
           end
         end
+      else
+        @files.join(source_path).open('w') do |f|
+          f.puts binary.read
+        end
       end
-      @zip.close
+    end
+    def has_picture?
+      !@pictures.empty?
     end
     def read(file)
       @path = Pathname.new file

data/lib/ydocx/templates/fachinfo.rb

@@ -147,4 +147,31 @@ div#container {
       style.gsub(/\s\s+|\n/, ' ')
     end
   end
+  # == Document
+  # Image reference option
+  # Currently, this supports only all images or first one reference.
+  # 
+  # $ docx2html example.docx --format fachinfo refence1.png refenece2.png
+  class Document
+    def init
+      @references = []
+      ARGV.reverse.each do |arg|
+        if arg =~ /\.(jpg|png|gif)$/
+          path = Pathname.new(arg).realpath
+          @references << path if path.exist?
+        end
+      end
+      @references.reverse unless @references.empty?
+    end
+    private
+    alias :copy_or_convert :organize_image
+    def organize_image(origin_path, source_path)
+      if reference = @references.shift and
+         File.extname(reference) == source_path.extname
+        FileUtils.copy reference, @files.join(source_path)
+      else
+        copy_or_convert(origin_path, source_path)
+      end
+    end
+  end
 end

data/lib/ydocx.rb

@@ -4,5 +4,5 @@
 require 'ydocx/document'
 
 module YDocx
-  VERSION = '1.0.8'
+  VERSION = '1.0.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ydocx
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &25506240 !ruby/object:Gem::Requirement
+  requirement: &24082040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *25506240
+  version_requirements: *24082040
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &25505820 !ruby/object:Gem::Requirement
+  requirement: &24081620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *25505820
+  version_requirements: *24081620
 description: ''
 email:
 - yasaka@ywesee.com,  zdavatz@ywesee.com