fuelator 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca8f288aaca9783d8bae901f60d407142f4132e0
-  data.tar.gz: 4bd994d1b88bf000b2d41ff915abbb32e65c15a5
+  metadata.gz: c0bec4abc5efa33fcc9f79013f97f931ed7c5ab1
+  data.tar.gz: a25945039a85d4bf73065dbad1c869a6efde096e
 SHA512:
-  metadata.gz: 516dff6979b493648379ced6cb27b82b6aaf9569bf63350d99277bbb32cdb1ed2b0379b818bd5195ab3f75db7b17b0c2c048ad0f7441a99b8573fd8ce11de3f0
-  data.tar.gz: cd9347c040138684336e99bb551a64ca69e9befc3a87eb5c9722ddc4cc3b656c673ff5729d3677ecfc2f8d04052a6d55a2f8eec84fca1c2dd10efcfe528a2434
+  metadata.gz: 5fcdc1c966251aeb76a232c7b8f5c182901a72885ab054fc2dbd46fec5490a9f9ce6ce42dc56a344a7aea2dbda1fa291f89a2e87e95a4a10da626de84ba476c9
+  data.tar.gz: d629265f46eb5a8f9f223a8c8079f057f133658674eca2b4d32d534d6b21aa7516ddaab40f1e0ade421d6f47f9c1b48058d8b24ea78ae708fb2e613bcaf1f465

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fuelator (0.1.4)
+    fuelator (0.1.6)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -31,6 +31,11 @@ require 'fuelator'
 Fuelator.calculate(28801, [[:launch, 9.807], [:land, 1.62], [:launch, 1.62], [:land, 9.807]])
 # => 51898
 ```
+Be ready do handle errors:
+```ruby
+Fuelator::Parameters::Error
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/bin/fuelator

@@ -32,9 +32,7 @@ def run(params, verbose)
   end
   result = Fuelator.calculate(params)
   log "#{result.to_i} kg"
-rescue Fuelator::Error, Fuelator::Parameters::Error => e
-  log_error(e, verbose)
-rescue StandardError => e
+rescue Fuelator::Parameters::Error, StandardError => e
   log_error(e, verbose)
 end
 

data/lib/fuelator.rb

@@ -23,7 +23,8 @@ module Fuelator
   }
 
   # @param [Array] params
-  #  [123, [[:launch, 123]]] or flatten [123, :launch, 123]
+  # Example:
+  #      [123, [[:launch, 123]]] or flatten [123, :launch, 123]
   # params are validated and validation error may be raised
   # @return Float - fuel for a flight
   def self.calculate(*params)
@@ -31,26 +32,23 @@ module Fuelator
 
     full_mass = parameters.mass
 
-    parameters.dir_grav_pairs.reverse.map do |val|
+    parameters.pairs.reverse.map do |val|
       full_mass += recursive_calculate(full_mass, val)
     end.last - parameters.mass
   end
 
   private
 
-  def self.recursive_calculate(mass, params)
-    directive = params[0]
-    gravity   = params[1]
+  def self.recursive_calculate(mass, pair)
+    directive = pair.directive
+    gravity   = pair.gravity
     constants = FLIGHT_CONSTANTS[directive]
 
-    begin
-      fuel_mass = (mass * gravity * constants[:theta] - constants[:bias]).to_i # rounded down
-    rescue StandardError => e
-      raise Error.new(e.message)
-    end
+    fuel_mass = (mass * gravity * constants[:theta] - constants[:bias]).to_i # rounded down
+
 
     return 0 if fuel_mass <= 0
-    result = recursive_calculate(fuel_mass, params)
+    result = recursive_calculate(fuel_mass, pair)
     fuel_mass + result
   end
 end

data/lib/fuelator/parameters.rb

@@ -1,14 +1,18 @@
-require 'fuelator/parameters/error'
+require 'fuelator/parameters/pair'
 # For flight parameters validation purposes
 
 module Fuelator
   class Parameters
-    attr_reader :mass, :dir_grav_pairs
+    class Error < StandardError; end
+
+    attr_reader :mass, :pairs, :directives_sequential
 
     def initialize(params)
-      params          = normalize(params)
-      @mass           = params[0]
-      @dir_grav_pairs = params[1..-1].each_slice(2).to_a
+      params                   = normalize(params)
+      @mass                    = params[0]
+      @pairs                   = params[1..-1].each_slice(2).to_a
+                                   .map { |pair| Pair.new(pair) }
+      @directives_sequential = directives_sequential?
 
       validate!
     end
@@ -20,22 +24,32 @@ module Fuelator
     end
 
     def validate!
-      error(:mass, mass) unless mass.is_a?(Float)
-      validate_pairs!
+      instance_variables.each do |v|
+        v_name = v.to_s.gsub(/^@/, '')
+        raise Error.new("value for #{v_name} is invalid") unless send("valid_#{v_name}?")
+      end
     end
 
-    def validate_pairs!
-      dir = nil
-      dir_grav_pairs.each do |pair|
-        error(:pairs, pair.count) if (pair.count % 2) != 0
-        error(:format, pair[0], pair[1]) unless pair[0].is_a?(Symbol) && pair[1].is_a?(Float)
-        error(:sequence, dir, pair[0]) if dir == pair[0] # no same directives allowed in a sequence
-        dir = pair[0]
-      end
+    def valid_mass?
+      !mass.nil? && mass.is_a?(Float)
+    end
+
+    def valid_pairs?
+      !pairs.empty?
     end
 
-    def error(type, *args)
-      raise Error.new Error::MESSAGES[type] % args
+    def valid_directives_sequential?
+      !directives_sequential
+    end
+
+    def directives_sequential?
+      directive = nil
+      pairs.map do |pair|
+        return true if directive == pair.directive
+
+        directive = pair.directive
+      end
+      false
     end
   end
 end

data/lib/fuelator/parameters/pair.rb

@@ -0,0 +1,30 @@
+module Fuelator
+  class Parameters
+    class Pair
+      DIRECTIVES = [:launch, :land]
+      attr_reader :directive, :gravity
+
+      def initialize(pair)
+        @directive = pair[0]
+        @gravity   = pair[1]
+
+        validate!
+      end
+
+      def validate!
+        instance_variables.each do |v|
+          v_name = v.to_s.gsub(/^@/, '')
+          raise Error.new("value for #{v_name} is invalid") unless send("valid_#{v_name}?")
+        end
+      end
+
+      def valid_directive?
+        Pair::DIRECTIVES.include?(directive) && directive.is_a?(Symbol)
+      end
+
+      def valid_gravity?
+        !gravity.nil? && gravity.is_a?(Float)
+      end
+    end
+  end
+end

data/lib/fuelator/version.rb

@@ -1,3 +1,3 @@
 module Fuelator
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuelator
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Sergii Brytiuk
@@ -38,7 +38,7 @@ files:
 - fuelator.gemspec
 - lib/fuelator.rb
 - lib/fuelator/parameters.rb
-- lib/fuelator/parameters/error.rb
+- lib/fuelator/parameters/pair.rb
 - lib/fuelator/version.rb
 homepage: https://github.com/645383/fuelator
 licenses:

data/lib/fuelator/parameters/error.rb

@@ -1,15 +0,0 @@
-# Flight parameters validation error,
-# Add error descriptive message to map of messages when new validation case added
-
-module Fuelator
-  class Parameters
-    class Error < StandardError
-      MESSAGES = {
-        format: "directive/gravity pairs should be in format string/float: directive: %s, gravity: %s",
-        sequence: "you can not pass 2 same directives in a sequence: %s => %s",
-        mass: "mass should be float: %s",
-        pairs: "provide pairs for directive/gravity: %s elements"
-      }
-    end
-  end
-end