eqn 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e3c2babed433b6bdbeec3165078ea736c56bdcd9
-  data.tar.gz: 21b7734540dc5612fd68489dffdac08fb522efde
+SHA256:
+  metadata.gz: 807944d76a7626f0a7772757f110600324c9fa63c12aaad04ad68c07c162ea90
+  data.tar.gz: 8debccddd120f9acc3523e6ca8b5a0835823d1c9240177751103b5a886fc7971
 SHA512:
-  metadata.gz: 3af53478ab744d25f0cb7ab6b3f5f08f02fa86311936182f660885fa100bcdbd4276e6a570530c53a1b2f08f8d0b89ca94561a2069b8072e9e64d0cc533e59e3
-  data.tar.gz: e9fbd3a367a4041243fd6f61ac6e37be55558b2550578efb482e3d6cd2ae834bfdd19397c722168af719c08c7ce33e87c86b6342a6cd965dc82660e89c325c16
+  metadata.gz: 4b3efde4aa07b6f310bb23085328186253c2874e1cf91d93cc13dc4289d9a8ea903d38052091a3194fedb8e66af2a74945298009fcf436610a011dfadfe84e8c
+  data.tar.gz: 865205a5958a138849e8e254ce3dcf4145fa10f27d8934a2132e710682919f234f0c021ea6b3b43e08a9f1a7172535cca43d6fa9b8b3066bd08cca4befd24d91

data/eqn.gemspec

@@ -27,9 +27,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'appraisal', '~> 2.2.0'
   spec.add_development_dependency 'bundler', '>= 1.9'
   spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0'
-  spec.add_development_dependency 'rake', '~> 11.0'
-  spec.add_development_dependency 'rubocop', '~> 0.49'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.15'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rubocop', '~> 0.60'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.30'
   spec.add_development_dependency 'rspec', '~> 3.5.0'
-  spec.add_development_dependency 'simplecov', '~> 0.14'
+  spec.add_development_dependency 'simplecov', '< 0.18'
 end

data/lib/eqn.rb

@@ -7,4 +7,4 @@ Treetop.load(File.join(__dir__, 'eqn.treetop'))
 require File.join(__dir__, 'eqn', 'eqn_node')
 
 # Load other eqn classes.
-Dir.glob File.join(__dir__, 'eqn', '**', '*.rb'), &method(:require)
+Dir.glob(File.join(__dir__, 'eqn', '**', '*.rb')).sort.each(&method(:require))

data/lib/eqn.treetop

@@ -40,19 +40,19 @@ grammar Eqn
   end
 
   rule if_func
-    'if' space? '(' comparation ',' expression ',' expression ')' <Eqn::Function::If>
+    ('if' / 'IF') space? '(' comparation ',' expression ',' expression ')' <Eqn::Function::If>
   end
 
   rule round_func
-    'round' space? '(' expression round_group? ')' <Eqn::Function::Round>
+    ('round' / 'ROUND') space? '(' expression round_group? ')' <Eqn::Function::Round>
   end
 
   rule roundup_func
-    'roundup' space? '(' expression round_group? ')' <Eqn::Function::RoundUp>
+    ('roundup' / 'ROUNDUP') space? '(' expression round_group? ')' <Eqn::Function::RoundUp>
   end
 
   rule rounddown_func
-    'rounddown' space? '(' expression round_group? ')' <Eqn::Function::RoundDown>
+    ('rounddown' / 'ROUNDDOWN') space? '(' expression round_group? ')' <Eqn::Function::RoundDown>
   end
 
   rule round_group

data/lib/eqn/calculator.rb

@@ -27,7 +27,7 @@ module Eqn
     end
 
     def respond_to_missing?(method, _include_private = false)
-      delegated_method?(method) || match_setter?(method) || match_getter?(method)
+      delegated_method?(method) || match_setter?(method) || match_getter?(method) || super
     end
 
     private
@@ -39,6 +39,7 @@ module Eqn
     def setter_key(method)
       match = method.to_s.match(/^[A-Za-z]+=$/)
       return unless match
+
       match.to_s.delete('=').to_sym
     end
 
@@ -49,8 +50,10 @@ module Eqn
     def getter_key(method)
       match = method.to_s.match(/^[A-Za-z]+$/)
       return if match.nil?
+
       key = match.to_s.to_sym
       return unless @vars.key?(key)
+
       key
     end
 
@@ -62,6 +65,7 @@ module Eqn
       def calculate(equation, vars = {})
         result = Parser.parse(equation).value(vars)
         raise ZeroDivisionError if result.is_a?(Float) && (result.abs == Float::INFINITY || result.nan?)
+
         result
       end
       alias calc calculate

data/lib/eqn/expression.rb

@@ -19,12 +19,14 @@ module Eqn
 
     def consume_while_left_associative(base, vars)
       return base unless left_associative?
+
       base = apply_next_operator(base, vars)
       consume_while_left_associative(base, vars)
     end
 
     def apply_next_operator(base, vars)
       return base if term?
+
       left_associative = elements.last.left_associative?
       op, num_expr = elements.shift.value(vars)
       if left_associative
@@ -34,10 +36,10 @@ module Eqn
       end
     end
 
-    def apply_left_associative(base, vars, op, num_expr)
+    def apply_left_associative(base, vars, operator, num_expr)
       num_expr_operand = num_expr.elements.shift
       elements.push(num_expr.elements.shift) unless num_expr.term?
-      base.send(op, num_expr_operand.value(vars))
+      base.send(operator, num_expr_operand.value(vars))
     end
 
     # Node class for the operator and latter component of an expression.

data/lib/eqn/function.rb

@@ -16,6 +16,7 @@ module Eqn
       def value(vars)
         value = elements.shift.value(vars)
         raise ZeroDivisionError if value.is_a?(Float) && (value.abs == Float::INFINITY || value.nan?)
+
         if term?
           value.send(self.class::ROUND_METHOD)
         else

data/lib/eqn/terminal.rb

@@ -6,6 +6,7 @@ module Eqn
         val = vars[text_value.to_sym]
         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

data/lib/eqn/version.rb

@@ -1,3 +1,3 @@
 module Eqn
-  VERSION = '1.6.4'.freeze
+  VERSION = '1.6.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eqn
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors:
 - Zach Schneider
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -72,42 +72,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.60'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.60'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.30'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.30'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +126,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.18'
 description: A gem to evaluate mathematical equations. Includes support for variables
   and functions.
 email:
@@ -168,7 +168,7 @@ homepage: https://github.com/schneidmaster/eqn
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -183,9 +183,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A gem to evaluate mathematical equations.
 test_files: []