dentaku 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 321fc84e833503ab21de4fdb06254666376ebe85
-  data.tar.gz: aa1d2820110ba82ff68219e6b5b0681224bfd44d
+  metadata.gz: 34a03b8d224b161ba7b6cdbfd0d5f1fd344f932c
+  data.tar.gz: 20e97d8a754981e1597748723afd4f54285a0e19
 SHA512:
-  metadata.gz: d5929679dbe4e6caea26ba61f4c920fe9a1d9e3b4880cc21c59a57e33109dc0ae9896f1c47ad4baadfe3ad1e2a0ac20d588b2266b63c8b3fcf4f535504871c95
-  data.tar.gz: aae2e18c9cad2e3452e2c8193c93be0754ee09628095119fdff91db9de613526cba57f9f4b3f5ff0c0eee6935298c754075ded6cd75b86c96c3aa1000cc29add
+  metadata.gz: 510851224ae2e3e6b6a19b229cfe6095a28eaf9c6ac978edd6ea40295f4dc9a37b2fdb03d6f0072ef79b9fcfe1bf34f715f3f910d21b79491ce72643e66cddaf
+  data.tar.gz: b27e2dfc0c821f04475310eb47e6d30d908c02a77ba7da7512ed703a21b99c62e6a85a21be25d34db8540d9e10d131971ca45dfd54be554aed0a29e71e9b1b50

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-## [v2.0.2] 2015-08-20
+## [v2.0.3] 2015-08-25
 - bug fixes
 - performance enhancements
 - code cleanup
@@ -80,7 +80,7 @@
 ## [v0.1.0] 2012-01-20
 - initial release
 
-[v2.0.2]:  https://github.com/rubysolo/dentaku/compare/v2.0.1...v2.0.2
+[v2.0.3]:  https://github.com/rubysolo/dentaku/compare/v2.0.1...v2.0.3
 [v2.0.1]:  https://github.com/rubysolo/dentaku/compare/v2.0.0...v2.0.1
 [v2.0.0]:  https://github.com/rubysolo/dentaku/compare/v1.2.6...v2.0.0
 [v1.2.6]:  https://github.com/rubysolo/dentaku/compare/v1.2.5...v1.2.6

data/lib/dentaku/ast/arithmetic.rb

@@ -1,4 +1,5 @@
 require_relative './operation'
+require 'bigdecimal'
 
 module Dentaku
   module AST
@@ -51,7 +52,22 @@ module Dentaku
 
     class Division < Arithmetic
       def value(context={})
-        left.value(context) / right.value(context)
+        r = BigDecimal.new(right.value(context))
+        raise ZeroDivisionError if r.zero?
+
+        v = BigDecimal.new(left.value(context)) / r
+        v = v.to_i if v.frac.zero?
+        v
+      end
+
+      def self.precedence
+        20
+      end
+    end
+
+    class Modulo < Arithmetic
+      def value(context={})
+        left.value(context) % right.value(context)
       end
 
       def self.precedence

data/lib/dentaku/parser.rb

@@ -114,6 +114,7 @@ module Dentaku
         divide:   AST::Division,
         pow:      AST::Exponentiation,
         negate:   AST::Negation,
+        mod:      AST::Modulo,
 
         lt:       AST::LessThan,
         gt:       AST::GreaterThan,

data/lib/dentaku/version.rb

@@ -1,3 +1,3 @@
 module Dentaku
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/spec/ast/addition_spec.rb

@@ -17,7 +17,7 @@ describe Dentaku::AST::Addition do
   it 'requires numeric operands' do
     expect {
       described_class.new(five, t)
-    }.to raise_error
+    }.to raise_error(RuntimeError, /requires numeric operands/)
 
     expression = Dentaku::AST::Multiplication.new(five, five)
     group = Dentaku::AST::Grouping.new(expression)

data/spec/ast/and_spec.rb

