dentaku 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cca185ca8ad75d5c0c0cd13241ad8356a6d046f0
-  data.tar.gz: 469a8af2de92efdb3b75297ec7de268e6b066492
+  metadata.gz: 3007daa3af2e8cf5e738f4d98d046f23422004e3
+  data.tar.gz: 7994b1e07961a589580275cfb14978a9fb6ab091
 SHA512:
-  metadata.gz: b0348e2c7b06c318ab67f88bfddc5f6c6e5ac44efdaeacd53d35a23764f3d961530524c7929673ce3737375f0b93671dedadccb7ab5d0d363f4916b218ce0b30
-  data.tar.gz: 36043cafe22a9f2dd60f926a13832dc3175e3f7000c6eac081925d234501f287c6289adeed51b45334d9c7353a4a29a5458b7414cd612ecbb05039e852590914
+  metadata.gz: b5287d0c47550c976e373a1b291526e79da3fae5aa4e78ebd6e479e3ee467a701f577b45d9acacf9949466186f429f6b9d0ec211917a776e0e29230bba6075d7
+  data.tar.gz: f7ac853d45ed2a50b3b5d0b4ee8cab110db7adea2dce84f291a328051a19da1c955e058d2d68d23ea1cb367deac0387b94b6039b836f7310a625a7a599861236

data/.gitignore

