la_gear 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3b73127f098ada69cc2e0ab170a4da60d2207b6
-  data.tar.gz: d3e8b4e4352fbb3fbd4cd13eb3c4efabb3548cf0
+  metadata.gz: af0f62ca02e7a0d327d376e9d1e43c72819f5cbe
+  data.tar.gz: 164640b8a42d87770dc09c2eb4a73195e21cf502
 SHA512:
-  metadata.gz: c566ae31db9318a8c28a8e7b2d2d9eb075ae14c2c1eef9e1416e95a478309023d6f2e8b959c58028eb9dba5bdf5c416e02e3d183659398f0fe3180e2974d7af9
-  data.tar.gz: dbc6562784c5f9a44927f239d3e0e4ecd8a3ed5ede4b14dbdae5dc0ee50a5ed0fe9e92c7fe0d0f647f8a6365d0440b73358881b0b939114a729de9dc762d4ef1
+  metadata.gz: 8c87e0696e4d709d2332f01f4d0c77bcd1725e5114173f98c7aef887ade8af73fe41afa34e44e3d98bb010e8aef3cc6f87d24267ab152793a7f70f3f4a7181ec
+  data.tar.gz: 4fa5b3011ec6741c0531677777aa816fef663edcea671885f180334efb2a89343588763a703cc46d51b535060517c4b5da29f71bf6c818adde4377276211d083

data/lib/la_gear/active_record/publish_triggerable.rb

@@ -3,50 +3,42 @@ module LaGear
     module PublishTriggerable
       def publish_after_commit(routing_key, opts)
         publish_method = "publish_#{routing_key}"
-        la_gear_opts = extract_la_gear_options(opts)
+        la_gear_opts = la_gear_options(opts)
         define_method publish_method do
           message = block_given? ? yield(self) : {}
           Bus.publish(routing_key.to_s, message, la_gear_opts)
         end
-        after_commit publish_method, opts
+        after_commit publish_method, after_commit_options(opts)
       end
 
       def send_after_commit(routing_key, opts)
         publish_method = "publish_#{routing_key}"
-        la_gear_opts = extract_la_gear_options(opts)
+        la_gear_opts = la_gear_options(opts)
         define_method publish_method do
           message = block_given? ? yield(self) : {}
           Bus.publish_local(routing_key.to_s, message, la_gear_opts)
         end
-        after_commit publish_method, opts
+        after_commit publish_method, after_commit_options(opts)
       end
 
       def send_in_after_commit(routing_key, opts, interval)
         publish_method = "publish_#{routing_key}"
-        la_gear_opts = extract_la_gear_options(opts)
+        la_gear_opts = la_gear_options(opts)
         define_method publish_method do
           message = block_given? ? yield(self) : {}
           Bus.publish_local_in(routing_key.to_s, message, la_gear_opts, interval)
         end
