pricing_plans 0.4.1 → 0.6.0

data/lib/pricing_plans/plan_resolver.rb

@@ -18,11 +18,11 @@ module PricingPlans
       def resolution_for(plan_owner)
         log_debug "[PricingPlans::PlanResolver] resolution_for called for #{plan_owner.class.name}##{plan_owner.respond_to?(:id) ? plan_owner.id : 'N/A'}"
 
-        assignment = assignment_for(plan_owner)
-        subscription = current_subscription_for(plan_owner)
+        assignment = pricing_plan_override_for(plan_owner)
+        subscription = current_subscription_for(plan_owner, preferred_plan_key: assignment&.plan_key)
 
         if assignment
-          log_debug "[PricingPlans::PlanResolver] Returning assignment-backed resolution: #{assignment.plan_key}"
+          log_debug "[PricingPlans::PlanResolver] Returning explicit-override resolution: #{assignment.plan_key}"
           return PlanResolution.new(
             plan: Registry.plan(assignment.plan_key),
             source: :assignment,
@@ -31,20 +31,8 @@ module PricingPlans
           )
         end
 
-        if subscription
-          processor_plan = subscription.processor_plan
-          log_debug "[PricingPlans::PlanResolver] resolution_for subscription processor_plan = #{processor_plan.inspect}"
-
-          if processor_plan && (plan = plan_from_processor_plan(processor_plan))
-            log_debug "[PricingPlans::PlanResolver] Returning subscription-backed resolution: #{plan.key}"
-            return PlanResolution.new(
-              plan: plan,
-              source: :subscription,
-              assignment: nil,
-              subscription: subscription
-            )
-          end
-        end
+        subscription_resolution = subscription_resolution_for(subscription)
+        return subscription_resolution if subscription_resolution
 
         default = Registry.default_plan
         log_debug "[PricingPlans::PlanResolver] Returning default-backed resolution: #{default ? default.key : 'nil'}"
@@ -56,12 +44,46 @@ module PricingPlans
         )
       end
 
+      def override_pricing_plan_for!(plan_owner, plan_key, source:)
+        Assignment.create_or_update_pricing_plan_override_for!(
+          plan_owner,
+          plan_key,
+          source: source
+        )
+      end
+
+      def clear_pricing_plan_override_for!(plan_owner)
+        Assignment.clear_pricing_plan_override_for!(plan_owner)
+      end
+
       def assign_plan_manually!(plan_owner, plan_key, source: "manual")
-        Assignment.assign_plan_to(plan_owner, plan_key, source: source)
+        LegacyPlanAssignmentApi.create_or_update_override!(
+          plan_owner,
+          plan_key,
+          source: source,
+          called_method_name: "PricingPlans::PlanResolver.assign_plan_manually!"
+        )
       end
 
       def remove_manual_assignment!(plan_owner)
-        Assignment.remove_assignment_for(plan_owner)
+        LegacyPlanAssignmentApi.clear_override!(
+          plan_owner,
+          called_method_name: "PricingPlans::PlanResolver.remove_manual_assignment!"
+        )
+      end
+
+      # Resolve a processor price identifier to the configured plan that owns
+      # it. Public so entitlement provenance can verify that an underlying
+      # subscription belongs to the same plan as a manual override.
+      def plan_for_processor_plan(processor_plan)
+        return nil if processor_plan.blank?
+
+        Registry.plans.values.find do |plan|
+          stripe_price = plan.stripe_price
+          next unless stripe_price
+
+          stripe_price.is_a?(Hash) ? stripe_price.value?(processor_plan) : stripe_price == processor_plan
+        end
       end
 
       private
@@ -71,25 +93,41 @@ module PricingPlans
         PaySupport.pay_available?
       end
 
-      def assignment_for(plan_owner)
-        log_debug "[PricingPlans::PlanResolver] Checking for manual assignment..."
+      def pricing_plan_override_for(plan_owner)
+        log_debug "[PricingPlans::PlanResolver] Checking for an explicit pricing plan override..."
         return nil unless plan_owner.respond_to?(:id)
 
         assignment = Assignment.find_by(
-          plan_owner_type: plan_owner.class.name,
-          plan_owner_id: plan_owner.id
+          PlanOwnerIdentity.conditions_for(plan_owner)
         )
 
         if assignment
