sidekiq-merger 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 764a83e3da41cbfaa54d2d8a0abbdcddcb42c289
-  data.tar.gz: 40793d538fcd693873fb53aa657cbbbb82ad20a8
+  metadata.gz: 60636bc150095c22b100fdbbeeb75dd9e9ed77de
+  data.tar.gz: 8a889756673e47f928c96204210a57ee39ec8e5f
 SHA512:
-  metadata.gz: e43782390e487179771cce40af1edefb40f493236629147fcdc44a595ae35d739a35d5c2aa2eca007975a19e69df9f0e56344f21f8a426cedccd617fbb029ad0
-  data.tar.gz: 9e34d46fea2b98e272f29d68f0e554d9f9c93299156fc7d986a9e29f54a7464949a270e8ae8613319e0c9a5ef6cd7708f9e7a15154913c460baa8b53bf6641a1
+  metadata.gz: 7a166d4979d485fcf98b962859f1f550b1e9966f2243de3d1ba51f82e955c4fd95b54210f8b0506c90f9d05c74f68a828eff64324a43c3a0e6a8eeb80096bef5
+  data.tar.gz: 6289d83637fcc81e87b35e4d01d671fb0d26114253d65b804cabe8cf2b029c3b91a4436d921240d8abad6a84a50074cb3bdd8ef7cbe1e5279f0ab3ea16719ff0

data/README.md

@@ -6,7 +6,7 @@
 [![Coverage Status][cov-image]][cov-link]
 [![Code Climate][gpa-image]][gpa-link]
 
-Merge sidekiq jobs occurring before the execution time. Inspired by [sidekiq-grouping](https://github.com/gzigzigzeo/sidekiq-grouping).
+Merge [sidekiq](http://sidekiq.org/) jobs occurring before the execution times. Inspired by [sidekiq-grouping](https://github.com/gzigzigzeo/sidekiq-grouping).
 
 ## Installation
 

data/app/views/index.erb

@@ -23,10 +23,10 @@
     </div>
     <h3>UniqueWorker</h3>
     <div>
-      <form action="/some_worker/perform_in" method="post" style="display: inline-block;">
+      <form action="/unique_worker/perform_in" method="post" style="display: inline-block;">
         <input type="submit" name="perform_in" value="perform_in">
       </form>
-      <form action="/some_worker/perform_in" method="post" style="display: inline-block;">
+      <form action="/unique_worker/perform_in" method="post" style="display: inline-block;">
         <input type="submit" name="perform_async" value="perform_async">
       </form>
     </div>

data/lib/sidekiq-merger.rb

@@ -12,4 +12,7 @@ Sidekiq.configure_server do |config|
   end
 end
 
-Sidekiq::Merger.start! if Sidekiq.server?
+if Sidekiq.server?
+  task = Sidekiq::Merger.create_task
+  task.execute
+end

data/lib/sidekiq/merger.rb

@@ -12,7 +12,7 @@ module Sidekiq::Merger
   class << self
     attr_accessor :logger
 
-    def start!
+    def create_task
       interval = Sidekiq::Merger::Config.poll_interval
       observer = Sidekiq::Merger::LoggingObserver.new(logger)
       flusher = Sidekiq::Merger::Flusher.new(logger)
@@ -20,10 +20,7 @@ module Sidekiq::Merger
         execution_interval: interval
       ) { flusher.flush }
       task.add_observer(observer)
-      logger.info(
-        "[#{Sidekiq::Merger::LOGGER_TAG}] Started polling merges every #{interval} seconds"
-      )
-      task.execute
+      task
     end
   end
 

data/lib/sidekiq/merger/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Merger
-    VERSION = "0.0.7".freeze
+    VERSION = "0.0.8".freeze
   end
 end

data/lib/sidekiq/merger/web.rb

@@ -4,19 +4,19 @@ module Sidekiq::Merger::Web
   VIEWS = File.expand_path("views", File.dirname(__FILE__))
 
   def self.registered(app)
-    app.get "/merger" do
+    app.get "/merges" do
       @merges = Sidekiq::Merger::Merge.all
       erb File.read(File.join(VIEWS, "index.erb")), locals: { view_path: VIEWS }
     end
 
-    app.post "/merger/:full_merge_key/delete" do
+    app.post "/merges/:full_merge_key/delete" do
       full_merge_key = URI.decode_www_form_component params[:full_merge_key]
       merge = Sidekiq::Merger::Merge.initialize_with_full_merge_key(full_merge_key)
       merge.delete_all
-      redirect "#{root_path}/merger"
+      redirect "#{root_path}/merges"
     end
   end
 end
 
 Sidekiq::Web.register(Sidekiq::Merger::Web)
-Sidekiq::Web.tabs["Merger"] = "merger"
+Sidekiq::Web.tabs["Merges"] = "merges"

data/spec/sidekiq/merger_spec.rb

@@ -2,6 +2,13 @@ require "spec_helper"
 
 describe Sidekiq::Merger do
   it "has a version number" do
-    expect(Sidekiq::Merger::VERSION).not_to be nil
+    expect(described_class::VERSION).not_to be nil
+  end
+  describe "#create_task" do
+    it "starts a monitoring task" do
+      task = described_class.create_task
+      expect(task).to be_a Concurrent::TimerTask
+      task.shutdown
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-merger
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - dtaniwaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake