convers_money 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69c34b7aae24a455b862d3f22e03836a79a3fa45
-  data.tar.gz: 18b2f788e8c2ee46a50b7f0490455bbd86257f9e
+  metadata.gz: e550192aacf950e861c7051c8341dd915412ce02
+  data.tar.gz: 1db1f09cfdff2c3b34225bd3d5cd89fa735abb23
 SHA512:
-  metadata.gz: ebed51488bfad055db104033f03c7f14cbada3acaef865300a324e97549da679c44369586087927b8caa6e3a9ab4b13adb21fd9fbc6703f6a7d89bce62356586
-  data.tar.gz: 790f608ac5bf1a2eb577a4fd2e7990232c92471ea143eb9822689de4ede05b7cf5f45130a778d919e9de0681f77e78cf2e38844f8d9f32738a3926f6bb9f9182
+  metadata.gz: dd519d7aa9f932620e369b7684e854fb9f2ef60d824278969f68231182ecb8c255ce93923a426c446eddd0f63600a0fab5fec9a542a410aeefc3d85d41b27866
+  data.tar.gz: fea2c1b35cad3d7511af1a2f6be016ab7d773f1d9e7796ca5419b209bf112eb26800cd95b73d6e761afd40db4e8a08463c4f2ede87063b9eeac2663a09f784b7

data/convers_money.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['antonelo@gmail.com']
 
   spec.summary       = 'Money conversor'
-  spec.description   = "ConversMoney it's a Money Conversor given by fixed currency and change rates of your choice. \n This version '1.0.0' it's the first full working version"
+  spec.description   = "ConversMoney it's a Money Conversor given by fixed currency and change rates of your choice. \r\n From the version and further '1.0.1' it's a full working version"
   spec.homepage      = 'https://github.com/nelantone/convers_money'
   spec.license       = 'MIT'
 

data/lib/convers_money.rb

@@ -56,58 +56,77 @@ class ConversMoney
     "#{format('%.2f', @amount)} #{@currency}"
   end
 
-  def convert_float_to_instance(other, currency)
-    if other.is_a? Float
-      other = ConversMoney.new( other, currency)
+  def convert_to_reference_currency(other, currency)
+    if (other.is_a? Float ) || (other.is_a? Integer)
+      ConversMoney.new( other, currency)
+    else
+      other.convert_to(currency)
     end
   end
 
+  # def resut_conversion(other, currency, total_amount)
+  #   result = ConversMoney.new(total_amount.round(2), currency)
+  #   if other.amount.is_a? Integer
+  #     result.amount = result.amount.to_i
+  #     result
+  #   end
+  # end
+
   def +(other)
-    if other.is_a? Float
-      other = ConversMoney.new( other, currency)
+    other = convert_to_reference_currency(other, currency)
+    total_amount = amount + other.amount
+    result = ConversMoney.new(total_amount.round(2), currency)
+    if other.amount.is_a? Integer
+      result.amount = result.amount.to_i
+      result
+    else
+      result
     end
-    total_amount = amount + other.convert_to(currency).amount
-    ConversMoney.new(total_amount.to_f.round(2), currency)
   end
 
   def -(other)
-    if other.is_a? Float
-      other = ConversMoney.new( other, currency)
+    other = convert_to_reference_currency(other, currency)
+    total_amount = amount - other.amount
+    result = ConversMoney.new(total_amount.round(2), currency)
+    if other.amount.is_a? Integer
+      result.amount = result.amount.to_i
+      result
+    else
+      result
     end
-    total_amount = amount - other.convert_to(currency).amount
-    ConversMoney.new(total_amount.to_f.round(2), currency)
   end
 
   def *(other)
-    if other.is_a? Float
-      other = ConversMoney.new( other, currency)
+    other = convert_to_reference_currency(other, currency)
+    total_amount = amount * other.amount
+    result = ConversMoney.new(total_amount.round(2), currency)
+    if other.amount.is_a? Integer
+      result.amount = result.amount.to_i
+      result
+    else
+      result
     end
-    total_amount = amount * other.convert_to(currency).amount
-    ConversMoney.new(total_amount.to_f.round(2), currency)
   end
 
   def /(other)
-    if other.is_a? Float
-      other = ConversMoney.new( other, currency)
+    other = convert_to_reference_currency(other, currency)
+    total_amount = amount / other.amount
+    result = ConversMoney.new(total_amount.round(2), currency)
+    if other.amount.is_a? Integer
+      result.amount = result.amount.to_i
+      result
+    else
+      result
     end
-    total_amount = amount / other.convert_to(currency).amount
-    ConversMoney.new(total_amount.to_f.round(2), currency)
   end
 
   def <=>(other)
     if other.is_a? Float
       other = ConversMoney.new( other.round(2), currency)
-    end
-    amount.round(2) <=> other.convert_to(currency).amount.round(2)
-  end
-
-  def self.checking_fixed_currency(other, currency)
-    if other.currency.eql?(currency)
-      other
     else
-      conversion_rates_access
-      other.convert_to(currency)
+      other = convert_to_reference_currency(other, currency)
     end
+    amount.round(2) <=> other.amount.round(2)
   end
 
   def self.conversion_rates_access

data/lib/convers_money/version.rb

@@ -1,3 +1,3 @@
 class ConversMoney
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convers_money
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Toño Serna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-12 00:00:00.000000000 Z
+date: 2017-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,7 +99,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.6.0
 description: "ConversMoney it's a Money Conversor given by fixed currency and change
-  rates of your choice. \n This version '1.0.0' it's the first full working version"
+  rates of your choice. \r\n From the version and further '1.0.1' it's a full working
+  version"
 email:
 - antonelo@gmail.com
 executables: []