Make it so metadata is more ergonomic to include

* GoodJob and Sidekiq do not require an explicit keyword, they just accept any other arguments as metadata and set them that way

* Also make it so we always return a hash for metadata, and that hash is with_indifferent_access

Author: jpcamara

app/models/solid_queue/batch.rb

@@ -48,6 +48,10 @@ def on_finish=(value)
       super(serialize_callback(value))
     end
 
+    def metadata
+      (super || {}).with_indifferent_access
+    end
+
     def check_completion!
       return if finished? || !ready?
       return if batch_executions.limit(1).exists?
@@ -124,7 +128,7 @@ def start_batch
       end
 
     class << self
-      def enqueue(on_success: nil, on_failure: nil, on_finish: nil, metadata: nil, &block)
+      def enqueue(on_success: nil, on_failure: nil, on_finish: nil, **metadata, &block)
         new.tap do |batch|
           batch.assign_attributes(
             on_success: on_success,

test/integration/batch_lifecycle_test.rb

@@ -274,10 +274,10 @@ def perform
 
   test "batch interface" do
     batch = SolidQueue::Batch.enqueue(
-      metadata: { source: "test", priority: "high", user_id: 123 },
       on_finish: OnFinishJob,
       on_success: OnSuccessJob,
-      on_failure: OnFailureJob
+      on_failure: OnFailureJob,
+      source: "test", priority: "high", user_id: 123
     ) do
       AddToBufferJob.perform_later "hey"
     end

test/models/solid_queue/batch_test.rb

@@ -24,14 +24,14 @@ def perform(arg)
 
   test "batch will be completed on success" do
     batch = SolidQueue::Batch.enqueue(on_finish: BatchCompletionJob) { }
-    job_batch = SolidQueue::Batch.find_by(batch_id: batch.batch_id)
+    job_batch = SolidQueue::Batch.find_by(id: batch.id)
     assert_not_nil job_batch.on_finish
     assert_equal BatchCompletionJob.name, job_batch.on_finish["job_class"]
   end
 
   test "batch will be completed on finish" do
     batch = SolidQueue::Batch.enqueue(on_success: BatchCompletionJob) { }
-    job_batch = SolidQueue::Batch.find_by(batch_id: batch.batch_id)
+    job_batch = SolidQueue::Batch.find_by(id: batch.id)
     assert_not_nil job_batch.on_success
     assert_equal BatchCompletionJob.name, job_batch.on_success["job_class"]
   end
@@ -43,7 +43,7 @@ def perform(arg)
     end
 
     assert_equal 2, SolidQueue::Job.count
-    assert_equal [ batch.batch_id ] * 2, SolidQueue::Job.last(2).map(&:batch_id)
+    assert_equal [ batch.id ] * 2, SolidQueue::Job.last(2).map(&:batch_id)
   end
 
   test "batch id is present inside the block" do
@@ -68,7 +68,7 @@ def perform(arg)
 
   test "creates batch with metadata" do
     SolidQueue::Batch.enqueue(
-      metadata: { source: "test", priority: "high", user_id: 123 }
+      source: "test", priority: "high", user_id: 123
     ) do
       NiceJob.perform_later("world")
     end