arithmetic 0.1.0 → 0.1.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTFkMzQwNDk4YWVkZTk1NWY2NTA4M2Y3MTUyODc5ZTg5MWZkOTE2MA==
+  data.tar.gz: !binary |-
+    Yzg1NTkyYmNiOTUzYzQ4ZTQyYTg0ODZlZTI5NzEwNGViZWRhODA4ZA==
+SHA512:
+  metadata.gz: !binary |-
+    MDY3YTA4ZmE4Yzc1MzA5YjQxZDI5N2ZiYWNhMmNmYTZhZWUxOTI0NDgwYmE2
+    NjhmYjVmYWJmNWJkYjQ5Mjk0NGU5MzY1NWJkOTNjNWM1ODNkNDZmZDI0ODgy
+    OGRhMjFmNjY2YjNkZGM0NTQzZmY2ZGJiM2U3ODcyYjg1MTg3Y2M=
+  data.tar.gz: !binary |-
+    YTQ4M2FmYTJhYTkxZWU2ODYxOTI3ZjIxNzhjZjAwNjEyNGQwY2NiMDAzNDE0
+    OGRiNDdkOGUxZDg3NzQwNmU3OGU5NTNiYjAxOThkOTE5MmMzNzVhMjk0ZDVl
+    MGEwOTEzNzljM2Y2OTE1Y2EwOTlmYTk1MDgzMjFlN2VhNjhjMWI=

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    arithmetic (0.0.1)
+    arithmetic (0.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.1.3)
+    rake (10.4.2)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)
@@ -21,4 +22,5 @@ PLATFORMS
 
 DEPENDENCIES
   arithmetic!
+  rake
   rspec

data/arithmetic.gemspec

@@ -17,4 +17,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.add_development_dependency('rspec')
+  gem.add_development_dependency('rake')
 end

data/lib/arithmetic.rb

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

data/lib/arithmetic/expression.rb

@@ -8,8 +8,14 @@ module Arithmetic
       @result ||= @parsed_expression.eval
     end
 
-    def to_s
-      @string ||= @parsed_expression.to_s
+    def to_s(visitor=identity_function)
+      @string ||= @parsed_expression.to_s(visitor)
+    end
+
+    private
+
+    def identity_function
+      ->(node) { node }
     end
   end
 end

data/lib/arithmetic/nodes.rb

@@ -6,8 +6,8 @@ module Arithmetic
       @operand = operand
     end
 
-    def to_s(na=nil)
-      @operand
+    def to_s(visitor, na=nil)
+      visitor.call(@operand)
     end
    
     def eval
@@ -23,14 +23,14 @@ module Arithmetic
       @operands = operands
     end
    
-    def to_s(top=true)
-      strs = @operands.map {|o| o.to_s(false) }
+    def to_s(visitor, top=true)
+      strs = @operands.map {|o| o.to_s(visitor, false) }
 
       if @operator.arity == 1
-        "#{@operator}#{strs.first}"
+        "#{visitor.call(@operator)}#{strs.first}"
       else
-        result = [strs.first, @operator, *strs[1..-1]].join(" ")
-        result = "(" + result + ")" unless top
+        result = [strs.first, visitor.call(@operator), *strs[1..-1]].join(" ")
+        result = visitor.call("(") + result + visitor.call(")") unless top
         result
       end
     end

data/lib/arithmetic/version.rb

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

data/spec/arithmetic_spec.rb

@@ -57,6 +57,10 @@ describe Arithmetic do
     test_to_s("   -1+\n    2*     \t3").should == '-1 + (2 * 3)'
   end
 
+  it "formats the expression using a custom visitor" do
+    test_to_s("-1 + 2 * 3", ->(n) { "x#{n}x" }).should == 'x-xx1x x+x x(xx2x x*x x3xx)x'
+  end
+
   it "handles ridiculous precision" do
     test_eval("1.111111111111111111111111111111111111111111 + 2").should == BigDecimal.new('3.111111111111111111111111111111111111111111')
   end
@@ -100,8 +104,8 @@ describe Arithmetic do
     test_init(exp).eval
   end
 
-  def test_to_s(exp)
-    test_init(exp).to_s
+  def test_to_s(exp, visitor=nil)
+    test_init(exp).to_s(*visitor)
   end
 
   def test_init(exp)

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arithmetic
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors:
 - Sean Kirby
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -23,7 +21,20 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -53,27 +64,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/nulogy/arithmetic
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple arithmetic calculator for Ruby
 test_files:
 - spec/arithmetic_spec.rb