slice_pizzabot 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6372fbbad64a043afa9e5a4931993877549c599183016444d538c9faa7efcf02
-  data.tar.gz: 4a27d733824c379daf8ce1699b6185f6b1d69b2bf9d02349758744df483f7c42
+  metadata.gz: 96524b57c59a4e83a476b2c8ea5805bfe14a83b775be76379e45b63e462833bf
+  data.tar.gz: 7726b461068299e3a68c137e09e096661d2ebaf1708a980c340115830327a72a
 SHA512:
-  metadata.gz: 7ea774e7828d2061b962375c7fac999e81604f027b3c0a7f65e8226a9c836b8369c482430ffae110e8f75d080adbf9924c2335b89217d2532e45096381e558ba
-  data.tar.gz: fd348e305bc7c5e2cae757cf2d76f4436add489083f991ba954b8fe6a0f66dbc8803b10100e041f300c3b4f93aaab998acf316ae7161d08356d1b0037095b610
+  metadata.gz: cba7baac7f3ceef0122c8fdae9f2119879a8954b0cf649544a372cf04dcb0733385b325c55f0c25d9e48f9a6c14a93dd029651649804b84b3a5cf0c7c0a4e1fd
+  data.tar.gz: 33c7d8059a3944ca84891df680e298df1a6edf3411933fc01d591a615410cb71218be368638eaddbeef9c4708c67eae83c1c871790766afd0108763c2b1a4bbc

data/bin/pizzabot

@@ -1,3 +1,3 @@
 require 'pizzabot'
 
-Pizzabot.new(ARGV[0]).deliver
+Pizzabot.new(ARGV[0]).deliver

data/lib/pizzabot.rb

@@ -1,20 +1,22 @@
-require_relative 'pizzabot/route_service.rb'
+require_relative 'pizzabot/route_service'
 
 class Pizzabot
+  NO_ARGUMENT_MESSAGE = 'You should provide delivery string to pizzabot,'\
+                        ' example: pizzabot "2x2 (0,1) (0,2)"'
+  INITIAL_POSITION = [0, 0]
 
-  NO_ARGUMENT_MESSAGE = 'You should provide delivery string to pizzabot, example: pizzabot "2x2 (0,1) (0,2)"'
+  attr_reader :route
+  attr_accessor :current_position, :delivery_process
 
-	attr_reader :route
-	attr_accessor :current_position, :delivery_process
-
-	def initialize(delivery_string)
+  def initialize(delivery_string)
     raise ArgumentError, NO_ARGUMENT_MESSAGE unless delivery_string
-		@current_position = [0, 0]
-		@delivery_process = ''
-		@route = RouteService.new(delivery_string).prepare_route
-	end
 
-	def deliver
+    @current_position = INITIAL_POSITION
+    @delivery_process = ''
+    @route = RouteService.new(delivery_string).prepare_route
+  end
+
+  def deliver
     route.each do |address|
       move_to(address)
       drop_pizza
@@ -27,43 +29,32 @@ class Pizzabot
   private
 
   def move_to(address)
-    until current_position[0] == address[0] do
-      if current_position[0] < address[0]
-        move_east
-      else
-        move_west
-      end
-    end
-    until current_position[1] == address[1] do
-      if current_position[1] < address[1]
-        move_north
-      else
-        move_south
-      end       
-    end
+    current_position[0] < address[0] ? move_east : move_west until current_position[0] == address[0]
+
+    current_position[1] < address[1] ? move_north : move_south until current_position[1] == address[1]
   end
 
   def drop_pizza
-    delivery_process << "D"
+    delivery_process << 'D'
   end
 
   def move_north
-  	current_position[1] += 1
-    delivery_process << "N"
+    current_position[1] += 1
+    delivery_process << 'N'
   end
 
   def move_south
-  	current_position[1] -= 1
-    delivery_process << "S"
+    current_position[1] -= 1
+    delivery_process << 'S'
   end
 
   def move_west
-  	current_position[0] -= 1
-    delivery_process << "W"
+    current_position[0] -= 1
+    delivery_process << 'W'
   end
 
   def move_east
-  	current_position[0] += 1
-    delivery_process << "E"
+    current_position[0] += 1
+    delivery_process << 'E'
   end
 end

data/lib/pizzabot/address_error.rb

@@ -2,4 +2,4 @@ class AddressError < StandardError
   def initialize(msg)
     super
   end
-end
+end

data/lib/pizzabot/grid_error.rb

@@ -1,5 +1,5 @@
 class GridError < StandardError
-  def initialize(msg='Grid in wrong format')
+  def initialize(msg = 'Grid in wrong format')
     super
   end
-end
+end

data/lib/pizzabot/route_service.rb

@@ -1,17 +1,19 @@
-require_relative 'grid_error.rb'
-require_relative 'address_error.rb'
+require_relative 'grid_error'
+require_relative 'address_error'
 
 class RouteService
-
-  GRID_REGEX = /^\d+x\d+/
+  GRID_REGEX = /^\s*\d+x\d+/
   ADDRESSES_REGEX = /\((.*?)\)/
   DIGITS_EXTRACT_REGEX = /\d+/
 
-  attr_reader :grid 
+  NEGATIVE_NUMBERS_MESSAGE = 'Address should not have negative numbers'
+  NOT_IN_RANGE_MESSAGE = 'Address is not in delivery range'
+
+  attr_reader :grid
   attr_accessor :addresses
 
   def initialize(delivery_string)
-    @grid = delivery_string[GRID_REGEX]
+    @grid = delivery_string[GRID_REGEX]&.split('x')&.map(&:to_i)
     @addresses = delivery_string.scan(ADDRESSES_REGEX).flatten
   end
 
@@ -23,15 +25,17 @@ class RouteService
   private
 
   def validate_route
-  	raise GridError unless grid
-    grid_values = grid.split('x').map(&:to_i)
+    raise GridError unless grid
 
     addresses.map! do |address|
+      raise AddressError, NEGATIVE_NUMBERS_MESSAGE if address.include?('-')
+
       extracted_array = address.scan(DIGITS_EXTRACT_REGEX).map(&:to_i)
-      raise AddressError.new("Address in wrong format: #{address}") unless extracted_array.length == 2
-      raise AddressError.new("Address is not in delivery range") if extracted_array[0] > grid_values[0] || 
-                                                                    extracted_array[1] > grid_values[1]
-      extracted_array  
+      raise AddressError, "Wrong format address: #{address}" unless extracted_array.length == 2
+      raise AddressError, NOT_IN_RANGE_MESSAGE if extracted_array[0] > grid[0] ||
+                                                  extracted_array[1] > grid[1]
+
+      extracted_array
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slice_pizzabot
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Aliaksei Khalupau