-        after_commit publish_method, opts
+        after_commit publish_method, after_commit_options(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
+      def after_commit_options(opts = {})
+        opts.reject { |k, _v| [:version, :suffix].include?(k) }
+      end
 
-        la_gear_opts
+      def la_gear_options(opts = {})
+        opts.select { |k, _v| [:version, :suffix].include?(k) }
       end
     end
   end

data/lib/la_gear/bus.rb

@@ -43,8 +43,6 @@ module LaGear
     end
     module_function :publish_local_in
 
-    private
-
     class NamespaceUtility
       class << self
         def local_worker(routing_key)
@@ -54,17 +52,13 @@ module LaGear
         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

data/lib/la_gear/version.rb

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

data/test/test_bus.rb

@@ -209,6 +209,12 @@ class TestBus < LaGear::Test
             must_invoke_publisher_with_must_invoke_publisher_publish
           end
         end
+
+        describe 'when method is called more than once' do
+          it 'does not modify the parameters' do
+            does_not_modify_parameters
+          end
+        end
       end
     end
 
@@ -397,6 +403,12 @@ class TestBus < LaGear::Test
             must_invoke_publisher_with_must_invoke_publisher_publish
           end
         end
+
+        describe 'when method is called more than once' do
+          it 'does not modify the parameters' do
+            does_not_modify_parameters
+          end
+        end
       end
     end
 
@@ -585,6 +597,12 @@ class TestBus < LaGear::Test
             must_invoke_publisher_with_must_invoke_publisher_publish
           end
         end
+
+        describe 'when method is called more than once' do
+          it 'does not modify the parameters' do
+            does_not_modify_parameters
+          end
+        end
       end
     end
 
@@ -652,6 +670,12 @@ class TestBus < LaGear::Test
         it 'must invoke perform_async on the constantized routing_key' do
           must_invoke_perform_method_on_the_constantized_routing_key
         end
+
+        describe 'when method is called more than once' do
+          it 'does not modify the parameters' do
+            does_not_modify_parameters
+          end
+        end
       end
     end
 
@@ -720,11 +744,30 @@ class TestBus < LaGear::Test
         it 'must invoke perform_async on the constantized routing_key' do
           must_invoke_perform_method_on_the_constantized_routing_key
         end
+
+        describe 'when method is called more than once' do
+          it 'does not modify the parameters' do
+            does_not_modify_parameters
+          end
+        end
       end
     end
 
     private
 
+    def does_not_modify_parameters
+      expected_opts = @la_gear_opts.clone
+      args = [@base_routing_key, @expected_msg, @la_gear_opts]
+      args.unshift(@expected_timestamp) if defined?(@expected_timestamp)
+      if defined?(@expected_interval)
+        args.push(@expected_interval) if @bus_method == :publish_local_in
+        args.unshift(@expected_interval) if @bus_method == :publish_in
+      end
+      LaGear::Bus.public_send(@bus_method, *args)
+      LaGear::Bus.public_send(@bus_method, *args)
+      @la_gear_opts.must_equal(expected_opts)
+    end
+
     def must_invoke_delayable_publisher_sidekiq_delay
       expected_args = [{}]
       expected_args.unshift(@expected_interval) if defined?(@expected_interval)
@@ -734,8 +777,11 @@ class TestBus < LaGear::Test
       LaGear::Bus::DelayablePublisher.stub @sidekiq_delay_method, mock do
         LaGear::Bus::DelayablePublisher.stub :publish, nil do
           input_args = [@base_routing_key, @expected_msg, @la_gear_opts]
-          input_args.unshift(@expected_interval) if defined?(@expected_interval)
           input_args.unshift(@expected_timestamp) if defined?(@expected_timestamp)
+          if defined?(@expected_interval)
+            input_args.push(@expected_interval) if @bus_method == :publish_local_in
+            input_args.unshift(@expected_interval) if @bus_method == :publish_in
+          end
           LaGear::Bus.public_send(@bus_method, *input_args)
         end
       end
@@ -748,8 +794,13 @@ class TestBus < LaGear::Test
       LaGear::Bus::DelayablePublisher.stub @sidekiq_delay_method, LaGear::Bus::DelayablePublisher do
         LaGear::Bus::DelayablePublisher.stub :publish, mock do
           args = [@base_routing_key, @expected_msg, @la_gear_opts]
-          args.unshift(@expected_interval) if defined?(@expected_interval)
+
           args.unshift(@expected_timestamp) if defined?(@expected_timestamp)
+          if defined?(@expected_interval)
+            args.push(@expected_interval) if @bus_method == :publish_local_in
+            args.unshift(@expected_interval) if @bus_method == :publish_in
+          end
+
           LaGear::Bus.send(@bus_method, *args)
         end
       end
@@ -762,8 +813,13 @@ class TestBus < LaGear::Test
       LaGear::Bus::DelayablePublisher.stub @sidekiq_delay_method, LaGear::Bus::DelayablePublisher do
         LaGear::Publisher.stub :new, mock do
           args = [@base_routing_key, @expected_msg, @la_gear_opts]
-          args.unshift(@expected_interval) if defined?(@expected_interval)
+
           args.unshift(@expected_timestamp) if defined?(@expected_timestamp)
+          if defined?(@expected_interval)
+            args.push(@expected_interval) if @bus_method == :publish_local_in
+            args.unshift(@expected_interval) if @bus_method == :publish_in
+          end
+
           LaGear::Bus.send(@bus_method, *args)
         end
       end
@@ -775,8 +831,13 @@ class TestBus < LaGear::Test
       $publisher.expect(:with, nil)
       LaGear::Bus::DelayablePublisher.stub @sidekiq_delay_method, LaGear::Bus::DelayablePublisher do
         args = [@base_routing_key, @expected_msg, @la_gear_opts]
-        args.unshift(@expected_interval) if defined?(@expected_interval)
+
         args.unshift(@expected_timestamp) if defined?(@expected_timestamp)
+        if defined?(@expected_interval)
+          args.push(@expected_interval) if @bus_method == :publish_local_in
+          args.unshift(@expected_interval) if @bus_method == :publish_in
+        end
+
         LaGear::Bus.send(@bus_method, *args)
       end
       $publisher.verify
@@ -788,8 +849,13 @@ class TestBus < LaGear::Test
       mock.expect(:publish, nil, [@expected_msg, { to_queue: @expected_routing_key }])
       LaGear::Bus::DelayablePublisher.stub @sidekiq_delay_method, LaGear::Bus::DelayablePublisher do
         args = [@base_routing_key, @expected_msg, @la_gear_opts]
-        args.unshift(@expected_interval) if defined?(@expected_interval)
+
         args.unshift(@expected_timestamp) if defined?(@expected_timestamp)
+        if defined?(@expected_interval)
+          args.push(@expected_interval) if @bus_method == :publish_local_in
+          args.unshift(@expected_interval) if @bus_method == :publish_in
+        end
+
         LaGear::Bus.send(@bus_method, *args)
       end
       mock.verify
@@ -798,11 +864,18 @@ class TestBus < LaGear::Test
     def must_invoke_perform_method_on_the_constantized_routing_key
       expected_args = @expected_msg.values
       expected_args.unshift(@expected_interval) if defined?(@expected_interval)
+      expected_args.unshift(@expected_timestamp) if defined?(@expected_timestamp)
       mock = MiniTest::Mock.new
       mock.expect(:call, nil, expected_args)
       @local_worker.stub @perform_method, mock do
         input_args = [@base_routing_key, @expected_msg, @la_gear_opts]
-        input_args.push(@expected_interval) if defined?(@expected_interval)
+
+        input_args.unshift(@expected_timestamp) if defined?(@expected_timestamp)
+        if defined?(@expected_interval)
+          input_args.push(@expected_interval) if @bus_method == :publish_local_in
+          input_args.unshift(@expected_interval) if @bus_method == :publish_in
+        end
+
         LaGear::Bus.send(@bus_method, *input_args)
       end
       mock.verify

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: la_gear
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Gabriel Chaney
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json