sidekiq-enqueuer 1.0.6 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4facd062308c7e127a3ce4bc99e58a933a6c77da
-  data.tar.gz: b8ab07cf5055a30176d98df8e8f2944da66ea678
+  metadata.gz: 1585a3c676060297b1cc89c7b1c554fe8b1b05d1
+  data.tar.gz: 004294f3a7df7865e4b6b3cfa7f2aa9f1839c808
 SHA512:
-  metadata.gz: 70e4653b366d3bc633fbf36e13831cfa912ced5894b8de7cf5b77f8237eccd4a05860a837eb4b03b6fbcbd3dbc979d2b29559b28bab46b620c187894cae7d99e
-  data.tar.gz: 2fb413362b47dbe7bac5242f89655326f4a657642ef6b20a79335b3436300cc750a9cdb1bfe041b1f721fe8f6a221263a2be047a417591af9319d36e7693f618
+  metadata.gz: f956108676be7658c630fc4dd19115e9dd23ab4b434aaef81369f5680d195ca9dba7e411be5f33887fd396ecc3f4bff7efa73c89880f330a3ed9b348253a0042
+  data.tar.gz: 514423672fc749f515637eacd92251be9ec1169a94070adf3af6e6a0e90ab1e73915af23286645df4084c3c6a9a2883c815f74caaf819e1e3974b0c253d7ee89

data/.travis.yml

@@ -2,3 +2,6 @@ language: ruby
 rvm:
   - 2.2.2
 before_install: gem install bundler -v 1.10.6
+
+services:
+  - redis-server

data/CHANGELOG.md

@@ -0,0 +1,27 @@
+# Sidekiq Enqueuer Changes
+
+2.0.0.beta
+-----------
+
+- Added configutation option: Provides a list of Jobs to display
+- Dropped support for manual 'unlock'
+- Sidekiq enqueing now uses `Sidekiq::Client.enqueue_to / enqueue_to_in` to a custom queue.
+- Refactor on classes and modules to bring Atomicity
+
+
+1.0.6
+-----------
+
+- Jobs are sorted by name by default
+
+
+1.0.4
+-----------
+
+- Support for jobs without arguments
+
+
+1.0.3
+-----------
+
+- Support unlock! for sidekiq-middleware

data/README.md

@@ -1,4 +1,5 @@
 # Sidekiq::Enqueuer
