money_attribute 0.12.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 306761efbc2f4f645f3e975ea830ff26901bc4ba5fac664346f5d7b5720050b8
-  data.tar.gz: 13dfc1b02f256f22ac1027700164ae57cee60bc77e1b233c28549b20988adaf7
+  metadata.gz: 6648e54fd55ca614b6b64674e0fe4135b6de228226056f1d39b30c9e577128c5
+  data.tar.gz: 3416fe702dac29b141eed67555a4d94d1dd104df755966c131ef9f00f735dcc4
 SHA512:
-  metadata.gz: 3d39e999c298070baf49359ed226f9582defac099e4da3b342f3b367df81c658575e973095a0c8de4a19d8c7116af778d38160de6dbb263fd050a6a36bb3f0a9
-  data.tar.gz: 02c399705be0e9ac78c3f9dd1bbe9603055d6702df60a43e12e57fb0fa16ecfd4212d129a91294bdb4323f487030def2bc3fe52a7484552b93c4f2e81b6a71ed
+  metadata.gz: 6051b71da3b44a030d7af3cc44f0c9c9958bd85bf4072f95a9c103e2fa6f6eed1ed773cec56ea9c8d6e4261893c7a1a41df1f886ccd4a2b1f9af228b99cbac85
+  data.tar.gz: e1157dd7957fd6b54649182a665aa464985bfce04a901d7e6570bf0f9e1d453fedb3407de3251a3dec79e72d2193f6e1bbcb412d3d5219a72f38244a62fb86c6

data/README.md

@@ -27,7 +27,7 @@ class CreateProducts < ActiveRecord::Migration[8.1]
   def change
     create_table :products do |t|
       t.string :name
-      t.money  :price
+      t.money_attribute :price
       t.timestamps
     end
   end
@@ -91,19 +91,19 @@ The generator creates `config/initializers/money_attribute.rb`.
 
 ## Migration helpers
 
-MoneyAttribute adds `add_money` / `remove_money` for existing tables and `t.money` / `t.remove_money` for `create_table` / `change_table` blocks.
+MoneyAttribute adds `add_money_attribute` / `remove_money_attribute` for existing tables and `t.money_attribute` / `t.remove_money_attribute` for `create_table` / `change_table` blocks.
 
-By default `t.money :price` creates a `decimal(16,4)` amount column and a `string` currency column — both nullable, no default. Pass `amount: { type: :integer }` to store subunits instead, or `currency: false` to skip the currency column entirely.
+By default `t.money_attribute :price` creates a `decimal(16,4)` amount column and a `string` currency column — both nullable, no default. Pass `amount: { type: :integer }` to store subunits instead, or `currency: false` to skip the currency column entirely.
 
 ```ruby
 class CreateProducts < ActiveRecord::Migration[8.1]
   def change
     create_table :products do |t|
       t.string :name
-      t.money  :price          # price (decimal) + price_currency (string)
-      t.money  :price_amount   # price_amount + price_currency (strips _amount suffix)
-      t.money  :fee, currency: false             # single column, no currency
-      t.money  :tax, amount: { type: :bigint }   # bigint amount + currency
+      t.money_attribute :price          # price (decimal) + price_currency (string)
+      t.money_attribute :price_amount   # price_amount + price_currency (strips _amount suffix)
+      t.money_attribute :fee, currency: false             # single column, no currency
+      t.money_attribute :tax, amount: { type: :bigint }   # bigint amount + currency
       t.timestamps
     end
   end
@@ -111,9 +111,9 @@ end
 
 class AddPriceToProducts < ActiveRecord::Migration[8.1]
   def change
-    add_money :products, :price                 # add price + price_currency
-    add_money :products, :discount, amount: { type: :integer }
-    remove_money :products, :obsolete_fee       # reversible in change
+    add_money_attribute :products, :price                 # add price + price_currency
+    add_money_attribute :products, :discount, amount: { type: :integer }
+    remove_money_attribute :products, :obsolete_fee       # reversible in change
   end
 end
 ```
@@ -122,20 +122,20 @@ end
 
 | Migration call | Columns created | Model declaration |
 |---|---|---|
