write_xlsx 0.76.0 → 0.76.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15e9357295f571cfc282263876abdaf83e28e652
-  data.tar.gz: 264a4bd65b91a39bc4cdabb518291a7df5894376
+  metadata.gz: 50ba1d56f0cd30c6747b137108d02434ae6fdf84
+  data.tar.gz: d02196b910a6f24fbbdd580fd00b7bb3f368c6e8
 SHA512:
-  metadata.gz: 70bb93acf8c0ecb36ecc45e0c5cb4c1c64c502252878cd3d4bf1c4ab1ad9dd0940dd673cc67c1200d5964597207c678f0996deb4c2466e5bf7f1afb20390903f
-  data.tar.gz: 3759ae9b833ca5e0138098b552370f9c7ab1daae3670c52a4b3539298de2d7aa219021eec5d9a9a475e12871bcd342799e17274acfb009d8028baf331fca8466
+  metadata.gz: a834e0b9894e75fddb5e2ba2c07c624f8fb46fbadff053cc4d67e6eae59d7b397b57db4662f5cfb2a92d0f2f6fe178864227935fd985c988827b5e1133df97d4
+  data.tar.gz: c22ff45ba70aa8d207e77994737b1ecde714c69fafe02d32de6580aaeafa3b72e84ccc4baac3b74dc90a2e12c01c941a63f089bd113b595c50c07cd8400f1319

data/Changes

@@ -1,4 +1,7 @@
 Change history of write_xlsx rubygem.
+2014-03-21 v0.76.1
+   Fix for issue #7
+
 2014-01-31 v0.76.0
    Added date axis handling to charts.
    Added support for non-contiguous chart ranges.

data/lib/write_xlsx/package/comments.rb

@@ -20,17 +20,9 @@ def initialize(workbook, worksheet, row, col, string, options = {})
         options ||= {}
         @workbook   = workbook
         @worksheet  = worksheet
-        @row        = row
-        @col        = col
+        @row, @col  = row, col
+        options_parse(row, col, options)
         @string     = string[0, STR_MAX]
-        @author     = options[:author]
-        @color      = backgrount_color(options[:color] || DEFAULT_COLOR)
-        @start_cell = options[:start_cell]
-        @start_row, @start_col = if @start_cell
-          substitute_cellref(@start_cell)
-        else
-          [ options[:start_row], options[:start_col] ]
-        end
         @start_row  ||= default_start_row(row)
         @start_col  ||= default_start_col(col)
         @visible    = options[:visible]
@@ -218,6 +210,26 @@ def write_client_data
       def writer=(w)
         @writer = w
       end
+
+      private
+
+      def options_parse(row, col, options)
+        @color      = backgrount_color(options[:color] || DEFAULT_COLOR)
+        @author     = options[:author]
+        @start_cell = options[:start_cell]
+        @start_row, @start_col = if @start_cell
+          substitute_cellref(@start_cell)
+        else
+          [ options[:start_row], options[:start_col] ]
+        end
+        @visible    = options[:visible]
+        @x_offset   = options[:x_offset] || default_x_offset(col)
+        @y_offset   = options[:y_offset] || default_y_offset(row)
+        @x_scale    = options[:x_scale]  || 1
+        @y_scale    = options[:y_scale]  || 1
+        @width      = (0.5 + (options[:width]  || DEFAULT_WIDTH)  * @x_scale).to_i
+        @height     = (0.5 + (options[:height] || DEFAULT_HEIGHT) * @y_scale).to_i
+      end
     end
 
     class Comments
@@ -290,6 +302,7 @@ def has_comment_in_row?(row)
 
       private
 
+
       def comments_visible?
         @worksheet.comments_visible?
       end

data/lib/write_xlsx/version.rb

@@ -1,5 +1,5 @@
 require 'write_xlsx/workbook'
 
 class WriteXLSX < Writexlsx::Workbook
-  VERSION = "0.76.0"
+  VERSION = "0.76.1"
 end

data/lib/write_xlsx/workbook.rb

@@ -120,7 +120,6 @@ def initialize(file, default_formats = {})
       @table_count         = 0
       @image_types         = {}
       @images              = []
-      @images_seen         = {}
 
       # Structures for the shared strings data.
       @shared_strings = Package::SharedStrings.new
@@ -1730,20 +1729,18 @@ def prepare_drawings #:nodoc:
     #
     def get_image_properties(filename)
       previous_images = []
+      images_seen = {}
       image_id = 1;
-      if @images_seen[filename]
+      if images_seen[filename]
         # We've processed this file already.
         index = images_seen[filename] - 1
-
-        # Increase image reference count.
-        image_data[index][0] += 1
       else
         # Open the image file and import the data.
         data = File.binread(filename)
         if data.unpack('x A3')[0] == 'PNG'
           # Test for PNGs.
           type, width, height = process_png(data)
-          image_types[:png] = 1
+          @image_types[:png] = 1
         elsif data.unpack('n')[0] == 0xFFD8
           # Test for JPEG files.
           type, width, height = process_jpg(data, filename)
@@ -1757,11 +1754,11 @@ def get_image_properties(filename)
           raise "Unsupported image format for file: #{filename}\n"
         end
 
-        @images << [ filename, type]
+        @images << [filename, type]
 
         # Also store new data for use in duplicate images.
         previous_images << [image_id, type, width, height]
-        @images_seen[filename] = image_id
+        images_seen[filename] = image_id
         image_id += 1
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 0.76.0
+  version: 0.76.1
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies: []
 description: write_xlsx is a gem to create a new file in the Excel 2007+ XLSX format.
 email:
@@ -1350,7 +1350,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: write_xlsx is a gem to create a new file in the Excel 2007+ XLSX format.
@@ -2546,3 +2546,4 @@ test_files:
 - test/worksheet/test_write_tab_color.rb
 - test/worksheet/test_write_url.rb
 - test/worksheet/test_write_worksheet_attributes.rb
+has_rdoc: