currency_shushugah 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 460d9b74715a54631d64b673616bbbb03e4cb8c7
-  data.tar.gz: a9cef6316c80c3bbc122f9bc569998170ee4e432
+  metadata.gz: 025a361a07ad5469e9f3b19f285c1882d4d2b510
+  data.tar.gz: b0a579adf6581e8926192437148bf965d0e400a3
 SHA512:
-  metadata.gz: 5a5f9027b8d08eceb31d0903fc291ce7d0fc9c4f8f631070ac12939cf582024c0c7d59d1615e465e7a671cf465cb76c120df13a7f7076170fb4b1942c7bfe40b
-  data.tar.gz: bed757796f2c981c17a6ed0f8cf65fda43b9c0fb73400beccff135ba9c47d0fd59e97ed4f721e7ce1a633ff8887f618cf70dbacc827a6f6924112b2511990885
+  metadata.gz: c3c2f0ecb2deb87d8a6abc4910b6d20bb04c38a45a0d0cd6e9d1b19db6ee22b527b8f01b34574460f4dc7c4d6008cb2c7230e30a13c850338e867b3a00b64be2
+  data.tar.gz: 76e6665f5ee08b7f089aae84707d4f5079fa7cb73ecd2595d435386df310d500457f4ec31c0b77bd68c751b3d682622a50438b96f16564653b622e59d0948a10

data/currency_shushugah.gemspec

@@ -6,10 +6,10 @@ require 'currency_shushugah/version'
 Gem::Specification.new do |spec|
   spec.name          = "currency_shushugah"
   spec.version       = CurrencyShushugah::VERSION
-  spec.authors       = ["yonatan miller"]
+  spec.authors       = ["Yonatan Miller"]
   spec.email         = ["brombacher1@gmail.com"]
 
-  spec.summary       = "Converts currencies after being fed a conversion rate, either manually or from an API"
+  spec.summary       = "Converts currencies and accepts conversion rates"
   spec.homepage      = "https://github.com/shushugah/currency_shushugah"
   spec.license       = "MIT"
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/currency_shushugah/version.rb

@@ -1,3 +1,3 @@
 class CurrencyShushugah
-  VERSION = "1.0.1"
+  VERSION = '2.0.0'.freeze
 end

data/lib/currency_shushugah.rb

@@ -1,55 +1,74 @@
-require "currency_shushugah/version"
+require 'currency_shushugah/version'
 
+# Understands currency and quantity
 class Money
-  attr_accessor :currency, :amount
-	@@currencies = {}
-	@@base_currency = ""
-
-	def self.conversion_rates(currency, hash)
-		@@currencies[currency] = hash
-		@@base_currency = currency
-	end
-
-	def initialize(amount, currency)
-		@amount = amount.round(2)
-		@currency = currency
-	end
-
-	def convert_to(currency_code)
-		return self if currency == currency_code
-		if @@currencies[currency] && @@currencies[currency].has_key?(currency_code)
-			Money.new(@@currencies[currency][currency_code]*amount, currency_code)	
-		else
-			Money.new(amount/@@currencies[currency_code][currency], currency_code)
-		end	
-	end
-
-	def inspect
-		"#{'%0.2f' % @amount} #{@currency}"
-	end
-
-  [:+, :-].each do |method_name|
-  	define_method method_name do |arg|
-  	if currency == arg.currency	
-  		normalized_amount, normalized_arg_amount, currency_param = amount, arg.amount, currency
-  	elsif [currency, arg.currency].include?(@@base_currency)
-  		normalized_amount, normalized_arg_amount, currency_param = self.convert_to(@@base_currency).amount, arg.convert_to(@@base_currency).amount, @@base_currency
-  	else
-  		normalized_arg_amount, currency_param = arg.convert_to(currency).amount, currency	  		
-  	end
-  		Money.new(normalized_amount.send(method_name, normalized_arg_amount), currency_param)
-  	end
-  end
-
-  [:*, :/].each do |method_name|
-  	define_method method_name do |arg|
-  		Money.new(amount.send(method_name, arg), currency)
-  	end
-  end
-
-  [:>,:<,:==].each do |method_name|
-  	define_method method_name do |arg|
-  		amount.send(method_name, arg.convert_to(currency).amount) 
-  	end
+  include Comparable
+
+  attr_reader :quantity, :currency
+  protected :currency, :quantity
+
+  def self.conversion_rates(base_currency, hash_rates)
+    @rates = hash_rates.merge(base_currency => 1)
+  end
+
+  def initialize(quantity, currency)
+    raise StandardError.new('Not supported currency') unless rates[currency]
+    @quantity = quantity
+    @currency = currency
+  end
+
+  def <=>(other)
+    return unless other.class == self.class
+    quantity <=> other.convert_to(currency).quantity
+  end
+
+  def inspect
+    "#{'%0.2f' % quantity} #{currency}"
+  end
+
+  def convert_to(other_currency)
+    raise StandardError.new('InvalidCurrency') unless rates[other_currency]
+    return self if currency == other_currency
+    new_quantity = @quantity * rates[other_currency] / rates[currency]
+    new_money(new_quantity, other_currency)
+  end
+
+  def +(other)
+    new_money(quantity + other.convert_to(currency).quantity)
+  end
+
+  def -(other)
+    self + -other
+  end
+
+  def -@
+    new_money(-quantity)
+  end
+
+  def coerce(other)
+    return self, other
+  end
+
+  def *(scalar)
+    new_money(quantity * scalar)
+  end
+
+  def /(scalar)
+    raise StandardError.new 'InvalidDivision' if scalar.zero?
+    self * (1.0 / scalar)
+  end
+
+  def new_money(quantity, currency = @currency)
+    Money.send :new, quantity.round(2), currency
+  end
+
+  def self.rates
+    Money.instance_variable_get(:@rates)
+  end
+
+  private
+
+  def rates
+    self.class.rates
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: currency_shushugah
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
-- yonatan miller
+- Yonatan Miller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-11 00:00:00.000000000 Z
+date: 2017-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +98,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Converts currencies after being fed a conversion rate, either manually or
-  from an API
+summary: Converts currencies and accepts conversion rates
 test_files: []