shopify-money 1.0.2.pre → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23562c524ba9f0d8219d01779505a75309d8825ed8f8839f1efdd71fbf5a1e89
-  data.tar.gz: ca1b6ea90e7a556970d135bbebc74c9cf6eb417cd475607ef58923751e2969b3
+  metadata.gz: ae2953d70e905d5f2425b6c334f5e8a920ec749a0e82341739b90dee7c446254
+  data.tar.gz: 42fd32e212f52fb97c366cc39fe8bf462fff7be09ebb54690a6c7a3d80e5c08d
 SHA512:
-  metadata.gz: 81f2eb5e04d1cf082cf3eaadd5d609d4abcdef1841d1dde9b2eee68c0b8e570b7c0c72dd0a2a05c7213b0c611a267a2b6fbca044d2a86711765aa91f8e2ea763
-  data.tar.gz: cf7864860eb1fab370902861200b23150d08b1d135f614896a9c32fe20ea9e1edc7070563325c4a102a4af64c986c308892e13aefe9ad2590e4ac75d17f30a22
+  metadata.gz: 538545671ca1a88fd930f5148b0477a2558a6166764439a2a30ff3a7b34f7057fbf510c11f238d44cae13296c2eb81cfd07ffa510bfacae2b8780c49920404ed
+  data.tar.gz: 67944f9355d6b02e61c0e90f9e34cfd3ec7d3adea2f6dfbb45fc88241e38af516ad89726bd13b2e4a211e4adb26741f842904f92095e678808e1e25b871abfde

data/.github/workflows/cla.yml

@@ -0,0 +1,22 @@
+name: Contributor License Agreement (CLA)
+
+on:
+  pull_request_target:
+    types: [opened, synchronize]
+  issue_comment:
+    types: [created]
+
+jobs:
+  cla:
+    runs-on: ubuntu-latest
+    if: |
+      (github.event.issue.pull_request 
+        && !github.event.issue.pull_request.merged_at
+        && contains(github.event.comment.body, 'signed')
+      ) 
+      || (github.event.pull_request && !github.event.pull_request.merged)
+    steps:
+      - uses: Shopify/shopify-cla-action@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          cla-token: ${{ secrets.CLA_TOKEN }}

data/.github/workflows/tests.yml

@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['2.6', '2.7', '3.0']
+        ruby: ['2.6', '2.7', '3.0', '3.1']
 
     name: Ruby ${{ matrix.ruby }}
     steps:

data/README.md

@@ -115,8 +115,8 @@ Money::Currency.new("MGA").minor_units  # => 1
 ## Money column
 
 Since money internally uses BigDecimal it's logical to use a `decimal` column
