Merge branch 'main' of github.com:excid3/noticed

db/migrate/20231215190233_create_noticed_tables.rb

@@ -1,8 +1,9 @@
 class CreateNoticedTables < ActiveRecord::Migration[6.1]
  def change
- create_table :noticed_events do |t|
+ primary_key_type, foreign_key_type = primary_and_foreign_key_types
+ create_table :noticed_events, id: primary_key_type do |t|
  t.string :type
- t.belongs_to :record, polymorphic: true
+ t.belongs_to :record, polymorphic: true, type: foreign_key_type
  if t.respond_to?(:jsonb)
  t.jsonb :params
  else
@@ -12,14 +13,24 @@ def change
  t.timestamps
  end
 
- create_table :noticed_notifications do |t|
+ create_table :noticed_notifications, id: primary_key_type do |t|
  t.string :type
- t.belongs_to :event, null: false
- t.belongs_to :recipient, polymorphic: true, null: false
+ t.belongs_to :event, null: false, type: foreign_key_type
+ t.belongs_to :recipient, polymorphic: true, null: false, type: foreign_key_type
  t.datetime :read_at
  t.datetime :seen_at
 
  t.timestamps
  end
  end
+
+ private
+
+ def primary_and_foreign_key_types
+ config = Rails.configuration.generators
+ setting = config.options[config.orm][:primary_key_type]
+ primary_key_type = setting || :primary_key
+ foreign_key_type = setting || :bigint
+ [primary_key_type, foreign_key_type]
+ end
 end

lib/noticed/api_client.rb

@@ -28,7 +28,7 @@ def post_request(url, args = {})
  if (json = args.delete(:json))
  request.body = json.to_json
  elsif (form = args.delete(:form))
- request.set_form(form, "multipart/form-data")
+ request.form_data = form
  end
 
  logger.debug("POST #{url}")

test/bulk_delivery_methods/webhook_test.rb

@@ -20,7 +20,7 @@ class WebhookBulkDeliveryMethodTest < ActiveSupport::TestCase
  url: "https://example.org/webhook",
  form: {foo: :bar}
  )
- stub_request(:post, "https://example.org/webhook").with(headers: {"Content-Type" => /multipart\/form-data/})
+ stub_request(:post, "https://example.org/webhook").with(headers: {"Content-Type" => /application\/x-www-form-urlencoded/})
  @delivery_method.deliver
  end
 

test/delivery_methods/twilio_messaging_test.rb

@@ -20,7 +20,12 @@ class TwilioMessagingTest < ActiveSupport::TestCase
  stub_request(:post, "https://api.twilio.com/2010-04-01/Accounts/acct_1234/Messages.json").with(
  headers: {
  "Authorization" => "Basic YWNjdF8xMjM0OnRva2Vu",
- "Content-Type" => "multipart/form-data"
+ "Content-Type" => "application/x-www-form-urlencoded"
+ },
+ body: {
+ From: "+1234567890",
+ To: "+1234567890",
+ Body: "Hello world"
  }
  ).to_return(status: 200)
  @delivery_method.deliver

test/delivery_methods/webhook_test.rb

@@ -20,7 +20,7 @@ class WebhookDeliveryMethodTest < ActiveSupport::TestCase
  url: "https://example.org/webhook",
  form: {foo: :bar}
  )
- stub_request(:post, "https://example.org/webhook").with(headers: {"Content-Type" => /multipart\/form-data/})
+ stub_request(:post, "https://example.org/webhook").with(headers: {"Content-Type" => /application\/x-www-form-urlencoded/})
  @delivery_method.deliver
  end