rpn-calculator 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67b5ea07408d666e0b0b1f0e564b989773f7e095
-  data.tar.gz: 37623c7573e54025ff442b97c7c024b6ea09a9e7
+  metadata.gz: 72f8ad5a6504d98bb59d0bfcbac6e918dee44743
+  data.tar.gz: e34bb42f596a78a62ee1c94e570c89bc9e3dbd64
 SHA512:
-  metadata.gz: e84986323f02c63a8dfa0cac0a144ff0ddb4916a83489a8f91088d2e0dbf24bd3d857749f1d8338bb9e971526f6c8b351b4f36851b855cee9c02a08b6ec43547
-  data.tar.gz: eacb1e523c7b9d4d98c4468ae8982ba251f19409c0a9256859be731ede0a108fba549c3b22e44cfea3cf36eb2edb0643993827ab6032e9c293b1099220721d08
+  metadata.gz: 6f1355c0cd90e80345918f66771eb4311b8a983e1fee0bb09ffdbebfa75623cf337f24f4e410424d434f5d69daa2b5d17e300428c9908e611d5750689391acae
+  data.tar.gz: 55a42ddf85c9efbbf32b34e67acd1bc35d60d3abd4d1dab846e802512e44a0e006d0d35d061eebe85698d6260fe976c6d9a736f606096003b0c287f1bcd06890

data/bin/rpn-calculator

@@ -2,4 +2,4 @@
 
 require 'rpn-calculator'
 
-RPNCalculator.start
+RPNCalculator.start_cli_tool

data/lib/rpn-calculator.rb

@@ -10,20 +10,24 @@ module RPNCalculator
     '/' => Operation::Division
   }.freeze
   ALLOWED_OPERATORS       = OPERATION_CLASSES.keys.freeze
