profitable 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f5435ab1dfe3d15abb2f92e6720a9ced3f3fb60474eaf85d407b85f8306632d
-  data.tar.gz: adc0a485926ff124fcd19bbf8c3d48eed10ac850fa459fcc9f84d78a40cddc9f
+  metadata.gz: f24a9849fbf5f3d6b87beaa3f0a4100d18a45ccb2b585e8e48b417d303759593
+  data.tar.gz: 7c8523a9547f30468ee7517a92af604aa66c7bcc269e6292200d8722f83c30ff
 SHA512:
-  metadata.gz: 1e8d5f63b3d11b0b146b9225da6f63b85353efff1f944cc59a1ad78107e75aab4daacbbed5c46f7896edbc401790fbf9001d9424ca0fdbbe70afb4c3b2d587a2
-  data.tar.gz: f429f34975e2c7c48e0c16579ec675059c13d82e9c1634ebdc3e29d3a327be9ceec9662957da5a2214bc1a642aa9a23fb33be4919100b553bd3ad4112583a8c9
+  metadata.gz: 4b79c94e7288c859f7419a8afe27c4352db1be8cff2c269b9d9d57348761a59e5f3a48cfe4b601496a1d4642b88fd5e2e5f349a1733f133488bb47a153b6a453
+  data.tar.gz: 216578eb9882a946fed3818c7d9301449727cd2b1bc64b282e90e1d8cf056b2f05ff801e49748ec46cf89a008771d796ec65daf9ce99d7ed058da5fa0d284e01

data/.simplecov

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+# SimpleCov configuration file (auto-loaded before test suite)
+# This keeps test_helper.rb clean and follows best practices
+
+SimpleCov.start do
+  # Use SimpleFormatter for terminal-only output (no HTML generation)
+  formatter SimpleCov::Formatter::SimpleFormatter
+
+  # Track coverage for the lib directory (gem source code)
+  add_filter "/test/"
+
+  # Exclude Rails engine components that require integration testing
+  # These are tested via Appraisal with a full Rails app
+  add_filter "/lib/profitable/engine.rb"
+  add_filter "/app/"
+
+  # Exclude the main profitable.rb entry point - it loads the engine and
+  # defines the Profitable module. Our unit tests use a test-specific
+  # Profitable module (defined in test_helper.rb) to avoid Rails dependencies.
+  # The core logic is tested via the individual lib/profitable/*.rb files.
+  add_filter "/lib/profitable.rb"
+
+  # Track the lib directory (core gem logic)
+  track_files "lib/**/*.rb"
+
+  # Enable branch coverage for more detailed metrics
+  enable_coverage :branch
+
+  # Set minimum coverage threshold for the core calculation logic
+  # The Rails engine/controllers are tested separately via Appraisal
+  minimum_coverage line: 80, branch: 70
+
+  # Disambiguate parallel test runs
+  command_name "Job #{ENV['TEST_ENV_NUMBER']}" if ENV['TEST_ENV_NUMBER']
+end
+
+# Print coverage summary to terminal after tests complete
+SimpleCov.at_exit do
+  SimpleCov.result.format!
+  puts "\n" + "=" * 60
+  puts "COVERAGE SUMMARY"
+  puts "=" * 60
+  puts "Line Coverage:   #{SimpleCov.result.covered_percent.round(2)}%"
+  puts "Branch Coverage: #{SimpleCov.result.coverage_statistics[:branch]&.percent&.round(2) || 'N/A'}%"
+  puts "=" * 60
+end

data/AGENTS.md

@@ -0,0 +1,5 @@
+# AGENTS.md
+
+This file provides guidance to AI Agents (like OpenAI's Codex, Cursor Agent, Claude Code, etc) when working with code in this repository.
+
+Please go ahead and read the full context for this project at `.cursor/rules/0-overview.mdc` and `.cursor/rules/1-quality.mdc` now. Also read the README for a good overview of the project.

data/Appraisals

@@ -1,31 +1,50 @@
 # frozen_string_literal: true
 
+# Test minimum supported Rails version (with latest Pay)
+appraise "rails-7.2" do
+  gem "rails", "~> 7.2.0"
+  gem "pay", "~> 11.0"
+  gem "stripe", "~> 18.0"
+end
+
+# Test latest Rails version (with latest Pay)
+appraise "rails-8.1" do
+  gem "rails", "~> 8.1.0"
+  gem "pay", "~> 11.0"
+  gem "stripe", "~> 18.0"
+end
+
 # Test against Pay 7.x (original minimum supported version)
 appraise "pay-7.3" do
   gem "pay", "~> 7.3.0"
   gem "stripe", "~> 12.0"
+  gem "rails", "~> 8.1.0"
 end
 
 # Test against Pay 8.x
 appraise "pay-8.3" do
   gem "pay", "~> 8.3.0"
   gem "stripe", "~> 13.0"
+  gem "rails", "~> 8.1.0"
 end
 
 # Test against Pay 9.x
 appraise "pay-9.0" do
   gem "pay", "~> 9.0.0"
   gem "stripe", "~> 13.0"
+  gem "rails", "~> 8.1.0"
 end
 
 # Test against Pay 10.x (newly supported version with object column)
 appraise "pay-10.0" do
   gem "pay", "~> 10.0.0"
   gem "stripe", "~> 15.0"
+  gem "rails", "~> 8.1.0"
 end
 
 # Test against Pay 11.x (latest version as of 2025)
 appraise "pay-11.0" do
   gem "pay", "~> 11.0"
   gem "stripe", "~> 18.0"
+  gem "rails", "~> 8.1.0"
 end

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # `profitable`
 
+## [0.4.0] - 2026-02-10
+- Add monthly summary (12mo) and daily summary (30d) tables to dashboard
+- Add `period_data` method for efficient batch computation of period metrics
+- Fix `new_mrr` counting incomplete/unpaid subscriptions (now only counts active)
+- Fix `new_subscribers` not filtering out trialing/paused subscriptions
+- DRY up period methods (churn, churned_customers, new_mrr, etc.) via `_in_period` delegation
+- Optimize dashboard from ~176 to 38 queries (batch summary queries, precompute in controller)
+
 ## [0.3.0] - 2026-01-01
 - Add Pay v10+ support, comprehensive Minitest test suite, and 16 critical bugfixes re: wrong calculations
 

data/CLAUDE.md

@@ -0,0 +1,5 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+Please go ahead and read the full context for this project at `.cursor/rules/0-overview.mdc` and `.cursor/rules/1-quality.mdc` now. Also read the README for a good overview of the project.

data/README.md

@@ -1,8 +1,11 @@
-# 💸 `profitable` - SaaS metrics for your Rails app
+# 💸 `profitable` - MRR dashboard & SaaS metrics for your Rails app
 
-[![Gem Version](https://badge.fury.io/rb/profitable.svg)](https://badge.fury.io/rb/profitable)
+[![Gem Version](https://badge.fury.io/rb/profitable.svg)](https://badge.fury.io/rb/profitable) [![Build Status](https://github.com/rameerez/profitable/workflows/Tests/badge.svg)](https://github.com/rameerez/profitable/actions)
 
-Calculate the MRR, ARR, churn, LTV, ARPU, total revenue & estimated valuation of your `pay`-powered Rails SaaS app, and display them in a simple dashboard.
+> [!TIP]
+> **🚀 Ship your next Rails app 10x faster!** I've built **[RailsFast](https://railsfast.com/?ref=profitable)**, a production-ready Rails boilerplate template that comes with everything you need to launch a software business in days, not weeks. Go [check it out](https://railsfast.com/?ref=profitable)!
+
+`profitable` allows you to calculate the MRR, ARR, churn, LTV, ARPU, total revenue & estimated valuation of your `pay`-powered Rails SaaS app, and display them in a simple dashboard. It also provides handy methods you can use independently if you don't want the full dashboard.
 
 ![Profitable gem main dashboard](profitable.webp)
 
@@ -12,7 +15,7 @@ Calculate the MRR, ARR, churn, LTV, ARPU, total revenue & estimated valuation of
 
 Usually, you would look into your Stripe Dashboard or query the Stripe API to know your MRR / ARR / churn – but when you're using `pay`, you already have that data available and auto synced to your own database. So we can leverage it to make handy, composable ActiveRecord queries that you can reuse in any part of your Rails app (dashboards, internal pages, reports, status messages, etc.)
 
-Think doing something like: `"Your app is currently at $#{Profitable.mrr} MRR – Estimated to be worth $#{Profitable.valuation_estimate("3x")} at a 3x valuation"`
+Think doing something like: `"Current MRR: $#{Profitable.mrr}"` or `"Your app is worth $#{Profitable.valuation_estimate("3x")} at a 3x valuation"`
 
 ## Installation
 

data/app/controllers/profitable/dashboard_controller.rb

@@ -1,12 +1,24 @@
 module Profitable
   class DashboardController < BaseController
     def index
-    end
+      @mrr = Profitable.mrr
+      @mrr_growth_rate = Profitable.mrr_growth_rate
+      @total_customers = Profitable.total_customers
+      @all_time_revenue = Profitable.all_time_revenue
+      @estimated_valuation = Profitable.estimated_valuation
+      @average_revenue_per_customer = Profitable.average_revenue_per_customer
+      @lifetime_value = Profitable.lifetime_value
 
-    private
+      @show_milestone = @mrr_growth_rate > 0
+      @milestone_message = Profitable.time_to_next_mrr_milestone if @show_milestone
 
-    def test
-    end
+      @monthly_summary = Profitable.monthly_summary(months: 12)
+      @daily_summary = Profitable.daily_summary(days: 30)
 
+      @periods = [24.hours, 7.days, 30.days]
+      @period_data = @periods.each_with_object({}) do |period, hash|
+        hash[period] = Profitable.period_data(in_the_last: period)
+      end
+    end
   end
 end

data/app/views/profitable/dashboard/index.html.erb

@@ -1,4 +1,9 @@
 <style>
+  main h2.title {
+    font-size: 1.25rem;
+    margin: 64px 0 12px 0;
+  }
+
   .card-grid {
     display: flex;
     flex-wrap: wrap;
@@ -32,8 +37,8 @@
 
 <header>
   <h1>💸 <%= Rails.application.class.module_parent_name %></h1>
-  <% if Profitable.mrr_growth_rate > 0 %>
-    <p><%= Profitable.time_to_next_mrr_milestone %></p>
+  <% if @show_milestone %>
+    <p><%= @milestone_message %></p>
   <% end %>
 </header>
 
@@ -41,69 +46,197 @@
 
   <div class="card-grid">
     <div class="card">
-      <h2><%= Profitable.total_customers.to_readable %></h2>
+      <h2><%= @total_customers.to_readable %></h2>
       <p>total customers</p>
     </div>
     <div class="card">
-      <h2><%= Profitable.mrr.to_readable %></h2>
+      <h2><%= @mrr.to_readable %></h2>
       <p>MRR</p>
     </div>
     <div class="card">
-      <h2><%= Profitable.estimated_valuation.to_readable %></h2>
+      <h2><%= @estimated_valuation.to_readable %></h2>
       <p>Valuation at 3x ARR</p>
     </div>
     <div class="card">
-      <h2><%= Profitable.mrr_growth_rate.to_readable %></h2>
+      <h2><%= @mrr_growth_rate.to_readable %></h2>
       <p>MRR growth rate</p>
     </div>
     <div class="card">
-      <h2><%= Profitable.average_revenue_per_customer.to_readable %></h2>
+      <h2><%= @average_revenue_per_customer.to_readable %></h2>
       <p>ARPC</p>
     </div>
     <div class="card">
-      <h2><%= Profitable.lifetime_value.to_readable %></h2>
+      <h2><%= @lifetime_value.to_readable %></h2>
       <p>LTV</p>
     </div>
     <div class="card">
-      <h2><%= Profitable.all_time_revenue.to_readable %></h2>
+      <h2><%= @all_time_revenue.to_readable %></h2>
       <p>All-time revenue</p>
     </div>
   </div>
 
-  <% [24.hours, 7.days, 30.days].each do |period| %>
+  <h2 class="title">Monthly summary</h2>
+  <small>(last 12 months)</small>
+
+  <style>
+    .summary-table {
+      width: 100%;
+      border-collapse: collapse;
+      margin-top: 16px;
+      background-color: var(--bg);
+      border: 1px solid var(--border);
+      border-radius: var(--standard-border-radius);
+      overflow: hidden;
+    }
+
+    .summary-table th,
+    .summary-table td {
+      padding: 12px 16px;
+      text-align: left;
+      border-bottom: 1px solid var(--border);
+    }
+
+    .summary-table th {
+      font-weight: 600;
+      background-color: var(--bg);
+      position: sticky;
+      top: 0;
+    }
+
+    .summary-table tr:last-child td {
+      border-bottom: none;
+    }
+
+    .summary-table .positive {
+      color: #10b981;
+    }
+
+    .summary-table .negative {
+      color: #ef4444;
+    }
+
+    .summary-table .muted {
+      color: #6b7280;
+      font-size: 0.875em;
+    }
+
+    .summary-table tbody tr:hover {
+      background-color: rgba(0, 0, 0, 0.02);
+    }
+  </style>
+
+  <table class="summary-table">
+    <thead>
+      <tr>
+        <th>Month</th>
+        <th>New</th>
+        <th>Churned</th>
+        <th>Net</th>
+        <th>Churn %</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @monthly_summary.reverse.each do |month_data| %>
+        <tr>
+          <td><strong><%= month_data[:month_date].strftime('%b %Y') %></strong></td>
+          <td>
+            <span class="positive">+<%= month_data[:new_subscribers] %></span>
+            <span class="muted">(~<%= number_to_currency(month_data[:new_mrr] / 100.0, precision: 0) %>)</span>
+          </td>
+          <td>
+            <% if month_data[:churned_subscribers] > 0 %>
+              <span class="negative">-<%= month_data[:churned_subscribers] %></span>
+              <span class="muted">(~<%= number_to_currency(month_data[:churned_mrr] / 100.0, precision: 0) %>)</span>
+            <% else %>
+              <span>0</span>
+            <% end %>
+          </td>
+          <td>
+            <% if month_data[:net_subscribers] > 0 %>
+              <span class="positive">+<%= month_data[:net_subscribers] %></span>
+              <span class="muted">(~+<%= number_to_currency(month_data[:net_mrr] / 100.0, precision: 0) %>)</span>
+            <% elsif month_data[:net_subscribers] < 0 %>
+              <span class="negative"><%= month_data[:net_subscribers] %></span>
+              <span class="muted">(~<%= number_to_currency(month_data[:net_mrr] / 100.0, precision: 0) %>)</span>
+            <% else %>
+              <span>0</span>
+            <% end %>
+          </td>
+          <td><%= month_data[:churn_rate] %>%</td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+
+  <h2 class="title">Daily summary</h2>
+  <small>(last 30 days)</small>
+
+  <table class="summary-table">
+    <thead>
+      <tr>
+        <th>Date</th>
+        <th>New Subscribers</th>
+        <th>Churned</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @daily_summary.reverse.each do |day_data| %>
+        <tr>
+          <td><strong><%= day_data[:date].strftime('%b %-d, %Y') %></strong></td>
+          <td>
+            <% if day_data[:new_subscribers] > 0 %>
+              <span class="positive">+<%= day_data[:new_subscribers] %></span>
+            <% else %>
+              <span>0</span>
+            <% end %>
+          </td>
+          <td>
+            <% if day_data[:churned_subscribers] > 0 %>
+              <span class="negative">-<%= day_data[:churned_subscribers] %></span>
+            <% else %>
+              <span>0</span>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+
+  <% @periods.each do |period| %>
     <% period_short = period.inspect.gsub("days", "d").gsub("hours", "h").gsub(" ", "") %>
+    <% data = @period_data[period] %>
 
-    <h2>Last <%= period.inspect %></h2>
+    <h2 class="title">Last <%= period.inspect %></h2>
 
     <div class="card-grid">
       <div class="card">
-        <h2><%= Profitable.new_customers(in_the_last: period).to_readable %></h2>
+        <h2><%= data[:new_customers].to_readable %></h2>
         <p>new customers (<%= period_short %>)</p>
       </div>
       <div class="card">
-        <h2><%= Profitable.churned_customers(in_the_last: period).to_readable %></h2>
+        <h2><%= data[:churned_customers].to_readable %></h2>
         <p>churned customers (<%= period_short %>)</p>
       </div>
       <div class="card">
-        <h2><%= Profitable.churn(in_the_last: period).to_readable %></h2>
+        <h2><%= data[:churn].to_readable %></h2>
         <p>churn (<%= period_short %>)</p>
       </div>
 
       <div class="card">
-        <h2><%= Profitable.new_mrr(in_the_last: period).to_readable %></h2>
+        <h2><%= data[:new_mrr].to_readable %></h2>
         <p>new MRR (<%= period_short %>)</p>
       </div>
       <div class="card">
-        <h2><%= Profitable.churned_mrr(in_the_last: period).to_readable %></h2>
+        <h2><%= data[:churned_mrr].to_readable %></h2>
         <p>churned MRR (<%= period_short %>)</p>
       </div>
       <div class="card">
-        <h2><%= Profitable.mrr_growth(in_the_last: period).to_readable %></h2>
+        <h2><%= data[:mrr_growth].to_readable %></h2>
         <p>MRR growth (<%= period_short %>)</p>
       </div>
 
       <div class="card">
-        <h2><%= Profitable.revenue_in_period(in_the_last: period).to_readable %></h2>
+        <h2><%= data[:revenue].to_readable %></h2>
         <p>total revenue (<%= period_short %>)</p>
       </div>
 

data/gemfiles/pay_10.0.gemfile

@@ -5,18 +5,19 @@ source "https://rubygems.org"
 gem "rake", "~> 13.0"
 gem "pay", "~> 10.0.0"
 gem "stripe", "~> 15.0"
+gem "rails", "~> 8.1.0"
 
-group :development do
-  gem "appraisal", "~> 2.5"
-end
-
-group :test do
-  gem "minitest", "~> 5.0"
-  gem "minitest-reporters", "~> 1.6"
+group :development, :test do
+  gem "appraisal"
+  gem "minitest", "~> 6.0"
+  gem "minitest-mock"
+  gem "minitest-reporters"
+  gem "rack-test"
+  gem "simplecov", require: false
+  gem "sqlite3", ">= 2.1"
   gem "mocha", "~> 2.1"
   gem "activerecord", ">= 7.0"
   gem "actionview", ">= 7.0"
-  gem "sqlite3"
 end
 
 gemspec path: "../"

data/gemfiles/pay_11.0.gemfile

@@ -5,18 +5,19 @@ source "https://rubygems.org"
 gem "rake", "~> 13.0"
 gem "pay", "~> 11.0"
 gem "stripe", "~> 18.0"
+gem "rails", "~> 8.1.0"
 
-group :development do
-  gem "appraisal", "~> 2.5"
-end
-
-group :test do
-  gem "minitest", "~> 5.0"
-  gem "minitest-reporters", "~> 1.6"
+group :development, :test do
+  gem "appraisal"
+  gem "minitest", "~> 6.0"
+  gem "minitest-mock"
+  gem "minitest-reporters"
+  gem "rack-test"
+  gem "simplecov", require: false
+  gem "sqlite3", ">= 2.1"
   gem "mocha", "~> 2.1"
   gem "activerecord", ">= 7.0"
   gem "actionview", ">= 7.0"
-  gem "sqlite3"
 end
 
 gemspec path: "../"

data/gemfiles/pay_7.3.gemfile

@@ -5,18 +5,19 @@ source "https://rubygems.org"
 gem "rake", "~> 13.0"
 gem "pay", "~> 7.3.0"
 gem "stripe", "~> 12.0"
+gem "rails", "~> 8.1.0"
 
-group :development do
-  gem "appraisal", "~> 2.5"
-end
-
-group :test do
-  gem "minitest", "~> 5.0"
-  gem "minitest-reporters", "~> 1.6"
+group :development, :test do
+  gem "appraisal"
+  gem "minitest", "~> 6.0"
+  gem "minitest-mock"
+  gem "minitest-reporters"
+  gem "rack-test"
+  gem "simplecov", require: false
+  gem "sqlite3", ">= 2.1"
   gem "mocha", "~> 2.1"
   gem "activerecord", ">= 7.0"
   gem "actionview", ">= 7.0"
-  gem "sqlite3"
 end
 
 gemspec path: "../"

data/gemfiles/pay_8.3.gemfile

@@ -5,18 +5,19 @@ source "https://rubygems.org"
 gem "rake", "~> 13.0"
 gem "pay", "~> 8.3.0"
 gem "stripe", "~> 13.0"
+gem "rails", "~> 8.1.0"
 
-group :development do
-  gem "appraisal", "~> 2.5"
-end
-
-group :test do
-  gem "minitest", "~> 5.0"
-  gem "minitest-reporters", "~> 1.6"
+group :development, :test do
+  gem "appraisal"
+  gem "minitest", "~> 6.0"
+  gem "minitest-mock"
+  gem "minitest-reporters"
+  gem "rack-test"
+  gem "simplecov", require: false
+  gem "sqlite3", ">= 2.1"
   gem "mocha", "~> 2.1"
   gem "activerecord", ">= 7.0"
   gem "actionview", ">= 7.0"
-  gem "sqlite3"
 end
 
 gemspec path: "../"

data/gemfiles/pay_9.0.gemfile

@@ -5,18 +5,19 @@ source "https://rubygems.org"
 gem "rake", "~> 13.0"
 gem "pay", "~> 9.0.0"
 gem "stripe", "~> 13.0"
+gem "rails", "~> 8.1.0"
 
-group :development do
-  gem "appraisal", "~> 2.5"
-end
-
-group :test do
-  gem "minitest", "~> 5.0"
-  gem "minitest-reporters", "~> 1.6"
+group :development, :test do
+  gem "appraisal"
+  gem "minitest", "~> 6.0"
+  gem "minitest-mock"
+  gem "minitest-reporters"
+  gem "rack-test"
+  gem "simplecov", require: false
+  gem "sqlite3", ">= 2.1"
   gem "mocha", "~> 2.1"
   gem "activerecord", ">= 7.0"
   gem "actionview", ">= 7.0"
-  gem "sqlite3"
 end
 
 gemspec path: "../"

data/gemfiles/rails_7.2.gemfile

@@ -0,0 +1,23 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "~> 13.0"
+gem "rails", "~> 7.2.0"
+gem "pay", "~> 11.0"
+gem "stripe", "~> 18.0"
+
+group :development, :test do
+  gem "appraisal"
+  gem "minitest", "~> 6.0"
+  gem "minitest-mock"
+  gem "minitest-reporters"
+  gem "rack-test"
+  gem "simplecov", require: false
+  gem "sqlite3", ">= 2.1"
+  gem "mocha", "~> 2.1"
+  gem "activerecord", ">= 7.0"
+  gem "actionview", ">= 7.0"
+end
+
+gemspec path: "../"

data/gemfiles/rails_8.1.gemfile

@@ -0,0 +1,23 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "~> 13.0"
+gem "rails", "~> 8.1.0"
+gem "pay", "~> 11.0"
+gem "stripe", "~> 18.0"
+
+group :development, :test do
+  gem "appraisal"
+  gem "minitest", "~> 6.0"
+  gem "minitest-mock"
+  gem "minitest-reporters"
+  gem "rack-test"
+  gem "simplecov", require: false
+  gem "sqlite3", ">= 2.1"
+  gem "mocha", "~> 2.1"
+  gem "activerecord", ">= 7.0"
+  gem "actionview", ">= 7.0"
+end
+
+gemspec path: "../"

data/lib/profitable/mrr_calculator.rb

@@ -10,7 +10,7 @@ module Profitable
       total_mrr = 0
       subscriptions = Pay::Subscription
         .active
-        .where.not(status: ['trialing', 'paused'])
+        .where.not(status: Profitable::EXCLUDED_STATUSES)
         .includes(:customer)
         .select('pay_subscriptions.*, pay_customers.processor as customer_processor')
         .joins(:customer)

data/lib/profitable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Profitable
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/profitable.rb

@@ -13,6 +13,10 @@ require "active_support/core_ext/numeric/conversions"
 require "action_view"
 
 module Profitable
+  # Subscription status constants (at module level so MrrCalculator can reference them)
+  EXCLUDED_STATUSES = ['trialing', 'paused'].freeze
+  CHURNED_STATUSES  = ['canceled', 'ended'].freeze
+
   class << self
     include ActionView::Helpers::NumberHelper
     include Profitable::JsonHelpers
@@ -123,8 +127,28 @@ module Profitable
       "#{days_to_milestone} days left to $#{number_with_delimiter(next_milestone)} MRR (#{target_date.strftime('%b %d, %Y')})"
     end
 
+    def monthly_summary(months: 12)
+      calculate_monthly_summary(months)
+    end
+
+    def daily_summary(days: 30)
+      calculate_daily_summary(days)
+    end
+
+    def period_data(in_the_last: DEFAULT_PERIOD)
+      calculate_period_data(in_the_last)
+    end
+
     private
 
+    # Helper to load subscriptions with processor info from customer
+    def subscriptions_with_processor(scope = Pay::Subscription.all)
+      scope
+        .includes(:customer)
+        .select('pay_subscriptions.*, pay_customers.processor as customer_processor')
+        .joins(:customer)
+    end
+
     def paid_charges
       # Pay gem v10+ stores charge data in `object` column, older versions used `data`
       # We check both columns for backwards compatibility using database-agnostic JSON extraction
@@ -184,68 +208,19 @@ module Profitable
     end
 
     def calculate_churn(period = DEFAULT_PERIOD)
-      start_date = period.ago
-
-      # Count subscribers who were active AT the start of the period
-      # (not just currently active, but active at that historical point)
-      total_subscribers_start = Pay::Subscription
-        .where('pay_subscriptions.created_at < ?', start_date)
-        .where('pay_subscriptions.ends_at IS NULL OR pay_subscriptions.ends_at > ?', start_date)
-        .where.not(status: ['trialing', 'paused'])
-        .distinct
-        .count('customer_id')
-
-      churned = calculate_churned_customers(period)
-      return 0 if total_subscribers_start == 0
-      (churned.to_f / total_subscribers_start * 100).round(2)
-    end
-
-    def churned_subscriptions(period = DEFAULT_PERIOD)
-      Pay::Subscription
-        .includes(:customer)
-        .select('pay_subscriptions.*, pay_customers.processor as customer_processor')
-        .joins(:customer)
-        .where(status: ['canceled', 'ended'])
-        .where(ends_at: period.ago..Time.current)
+      calculate_churn_rate_for_period(period.ago, Time.current)
     end
 
     def calculate_churned_customers(period = DEFAULT_PERIOD)
-      churned_subscriptions(period).distinct.count('customer_id')
+      calculate_churned_subscribers_in_period(period.ago, Time.current)
     end
 
     def calculate_churned_mrr(period = DEFAULT_PERIOD)
-      start_date = period.ago
-      end_date = Time.current
-
-      # Churned MRR = full monthly rate of subscriptions that ended in the period
-      # MRR is a rate, not revenue, so we don't prorate
-      Pay::Subscription
-        .includes(:customer)
-        .select('pay_subscriptions.*, pay_customers.processor as customer_processor')
-        .joins(:customer)
-        .where(status: ['canceled', 'ended'])
-        .where(ends_at: start_date..end_date)
-        .sum do |subscription|
-          MrrCalculator.process_subscription(subscription)
-        end
+      calculate_churned_mrr_in_period(period.ago, Time.current)
     end
 
     def calculate_new_mrr(period = DEFAULT_PERIOD)
-      start_date = period.ago
-      end_date = Time.current
-
-      # New MRR = full monthly rate of subscriptions created in the period
-      # MRR is a rate, not revenue, so we don't prorate
-      Pay::Subscription
-        .active
-        .includes(:customer)
-        .select('pay_subscriptions.*, pay_customers.processor as customer_processor')
-        .joins(:customer)
-        .where(created_at: start_date..end_date)
-        .where.not(status: ['trialing', 'paused'])
-        .sum do |subscription|
-          MrrCalculator.process_subscription(subscription)
-        end
+      calculate_new_mrr_in_period(period.ago, Time.current)
     end
 
     def calculate_revenue_in_period(period)
@@ -298,12 +273,7 @@ module Profitable
     end
 
     def calculate_new_subscribers(period)
-      # Count customers who got a NEW subscription in the period
-      # (not customers created in the period, but subscriptions created in the period)
-      Pay::Customer.joins(:subscriptions)
-                   .where(pay_subscriptions: { created_at: period.ago..Time.current })
-                   .distinct
-                   .count
+      calculate_new_subscribers_in_period(period.ago, Time.current)
     end
 
     def calculate_average_revenue_per_customer
@@ -348,17 +318,213 @@ module Profitable
       # - Not ended before that date (ends_at is nil OR ends_at > date)
       # - Not paused at that date
       # - Not in trialing status (trials don't count as MRR)
+      subscriptions_with_processor(
+        Pay::Subscription
+          .where('pay_subscriptions.created_at <= ?', date)
+          .where('pay_subscriptions.ends_at IS NULL OR pay_subscriptions.ends_at > ?', date)
+          .where('pay_subscriptions.pause_starts_at IS NULL OR pay_subscriptions.pause_starts_at > ?', date)
+          .where.not(status: EXCLUDED_STATUSES)
+      ).sum do |subscription|
+        MrrCalculator.process_subscription(subscription)
+      end
+    end
+
+    def calculate_period_data(period)
+      period_start = period.ago
+      period_end = Time.current
+
+      new_customers_count = actual_customers.where(created_at: period_start..period_end).count
+      churned_count = calculate_churned_subscribers_in_period(period_start, period_end)
+      new_mrr_val = calculate_new_mrr_in_period(period_start, period_end)
+      churned_mrr_val = calculate_churned_mrr_in_period(period_start, period_end)
+      revenue_val = paid_charges.where(created_at: period_start..period_end).sum(:amount)
+
+      # Churn rate (reuses churned_count)
+      total_at_start = Pay::Subscription
+        .where('pay_subscriptions.created_at < ?', period_start)
+        .where('pay_subscriptions.ends_at IS NULL OR pay_subscriptions.ends_at > ?', period_start)
+        .where.not(status: EXCLUDED_STATUSES)
+        .distinct
+        .count('customer_id')
+      churn_rate = total_at_start > 0 ? (churned_count.to_f / total_at_start * 100).round(1) : 0
+
+      {
+        new_customers: NumericResult.new(new_customers_count, :integer),
+        churned_customers: NumericResult.new(churned_count, :integer),
+        churn: NumericResult.new(churn_rate, :percentage),
+        new_mrr: NumericResult.new(new_mrr_val),
+        churned_mrr: NumericResult.new(churned_mrr_val),
+        mrr_growth: NumericResult.new(new_mrr_val - churned_mrr_val),
+        revenue: NumericResult.new(revenue_val)
+      }
+    end
+
+    # Batched: loads all data in 5 queries then groups by month in Ruby
+    def calculate_monthly_summary(months_count)
+      overall_start = (months_count - 1).months.ago.beginning_of_month
+      overall_end = Time.current.end_of_month
+
+      # Bulk load all data for the full range
+      new_sub_records = Pay::Subscription
+        .where(created_at: overall_start..overall_end)
+        .where.not(status: EXCLUDED_STATUSES)
+        .pluck(:customer_id, :created_at)
+
+      churned_sub_records = Pay::Subscription
+        .where(status: CHURNED_STATUSES)
+        .where(ends_at: overall_start..overall_end)
+        .pluck(:customer_id, :ends_at)
+
+      new_mrr_subs = subscriptions_with_processor(
+        Pay::Subscription
+          .where(status: 'active')
+          .where(created_at: overall_start..overall_end)
+      ).to_a
+
+      churned_mrr_subs = subscriptions_with_processor(
+        Pay::Subscription
+          .where(status: CHURNED_STATUSES)
+          .where(ends_at: overall_start..overall_end)
+      ).to_a
+
+      churn_base_records = Pay::Subscription
+        .where('pay_subscriptions.created_at < ?', overall_end)
+        .where('pay_subscriptions.ends_at IS NULL OR pay_subscriptions.ends_at > ?', overall_start)
+        .where.not(status: EXCLUDED_STATUSES)
+        .pluck(:customer_id, :created_at, :ends_at)
+
+      # Group by month in Ruby
+      summary = []
+      (months_count - 1).downto(0) do |months_ago|
+        month_start = months_ago.months.ago.beginning_of_month
+        month_end = month_start.end_of_month
+
+        new_count = new_sub_records
+          .select { |_, created_at| created_at >= month_start && created_at <= month_end }
+          .map(&:first).uniq.count
+
+        churned_count = churned_sub_records
+          .select { |_, ends_at| ends_at >= month_start && ends_at <= month_end }
+          .map(&:first).uniq.count
+
+        new_mrr_amount = new_mrr_subs
+          .select { |s| s.created_at >= month_start && s.created_at <= month_end }
+          .sum { |s| MrrCalculator.process_subscription(s) }
+
+        churned_mrr_amount = churned_mrr_subs
+          .select { |s| s.ends_at >= month_start && s.ends_at <= month_end }
+          .sum { |s| MrrCalculator.process_subscription(s) }
+
+        total_at_start = churn_base_records
+          .select { |_, created_at, ends_at| created_at < month_start && (ends_at.nil? || ends_at > month_start) }
+          .map(&:first).uniq.count
+
+        churn_rate = total_at_start > 0 ? (churned_count.to_f / total_at_start * 100).round(1) : 0
+
+        summary << {
+          month: month_start.strftime('%Y-%m'),
+          month_date: month_start,
+          new_subscribers: new_count,
+          churned_subscribers: churned_count,
+          net_subscribers: new_count - churned_count,
+          new_mrr: new_mrr_amount,
+          churned_mrr: churned_mrr_amount,
+          net_mrr: new_mrr_amount - churned_mrr_amount,
+          churn_rate: churn_rate
+        }
+      end
+
+      summary
+    end
+
+    # Batched: loads all data in 2 queries then groups by day in Ruby
+    def calculate_daily_summary(days_count)
+      overall_start = (days_count - 1).days.ago.beginning_of_day
+      overall_end = Time.current.end_of_day
+
+      new_sub_records = Pay::Subscription
+        .where(created_at: overall_start..overall_end)
+        .where.not(status: EXCLUDED_STATUSES)
+        .pluck(:customer_id, :created_at)
+
+      churned_sub_records = Pay::Subscription
+        .where(status: CHURNED_STATUSES)
+        .where(ends_at: overall_start..overall_end)
+        .pluck(:customer_id, :ends_at)
+
+      summary = []
+      (days_count - 1).downto(0) do |days_ago|
+        day_start = days_ago.days.ago.beginning_of_day
+        day_end = day_start.end_of_day
+
+        new_count = new_sub_records
+          .select { |_, created_at| created_at >= day_start && created_at <= day_end }
+          .map(&:first).uniq.count
+
+        churned_count = churned_sub_records
+          .select { |_, ends_at| ends_at >= day_start && ends_at <= day_end }
+          .map(&:first).uniq.count
+
+        summary << {
+          date: day_start.to_date,
+          new_subscribers: new_count,
+          churned_subscribers: churned_count
+        }
+      end
+
+      summary
+    end
+
+    # Consolidated methods that work with any date range
+    def calculate_new_subscribers_in_period(period_start, period_end)
+      Pay::Customer.joins(:subscriptions)
+                   .where(pay_subscriptions: { created_at: period_start..period_end })
+                   .where.not(pay_subscriptions: { status: EXCLUDED_STATUSES })
+                   .distinct
+                   .count
+    end
+
+    def calculate_churned_subscribers_in_period(period_start, period_end)
       Pay::Subscription
-        .where('pay_subscriptions.created_at <= ?', date)
-        .where('pay_subscriptions.ends_at IS NULL OR pay_subscriptions.ends_at > ?', date)
-        .where('pay_subscriptions.pause_starts_at IS NULL OR pay_subscriptions.pause_starts_at > ?', date)
-        .where.not(status: ['trialing', 'paused'])
-        .includes(:customer)
-        .select('pay_subscriptions.*, pay_customers.processor as customer_processor')
-        .joins(:customer)
-        .sum do |subscription|
-          MrrCalculator.process_subscription(subscription)
-        end
+        .where(status: CHURNED_STATUSES)
+        .where(ends_at: period_start..period_end)
+        .distinct
+        .count('customer_id')
+    end
+
+    def calculate_new_mrr_in_period(period_start, period_end)
+      subscriptions_with_processor(
+        Pay::Subscription
+          .where(status: 'active')
+          .where(created_at: period_start..period_end)
+      ).sum do |subscription|
+        MrrCalculator.process_subscription(subscription)
+      end
+    end
+
+    def calculate_churned_mrr_in_period(period_start, period_end)
+      subscriptions_with_processor(
+        Pay::Subscription
+          .where(status: CHURNED_STATUSES)
+          .where(ends_at: period_start..period_end)
+      ).sum do |subscription|
+        MrrCalculator.process_subscription(subscription)
+      end
+    end
+
+    def calculate_churn_rate_for_period(period_start, period_end)
+      # Count subscribers who were active AT the start of the period
+      total_subscribers_start = Pay::Subscription
+        .where('pay_subscriptions.created_at < ?', period_start)
+        .where('pay_subscriptions.ends_at IS NULL OR pay_subscriptions.ends_at > ?', period_start)
+        .where.not(status: EXCLUDED_STATUSES)
+        .distinct
+        .count('customer_id')
+
+      churned = calculate_churned_subscribers_in_period(period_start, period_end)
+      return 0 if total_subscribers_start == 0
+
+      (churned.to_f / total_subscribers_start * 100).round(1)
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: profitable
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - rameerez
 bindir: exe
 cert_chain: []
-date: 2026-01-01 00:00:00.000000000 Z
+date: 2026-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pay
@@ -46,8 +46,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".simplecov"
+- AGENTS.md
 - Appraisals
 - CHANGELOG.md
+- CLAUDE.md
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -61,6 +64,8 @@ files:
 - gemfiles/pay_7.3.gemfile
 - gemfiles/pay_8.3.gemfile
 - gemfiles/pay_9.0.gemfile
+- gemfiles/rails_7.2.gemfile
+- gemfiles/rails_8.1.gemfile
 - lib/profitable.rb
 - lib/profitable/engine.rb
 - lib/profitable/error.rb