resque-cleaner 0.2.1 → 0.2.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.2 (2011-04-07)
+
+* Changed a way to load yajl/json\_gem.
+
 ## 0.2.1 (2011-04-06)
 
 * BUGFIX: Bulk action didn't work properly when you select all jobs.

data/lib/resque_cleaner/server.rb

@@ -3,12 +3,6 @@
 module ResqueCleaner
   module Server
 
-    begin
-      require 'yajl/json_gem'
-    rescue Exception
-      require 'json'
-    end
-
     def self.erb_path(filename)
       File.join(File.dirname(__FILE__), 'server', 'views', filename)
     end
@@ -67,7 +61,7 @@ module ResqueCleaner
     end
 
     def self.included(base)
-      require 'digest/sha1'
+
       base.class_eval do
         helpers do
           def time_filter(id, name, value)
@@ -96,6 +90,7 @@ module ResqueCleaner
         end
 
         get "/cleaner" do
+          load_library
           load_cleaner_filter
 
           @jobs = cleaner.select
@@ -119,6 +114,7 @@ module ResqueCleaner
         end
 
         get "/cleaner_list" do
+          load_library
           load_cleaner_filter
 
           block = filter_block
@@ -135,6 +131,7 @@ module ResqueCleaner
         end
 
         post "/cleaner_exec" do
+          load_library
           load_cleaner_filter
 
           if params[:select_all_pages]!="1"
@@ -156,6 +153,7 @@ module ResqueCleaner
         end
 
         post "/cleaner_stale" do
+          load_library
           cleaner.clear_stale
           redirect "/cleaner"
         end
@@ -173,6 +171,15 @@ module ResqueCleaner
       @cleaner
     end
 
+    def load_library
+      require 'digest/sha1'
+      begin
+        require 'yajl/json_gem' unless [].respond_to?(:to_json)
+      rescue Exception
+        require 'json'
+      end
+    end
+
     def load_cleaner_filter
       @from = params[:f]=="" ? nil : params[:f]
       @to = params[:t]=="" ? nil : params[:t]

data/test/resque_web_test.rb

@@ -2,6 +2,8 @@ require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 # Pull in the server test_helper from resque
 require 'resque/server/test_helper.rb'
+require 'digest/sha1'
+require 'json'
 
 def setup_some_failed_jobs
   Resque.redis.flushall

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-cleaner
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Tatsuya Ono
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 +01:00
+date: 2011-04-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency