xlsx_writer 0.2.0 → 0.2.1

data/.gitignore

@@ -13,3 +13,4 @@ notes.txt
 pkg
 .DS_Store
 Gemfile.lock
+*.gem

data/CHANGELOG

@@ -1,3 +1,17 @@
+0.2.1 / 2012-06-08
+
+* Bug fixes
+
+  * Clean up after tests (don't leave junk files around)
+
+* Enhancements
+
+  * Sorting by autofilter doesn't crash any more! (at least on Office for Mac 2011)
+
+* Developer notes
+
+  * Added repack.rb and unpack.rb, which are useful for trying out incremental changes to xlsx files
+
 0.2.0 / 2012-04-23
 
 * Enhancements

data/Gemfile

@@ -1,9 +1,3 @@
 source :rubygems
 
 gemspec
-
-# development dependencies
-gem 'minitest'
-gem 'minitest-reporters'
-gem 'yard'
-gem 'remote_table'

data/foo.rb

@@ -0,0 +1,28 @@
+require 'bundler/setup'
+
+if ::Bundler.definition.specs['debugger'].first
+  require 'debugger'
+elsif ::Bundler.definition.specs['ruby-debug'].first
+  require 'ruby-debug'
+end
+
+require 'xlsx_writer'
+
+@doc = XlsxWriter::Document.new
+
+@sheet1 = @doc.add_sheet("Sheet1")
+@sheet1.add_row(['a', 'a'])
+@sheet1.add_row(['a', 'a'])
+@sheet1.add_row(['a', 'a'])
+# @sheet1.add_row(['foo', 'bar'])
+@sheet1.add_autofilter 'A1:B1'
+
+@sheet2 = @doc.add_sheet("Sheet2")
+@sheet2.add_row(['a', 'a'])
+# @sheet2.add_row(['hello', 'world'])
+# @sheet2.add_row(['yo', 'there'])
+# @sheet2.add_row(['foo', 'bar'])
+@sheet2.add_autofilter 'A1:B1'
+
+FileUtils.mv @doc.path, 'foo.xlsx'
+@doc.cleanup

data/lib/xlsx_writer/autofilter.rb

@@ -1,7 +1,17 @@
 module XlsxWriter
-  class Autofilter < ::Struct.new(:range)
+  class Autofilter < ::Struct.new(:sheet, :range)
     def to_xml
       %{<autoFilter ref="#{range}" />}
     end
+
+    # Sheet1!$A$1:$B$1
+    def defined_name
+      "#{sheet.name}!#{dollar_range}"
+    end
+
+    def dollar_range
+      a = /([A-Z]+)(\d+):([A-Z]+)(\d+)/.match(range).captures.map { |c| c.prepend '$' }
+      [ a.first(2).join, a.last(2).join ].join(':')
+    end
   end
 end

data/lib/xlsx_writer/document.rb

@@ -63,10 +63,8 @@ module XlsxWriter
     end
 
     def cleanup
-      ::FileUtils.rm_rf(@staging_dir) if ::File.exist?(@staging_dir.to_s)
-      if generated?
-        ::File.unlink(@path) if ::File.exist?(@path.to_s)
-      end
+      ::FileUtils.rm_rf @staging_dir.to_s
+      ::FileUtils.rm_f @path.to_s
     end
     
     def generate

data/lib/xlsx_writer/generators/sheet.rb

@@ -29,6 +29,10 @@ module XlsxWriter
       document.sheets.index(self) + 1
     end
 
+    def local_id
+      ndx - 1
+    end
+
     # +1 because styles.xml occupies the first spot
     def rid
       "rId#{ndx + 1}"
@@ -45,7 +49,7 @@ module XlsxWriter
     # specify range like "A1:C1"
     def add_autofilter(range)
       raise ::RuntimeError, "Can't add autofilter, already generated!" if generated?
-      autofilters << Autofilter.new(range)
+      autofilters << Autofilter.new(self, range)
     end
         
     def add_row(data)

data/lib/xlsx_writer/generators/workbook.erb

@@ -9,4 +9,11 @@
     <sheet name="<%= sheet.name %>" sheetId="<%= sheet.ndx %>" r:id="<%= sheet.rid %>"/>
   <% end %>
   </sheets>
+  <definedNames>
+  <% document.sheets.each do |sheet| %>
+    <% sheet.autofilters.each do |autofilter| %>
+    <definedName name="_xlnm._FilterDatabase" localSheetId="<%= sheet.local_id %>" hidden="1"><%= autofilter.defined_name %></definedName>
+    <% end %>
+  <% end %>
+  </definedNames>
 </workbook>

data/lib/xlsx_writer/version.rb

@@ -1,3 +1,3 @@
 module XlsxWriter
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/repack.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+# Usage: ./repack.rb foo
+# where "foo" is a directory previously unpacked to by unpack.rb
+# outputs to out.xlsx
+
+require 'unix_utils'
+
+src = File.expand_path ARGV[0]
+dest = File.join(File.dirname(src), 'out.xlsx')
+
+raise "#{dest} exists" if File.exist?(dest)
+
+src_copy = UnixUtils.tmp_path src
+FileUtils.cp_r src, src_copy
+Dir["#{src_copy}/**/*"].each do |infile|
+  if File.file?(infile) and not File.extname(infile) == '.vml' and File.read(infile, 50).include?('<?xml')
+    raise "uhh ohh #{File.dirname(infile)}" unless File.dirname(infile).start_with?(Dir.tmpdir)
+    tmp_path = UnixUtils.unix2dos infile
+    FileUtils.mv tmp_path, infile
+  end
+end
+
+tmp_path = UnixUtils.zip src_copy
+FileUtils.mv tmp_path, dest

data/test/test_xlsx_writer.rb

@@ -76,20 +76,20 @@ describe XlsxWriter do
       @doc.header.right.contents = 'Reporting Program'
       @doc.footer.center.contents = [ 'Powered by ', center_footer_image ]
       @doc.footer.right.contents = :page_x_of_y
+      @unzipped = UnixUtils.unzip @doc.path
     end
     after do
       @doc.cleanup
+      FileUtils.rm_rf @unzipped
     end
     it "has an autofilter" do
-      contents = UnixUtils.unzip @doc.path
-      File.read("#{contents}/xl/worksheets/sheet1.xml").must_include %{<autoFilter ref="A1:F1" />}
+      File.read("#{@unzipped}/xl/worksheets/sheet1.xml").must_include %{<autoFilter ref="A1:F1" />}
     end
     it "has a header image" do
-      contents = UnixUtils.unzip @doc.path
-      File.read("#{contents}/xl/drawings/_rels/vmlDrawing1.vml.rels").must_include %{<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="/xl/media/image1.emf"/>}
-      File.read("#{contents}/xl/drawings/vmlDrawing1.vml").must_include %{<v:imagedata o:relid="rId1" o:title="image1.emf" croptop="11025f" cropleft="9997f"/>}
+      File.read("#{@unzipped}/xl/drawings/_rels/vmlDrawing1.vml.rels").must_include %{<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="/xl/media/image1.emf"/>}
+      File.read("#{@unzipped}/xl/drawings/vmlDrawing1.vml").must_include %{<v:imagedata o:relid="rId1" o:title="image1.emf" croptop="11025f" cropleft="9997f"/>}
       original = UnixUtils.md5sum File.expand_path("../support/image1.emf", __FILE__)
-      UnixUtils.md5sum("#{contents}/xl/media/image1.emf").must_equal original
+      UnixUtils.md5sum("#{@unzipped}/xl/media/image1.emf").must_equal original
     end
   end
 

data/unpack.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+
+# Usage: ./unpack.rb foo.xlsx
+# outputs to foo/
+
+# requires xmllint to be in your path
+
+require 'unix_utils'
+
+src = File.expand_path ARGV[0]
+dest = File.join(File.dirname(src), File.basename(src, '.xlsx').gsub(/\W/, '_'))
+
+raise "#{dest} exists" if File.exist?(dest)
+tmp_path = UnixUtils.unzip src
+FileUtils.mv tmp_path, dest
+
+Dir["#{dest}/**/*"].each do |infile|
+  if File.file?(infile) and not File.extname(infile) == '.vml' and File.read(infile, 50).include?('<?xml')
+    outfile = infile + '.tmp'
+    `xmllint --format #{infile} > #{outfile}`
+    FileUtils.mv outfile, infile
+  end
+end

data/xlsx_writer.gemspec

@@ -13,6 +13,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency 'fast_xs'
   s.add_runtime_dependency 'unix_utils'
+
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'minitest-reporters'
+  s.add_development_dependency 'yard'
+  s.add_development_dependency 'remote_table'
   
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xlsx_writer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000 Z
+date: 2012-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -61,6 +61,70 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: remote_table
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Writes XLSX files. Minimal XML and style. Supports autofilters and headers/footers
   with images and page numbers.
 email:
@@ -76,6 +140,7 @@ files:
 - LICENSE
 - README.markdown
 - Rakefile
+- foo.rb
 - lib/xlsx_writer.rb
 - lib/xlsx_writer/autofilter.rb
 - lib/xlsx_writer/cell.rb
@@ -107,10 +172,12 @@ files:
 - lib/xlsx_writer/row.rb
 - lib/xlsx_writer/version.rb
 - lib/xlsx_writer/xml.rb
+- repack.rb
 - test/helper.rb
 - test/support/image1.emf
 - test/support/image2.emf
 - test/test_xlsx_writer.rb
+- unpack.rb
 - xlsx_writer.gemspec
 homepage: https://github.com/seamusabshere/xlsx_writer
 licenses: []
@@ -132,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Writes XLSX files. Minimal XML and style. Supports autofilters and headers/footers