coney_island 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a24a22373dabe6fda9ea61fc93c5ffc09aa0445c
-  data.tar.gz: b092d0eb89b1a2556e2ea58871f7cea5ef0d1b15
+  metadata.gz: c56c9ef5e0a701dbf1b5dc6d574158eb603c5b39
+  data.tar.gz: 78a9a731b07471b9591b43774805622601b6fc66
 SHA512:
-  metadata.gz: 0cf1d7b5d2a88432f701c8554ab214e371a5512f0a50fefc08fcabd37cec8fb5f4e74ed7e945d1514988784b6b743d6594c620172757dcd9774cdb2f5c0e0695
-  data.tar.gz: a8ed8db032ab4b9e7e898bc751bb685664ea8abb90d78ca3093ef5b443f4bc040aa1297efcac369c16a4370df9ab496e95781bef2cc6ae896ee0db03cef5791c
+  metadata.gz: fcac6ce63736e212e822371306d7a4d57b5d0b5571f8716086d8d2d725f7846424b936e554593df95c56c2af1bd5912359ca6e5946ce40a905adae74ab44a083
+  data.tar.gz: f3fb209da6ffc4acec4ba8921b1523931f426e6bbdef62f9800562981bc14fecfde5ab7453da8f9bf0fdd295a45f5f42c7c72a7dea8e3f9e125cbac766435702

data/lib/coney_island/submitter.rb

@@ -21,9 +21,7 @@ module ConeyIsland
       if @run_inline
         self.handle_publish(args)
       else
-        EventMachine.next_tick do
           self.handle_publish(args)
-        end
       end
     end
 
@@ -52,28 +50,34 @@ module ConeyIsland
 
     def self.handle_publish(args)
       self.handle_connection unless @run_inline
-      jobs = (args.first.is_a? Array) ? args : [args]
-      jobs.each do |args|
-        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 = klass.name
-          method_name = args.shift
-          job_args = args.shift
-          job_args ||= {}
-          job_args['klass'] = klass
-          job_args['method_name'] = method_name
-          if @run_inline
-            job_args.stringify_keys!
-            ConeyIsland::Worker.execute_job_method(job_args)
-          else
-            work_queue = job_args.delete :work_queue
-            work_queue ||= 'default'
-            self.exchange.publish((job_args.to_json), routing_key: "carousels.#{work_queue}")
-          end
+      if :all_cached_jobs == args
+        RequestStore.store[:jobs].delete_if do |job_args|
+          self.publish_job(job_args)
+        end
+      else
+        self.publish_job(args)
+      end
+    end
+
+    def self.publish_job(args)
+      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 = klass.name
+        method_name = args.shift
+        job_args = args.shift
+        job_args ||= {}
+        job_args['klass'] = klass
+        job_args['method_name'] = method_name
+        if @run_inline
+          job_args.stringify_keys!
+          ConeyIsland::Worker.execute_job_method(job_args)
+        else
+          work_queue = job_args.delete :work_queue
+          work_queue ||= 'default'
+          self.exchange.publish((job_args.to_json), routing_key: "carousels.#{work_queue}")
         end
-        RequestStore.store[:completed_jobs] ||= 0
-        RequestStore.store[:completed_jobs] += 1
       end
+      true
     end
 
     def self.cache_jobs
@@ -82,9 +86,7 @@ module ConeyIsland
     end
 
     def self.flush_jobs
-      jobs = RequestStore.store[:jobs].dup
-      self.submit!(jobs) if jobs.any?
-      RequestStore.store[:jobs] = []
+      self.submit!(:all_cached_jobs) if RequestStore.store[:jobs].any?
     end
 
     def self.stop_caching_jobs
@@ -102,8 +104,8 @@ module ConeyIsland
 
     def self.publisher_shutdown
       EventMachine.add_periodic_timer(1) do
-        if RequestStore.store[:jobs] && (RequestStore.store[:jobs].length > RequestStore.store[:completed_jobs])
-          Rails.logger.info("Waiting for #{RequestStore.store[:jobs].length - RequestStore.store[:completed_jobs]} publishes to finish")
+        if RequestStore.store[:jobs] && (RequestStore.store[:jobs].length > 0)
+          Rails.logger.info("Waiting for #{RequestStore.store[:jobs].length} publishes to finish")
         else
           Rails.logger.info("Shutting down coney island publisher")
           EventMachine.stop

data/lib/coney_island/version.rb

@@ -1,3 +1,3 @@
 module ConeyIsland
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coney_island
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Eric Draut
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails