rpn-calculator 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3de84cffbeb26378a73daf456bdf6a617e876d5
-  data.tar.gz: '08c6d4901a8a7272cd2bc3a68711a795659b8a61'
+  metadata.gz: 67b5ea07408d666e0b0b1f0e564b989773f7e095
+  data.tar.gz: 37623c7573e54025ff442b97c7c024b6ea09a9e7
 SHA512:
-  metadata.gz: 3d0627889fa8c2ad58afc8483a4f78a9fa9655fe077eed1c647050e338a6dca558542eb03d7b4fb09319c7e2ca0fea9b6aad0a8bb5ca538d21ac9f4483f9c4b9
-  data.tar.gz: 4f563e0a74d5e0044885b02166107b381e00bac97738f5709345aa472e24e0903cf648b519a5159fe653e6853589412bd9d76c4e4c60994b5ec35a23478be919
+  metadata.gz: e84986323f02c63a8dfa0cac0a144ff0ddb4916a83489a8f91088d2e0dbf24bd3d857749f1d8338bb9e971526f6c8b351b4f36851b855cee9c02a08b6ec43547
+  data.tar.gz: eacb1e523c7b9d4d98c4468ae8982ba251f19409c0a9256859be731ede0a108fba549c3b22e44cfea3cf36eb2edb0643993827ab6032e9c293b1099220721d08

data/lib/rpn-calculator/io_processor.rb

@@ -9,6 +9,7 @@ module RPNCalculator
     def start
       while (input = io_interface.read_input)
         processor_result = operation_processor.process(input_stack, input)
+
         if processor_result.valid?
           print_result_array(processor_result.result)
           @input_stack = processor_result.result

data/lib/rpn-calculator/operation/base.rb

@@ -1,8 +1,12 @@
 module RPNCalculator
   module Operation
     class Base
+      def self.operate(operands)
+        new(operands).result
+      end
+
       def initialize(operands)
-        @operands = operands
+        @operands = operands.compact
       end
 
       def result
@@ -24,6 +28,10 @@ module RPNCalculator
       def invalid_operation_result(operation)
         Result::Operation.new(operation, [], operands)
       end
+
+      def operation_string
+        raise 'must implement in subclass'
+      end
     end
   end
 end

data/lib/rpn-calculator/operation_processor.rb

@@ -7,12 +7,14 @@ module RPNCalculator
       @operation_symbols = @operation_classes.keys
     end
 
+    # Refator needed, process should receive parsed input
     def process(previous_operations, input)
       validator_result = input_validator.validate(input)
       return Result::Processor.new([], validator_result.error) unless validator_result.valid?
 
       parser_result = input_parser.parse(input)
       return Result::Processor.new([], parser_result.error) unless parser_result.valid?
+
       process_operations(previous_operations + parser_result.parsed_elements)
     end
 
@@ -21,19 +23,18 @@ module RPNCalculator
     attr_reader :input_validator, :input_parser, :operation_classes, :operation_symbols
 
     def process_operations(operations)
-      operation_stack = []
-      while operations.size > 0
-        element = operations.shift
+      result_stack = operations.inject([]) do |stack, element|
         if operation_symbols.include?(element)
-          result = operation_classes.fetch(element).new(operation_stack).result
+          result = operation_classes.fetch(element)
+                                    .operate([stack.pop, stack.pop].reverse)
           return invalid_processor_result(result) unless result.valid?
-
-          operation_stack = [result.result]
+          stack.push(result.result)
         else
-          operation_stack.push(element)
+          stack.push(element)
         end
+        stack
       end
-      Result::Processor.new(operation_stack)
+      Result::Processor.new(result_stack)
     end
 
     def invalid_processor_result(result)

data/lib/rpn-calculator/version.rb

@@ -1,3 +1,3 @@
 module RPNCalculator
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rpn-calculator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Mario Celi