fractify 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d6713db12a507f2f631b194aa35a55da4084fdf1a21983bc22b9639ed6b428d
-  data.tar.gz: 8758538741493267b7f6955fa40816b2f38edce26ccbc92591402481ee4bd273
+  metadata.gz: 815c6148fb1a168ecc92fc30a767b334d22b69bd01ec45d710528404a03962de
+  data.tar.gz: cf9d530bb686c30cfae00bd44ee24f22faff2cf800f11da8f67a08d0a030a140
 SHA512:
-  metadata.gz: ca97e7525f6adaba3ce22a404466075dcb6b226986f33d4712f730c79b5dfcb555408e229331207e20dfea57bcad9d7722911472d8a810a399d6f5f64183644d
-  data.tar.gz: 7d62525a69facd0fb7abe352a0a883f6c76d473d7d86cfb76bd2282c6b943827539d735b82d564c822238e1556ac2940e829afaeb501fd737deecda3684cced8
+  metadata.gz: f986edd971a9e04fdb4f66ec950748789372f7931117d75193512e62665b9bc18de3cc459591e1ff3e3f4df2b66e016743686b46deea21c54be8611f708ad1f1
+  data.tar.gz: b46f33911ed19b88cb92f8bca462a5f53aea4758710ef324075dab77d47b887db33c56a2c85b8fa122a9e3c1cdd3fe9cd06e309279f9f165f42798f59ede6ac3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fractify (1.0.1)
+    fractify (1.0.2)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -32,7 +32,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/fractify.
+Bug reports and pull requests are welcome on GitHub at https://gitlab.com/Verseth/fractify.
 
 ## License
 

data/lib/fractify/fraction.rb

@@ -7,15 +7,15 @@ module Fractify
   class Fraction
     attr_accessor :whole_part, :numerator, :denominator, :negative
 
-    def initialize(whole_part: 0, numerator: 0, denominator: 1, string: '', number: false)
+    def initialize(whole_part: 0, numerator: 0, denominator: 1, string: '', numeric: false)
       unless string.strip.empty?
         to_zero!
         parse_fraction_string!(string)
         return
       end
 
-      if number.is_a? Numeric
-        convert_number!(number)
+      if numeric.is_a? Numeric
+        convert_number!(numeric)
         return
       end
       raise DividingByZeroError if denominator.zero? && numerator != 0
@@ -53,9 +53,11 @@ module Fractify
     end
 
     def simplify!
-      return if integer?
+      return true if integer?
 
       if zero?
+        @denominator = 1
+        @whole_part = 0
         @negative = false
       else
         greatest_common_divisor = self.class.greatest_common_divisor(numerator, denominator)
@@ -63,10 +65,12 @@ module Fractify
         @denominator /= greatest_common_divisor
         @numerator /= greatest_common_divisor
       end
+
+      true
     end
 
     def to_proper_fraction!
-      return if zero?
+      return true if zero?
 
       if denominator == 1 && numerator != 1
         @whole_part += numerator
@@ -76,6 +80,18 @@ module Fractify
         @whole_part += new_whole_part
         @numerator %= denominator
       end
+
+      true
+    end
+
+    def to_improper!
+      return true if whole_part.zero?
+
+      @numerator -= 1 if numerator == 1 && denominator == 1
+      @numerator += whole_part * denominator
+      @whole_part = 0
+
+      true
     end
 
     def puts
@@ -87,6 +103,8 @@ module Fractify
       @numerator = 0
       @denominator = 1
       @negative = false
+
+      true
     end
 
     def to_f
@@ -111,73 +129,77 @@ module Fractify
     end
 
     def to_s(improper = false)
-      to_proper_fraction! unless improper
+      fraction = dup
+      fraction.to_proper_fraction! unless improper
       fraction_string = '('
       fraction_string += '-' if negative?
 
-      if zero?
+      if fraction.zero?
         fraction_string += '0'
-      elsif one?
+      elsif fraction.one?
         fraction_string += '1'
       else
-        fraction_string += whole_part.to_s if whole_part != 0
-        if numerator != 1 || denominator != 1
-          fraction_string += ' ' if whole_part != 0
-          fraction_string += numerator.to_s + '/' + denominator.to_s
+        fraction_string += fraction.whole_part.to_s if fraction.whole_part != 0
+        if fraction.numerator != 1 || fraction.denominator != 1
+          fraction_string += ' ' if fraction.whole_part != 0
+          fraction_string += fraction.numerator.to_s + '/' + fraction.denominator.to_s
         end
       end
 
-      to_improper!
       fraction_string + ')'
     end
 
     def -(other)
+      check_argument(other)
+
       fraction = dup
