kalculator 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 50725a89c0d8187d980f2a8f250a333c52e6c0c0
-  data.tar.gz: f684b6d36c46254dc2dc8336c613c25c8b0e3097
+SHA256:
+  metadata.gz: df50bd8eebb0124d8656b68a187b42963c2a8d1a4e14018e79f9b2e12fa9e77e
+  data.tar.gz: e414204de2fca16a6ee2313508dc4c10aa9755ddc9fd95ab77083c72b33c1687
 SHA512:
-  metadata.gz: c07c402094c36cd412a173c8edfe16ac4b2436627cc20aede88a11a4c8fe091d2bc3bc37cc5da479955fb467a7d039ec1864b947a55ee08dd1d7e621f43169a4
-  data.tar.gz: 1cdddcef2cc96ee32753d038dfc39ea9a8ba235ee99b2e90026eae727b3bb2395fea0948d74f4f2fa8c98b6458214dc56fe4b3bf6f76b8e9e3649c5a92951668
+  metadata.gz: f2bdd16d1393e2f1991aa0240cbe4ea761fd4b3db0bb1ec2711646fd855305dac8eff52d9c6a271a2a6df39c5eaffaf9623ade7ba9984b7ac122c0454cd9e4d4
+  data.tar.gz: 74102a128ee39aa879a5380a0c7934b0d5bc11ee618553431808e39dd390c873c4a6246338e587c6c7a4de4051622564444d11cd005dca6927e95845c06763eb

data/lib/kalculator.rb

@@ -2,23 +2,17 @@ require "rltk"
 require "kalculator/data_sources"
 require "kalculator/errors"
 require "kalculator/evaluator"
+require "kalculator/formula"
 require "kalculator/lexer"
 require "kalculator/parser"
 require "kalculator/version"
 
 class Kalculator
   def self.evaluate(formula, data_source = {})
-    new(formula).evaluate(data_source)
+    Kalculator::Formula.new(formula).evaluate(data_source)
   end
 
-  attr_reader :ast, :string
-
-  def initialize(string)
-    @ast = Kalculator::Parser.parse(Kalculator::Lexer.lex(string))
-    @string = string
-  end
-
-  def evaluate(data_source = {})
-    Kalculator::Evaluator.new(data_source).evaluate(ast)
+  def self.new(*args)
+    Kalculator::Formula.new(*args)
   end
 end

data/lib/kalculator/formula.rb

@@ -0,0 +1,14 @@
+class Kalculator
+  class Formula
+    attr_reader :ast, :string
+
+    def initialize(string)
+      @ast = Kalculator::Parser.parse(Kalculator::Lexer.lex(string))
+      @string = string
+    end
+
+    def evaluate(data_source = {})
+      Kalculator::Evaluator.new(data_source).evaluate(ast)
+    end
+  end
+end

data/lib/kalculator/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kalculator
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Michael Ries
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-13 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rltk
@@ -92,6 +92,7 @@ files:
 - lib/kalculator/data_sources.rb
 - lib/kalculator/errors.rb
 - lib/kalculator/evaluator.rb
+- lib/kalculator/formula.rb
 - lib/kalculator/lexer.rb
 - lib/kalculator/parser.rb
 - lib/kalculator/version.rb
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A calculator that can safely and quickly interpret user-input