arithmetic 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTFkMzQwNDk4YWVkZTk1NWY2NTA4M2Y3MTUyODc5ZTg5MWZkOTE2MA==
+    NzVjMzE4ZDlmZGEzNGY5MDQ4Y2M4NGNmODk3NWI3OWQ5NDk5MGY1MA==
   data.tar.gz: !binary |-
-    Yzg1NTkyYmNiOTUzYzQ4ZTQyYTg0ODZlZTI5NzEwNGViZWRhODA4ZA==
+    OGYxMjYyNGZmOTc4ZThhN2U0ZmZkMDk3ODAwNzY5N2QwNWZjMWVmYQ==
 SHA512:
   metadata.gz: !binary |-
-    MDY3YTA4ZmE4Yzc1MzA5YjQxZDI5N2ZiYWNhMmNmYTZhZWUxOTI0NDgwYmE2
-    NjhmYjVmYWJmNWJkYjQ5Mjk0NGU5MzY1NWJkOTNjNWM1ODNkNDZmZDI0ODgy
-    OGRhMjFmNjY2YjNkZGM0NTQzZmY2ZGJiM2U3ODcyYjg1MTg3Y2M=
+    MDhjNGZiZjlmZDY4MTA5MWQyYTRmMWZmOTdlZGQzNmRkOTM0ZWUwNmFlNzBl
+    NmUxYjAzYTc4Y2ZiYzlhMzdiMTZhMDFlMDRiNTY5NmJiYTVmNjM4MjlhMmY3
+    ODY4ZjJkMDhhNmFkMzkwNDkwY2QzMmM5ODZiYWU3ZDFmMWUwMjM=
   data.tar.gz: !binary |-
-    YTQ4M2FmYTJhYTkxZWU2ODYxOTI3ZjIxNzhjZjAwNjEyNGQwY2NiMDAzNDE0
-    OGRiNDdkOGUxZDg3NzQwNmU3OGU5NTNiYjAxOThkOTE5MmMzNzVhMjk0ZDVl
-    MGEwOTEzNzljM2Y2OTE1Y2EwOTlmYTk1MDgzMjFlN2VhNjhjMWI=
+    OGIzOGJiNDM2ZmQ4YTVhMDVjMWE1ZjMxNGI0MjY1MjI1MTgyYTI0NjJmZGY0
+    MWU1ODIyOWI5MmVkOTcwYTQxNTBmZDQxZWExZjcxMjNkNjAzNzc4NDQzMDJh
+    ZTQyZjA0OTViYjZiZTllZTNmZGU3OGE1NjZkNjkxYjQwZWY4ZTU=

data/.gitignore

@@ -11,6 +11,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.rake_tasks
 
 # YARD artifacts
 .yardoc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arithmetic (0.1.1)
+    arithmetic (0.1.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/arithmetic.rb

@@ -10,7 +10,7 @@ module Arithmetic
     Expression.new(Parser.new(expression).parse)
   end
 
-  def self.is_operand?(token)
-    !token.is_a?(Arithmetic::Operator) && token != "(" && token != ")"
+  def self.is_a_number?(token)
+    Arithmetic::Parser.is_a_number?(token)
   end
 end

data/lib/arithmetic/parser.rb

@@ -1,5 +1,10 @@
 module Arithmetic
   class Parser
+
+    def self.is_a_number?(str)
+      str.respond_to?(:to_str) && !!str.to_str.match(/^[\d\.]+$/)
+    end
+
     def initialize(exp)
       @expression = exp.to_s
       @node_stack = []
@@ -45,7 +50,7 @@ module Arithmetic
     private
 
     def push_operand(operand)
-      raise InvalidExpression.new(@expression) unless is_a_number?(operand)
+      raise InvalidExpression.new(@expression) unless Arithmetic::Parser.is_a_number?(operand)
       @node_stack.push(OperandNode.new(operand))
     end
 
@@ -60,10 +65,6 @@ module Arithmetic
 
       @node_stack.push(OperatorNode.new(operator, operands))
     end
-
-    def is_a_number?(str)
-      !!str.match(/^[\d\.]+$/)
-    end
   end
 
   class Tokenizer

data/lib/arithmetic/version.rb

@@ -1,3 +1,3 @@
 module Arithmetic
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/arithmetic_spec.rb

@@ -96,6 +96,20 @@ describe Arithmetic do
     end
   end
 
+  describe ".is_a_number?" do
+    it "returns true if argument is a number" do
+      expect(Arithmetic.is_a_number?('23.5')).to eq(true)
+    end
+
+    it "returns false if argument is not a number" do
+      expect(Arithmetic.is_a_number?('2aa23')).to eq(false)
+    end
+
+    it "returns false if argument is not convertible to string" do
+      expect(Arithmetic.is_a_number?(Object.new)).to eq(false)
+    end
+  end
+
   def exp_should_error(exp)
     expect {test_init exp}.to raise_error Arithmetic::InvalidExpression
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arithmetic
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sean Kirby