kalculator 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a86a3a471fd726634a4f8417a6ce273c2a06c577
-  data.tar.gz: 6c806defc93c0a68a7a4cf175a76dbbdcfdbb41c
+  metadata.gz: 50725a89c0d8187d980f2a8f250a333c52e6c0c0
+  data.tar.gz: f684b6d36c46254dc2dc8336c613c25c8b0e3097
 SHA512:
-  metadata.gz: 524bc87684c499ac83d0a715b271ae471f39ec53dc8514f05ad2eae9c41c4c2cc4f2909dd8a7ca5293d067141eab0a71537072609443d08b33a0cbfb8a28d77a
-  data.tar.gz: 143504c4a02aa61d35ba2103ced6c879a754b12c2304ecee67ff6381b2fb4c4830462868c24de5db014ccd99eece7a3b2774b91f3c79fb305dcca6a42e7fbc87
+  metadata.gz: c07c402094c36cd412a173c8edfe16ac4b2436627cc20aede88a11a4c8fe091d2bc3bc37cc5da479955fb467a7d039ec1864b947a55ee08dd1d7e621f43169a4
+  data.tar.gz: 1cdddcef2cc96ee32753d038dfc39ea9a8ba235ee99b2e90026eae727b3bb2395fea0948d74f4f2fa8c98b6458214dc56fe4b3bf6f76b8e9e3649c5a92951668

data/lib/kalculator.rb

@@ -1,5 +1,6 @@
 require "rltk"
 require "kalculator/data_sources"
+require "kalculator/errors"
 require "kalculator/evaluator"
 require "kalculator/lexer"
 require "kalculator/parser"

data/lib/kalculator/errors.rb

@@ -0,0 +1,5 @@
+class Kalculator
+  class Error < ::StandardError; end
+  class TypeError < Error; end
+  class UndefinedVariableError < Error; end
+end

data/lib/kalculator/evaluator.rb

@@ -48,6 +48,15 @@ class Kalculator
       boolean
     end
 
+    def contains(_, string, substring)
+      string = evaluate(string)
+      substring = evaluate(substring)
+      unless string.is_a?(String) && substring.is_a?(String)
+        raise TypeError, "contains only works with strings, got #{string.inspect} and #{substring.inspect}"
+      end
+      string.include?(substring)
+    end
+
     def if(_, condition, true_clause, false_clause)
       if evaluate(condition)
         evaluate(true_clause)
@@ -65,12 +74,16 @@ class Kalculator
     end
 
     def sum(_, array)
-      evaluate(array).inject(0){|sum, num| sum + num}
+      array = evaluate(array)
+      unless array.is_a?(Array) && array.all?{|n| n.is_a?(Numeric)}
+        raise TypeError, "sum only works with lists of numbers, got #{array.inspect}"
+      end
+      array.inject(0){|sum, num| sum + num}
     end
 
     def variable(_, names)
       names.inject(@data_source) do |source, name|
-        raise "undefined variable #{names.join(".")} (could not find #{name} in #{source}" unless source.key?(name)
+        raise UndefinedVariableError, "undefined variable #{names.join(".")} (could not find #{name} in #{source}" unless source.key?(name)
         source[name]
       end
     end

data/lib/kalculator/lexer.rb

@@ -16,6 +16,7 @@ class Kalculator
     rule(/\d+/)      { |t| [:NUMBER, t.to_i] }
     rule(/\.\d+/)    { |t| [:NUMBER, t.to_f] }
     rule(/\d+\.\d+/) { |t| [:NUMBER, t.to_f] }
+    rule(/contains/) { |t| :CONTAINS }
     rule(/if/)       { |t| :IF }
     rule(/sum/)      { |t| :SUM }
     rule(/true/)     { |t| :TRUE }

data/lib/kalculator/parser.rb

@@ -7,6 +7,9 @@ class Kalculator
     #Left     600 '.'.
 
     production(:expression) do
+      clause('CONTAINS LPAREN expression COMMA expression RPAREN') do |_, _, string, _, substring, _|
+        [:contains, string, substring]
+      end
       clause('IF LPAREN expression COMMA expression COMMA expression RPAREN') do |_, _, condition, _, true_clause, _, false_clause, _|
         [:if, condition, true_clause, false_clause]
       end

data/lib/kalculator/version.rb

@@ -1,3 +1,3 @@
 class Kalculator
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kalculator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Michael Ries
@@ -90,6 +90,7 @@ files:
 - kalculator.gemspec
 - lib/kalculator.rb
 - lib/kalculator/data_sources.rb
+- lib/kalculator/errors.rb
 - lib/kalculator/evaluator.rb
 - lib/kalculator/lexer.rb
 - lib/kalculator/parser.rb