fuelator 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f14896dfaa72e8e708d299a5d9a2d92d86d26379bb146f9d4efdf0b97b02567e
-  data.tar.gz: b968191c04bfb2d9b892a635571036a52f6366239739feb3ecbbf042311e311d
+  metadata.gz: 43d8b93c7d45e513ec7cae873e5f731352141522230a2476191ddf3a774401dc
+  data.tar.gz: 4bb97c63e9c245bc40922225584258be881f21b36efe48752c47bd230705d404
 SHA512:
-  metadata.gz: 4732f1251452d02ca01d76a8c710c6813c8a5c364db3fc981d5c46ea1634caf34e3b16367b84d92dbe7d71c2282b4906a9ddf2150ac1020dfe34a1754140dee9
-  data.tar.gz: 3315e505c1fb8e3227a0c7318c1d1296b892e9dcc0145bdf34c2b937f823468f4046bf54e3a0265d3815bc43d21f0889c79318382ce81b8f6c8dae0b2241a68b
+  metadata.gz: d164d93c3665ab8d53ea70ee7864d15b71d2a31a5482c080c3f44799784c76400ab8e0580df05e566c2dc35b8a6f80b73f2b910db2f1a5d574a10e1791b3805e
+  data.tar.gz: 9985545e3444a24983a3628ebd6478410c9fbe2d21fceaf71631089aca3579f83543cbc10895ce9baa3e740ef8fc005f609f7ce410af12d4ca3a7d249f4961c6

data/Gemfile.lock

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

data/bin/fuelator

@@ -74,7 +74,7 @@ end
 def run_script
   options = OptsParser.parse
   begin
-    puts "#{Fuelator::Calc.new(options.mass, options.pairs).run} kg"
+    puts "#{Fuelator::Calc.run(options.mass, options.pairs)} kg"
   rescue Fuelator::Parameters::Error, StandardError => e
     puts e
     puts e.backtrace if options.verbose

data/lib/fuelator/calc.rb

@@ -20,11 +20,16 @@ module Fuelator
       },
     }
 
+    def self.run(mass, pairs)
+      new(mass, pairs).run
+    end
+
     def initialize(mass, pairs)
       @parameters = Parameters.new(mass, pairs)
     end
 
     def run
+      parameters.validate!
       full_mass = parameters.mass
 
       parameters.reversed.map do |val|

data/lib/fuelator/parameters.rb

@@ -10,20 +10,16 @@ module Fuelator
 
     def initialize(mass, pairs)
       @mass  = mass
-      @pairs = pairs.map { |pair| Pair.new(pair) }
+      @pairs = pairs.map { |pair| Pair.new(pair).validate! }
       @order = define_order
-
-      validate!
     end
 
     def reversed
       pairs.reverse
     end
 
-    private
-
     def valid_mass?
-      !mass.nil? && mass.is_a?(Numeric)
+      mass.is_a?(Numeric)
     end
 
     def valid_pairs?
@@ -34,6 +30,8 @@ module Fuelator
       !order
     end
 
+    private
+
     # you can only calculate if directives passed in right order - :launch->:land
     def define_order
       dir = nil

data/lib/fuelator/parameters/pair.rb

@@ -9,16 +9,14 @@ module Fuelator
       def initialize(pair)
         @directive = pair[0]
         @gravity   = pair[1]
-
-        validate!
       end
 
       def valid_directive?
-        DIRECTIVES.include?(directive) && directive.is_a?(Symbol)
+        directive.is_a?(Symbol) && DIRECTIVES.include?(directive)
       end
 
       def valid_gravity?
-        !gravity.nil? && gravity.is_a?(Numeric)
+        gravity.is_a?(Numeric)
       end
     end
   end

data/lib/fuelator/parameters/validator.rb

@@ -1,14 +1,17 @@
 module Fuelator
   class Parameters
     module Validator
-
       # runs #valid_[variable]? method for every instance variable
       # raises Error defined in parent namespace
+      # @return [self]
       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
+
+        self
       end
     end
   end

data/lib/fuelator/version.rb

@@ -1,3 +1,3 @@
 module Fuelator
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuelator
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Sergii Brytiuk