moonshot-rails 0.0.8 → 0.0.10

data/app/jobs/moonshot/convertkit/upsert_job.rb

@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+module Moonshot
+  module Convertkit
+    class UpsertJob < ApplicationJob
+      queue_as :default
+
+      delegate :convertkit_api_key, :convertkit_api_secret, :convertkit_form_id, to: 'MoonshotRails.configuration'
+
+      def perform user_object_or_klass, user_id: nil, first_name:, fields:
+        # return unless Rails.env.production?
+
+        user = if user_object_or_klass.is_a?(String)
+          klass = user_object_or_klass.constantize
+          klass.respond_to?(:with_deleted) ? klass.with_deleted.find(user_id) : klass.find(user_id)
+        else
+          user_object_or_klass
+        end
+
+        return unless user.respond_to?(:email) && user.email.present?
+
+        assert_required_config!
+
+        if existing_subscriber = find_by(email: user.email)
+          params = {
+            first_name: user.respond_to?(first_name) ? user.send(first_name) : nil
+          }
+          params.merge!(fields: user.send(fields)) if user.respond_to?(fields)
+
+          put_request "subscribers/#{existing_subscriber['id']}", params
+        else
+          params = {
+            email: user.email,
+            first_name: user.respond_to?(first_name) ? user.send(first_name) : nil
+          }
+          params.merge!(fields: user.send(fields)) if user.respond_to?(fields)
+
+          post_request "forms/#{convertkit_form_id}/subscribe", params
+        end
+      end
+
+      def find_by email:
+        response = get_request({ email_address: email })
+
+        return if response['total_subscribers'].zero?
+
+        if response['total_subscribers'] > 1
+          raise "Multiple (#{response['total_subscribers']}) subscribers found for email #{email}"
+        end
+
+        response['subscribers'].first
+      end
+
+      protected
+
+      def get_request query, path: 'subscribers'
+        params = query.merge({
+          api_key: convertkit_api_key,
+          api_secret: convertkit_api_secret
+        }).compact
+
+        url = "https://api.convertkit.com/v3/#{path}?#{params.to_query}"
+
+        Excon
+          .get(url)
+          .tap { |response| raise "Error #{response.status}: #{response.body}" unless response.status == 200 }
+          .then { |response| JSON.parse(response.body) }
+      end
+
+      def post_request path, body
+        json_body = body.merge(api_key: convertkit_api_key).to_json
+
+        Excon
+          .post("https://api.convertkit.com/v3/#{path}", body: json_body, headers: { 'Content-Type' => 'application/json' })
+          .tap { |response| raise "Error #{response.status}: #{response.body}" unless response.status == 200 }
+          .then { |response| JSON.parse(response.body) }
+      end
+
+      def put_request path, body
+        json_body = body.merge(api_secret: convertkit_api_secret).to_json
+
+        Excon
+          .put("https://api.convertkit.com/v3/#{path}", body: json_body, headers: { 'Content-Type' => 'application/json' })
+          .tap { |response| raise "Error #{response.status}: #{response.body}" unless response.status == 200 }
+          .then { |response| JSON.parse(response.body) }
+      end
+
+      def assert_required_config!
+        %i[convertkit_api_key convertkit_api_secret convertkit_form_id].each do |config|
+          raise MoonshotRails::MissingConfig, "#{config} is required" unless send(config).present?
+        end
+      end
+    end
+  end
+end

data/app/models/moonshot/model_helper.rb

@@ -5,14 +5,14 @@ module Moonshot
     extend ActiveSupport::Concern
 
     class_methods do
-      def convertkit_sync
-        after_save_commit :moonshot_convertkit_subscribe
+      def convertkit_sync first_name: :name, fields: :convertkit_fields
+        after_save_commit -> { moonshot_convertkit_upsert first_name: first_name, fields: fields }
         after_destroy_commit :moonshot_convertkit_unsubscribe
       end
     end
 
-    def moonshot_convertkit_subscribe
-      Moonshot::Convertkit::SubscribeJob.perform_later self
+    def moonshot_convertkit_upsert first_name: :name, fields: :convertkit_fields
+      Moonshot::Convertkit::UpsertJob.perform_later self.class.name, user_id: id, first_name: first_name, fields: fields
     end
 
     def moonshot_convertkit_unsubscribe

data/lib/moonshot-rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MoonshotRails
-  VERSION = '0.0.8'
+  VERSION = '0.0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moonshot-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - Catalin Ionescu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-03 00:00:00.000000000 Z
+date: 2024-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.0.0
 description:
 email:
 - catalin.ionescu282@gmail.com
@@ -70,8 +70,8 @@ files:
 - app/components/moonshot/app/jobs_to_be_done.rb
 - app/helpers/moonshot/moonshot_helper.rb
 - app/jobs/moonshot/application_job.rb
-- app/jobs/moonshot/convertkit/subscribe_job.rb
 - app/jobs/moonshot/convertkit/unsubscribe_job.rb
+- app/jobs/moonshot/convertkit/upsert_job.rb
 - app/models/moonshot/model_helper.rb
 - lib/generators/moonshot_rails_generator.rb
 - lib/moonshot-rails.rb

data/app/jobs/moonshot/convertkit/subscribe_job.rb

@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-module Moonshot
-  module Convertkit
-    class SubscribeJob < ApplicationJob
-      queue_as :default
-
-      delegate :convertkit_api_key, :convertkit_api_secret, :convertkit_form_id, to: 'MoonshotRails.configuration'
-
-      def perform user
-        return unless Rails.env.production?
-
-        assert_required_config!
-
-        existing_subscriber = find_by(email: user.email)
-        return existing_subscriber if existing_subscriber
-
-        params = {
-          email: user.email
-        }
-        params.merge!(fields: user.convertkit_fields) if user.respond_to?(:convertkit_fields)
-
-        post_request "forms/#{convertkit_form_id}/subscribe", params
-      end
-
-      def find_by email:
-        response = get_request({ email_address: email })
-
-        return if response['total_subscribers'].zero?
-
-        if response['total_subscribers'] > 1
-          raise "Multiple (#{response['total_subscribers']}) subscribers found for email #{email}"
-        end
-
-        response['subscribers'].first
-      end
-
-      protected
-
-      def get_request query, path: 'subscribers'
-        params = query.merge({
-          api_key: convertkit_api_key,
-          api_secret: convertkit_api_secret
-        }).compact
-
-        url = "https://api.convertkit.com/v3/#{path}?#{params.to_query}"
-
-        Excon
-          .get(url)
-          .then { |response| JSON.parse(response.body) }
-      end
-
-      def post_request path, body
-        json_body = body.merge(api_key: convertkit_api_key).to_json
-
-        Excon
-          .post("https://api.convertkit.com/v3/#{path}", body: json_body, headers: { 'Content-Type' => 'application/json' })
-          .then { |response| JSON.parse(response.body) }
-      end
-
-      def assert_required_config!
-        %i[convertkit_api_key convertkit_api_secret convertkit_form_id].each do |config|
-          raise MoonshotRails::MissingConfig, "#{config} is required" unless send(config).present?
-        end
-      end
-    end
-  end
-end