fractify 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7dee9a90b5b90e4e6b5279eadf795942cb424e3507d1e80c3d8fd2e95a1cc3b
-  data.tar.gz: a564de039fbc57637c3be967797d26a5f7216e16d1b9000439fc6de38fcd53e9
+  metadata.gz: 6d6713db12a507f2f631b194aa35a55da4084fdf1a21983bc22b9639ed6b428d
+  data.tar.gz: 8758538741493267b7f6955fa40816b2f38edce26ccbc92591402481ee4bd273
 SHA512:
-  metadata.gz: 57de8465352800e17149a1d216ac311169bdc679e47e732970a694130ea8274a0b3c2bb4929fa64a24d9ce67862e9290162c0fb6e557fb9ba623be4515303e85
-  data.tar.gz: e28a9f15bf58ed3492fc8878400072fb8bbc22f3fea31b874fa5be9df76db6626dd03c7ee8c8b69fccc5b8a9128b8e12a84a0cfa2f4dc38a590c15ab56b33bca
+  metadata.gz: ca97e7525f6adaba3ce22a404466075dcb6b226986f33d4712f730c79b5dfcb555408e229331207e20dfea57bcad9d7722911472d8a810a399d6f5f64183644d
+  data.tar.gz: 7d62525a69facd0fb7abe352a0a883f6c76d473d7d86cfb76bd2282c6b943827539d735b82d564c822238e1556ac2940e829afaeb501fd737deecda3684cced8

data/.gitignore

@@ -7,3 +7,4 @@
 /spec/reports/
 /tmp/
 .byebug_history
+*.gem

data/Gemfile.lock

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

data/fractify.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Mateusz Drewniak']
   spec.email         = ['matmg24@gmail.com']
 
-  spec.summary       = 'A few classes which make it possible to properly' \
+  spec.summary       = 'A small gem which makes it possible to properly' \
                        ' handle common fractions in Ruby'
   spec.homepage      = 'https://gitlab.com/Verseth/fractify'
   spec.license       = 'MIT'
@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>=2.3'
   spec.add_development_dependency 'bundler', '~> 1.17'
   spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'minitest', '~> 5.0'

data/lib/fractify/fraction.rb

@@ -20,12 +20,14 @@ module Fractify
       end
       raise DividingByZeroError if denominator.zero? && numerator != 0
 
-      @whole_part = whole_part
+      self.whole_part = whole_part
       self.numerator = numerator
       self.denominator = denominator
       self.negative = false
 
+      fix_negativity!
       simplify!
+      to_improper!
     end
 
     def negative?
@@ -38,6 +40,12 @@ module Fractify
       false
     end
 
+    def integer?
+      return true if denominator == 1 && !zero?
+
+      false
+    end
+
     def one?
       return true if numerator == 1 && denominator == 1 && whole_part.zero?
 
@@ -45,23 +53,28 @@ module Fractify
     end
 
     def simplify!
-      fix_negativity!
-      if !zero?
+      return if integer?
+
+      if zero?
+        @negative = false
+      else
         greatest_common_divisor = self.class.greatest_common_divisor(numerator, denominator)
 
         @denominator /= greatest_common_divisor
         @numerator /= greatest_common_divisor
+      end
+    end
 
-        if denominator == 1 && numerator != 1
-          @whole_part += numerator
-          @numerator = 1
-        elsif numerator > denominator
-          new_whole_part = numerator / denominator
-          @whole_part += new_whole_part
-          @numerator %= denominator
-        end
-      else
-        @negative = false
+    def to_proper_fraction!
+      return if zero?
+
+      if denominator == 1 && numerator != 1
+        @whole_part += numerator
+        @numerator = 1
+      elsif numerator > denominator
+        new_whole_part = numerator / denominator
+        @whole_part += new_whole_part
+        @numerator %= denominator
       end
     end
 
@@ -76,15 +89,6 @@ module Fractify
       @negative = false
     end
 
-    def to_improper!
-      return if whole_part.zero?
-
-      simplify!
-      @numerator -= 1 if numerator == 1 && denominator == 1
-      @numerator += whole_part * denominator
-      @whole_part = 0
-    end
-
     def to_f
       return 0.0 if zero?
 
@@ -97,17 +101,17 @@ module Fractify
 
     def to_i
       return 0 if zero?
-
       fraction = dup
-      fraction.simplify!
+      fraction.to_proper_fraction!
 
-      result = whole_part
+      result = fraction.whole_part
       result = -result if fraction.negative?
 
       result
     end
 
-    def to_s
+    def to_s(improper = false)
+      to_proper_fraction! unless improper
       fraction_string = '('
       fraction_string += '-' if negative?
 
@@ -123,6 +127,7 @@ module Fractify
         end
       end
 
+      to_improper!
       fraction_string + ')'
     end
 
@@ -244,18 +249,9 @@ module Fractify
     end
 
     def self.greatest_common_divisor(first, second)
-      first = first.abs
-      second = second.abs
-
-      while first != second
-        if first > second
-          first -= second
-        else
-          second -= first
-        end
-      end
+      return first if second.zero?
 
-      first
+      greatest_common_divisor(second, first % second)
     end
 
     def self.numeric?(char)
@@ -429,6 +425,14 @@ module Fractify
 
     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
 

data/lib/fractify/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fractify
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Mateusz Drewniak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -139,6 +139,6 @@ requirements: []
 rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
-summary: A few classes which make it possible to properly handle common fractions
-  in Ruby
+summary: A small gem which makes it possible to properly handle common fractions in
+  Ruby
 test_files: []