money-rails 1.13.0 → 1.14.0

data/lib/money-rails/helpers/action_view_extension.rb

@@ -1,8 +1,7 @@
 module MoneyRails
   module ActionViewExtension
-
-    def currency_symbol
-      content_tag(:span, Money.default_currency.symbol, class: "currency_symbol")
+    def currency_symbol(currency = Money.default_currency)
+      content_tag(:span, Money::Currency.find(currency).symbol, class: "currency_symbol")
     end
 
     def humanized_money(value, options={})
@@ -48,5 +47,13 @@ module MoneyRails
     def money_without_cents_and_with_symbol(value)
       money_without_cents(value, symbol: true)
     end
+
+    def money_only_cents(value)
+      return '00' unless value.respond_to?(:to_money)
+
+      value = value.to_money
+
+      format "%0#{value.currency.exponent}d", (value % value.currency.subunit_to_unit).cents
+    end
   end
 end

data/lib/money-rails/hooks.rb

@@ -18,7 +18,13 @@ module MoneyRails
                                     else
                                       false
                                     end
-            current_adapter = ::ActiveRecord::Base.connection_config[:adapter]
+
+            current_adapter = if ::ActiveRecord::Base.respond_to?(:connection_db_config)
+                                ::ActiveRecord::Base.connection_db_config.configuration_hash[:adapter]
+                              else
+                                ::ActiveRecord::Base.connection_config[:adapter]
+                              end
+
             postgresql_with_money = rails42 && PG_ADAPTERS.include?(current_adapter)
           end
         end

data/lib/money-rails/money.rb

@@ -2,7 +2,7 @@ require "active_support/core_ext/module/aliasing.rb"
 require "active_support/core_ext/hash/reverse_merge.rb"
 
 class Money
-  class <<self
+  class << self
     alias_method :orig_default_formatting_rules, :default_formatting_rules
 
     def default_formatting_rules
@@ -21,4 +21,9 @@ class Money
       rules
     end
   end
+
+  # This is expected to be called by ActiveSupport when calling as_json an Money object
+  def to_hash
+    { cents: cents, currency_iso: currency.iso_code.to_s }
+  end
 end

data/lib/money-rails/mongoid/money.rb

@@ -28,25 +28,12 @@ class Money
     # Takes any possible object and converts it to how it would be
     # stored in the database.
     def mongoize(object)
-      case
-      when object.is_a?(Money) then object.mongoize
-      when object.is_a?(Hash) then
-        if object.respond_to?(:deep_symbolize_keys!)
-          object.deep_symbolize_keys!
-        elsif object.respond_to?(:symbolize_keys!)
-          object.symbolize_keys!
-        end
-        ::Money.new(object[:cents], object[:currency_iso]).mongoize
-      when object.nil? then nil
-      when object.respond_to?(:to_money) then
-        begin
-          object.to_money.mongoize
-        rescue Money::Currency::UnknownCurrency, Monetize::ParseError => e
-          raise MoneyRails::Error, e.message if MoneyRails.raise_error_on_money_parsing
-          nil
-        end
-      else object
-      end
+      return object.mongoize if object.is_a?(Money)
+      return mongoize_hash(object) if object.is_a?(Hash)
+      return nil if object.nil?
+      return mongoize_castable(object) if object.respond_to?(:to_money)
+
+      object
     end
 
     # Converts the object that was supplied to a criteria and converts it
@@ -57,5 +44,27 @@ class Money
       else object
       end
     end
+
+    private
+
+    def mongoize_hash(hash)
+      if hash.respond_to?(:deep_symbolize_keys!)
+        hash.deep_symbolize_keys!
+      elsif hash.respond_to?(:symbolize_keys!)
+        hash.symbolize_keys!
+      end
+
+      # Guard for a blank form
+      return nil if hash[:cents] == '' && hash[:currency_iso] == ''
+
+      ::Money.new(hash[:cents], hash[:currency_iso]).mongoize
+    end
+
+    def mongoize_castable(object)
+      object.to_money.mongoize
+    rescue Money::Currency::UnknownCurrency, Monetize::ParseError => e
+      return nil unless MoneyRails.raise_error_on_money_parsing
+      raise MoneyRails::Error, e.message
+    end
   end
 end

data/lib/money-rails/rails_admin.rb

@@ -8,7 +8,7 @@ module RailsAdmin
   module Config
     module Fields
       module Types
-        class Money < RailsAdmin::Config::Fields::Types::Integer
+        class Money < RailsAdmin::Config::Fields::Types::Decimal
           RailsAdmin::Config::Fields::Types::register(self)
 
           register_instance_option :pretty_value do

