money_attribute 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 306761efbc2f4f645f3e975ea830ff26901bc4ba5fac664346f5d7b5720050b8
-  data.tar.gz: 13dfc1b02f256f22ac1027700164ae57cee60bc77e1b233c28549b20988adaf7
+  metadata.gz: 47ae4d496ececb42ec6ab60e278b3b523518c057074ead9610d90395ae4c5cb7
+  data.tar.gz: 3f26f8a306a4d64cf982ca0d079cdf7738dc10b3acaed2ccb2036b67755b83e9
 SHA512:
-  metadata.gz: 3d39e999c298070baf49359ed226f9582defac099e4da3b342f3b367df81c658575e973095a0c8de4a19d8c7116af778d38160de6dbb263fd050a6a36bb3f0a9
-  data.tar.gz: 02c399705be0e9ac78c3f9dd1bbe9603055d6702df60a43e12e57fb0fa16ecfd4212d129a91294bdb4323f487030def2bc3fe52a7484552b93c4f2e81b6a71ed
+  metadata.gz: d2ef7b83fee1736f8944ebfcec5348b7c69a9b15f018b8080689c30dd4387aa2cfa10b4a459bf3ff36a117f2c22a7ce1e98909e2e6a5d3e56eada694c46b0080
+  data.tar.gz: 8e1da01132bb2309f0c5fc10ec00648a035c761e6ca3f3fa7ac43f3ed7e19d324831f8142d939225aab7c273308507c428a115509b911e2c1944cbfc12ae704e

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/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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money_attribute
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Gilson Ferraz