coney_island 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a235d6cee30feec0ec69bcf5fcb2595cd5a3e8b
-  data.tar.gz: e01a71e0cd83955f1e017831cd58fd30051bcf44
+  metadata.gz: 3ebf4aa13f64b3592f798c759e5a28a5e17c84ab
+  data.tar.gz: b22573d2f20af9c3e212351632615e38e2b39aae
 SHA512:
-  metadata.gz: 2c940a0f31e66999046c685dc75512de76dcf154542a5c9370ecdfbc631880a9fb7b6733b39da76019930c3407d42951201016dbb1cbef57850b52ef3d7412f4
-  data.tar.gz: ff0eeb784f63e3e9c6745133b9e5d23afe46400f96078a005942fedffbfa0ff9812334ab3fd27348cce33aec1745028fc23687e4ebfa5d9b28f4d0401194ad86
+  metadata.gz: e31f447e805176a230c56540099b49dfc5f348287a9cfd957398cd8ebd7017debf9a5c605d650cbb6999d6acdd10d8b134642763d981f5febd30d9ef8da811ee
+  data.tar.gz: 767d5f3ef2575904e57cf6b53f2da1f48e6aba5e6e74efa5e476064ef4f601812ca017ac0dbbe533f4274306669699f67f3b28fde51abe98fcd66f09faf57e0f

data/lib/coney_island/submitter.rb

@@ -10,7 +10,7 @@ module ConeyIsland
     end
 
     def self.running_inline?
-      @run_inline
+      !!@run_inline
     end
 
     def self.tcp_connection_retries=(number)
@@ -149,53 +149,49 @@ module ConeyIsland
     end
 
     def self.publish_job(args, job_id = nil)
-      if (args.first.is_a? Class or args.first.is_a? Module) and (args[1].is_a? String or args[1].is_a? Symbol) and args.last.is_a? Hash and 3 == args.length
-        klass = args.shift
-        klass_name = klass.name
-
-        method_name = args.shift
-        job_args = args.shift
-        job_args ||= {}
-        job_args['klass'] = klass_name
-        job_args['method_name'] = method_name
-        job_args.stringify_keys!
-        # Extract non job args
-        delay      = job_args.delete 'delay'
-        work_queue = job_args.delete 'work_queue'
-        # Set class defaults if they exist
-        if klass.included_modules.include?(Performer)
-          delay      ||= klass.get_coney_settings[:delay]
-          work_queue ||= klass.get_coney_settings[:work_queue]
-        end
-        # Set our own defaults if we still don't have any
-        work_queue ||= ConeyIsland.default_settings[:work_queue]
-        delay      ||= ConeyIsland.default_settings[:delay]
-
-        if @run_inline
-          job = ConeyIsland::Job.new(nil, job_args)
-          job.handle_job
-        else
-          if delay && delay.to_i > 0
-            @delay_queue[work_queue] ||= {}
-            unless @delay_queue[work_queue][delay].present?
-              @delay_queue[work_queue][delay] ||= self.channel.queue(
-                work_queue + '_delayed_' + delay.to_s, auto_delete: false, durable: true,
-                arguments: {'x-dead-letter-exchange' => 'coney_island', 'x-message-ttl' => delay * 1000})
-              @delay_queue[work_queue][delay].bind(self.delay_exchange, routing_key: 'carousels.' + work_queue + ".#{delay}")
-            end
-            self.delay_exchange.publish(job_args.to_json, {routing_key: "carousels.#{work_queue}.#{delay}"}) do
-              RequestStore.store[:jobs].delete job_id if RequestStore.store[:jobs] && job_id.present?
-            end
-          else
-            self.exchange.publish(job_args.to_json, {routing_key: "carousels.#{work_queue}"}) do
-              RequestStore.store[:jobs].delete job_id if RequestStore.store[:jobs] && job_id.present?
-            end
-          end
-        end
-        true
+      # Map arguments
+      klass, method_name, job_args = *args
+      # Job args is optional
+      job_args ||= {}
+
+      # Check arguments
+      # Break if klass isn't a Class or a Module
+      raise ConeyIsland::JobArgumentError.new "Expected #{klass} to be a Class or Module" unless [Class, Module].any? {|k| klass.is_a?(k)}
+      # Break if method_name isn't a String or a Symbol
+      raise ConeyIsland::JobArgumentError.new "Expected #{method_name} to be a String or a Symbol" unless [String,Symbol].any? {|k| method_name.is_a?(k)}
+
+      # Set defaults
+      job_args['klass']       = klass.name
+      job_args['method_name'] = method_name
+      job_args.stringify_keys!
+
+      # Extract non job args
+      delay      = job_args.delete 'delay'
+      work_queue = job_args.delete 'work_queue'
+
+      # Set class defaults if they exist
+      if klass.included_modules.include?(Performer)
+        delay      ||= klass.get_coney_settings[:delay]
+        work_queue ||= klass.get_coney_settings[:work_queue]
+      end
+
+      # Set our own defaults if we still don't have any
+      work_queue ||= ConeyIsland.default_settings[:work_queue]
+      delay      ||= ConeyIsland.default_settings[:delay]
+
+      if self.running_inline?
+        # Just run this inline if we're not threaded
+        ConeyIsland::Job.new(nil, job_args).handle_job
+      elsif delay && delay.to_i > 0
+        # Is this delayed?
+        # Publish to the delay exchange
+        publish_to_delay_queue(job_id, job_args, work_queue, delay)
       else