-      object = other.dup
-      if zero?
-        fraction.whole_part = object.whole_part
-        fraction.numerator = object.numerator
-        fraction.denominator = object.denominator
-        fraction.negative = !object.negative
-      else
-        fraction.to_common_denominator!(object) unless object.zero?
+      object = if other.is_a? Numeric
+                 Fractify::Fraction.new(numeric: other)
+               else
+                 other.dup
+               end
+      fraction.to_common_denominator!(object) unless object.zero?
 
-        fraction.minus_to_numerator!
-        object.minus_to_numerator!
+      fraction.minus_to_numerator!
+      object.minus_to_numerator!
 
-        fraction.numerator -= object.numerator
-        fraction.minus_to_negative_field!
-        fraction.simplify!
-      end
+      fraction.numerator -= object.numerator
+      fraction.minus_to_negative_field!
+      fraction.simplify!
 
       fraction
     end
 
     def +(other)
+      check_argument(other)
+
       fraction = dup
-      object = other.dup
-      if zero?
-        fraction.whole_part = object.whole_part
-        fraction.numerator = object.numerator
-        fraction.denominator = object.denominator
-        fraction.negative = object.negative
-      else
-        fraction.to_common_denominator!(object) unless object.zero?
+      object = if other.is_a? Numeric
+                 Fractify::Fraction.new(numeric: other)
+               else
+                 other.dup
+               end
+      fraction.to_common_denominator!(object) unless object.zero?
 
-        fraction.minus_to_numerator!
-        object.minus_to_numerator!
+      fraction.minus_to_numerator!
+      object.minus_to_numerator!
 
-        fraction.numerator += object.numerator
-        fraction.minus_to_negative_field!
-        fraction.simplify!
-      end
+      fraction.numerator += object.numerator
+      fraction.minus_to_negative_field!
+      fraction.simplify!
 
       fraction
     end
 
     def *(other)
+      check_argument(other)
+
       fraction = dup
-      object = other.dup
+      object = if other.is_a? Numeric
+                 Fractify::Fraction.new(numeric: other)
+               else
+                 other.dup
+               end
 
       fraction.to_improper!
       object.to_improper!
@@ -198,8 +220,15 @@ module Fractify
     end
 
     def /(other)
+      check_argument(other)
+      raise DividingByZeroError if other.zero?
+
       fraction = dup
-      object = other.dup
+      object = if other.is_a? Numeric
+                 Fractify::Fraction.new(numeric: other)
+               else
+                 other.dup
+               end
 
       object.to_reciprocal!
       fraction *= object
@@ -208,13 +237,12 @@ module Fractify
     end
 
     def **(other)
+      check_argument(other)
       if other.is_a? Numeric
         power(other)
-      elsif other.is_a? Fractify::Fraction
+      else
         x = other.to_f
         power(x)
-      else
-        raise IncorrectArgumentsError
       end
     end
 
@@ -414,6 +442,8 @@ module Fractify
       numerator_multiplication = least_common_multiple / other.denominator
       other.numerator *= numerator_multiplication
       other.denominator = least_common_multiple
+
+      true
     end
 
     def to_reciprocal!
@@ -421,37 +451,41 @@ module Fractify
       aux = denominator
       @denominator = numerator
       @numerator = aux
+
+      true
     end
 
     protected
 
-    def to_improper!
-      return if whole_part.zero?
-
-      @numerator -= 1 if numerator == 1 && denominator == 1
-      @numerator += whole_part * denominator
-      @whole_part = 0
-    end
-
     def minus_to_numerator!
-      return unless negative
+      return true unless negative
 
       @negative = false
       @numerator = -numerator
+
+      true
     end
 
     def minus_to_negative_field!
-      return unless numerator.negative?
+      return true unless numerator.negative?
 
       @negative = true
       @numerator = numerator.abs
+
+      true
     end
 
     private
 
+    def check_argument(other)
+      return unless !other.is_a?(Numeric) && !other.is_a?(Fractify::Fraction)
+
+      raise IncorrectArgumentsError
+    end
+
     def power(x)
       fraction = dup
-      fraction.negative = false if x % 2 == 0
+      fraction.negative = false if (x % 2).zero?
 
       if x.negative?
         fraction.to_reciprocal!
@@ -468,7 +502,7 @@ module Fractify
         float = fraction.to_f.abs
         float **= x
         float = -float if fraction.negative?
-        fraction = Fractify::Fraction.new(number: float)
+        fraction = Fractify::Fraction.new(numeric: float)
       end
 
       fraction
@@ -480,6 +514,8 @@ module Fractify
       @whole_part = whole_part.abs
       @numerator = numerator.abs
       @denominator = denominator.abs
+
+      true
     end
 
     def arguments_make_negative?
@@ -682,6 +718,7 @@ module Fractify
       @numerator = 1 if numerator.zero?
 
       simplify!
+      to_improper!
     end
   end
 end

data/lib/fractify/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fractify
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fractify
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Mateusz Drewniak