meplato-money 0.1.3 → 0.2.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.2.0, released 2012-08-01
+
+* Thread safety (remove autoload and class variables)
+* Remove init.rb and use Rails initializer
+
 # 0.1.3, released 2011-10-11
 
 * Published gem as meplato-money.

data/lib/money.rb

@@ -6,10 +6,11 @@
 
 # This library is for parsing and formatting monetary values.
 
-module Money
-  autoload :CoreExt,        'money/core_ext.rb'
-  autoload :Money,          'money/money.rb'
-  autoload :MoneyFormatter, 'money/money_formatter.rb'
-  autoload :FixedBank,      'money/fixed_bank.rb'
-  autoload :MeplatoBank,    'money/meplato_bank.rb'
-end
+require 'money/core_ext'
+require 'money/currencies'
+require 'money/formats'
+require 'money/money_formatter'
+require 'money/fixed_bank'
+require 'money/meplato_bank'
+require 'money/money'
+require 'money/rails' if defined?(::Rails::Engine)

data/lib/money/money.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'money/currencies'
-require 'money/formats'
 
 module Money
 
@@ -26,23 +24,35 @@ module Money
 
     attr_reader :amount, :currency, :bank
 
-    class << self
-      attr_accessor :default_bank
-      attr_accessor :default_currency
-      attr_accessor :default_locale
+    def initialize(amount, currency = nil, bank = nil)
+      @amount   = amount
+      @currency = currency || self.class.default_currency
+      @bank     = bank || self.class.default_bank
+      raise UnknownCurrency unless CURRENCIES[@currency]
+    end
 
-      def same_currency?(source, target)
-        source.upcase == target.upcase
-      end
+    def self.default_bank
+      Thread.current[:money_default_bank] || MeplatoBank.instance
+    end
+
+    def self.default_bank=(bank)
+      Thread.current[:money_default_bank] = bank
     end
 
-    self.default_bank = MeplatoBank.instance
-    self.default_currency = "USD"
-    self.default_locale = "en"
+    def self.default_currency
+      Thread.current[:money_default_currency] || "USD"
+    end
 
-    def initialize(amount, currency = Money.default_currency, bank = Money.default_bank)
-      @amount, @currency, @bank = amount, currency || Money.default_currency, bank || Money.default_bank
-      raise UnknownCurrency unless CURRENCIES[@currency]
+    def self.default_currency=(currency)
+      Thread.current[:money_default_currency] = currency
+    end
+
+    def self.default_locale
+      Thread.current[:money_default_locale] || "en"
+    end
+
+    def self.default_locale=(locale)
+      Thread.current[:money_default_locale] = locale
     end
 
     def positive?
@@ -62,11 +72,11 @@ module Money
     end
 
     def ==(other)
-      self.amount == other.amount && Money.same_currency?(self.currency, other.currency)
+      self.amount == other.amount && self.class.same_currency?(self.currency, other.currency)
     end
 
     def <=>(other)
-      if Money.same_currency?(@currency, other.currency)
+      if self.class.same_currency?(@currency, other.currency)
         @amount <=> other.amount
       else
         @amount <=> other.exchange_to(@currency).amount
@@ -74,7 +84,7 @@ module Money
     end
 
     def +(other)
-      if Money.same_currency?(@currency, other.currency)
+      if self.class.same_currency?(@currency, other.currency)
         Money.new(@amount + other.amount, @currency)
       else
         Money.new(@amount + other.exchange_to(@currency).amount, @currency)
@@ -82,7 +92,7 @@ module Money
     end
 
     def -(other)
-      if Money.same_currency?(@currency, other.currency)
+      if self.class.same_currency?(@currency, other.currency)
         Money.new(@amount - other.amount, @currency)
       else
         Money.new(@amount - other.exchange_to(@currency).amount, @currency)
@@ -90,7 +100,7 @@ module Money
     end
 
     def exchange_to(target)
-      unless Money.same_currency?(@currency, target)
+      unless self.class.same_currency?(@currency, target)
         rate = self.bank.get_rate(@currency, target)
         if !rate
           raise UnknownRate, "No conversion from #{@currency} to #{target}"
@@ -118,6 +128,10 @@ module Money
       self.format(options)
     end
 
+    def self.same_currency?(source, target)
+      source.upcase == target.upcase
+    end
+
     def self.parse(value, currency, options = {})
       return Money.new(0, currency, options) if value.nil?
       opts = {
@@ -131,8 +145,5 @@ module Money
       s.gsub!(format[:decimal_sep], '.')
       Money.new(s.to_f, opts[:currency], opts)
     end
-
-  private
-
   end
 end

data/lib/money/rails.rb

@@ -0,0 +1,9 @@
+module Money
+  class Rails < ::Rails::Engine
+    initializer 'money' do
+      if defined?(ActiveRecord)
+        ActiveRecord::Base.send(:include, ::Money)
+      end
+    end
+  end if defined?(::Rails)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meplato-money
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-12 00:00:00.000000000 Z
+date: 2012-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70300784862420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70300784862420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70300784861960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70300784861960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70300784861500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70300784861500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: Working with monetary values as well as performing currency exchange.
 email:
 - oliver.eilhard@gmail.com
@@ -64,6 +79,7 @@ files:
 - lib/money/meplato_bank.rb
 - lib/money/money.rb
 - lib/money/money_formatter.rb
+- lib/money/rails.rb
 - CHANGELOG.md
 - LICENSE
 - README.md
@@ -88,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Working with monetary values as well as performing currency exchange.