rubyexcel 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75b8ea393ff09d58583bf303db48f20701f1497a
-  data.tar.gz: 4ff035e0b2044679f01e555954e584654b3d199c
+  metadata.gz: 80bb23913c3b7ba62ca2aa77d5790e24a8dc610b
+  data.tar.gz: c1ff697b448df786dfb8f29cf6c3f43f37f8e6ce
 SHA512:
-  metadata.gz: c5f31688394d7a8ea42142736bb2768019c5850af22da19ca4b1e1bd7e327f74e7a94a8fb9dc3cc6b9be8540eb86ebc36328a294fc9b28ef9b65e5a545c1ae40
-  data.tar.gz: 3eb3b05e1913bc75ef784b46f61100358528119e50511dc20f5b62375ead84106839ab05761920813419615fae6186f5d77cbfb4fe561d490dc24e917bbd402b
+  metadata.gz: da3bd961b2bed9df6cc63bbf8604ada00d19dd509c0e1afe9fd0178adfd63fa4ea5a8fe594464b589c5a9e2af60c6209e9f08a38d597a3275d2352c574262b0c
+  data.tar.gz: f5fbdd7e132b5c2b87f88a3a45904f33346c2f1047a07a6939a292d9b64da31eda73a2bf6d11965b4373e2465a58ce3e667eb377c15266db182dc89252b35d0d

data/lib/rubyexcel/excel_tools.rb

@@ -123,10 +123,11 @@ module RubyExcel
         # Filename
         File.exists?( other ) || fail( ArgumentError, "Unable to find file: #{ other }" )
         
-        #Open the file with Excel
+        #Open Excel
         excel = WIN32OLE.new( 'excel.application' )
         excel.displayalerts = false
         
+        # Open the file
         begin
           wb = excel.workbooks.open({'filename'=> other, 'readOnly' => true})
         rescue WIN32OLERuntimeError
@@ -136,10 +137,14 @@ module RubyExcel
         
         # Only one sheet, or the entire Workbook?
         if sheetname
+        
           add( sheetname ).load( wb.sheets( sheetname ).usedrange.send( operation ) )
+          
         else
+        
           self.name = File.basename( other, '.*' )
-          wb.sheets.each { |sh| add( sh.name ).load( sh.usedrange.send( operation ) ) }
+          wb.sheets.each { |sh| add( sh.name ).tap{ |s| s.load( sh.usedrange.send( operation ) ) unless sh.application.worksheetfunction.counta(sh.cells).zero? } }
+          
         end
         
         # Cleanup
@@ -156,16 +161,16 @@ module RubyExcel
         
         # Only one sheet, or the entire Workbook?
         if sheetname
-          add( sheetname ).load( other.sheets( sheetname ).usedrange.send( operation ) )
+          add( sheetname ).tap{ |s| s.load( sh.usedrange.send( operation ) ) unless sh.application.worksheetfunction.counta(sh.cells).zero? }
         else
           self.name = File.basename( other.name, '.*' )
-          other.sheets.each { |sh| add( sh.name ).load( sh.usedrange.send( operation ) ) }
+          other.sheets.each { |sh| add( sh.name ).tap{ |s| s.load( sh.usedrange.send( operation ) ) unless sh.application.worksheetfunction.counta(sh.cells).zero? } }
         end
         
       elsif other.ole_respond_to?( :usedrange )
       
         # Sheet
-        add( other.name ).load( other.usedrange.send( operation ) )
+        add( other.name ).tap{ |s| s.load( sh.usedrange.send( operation ) ) unless sh.application.worksheetfunction.counta(sh.cells).zero? }
         
       else
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyexcel
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Joel Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies: []
 description: A tabular data structure in Ruby, with header-based helper methods for
   analysis and editing, and some of Excel's API style. Can output as 2D Array, HTML