rubyexcel 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40c596ee10197b5bc146e4f6be9f2b32ac7a06f7
-  data.tar.gz: 34c2cfdaae3582ffe47b557bbef408dcbddf434b
+  metadata.gz: e73dc9173659b6318a48416b5a6692a0d8b5affa
+  data.tar.gz: 379dfddff3355e9cac9681f374fd85d8a9134136
 SHA512:
-  metadata.gz: 9a3dd614fe5fbaa9567eaec7687efb35a3545cede5e90a12925b6f8e9f2995164847f4cee19330b4831844c2cde34c566de5a2d961d60ebfe9a62e1f2732fc85
-  data.tar.gz: b2f60c6c5592bb357214bf387cbb94fd12f0d320d80ab7022113b3d679c2c96d611f103a6ea4f94501da61eae8f387bb17d3c844834c2e455214f4e21fa09894
+  metadata.gz: 90d1297aaf058a85e9ad8abaa646fa00a5c4cdeb29048826629f91d5f34116f3d274b5c06b0cd942374103bda43738581a298cb5b9b0114d88746a2347e016bb
+  data.tar.gz: a7ecbc87bd8fc4ae4633a99f89d8075caab55641b75a6802760bedf7dada3809f257e5357af84404dbcf9b26bb80b4d09058ee6914d44267c47ac1b2389d745a

data/README.md

@@ -304,6 +304,7 @@ s += s
 s -= data
 s -= s
 
+#Sheet#advanced_filter! is Deprecated. Sheet#filter! now accepts multiple arguments.
 #Filter on multiple criteria
 #You can add as many arguments as you like. The order is: Header, Method(Symbol), Argument
 #Note: Returns a copy of the sheet when used without "!".
@@ -354,6 +355,7 @@ s.delete_columns_if { |c| c.empty? }
 #Note: Returns a copy of the sheet when used without "!".
 #Note: This gem carries a Regexp to_proc method for Regex shorthand (shown below).
 s.filter!( 'Part' ) { |value| value =~ /Type[13]/ }
+s.filter!( 'Part', 'Cost' ) { |part, cost| part =~ /Type[13]/ && cost < 2 }
 s.filter!( 'Part', &/Type[13]/ )
 
 #Filter the data to a specific set of columns by their headers.

data/lib/rubyexcel/data.rb

@@ -246,7 +246,7 @@ require_relative 'address.rb'
     def filter!( *headers )
       hrows = sheet.header_rows
       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 ] } ) }
+      @data = @data.select.with_index { |row, i| hrows > i || yield( idx_array.length == 1 ? row[ idx_array[0] - 1 ] : idx_array.map { |idx| row[ idx -1 ] } ) }
       calc_dimensions
     end
   

data/lib/rubyexcel/sheet.rb

@@ -290,7 +290,7 @@ module RubyExcel
     
     def filter!( *headers, &block )
       return to_enum( :filter!, headers ) unless block_given?
-      data.filter!( headers, &block ); self
+      data.filter!( *headers, &block ); self
     end
     
     #
@@ -390,6 +390,7 @@ module RubyExcel
     def maxrow
       data.rows
     end
+    alias length maxrow
     
     #
     # The highest currently used column number
@@ -399,6 +400,7 @@ module RubyExcel
       data.cols
     end
     alias maxcolumn maxcol
+    alias width maxcol
     
     #
     # Allow shorthand range references and non-bang versions of bang methods.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyexcel
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Joel Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-11-08 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,