data/lib/money-rails/railtie.rb

@@ -1,6 +1,6 @@
 module MoneyRails
   class Railtie < ::Rails::Railtie
-    initializer 'moneyrails.initialize' do
+    initializer 'moneyrails.initialize', after: 'active_record.initialize_database' do
       MoneyRails::Hooks.init
     end
   end

data/lib/money-rails/version.rb

@@ -1,3 +1,3 @@
 module MoneyRails
-  VERSION = '1.13.0'
+  VERSION = '1.14.0'
 end

data/money-rails.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
 
   s.require_path = "lib"
 
-  s.add_dependency "money",         "~> 6.13.0"
+  s.add_dependency "money",         "~> 6.13.2"
   s.add_dependency "monetize",      "~> 1.9.0"
   s.add_dependency "activesupport", ">= 3.0"
   s.add_dependency "railties",      ">= 3.0"
@@ -36,4 +36,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-rails", "~> 3.0"
   s.add_development_dependency 'database_cleaner', '~> 1.6.1'
   s.add_development_dependency 'test-unit', '~> 3.0' if RUBY_VERSION >= '2.2'
+  s.add_development_dependency 'bundler'
+
+  if s.respond_to?(:metadata)
+    s.metadata['changelog_uri'] = 'https://github.com/RubyMoney/money-rails/blob/master/CHANGELOG.md'
+    s.metadata['source_code_uri'] = 'https://github.com/RubyMoney/money-rails/'
+    s.metadata['bug_tracker_uri'] = 'https://github.com/RubyMoney/money-rails/issues'
+  end
 end

data/spec/active_record/monetizable_spec.rb

@@ -20,6 +20,14 @@ if defined? ActiveRecord
         Service.create(charge_cents: 2000, discount_cents: 120)
       end
 
+      def update_product(*attributes)
+        if defined?(::ActiveRecord::VERSION) && ::ActiveRecord::VERSION::MAJOR >= 5
+          product.update(*attributes)
+        else
+          product.update_attributes(*attributes)
+        end
+      end
+
       context ".monetized_attributes" do
 
         class InheritedMonetizeProduct < Product
@@ -73,7 +81,7 @@ if defined? ActiveRecord
       end
 
       it "correctly updates from a Money object using update_attributes" do
-        expect(product.update_attributes(price: Money.new(215, "USD"))).to be_truthy
+        expect(update_product(price: Money.new(215, "USD"))).to be_truthy
         expect(product.price_cents).to eq(215)
       end
 
@@ -187,8 +195,8 @@ if defined? ActiveRecord
       end
 
       it "respects numericality validation when using update_attributes" do
-        expect(product.update_attributes(price_cents: "some text")).to be_falsey
-        expect(product.update_attributes(price_cents: 2000)).to be_truthy
+        expect(update_product(price_cents: "some text")).to be_falsey
+        expect(update_product(price_cents: 2000)).to be_truthy
       end
 
       it "uses numericality validation on money attribute" do
@@ -415,8 +423,8 @@ if defined? ActiveRecord
       end
 
       it "respects numericality validation when using update_attributes on money attribute" do
-        expect(product.update_attributes(price: "some text")).to be_falsey
-        expect(product.update_attributes(price: Money.new(320, 'USD'))).to be_truthy
+        expect(update_product(price: "some text")).to be_falsey
+        expect(update_product(price: Money.new(320, 'USD'))).to be_truthy
       end
 
       it "uses i18n currency format when validating" do
@@ -494,31 +502,31 @@ if defined? ActiveRecord
         product.price = Money.new(2500, :USD)
         expect(product.save).to be_truthy
         expect(product.price.cents).to eq(2500)
-        expect(product.price.currency_as_string).to eq("USD")
+        expect(product.price.currency.to_s).to eq("USD")
       end
 
       it "correctly assigns Fixnum objects to the attribute" do
         product.price = 25
         expect(product.save).to be_truthy
         expect(product.price.cents).to eq(2500)
-        expect(product.price.currency_as_string).to eq("USD")
+        expect(product.price.currency.to_s).to eq("USD")
 
         service.discount = 2
         expect(service.save).to be_truthy
         expect(service.discount.cents).to eq(200)
-        expect(service.discount.currency_as_string).to eq("EUR")
+        expect(service.discount.currency.to_s).to eq("EUR")
       end
 
       it "correctly assigns String objects to the attribute" do
         product.price = "25"
         expect(product.save).to be_truthy
         expect(product.price.cents).to eq(2500)
-        expect(product.price.currency_as_string).to eq("USD")
+        expect(product.price.currency.to_s).to eq("USD")
 
         service.discount = "2"
         expect(service.save).to be_truthy
         expect(service.discount.cents).to eq(200)
-        expect(service.discount.currency_as_string).to eq("EUR")
+        expect(service.discount.currency.to_s).to eq("EUR")
       end
 
       it "correctly assigns objects to a accessor attribute" do
@@ -532,57 +540,57 @@ if defined? ActiveRecord
         product.bonus = 25
         expect(product.save).to be_truthy
         expect(product.bonus.cents).to eq(2500)
-        expect(product.bonus.currency_as_string).to eq("GBP")
+        expect(product.bonus.currency.to_s).to eq("GBP")
 
         service.charge = 2
         expect(service.save).to be_truthy
         expect(service.charge.cents).to eq(200)
-        expect(service.charge.currency_as_string).to eq("USD")
+        expect(service.charge.currency.to_s).to eq("USD")
       end
 
       it "overrides default, model currency with the value of :with_currency in string assignments" do
         product.bonus = "25"
         expect(product.save).to be_truthy
         expect(product.bonus.cents).to eq(2500)
-        expect(product.bonus.currency_as_string).to eq("GBP")
+        expect(product.bonus.currency.to_s).to eq("GBP")
 
         service.charge = "2"
         expect(service.save).to be_truthy
         expect(service.charge.cents).to eq(200)
-        expect(service.charge.currency_as_string).to eq("USD")
+        expect(service.charge.currency.to_s).to eq("USD")
 
         product.lambda_price = "32"
         expect(product.save).to be_truthy
         expect(product.lambda_price.cents).to eq(3200)
-        expect(product.lambda_price.currency_as_string).to eq("CAD")
+        expect(product.lambda_price.currency.to_s).to eq("CAD")
       end
 
       it "overrides default currency with model currency, in fixnum assignments" do
         product.discount_value = 5
         expect(product.save).to be_truthy
         expect(product.discount_value.cents).to eq(500)
-        expect(product.discount_value.currency_as_string).to eq("USD")
+        expect(product.discount_value.currency.to_s).to eq("USD")
       end
 
       it "overrides default currency with model currency, in string assignments" do
         product.discount_value = "5"
         expect(product.save).to be_truthy
         expect(product.discount_value.cents).to eq(500)
-        expect(product.discount_value.currency_as_string).to eq("USD")
+        expect(product.discount_value.currency.to_s).to eq("USD")
       end
 
       it "falls back to default currency, in fixnum assignments" do
         service.discount = 5
         expect(service.save).to be_truthy
         expect(service.discount.cents).to eq(500)
-        expect(service.discount.currency_as_string).to eq("EUR")
+        expect(service.discount.currency.to_s).to eq("EUR")
       end
 
       it "falls back to default currency, in string assignments" do
         service.discount = "5"
         expect(service.save).to be_truthy
         expect(service.discount.cents).to eq(500)
-        expect(service.discount.currency_as_string).to eq("EUR")
+        expect(service.discount.currency.to_s).to eq("EUR")
       end
 
       it "sets field to nil, in nil assignments if allow_nil is set" do
@@ -616,13 +624,13 @@ if defined? ActiveRecord
       context "for column with model currency:" do
         it "has default currency if not specified" do
           product = Product.create(sale_price_amount: 1234)
-          product.sale_price.currency_as_string == 'USD'
+          product.sale_price.currency.to_s == 'USD'
         end
 
         it "is overridden by instance currency column" do
           product = Product.create(sale_price_amount: 1234,
                                    sale_price_currency_code: 'CAD')
-          expect(product.sale_price.currency_as_string).to eq('CAD')
+          expect(product.sale_price.currency.to_s).to eq('CAD')
         end
 
         it 'can change currency of custom column' do
@@ -634,14 +642,14 @@ if defined? ActiveRecord
             sale_price_currency_code: 'USD'
           )
 
-          expect(product.sale_price.currency_as_string).to eq('USD')
+          expect(product.sale_price.currency.to_s).to eq('USD')
 
           product.sale_price = Money.new 456, 'CAD'
           product.save
           product.reload
 
-          expect(product.sale_price.currency_as_string).to eq('CAD')
-          expect(product.discount_value.currency_as_string).to eq('USD')
+          expect(product.sale_price.currency.to_s).to eq('CAD')
+          expect(product.discount_value.currency.to_s).to eq('USD')
         end
       end
 
@@ -705,12 +713,12 @@ if defined? ActiveRecord
           transaction.amount = Money.new(2500, :eur)
           expect(transaction.save).to be_truthy
           expect(transaction.amount.cents).to eq(Money.new(2500, :eur).cents)
-          expect(transaction.amount.currency_as_string).to eq("EUR")
+          expect(transaction.amount.currency.to_s).to eq("EUR")
         end
 
         it "uses default currency if a non Money object is assigned to the attribute" do
           transaction.amount = 234
-          expect(transaction.amount.currency_as_string).to eq("USD")
+          expect(transaction.amount.currency.to_s).to eq("USD")
         end
 
         it "constructs the money object from the mapped method value" do
@@ -738,6 +746,8 @@ if defined? ActiveRecord
           end
         end
 
+        # TODO: these specs should mock locale_backend with expected values
+        #       instead of manipulating it directly
         context "and an Italian locale" do
           around(:each) do |example|
             I18n.with_locale(:it) do
@@ -745,7 +755,7 @@ if defined? ActiveRecord
             end
           end
 
-          context "when use_i18n is true" do
+          context "when using :i18n locale backend" do
             it "validates with the locale's decimal mark" do
               transaction.amount = "123,45"
               expect(transaction.valid?).to be_truthy
@@ -767,13 +777,13 @@ if defined? ActiveRecord
             end
           end
 
-          context "when use_i18n is false" do
+          context "when using :currency locale backend" do
             around(:each) do |example|
               begin
-                Money.use_i18n = false
+                Money.locale_backend = :currency
                 example.run
               ensure
-                Money.use_i18n = true
+                Money.locale_backend = :i18n
               end
             end
 

data/spec/configuration_spec.rb

@@ -18,8 +18,8 @@ describe "configuration" do
     end
 
     it "sets no_cents_if_whole value for formatted output globally" do
-      # Disable the usage of I18n (to avoid default symbols for :en)
-      Money.use_i18n = false
+      # Enable formatting to depend only on currency (to avoid default symbols for :en)
+      Money.locale_backend = :currency
 
       value = Money.new(12345600, "EUR")
       mark = Money::Currency.find(:eur).decimal_mark
@@ -35,7 +35,7 @@ describe "configuration" do
 
       # Reset global settings
       MoneyRails.no_cents_if_whole = nil
-      Money.use_i18n = true
+      Money.locale_backend = :i18n
     end
 
     it "sets symbol for formatted output globally" do

data/spec/dummy/db/schema.rb

@@ -1,60 +1,59 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151026220420) do
+ActiveRecord::Schema.define(version: 2015_10_26_220420) do
 
   create_table "dummy_products", force: :cascade do |t|
-    t.string   "currency"
-    t.integer  "price_cents"
+    t.string "currency"
+    t.integer "price_cents"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "products", force: :cascade do |t|
-    t.integer  "price_cents"
-    t.integer  "discount"
+    t.integer "price_cents"
+    t.integer "discount"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "bonus_cents"
-    t.integer  "optional_price_cents"
-    t.integer  "sale_price_amount",             default: 0, null: false
-    t.string   "sale_price_currency_code"
-    t.integer  "price_in_a_range_cents"
-    t.integer  "validates_method_amount_cents"
-    t.integer  "aliased_cents"
-    t.integer  "delivery_fee_cents"
-    t.integer  "restock_fee_cents"
-    t.integer  "reduced_price_cents"
-    t.string   "reduced_price_currency"
-    t.integer  "special_price_cents"
-    t.integer  "lambda_price_cents"
-    t.string   "skip_validation_price_cents"
+    t.integer "bonus_cents"
+    t.integer "optional_price_cents"
+    t.integer "sale_price_amount", default: 0, null: false
+    t.string "sale_price_currency_code"
+    t.integer "price_in_a_range_cents"
+    t.integer "validates_method_amount_cents"
+    t.integer "aliased_cents"
+    t.integer "delivery_fee_cents"
+    t.integer "restock_fee_cents"
+    t.integer "reduced_price_cents"
+    t.string "reduced_price_currency"
+    t.integer "special_price_cents"
+    t.integer "lambda_price_cents"
+    t.string "skip_validation_price_cents"
   end
 
   create_table "services", force: :cascade do |t|
-    t.integer  "charge_cents"
-    t.integer  "discount_cents"
+    t.integer "charge_cents"
+    t.integer "discount_cents"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "transactions", force: :cascade do |t|
-    t.integer  "amount_cents"
-    t.integer  "tax_cents"
-    t.string   "currency"
+    t.integer "amount_cents"
+    t.integer "tax_cents"
+    t.string "currency"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "optional_amount_cents"
+    t.integer "optional_amount_cents"
   end
 
 end