-          log_debug "[PricingPlans::PlanResolver] Found manual assignment: #{assignment.plan_key}"
+          log_debug "[PricingPlans::PlanResolver] Found explicit pricing plan override: #{assignment.plan_key}"
         else
-          log_debug "[PricingPlans::PlanResolver] No manual assignment found"
+          log_debug "[PricingPlans::PlanResolver] No explicit pricing plan override found"
         end
 
         assignment
       end
 
-      def current_subscription_for(plan_owner)
+      def subscription_resolution_for(subscription)
+        return nil unless subscription.respond_to?(:processor_plan)
+
+        processor_plan = subscription.processor_plan
+        log_debug "[PricingPlans::PlanResolver] resolution_for subscription processor_plan = #{processor_plan.inspect}"
+        plan = plan_for_processor_plan(processor_plan)
+        return nil unless plan
+
+        log_debug "[PricingPlans::PlanResolver] Returning subscription-backed resolution: #{plan.key}"
+        PlanResolution.new(
+          plan: plan,
+          source: :subscription,
+          assignment: nil,
+          subscription: subscription
+        )
+      end
+
+      def current_subscription_for(plan_owner, preferred_plan_key: nil)
         return nil unless plan_owner
 
         pay_available = pay_available?
@@ -97,32 +135,30 @@ module PricingPlans
 
         return nil unless pay_available
 
-        # This intentionally delegates the active/trial/grace filtering contract
-        # to PaySupport.current_subscription_for so resolution_for can preserve
-        # the same billing context wherever it is called.
-        subscription = PaySupport.current_subscription_for(plan_owner)
+        subscriptions = PaySupport.current_subscriptions_for(plan_owner)
+        subscription = select_subscription(subscriptions, preferred_plan_key: preferred_plan_key)
         log_debug "[PricingPlans::PlanResolver] current_subscription_for returned: #{subscription ? subscription.class.name : 'nil'}"
         subscription
       end
 
-      def plan_from_processor_plan(processor_plan)
-        # Look through all plans to find one matching this Stripe price
-        Registry.plans.values.find do |plan|
-          stripe_price = plan.stripe_price
-          next unless stripe_price
+      def select_subscription(subscriptions, preferred_plan_key: nil)
+        subscriptions = Array(subscriptions)
 
-          case stripe_price
-          when String
-            stripe_price == processor_plan
-          when Hash
-            stripe_price[:id] == processor_plan ||
-            stripe_price[:month] == processor_plan ||
-            stripe_price[:year] == processor_plan ||
-            stripe_price.values.include?(processor_plan)
-          else
-            false
+        if preferred_plan_key
+          preferred = subscriptions.find do |subscription|
+            subscription_plan = plan_for_subscription(subscription)
+            subscription_plan&.key == preferred_plan_key.to_sym
           end
+          return preferred if preferred
         end
+
+        subscriptions.find { |subscription| plan_for_subscription(subscription) } || subscriptions.first
+      end
+
+      def plan_for_subscription(subscription)
+        return nil unless subscription.respond_to?(:processor_plan)
+
+        plan_for_processor_plan(subscription.processor_plan)
       end
     end
   end

data/lib/pricing_plans/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PricingPlans
-  VERSION = "0.4.1"
+  VERSION = "0.6.0"
 end

data/lib/pricing_plans.rb

@@ -1,12 +1,24 @@
 # frozen_string_literal: true
 
 require_relative "pricing_plans/version"
+require "active_support/deprecation"
 require_relative "pricing_plans/engine" if defined?(Rails::Engine)
 
 module PricingPlans
   class Error < StandardError; end
   class ConfigurationError < Error; end
   class PlanNotFoundError < Error; end
+
+  class LegacyDefaultPlanAssignmentError < Error
+    attr_reader :configured_default_plan_key, :legacy_assignment_method_name
+
+    def initialize(message, configured_default_plan_key:, legacy_assignment_method_name:)
+      super(message)
+      @configured_default_plan_key = configured_default_plan_key.to_sym
+      @legacy_assignment_method_name = legacy_assignment_method_name
+    end
+  end
+
   class FeatureDenied < Error
     attr_reader :feature_key, :plan_owner
 
@@ -25,6 +37,8 @@ module PricingPlans
   autoload :DSL, "pricing_plans/dsl"
   autoload :IntegerRefinements, "pricing_plans/integer_refinements"
   autoload :PlanResolver, "pricing_plans/plan_resolver"
+  autoload :PlanOwnerIdentity, "pricing_plans/plan_owner_identity"
+  autoload :LegacyPlanAssignmentApi, "pricing_plans/legacy_plan_assignment_api"
   autoload :PaySupport, "pricing_plans/pay_support"
   autoload :LimitChecker, "pricing_plans/limit_checker"
   autoload :LimitableRegistry, "pricing_plans/limit_checker"
@@ -48,6 +62,7 @@ module PricingPlans
   autoload :EnforcementState, "pricing_plans/models/enforcement_state"
   autoload :Usage, "pricing_plans/models/usage"
   autoload :Assignment, "pricing_plans/models/assignment"
+  autoload :FeatureGrant, "pricing_plans/models/feature_grant"
 
   class << self
     attr_writer :configuration
@@ -56,6 +71,13 @@ module PricingPlans
       @configuration ||= Configuration.new
     end
 
+    # A gem-specific deprecator lets host applications configure pricing_plans
+    # warnings independently and lets Rails include them in its deprecator
+    # collection.
+    def deprecator
+      @deprecator ||= ActiveSupport::Deprecation.new("0.7.0", "pricing_plans")
+    end
+
     def configure(&block)
       # Support both styles simultaneously inside the block:
       # - Bare DSL:   plan :free { ... }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pricing_plans
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.6.0
 platform: ruby
 authors:
 - rameerez
 bindir: exe
 cert_chain: []
-date: 2026-08-24 00:00:00.000000000 Z
+date: 2026-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -77,12 +77,16 @@ files:
 - docs/04-views.md
 - docs/05-semantic-pricing.md
 - docs/06-gem-compatibility.md
+- docs/07-repricing.md
 - docs/images/pricing_plans_ruby_rails_gem_pricing_table.jpg
 - docs/images/pricing_plans_ruby_rails_gem_usage_alert_upgrade.jpg
 - docs/images/pricing_plans_ruby_rails_gem_usage_meter.jpg
 - docs/images/product_creation_blocked.jpg
+- gemfiles/rails_7.1.gemfile
 - gemfiles/rails_7.2.gemfile
 - gemfiles/rails_8.1.gemfile
+- lib/generators/pricing_plans/grants/grants_generator.rb
+- lib/generators/pricing_plans/grants/templates/create_pricing_plans_feature_grants.rb.erb
 - lib/generators/pricing_plans/install/install_generator.rb
 - lib/generators/pricing_plans/install/templates/create_pricing_plans_tables.rb.erb
 - lib/generators/pricing_plans/install/templates/initializer.rb
@@ -98,16 +102,19 @@ files:
 - lib/pricing_plans/grace_manager.rb
 - lib/pricing_plans/integer_refinements.rb
 - lib/pricing_plans/job_guards.rb
+- lib/pricing_plans/legacy_plan_assignment_api.rb
 - lib/pricing_plans/limit_checker.rb
 - lib/pricing_plans/limitable.rb
 - lib/pricing_plans/models/assignment.rb
 - lib/pricing_plans/models/enforcement_state.rb
+- lib/pricing_plans/models/feature_grant.rb
 - lib/pricing_plans/models/usage.rb
 - lib/pricing_plans/overage_reporter.rb
 - lib/pricing_plans/pay_support.rb
 - lib/pricing_plans/period_calculator.rb
 - lib/pricing_plans/plan.rb
 - lib/pricing_plans/plan_owner.rb
+- lib/pricing_plans/plan_owner_identity.rb
 - lib/pricing_plans/plan_resolution.rb
 - lib/pricing_plans/plan_resolver.rb
 - lib/pricing_plans/price_components.rb
@@ -122,7 +129,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/rameerez/pricing_plans
-  source_code_uri: https://github.com/rameerez/pricing_plans
+  source_code_uri: https://github.com/rameerez/pricing_plans/tree/v0.6.0
   changelog_uri: https://github.com/rameerez/pricing_plans/blob/main/CHANGELOG.md
   bug_tracker_uri: https://github.com/rameerez/pricing_plans/issues
   documentation_uri: https://github.com/rameerez/pricing_plans#readme