rubyexcel 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc15333e40633038ed0ed4d6c57fd67a978b3bb6
-  data.tar.gz: c4ae59d243e7fb209247bf41f73d21e6ccad2c32
+  metadata.gz: 19940731a3d60be4f0f8f4304585f8c36b4855b9
+  data.tar.gz: 0745972f955570f622ebf25b0f89c2cfa253430d
 SHA512:
-  metadata.gz: 4fcc164c88a1c3e8b17d8ce62434d891980b60ccd90fed2d4f040935d24c7d9e741364485d76a4efd272ebed93593691f58a264c724d53ea4d94f480c1bdb793
-  data.tar.gz: 82ea96341ab519b5d6cc060502b5b142ffad6cc3cb222a08d80eb06267a514700c8429923b666f11706cea9143e4315c61893b7d3ff0d8652d6c5df8193b9b33
+  metadata.gz: 504b261f043af26e1fc4a055ab8c18d8f943809eaad2cea83e99271c415274bd88104558c9374832f43077bd8e2589e83bf35a53aa09c60bee5e8620872b12c2
+  data.tar.gz: 05ca9a4818c5d544cfaa6233d20e607192d1d132a221e33ebc4971a24d6aba0dd6f55b97d3679b9d3724eb2fc9086cf76eff288270c52cb9fba8616908a4ed45

data/README.md

@@ -236,6 +236,20 @@ wb.delete( 'Sheet1' )
 wb.delete( sheet1 )
 wb.delete( /sheet1/i )
 
+#Import a WIN32OLE Workbook or Sheet, either by passing the Object or a Filename
+#Parameters: WIN32OLE Object or Filename, SheetName or nil for all Sheets, true to keep Excel Formulas or omit to import Values.
+wb = RubyExcel.import( '/path/to/file.xlsx' )
+wb = RubyExcel.import( '/path/to/file.xlsx', 'Sheet2' )
+wb = RubyExcel.import( '/path/to/file.xlsx', 'Sheet2', true )
+#Or:
+require 'win32ole'
+excel = WIN32OLE.new( 'excel.application' )
+excel.visible = true #Optional
+my_workbook = excel.workbooks.open( '/path/to/file.xlsx' )
+wb.import( my_workbook )
+#Or:
+wb.import( my_workbook.sheets(1) )
+
 #Shortcut to create a sheet with a default name and fill it with data
 wb.load( data )
 

data/lib/rubyexcel/excel_tools.rb

@@ -96,6 +96,70 @@ module RubyExcel
       wb
     end
 
+    #
+    # Import a WIN32OLE Object as a Workbook or Sheet
+    #
+    # @param [WIN32OLE::Workbook, WIN32OLE::Sheet, String] other The WIN32OLE Object, either Sheet or Workbook, to import, or a path to the file.
+    # @param [String] sheetname the name of a specific Sheet to import.
+    # @param [Boolean] keep_formulas Retain Excel formulas rather than importing their current values
+    # @return [self] self with the data and name(s) imported.
+    #
+    
+    def import( other, sheetname=nil, keep_formulas=false )
+      operation = ( keep_formulas ? :formula : :value )
+    
+      if other.is_a?( String )
+      
+        # Filename
+        File.exists?( other ) || fail( ArgumentError, "Unable to find file: #{ other }" )
+        
+        #Open the file with Excel
+        excel = WIN32OLE.new( 'excel.application' )
+        excel.displayalerts = false
+        wb = excel.workbooks.open({'filename'=> other, 'readOnly' => true})
+        
+        # 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 ) ) }
+        end
+        
+        # Cleanup
+        wb.close
+        excel.quit
+        
+      elsif !other.respond_to?( :ole_respond_to? )
+      
+        fail ArgumentError, "Invalid input: #{other.class}"
+        
+      elsif other.ole_respond_to?( :sheets )
+      
+        # Workbook
+        
+        # Only one sheet, or the entire Workbook?
+        if sheetname
+          add( sheetname ).load( other.sheets( sheetname ).usedrange.send( operation ) )
+        else
+          self.name = File.basename( other.name, '.*' )
+          other.sheets.each { |sh| add( sh.name ).load( sh.usedrange.send( operation ) ) }
+        end
+        
+      elsif other.ole_respond_to?( :usedrange )
+      
+        # Sheet
+        add( other.name ).load( other.usedrange.send( operation ) )
+        
+      else
+      
+        fail ArgumentError, "Object not recognised as a WIN32OLE Workbook or Sheet.\n#{other.inspect}"
+        
+      end
+      
+      self
+    end
+    
     #
     # Take an Excel Sheet and standardise some of the formatting
     #

data/lib/rubyexcel/rubyexcel_components.rb

@@ -60,4 +60,12 @@ module RubyExcel
     Workbook.new.load RubyExcel.sample_data
   end
  
+  #
+  # Shortcut to import a WIN32OLE Workbook or Sheet
+  #
+ 
+  def self.import( *args )
+    Workbook.new.import( *args )
+  end
+ 
 end

data/lib/rubyexcel.rb

@@ -34,7 +34,7 @@ module RubyExcel
     include Enumerable
 
     # Names of methods which require win32ole
-    ExcelToolsMethods = [ :disable_formulas!, :documents_path, :dump_to_sheet, :get_excel, :get_workbook, :make_sheet_pretty, :save_excel, :to_excel, :to_safe_format, :to_safe_format! ]
+    ExcelToolsMethods = [ :disable_formulas!, :documents_path, :dump_to_sheet, :get_excel, :get_workbook, :import, :make_sheet_pretty, :save_excel, :to_excel, :to_safe_format, :to_safe_format! ]
     
     # Get and set the Workbook name
     attr_accessor :name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyexcel
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Joel Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-09-30 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,