currency_converter_gem_nichohelmut 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0f9cd75f72cda30bce1922b83396ed4a33a7e9a
-  data.tar.gz: 6b26117ba8625b7a2ed823163868b5e1f5d7a3ae
+  metadata.gz: 7564c8580075474ceee5d3b222d936e7cc0d2cc9
+  data.tar.gz: 3c224227563d78b9976591208e0dd2692ca2f330
 SHA512:
-  metadata.gz: 86990eaada2926c706f2fcb6bc4d5ccdc4f7fca15209c9ac1b16e312e1743e7ef5bf88628827d2b934988b775a1a85ba58115bd2f6557a45c010ecf34e0a76f8
-  data.tar.gz: e7f3fb56e98e927880c37b570a46a1db586277519b1fb6b474c4fc7b9a76cbd130fcba7b7ce6e46d148a906330caae14387c6293f8155fa6e45d0e83ac35e00d
+  metadata.gz: 3d613365f555be31b16b2d7b6b870efdb19a30afc2b629838f3c774b993af9206911b69f8c698293133d2f2c35a7c9e341fefd384342850388603728fba15a1c
+  data.tar.gz: 88f7b80dfa51fdb6e44289b056fd20c2a8451ea88c4c80b392c89cb1f172ec43459345882ed0602add7bd5c5cc1afd99b30d06d6ea2f236104714879f56624eb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    currency_converter_gem_nichohelmut (0.1.1)
+    currency_converter_gem_nichohelmut (0.1.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/currency_converter_gem_nichohelmut/version.rb

@@ -1,3 +1,3 @@
 module CurrencyConverterGemNichohelmut
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/currency_converter_gem_nichohelmut.rb

@@ -1,86 +1,67 @@
 require "currency_converter_gem_nichohelmut/version"
 
 module CurrencyConverterGemNichohelmut
-class Money
-    attr_accessor :amount, :converted_amount
-
-    def initialize(amount, from_curr)
-      @amount = amount
-      @from_curr = from_curr
-    end
-
-    def amount
-      @amount
-    end
-
-    def from_curr
-      @from_curr
-    end
+def initialize(amount, curr)
+    @amount = amount
+    @curr = curr
+  end
 
-    def inspect
-      '%.2f' % @amount.to_s + " " + @from_curr
-    end
+  def self.conversion_rates(fx = {})
+    {'EUR'=>{'USD'=>1.2, 'Bitcoin'=>0.0047},
+    'USD'=>{'EUR'=>0.8, 'Bitcoin'=>0.0097},
+    'Bitcoin'=>{'USD'=>1.11, 'EUR'=>0.0047}}
+  end
 
+  def amount
+    @amount
+  end
 
- def self.conversion_rates(attr = {})
-      # @conv_rates = {from_curr = {rates}} Use Hard Code for now
-      # refactor to attr ={}
-      return {'EUR'=>{'USD'=>1.23, 'Bitcoin'=>0.00016},
-      'USD'=>{'EUR'=>0.81, 'Bitcoin'=>0.00013},
-      'Bitcoin'=>{'USD'=>7468.23, 'EUR'=>6557.93}}
+  def curr
+    @curr
+  end
 
+  def inspect
+    '%.2f' % @amount.to_s + " " + @curr
+  end
 
+  def convert_to(to_curr)
+    if to_curr != self.curr
+      @rate = Money.conversion_rates[self.curr][to_curr]
+      Money.new(@amount * @rate, to_curr)
+    else
+      Money.new(@amount, curr)
     end
+  end
 
-    def convert_to(to_curr)
-      if to_curr != self.from_curr
-        @rate = Money.conversion_rates[self.from_curr]["#{to_curr}"]
-        @converted_amount = @amount * @rate
-        Money.new(@converted_amount, to_curr)
-      else
-        Money.new(@amount, from_curr)
-      end
-    end
+# --------------------------------------
 
   def +(other)
-    curr = self.from_curr
-    result = self.amount + other.convert_to(curr).amount
-    return Money.new(result, curr)
+    Money.new(self.amount + other.convert_to(self.curr).amount, self.curr)
   end
 
   def -(other)
-    curr = self.from_curr
-    result = self.amount - other.convert_to(curr).amount
-    return Money.new(result, curr)
+    Money.new(self.amount - other.convert_to(self.curr).amount, self.curr)
   end
 
   def *(other)
-    result = self.amount * other
-    Money.new(result, self.from_curr)
+    Money.new(self.amount * other, self.curr)
   end
 
   def /(other)
-    result = self.amount / other
-    Money.new(result, self.from_curr)
+    Money.new(self.amount / other, self.curr)
   end
 
- def ==(other)
-    curr = self.from_curr
-    result = (self.amount == other.convert_to(curr).amount)
+  def ==(other)
+    self.amount == other.convert_to(self.curr).amount
   end
 
   def >(other)
-    curr = self.from_curr
-    self.amount > other.convert_to(curr).amount
+    self.amount > other.convert_to(self.curr).amount
   end
 
   def <(other)
-    curr = self.from_curr
-    self.amount < other.convert_to(curr).amount
+    self.amount < other.convert_to(self.curr).amount
   end
 end
 
-twenty_dollars = Money.new(20, "USD")
-fifty_euro = Money.new(50, "EUR")
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: currency_converter_gem_nichohelmut
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nicholas Utikal
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler