rubyexcel 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e73dc9173659b6318a48416b5a6692a0d8b5affa
-  data.tar.gz: 379dfddff3355e9cac9681f374fd85d8a9134136
+  metadata.gz: 75b8ea393ff09d58583bf303db48f20701f1497a
+  data.tar.gz: 4ff035e0b2044679f01e555954e584654b3d199c
 SHA512:
-  metadata.gz: 90d1297aaf058a85e9ad8abaa646fa00a5c4cdeb29048826629f91d5f34116f3d274b5c06b0cd942374103bda43738581a298cb5b9b0114d88746a2347e016bb
-  data.tar.gz: a7ecbc87bd8fc4ae4633a99f89d8075caab55641b75a6802760bedf7dada3809f257e5357af84404dbcf9b26bb80b4d09058ee6914d44267c47ac1b2389d745a
+  metadata.gz: c5f31688394d7a8ea42142736bb2768019c5850af22da19ca4b1e1bd7e327f74e7a94a8fb9dc3cc6b9be8540eb86ebc36328a294fc9b28ef9b65e5a545c1ae40
+  data.tar.gz: 3eb3b05e1913bc75ef784b46f61100358528119e50511dc20f5b62375ead84106839ab05761920813419615fae6186f5d77cbfb4fe561d490dc24e917bbd402b

data/README.md

@@ -235,6 +235,7 @@ wb.delete( 1 )
 wb.delete( 'Sheet1' )
 wb.delete( sheet1 )
 wb.delete( /sheet1/i )
+wb.delete { |sht| sht.name == 'Sheet1' }
 
 #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.

data/lib/rubyexcel.rb

@@ -112,11 +112,16 @@ module RubyExcel
     #
     # Removes Sheet(s) from the Workbook
     #
-    # @param [Fixnum, String, Regexp, RubyExcel::Sheet] ref the reference or object to remove
+    # @param [Fixnum, String, Regexp, RubyExcel::Sheet, NilClass] ref the reference or object to remove, or nil if passing a block
+    # @yield [RubyExcel::Sheet] yields each sheet, if there is no argument and a block is given
     #
     
-    def delete( ref )
+    def delete( ref=nil, &block )
+    
+      fail ArgumentError, 'Requires either an argument OR a block' if ref && block_given?
+      
       case ref
+      when nil    ; @sheets.reject! { |sht| yield sht }
       when Fixnum ; @sheets.delete_at( ref - 1 )
       when String ; @sheets.reject! { |s| s.name == ref }
       when Regexp ; @sheets.reject! { |s| s.name =~ ref }

data/lib/rubyexcel/excel_tools.rb

@@ -247,13 +247,8 @@ module RubyExcel
     #
     
     def to_safe_format!
-      sheets { |s| s.rows { |r| r.map! { |v|
-        if v.is_a?( String )
-          v[0] == '=' ? v.sub( /\A=/,"'=" ) : v
-        else
-          v.to_s
-        end
-      } } }; self
+      sheets &:to_safe_format!
+      self
     end
     
   end # Workbook

data/lib/rubyexcel/sheet.rb

@@ -542,6 +542,9 @@ module RubyExcel
       sort_method = lambda { |array| idx_array.map { |idx| array[idx] } }
       data.sort_by!( &sort_method )
       self
+    rescue ArgumentError => err
+      raise( NoMethodError, 'Item not comparable in "' + headers.flatten.map(&:to_s).join(', ') + '"' ) if err.message == 'comparison of Array with Array failed'
+      raise err
     end
     
     #
@@ -638,6 +641,27 @@ module RubyExcel
       data.map { |ar| ar.map { |v| v.to_s.gsub(/\t|\n|\r/,' ') }.join "\t" }.join( $/ )
     end
     
+    # {Sheet#to_safe_format!}
+    
+    def to_safe_format
+      dup.to_safe_format!
+    end
+    
+    #
+    # Standardise the data for safe export to Excel.
+    #   Set each cell contents to a string and remove leading equals signs.
+    #
+    
+    def to_safe_format!
+      rows { |r| r.map! { |v|
+        if v.is_a?( String )
+          v[0] == '=' ? v.sub( /\A=/,"'=" ) : v
+        else
+          v.to_s
+        end
+      } }; self
+    end
+    
     #
     # the Sheet as a TSV String
     #

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rubyexcel
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Joel Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-12-20 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,
-  CSV, TSV, or an Excel WIN32OLE Object
+  analysis and editing, and some of Excel's API style. Can output as 2D Array, HTML
+  Table, CSV, TSV, or an Excel WIN32OLE Object
 email: VirtuosoJoel@gmail.com
 executables: []
 extensions: []