eqn 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1719c42c8c6c2969cbc5bc1895317205b233a23b
-  data.tar.gz: c3917e3e216c4c5cb6738886d505bde0f2ab73b6
+  metadata.gz: d070fa9a192c3c584f4d91b4adb0b8e7500f8cb5
+  data.tar.gz: a88cd4517b3978cae22afc0efa8e57cd4ad57d9b
 SHA512:
-  metadata.gz: 7bc8f654be594c43376da76c350026ffc6be2078047b334aa8d5ab3fad3b04e5d86bab77f9a7d6d9a6ea7c895eeb8dd314173260d5982132a7cfd1d288a13de1
-  data.tar.gz: 28202b1fa04f0ee38140bf772699b68dd2643e8f3f8506fe38f693baf294ae82533219379b87c91b117003fd33bd76f7e5ffbd996e887dee9b0d28438f49a20a
+  metadata.gz: 98a4e10833eef688a1ade5d4eb2ebde63df3555c6305216c8e5aa58904656b0b2a21639c91bad1a298b3dce0f13a4017db68eff7bc3c0fa6b1b12e9d89e44a04
+  data.tar.gz: cf9c913e5e3229ce7258e9babf4d1e40dc807d4c5dc4e0ee3dcf78ebea3fcbe328e8adcff6dddbbfd3b9022586e0374f102893983d027245f98d9a85556eb52f

data/.gitignore

@@ -1,9 +1,4 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
+.bundle
+coverage
+Gemfile.lock
+pkg

data/README.md

@@ -58,6 +58,15 @@ Eqn supports dynamically inserting values into an equation. Variables are passed
     $ Eqn::Calculator.calc('if(a > 10, b, c)', a: 15, b: 1, c: 0) # see below for function documentation
     # => 1
 
+If you need distinct equations with variable sets, you can instantiate separate instances:
+
+    $ calc = Eqn::Calculator.new('1 + abc', abc: 2.0)
+    $ calc.calc
+    # => 3.0
+    $ calc_two = Eqn::Calculator.new('1 + abc', abc: 5.0)
+    $ calc_two.calc
+    # => 6.0
+
 ### Functions
 
 Eqn presently supports four functions:

data/bin/console

@@ -3,12 +3,5 @@
 require 'bundler/setup'
 require 'eqn'
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
 require 'irb'
 IRB.start

data/lib/eqn.rb

@@ -1,5 +1,2 @@
 require 'treetop'
-require 'eqn/version'
-require 'eqn/parser'
-require 'eqn/calculator'
-require 'eqn/engine' if defined? Rails
+Dir.glob File.join(__dir__, 'eqn', '**', '*.rb'), &method(:require)

data/lib/eqn.treetop

@@ -84,27 +84,27 @@ grammar Eqn
   end
 
   rule pow_op
-    '^' <Eqn::Terminal::Op::Pow>
+    '^' <Eqn::Terminal::Op::RightAssociativeOp>
   end
 
   rule muldiv_op
-      '*' <Eqn::Terminal::Op::Mul>
-    / '/' <Eqn::Terminal::Op::Div>
+      '*' <Eqn::Terminal::Op::RightAssociativeOp>
+    / '/' <Eqn::Terminal::Op::LeftAssociativeOp>
   end
 
   rule addsub_op
-      '+' <Eqn::Terminal::Op::Add>
-    / '-' <Eqn::Terminal::Op::Sub>
+      '+' <Eqn::Terminal::Op::RightAssociativeOp>
+    / '-' <Eqn::Terminal::Op::LeftAssociativeOp>
   end
 
   rule comp_op