-| `t.money :price` | `price` decimal + `price_currency` string | `money_attribute :price` |
-| `t.money :price_amount` | `price_amount` decimal + `price_currency` string | `money_attribute :price` |
-| `t.money :price, currency: false` | `price` decimal | `money_attribute :price` |
-| `t.money :price, amount: { type: :integer }` | `price` integer + `price_currency` string | `money_attribute :price` |
-| `t.money :price, amount: { column: :a }, currency: { column: :c }` | `a` + `c` | `money_attribute :price, mapping: { amount: :a, currency: :c }` |
-| `t.money :price, currency: { limit: 3 }` | `price` decimal + `price_currency` string(3) | `money_attribute :price` |
-| `t.money :price, amount: { precision: 14, scale: 2, null: false }, currency: { limit: 3, default: 'USD' }` | `price` decimal(14,2) NOT NULL + `price_currency` string(3) DEFAULT 'USD' | `money_attribute :price` |
-| `t.remove_money :price` | Removes `price` + `price_currency` | `money_attribute :price` |
+| `t.money_attribute :price` | `price` decimal + `price_currency` string | `money_attribute :price` |
+| `t.money_attribute :price_amount` | `price_amount` decimal + `price_currency` string | `money_attribute :price` |
+| `t.money_attribute :price, currency: false` | `price` decimal | `money_attribute :price` |
+| `t.money_attribute :price, amount: { type: :integer }` | `price` integer + `price_currency` string | `money_attribute :price` |
+| `t.money_attribute :price, amount: { column: :a }, currency: { column: :c }` | `a` + `c` | `money_attribute :price, mapping: { amount: :a, currency: :c }` |
+| `t.money_attribute :price, currency: { limit: 3 }` | `price` decimal + `price_currency` string(3) | `money_attribute :price` |
+| `t.money_attribute :price, amount: { precision: 14, scale: 2, null: false }, currency: { limit: 3, default: 'USD' }` | `price` decimal(14,2) NOT NULL + `price_currency` string(3) DEFAULT 'USD' | `money_attribute :price` |
+| `t.remove_money_attribute :price` | Removes `price` + `price_currency` | `money_attribute :price` |
 
 Inside `change_table`:
 
 ```ruby
 change_table :products do |t|
-  t.remove_money :obsolete_fee   # removes obsolete_fee + obsolete_fee_currency
+  t.remove_money_attribute :obsolete_fee   # removes obsolete_fee + obsolete_fee_currency
 end
 ```
 
@@ -201,7 +201,7 @@ If none of those keys are set, `format` is used as a plain string (simple format
 
 | | Fixed currency (single column) | Multi-currency (amount + currency) |
 |---|---|---|
-| **Migration** | `t.money :price` (or `t.decimal :price`) | `t.money :price` (or `t.decimal :price_amount` + `t.string :price_currency`) |
+| **Migration** | `t.money_attribute :price` (or `t.decimal :price`) | `t.money_attribute :price` (or `t.decimal :price_amount` + `t.string :price_currency`) |
 | **Model** | `money_attribute :price, currency: 'USD'` | `money_attribute :price` |
 | **When to use** | Column always holds the same currency | Each row can hold a different currency |
 | **Column type** | `decimal`, `integer`, or `bigint` | `decimal`, `integer`, or `bigint` for amount; `string` for currency |

data/lib/money_attribute/converter.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module MoneyAttribute
+  class Converter
+    def initialize(currency = MoneyAttribute.default_currency)
+      @default_currency = currency
+    end
+
+    def parse(amount, currency = @default_currency)
+      case amount
+      when Mint::Money, NilClass then amount
+      when Numeric               then Mint::Money.from(amount, currency)
+      else                            Mint.parse(amount, currency)
+      end
+    end
+    alias call parse
+  end
+end

data/lib/money_attribute/form_builder_extension.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module MoneyAttribute
+  module FormBuilderExtension
+    def money_field(method, options = {})
+      money = object.public_send(method)
+      value = money ? money.to_s : nil
+
+      @template.text_field_tag(field_name(method), value,
+                               { id: field_id(method) }.merge(options))
+    end
+
+    def money_amount(method, options = {})
+      money_from_column = object.public_send(method)
+      value = money_from_column ? money_from_column.to_s : nil
+
+      @template.text_field_tag(field_name(method), value,
+                               { id: field_id(method) }.merge(options))
+    end
+  end
+end

data/lib/money_attribute/macro.rb

@@ -8,14 +8,14 @@ module MoneyAttribute
       def money_attribute(name, currency: MoneyAttribute.default_currency, mapping: nil)
         columns = attribute_names
         currency = ::Mint::Currency.resolve!(currency)
+        converter = Converter.new(currency)
         name = name.to_s
-        parser = Parser.new(currency)
         resolved_mapping = mapping || resolve_mapping(name, columns)
 
         if columns.include?(name) && resolved_mapping.nil?
-          define_single_column_money_attribute(name, currency, parser)
+          define_single_column_money_attribute(name, currency)
         else
-          define_composite_money_attribute(name, resolved_mapping, parser)
+          define_composite_money_attribute(name, resolved_mapping)
         end
       end
 
@@ -55,7 +55,22 @@ module MoneyAttribute
 
       def amount_extractor_for(column_name) = integer_column?(column_name) ? :subunits : :to_d
 
-      def money_constructor_for(amount_column) = integer_column?(amount_column) ? :from_subunits : :from
+      def money_constructor_for(amount_column)
+        default = MoneyAttribute.default_currency
+        if integer_column?(amount_column)
+          lambda { |amount, currency|
+            return nil if amount.nil?
+
+            Mint::Money.from_subunits(amount, currency.presence || default)
+          }
+        else
+          lambda { |amount, currency|
+            return nil if amount.nil?
+
+            Mint::Money.from(amount, currency.presence || default)
+          }
+        end
+      end
 
       def integer_column?(column_name)
         col = columns.find { |c| c.name == column_name }
@@ -64,20 +79,20 @@ module MoneyAttribute
 
       # --- Configuration (registers types, normalizers, composed_of) ---
 
-      def define_single_column_money_attribute(name, currency, parser)
+      def define_single_column_money_attribute(name, currency)
         column_type = integer_column?(name) ? ActiveRecord::Type::Integer.new : ActiveRecord::Type::Decimal.new
         attribute(name.to_sym, :money, currency:, column_type: column_type)
-        normalizes(name.to_sym, with: parser)
+        normalizes(name.to_sym, with: Converter.new(currency))
       end
 
-      def define_composite_money_attribute(name, mapping, parser)
+      def define_composite_money_attribute(name, mapping)
         aggregated = resolve_composite_for(name, mapping:)
 
         composed_of(name.to_sym, {
                       allow_nil: true,
                       class_name: 'Mint::Money',
                       constructor: money_constructor_for(aggregated[:amount]),
-                      converter: parser,
+                      converter: Converter.new(currency),
                       mapping: {
                         aggregated[:amount] => amount_extractor_for(aggregated[:amount]),
                         aggregated[:currency] => :currency_code

data/lib/money_attribute/migration_extensions/helper.rb

@@ -34,7 +34,11 @@ module MoneyAttribute
         end
 
         stripped = name.end_with?('_amount') ? name.sub(/_amount$/, '') : name
-        default_currency_col = "#{stripped}_currency"
+        default_currency_col = if name == 'amount' && !(options[:currency].is_a?(Hash) && options[:currency][:column])
+                                 'currency'
+                               else
+                                 "#{stripped}_currency"
+                               end
 
         if options.key?(:currency) && options[:currency].is_a?(Hash)
           currency_col = options[:currency][:column]&.to_s || default_currency_col

data/lib/money_attribute/migration_extensions/schema_statements.rb

@@ -7,14 +7,14 @@ module MoneyAttribute
     module SchemaStatements
       include Helper
 
-      def add_money(table_name, accessor, options = {})
+      def add_money_attribute(table_name, accessor, options = {})
         amount_col, currency_col, amount_opts, currency_opts = parse_money_args(accessor, options)
 
         add_column(table_name, amount_col, amount_opts[:type], **amount_opts.except(:type))
         add_column(table_name, currency_col, :string, **currency_opts) if currency_col
       end
 
-      def remove_money(table_name, accessor, options = {})
+      def remove_money_attribute(table_name, accessor, options = {})
         amount_col, currency_col, = parse_money_args(accessor, options)
 
         remove_column(table_name, amount_col)

data/lib/money_attribute/migration_extensions/table_definition.rb

@@ -7,14 +7,14 @@ module MoneyAttribute
     module TableDefinition
       include Helper
 
-      def money(accessor, options = {})
+      def money_attribute(accessor, options = {})
         amount_col, currency_col, amount_opts, currency_opts = parse_money_args(accessor, options)
 
         column(amount_col, amount_opts[:type], **amount_opts.except(:type))
         column(currency_col, :string, **currency_opts) if currency_col
       end
 
-      def remove_money(accessor, options = {})
+      def remove_money_attribute(accessor, options = {})
         amount_col, currency_col, = parse_money_args(accessor, options)
 
         remove_column(amount_col)

data/lib/money_attribute/railtie.rb

@@ -14,6 +14,8 @@ module MoneyAttribute
       ActiveRecord::ConnectionAdapters::TableDefinition.include(MoneyAttribute::MigrationExtensions::TableDefinition)
       ActiveRecord::ConnectionAdapters::Table.include(MoneyAttribute::MigrationExtensions::TableDefinition)
 
+      ActionView::Helpers::FormBuilder.include(MoneyAttribute::FormBuilderExtension)
+
       setup_locale_backend!
       register_custom_currencies!
     end

data/lib/money_attribute/type.rb

@@ -9,10 +9,17 @@ module MoneyAttribute
       super()
     end
 
+    def cast(value)
+      case value
+      when String then Mint::Money.parse(value, @currency)
+      else             super
+      end
+    end
+
     def assert_valid_value(value)
       case value
       when NilClass, Numeric, String then return
-      when ::Mint::Money
+      when Mint::Money
         return if value.currency == @currency
 
         message = "'#{value.inspect}' has different currency. Only #{@currency.code} allowed."

data/lib/money_attribute/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MoneyAttribute
-  VERSION = '0.12.0'
+  VERSION = '0.14.0'
 end

data/lib/money_attribute.rb

@@ -4,7 +4,8 @@ require 'minting'
 require 'money_attribute/core_ext'
 require 'money_attribute/configuration'
 require 'money_attribute/macro'
-require 'money_attribute/parser'
+require 'money_attribute/converter'
 require 'money_attribute/type'
+require 'money_attribute/form_builder_extension'
 require 'money_attribute/railtie'
 require 'money_attribute/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money_attribute
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Gilson Ferraz
@@ -51,12 +51,13 @@ files:
 - lib/generators/templates/money_attribute.rb
 - lib/money_attribute.rb
 - lib/money_attribute/configuration.rb
+- lib/money_attribute/converter.rb
 - lib/money_attribute/core_ext.rb
+- lib/money_attribute/form_builder_extension.rb
 - lib/money_attribute/macro.rb
 - lib/money_attribute/migration_extensions/helper.rb
 - lib/money_attribute/migration_extensions/schema_statements.rb
 - lib/money_attribute/migration_extensions/table_definition.rb
-- lib/money_attribute/parser.rb
 - lib/money_attribute/railtie.rb
 - lib/money_attribute/type.rb
 - lib/money_attribute/version.rb

data/lib/money_attribute/parser.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module MoneyAttribute
-  class Parser
-    def initialize(currency = MoneyAttribute.default_currency)
-      @default_currency = currency
-    end
-
-    def parse(amount, currency = @default_currency)
-      currency = ::Mint::Currency.resolve!(currency)
-      case amount
-      when NilClass    then nil
-      when Numeric     then ::Mint::Money.from(amount, currency)
-      when String      then ::Mint::Money.from(amount.to_r, currency)
-      when ::Mint::Money
-        return amount if amount.currency == currency
-
-        raise TypeError, "Cannot automatically convert #{amount} to #{currency.code}"
-      else
-        ::Mint.parse(amount, currency)
-      end
-    end
-    alias call parse
-  end
-end