kalculator 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5026dd4c73a2ebf6f64a18d11d6ef1c8838f902a4fb9fdee31bba43c0819d998
-  data.tar.gz: dacfcdd98e1bc4c08048052b1f4ce4fa94449ac05d7217842c9fbfbce8c0efc6
+  metadata.gz: 4fd2684ec05188a764da05fae5593566ab7122191864da22ae2296b89d8e1185
+  data.tar.gz: d4f25af127744abcfe43f13281169374cd678ec9964c96b0f365bbf8de69762c
 SHA512:
-  metadata.gz: 35c4bab92d9ed7b895f7f60231a8cfbd01a4ecefec46f0eebdff27a465543fe3ab6f14b6a2876df636ebb9fc20a02ebfbb1695a04d50197c80b7678cc513222b
-  data.tar.gz: 243833c66d4dc6a3eb952a53610226cf28c5f8d94b49c77b95d71737d33ec35ef32bafd3ebda38511b96be36fda8cc9ac59cc71ff47ae958940bd5401f6af2a5
+  metadata.gz: b361d425d87505bab75a23f84a9e8073b90a551d3aeffe33b39cae270dbb49a7925ea9bc90c66e553bc9c2bf6acc092732bc93998e7c1228f7b2c47a873308e8
+  data.tar.gz: d2bf943a2fa7e5a9693cb52bbb4ccce40f267b3b90c97fdc99050c890eb03e93395269f04f9ab752560e43667cc362c1c02abb677eb8bc4bd7c11241d231a756

data/lib/kalculator/evaluator.rb

@@ -72,6 +72,12 @@ class Kalculator
       end
     end
 
+    def count(_, collection)
+      collection = evaluate(collection)
+      raise TypeError, "count only works with Enumerable types, got #{collection.inspect}" unless collection.is_a?(Enumerable)
+      collection.count
+    end
+
     def if(_, condition, true_clause, false_clause)
       if evaluate(condition)
         evaluate(true_clause)

data/lib/kalculator/lexer.rb

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

data/lib/kalculator/parser.rb

@@ -16,6 +16,9 @@ class Kalculator
       clause('SUM LPAREN expression RPAREN') do |_, _, e0, _|
         [:sum, e0]
       end
+      clause('COUNT LPAREN expression RPAREN') do |_, _, e0, _|
+        [:count, e0]
+      end
       clause('LPAREN expression RPAREN') { |_, expression, _| expression }
       clause('LBRACKET expressions RBRACKET') { |_, expressions, _| [:list, expressions] }
 

data/lib/kalculator/version.rb

@@ -1,3 +1,3 @@
 class Kalculator
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kalculator
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Michael Ries
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rltk