excel_to_code 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4ebae76600b8d182956b7c1f6a0d98617cb7aeb
-  data.tar.gz: 07751fc9af519871db9f60f6011b8de21ee0e6f8
+  metadata.gz: f1b2c421597403690e3738e1f56d63952aee2408
+  data.tar.gz: 3fc17ec74fc2d294220e7cf3b319d8cafe67babf
 SHA512:
-  metadata.gz: 46b666e419461ce012bf8e2f84e2c6b97996943c4d41590c3260e10bbf3de827b4ca6e96caa10f99d16afa80785fea8c6179dc36b0e7f3c58b1a3886f1853daf
-  data.tar.gz: e694dff8476a31eea15131fadb9fa44ddf8d77839ce3ab5e525d40a4ba4307d97ebbfa485a4b9bb4847a05663cbe2970db576d92ab52d21c327904f4f6df97d4
+  metadata.gz: f52431b3047ba767b58f22cd02e5cffc90e4a1eadd207d8dcafe3b00877ea3fc7cfe557f1fc6d1785372bcf7c323fa406af3c01e049a7e891059cb7b60a3cfd4
+  data.tar.gz: 957cf0e0ff469aeba06b08c97013b093f51d5ed8e5a2308e079293a0be2b57c3047f16168418fe5e532911733be2b6f115fd4e4137efd39d70bdd52a08ba716f

data/src/compile/ruby/map_formulae_to_ruby.rb

@@ -34,6 +34,7 @@ class MapFormulaeToRuby < MapValuesToRuby
     'ISNUMBER' => 'isnumber',
     'LARGE' => 'large',
     'LEFT' => 'left',
+    'LEN' => 'len',
     'LOG' => 'log',
     'MATCH' => 'excel_match',
     'MAX' => 'max',
@@ -49,6 +50,7 @@ class MapFormulaeToRuby < MapValuesToRuby
     'ROUND' => 'round',
     'ROUNDDOWN' => 'rounddown',
     'ROUNDUP' => 'roundup',
+    'SUBSTITUTE' => 'substitute',
     'SUBTOTAL' => 'subtotal',
     'SUM' => 'sum',
     'SUMIF' => 'sumif',

data/src/excel/excel_functions.rb

@@ -89,3 +89,7 @@ require_relative 'excel_functions/mmult'
 require_relative 'excel_functions/rank'
 
 require_relative 'excel_functions/isnumber'
+
+require_relative 'excel_functions/len'
+
+require_relative 'excel_functions/substitute'

data/src/excel/excel_functions/excel_equal.rb

@@ -8,12 +8,8 @@ module ExcelFunctions
     return a if a.is_a?(Symbol)
     return b if b.is_a?(Symbol)
     
-    case a
-    when String
-      a.downcase == b.downcase
-    else
-      a == b
-    end
+    return a.downcase == b.downcase if a.is_a?(String) && b.is_a?(String)
+    a == b
     
   end
   

data/src/excel/excel_functions/len.rb

@@ -0,0 +1,8 @@
+module ExcelFunctions
+  
+  def len(a)
+    return a if a.is_a?(Symbol)
+    a.to_s.length
+  end
+  
+end

data/src/excel/excel_functions/not_equal.rb

@@ -3,17 +3,10 @@ require_relative 'apply_to_range'
 module ExcelFunctions
   
   def not_equal?(a,b)
-    # return apply_to_range(a,b) { |a,b| not_equal?(a,b) } if a.is_a?(Array) || b.is_a?(Array)
-    
     return a if a.is_a?(Symbol)
     return b if b.is_a?(Symbol)
-    
-    case a
-    when String
-      a.downcase != b.downcase
-    else
-      a != b
-    end
+    return a.downcase != b.downcase if a.is_a?(String) && b.is_a?(String)
+    a != b
   end
   
 end

data/src/excel/excel_functions/substitute.rb

@@ -0,0 +1,41 @@
+module ExcelFunctions
+  
+  def substitute(text, old_text, new_text, instance_num = :any)
+    # Check for errors
+    return text if text.is_a?(Symbol)
+    return old_text if old_text.is_a?(Symbol)
+    return new_text if new_text.is_a?(Symbol)
+    # Nils get turned into blanks
+    text ||= ""
+    new_text ||= ""
+    old_text ||= ""
+    return text if old_text == ""
+    # Booleans get made into text, but need to be TRUE not true
+    text = text.to_s.upcase if text.is_a?(TrueClass) || text.is_a?(FalseClass)
+    old_text = old_text.to_s.upcase if old_text.is_a?(TrueClass) || old_text.is_a?(FalseClass)
+    new_text = new_text.to_s.upcase if new_text.is_a?(TrueClass) || new_text.is_a?(FalseClass)
+    # Other items get turned into text
+    text = text.to_s
+    old_text = old_text.to_s
+    new_text = new_text.to_s
+    # Now split based on whether instance_num is passed
+    if instance_num == :any
+      # The easy case
+      text.gsub(old_text, new_text)
+    else
+      # The harder case
+      return instance_num if instance_num.is_a?(Symbol)
+      return :value unless instance_num.to_i > 0
+      instances_found = 0
+      text.gsub(old_text) do |match|
+        instances_found += 1
+        if instances_found == instance_num
+          new_text
+        else
+          old_text
+        end
+      end
+    end
+  end
+  
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
@@ -140,6 +140,7 @@ files:
 - src/excel/excel_functions/isnumber.rb
 - src/excel/excel_functions/large.rb
 - src/excel/excel_functions/left.rb
+- src/excel/excel_functions/len.rb
 - src/excel/excel_functions/less_than.rb
 - src/excel/excel_functions/less_than_or_equal.rb
 - src/excel/excel_functions/log.rb
@@ -163,6 +164,7 @@ files:
 - src/excel/excel_functions/rounddown.rb
 - src/excel/excel_functions/roundup.rb
 - src/excel/excel_functions/string_join.rb
+- src/excel/excel_functions/substitute.rb
 - src/excel/excel_functions/subtotal.rb
 - src/excel/excel_functions/subtract.rb
 - src/excel/excel_functions/sum.rb
@@ -263,3 +265,4 @@ specification_version: 4
 summary: Converts .xlxs files into pure ruby 1.9 code or pure C code so that they
   can be executed without excel
 test_files: []
+has_rdoc: false