-      '<=' <Eqn::Terminal::CompOp::Lte>
-    / '>=' <Eqn::Terminal::CompOp::Gte>
-    / '<'  <Eqn::Terminal::CompOp::Lt>
-    / '>'  <Eqn::Terminal::CompOp::Gt>
-    / '==' <Eqn::Terminal::CompOp::Eq>
-    / '='  <Eqn::Terminal::CompOp::Eq>
-    / '!=' <Eqn::Terminal::CompOp::Neq>
+      '<=' <Eqn::Terminal::CompOp>
+    / '>=' <Eqn::Terminal::CompOp>
+    / '<'  <Eqn::Terminal::CompOp>
+    / '>'  <Eqn::Terminal::CompOp>
+    / '==' <Eqn::Terminal::CompOp>
+    / '='  <Eqn::Terminal::CompOp>
+    / '!=' <Eqn::Terminal::CompOp>
   end
 
   rule exp

data/lib/eqn/calculator.rb

@@ -1,16 +1,32 @@
 module Eqn
   class Calculator
+    def initialize(eqn, vars = {})
+      @eqn = eqn
+      @vars = vars
+    end
+
+    def set(key, value)
+      @vars[key.intern] = value
+    end
+
+    def method_missing(method)
+      super unless %i(calculate calc valid?).include?(method)
+      self.class.send(method, @eqn, @vars)
+    end
+
     class << self
-      def calc(data, vars = {})
+      def calculate(data, vars = {})
+        @@cache_vars = @@vars if defined?(@@vars)
         @@vars = vars
         begin
           result = Parser.parse(data).value
-          fail ZeroDivisionError if result.is_a?(Float) && (result.abs == Float::INFINITY || result.nan?)
+          raise ZeroDivisionError if result.is_a?(Float) && (result.abs == Float::INFINITY || result.nan?)
           result
         ensure
-          @@vars = nil
+          @@vars = defined?(@@cache_vars) ? @@cache_vars : nil
         end
       end
+      alias calc calculate
 
       def valid?(data, vars = {})
         calc(data, vars)

data/lib/eqn/comparation.rb

@@ -1,18 +1,15 @@
 module Eqn
-  class Node < Treetop::Runtime::SyntaxNode; end
-
-  class Comparation < Node
+  class Comparation < Treetop::Runtime::SyntaxNode
     def value
       val_one = elements.shift.value
       if elements.empty?
         val_one
       else
-        op, val_two = elements.shift.value
-        val_one.send(op, val_two)
+        val_one.send(*elements.shift.value)
       end
     end
 
-    class CompGroup < Node
+    class CompGroup < Treetop::Runtime::SyntaxNode
       def value
         [elements.shift.value, elements.shift.value]
       end

data/lib/eqn/engine.rb

@@ -1,7 +1,11 @@
 module Eqn
-  class Engine < ::Rails::Engine
-    initializer 'eqn' do
-      config.autoload_paths += Dir["#{config.root}/lib/**/"]
+  if defined? Rails
+    # :nocov:
+    class Engine < ::Rails::Engine
+      initializer 'eqn' do
+        config.autoload_paths += Dir["#{config.root}/lib/**/"]
+      end
     end
+    # :nocov:
   end
 end

data/lib/eqn/expression.rb

@@ -1,7 +1,5 @@
 module Eqn
-  class Node < Treetop::Runtime::SyntaxNode; end
-
-  class Expression < Node
+  class Expression < Treetop::Runtime::SyntaxNode
     def left_associative?
       elements.any? && elements.last.left_associative?
     end
@@ -34,7 +32,7 @@ module Eqn
       end
     end
 
-    class ExprGroup < Node
+    class ExprGroup < Treetop::Runtime::SyntaxNode
       def left_associative?
         elements.first.left_associative?
       end

data/lib/eqn/function.rb

@@ -1,8 +1,6 @@
 module Eqn
-  class Node < Treetop::Runtime::SyntaxNode; end
-
   module Function
-    class If < Node
+    class If < Treetop::Runtime::SyntaxNode
       def value
         comp_val = elements.shift.value
         ls = elements.shift.value
@@ -12,41 +10,34 @@ module Eqn
       end
     end
 
-    class Round < Node
-      def value
+    class RoundBase < Treetop::Runtime::SyntaxNode
+      def value(fn)
         value = elements.shift.value
