kalculator 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df50bd8eebb0124d8656b68a187b42963c2a8d1a4e14018e79f9b2e12fa9e77e
-  data.tar.gz: e414204de2fca16a6ee2313508dc4c10aa9755ddc9fd95ab77083c72b33c1687
+  metadata.gz: 3cb0411bb21bb99550cde9115cb53218b956d7fa107779b8e318446114fa6f3e
+  data.tar.gz: 1aad75a31f459f8a6b3c2390b073ff507c27d5ec56b5bf017d91c5f14ff41bce
 SHA512:
-  metadata.gz: f2bdd16d1393e2f1991aa0240cbe4ea761fd4b3db0bb1ec2711646fd855305dac8eff52d9c6a271a2a6df39c5eaffaf9623ade7ba9984b7ac122c0454cd9e4d4
-  data.tar.gz: 74102a128ee39aa879a5380a0c7934b0d5bc11ee618553431808e39dd390c873c4a6246338e587c6c7a4de4051622564444d11cd005dca6927e95845c06763eb
+  metadata.gz: b25b44e6d18de63b49db47effbf77661d1ae1556e5b61745be03bd3a813bda3afe7218815af54132ac59ffee4e32314d6bdb7ff993ca4255da7b713ac64633cd
+  data.tar.gz: dbede4204b904eb0f9969da284facdc0b91827878e87430dfa10d45bccc3e7a9fa373fa78cf26d63c7d6f96f38f604d074dbc622fb5fe01ca19b5bc08d881733

data/lib/kalculator.rb

@@ -4,6 +4,7 @@ require "kalculator/errors"
 require "kalculator/evaluator"
 require "kalculator/formula"
 require "kalculator/lexer"
+require "kalculator/nested_lookup"
 require "kalculator/parser"
 require "kalculator/version"
 

data/lib/kalculator/evaluator.rb

@@ -81,11 +81,9 @@ class Kalculator
       array.inject(0){|sum, num| sum + num}
     end
 
-    def variable(_, names)
-      names.inject(@data_source) do |source, name|
-        raise UndefinedVariableError, "undefined variable #{names.join(".")} (could not find #{name} in #{source}" unless source.key?(name)
-        source[name]
-      end
+    def variable(_, name)
+      raise UndefinedVariableError, "undefined variable #{name}" unless @data_source.key?(name)
+      @data_source[name]
     end
   end
 end

data/lib/kalculator/nested_lookup.rb

@@ -0,0 +1,25 @@
+class Kalculator
+  class NestedLookup
+    def initialize(data_source)
+      @data_source = data_source
+    end
+
+    def key?(name)
+      names = name.split(".")
+      source = @data_source
+      names.all? do |name|
+        break false unless source.key?(name)
+        source = source[name]
+        true
+      end
+    end
+
+    def [](name)
+      names = name.split(".")
+      names.inject(@data_source) do |source, name|
+        break nil unless source.key?(name)
+        source[name]
+      end
+    end
+  end
+end

data/lib/kalculator/parser.rb

@@ -20,7 +20,7 @@ class Kalculator
 
       clause('NUMBER') { |n| [:number, n] }
       clause('STRING') { |s| [:string, s] }
-      clause('IDENT') { |n| [:variable, n.split(".")] }
+      clause('IDENT') { |n| [:variable, n] }
       clause('TRUE') { |n| [:boolean, true] }
       clause('FALSE') { |n| [:boolean, false] }
 

data/lib/kalculator/version.rb

@@ -1,3 +1,3 @@
 class Kalculator
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kalculator
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Ries
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rltk
@@ -94,6 +94,7 @@ files:
 - lib/kalculator/evaluator.rb
 - lib/kalculator/formula.rb
 - lib/kalculator/lexer.rb
+- lib/kalculator/nested_lookup.rb
 - lib/kalculator/parser.rb
 - lib/kalculator/version.rb
 homepage: https://github.com/mmmries/kalculator