ydocx 1.1.7 → 1.1.8

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.1.8 / 10.05.2012
+
+* Fixed image reference option for fi/pi format
+
 === 1.1.7 / 10.05.2012
 
 * Improved title detecting. skipped blank line.

data/lib/ydocx/builder.rb

@@ -8,12 +8,13 @@ require 'ydocx/markup_method'
 module YDocx
   class Builder
     include MarkupMethod
-    attr_accessor :contents, :container, :indecies,
+    attr_accessor :contents, :container, :indecies, :references,
                   :block, :files, :style, :title
     def initialize(contents)
       @contents = contents
       @container = {}
       @indecies = []
+      @references = []
       @block = :div
       @files = Pathname.new('.')
       @style = false

data/lib/ydocx/document.rb

@@ -22,7 +22,8 @@ module YDocx
       @parser = nil
       @builder = nil
       @contents = nil
-      @indecies = nil
+      @indecies = []
+      @references = []
       @images = []
       @options = options
       @path = Pathname.new('.')
@@ -47,9 +48,10 @@ module YDocx
         builder.title = @path.basename
         builder.files = files.relative_path_from(files.dirname)
         builder.style = options[:style] if options.has_key?(:style)
-        if @indecies
-          builder.indecies = @indecies
-        end
+        # option
+        builder.indecies = @indecies.dup
+        builder.references = @references.dup
+
         html = builder.build_html
       end
       unless file.empty?

data/lib/ydocx/templates/fachinfo.rb

@@ -164,14 +164,13 @@ div#container {
       style.gsub(/\s\s+|\n/, ' ')
     end
     def resolve_path(path)
-      path
+      if reference = @references.shift
+        File.dirname(path) + '/' + reference.basename.to_s
+      else
+        path
+      end
     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
       @directory = 'fi'
@@ -198,16 +197,21 @@ div#container {
     end
     private
     def has_image?
-      # TODO
+      # NOTE
       # fi/pi format needs always directories.
       # now returns just true
       true
     end
+    # NOTE
+    # Image reference option
+    # Currently, this supports only all images or first one reference.
+    #
+    # $ docx2html example.docx --format fachinfo refence1.png refenece2.png
     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)
+      if reference = @references.shift
+        new_source_path = source_path.dirname.to_s + '/' + File.basename(reference)
+        FileUtils.copy reference, @files.join(new_source_path)
       else
         copy_or_convert(origin_path, source_path)
       end
@@ -215,8 +219,8 @@ div#container {
     def prepare_reference
       ARGV.reverse.each do |arg|
         if arg.downcase =~ /\.(jpeg|jpg|png|gif)$/
-          path = Pathname.new(arg).realpath
-          @references << path if path.exist?
+          path = Pathname.new(arg)
+          @references << path.realpath if path.exist?
         end
       end
       @references.reverse unless @references.empty?

data/lib/ydocx.rb

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

metadata

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