-  INVALID_ARGUMENTS_REGEX = /[^\d\s\+\-\/\*\.]/.freeze
+  INVALID_ARGUMENTS_REGEX = /[^\d\s\.#{Regexp.quote(ALLOWED_OPERATORS.join)}]/
+  OPERATION_PROCESSOR     = OperationProcessor.new(OPERATION_CLASSES).freeze
+  INPUT_PROCESSOR         = InputProcessor.new(
+    OPERATION_PROCESSOR,
+    Input::Validator.new(INVALID_ARGUMENTS_REGEX),
+    Input::Parser.new(ALLOWED_OPERATORS)
+  ).freeze
 
   module_function
 
-  def start
-    operation_processor = OperationProcessor.new(
-      OPERATION_CLASSES,
-      Input::Validator.new(INVALID_ARGUMENTS_REGEX),
-      Input::Parser.new(ALLOWED_OPERATORS)
-    )
-
+  def start_cli_tool
     # Here is where we could read and write to another input
     # using stdin and stdout by default
-    processor = IoProcessor.new(IoInterface::Standard.new, operation_processor)
+    processor = CLI.new(IoInterface::Standard.new, INPUT_PROCESSOR)
     processor.start
   end
+
+  def calculate(expression)
+    INPUT_PROCESSOR.process(expression)
+  end
 end

data/lib/rpn-calculator/{io_processor.rb → cli.rb}

@@ -1,14 +1,14 @@
 module RPNCalculator
-  class IoProcessor
-    def initialize(io_interface, operation_processor)
+  class CLI
+    def initialize(io_interface, input_processor)
       @io_interface = io_interface
       @input_stack  = []
-      @operation_processor = operation_processor
+      @input_processor = input_processor
     end
 
     def start
-      while (input = io_interface.read_input)
-        processor_result = operation_processor.process(input_stack, input)
+      while (input_expression = io_interface.read_input)
+        processor_result = input_processor.process(input_expression, input_stack)
 
         if processor_result.valid?
           print_result_array(processor_result.result)
@@ -21,7 +21,7 @@ module RPNCalculator
 
     private
 
-    attr_reader :io_interface, :operation_processor, :input_stack
+    attr_reader :io_interface, :input_processor, :input_stack
 
     def print_result_array(result)
       io_interface.display_output(result.join(' '))

data/lib/rpn-calculator/input/parser.rb

@@ -18,19 +18,19 @@ module RPNCalculator
       attr_reader :allowed_operators
 
       def input_without_whitespace(split_string)
-        split_string.select { |e| e!= ' ' }
+        split_string.reject { |e| e == ' ' }
       end
 
       def parsed_input_errors(parsed_input)
         parsed_input.inject([]) do |result, element|
-          result << element unless allowed_operators.include?(element) || is_number?(element)
+          result << element unless allowed_operators.include?(element) || number?(element)
           result
         end
       end
 
       def join_consecutive_numbers(split_string)
         split_string.each_with_index.inject([]) do |result, (element, index)|
-          if index == 0 || any_operator?([split_string[index - 1], element])
+          if index.zero? || any_operator?([split_string[index - 1], element])
             result << element
           else
             result[-1] += element
@@ -40,14 +40,14 @@ module RPNCalculator
       end
 
       def any_operator?(elements)
-        elements.any? { |e| !is_number_or_period?(e) }
+        elements.any? { |e| !number_or_period?(e) }
       end
 
-      def is_number_or_period?(number_string)
-        number_string == '.' || is_number?(number_string)
+      def number_or_period?(number_string)
+        number_string == '.' || number?(number_string)
       end
 
-      def is_number?(number_string)
+      def number?(number_string)
         true if Float(number_string)
       rescue ArgumentError
         false

data/lib/rpn-calculator/input_processor.rb

@@ -0,0 +1,32 @@
+module RPNCalculator
+  class InputProcessor
+    def initialize(operation_processor, input_validator, input_parser)
+      @input_validator     = input_validator
+      @input_parser        = input_parser
+      @operation_processor = operation_processor
+    end
+
+    def process(input_expression, previous_operations = [])
+      validator_result = input_validator.validate(input_expression)
+      return invalid_processor_result(validator_result) unless validator_result.valid?
+
+      parser_result = input_parser.parse(input_expression)
+      return invalid_processor_result(parser_result) unless parser_result.valid?
+
+      operation_result = operation_processor.process(
+        previous_operations + parser_result.result
+      )
+      return invalid_processor_result(operation_result) unless operation_result.valid?
+
+      Result::Processor.new(operation_result.result)
+    end
+
+    private
+
+    attr_reader :input_validator, :input_parser, :operation_processor
+
+    def invalid_processor_result(result)
+      Result::Processor.new([], result.error)
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module RPNCalculator
       def result
         return invalid_operation_result(operation_string) unless valid?
 
-        Result::Operation.new(operation_string, float_operands.reduce(&:+))
+        Result::Operation.new(operation_string, operands.reduce(&:+))
       end
 
       private

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

@@ -21,10 +21,6 @@ module RPNCalculator
         operands.size == 2
       end
 
-      def float_operands
-        operands.map { |operator| Float(operator) }
-      end
-
       def invalid_operation_result(operation)
         Result::Operation.new(operation, [], operands)
       end

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

@@ -6,7 +6,7 @@ module RPNCalculator
       def result
         return invalid_operation_result(operation_string) unless valid?
 
-        Result::Operation.new(operation_string, float_operands.reduce(&:/))
+        Result::Operation.new(operation_string, operands.reduce(&:/))
       end
 
       private

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

@@ -6,7 +6,7 @@ module RPNCalculator
       def result
         return invalid_operation_result(operation_string) unless valid?
 
-        Result::Operation.new(operation_string, float_operands.reduce(&:*))
+        Result::Operation.new(operation_string, operands.reduce(&:*))
       end
 
       private

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

@@ -6,7 +6,7 @@ module RPNCalculator
       def result
         return invalid_operation_result(operation_string) unless valid?
 
-        Result::Operation.new(operation_string, float_operands.reduce(&:-))
+        Result::Operation.new(operation_string, operands.reduce(&:-))
       end
 
       private

data/lib/rpn-calculator/operation_processor.rb

@@ -1,44 +1,34 @@
 module RPNCalculator
   class OperationProcessor
-    def initialize(operation_classes, input_validator, input_parser)
-      @input_validator   = input_validator
-      @input_parser      = input_parser
+    def initialize(operation_classes)
       @operation_classes = operation_classes
       @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
-
-    private
-
-    attr_reader :input_validator, :input_parser, :operation_classes, :operation_symbols
-
-    def process_operations(operations)
-      result_stack = operations.inject([]) do |stack, element|
+    def process(parsed_expression)
+      result_stack = parsed_expression.inject([]) do |stack, element|
         if operation_symbols.include?(element)
-          result = operation_classes.fetch(element)
-                                    .operate([stack.pop, stack.pop].reverse)
+          result = operation_classes.fetch(element).operate(stack.pop(2))
           return invalid_processor_result(result) unless result.valid?
           stack.push(result.result)
         else
-          stack.push(element)
+          stack.push(as_float(element))
         end
         stack
       end
       Result::Processor.new(result_stack)
     end
 
+    private
+
+    attr_reader :operation_classes, :operation_symbols
+
     def invalid_processor_result(result)
       Result::Processor.new([], result.error)
     end
+
+    def as_float(num_string)
+      Float(num_string)
+    end
   end
 end

data/lib/rpn-calculator/result/input.rb

@@ -0,0 +1,21 @@
+module RPNCalculator
+  module Result
+    class Input
+      def initialize
+        raise 'Can not instantiate abstract class'
+      end
+
+      def valid?
+        raise 'must implement in subclass'
+      end
+
+      def error
+        raise 'must implement in subclass'
+      end
+
+      def result
+        raise 'must implement in subclass'
+      end
+    end
+  end
+end

data/lib/rpn-calculator/result/parser.rb

@@ -1,6 +1,8 @@
+require 'rpn-calculator/result/input'
+
 module RPNCalculator
   module Result
-    class Parser
+    class Parser < Input
       def initialize(parsed_elements = [], invalid_elements = [])
         @parsed_elements  = parsed_elements
         @invalid_elements = invalid_elements
@@ -14,10 +16,14 @@ module RPNCalculator
         "Invalid operators or numbers: #{invalid_element_list}" unless valid?
       end
 
-      attr_reader :parsed_elements, :invalid_elements
+      def result
+        @parsed_elements
+      end
 
       private
 
+      attr_reader :invalid_elements
+
       def invalid_element_list
         invalid_elements.join(', ')
       end

data/lib/rpn-calculator/result/processor.rb

@@ -1,6 +1,8 @@
+require 'rpn-calculator/result/input'
+
 module RPNCalculator
   module Result
-    class Processor
+    class Processor < Input
       def initialize(result = [], error = nil)
         @result = result
         @error  = error

data/lib/rpn-calculator/result/validator.rb

@@ -1,6 +1,8 @@
+require 'rpn-calculator/result/input'
+
 module RPNCalculator
   module Result
-    class Validator
+    class Validator < Input
       def initialize(invalid_characters = [])
         @invalid_characters = invalid_characters
       end
@@ -13,6 +15,10 @@ module RPNCalculator
         "Invalid characters: #{invalid_character_list}" unless valid?
       end
 
+      def result
+        []
+      end
+
       private
 
       attr_reader :invalid_characters

data/lib/rpn-calculator/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpn-calculator
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Mario Celi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -34,17 +34,19 @@ extra_rdoc_files: []
 files:
 - bin/rpn-calculator
 - lib/rpn-calculator.rb
+- lib/rpn-calculator/cli.rb
 - lib/rpn-calculator/input/parser.rb
 - lib/rpn-calculator/input/validator.rb
+- lib/rpn-calculator/input_processor.rb
 - lib/rpn-calculator/io_interface/abstract.rb
 - lib/rpn-calculator/io_interface/standard.rb
-- lib/rpn-calculator/io_processor.rb
 - lib/rpn-calculator/operation/addition.rb
 - lib/rpn-calculator/operation/base.rb
 - lib/rpn-calculator/operation/division.rb
 - lib/rpn-calculator/operation/multiplication.rb
 - lib/rpn-calculator/operation/subtraction.rb
 - lib/rpn-calculator/operation_processor.rb
+- lib/rpn-calculator/result/input.rb
 - lib/rpn-calculator/result/operation.rb
 - lib/rpn-calculator/result/parser.rb
 - lib/rpn-calculator/result/processor.rb
@@ -62,7 +64,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="