sidekiq-enqueuer 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5dbc2cdcd956e6126c1299c490e61057bc1dc61
-  data.tar.gz: 16526ef109984855d5a85018fc2767663d5d3018
+  metadata.gz: db4c4b0c1816251c65a6e03abf0163c6eb640a3f
+  data.tar.gz: ca07096636cc304c81ae844787d4e80e52db874b
 SHA512:
-  metadata.gz: 92c9046d2dd0200b36147283a34d91aaa093168a1646325154e81d81c933ad3c341b080e4b404ec9f6ad9c470042ec028c79da1932c4a0cde871779a2384a1d6
-  data.tar.gz: c8deb9bc67eb0f46d325564d3d0191a39ea26b7a3dc42f79924df4db830a80980637bc349d82e5d1372045a35ee96f734738eb8534aa58fcc3917187b8451eb5
+  metadata.gz: 57bc674fb3fc33cd790368596d13c16f86cecbe708e579a5de965f3db645d4fb7ff0cfbf8dc697fce7730b49c27bbe33901bfcda7ba7fe723cd994eb6a959492
+  data.tar.gz: 9a69db182e806570b852aa90699da544d4e21a45b29347547327d86c6134cc11a110279a519e529eb11e33827f550d00381e8bf077a89f5517b83acd9a72f34a

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/README.md

@@ -20,7 +20,20 @@ Or install it yourself as:
 
 ## Usage
 
-Visit the Sidekiq Web, click the Enqueuer tab.
+* Open Sidekiq Web, click the Enqueuer tab.
+
+* You can see a list of job classes/modules and params. Click Enqueue Form.
+
+![list](https://cloud.githubusercontent.com/assets/830633/14494297/c9b01b10-01bc-11e6-8ef5-a4d29ff45fb3.png)
+
+* Fill the form, click Enqueue or Schedule.  
+![form](https://cloud.githubusercontent.com/assets/830633/14494314/ddd9f8ae-01bc-11e6-86ce-0641a9c4d3e4.png)
+
+* That is it!
+
+## Form filling
+* Support string value and hash value.
+* Hash value should start with {, hash value will be parsed by YAML, eg: {k1: v1, k2: v2} to {'k1'=> 'v1', 'k2'=> 'v2'}.
 
 
 ## Contributing

data/lib/sidekiq/enqueuer.rb

@@ -5,11 +5,9 @@ require 'sidekiq/enqueuer/railtie' if defined? ::Rails::Railtie
 
 module Sidekiq
   module Enqueuer
-    def self.eager_load
-      has_eager_loaded = false
-      if defined?(::Rails) && ::Rails.env != 'production' && has_eager_loaded == false
+    def self.rails_eager_load
+      if defined?(::Rails) && ::Rails.env != 'production'
         ::Rails.application.eager_load! 
-        has_eager_loaded = true
       end
     end
 
@@ -24,12 +22,16 @@ module Sidekiq
     end
 
     def self.get_jobs
-      eager_load
+      return @jobs if @jobs
+
+      rails_eager_load
       jobs = get_job_modules + get_job_classes
-      jobs.map(&:to_s).uniq.map(&:constantize)
+      @jobs = jobs.map(&:to_s).uniq.map(&:constantize)
     end
 
     def self.is_job_class?(klass)
+      return false if !defined?(::ActiveJob)
+
       klass < ::ActiveJob::Base
     end
 
@@ -38,20 +40,36 @@ module Sidekiq
     end
 
     def self.perform_async(klass, values)
+      parsed_values = values_parser(values)
       if is_job_class?(klass)
-        klass.perform_later(*values)
+        klass.perform_later(*parsed_values)
       elsif has_worker_module?(klass)
-        klass.perform_async(*values)
+        klass.perform_async(*parsed_values)
       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(*values)
+        klass.set(wait: seconds).perform_later(*parsed_values)
       elsif has_worker_module?(klass)
-        klass.perform_in(seconds, *values)
+        klass.perform_in(seconds, *parsed_values)
+      end
+    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
+        end
       end
+      raise errors if errors.size > 0
+      parsed_values
     end
 
   end

data/lib/sidekiq/enqueuer/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Enqueuer
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

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

@@ -11,9 +11,9 @@
 	<tbody>
 		<% for job in @jobs %>
 			<tr>
-				<td><%= job %></td>
-				<td><%= get_job_perform_params(job).join(', ') %></td>
-				<td><a href="<%= root_path %>enqueuer/<%= job %>" class="btn btn-danger btn-xs" style="color: white;">Enqueue Form</a></td>
+				<td width="40%"><%= job %></td>
+				<td width="40%"><%= get_job_perform_params(job).join(', ') %></td>
+				<td width="20%"><a href="<%= root_path %>enqueuer/<%= job %>" class="btn btn-danger btn-xs" style="color: white;">Enqueue Form</a></td>
 			</tr>
 		<% end %>
 	</tbody>

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

@@ -1,5 +1,10 @@
 <h3>Enqueuer</h3>
 
+<div class="well">
+	<p>Support string value and hash value.</p>
+	<p>Hash value should start with {, hash value will be parsed by YAML, 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) %>
 	

data/sidekiq-enqueuer.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["richfisher"]
   spec.email         = ["richfisher.pan@gmail.com"]
 
-  spec.summary       = %q{A Sidekiq Web extension to enqueue/schedule job in Web UI.}
-  spec.description   = %q{A Sidekiq Web extension to enqueue/schedule job in Web UI. Support both Sidekiq::Worker and ActiveJob.}
+  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"
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-enqueuer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - richfisher
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,8 +94,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A Sidekiq Web extension to enqueue/schedule job in Web UI. Support both
-  Sidekiq::Worker and ActiveJob.
+description: A Sidekiq Web extension to enqueue/schedule jobs with custom perform
+  params in Web UI. Support both Sidekiq::Worker and ActiveJob.
 email:
 - richfisher.pan@gmail.com
 executables: []
@@ -139,5 +139,6 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: A Sidekiq Web extension to enqueue/schedule job in Web UI.
+summary: A Sidekiq Web extension to enqueue/schedule jobs with custom perform params
+  in Web UI.
 test_files: []