rubyexcel 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19940731a3d60be4f0f8f4304585f8c36b4855b9
-  data.tar.gz: 0745972f955570f622ebf25b0f89c2cfa253430d
+  metadata.gz: 40c596ee10197b5bc146e4f6be9f2b32ac7a06f7
+  data.tar.gz: 34c2cfdaae3582ffe47b557bbef408dcbddf434b
 SHA512:
-  metadata.gz: 504b261f043af26e1fc4a055ab8c18d8f943809eaad2cea83e99271c415274bd88104558c9374832f43077bd8e2589e83bf35a53aa09c60bee5e8620872b12c2
-  data.tar.gz: 05ca9a4818c5d544cfaa6233d20e607192d1d132a221e33ebc4971a24d6aba0dd6f55b97d3679b9d3724eb2fc9086cf76eff288270c52cb9fba8616908a4ed45
+  metadata.gz: 9a3dd614fe5fbaa9567eaec7687efb35a3545cede5e90a12925b6f8e9f2995164847f4cee19330b4831844c2cde34c566de5a2d961d60ebfe9a62e1f2732fc85
+  data.tar.gz: b2f60c6c5592bb357214bf387cbb94fd12f0d320d80ab7022113b3d679c2c96d611f103a6ea4f94501da61eae8f387bb17d3c844834c2e455214f4e21fa09894

data/lib/rubyexcel/data.rb

@@ -236,17 +236,17 @@ require_relative 'address.rb'
     end
 
     #
-    # Removes all Rows (omitting headers) where the block is false
+    # Removes all Rows (omitting headers) where the block is falsey
     #
-    # @param [String] header the header of the Column to pass to the block
-    # @yield [Object] the value at the intersection of Column and Row
+    # @param [String, Array] headers splat of the headers for the Columns to filter by
+    # @yield [Array] the values at the intersections of Column and Row
     # @return [self]
     #
 
-    def filter!( header )
+    def filter!( *headers )
       hrows = sheet.header_rows
-      idx = index_by_header( header )
-      @data = @data.select.with_index { |row, i| hrows > i || yield( row[ idx -1 ] ) }
+      idx_array = headers.flatten.map { |header| index_by_header( header ) }.compact
+      @data = @data.select.with_index { |row, i| hrows > i || yield( idx_array.map { |idx| row[ idx -1 ] } ) }
       calc_dimensions
     end
   

data/lib/rubyexcel/excel_tools.rb

@@ -27,6 +27,16 @@ module RubyExcel
     range
   end
 
+  #
+  # Find the Windows "Documents" or "My Documents" path, or return the present working directory if it can't be found.
+  #
+  # @return [String]
+  #
+
+  def self.documents_path
+    Win32::Registry::HKEY_CURRENT_USER.open( 'SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders' )['Personal'] rescue Dir.pwd.gsub('/','\\')
+  end
+  
   class Workbook
   
   
@@ -50,7 +60,7 @@ module RubyExcel
     #
   
     def documents_path
-      Win32::Registry::HKEY_CURRENT_USER.open( 'SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders' )['Personal'] rescue Dir.pwd.gsub('/','\\')
+      RubyExcel.documents_path
     end
   
     #
@@ -116,7 +126,13 @@ module RubyExcel
         #Open the file with Excel
         excel = WIN32OLE.new( 'excel.application' )
         excel.displayalerts = false
-        wb = excel.workbooks.open({'filename'=> other, 'readOnly' => true})
+        
+        begin
+          wb = excel.workbooks.open({'filename'=> other, 'readOnly' => true})
+        rescue WIN32OLERuntimeError
+          excel.quit
+          raise
+        end
         
         # Only one sheet, or the entire Workbook?
         if sheetname

data/lib/rubyexcel/sheet.rb

@@ -115,6 +115,7 @@ module RubyExcel
       self
     end
     
+    # @deprecated Please use {#filter!} instead
     # @overload advanced_filter!( header, comparison_operator, search_criteria, ... )
     #   Filter on multiple criteria
     # @param [String] header a header to search under
@@ -129,6 +130,7 @@ module RubyExcel
     #
     
     def advanced_filter!( *args )
+      warn "[DEPRECATION] `advanced_filter!` is deprecated.  Please use `filter!` instead."
       data.advanced_filter!( *args ); self
     end
     
@@ -279,16 +281,16 @@ module RubyExcel
     end
     
     #
-    # Removes all Rows (omitting headers) where the block is false
+    # Removes all Rows (omitting headers) where the block is falsey
     #
-    # @param [String] header the header of the Column to pass to the block
-    # @yield [Object] the value at the intersection of Column and Row
+    # @param [String, Array] headers splat of the headers for the Columns to filter by
+    # @yield [Array] the values at the intersections of Column and Row
     # @return [self]
     #
     
-    def filter!( header, &block )
-      return to_enum( :filter!, header ) unless block_given?
-      data.filter!( header, &block ); self
+    def filter!( *headers, &block )
+      return to_enum( :filter!, headers ) unless block_given?
+      data.filter!( headers, &block ); self
     end
     
     #
@@ -427,7 +429,7 @@ module RubyExcel
     # Allow for certain method_missing calls
     #
     
-    def respond_to?( m )
+    def respond_to?( m, include_private = false )
     
       if m[-1] != '!' && respond_to?( m.to_s + '!' )
         true

data/lib/rubyexcel.rb

@@ -16,7 +16,7 @@ class Regexp
   #
 
   def to_proc
-    proc { |s| self =~ s.to_s }
+    proc { |string| self =~ string.to_s }
   end
 end
 
@@ -26,6 +26,19 @@ end
 
 module RubyExcel
 
+  #
+  # Don't require Windows-specific libraries unless the relevant methods are called
+  #
+
+  def self.method_missing( method, *args, &block )
+    if method == :documents_path
+      require_relative 'rubyexcel/excel_tools.rb'
+      send( method, *args, &block )
+    else
+      super
+    end
+  end
+
   #
   # A Workbook which can hold multiple Sheets
   #
@@ -75,9 +88,9 @@ module RubyExcel
     # @param [nil, RubyExcel::Sheet, String] ref the identifier or Sheet to add
     # @return [RubyExcel::Sheet] the Sheet which was added
     
-    def add( ref=nil )
+    def add( ref = false )
       case ref
-      when nil    ; s = Sheet.new( 'Sheet' + ( @sheets.count + 1 ).to_s, self )
+      when false    ; s = Sheet.new( 'Sheet' + ( @sheets.count + 1 ).to_s, self )
       when Sheet  ; ( s = ref ).workbook = self
       when String ; s = Sheet.new( ref, self )
       else        ; fail TypeError, "Unsupported Type: #{ ref.class }"
@@ -158,10 +171,10 @@ module RubyExcel
     # Don't require Windows-specific libraries unless the relevant methods are called
     #
 
-    def method_missing(m, *args, &block)
-      if ExcelToolsMethods.include?( m )
+    def method_missing(method, *args, &block)
+      if ExcelToolsMethods.include?( method )
         require_relative 'rubyexcel/excel_tools.rb'
-        send( m, *args, &block )
+        send( method, *args, &block )
       else
         super
       end
@@ -171,8 +184,8 @@ module RubyExcel
     # Allow for certain method_missing calls
     #
     
-    def respond_to?( m )
-      if ExcelToolsMethods.include?( m )
+    def respond_to?( method, include_private = false )
+      if ExcelToolsMethods.include?( method )
         true
       else
         super

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyexcel
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Joel Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-11-01 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,
@@ -48,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.4
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Spreadsheets in Ruby