eqn 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fce3040108d20ba8a47b915c6878c541f0c845c3
-  data.tar.gz: b612f8b6d206e04a545c1577f8032ace2c6f4b43
+  metadata.gz: e3c2babed433b6bdbeec3165078ea736c56bdcd9
+  data.tar.gz: 21b7734540dc5612fd68489dffdac08fb522efde
 SHA512:
-  metadata.gz: c9fdd51eb3ffd6b8acee105627279a70c886da6cce6bc1d4813ef78de5143aa81b8748d974230cfb74bba279f0b7e8e460ede46f00b4ce8e8acb8a43c98f5162
-  data.tar.gz: 8e862df9a84a75763e52cebeca227c7bd5221fbd8daaff4b70c5f5b607db663958cd883ff60ac0775f7cffbd7dfec076e184966608f7d84e2a493a7e3844a6ad
+  metadata.gz: 3af53478ab744d25f0cb7ab6b3f5f08f02fa86311936182f660885fa100bcdbd4276e6a570530c53a1b2f08f8d0b89ca94561a2069b8072e9e64d0cc533e59e3
+  data.tar.gz: e9fbd3a367a4041243fd6f61ac6e37be55558b2550578efb482e3d6cd2ae834bfdd19397c722168af719c08c7ce33e87c86b6342a6cd965dc82660e89c325c16

data/eqn.gemspec

@@ -4,7 +4,7 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'eqn/version'
 
-config_files = %w(.rspec .rubocop.yml .ruby-version Appraisals circle.yml)
+config_files = %w(.rspec .rubocop.yml .ruby-version Appraisals .circleci/config.yml)
 
 Gem::Specification.new do |spec|
   spec.name          = 'eqn'
@@ -12,8 +12,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Zach Schneider']
   spec.email         = ['zach@aha.io']
 
-  spec.summary       = 'A gem to evaluate numerical equations.'
-  spec.description   = 'A gem to evaluate numerical equations. Includes support for variables and functions.'
+  spec.summary       = 'A gem to evaluate mathematical equations.'
+  spec.description   = 'A gem to evaluate mathematical equations. Includes support for variables and functions.'
   spec.homepage      = 'https://github.com/schneidmaster/eqn'
   spec.license       = 'MIT'
 
@@ -28,7 +28,8 @@ Gem::Specification.new do |spec|
   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.42'
+  spec.add_development_dependency 'rubocop', '~> 0.49'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.15'
   spec.add_development_dependency 'rspec', '~> 3.5.0'
   spec.add_development_dependency 'simplecov', '~> 0.14'
 end

data/lib/eqn.treetop

@@ -112,7 +112,8 @@ grammar Eqn
   end
 
   rule sign
-    '+' / '-' <Eqn::Terminal::Sign>
+      '+' 
+    / '-' <Eqn::Terminal::UnaryMinus>
   end
 
   rule digits

data/lib/eqn/calculator.rb

@@ -14,34 +14,60 @@ module Eqn
       end
     end
 
-    def method_missing(method, *args) # rubocop:disable AbcSize
-      if %i(calculate calc valid?).include?(method)
+    def method_missing(method, *args)
+      if delegated_method?(method)
         self.class.send(method, @eqn, @vars)
-      elsif (match = method.to_s.match(/^[A-Za-z]+=$/))
-        @vars[match.to_s.delete('=').to_sym] = args.first
-      elsif (var = method.to_s.match(/^[A-Za-z]+$/).to_s.to_sym) && @vars.key?(var)
-        @vars[var]
+      elsif match_setter?(method)
+        @vars[setter_key(method)] = args.first
+      elsif match_getter?(method)
+        @vars[getter_key(method)]
       else
         super
       end
     end
 
-    def respond_to_missing?(method, _p2 = false)
-      %i(calculate calc valid?).include?(method) ||
-        method.to_s.match(/^[A-Za-z]+=$/) ||
-        (var = method.to_s.match(/^[A-Za-z]+$/).to_s.to_sym) && @vars.key?(var)
+    def respond_to_missing?(method, _include_private = false)
+      delegated_method?(method) || match_setter?(method) || match_getter?(method)
+    end
+
+    private
+
+    def delegated_method?(method)
+      %i(calculate calc valid?).include?(method.to_sym)
+    end
+
+    def setter_key(method)
+      match = method.to_s.match(/^[A-Za-z]+=$/)
+      return unless match
+      match.to_s.delete('=').to_sym
+    end
+
+    def match_setter?(method)
+      !setter_key(method).nil?
+    end
+
+    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
+
+    def match_getter?(method)
+      !getter_key(method).nil?
     end
 
     class << self
-      def calculate(data, vars = {})
-        result = Parser.parse(data).value(vars)
+      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
 
-      def valid?(data, vars = {})
-        calc(data, vars)
+      def valid?(equation, vars = {})
+        calculate(equation, vars)
         true
       rescue EqnError
         false

data/lib/eqn/number.rb

@@ -20,14 +20,14 @@ module Eqn
     # Node class for a signed number.
     class SignedNumber < EqnNode
       def value(vars = {})
-        # Store sign if any.
-        sign_negative = elements.shift.negative? if elements.first.is_a?(Terminal::Sign)
-
-        # Evaluate float.
-        value = elements.shift.value(vars)
-
-        # Apply sign if any.
-        sign_negative ? -value : value
+        first_element = elements.shift
+        # If first element is unary minus, negate the following value.
+        # Otherwise, simply return the positive value.
+        if first_element.is_a?(Terminal::UnaryMinus)
+          -elements.shift.value(vars)
+        else
+          first_element.value(vars)
+        end
       end
     end
 

data/lib/eqn/terminal.rb

@@ -21,12 +21,8 @@ module Eqn
       end
     end
 
-    # Node class for a number sign.
-    class Sign < EqnNode
-      def negative?
-        text_value == '-'
-      end
-    end
+    # Node class for a unary minus.
+    class UnaryMinus < EqnNode; end
 
     # Node class for an operator.
     class Op < EqnNode

data/lib/eqn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eqn
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Zach Schneider
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
+date: 2017-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -86,14 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.42'
+        version: '0.49'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.42'
+        version: '0.49'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +136,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
-description: A gem to evaluate numerical equations. Includes support for variables
+description: A gem to evaluate mathematical equations. Includes support for variables
   and functions.
 email:
 - zach@aha.io
@@ -170,8 +184,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
-summary: A gem to evaluate numerical equations.
+summary: A gem to evaluate mathematical equations.
 test_files: []