xlsxwriter 0.1.1 → 0.1.2.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4803495a8461935936f93daa7b11167935d977415e3a64279ace94a15a9ee55
-  data.tar.gz: 7c9b3293a7166a11739bb1ec794a852248914fcac8d5f759058b035c6a0f4e84
+  metadata.gz: 2fb20c025afb481308dc6787fa972d8e5675c20b6de467ade855dc051b1b48f2
+  data.tar.gz: 04535f83606938834b2eca512d68a38c4b3e056c4ee660a06e86f8a20ea1454e
 SHA512:
-  metadata.gz: 6dd4d9ab1eb21b5b2eb2f92d8f5b6d7753af94ad85dfeadbff8dad24f0c7c2ca7a3791762bed349560f3165226c47f573020f5318173232a9d16644aa1346a72
-  data.tar.gz: 18730b942a2015143aceb297014755da8465a6db55b51033e97a73f2d57f335efd2c4fafceb3b665ea0797b1df6bdcf11eb373ef6e330025943e7414281bfb19
+  metadata.gz: a3e97984e91290594bf91c438de8ad68f271de79b0dd7bbdef36539f1fe47db589269a956e00b69e75a41ad7fbd627dd143e37abe7e8d6c1cdc1341fab42dbd2
+  data.tar.gz: 1a7d898c096afef2e230d04db7e0180c8dca48bfc72c7cbca6819a300fc8259ad70d6cf55a85368e9df37d717522760725c7d4e878732973ccaf410ce8ba3490

data/ext/xlsxwriter/workbook.c

@@ -352,15 +352,18 @@ value_to_lxw_datetime(VALUE val) {
   if (rb_respond_to(val, i_to_time)) {
     val = rb_funcall(val, i_to_time, 0);
   }
+  VALUE time_a = rb_funcall(val, rb_intern("to_a"), 0);
+  static const VALUE idxs[6] = { INT2FIX(0), INT2FIX(1), INT2FIX(2), INT2FIX(3), INT2FIX(4), INT2FIX(5) };
   lxw_datetime res = {
-    .year  = NUM2INT(rb_funcall(val, rb_intern("year"), 0)),
-    .month = NUM2INT(rb_funcall(val, rb_intern("month"), 0)),
-    .day   = NUM2INT(rb_funcall(val, rb_intern("day"), 0)),
-    .hour  = NUM2INT(rb_funcall(val, rb_intern("hour"), 0)),
-    .min   = NUM2INT(rb_funcall(val, rb_intern("min"), 0)),
-    .sec   = NUM2DBL(rb_funcall(val, rb_intern("sec"), 0)) +
-    NUM2DBL(rb_funcall(val, rb_intern("subsec"), 0))
+    .year  = NUM2INT(rb_ary_aref(1, idxs+5, time_a)),
+    .month = NUM2INT(rb_ary_aref(1, idxs+4, time_a)),
+    .day   = NUM2INT(rb_ary_aref(1, idxs+3, time_a)),
+    .hour  = NUM2INT(rb_ary_aref(1, idxs+2, time_a)),
+    .min   = NUM2INT(rb_ary_aref(1, idxs+1, time_a)),
+    .sec   = NUM2DBL(rb_ary_aref(1, idxs+0, time_a)) +
+             NUM2DBL(rb_funcall(val, rb_intern("subsec"), 0))
   };
+
   return res;
 }
 

data/ext/xlsxwriter/worksheet.c

@@ -206,7 +206,7 @@ worksheet_write_formula_(int argc, VALUE *argv, VALUE self) {
 VALUE worksheet_write_array_formula_(int argc, VALUE *argv, VALUE self) {
   lxw_row_t row_from, row_to;
   lxw_col_t col_from, col_to;
-  const char *str;
+  const char *str = NULL;
   VALUE format_key = Qnil;
 
   rb_check_arity(argc, 2, 6);
@@ -215,6 +215,8 @@ VALUE worksheet_write_array_formula_(int argc, VALUE *argv, VALUE self) {
   if (larg < argc) {
     str = StringValueCStr(argv[larg]);
     ++larg;
+  } else {
+    rb_raise(rb_eArgError, "No formula specified");
   }
 
   if (larg < argc) {
@@ -365,8 +367,8 @@ worksheet_write_boolean_(int argc, VALUE *argv, VALUE self) {
 }
 
 /*  call-seq:
- *     ws.write_datetime(cell, format = nil) -> self
- *     ws.write_datetime(row, col, format = nil) -> self
+ *     ws.write_blank(cell, format = nil) -> self
+ *     ws.write_blank(row, col, format = nil) -> self
  *
  *  Make a +cell+ blank with +format+.
  */

data/lib/xlsxwriter/version.rb

@@ -2,5 +2,5 @@
 
 module XlsxWriter
   # :nodoc:
-  VERSION='0.1.1'.freeze
+  VERSION='0.1.2.pre'.freeze
 end

data/lib/xlsxwriter/worksheet.rb

@@ -20,14 +20,18 @@ class XlsxWriter::Worksheet
     row_idx = @current_row ||= 0
     @current_row += 1
 
+    style_ary = style if style.is_a?(Array)
+    types_ary = types if types.is_a?(Array)
+
     row.each_with_index do |value, idx|
-      cell_style = style.is_a?(Array) ? style[idx] : style
-      cell_type = types.is_a?(Array) ? types[idx] : types
+      cell_style = style_ary ? style_ary[idx] : style
+      cell_type  = types_ary ? types_ary[idx] : types
 
       case cell_type && cell_type.to_sym
       when :string
-        write_string(row_idx, idx, value.to_s, cell_style)
-        update_col_auto_width(idx, value.to_s, cell_style)
+        value = value.to_s
+        write_string(row_idx, idx, value, cell_style)
+        update_col_auto_width(idx, value, cell_style)
       when :number
         write_number(row_idx, idx, value.to_f, cell_style)
       when :formula
@@ -49,19 +53,19 @@ class XlsxWriter::Worksheet
           write_number(row_idx, idx, value, cell_style)
         when TrueClass, FalseClass
           write_boolean(row_idx, idx, value, cell_style)
+        when Time, (defined?(Date) ? Date : Time)
+          write_datetime(row_idx, idx, value, cell_style)
         when '', nil
           write_blank(row_idx, idx, cell_style) unless skip_empty
         when /\A=/
           write_formula(row_idx, idx, value, cell_style)
-        else
-          if value.is_a?(Time) ||
-             (defined?(Date) && value.is_a?(Date)) ||
-             (defined?(DateTime) && value.is_a?(DateTime))
-            write_datetime(row_idx, idx, value.to_time, cell_style)
-          else # assume string
-            write_string(row_idx, idx, value.to_s, cell_style)
-            update_col_auto_width(idx, value.to_s, cell_style)
-          end
+        when String
+          write_string(row_idx, idx, value, cell_style)
+          update_col_auto_width(idx, value, cell_style)
+        else # assume string
+          value = value.to_s
+          write_string(row_idx, idx, value, cell_style)
+          update_col_auto_width(idx, value, cell_style)
         end
       else
         raise ArgumentError, "Unknown cell type #{cell_type}."
@@ -87,6 +91,6 @@ class XlsxWriter::Worksheet
     font_scale = (@workbook.font_sizes[format] || 11) / 10.0
     width = (val.count(THIN_CHARS) + 3) * font_scale
     width = 255 if width > 255 # Max xlsx column width is 255 characters
-    @col_auto_widths[idx] = [@col_auto_widths[idx], width].compact.max
+    @col_auto_widths[idx] = [@col_auto_widths[idx] || 0, width].max
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlsxwriter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2.pre
 platform: ruby
 authors:
 - Nick H
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-07 00:00:00.000000000 Z
+date: 2019-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -195,9 +195,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: