From cd0698f782f5aced88edbdf37886f2f8bce4111b Mon Sep 17 00:00:00 2001
From: Aidan Cornelius-Bell <aidan@cornelius-bell.com>
Date: Sat, 11 Jan 2025 18:53:55 +1030
Subject: [PATCH] Fixed rubocop issues
---
app/controllers/job_runner_controller.rb | 4 ++--
app/controllers/pubview_controller.rb | 1 -
app/controllers/subscriptions_controller.rb | 14 +++++++-------
.../users/registrations_controller.rb | 2 +-
app/services/buttondown_service.rb | 19 +++++++------------
5 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/app/controllers/job_runner_controller.rb b/app/controllers/job_runner_controller.rb
index 1975f3a..22091df 100644
--- a/app/controllers/job_runner_controller.rb
+++ b/app/controllers/job_runner_controller.rb
@@ -10,9 +10,9 @@ class JobRunnerController < ApplicationController
user = params[:user_id].present? ? User.find(params[:user_id]) : nil
WeeklyBookmarksDigestJob.perform_later(user)
flash[:notice] = user ? "Weekly bookmarks digest job queued for #{user.email}" : "Weekly bookmarks digest job queued for all users"
- else
+ else
flash[:alert] = "Invalid job selection"
- end
+ end
redirect_to job_runner_path
end
end
diff --git a/app/controllers/pubview_controller.rb b/app/controllers/pubview_controller.rb
index 64aabfa..5864bce 100644
--- a/app/controllers/pubview_controller.rb
+++ b/app/controllers/pubview_controller.rb
@@ -29,7 +29,6 @@ class PubviewController < ApplicationController
end
def join
-
end
def post
diff --git a/app/controllers/subscriptions_controller.rb b/app/controllers/subscriptions_controller.rb
index 6a0d466..9d1606d 100644
--- a/app/controllers/subscriptions_controller.rb
+++ b/app/controllers/subscriptions_controller.rb
@@ -52,11 +52,11 @@ class SubscriptionsController < ApplicationController
end
private
-
+
def create_portal_session
Stripe::BillingPortal::Session.create({
customer: current_user.stripe_customer_id,
- return_url: subscriptions_url,
+ return_url: subscriptions_url
})
end
@@ -83,13 +83,13 @@ class SubscriptionsController < ApplicationController
price = Stripe::Price.create({
unit_amount: amount_cents,
currency: 'aud',
- recurring: {interval: 'year'},
- product: product.id,
+ recurring: { interval: 'year' },
+ product: product.id
})
subscription = Stripe::Subscription.create({
customer: customer.id,
- items: [{price: price.id}],
+ items: [ { price: price.id } ]
})
current_user.update(subscription_status: 'active', buttondown_status: 'premium', support_type: 'ongoing')
else
@@ -99,11 +99,11 @@ class SubscriptionsController < ApplicationController
customer: customer.id,
payment_method_types: ['card'],
description: 'One-time donation',
- confirm: true,
+ confirm: true
})
current_user.update(subscription_status: 'one_time', buttondown_status: 'premium', support_type: 'one_time')
end
current_user.update(last_payment_at: Time.current, payment_amount: amount)
end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb
index afea816..703d4f1 100644
--- a/app/controllers/users/registrations_controller.rb
+++ b/app/controllers/users/registrations_controller.rb
@@ -50,7 +50,7 @@ class Users::RegistrationsController < Devise::RegistrationsController
recurring: { interval: 'year' },
product: 'prod_your_product_id_here' # Replace with your actual product ID
}
- }],
+ }]
})
user.update(subscription_status: 'active', buttondown_status: 'premium')
else
diff --git a/app/services/buttondown_service.rb b/app/services/buttondown_service.rb
index fa166ec..5eeab02 100644
--- a/app/services/buttondown_service.rb
+++ b/app/services/buttondown_service.rb
@@ -3,8 +3,8 @@ class ButtondownService
base_uri 'https://api.buttondown.email/v1'
def initialize
- @options = {
- headers: {
+ @options = {
+ headers: {
'Authorization' => "Token #{ENV['BUTTONDOWN_API_KEY']}",
'Content-Type' => 'application/json',
'Accept' => 'application/json'
@@ -44,10 +44,10 @@ class ButtondownService
user.update(buttondown_status: 'unactivated') if response.success?
response.success?
end
-
+
def resync_user(user)
response = self.class.get("/subscribers/#{user.email}", @options)
-
+
if response.success?
subscriber_data = JSON.parse(response.body)
update_user_from_buttondown(user, subscriber_data)
@@ -68,15 +68,10 @@ class ButtondownService
user.buttondown_status
end
end
-
+
def update_user_from_buttondown(user, subscriber_data)
user.update(
- buttondown_status: subscriber_data['type'],
- # Add any other fields you want to sync from Buttondown
- # For example:
- # last_buttondown_sync: Time.current,
- # buttondown_notes: subscriber_data['notes'],
- # etc.
+ buttondown_status: subscriber_data['type']
)
end
@@ -84,4 +79,4 @@ class ButtondownService
buttondown_data = JSON.parse(response.body)
user.update(buttondown_status: buttondown_data['type'])
end
-end
\ No newline at end of file
+end
--
2.39.5