-        fail ZeroDivisionError if value.is_a?(Float) && (value.abs == Float::INFINITY || value.nan?)
+        raise ZeroDivisionError if value.is_a?(Float) && (value.abs == Float::INFINITY || value.nan?)
         if elements.empty?
-          value.round
+          value.send(fn)
         else
-          value.round(elements.shift.value)
+          decimals = elements.shift.value
+          (value * 10**decimals).send(fn).to_f / 10**decimals
         end
       end
     end
 
-    class RoundUp < Node
+    class Round < RoundBase
       def value
-        value = elements.shift.value
-        fail ZeroDivisionError if value.is_a?(Float) && (value.abs == Float::INFINITY || value.nan?)
-        if elements.empty?
-          value.ceil
-        else
-          decimals = elements.shift.value
-          (value * 10**decimals).ceil.to_f / 10**decimals
-        end
+        super(:round)
       end
     end
 
-    class RoundDown < Node
+    class RoundUp < RoundBase
       def value
-        value = elements.shift.value
-        fail ZeroDivisionError if value.is_a?(Float) && (value.abs == Float::INFINITY || value.nan?)
-        if elements.empty?
-          value.floor
-        else
-          decimals = elements.shift.value
-          (value * 10**decimals).floor.to_f / 10**decimals
-        end
+        super(:ceil)
+      end
+    end
+
+    class RoundDown < RoundBase
+      def value
+        super(:floor)
       end
     end
   end

data/lib/eqn/number.rb

@@ -1,7 +1,5 @@
 module Eqn
-  class Node < Treetop::Runtime::SyntaxNode; end
-
-  class Number < Node
+  class Number < Treetop::Runtime::SyntaxNode
     def value
       base = elements.shift.value
       # Apply any exponent.
@@ -9,7 +7,7 @@ module Eqn
       base
     end
 
-    class SignedNumber < Node
+    class SignedNumber < Treetop::Runtime::SyntaxNode
       def value
         # Store sign if any.
         sign_negative = elements.shift.negative? if elements.first.is_a? Terminal::Sign
@@ -22,7 +20,7 @@ module Eqn
       end
     end
 
-    class Float < Node
+    class Float < Treetop::Runtime::SyntaxNode
       def value
         base = elements.shift.value
 
@@ -33,13 +31,13 @@ module Eqn
       end
     end
 
-    class Decimal < Node
+    class Decimal < Treetop::Runtime::SyntaxNode
       def value
         elements.shift.dec_value
       end
     end
 
-    class Exponent < Node
+    class Exponent < Treetop::Runtime::SyntaxNode
       def value
         10**elements.shift.value
       end

data/lib/eqn/parser.rb

@@ -1,33 +1,29 @@
-require 'eqn/comparation'
-require 'eqn/errors'
-require 'eqn/expression'
-require 'eqn/function'
-require 'eqn/number'
-require 'eqn/terminal'
-
 module Eqn
   class Parser
     # Load the Treetop grammar from the grammar.
     Treetop.load(File.join(File.dirname(__dir__), 'eqn.treetop'))
     @@parser = EqnParser.new
 
-    def self.parse(data)
-      # Pass the data over to the parser instance.
-      tree = @@parser.parse(data.downcase)
+    class << self
+      def parse(data)
+        # Pass the data over to the parser instance.
+        tree = @@parser.parse(data.downcase)
 
-      # Raise any errors.
-      fail ParseError, "Parse error at offset: #{@@parser.index}" + @@parser.failure_reason if tree.nil?
+        # Raise any errors.
+        raise ParseError, "Parse error at offset: #{@@parser.index}" + @@parser.failure_reason if tree.nil?
 
-      # Remove extraneous nodes and return tree.
-      clean_tree(tree)
-    end
+        # Remove extraneous nodes and return tree.
+        clean_tree(tree)
+      end
+
+      private
 
