la_gear 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 503e95feb00357ec5d4b83d49d4a9676feb8c4bd
-  data.tar.gz: 5a440b745bd414158e2e724aca64562452ced2b8
+  metadata.gz: c3b73127f098ada69cc2e0ab170a4da60d2207b6
+  data.tar.gz: d3e8b4e4352fbb3fbd4cd13eb3c4efabb3548cf0
 SHA512:
-  metadata.gz: 5b521b51ddbdf2338caf2840f4bb1dec3d0eefcfe2590836d911f54742a58abcdede0c7e9dd42e764407c35b3f7a124173fc866e13aa6e94b03f4260e2b96ab5
-  data.tar.gz: 718958b3be88d232a9659ff926eba097274705263c56863cd70ba381067d10958c7f86e481b3ee5f65dabac9265aa0e07f534abd5daee0d4200c75cfce3074e9
+  metadata.gz: c566ae31db9318a8c28a8e7b2d2d9eb075ae14c2c1eef9e1416e95a478309023d6f2e8b959c58028eb9dba5bdf5c416e02e3d183659398f0fe3180e2974d7af9
+  data.tar.gz: dbc6562784c5f9a44927f239d3e0e4ecd8a3ed5ede4b14dbdae5dc0ee50a5ed0fe9e92c7fe0d0f647f8a6365d0440b73358881b0b939114a729de9dc762d4ef1

data/la_gear.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.7.0'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'rr'
+  spec.add_development_dependency 'pry'
 end

data/lib/la_gear/active_record/publish_triggerable.rb

@@ -3,30 +3,51 @@ module LaGear
     module PublishTriggerable
       def publish_after_commit(routing_key, opts)
         publish_method = "publish_#{routing_key}"
+        la_gear_opts = extract_la_gear_options(opts)
         define_method publish_method do
           message = block_given? ? yield(self) : {}
-          Bus.publish(routing_key.to_s, message)
+          Bus.publish(routing_key.to_s, message, la_gear_opts)
         end
         after_commit publish_method, opts
       end
 
       def send_after_commit(routing_key, opts)
         publish_method = "publish_#{routing_key}"
+        la_gear_opts = extract_la_gear_options(opts)
         define_method publish_method do
           message = block_given? ? yield(self) : {}
-          Bus.publish_local(routing_key.to_s, message)
+          Bus.publish_local(routing_key.to_s, message, la_gear_opts)
         end
         after_commit publish_method, opts
       end
 
       def send_in_after_commit(routing_key, opts, interval)
         publish_method = "publish_#{routing_key}"
+        la_gear_opts = extract_la_gear_options(opts)
         define_method publish_method do
           message = block_given? ? yield(self) : {}
-          Bus.publish_local_in(routing_key.to_s, message, interval)
+          Bus.publish_local_in(routing_key.to_s, message, la_gear_opts, interval)
         end
         after_commit publish_method, opts
       end
+
+      private
+
+      def extract_la_gear_options(opts = {})
+        la_gear_opts = {}
+
+        if opts.key?(:version)
+          la_gear_opts[:version] = opts[:version]
+          opts.delete(:version)
+        end
+
+        if opts.key?(:suffix)
+          la_gear_opts[:suffix] = opts[:suffix]
+          opts.delete(:suffix)
+        end
+
+        la_gear_opts
+      end
     end
   end
 end

data/lib/la_gear/bus.rb

@@ -13,33 +13,70 @@ module LaGear
     end
     module_function :init_pool
 
-    def publish(routing_key, msg, bunny_opts = {}, sidekiq_opts = {})
+    def publish(routing_key, msg, la_gear_opts = {}, bunny_opts = {}, sidekiq_opts = {})
+      routing_key = NamespaceUtility.adjust_routing_key(routing_key, la_gear_opts)
       DelayablePublisher.sidekiq_delay(sidekiq_opts).publish(routing_key, msg, bunny_opts)
     end
     module_function :publish
 
-    def publish_in(interval, routing_key, msg, bunny_opts = {}, sidekiq_opts = {})
+    def publish_in(interval, routing_key, msg, la_gear_opts = {}, bunny_opts = {}, sidekiq_opts = {})
+      routing_key = NamespaceUtility.adjust_routing_key(routing_key, la_gear_opts)
       DelayablePublisher.sidekiq_delay_for(interval, sidekiq_opts).publish(routing_key, msg, bunny_opts)
     end
     module_function :publish_in
 
-    def publish_at(timestamp, routing_key, msg, bunny_opts = {}, sidekiq_opts = {})
+    def publish_at(timestamp, routing_key, msg, la_gear_opts = {}, bunny_opts = {}, sidekiq_opts = {})
+      routing_key = NamespaceUtility.adjust_routing_key(routing_key, la_gear_opts)
       DelayablePublisher.sidekiq_delay_until(timestamp, sidekiq_opts).publish(routing_key, msg, bunny_opts)
     end
     module_function :publish_at
 
-    def publish_local(routing_key, msg)
-      routing_key.classify.constantize.perform_async(*msg.values)
+    def publish_local(routing_key, msg, la_gear_opts = {})
+      routing_key = NamespaceUtility.adjust_routing_key(routing_key, la_gear_opts)
+      NamespaceUtility.local_worker(routing_key).perform_async(*msg.values)
     end
     module_function :publish_local
 
-    def publish_local_in(routing_key, msg, interval)
-      routing_key.classify.constantize.perform_in(interval, *msg.values)
+    def publish_local_in(routing_key, msg, la_gear_opts = {}, interval)
+      routing_key = NamespaceUtility.adjust_routing_key(routing_key, la_gear_opts)
+      NamespaceUtility.local_worker(routing_key).perform_in(interval, *msg.values)
     end
     module_function :publish_local_in
 
     private
 
+    class NamespaceUtility
+      class << self
+        def local_worker(routing_key)
+          routing_key.split('.').map(&:classify).join('::').constantize
+        end
+
+        def adjust_routing_key(routing_key, opts = {})
+          if opts.key?(:version)
+            routing_key = add_version(routing_key, opts[:version])
+            opts.delete(:version)
+          elsif opts.key?(:suffix)
+            routing_key = add_suffix(routing_key, opts[:suffix])
+          end
+
+          opts.delete(:suffix)
+          routing_key
+        end
+
+        private
+
+        def add_version(routing_key, version)
+          return add_suffix(routing_key, "v#{version}") if version.present?
+          routing_key
+        end
+
+        def add_suffix(routing_key, suffix)
+          return "#{routing_key}.#{suffix}" if suffix.present?
+          routing_key
+        end
+      end
+    end
+
     class DelayablePublisher
       def self.publish(routing_key, msg, opts = {})
         opts = opts.merge(to_queue: routing_key)

data/lib/la_gear/version.rb

@@ -1,3 +1,3 @@
 module LaGear
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/lib/la_gear/worker.rb

@@ -40,8 +40,7 @@ module LaGear
       end
 
       def routing_key
-        # TODO: the splitting is a semantic smell...
-        name.split('::').last.underscore
+        name.underscore.gsub('/', '.')
       end
 
       def retry_routing_key

data/test/helper.rb

@@ -19,5 +19,7 @@ require 'sneakers'
 require 'la_gear'
 
 require 'active_support/all'
+require 'pry'
 
 LaGear::Test = Minitest::Test
+LaGear::Spec = Minitest::Spec