-        raise ConeyIsland::JobArgumentError.new
+        # Publish to the normal exchange
+        publish_to_queue(self.exchange, job_id, job_args, work_queue)
       end
+
+      true
     end
 
     def self.cache_jobs
@@ -211,6 +207,30 @@ module ConeyIsland
       RequestStore.store[:cache_jobs] = false
     end
 
+    protected
+
+    # Publishes a job to a delayed queue exchange
+    def self.publish_to_delay_queue(job_id, job_args, work_queue, delay)
+      @delay_queue[work_queue] ||= {}
+
+      # TODO: Should this be in a different little method, say, bind_delay?
+      unless @delay_queue[work_queue][delay].present?
+        @delay_queue[work_queue][delay] ||= self.channel.queue(
+          work_queue + '_delayed_' + delay.to_s, auto_delete: false, durable: true,
+          arguments: {'x-dead-letter-exchange' => 'coney_island', 'x-message-ttl' => delay * 1000})
+        @delay_queue[work_queue][delay].bind(self.delay_exchange, routing_key: 'carousels.' + work_queue + ".#{delay}")
+      end
+
+      publish_to_queue(self.delay_exchange, job_id, job_args, "#{work_queue}.#{delay}")
+    end
+
+    # Publishes a job to a given exchange
+    def self.publish_to_queue(exchange, job_id, job_args, queue)
+      exchange.publish(job_args.to_json, {routing_key: "carousels.#{queue}"}) do
+        RequestStore.store[:jobs].delete job_id if RequestStore.store[:jobs] && job_id.present?
+      end
+    end
+
   end
 end
 

data/lib/coney_island/version.rb

@@ -1,3 +1,3 @@
 module ConeyIsland
-  VERSION = "0.12.3"
+  VERSION = "0.12.4"
 end

data/test/dummy/log/test.log

@@ -138,3 +138,33 @@ ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
 ConeyIsland::Submitter.handle_connection connecting...
 Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
 ConeyIsland::Submitter.handle_connection connecting...
+ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
+ConeyIsland::Submitter.handle_connection connecting...
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+ConeyIsland::Submitter.handle_connection connecting...
+ConeyIsland::Submitter.handle_connection connecting...
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+ConeyIsland::Submitter.handle_connection connecting...
+ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
+ConeyIsland::Submitter.handle_connection connecting...
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+ConeyIsland::Submitter.handle_connection connecting...
+ConeyIsland::Submitter.handle_connection connecting...
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+ConeyIsland::Submitter.handle_connection connecting...
+ConeyIsland::Submitter.handle_connection connecting...
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+ConeyIsland::Submitter.handle_connection connecting...
+ConeyIsland::Submitter.handle_connection connecting...
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+ConeyIsland::Submitter.handle_connection connecting...
+ConeyIsland::Submitter.handle_connection connecting...
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+ConeyIsland::Submitter.handle_connection connecting...
+ConeyIsland::Submitter.handle_connection connecting...
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+ConeyIsland::Submitter.handle_connection connecting...
+ConeyIsland::Submitter.handle_connection connecting...
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+ConeyIsland::Submitter.handle_connection connecting...
+ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1

data/test/submitter_test.rb

@@ -27,6 +27,20 @@ class SubmitterTest < MiniTest::Test
       end
     end
     describe "error handling" do
+      it "breaks if klass is not a class or a Module" do
+        error = assert_raises(ConeyIsland::JobArgumentError) do
+          ConeyIsland::Submitter.publish_job([:not_a_class, :method])
+        end
+        assert_match /to be a Class or Module/, error.message
+      end
+
+      it "breaks if the method_name is not a String or a Symbol" do
+        error = assert_raises(ConeyIsland::JobArgumentError) do
+          ConeyIsland::Submitter.publish_job([Class, 1])
+        end
+        assert_match /to be a String or a Symbol/, error.message
+      end
+
       it "handles argument errors for jobs" do
         assert_raises(ConeyIsland::JobArgumentError) do
           ConeyIsland::Submitter.publish_job([:not_a_class, :add_to_list, args: [[]]])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coney_island
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - Eric Draut