-    def self.clean_tree(root_node)
-      return if root_node.elements.nil?
-      root_node.elements.delete_if { |node| node.class.name == 'Treetop::Runtime::SyntaxNode' }
-      root_node.elements.each { |node| clean_tree(node) }
-      root_node
+      def clean_tree(root_node)
+        return if root_node.elements.nil?
+        root_node.elements.delete_if { |node| node.class == Treetop::Runtime::SyntaxNode }
+        root_node.elements.each { |node| clean_tree(node) }
+        root_node
+      end
     end
-    private_class_method :clean_tree
   end
 end

data/lib/eqn/terminal.rb

@@ -1,20 +1,15 @@
 module Eqn
   module Terminal
-    class Node < Treetop::Runtime::SyntaxNode; end
-
-    class Variable < Node
+    class Variable < Treetop::Runtime::SyntaxNode
       def value
-        unless Eqn::Calculator.class_variable_get(:@@vars).key? text_value.intern
-          fail NoVariableValueError, "No value given for: #{text_value}"
-        end
-        unless Eqn::Calculator.class_variable_get(:@@vars)[text_value.intern].is_a? Numeric
-          fail NonNumericVariableError, "Variable #{text_value} value is nonnumeric: #{Eqn::Calculator.class_variable_get(:@@vars)[text_value.intern]}"
-        end
-        Eqn::Calculator.class_variable_get(:@@vars)[text_value.intern]
+        val = Eqn::Calculator.class_variable_get(:@@vars)[text_value.intern]
+        raise NoVariableValueError, "No value given for: #{text_value}" unless val
+        raise NonNumericVariableError, "Variable #{text_value} value is nonnumeric: #{val}" unless val.is_a? Numeric
+        val
       end
     end
 
-    class Digits < Node
+    class Digits < Treetop::Runtime::SyntaxNode
       def dec_value
         ".#{text_value}".to_f
       end
@@ -24,99 +19,28 @@ module Eqn
       end
     end
 
-    class Sign < Node
+    class Sign < Treetop::Runtime::SyntaxNode
       def negative?
         text_value == '-'
       end
     end
 
-    class Op < Node
-      class Add < Node
-        def left_associative?
-          false
-        end
-
-        def value
-          '+'
-        end
-      end
-
-      class Sub < Node
-        def left_associative?
-          true
-        end
-
-        def value
-          '-'
-        end
-      end
-
-      class Mul < Node
-        def left_associative?
-          false
-        end
-
-        def value
-          '*'
-        end
+    class Op < Treetop::Runtime::SyntaxNode
+      def left_associative?
+        is_a? LeftAssociativeOp
       end
 
-      class Div < Node
-        def left_associative?
-          true
-        end
-
-        def value
-          '/'
-        end
+      def value
+        text_value == '^' ? :** : text_value.intern
       end
 
-      class Pow < Node
-        def left_associative?
-          false
-        end
-
-        def value
-          '**'
-        end
-      end
+      class LeftAssociativeOp < Op; end
+      class RightAssociativeOp < Op; end
     end
 
-    class CompOp < Node
-      class Lt < Node
-        def value
-          '<'
-        end
-      end
-
-      class Gt < Node
-        def value
-          '>'
-        end
-      end
-
-      class Lte < Node
-        def value
-          '<='
-        end
-      end
-
-      class Gte < Node
-        def value
-          '>='
-        end
-      end
-
-      class Eq < Node
-        def value
-          '=='
-        end
-      end
-
-      class Neq < Node
-        def value
-          '!='
-        end
+    class CompOp < Treetop::Runtime::SyntaxNode
+      def value
+        text_value == '=' ? :== : text_value.intern
       end
     end
   end

data/lib/eqn/version.rb

@@ -1,3 +1,3 @@
 module Eqn
-  VERSION = '1.3.2'
+  VERSION = '1.4.0'.freeze
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: eqn
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Zach Schneider
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.14
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.31'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.31'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
 description: A gem to evaluate numerical equations. Includes support for variables
@@ -116,10 +116,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .ruby-version
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -149,17 +149,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A gem to evaluate numerical equations.