+[![Build Status](https://travis-ci.org/vgarro/sidekiq-enqueuer.svg?branch=vg%2Fconfig-option-and-refactor)](https://travis-ci.org/vgarro/sidekiq-enqueuer)
 
 A Sidekiq Web extension to enqueue/schedule job in Web UI. Support both Sidekiq::Worker and ActiveJob.
 
@@ -21,6 +22,49 @@ Edit config/initializers/sidekiq.rb, add following line
 require 'sidekiq/enqueuer'
 ```
 
+Optionally, provide a list of Jobs to display on the new tab, on a new initializer file.
+Worry not, when no configuration is provided, All jobs will be displayed
+
+```
+# config/initializers/sidekiq_enqueuer_config.rb
+require 'sidekiq/enqueuer'
+
+Sidekiq::Enqueuer.configure do |config|
+  config.jobs = [MyAwesomeJob1, MyModule::MyAwesomeJob2]
+end
+
+```
+
+
+## Notes:
+
+### Queuing & ActiveJob support
+Use default sidekiq queue adapter for Jobs including Sidekiq::Worker or Jobs inheriting from ActiveJob::base
+
+```
+ActiveJob::Base.queue_adapter = :sidekiq
+```
+https://github.com/mperham/sidekiq/wiki/Active-Job#active-job-setup
+
+
+### Jobs action param mapping.
+This gem dynamically infers the params required in the `perform` or `perform_in` action in your Job / Worker.
+It is important those actions (either of them) won't hide the actual params into a single *args one.
+In that case it will be impossible to infer the params for your method.
+
+Want to verify this last line? Run this in a rails console:
+```
+MyJob.instance_method(:perform).parameters            # change :perform for your implemented method
+>> [[:req, :param1], [:opt, :param2], [:opt, :param3]]   # Good output
+
+=> [[:rest, :args], [:block, :block]]   # Bad output. Params are being wrapped into a super class.
+```
+
+### Enqueuing Jobs:
+
+For Sidekiq, enqueing is being done using `Sidekiq::Client.enqueue_to` / `enqueue_to_in`, providing Job, and queue extracted from the Job sidekiq_options hash, defaults to 'default' queue when not present.
+
+For ActiveJob, enqueing is being done calling the very own `perform_later` instance method. Please advise your Job should respond to `perform_later` to correctly work.
 
 ## Usage
 
@@ -30,7 +74,7 @@ require 'sidekiq/enqueuer'
 
 ![list](https://cloud.githubusercontent.com/assets/830633/14494297/c9b01b10-01bc-11e6-8ef5-a4d29ff45fb3.png)
 
-* Fill the form, click Enqueue or Schedule.  
+* Fill the form, click Enqueue or Schedule.
 ![form](https://cloud.githubusercontent.com/assets/830633/14494314/ddd9f8ae-01bc-11e6-86ce-0641a9c4d3e4.png)
 
 * That is it!

data/Rakefile

@@ -1,11 +1,11 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 task :default => :test
 
 Rake::TestTask.new do |t|
-  t.libs << "lib"
-  t.libs << "test"
-  t.test_files = FileList["test/**/*_test.rb"]
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.test_files = FileList['test/**/*_test.rb']
   t.verbose = true
 end

data/lib/sidekiq-enqueuer.rb

@@ -1 +1 @@
-require 'sidekiq/enqueuer'
+require 'sidekiq/enqueuer'

data/lib/sidekiq/enqueuer.rb

@@ -1,88 +1,39 @@
 require 'sidekiq/web'
-require "sidekiq/enqueuer/version"
-require 'sidekiq/enqueuer/web_extension'
+require 'sidekiq/enqueuer/version'
+require 'sidekiq/enqueuer/configuration'
+require 'sidekiq/enqueuer/worker/instance'
+require 'sidekiq/enqueuer/worker/param'
+require 'sidekiq/enqueuer/worker/trigger'
+require 'sidekiq/enqueuer/web_extension/loader'
+require 'sidekiq/enqueuer/web_extension/helper'
+require 'sidekiq/enqueuer/web_extension/params_parser'
 require 'sidekiq/enqueuer/railtie' if defined? ::Rails::Railtie
 
 module Sidekiq
   module Enqueuer
-    def self.rails_eager_load
-      if defined?(::Rails) && ::Rails.env != 'production'
-        ::Rails.application.eager_load!
-      end
-    end
-
-    def self.get_job_modules
-      ObjectSpace.each_object(Module)
-                 .select { |klass| has_worker_module?(klass) }
-                 .delete_if { |klass| klass.to_s =~ /^Sidekiq::Extensions/ }
-                 .delete_if { |klass| klass.to_s =~ /^ActiveJob::QueueAdapters/ }
-    end
-
-    def self.get_job_classes
-      ObjectSpace.each_object(Class)
-                 .select { |klass| is_job_class?(klass) }
-    end
-
-    def self.get_jobs
-      return @jobs if @jobs
-
-      rails_eager_load
-      jobs = get_job_modules + get_job_classes
-      jobs = jobs.map(&:to_s).uniq.map(&:constantize)
-      @jobs = jobs.sort_by(&:name)
-    end
-
-    def self.is_job_class?(klass)
-      return false if !defined?(::ActiveJob)
+    class << self
+      attr_accessor :configuration
 
-      klass < ::ActiveJob::Base
-    end
-
-    def self.has_worker_module?(klass)
-      klass.included_modules.include? ::Sidekiq::Worker
-    end
-
-    def self.perform_async(klass, values)
-      parsed_values = values_parser(values)
-      if is_job_class?(klass)
-        klass.perform_later(*parsed_values)
-      elsif has_worker_module?(klass)
-        klass.perform_async(*parsed_values)
+      def configuration
+        @configuration ||= Configuration.new
       end
-    end
 
-    def self.perform_in(klass, seconds_str, values)
-      parsed_values = values_parser(values)
-      seconds = seconds_str.to_i.seconds
-      if is_job_class?(klass)
-        klass.set(wait: seconds).perform_later(*parsed_values)
-      elsif has_worker_module?(klass)
-        klass.perform_in(seconds, *parsed_values)
+      def configure
+        yield(configuration)
       end
-    end
-
-    def self.unlock!(klass, values)
-      parsed_values = values_parser(values)
-      klass.unlock!(*parsed_values)
-    end
 
-    def self.values_parser(values)
-      parsed_values = []
-      errors = []
-      for value in values.map(&:strip)
-        if value =~ /^{/
-          parsed_values << YAML.load(value) rescue errors << value
-        else
-          parsed_values << value
+      def all_jobs
+        included_jobs = defined?(@all_jobs) ? @all_jobs : configuration.all_jobs
+        included_jobs.each_with_object([]) do |job_klass, acc|
+          acc << Worker::Instance.new(job_klass, configuration.enqueue_using_async)
         end
       end
-      raise errors if errors.size > 0
-      parsed_values
     end
-
   end
 end
 
-Sidekiq::Web.register Sidekiq::Enqueuer::WebExtension
-Sidekiq::Web.tabs["Enqueuer"] = "enqueuer"
-Sidekiq::Web.settings.locales << File.join(File.dirname(__FILE__), "enqueuer/locales")
+if defined?(Sidekiq::Web)
+  Sidekiq::Web.register Sidekiq::Enqueuer::WebExtension::Loader
+  Sidekiq::Web.tabs['Enqueuer'] = 'enqueuer'
+  Sidekiq::Web.settings.locales << File.join(File.dirname(__FILE__), 'enqueuer/locales')
+end

data/lib/sidekiq/enqueuer/configuration.rb

@@ -0,0 +1,51 @@
+module Sidekiq
+  module Enqueuer
+    class Configuration
+      attr_accessor :jobs, :enqueue_using_async
+
+      IGNORED_CLASSES = %w(Sidekiq::Extensions
+                           Sidekiq::Extensions::DelayedModel
+                           Sidekiq::Extensions::DelayedMailer
+                           Sidekiq::Extensions::DelayedClass
+                           ActiveJob::QueueAdapters).freeze
+
+      def initialize(enqueue_using_async = nil)
+        @enqueue_using_async = true if enqueue_using_async.nil?
+      end
+
+      def all_jobs
+        @jobs = defined?(@jobs) ? sort(@jobs) : sort(application_jobs)
+      end
+
+      private
+
+      def sort(all_jobs)
+        all_jobs.sort_by(&:name)
+      end
+
+      # Loads all jobs within the application after an eager_load
+      # Filters Sidekiq system Jobs
+      def application_jobs
+        rails_eager_load
+        all_jobs = []
+        all_jobs << sidekiq_jobs
+        all_jobs << active_jobs
+        all_jobs = all_jobs.flatten
+        all_jobs.delete_if { |klass| IGNORED_CLASSES.include?(klass.to_s) }
+      end
+
+      def sidekiq_jobs
+        ObjectSpace.each_object(Class).select { |k| k.included_modules.include?(::Sidekiq::Worker) }
+      end
+
+      def active_jobs
+        ObjectSpace.each_object(Class).select { |k| k.superclass == ::ActiveJob::Base }
+      end
+
+      # Load all classes from the included application before selecting Jobs from it
+      def rails_eager_load
+        ::Rails.application.eager_load! if defined?(::Rails) && !::Rails.env.production?
+      end
+    end
+  end
+end

data/lib/sidekiq/enqueuer/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Enqueuer
-    VERSION = '1.0.6'
+    VERSION = '2.0.0.beta1'.freeze
   end
 end

data/lib/sidekiq/enqueuer/views/index.erb

@@ -1,24 +1,26 @@
 <h3>Enqueuer</h3>
 
 <table class="table table-hover table-bordered table-striped table-white">
-	<thead>
-		<tr>
-			<th>Name</th>
-			<th>Params</th>
-			<th>Actions</th>
-		</tr>		
-	</thead>
-	<tbody>
-		<% for job in @jobs %>
-			<tr>
-				<td width="40%"><%= job %></td>
-				<td width="40%"><%= get_job_perform_params(job).join(', ') %></td>
-				<td width="20%">
-					<button class="btn btn-danger btn-xs">
-						<a href="<%= root_path %>enqueuer/<%= job %>" style="color: white;">Enqueue Form</a>
-					</button>
-				</td>
-			</tr>
-		<% end %>
-	</tbody>
-</table>
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Params</th>
+      <th>Actions</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @jobs.each do |job| %>
+      <tr>
+        <td width="40%"><%= job.name %></td>
+        <td width="40%"><%= job.params.map(&:name).join(', ') %></td>
+        <td width="20%">
+          <button class="btn btn-danger btn-xs">
+            <a href="<%= root_path %>enqueuer/<%= job.name %>" style="color: white;">
+              Enqueue Form
+            </a>
+          </button>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/lib/sidekiq/enqueuer/views/new.erb

@@ -1,63 +1,46 @@
 <h3>Enqueuer</h3>
 
 <div class="well">
-	<p>Support string value and hash value. Value will be stripped.</p>
-	<p>Start with { will be parsed by YAML as hash, eg: {k1: v1, k2: v2} to {'k1'=> 'v1', 'k2'=> 'v2'}. </p>
+  <p>Support string value and hash value. Value will be stripped.</p>
+  <p>Start with { will be parsed by YAML as hash, eg: {k1: v1, k2: v2} to {'k1'=> 'v1', 'k2'=> 'v2'}. </p>
 </div>
 
 <form method="post" action="<%= root_path %>enqueuer">
-	<%= csrf_tag if respond_to?(:csrf_tag) %>
-	
-	<div class="panel panel-default">
-		<div class="panel-heading">
-			<h3 class="panel-title">Perform</h3>
-		</div>
-		<div class="panel-body">
-			<div class="form-group">
-				<label for="job_class_name">Job Class/Module</label>
-				<input class="form-control" name="job_class_name" value="<%= @klass %>" readonly=readonly /> 
-			</div>
-
-			<% for param in get_job_perform_params(@klass) %>
-				<div class="form-group">
-					<label for="perform[<%= param %>]"><%= param %></label>
-					<input class="form-control" name="perform[<%= param %>]" /> 
-				</div>
-			<% end %>
-	  </div>
-	</div>
-
-	<% if does_job_have_unlock_method(@klass) %>
-		<div class="panel panel-default">
-			<div class="panel-heading">
-				<h3 class="panel-title">
-					<input type="checkbox" name="unlock-enable" id="unlock-enable">
-					<label for="unlock-enable">Unlock!</label>
-				</h3>
-			</div>
-			<div class="panel-body">
-				<% for param in get_job_unlock_params(@klass) %>
-					<div class="form-group">
-						<label for="unlock[<%= param %>]"><%= param %></label>
-						<input class="form-control" name="unlock[<%= param %>]" /> 
-					</div>
-				<% end %>
-		  </div>
-		</div>	
-	<% end %>
-
-	<div class="form-group">
-		<input type="submit" class="btn btn-danger" name="submit" value="Enqueue" />
-	</div>
-
-	<div class="form-group">
-		<hr />
-	</div>
-
-	<div class="form-group">
-		<label for="enqueue_in">Enqueue in</label>
-		<input class="form-control" name="enqueue_in" placeholder="x seconds" /> 
-	</div>
-
-	<input type="submit" class="btn btn-danger" name="submit" value="Schedule" />
+  <%= csrf_tag if respond_to?(:csrf_tag) %>
+
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h3 class="panel-title">Perform</h3>
+    </div>
+    <div class="panel-body">
+      <div class="form-group">
+        <label for="job_class_name">Job Class/Module</label>
+        <input class="form-control" name="job_class_name" value="<%= @job.name %>" readonly=readonly />
+      </div>
+
+      <% @job.params.each do |param| %>
+        <div class="form-group">
+          <label for="perform[<%= param %>]"><%= param.name %>
+            <span style="color: red; font-size: small;">&nbsp;&nbsp;&nbsp;*<%= param.label %></span>
+          </label>
+          <input class="form-control" name="perform[<%= param.name %>]" />
+        </div>
+      <% end %>
+    </div>
+  </div>
+
+  <div class="form-group">
+    <input type="submit" class="btn btn-danger" name="submit" value="Enqueue" />
+  </div>
+
+  <div class="form-group">
+    <hr />
+  </div>
+
+  <div class="form-group">
+    <label for="enqueue_in">Enqueue in</label>
+    <input class="form-control" name="enqueue_in" placeholder="x seconds" />
+  </div>
+
+  <input type="submit" class="btn btn-danger" name="submit" value="Schedule" />
 </form>

data/lib/sidekiq/enqueuer/web_extension/helper.rb

@@ -0,0 +1,35 @@
+module Sidekiq
+  module Enqueuer
+    module WebExtension
+      module Helper
+        def get_params_by_action(name)
+          return [] if params[name].nil?
+          ParamsParser.new(params[name]).process
+        end
+
+        def find_job_by_class_name(job_class_name)
+          Sidekiq::Enqueuer.all_jobs.find do |job_klass|
+            job_klass.job == job_class_name || job_klass.job.to_s == job_class_name || job_klass.name == job_class_name
+          end
+        end
+
+        # TODO: Figure out the need of unlock!
+        # def does_job_have_unlock_method(klass_or_module)
+        #   klass_or_module.respond_to?(:unlock!)
+        #   false
+        # end
+
+        # TODO: Figure out the need of unlock!
+        # def get_job_unlock_params(klass_or_module)
+        #   klass_or_module.method(:unlock!).parameters.map{ |e| e[1]}
+        # end
+
+        # TODO: Figure out the need of unlock!
+        # def self.unlock!(klass, values)
+        #   parsed_values = values_parser(values)
+        #   klass.unlock!(*parsed_values)
+        # end
+      end
+    end
+  end
+end

data/lib/sidekiq/enqueuer/web_extension/loader.rb

@@ -0,0 +1,36 @@
+module Sidekiq
+  module Enqueuer
+    module WebExtension
+      module Loader
+        def self.registered(app)
+          view_path = File.join(File.expand_path('../..', __FILE__), 'views')
+          app.helpers WebExtension::Helper
+
+          app.get '/enqueuer' do
+            @jobs = Sidekiq::Enqueuer.all_jobs
+            render(:erb, File.read(File.join(view_path, 'index.erb')))
+          end
+
+          app.get '/enqueuer/:job_class_name' do
+            @job = find_job_by_class_name(params[:job_class_name])
+            render(:erb, File.read(File.join(view_path, 'new.erb')))
+          end
+
+          app.post '/enqueuer' do
+            job = find_job_by_class_name(params[:job_class_name])
+            requested_params = get_params_by_action('perform')
+            # TODO: Figure out the need of unlock!
+            # if params['unlock-enable'] && params['unlock-enable'] != ''
+            #   Sidekiq::Enqueuer.unlock!(klass, get_params_by_action('unlock'))
+            # end
+            if job
+              job.trigger(requested_params) if params['submit'] == 'Enqueue'
+              job.trigger_in(params['enqueue_in'], requested_params) if params['submit'] == 'Schedule'
+            end
+            redirect "#{root_path}enqueuer"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq/enqueuer/web_extension/params_parser.rb

@@ -0,0 +1,48 @@
+module Sidekiq
+  module Enqueuer
+    module WebExtension
+      class ParamsParser
+        attr_reader :raw_params
+
+        def initialize(params)
+          @raw_params = params
+        end
+
+        def process
+          all_params    = filter_empty(raw_params)
+          hash_params   = yaml_to_params(all_params.values)
+          all_params    = hash_params.merge!(all_params) if hash_params
+          simple_params = filter_complex(all_params)
+          simple_params.values.compact.flatten
+        end
+
+        private
+
+        def yaml_to_params(values)
+          unique_params = {}
+          values.each do |str_param|
+            param_hash = expected_hash?(str_param) ? convert_to_ruby(str_param) : {}
+            unique_params.merge!(param_hash)
+          end
+          unique_params
+        end
+
+        def filter_empty(given_params)
+          given_params.delete_if { |_, v| v.to_s.empty? }
+        end
+
+        def filter_complex(given_params)
+          given_params.delete_if { |_, v| expected_hash?(v.to_s) }
+        end
+
+        def convert_to_ruby(value)
+          YAML.parse(value.to_s.strip).to_ruby
+        end
+
+        def expected_hash?(value)
+          value.to_s.start_with?('{') && value.to_s.end_with?('}')
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq/enqueuer/worker/instance.rb

@@ -0,0 +1,50 @@
+module Sidekiq
+  module Enqueuer
+    module Worker
+      class Instance
+        attr_reader :job, :instance_method, :params, :enqueue_using_async
+
+        def initialize(job, enqueue_using_async)
+          @job = job
+          @enqueue_using_async = enqueue_using_async
+          @instance_method     = deduce_instance_method
+          @params              = deduce_params
+        end
+
+        def trigger(input_params)
+          trigger_job(input_params).enqueue
+        end
+
+        def trigger_in(seconds, input_params)
+          trigger_job(input_params).enqueue_in(seconds.to_s.to_i.seconds)
+        end
+
+        def name
+          @job.name
+        end
+
+        private
+
+        def trigger_job(input_params)
+          Trigger.new(job, input_params)
+        end
+
+        # TODO: what if two of this methods exist? which one to pick to figure out params?
+        def deduce_instance_method
+          [:perform, :perform_in, :perform_async, :perform_at].each do |evaluating_method|
+            return evaluating_method if job.instance_methods.include?(evaluating_method)
+          end
+          nil
+        end
+
+        def deduce_params
+          worker_params.empty? ? [] : worker_params.map { |e| Param.new(e[1], e[0]) }
+        end
+
+        def worker_params
+          job.instance_method(instance_method).parameters
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq/enqueuer/worker/param.rb

@@ -0,0 +1,20 @@
+module Sidekiq
+  module Enqueuer
+    module Worker
+      class Param
+        attr_reader :name, :condition
+
+        VALID_OPTIONS = { req: 'required', opt: 'optional' }.freeze
+
+        def initialize(name, condition)
+          @name = name
+          @condition = VALID_OPTIONS[condition]
+        end
+
+        def label
+          condition
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq/enqueuer/worker/trigger.rb

@@ -0,0 +1,51 @@
+module Sidekiq
+  module Enqueuer
+    module Worker
+      class Trigger
+        class UnsupportedJobType < StandardError; end
+
+        attr_reader :job, :queue, :args_with_values
+
+        def initialize(job, input_param_hash)
+          @job = job
+          @queue = deduce_queue
+          @args_with_values = input_param_hash
+        end
+
+        def enqueue
+          if sidekiq_job?
+            Sidekiq::Client.enqueue_to(queue, job, *args_with_values)
+          elsif active_job?
+            return job.perform_later(*args_with_values)
+          else
+            raise UnsupportedJobType
+          end
+        end
+
+        def enqueue_in(time_in_seconds)
+          if sidekiq_job?
+            Sidekiq::Client.enqueue_to_in(queue, time_in_seconds, job, *args_with_values)
+          elsif active_job?
+            job.set(wait: time_in_seconds).perform_later(*args_with_values)
+          else
+            raise UnsupportedJobType
+          end
+        end
+
+        private
+
+        def deduce_queue
+          job.respond_to?(:sidekiq_options) ? job.sidekiq_options['queue'].to_s : 'default'
+        end
+
+        def sidekiq_job?
+          job.included_modules.include? ::Sidekiq::Worker
+        end
+
+        def active_job?
+          job.superclass == ::ActiveJob::Base
+        end
+      end
+    end
+  end
+end

data/sidekiq-enqueuer.gemspec

@@ -4,14 +4,14 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'sidekiq/enqueuer/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "sidekiq-enqueuer"
+  spec.name          = 'sidekiq-enqueuer'
   spec.version       = Sidekiq::Enqueuer::VERSION
-  spec.authors       = ["richfisher"]
-  spec.email         = ["richfisher.pan@gmail.com"]
+  spec.authors       = ['richfisher']
+  spec.email         = ['richfisher.pan@gmail.com']
 
   spec.summary       = %q{A Sidekiq Web extension to enqueue/schedule jobs with custom perform params in Web UI.}
   spec.description   = %q{A Sidekiq Web extension to enqueue/schedule jobs with custom perform params in Web UI. Support both Sidekiq::Worker and ActiveJob.}
-  spec.homepage      = "https://github.com/richfisher/sidekiq-enqueuer"
+  spec.homepage      = 'https://github.com/richfisher/sidekiq-enqueuer'
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
@@ -22,14 +22,14 @@ Gem::Specification.new do |spec|
   # end
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rack-test"
-  spec.add_development_dependency "sidekiq"
-  spec.add_development_dependency "rails", '> 4.2'
-  spec.add_development_dependency "sinatra"
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rack-test'
+  spec.add_development_dependency 'sidekiq'
+  spec.add_development_dependency 'rails', '> 4.2'
+  spec.add_development_dependency 'sinatra'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-enqueuer
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - richfisher
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,7 +105,7 @@ files:
 - ".gitignore"
 - ".ruby-version"
 - ".travis.yml"
-- Changes.md
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -113,12 +113,18 @@ files:
 - bin/setup
 - lib/sidekiq-enqueuer.rb
 - lib/sidekiq/enqueuer.rb
+- lib/sidekiq/enqueuer/configuration.rb
 - lib/sidekiq/enqueuer/locales/en.yml
 - lib/sidekiq/enqueuer/railtie.rb
 - lib/sidekiq/enqueuer/version.rb
 - lib/sidekiq/enqueuer/views/index.erb
 - lib/sidekiq/enqueuer/views/new.erb
-- lib/sidekiq/enqueuer/web_extension.rb
+- lib/sidekiq/enqueuer/web_extension/helper.rb
+- lib/sidekiq/enqueuer/web_extension/loader.rb
+- lib/sidekiq/enqueuer/web_extension/params_parser.rb
+- lib/sidekiq/enqueuer/worker/instance.rb
+- lib/sidekiq/enqueuer/worker/param.rb
+- lib/sidekiq/enqueuer/worker/trigger.rb
 - sidekiq-enqueuer.gemspec
 homepage: https://github.com/richfisher/sidekiq-enqueuer
 licenses: []
@@ -134,9 +140,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8

data/Changes.md

@@ -1,18 +0,0 @@
-# Sidekiq Enqueuer Changes
-
-1.0.6
------------
-
-- Jobs are sorted by name by default
-
-
-1.0.4
------------
-
-- Support for jobs without arguments
-
-
-1.0.3
------------
-
-- Support unlock! for sidekiq-middleware

data/lib/sidekiq/enqueuer/web_extension.rb

@@ -1,53 +0,0 @@
-module Sidekiq::Enqueuer::WebExtension
-  def self.registered(app)
-    view_path = File.join(File.expand_path("..", __FILE__), "views")
-
-    app.helpers do
-      def get_job_perform_params(klass_or_module)
-        klass_or_module.instance_method(:perform).parameters.map{ |e| e[1]}
-      end
-
-      def does_job_have_unlock_method(klass_or_module)
-        klass_or_module.respond_to?(:unlock!)
-      end
-
-      def get_job_unlock_params(klass_or_module)
-        klass_or_module.method(:unlock!).parameters.map{ |e| e[1]}
-      end
-
-      def get_params_by_name(name)
-        params[name].nil? ? [] : params[name].values
-      end
-    end
-
-    app.get "/enqueuer" do
-      @jobs = Sidekiq::Enqueuer.get_jobs
-
-      render(:erb, File.read(File.join(view_path, "index.erb")))
-    end
-
-    app.get "/enqueuer/:job_class_name" do
-      @klass = params[:job_class_name].constantize
-      render(:erb, File.read(File.join(view_path, "new.erb")))
-    end
-
-    app.post "/enqueuer" do
-      klass = params[:job_class_name].constantize
-
-      if params['unlock-enable'] && params['unlock-enable'] != ''
-        Sidekiq::Enqueuer.unlock!(klass, get_params_by_name('unlock'))
-      end
-
-      if params['submit'] == 'Enqueue'
-        Sidekiq::Enqueuer.perform_async(klass, get_params_by_name('perform'))
-      end
-
-      if params['submit'] == 'Schedule'
-        Sidekiq::Enqueuer.perform_in(klass, params['enqueue_in'], get_params_by_name('perform'))
-      end
-
-      redirect "#{root_path}enqueuer"
-    end
-
-  end
-end