@@ -17,7 +17,7 @@ describe Dentaku::AST::And do
   it 'requires logical operands' do
     expect {
       described_class.new(t, five)
-    }.to raise_error
+    }.to raise_error(RuntimeError, /requires logical operands/)
 
     expression = Dentaku::AST::LessThanOrEqual.new(five, five)
     expect {

data/spec/ast/division_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'dentaku/ast/arithmetic'
+
+require 'dentaku/token'
+
+describe Dentaku::AST::Division do
+  let(:five) { Dentaku::AST::Logical.new Dentaku::Token.new(:numeric, 5) }
+  let(:six)  { Dentaku::AST::Logical.new Dentaku::Token.new(:numeric, 6) }
+
+  let(:t)    { Dentaku::AST::Numeric.new Dentaku::Token.new(:logical, true) }
+
+  it 'performs division' do
+    node = described_class.new(five, six)
+    expect(node.value.round(4)).to eq 0.8333
+  end
+
+  it 'requires numeric operands' do
+    expect {
+      described_class.new(five, t)
+    }.to raise_error(RuntimeError, /requires numeric operands/)
+
+    expression = Dentaku::AST::Multiplication.new(five, five)
+    group = Dentaku::AST::Grouping.new(expression)
+
+    expect {
+      described_class.new(group, five)
+    }.not_to raise_error
+  end
+end

data/spec/ast/function_spec.rb

@@ -7,7 +7,7 @@ describe Dentaku::AST::Function do
   end
 
   it 'raises an exception when trying to access an undefined function' do
-    expect { described_class.get("flarble") }.to raise_error
+    expect { described_class.get("flarble") }.to raise_error(RuntimeError, /undefined function/i)
   end
 
   it 'registers a custom function' do

data/spec/calculator_spec.rb

@@ -27,6 +27,8 @@ describe Dentaku::Calculator do
     expect(calculator.evaluate('0 * 10 ^ -5')).to eq(0)
     expect(calculator.evaluate('3 + 0 * -3')).to eq(3)
     expect(calculator.evaluate('3 + 0 / -3')).to eq(3)
+    expect(calculator.evaluate('15 % 8')).to eq(7)
+    expect(calculator.evaluate('(((695759/735000)^(1/(1981-1991)))-1)*1000').round(4)).to eq(5.5018)
   end
 
   describe 'memory' do
@@ -81,7 +83,7 @@ describe Dentaku::Calculator do
     it "lets you know about a cycle if one occurs" do
       expect do
         calculator.solve!(health: "happiness", happiness: "health")
-      end.to raise_error (TSort::Cyclic)
+      end.to raise_error(TSort::Cyclic)
     end
 
     it 'is case-insensitive' do

data/spec/parser_spec.rb

@@ -82,7 +82,7 @@ describe Dentaku::Parser do
     x     = Dentaku::Token.new(:identifier, :x)
 
     node  = described_class.new([five, times, x]).parse
-    expect { node.value }.to raise_error
+    expect { node.value }.to raise_error(Dentaku::UnboundVariableError)
     expect(node.value(x: 3)).to eq 15
   end
 

data/spec/tokenizer_spec.rb

@@ -142,8 +142,8 @@ describe Dentaku::Tokenizer do
   end
 
   it 'detects unbalanced parentheses' do
-    expect { tokenizer.tokenize('(5+3') }.to raise_error
-    expect { tokenizer.tokenize(')')    }.to raise_error
+    expect { tokenizer.tokenize('(5+3') }.to raise_error(RuntimeError, /too many opening parentheses/)
+    expect { tokenizer.tokenize(')')    }.to raise_error(RuntimeError, /too many closing parentheses/)
   end
 
   it 'recognizes identifiers that share initial substrings with combinators' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dentaku
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Solomon White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -105,6 +105,7 @@ files:
 - lib/dentaku/version.rb
 - spec/ast/addition_spec.rb
 - spec/ast/and_spec.rb
+- spec/ast/division_spec.rb
 - spec/ast/function_spec.rb
 - spec/ast/node_spec.rb
 - spec/ast/numeric_spec.rb
@@ -146,6 +147,7 @@ summary: A formula language parser and evaluator
 test_files:
 - spec/ast/addition_spec.rb
 - spec/ast/and_spec.rb
+- spec/ast/division_spec.rb
 - spec/ast/function_spec.rb
 - spec/ast/node_spec.rb
 - spec/ast/numeric_spec.rb