usage_credits 0.1.1 → 0.2.0

data/lib/usage_credits/models/transaction.rb

@@ -26,6 +26,7 @@ module UsageCredits
       "subscription_credits",           # Generic subscription credits
       "subscription_trial",             # Trial period credits
       "subscription_signup_bonus",      # Bonus for subscribing
+      "subscription_upgrade",           # Plan upgrade credits
 
       # One-time purchases
       "credit_pack",                    # Generic credit pack

data/lib/usage_credits/models/wallet.rb

@@ -94,9 +94,10 @@ module UsageCredits
       raise InsufficientCredits, "Insufficient credits (#{credits} < #{cost})" unless has_enough_credits_to?(operation_name, **params)
 
       # Create audit trail
-      audit_data = operation.to_audit_hash(params)
+      # Stringify keys from audit_data to avoid duplicate key warnings in JSON
+      audit_data = operation.to_audit_hash(params).deep_stringify_keys
       deduct_params = {
-        metadata: audit_data.merge(operation.metadata).merge(
+        metadata: audit_data.merge(operation.metadata.deep_stringify_keys).merge(
           "executed_at" => Time.current,
           "gem_version" => UsageCredits::VERSION
         ),
@@ -126,7 +127,7 @@ module UsageCredits
     def give_credits(amount, reason: nil, expires_at: nil)
       raise ArgumentError, "Amount is required" if amount.nil?
       raise ArgumentError, "Cannot give negative credits" if amount.to_i.negative?
-      raise ArgumentError, "Credit amount must be a whole number" unless amount.to_i.integer?
+      raise ArgumentError, "Credit amount must be a whole number" unless amount == amount.to_i
       raise ArgumentError, "Expiration date must be a valid datetime" if expires_at && !expires_at.respond_to?(:to_datetime)
       raise ArgumentError, "Expiration date must be in the future" if expires_at && expires_at <= Time.current
 
@@ -155,8 +156,6 @@ module UsageCredits
         amount = amount.to_i
         raise ArgumentError, "Cannot add non-positive credits" if amount <= 0
 
-        previous_balance = credits
-
         transaction = transactions.create!(
           amount: amount,
           category: category,
@@ -170,7 +169,6 @@ module UsageCredits
         save!
 
         notify_balance_change(:credits_added, amount)
-        check_low_balance if !was_low_balance?(previous_balance) && low_balance?
 
         # To finish, let's return the transaction that has been just created so we can reference it in parts of the code
         # Useful, for example, to update the transaction's `fulfillment` reference in the subscription extension
@@ -186,15 +184,18 @@ module UsageCredits
     # positive transactions still have leftover.
     #
     # TODO: This code enumerates all unexpired positive transactions each time.
-    # That’s fine if usage scale is moderate. We're already indexing this.
+    # That's fine if usage scale is moderate. We're already indexing this.
     # If performance becomes a concern, we need to create a separate model to store the partial allocations efficiently.
     def deduct_credits(amount, metadata: {}, category: :credit_deducted)
-    with_lock do
+      with_lock do
       amount = amount.to_i
       raise InsufficientCredits, "Cannot deduct a non-positive amount" if amount <= 0
 
+      # Capture previous balance for low_balance check
+      previous_balance = credits
+
       # Figure out how many credits are available right now
-      available = credits
+      available = previous_balance
       if amount > available && !allow_negative_balance?
         raise InsufficientCredits, "Insufficient credits (#{available} < #{amount})"
       end
@@ -254,9 +255,13 @@ module UsageCredits
 
       # Fire your existing notifications
       notify_balance_change(:credits_deducted, amount)
+
+      # Check if we crossed the low balance threshold
+      check_low_balance if !was_low_balance?(previous_balance) && low_balance?
+
       spend_tx
+      end
     end
-  end
 
 
     private

data/lib/usage_credits/services/fulfillment_service.rb

@@ -100,7 +100,15 @@ module UsageCredits
       return nil unless @fulfillment.fulfillment_type == "subscription" && @plan
       return nil if @plan.rollover_enabled
 
-      @fulfillment.calculate_next_fulfillment + UsageCredits.configuration.fulfillment_grace_period
+      # Cap the grace period to the fulfillment period to prevent balance accumulation
+      # when fulfillment_period << grace_period (e.g., 15 seconds vs 5 minutes)
+      fulfillment_period = @plan.parsed_fulfillment_period
+      effective_grace = [
+        UsageCredits.configuration.fulfillment_grace_period,
+        fulfillment_period
+      ].min
+
+      @fulfillment.calculate_next_fulfillment + effective_grace
     end
 
     def fulfillment_category
@@ -112,15 +120,16 @@ module UsageCredits
     end
 
     def fulfillment_metadata
+      # Use string keys consistently to avoid duplicates after JSON serialization
       base_metadata = {
-        last_fulfilled_at: Time.current,
-        reason: "fulfillment_cycle",
-        fulfillment_period: @fulfillment.fulfillment_period,
-        fulfillment_id: @fulfillment.id
+        "last_fulfilled_at" => Time.current,
+        "reason" => "fulfillment_cycle",
+        "fulfillment_period" => @fulfillment.fulfillment_period,
+        "fulfillment_id" => @fulfillment.id
       }
 
       if @fulfillment.source.is_a?(Pay::Subscription)
-        base_metadata[:subscription_id] = @fulfillment.source.id
+        base_metadata["subscription_id"] = @fulfillment.source.id
       end
 
       @fulfillment.metadata.merge(base_metadata)

data/lib/usage_credits/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UsageCredits
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,15 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: usage_credits
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - rameerez
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-14 00:00:00.000000000 Z
+date: 2025-12-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: pay
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '8.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '8.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -25,19 +44,103 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.1'
 - !ruby/object:Gem::Dependency
-  name: pay
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.3'
-  type: :runtime
+        version: '2.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.3'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.35'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.35'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Add a usage-based credit system to your Rails app, easily. Let users
   buy and spend credits on usage-based actions. Refill Stripe subscriptions with credits,
   sell one-time booster credit packs, implement PAYG (pay-as-you-go) billing, award
@@ -51,10 +154,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rubocop.yml"
+- ".simplecov"
+- AGENTS.md
+- Appraisals
 - CHANGELOG.md
+- CLAUDE.md
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/pay_10.0.gemfile
+- gemfiles/pay_11.0.gemfile
+- gemfiles/pay_8.3.gemfile
+- gemfiles/pay_9.0.gemfile
 - lib/generators/usage_credits/install_generator.rb
 - lib/generators/usage_credits/templates/create_usage_credits_tables.rb.erb
 - lib/generators/usage_credits/templates/initializer.rb
@@ -93,7 +204,6 @@ metadata:
   source_code_uri: https://github.com/rameerez/usage_credits
   changelog_uri: https://github.com/rameerez/usage_credits/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,8 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Add usage-based credits to your Rails app.
 test_files: []