@@ -8,3 +8,4 @@ vendor/*
 
 /.ruby-gemset
 /.ruby-version
+/.rspec

data/.pryrc

@@ -0,0 +1,2 @@
+require "bundler"
+Bundler.require

data/README.md

@@ -247,11 +247,12 @@ contributors:
 
 * [0xCCD](https://github.com/0xCCD)
 * [AlexeyMK](https://github.com/AlexeyMK)
-* [CraigCottingham](https://github.com/CraigCottingham)
 * [antonversal](https://github.com/antonversal)
 * [arnaudl](https://github.com/arnaudl)
 * [bernardofire](https://github.com/bernardofire)
 * [brixen](https://github.com/brixen)
+* [CraigCottingham](https://github.com/CraigCottingham)
+* [glanotte](https://github.com/glanotte)
 * [jasonhutchens](https://github.com/jasonhutchens)
 * [jmangs](https://github.com/jmangs)
 * [mvbrocato](https://github.com/mvbrocato)

data/dentaku.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec')
+  s.add_development_dependency('pry')
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/dentaku/bulk_expression_solver.rb

@@ -0,0 +1,75 @@
+require 'dentaku/calculator'
+require 'dentaku/dependency_resolver'
+require 'dentaku/exceptions'
+require 'dentaku/expression'
+
+module Dentaku
+  class BulkExpressionSolver
+    def initialize(expression_hash, memory)
+      self.expression_hash = expression_hash
+      self.memory = memory
+    end
+
+    def solve!
+      solve(&raise_exception_handler)
+    end
+
+    def solve(&block)
+      error_handler = block || return_undefined_handler
+      results = load_results(&error_handler)
+
+      expression_hash.each_with_object({}) do |(k, _), r|
+        r[k] = results[k.to_s]
+      end
+    end
+
+    private
+
+    attr_accessor :expression_hash, :memory
+
+    def return_undefined_handler
+      ->(*) { :undefined }
+    end
+
+    def raise_exception_handler
+      ->(ex) { raise ex }
+    end
+
+    def load_results(&block)
+      variables_in_resolve_order.each_with_object({}) do |var_name, r|
+        begin
+          r[var_name] = evaluate!(expressions[var_name], r)
+        rescue Dentaku::UnboundVariableError, ZeroDivisionError => ex
+          r[var_name] = block.call(ex)
+        end
+      end
+    end
+
+    def dependencies(expression)
+      Expression.new(expression, memory).identifiers
+    end
+
+    def expressions
+      @expressions ||= Hash[expression_hash.map { |k,v| [k.to_s, v] }]
+    end
+
+    def expression_dependencies
+      Hash[expressions.map { |var, expr| [var, dependencies(expr)] }]
+    end
+
+    def variables_in_resolve_order
+      @variables_in_resolve_order ||=
+        DependencyResolver::find_resolve_order(expression_dependencies)
+    end
+
+    def evaluate!(expression, results)
+      expr = Expression.new(expression, memory.merge(expressions))
+      raise UnboundVariableError.new(expr.identifiers) if expr.unbound?
+      calculator.evaluate!(expression, results)
+    end
+
+    def calculator
+      @calculator ||= Calculator.new.store(memory)
+    end
+  end
+end

data/lib/dentaku/calculator.rb

@@ -1,3 +1,4 @@
+require 'dentaku/bulk_expression_solver'
 require 'dentaku/evaluator'
 require 'dentaku/exceptions'
 require 'dentaku/expression'
@@ -40,24 +41,11 @@ module Dentaku
     end
 
     def solve!(expression_hash)
-      expressions = Hash[expression_hash.map { |k,v| [k.to_s, v] }]
-
-      # expression_hash: { variable_name: "string expression" }
-      # TSort thru the expressions' dependencies, then evaluate all
-      expression_dependencies = Hash[expressions.map do |var, expr|
-        [var, dependencies(expr)]
-      end]
-
-      variables_in_resolve_order = DependencyResolver::find_resolve_order(
-        expression_dependencies)
-
-      results = variables_in_resolve_order.each_with_object({}) do |var_name, r|
-        r[var_name] = evaluate!(expressions[var_name], r)
-      end
+      BulkExpressionSolver.new(expression_hash, @memory).solve!
+    end
 
-      expression_hash.each_with_object({}) do |(k, _), r|
-        r[k] = results[k.to_s]
-      end
+    def solve(expression_hash, &block)
+      BulkExpressionSolver.new(expression_hash, @memory).solve(&block)
     end
 
     def dependencies(expression)

data/lib/dentaku/version.rb

@@ -1,3 +1,3 @@
 module Dentaku
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

data/spec/bulk_expression_solver_spec.rb

@@ -0,0 +1,51 @@
+require 'dentaku/bulk_expression_solver'
+
+RSpec.describe Dentaku::BulkExpressionSolver do
+  describe "#solve!" do
+    it "evaluates properly with variables, even if some in memory" do
+      expressions = {
+        weekly_fruit_budget: "weekly_apple_budget + pear * 4",
+        weekly_apple_budget: "apples * 7",
+        pear: "1"
+      }
+      memory = {apples: 3}
+      solver = described_class.new(expressions, memory)
+      expect(solver.solve!)
+        .to eq(pear: 1, weekly_apple_budget: 21, weekly_fruit_budget: 25)
+    end
+
+    it "lets you know if a variable is unbound" do
+      expressions = {more_apples: "apples + 1"}
+      expect {
+        described_class.new(expressions, {}).solve!()
+      }.to raise_error(Dentaku::UnboundVariableError)
+    end
+
+    it "lets you know if the result is a div/0 error" do
+      expressions = {more_apples: "1/0"}
+      expect {
+        described_class.new(expressions, {}).solve!()
+      }.to raise_error(ZeroDivisionError)
+    end
+  end
+
+  describe "#solve" do
+    it "returns :undefined when variables are unbound" do
+      expressions = {more_apples: "apples + 1"}
+      expect(described_class.new(expressions, {}).solve())
+        .to eq(more_apples: :undefined)
+    end
+
+    it "allows passing in a custom value to an error handler when a variable is unbound" do
+      expressions = {more_apples: "apples + 1"}
+      expect(described_class.new(expressions, {}).solve() { :foo })
+        .to eq(more_apples: :foo)
+    end
+
+    it "allows passing in a custom value to an error handler when there is a div/0 error" do
+      expressions = {more_apples: "1/0"}
+      expect(described_class.new(expressions, {}).solve() { :foo })
+        .to eq(more_apples: :foo)
+    end
+  end
+end

data/spec/calculator_spec.rb

@@ -87,6 +87,25 @@ describe Dentaku::Calculator do
       result = with_memory.solve!(total_fruit: "Apples + pears", pears: 10)
       expect(result[:total_fruit]).to eq 13
     end
+
+    it "lets you know if a variable is unbound" do
+      expect {
+        calculator.solve!(more_apples: "apples + 1")
+      }.to raise_error(Dentaku::UnboundVariableError)
+    end
+  end
+
+  describe 'solve' do
+    it "returns :undefined when variables are unbound" do
+      expressions = {more_apples: "apples + 1"}
+      expect(calculator.solve(expressions)).to eq(more_apples: :undefined)
+    end
+
+    it "allows passing in a custom value to an error handler" do
+      expressions = {more_apples: "apples + 1"}
+      expect(calculator.solve(expressions) { :foo })
+        .to eq(more_apples: :foo)
+    end
   end
 
   it 'evaluates a statement with no variables' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dentaku
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Solomon White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-23 00:00:00.000000000 Z
+date: 2015-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |2
       Dentaku is a parser and evaluator for mathematical formulas
 email:
@@ -47,6 +61,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".pryrc"
 - ".travis.yml"
 - Gemfile
 - README.md
@@ -54,6 +69,7 @@ files:
 - dentaku.gemspec
 - lib/dentaku.rb
 - lib/dentaku/binary_operation.rb
+- lib/dentaku/bulk_expression_solver.rb
 - lib/dentaku/calculator.rb
 - lib/dentaku/dependency_resolver.rb
 - lib/dentaku/evaluator.rb
@@ -68,6 +84,7 @@ files:
 - lib/dentaku/version.rb
 - spec/benchmark.rb
 - spec/binary_operation_spec.rb
+- spec/bulk_expression_solver_spec.rb
 - spec/calculator_spec.rb
 - spec/dentaku_spec.rb
 - spec/evaluator_spec.rb
@@ -106,6 +123,7 @@ summary: A formula language parser and evaluator
 test_files:
 - spec/benchmark.rb
 - spec/binary_operation_spec.rb
+- spec/bulk_expression_solver_spec.rb
 - spec/calculator_spec.rb
 - spec/dentaku_spec.rb
 - spec/evaluator_spec.rb