excel_to_code 0.3.18.beta.2 → 0.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 454aafc3c0b81b49d23e47d43c6c9481e05bfd2f203a54cbb4f843a443c2a940
-  data.tar.gz: f91a141c594eade7eb307230be6b942d909081266e6ea13124ebce0539174161
+  metadata.gz: 8a3957e729191cbc51037a420413ad74da28146727732dad6b681d82dc3dc186
+  data.tar.gz: 8dc0f9e740b1826f953fc58da6a6a533f45019a1e64a6d69a2c9435a084ff570
 SHA512:
-  metadata.gz: ff5152ff1c3e2db4456ade2ae8602cf68d52cc62dfcaa4bd8e102d1c3083a42bb32b337d4618ca3bfacf97bec9bcf35eddaea3e9e3a9ecc10aba2a52d75d68bf
-  data.tar.gz: aa9fe6581068e15768d53e2b9a9d2692383c487559808a32f1e86df41d0c3ba5b3b50a01884c7b7e5086c8142ba507b48ab6498a10fbad26a4c71b4ddb57f147
+  metadata.gz: 2a7fcd36058406db53cca24714416d25f6ee2f1f20ba4d97d57632a1d6cd42992243add6f66c835d0264db6a3d9d4f658e063a8c374e36a0445aaea9016e273e
+  data.tar.gz: 623215bcb5cf2b1b20708c86e75976db740ebcc180ad8d93f9587e98ae17e0c3f886c3504fe4051e96050c101560065986db4c2a31953f502b81839ff5a7adb0

data/src/compile/c/excel_to_c_runtime.c

@@ -2215,18 +2215,30 @@ static ExcelValue filter_range(ExcelValue original_range_v, int number_of_argume
 
     if(current_value.type == ExcelString) {
       s = current_value.string;
+      while(s[0] == ' ') {
+        s = s + 1;
+      }
       if(s[0] == '<') {
         if( s[1] == '>') {
+          while(s[2] == ' ') {
+            s = s + 1;
+          }
           new_comparator = strndup(s+2,strlen(s)-2);
           free_later(new_comparator);
           criteria[i].type = NotEqual;
           criteria[i].comparator = EXCEL_STRING(new_comparator);
         } else if(s[1] == '=') {
+          while(s[2] == ' ') {
+            s = s + 1;
+          }
           new_comparator = strndup(s+2,strlen(s)-2);
           free_later(new_comparator);
           criteria[i].type = LessThanOrEqual;
           criteria[i].comparator = EXCEL_STRING(new_comparator);
         } else {
+          while(s[1] == ' ') {
+            s = s + 1;
+          }
           new_comparator = strndup(s+1,strlen(s)-1);
           free_later(new_comparator);
           criteria[i].type = LessThan;
@@ -2234,17 +2246,26 @@ static ExcelValue filter_range(ExcelValue original_range_v, int number_of_argume
         }
       } else if(s[0] == '>') {
         if(s[1] == '=') {
+          while(s[2] == ' ') {
+            s = s + 1;
+          }
           new_comparator = strndup(s+2,strlen(s)-2);
           free_later(new_comparator);
           criteria[i].type = MoreThanOrEqual;
           criteria[i].comparator = EXCEL_STRING(new_comparator);
         } else {
+          while(s[1] == ' ') {
+            s = s + 1;
+          }
           new_comparator = strndup(s+1,strlen(s)-1);
           free_later(new_comparator);
           criteria[i].type = MoreThan;
           criteria[i].comparator = EXCEL_STRING(new_comparator);
         }
       } else if(s[0] == '=') {
+        while(s[1] == ' ') {
+          s = s + 1;
+        }
         new_comparator = strndup(s+1,strlen(s)-1);
         free_later(new_comparator);
         criteria[i].type = Equal;
@@ -2466,18 +2487,30 @@ static ExcelValue countifs(int number_of_arguments, ExcelValue *arguments) {
 
     if(current_value.type == ExcelString) {
       s = current_value.string;
+      while(s[0] == ' ') {
+        s = s + 1;
+      }
       if(s[0] == '<') {
         if( s[1] == '>') {
+          while(s[2] == ' ') {
+            s = s + 1;
+          }
           new_comparator = strndup(s+2,strlen(s)-2);
           free_later(new_comparator);
           criteria[i].type = NotEqual;
           criteria[i].comparator = EXCEL_STRING(new_comparator);
         } else if(s[1] == '=') {
+          while(s[2] == ' ') {
+            s = s + 1;
+          }
           new_comparator = strndup(s+2,strlen(s)-2);
           free_later(new_comparator);
           criteria[i].type = LessThanOrEqual;
           criteria[i].comparator = EXCEL_STRING(new_comparator);
         } else {
+          while(s[1] == ' ') {
+            s = s + 1;
+          }
           new_comparator = strndup(s+1,strlen(s)-1);
           free_later(new_comparator);
           criteria[i].type = LessThan;
@@ -2485,17 +2518,26 @@ static ExcelValue countifs(int number_of_arguments, ExcelValue *arguments) {
         }
       } else if(s[0] == '>') {
         if(s[1] == '=') {
+          while(s[2] == ' ') {
+            s = s + 1;
+          }
           new_comparator = strndup(s+2,strlen(s)-2);
           free_later(new_comparator);
           criteria[i].type = MoreThanOrEqual;
           criteria[i].comparator = EXCEL_STRING(new_comparator);
         } else {
+          while(s[1] == ' ') {
+            s = s + 1;
+          }
           new_comparator = strndup(s+1,strlen(s)-1);
           free_later(new_comparator);
           criteria[i].type = MoreThan;
           criteria[i].comparator = EXCEL_STRING(new_comparator);
         }
       } else if(s[0] == '=') {
+        while(s[1] == ' ') {
+          s = s + 1;
+        }
         new_comparator = strndup(s+1,strlen(s)-1);
         free_later(new_comparator);
         criteria[i].type = Equal;
@@ -2871,6 +2913,8 @@ static ExcelValue text(ExcelValue number_v, ExcelValue format_v) {
     snprintf(s, 99, "%'0.3f",number_v.number);
   } else if(strcmp(format_v.string,"0000") == 0) {
     snprintf(s, 99, "%04.0f",number_v.number);
+  } else if(strcmp(format_v.string,"#,000") == 0) {
+    snprintf(s, 99, "%'03.0f",number_v.number);
   } else {
     snprintf(s, 99, "Text format not recognised");
   }

data/src/compile/c/excel_to_c_runtime_test.c

@@ -585,6 +585,8 @@ int test_functions() {
 
   ExcelValue sumifs_array_10f[] = { sumifs_array_3_v, EXCEL_STRING(">=3")};
   assert(sumifs(sumifs_array_3_v,2, sumifs_array_10f).number == 17);
+  ExcelValue sumifs_array_10g[] = { sumifs_array_3_v, EXCEL_STRING(" >= 3")};
+  assert(sumifs(sumifs_array_3_v,2, sumifs_array_10g).number == 17);
 
   // ... BLANK in check range should match empty strings, BLANK in criteria should match zero
   ExcelValue sumifs_array_11[] = { BLANK, EXCEL_NUMBER(0)};
@@ -658,6 +660,9 @@ int test_functions() {
   ExcelValue countifs_array_10e[] = { countifs_array_3_v, EXCEL_STRING(">3")};
   assert(countifs(2, countifs_array_10e).number == 3.0);
 
+  ExcelValue countifs_array_10e2[] = { countifs_array_3_v, EXCEL_STRING("> 3")};
+  assert(countifs(2, countifs_array_10e2).number == 3.0);
+
   ExcelValue countifs_array_10f[] = { countifs_array_3_v, EXCEL_STRING(">=3")};
   assert(countifs(2, countifs_array_10f).number == 4.0);
 
@@ -890,6 +895,8 @@ int test_functions() {
   assert(strcmp(text(EXCEL_NUMBER(123456789.123456), EXCEL_STRING("#,##")).string, "123,456,789") == 0);
   assert(strcmp(text(EXCEL_NUMBER(123456789.123456), EXCEL_STRING("#,##0")).string, "123,456,789") == 0);
   assert(strcmp(text(EXCEL_NUMBER(123456789.123456), EXCEL_STRING("#,##0.0")).string, "123,456,789.1") == 0);
+  assert(strcmp(text(EXCEL_NUMBER(3.1), EXCEL_STRING("#,000")).string, "003") == 0);
+  assert(strcmp(text(EXCEL_NUMBER(1000.3), EXCEL_STRING("#,000")).string, "1,000") == 0);
   assert(strcmp(text(EXCEL_NUMBER(123456789.123456), EXCEL_STRING("!#,##0.0")).string, "Text format not recognised") == 0);
 
   // Test LOG

data/src/excel/excel_functions/sumifs.rb

@@ -69,7 +69,7 @@ module ExcelFunctions
           when Numeric
             check_value == required_value
           when String
-            required_value =~ /^(<=|>=|<|>)?([-+]?[0-9]+\.?[0-9]*([eE][-+]?[0-9]+)?)$/
+            required_value =~ /^\s*(<=|>=|<|>)?\s*([-+]?[0-9]+\.?[0-9]*([eE][-+]?[0-9]+)?)\s*$/
             if $1 && $2
               check_value.send($1,$2.to_f)
             elsif $2

data/src/excel/excel_functions/text.rb

@@ -20,9 +20,12 @@ module ExcelFunctions
       text(number*100, $1)+"%"
     when /^(0+)$/
       sprintf("%0#{$1.length}.0f", number)
-    when /#[,.]#+(0[.,]0+)?/
+    when /^#[,.]#*(0[.,]0+)?(0*)$/
       formated_with_decimals = text(number, $1 || "0")
       parts = formated_with_decimals.split('.')
+      if $2 && parts[0].length < $2.length
+        parts[0] = ("0"*($2.length - parts[0].length))+parts[0]
+      end
       parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1,")
       parts.join('.')
     when /0[.,](0+)/

data/src/version.rb

@@ -1,4 +1,4 @@
 class ExcelToCode
-  def self.version() "0.3.18.beta.2" end
+  def self.version() "0.3.18" end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.3.18.beta.2
+  version: 0.3.18
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-30 00:00:00.000000000 Z
+date: 2019-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
@@ -365,9 +365,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7