-(or `money` for PostgreSQL) for your database. The `money_column` method can
-generate methods for use with ActiveRecord:
+for your database. The `money_column` method can generate methods for use with
+ActiveRecord:
 
 ```ruby
 create_table :orders do |t|

data/lib/money/money.rb

@@ -124,14 +124,14 @@ class Money
 
   def +(other)
     arithmetic(other) do |money|
-      return self if money.value == 0 && !no_currency?
+      return self if money.value.zero? && !no_currency?
       Money.new(value + money.value, calculated_currency(money.currency))
     end
   end
 
   def -(other)
     arithmetic(other) do |money|
-      return self if money.value == 0 && !no_currency?
+      return self if money.value.zero? && !no_currency?
       Money.new(value - money.value, calculated_currency(money.currency))
     end
   end
@@ -232,9 +232,12 @@ class Money
     if units == 0
       sprintf("%d", rounded_value)
     else
-      sign = rounded_value < 0 ? '-' : ''
-      rounded_value = rounded_value.abs
-      sprintf("%s%d.%0#{units}d", sign, rounded_value.truncate, rounded_value.frac * (10 ** units))
+      formatted = rounded_value.to_s("F")
+      decimal_digits = formatted.size - formatted.index(".") - 1
+      (units - decimal_digits).times do
+        formatted << '0'
+      end
+      formatted
     end
   end
   alias_method :to_s, :to_fs

data/lib/money/rails/job_argument_serializer.rb

@@ -4,7 +4,7 @@ class Money
   module Rails
     class JobArgumentSerializer < ::ActiveJob::Serializers::ObjectSerializer
       def serialize(money)
-        super("value" => money.value, "currency" => money.currency.iso_code)
+        super("value" => money.value.to_s("F"), "currency" => money.currency.iso_code)
       end
 
       def deserialize(hash)

data/lib/money/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 class Money
-  VERSION = "1.0.2.pre"
+  VERSION = "1.1.1"
 end

data/spec/currency_spec.rb

@@ -80,7 +80,7 @@ RSpec.describe "Currency" do
   describe "#hash" do
     specify "equal currencies from different loaders have the same hash" do
       currency_1 = Money::Currency.find('USD')
-      currency_2 = YAML.load(Money::Currency.find('USD').to_yaml)
+      currency_2 = yaml_load(Money::Currency.find('USD').to_yaml)
 
       expect(currency_1.eql?(currency_2)).to eq(true)
       expect(currency_1.hash).to eq(currency_2.hash)

data/spec/money_spec.rb

@@ -846,17 +846,17 @@ RSpec.describe "Money" do
 
   describe "YAML deserialization" do
     it "accepts values with currencies" do
-      money = YAML.load("--- !ruby/object:Money\nvalue: '750.0'\ncurrency: USD\n")
+      money = yaml_load("--- !ruby/object:Money\nvalue: '750.0'\ncurrency: USD\n")
       expect(money).to eq(Money.new(750, 'usd'))
     end
 
     it "accepts values with null currencies" do
-      money = YAML.load("--- !ruby/object:Money\nvalue: '750.0'\ncurrency: XXX\n")
+      money = yaml_load("--- !ruby/object:Money\nvalue: '750.0'\ncurrency: XXX\n")
       expect(money).to eq(Money.new(750))
     end
 
     it "accepts serialized NullCurrency objects" do
-      money = YAML.load(<<~EOS)
+      money = yaml_load(<<~EOS)
         ---
         !ruby/object:Money
           currency: !ruby/object:Money::NullCurrency
@@ -879,7 +879,7 @@ RSpec.describe "Money" do
     end
 
     it "accepts BigDecimal values" do
-      money = YAML.load(<<~EOS)
+      money = yaml_load(<<~EOS)
         ---
         !ruby/object:Money
           value: !ruby/object:BigDecimal 18:0.75E3
@@ -890,7 +890,7 @@ RSpec.describe "Money" do
     end
 
     it "accepts old float values..." do
-      money = YAML.load(<<~EOS)
+      money = yaml_load(<<~EOS)
         ---
         !ruby/object:Money
           value: 750.00

data/spec/rails/job_argument_serializer_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe Money::Rails::JobArgumentSerializer do
     serialized_job = job.serialize
     serialized_value = serialized_job["arguments"][0]["value"]
     expect(serialized_value["_aj_serialized"]).to eq("Money::Rails::JobArgumentSerializer")
-    expect(serialized_value["value"]).to eq(BigDecimal("10.21"))
+    expect(serialized_value["value"]).to eq("10.21")
     expect(serialized_value["currency"]).to eq("BRL")
 
     job2 = MoneyTestJob.deserialize(serialized_job)

data/spec/spec_helper.rb

@@ -83,3 +83,9 @@ def configure(default_currency: nil, legacy_json_format: nil, legacy_deprecation
 ensure
   Money.config = old_config
 end
+
+def yaml_load(yaml)
+  return YAML.load(yaml) if Psych::VERSION < '4.0'
+
+  YAML.safe_load(yaml, permitted_classes: [BigDecimal, Money, Money::Currency, Money::NullCurrency])
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-money
 version: !ruby/object:Gem::Version
-  version: 1.0.2.pre
+  version: 1.1.1
 platform: ruby
 authors:
 - Shopify Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-17 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,7 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".document"
-- ".github/probots.yml"
+- ".github/workflows/cla.yml"
 - ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rspec"
@@ -179,11 +179,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.20
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Shopify's money gem

data/.github/probots.yml

@@ -1,2 +0,0 @@
-enabled:
-  - cla