resque-history 1.9.5 → 1.10.0

data/.travis.yml

@@ -7,4 +7,6 @@ rvm:
   - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-18mode
-  - rbx-19mode
+  - rbx-19mode
+services:
+  - redis-server

data/Gemfile

@@ -1,12 +1,14 @@
 source "http://rubygems.org"
 
 # Specify your gem's dependencies in resque-history.gemspec
-gemspec
+# gemspec
 
-gem "rake"
 gem "resque"
 
-group :test, :development do
+group :development, :test do
+  gem "rake"
+  gem "bundler"
+  gem "jeweler"
+  gem "rspec-rails"
   gem "timecop"
 end
-

data/Gemfile.lock

@@ -1,94 +1,76 @@
-PATH
-  remote: .
-  specs:
-    resque-history (1.9.5)
-      rake
-      resque
-      resque-history
-
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
-      builder (~> 3.0.0)
-    activesupport (3.2.3)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
+    abstract (1.0.0)
+    actionpack (3.0.8)
+      activemodel (= 3.0.8)
+      activesupport (= 3.0.8)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.8)
+      activesupport (= 3.0.8)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activesupport (3.0.8)
+    backports (3.1.1)
+    builder (2.1.2)
+    diff-lcs (1.2.1)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
     git (1.2.5)
-    hike (1.2.1)
-    i18n (0.6.0)
-    jeweler (1.6.4)
+    i18n (0.5.0)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    journey (1.0.3)
-    json (1.6.6)
-    multi_json (1.2.0)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-protection (1.2.0)
-      rack
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
+      rdoc
+    json (1.7.7)
+    multi_json (1.7.1)
+    rack (1.2.8)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
       rack (>= 1.0)
-    railties (3.2.3)
-      actionpack (= 3.2.3)
-      activesupport (= 3.2.3)
-      rack-ssl (~> 1.3.2)
+    railties (3.0.8)
+      actionpack (= 3.0.8)
+      activesupport (= 3.0.8)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
+      thor (~> 0.14.4)
+    rake (10.0.3)
+    rdoc (4.0.0)
       json (~> 1.4)
-    redis (2.2.2)
-    redis-namespace (1.0.3)
-      redis (< 3.0.0)
-    resque (1.20.0)
+    redis (3.0.3)
+    redis-namespace (1.2.1)
+      redis (~> 3.0.0)
+    resque (1.23.1)
       multi_json (~> 1.0)
-      redis-namespace (~> 1.0.2)
+      redis-namespace (~> 1.0)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    rspec-rails (2.9.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    rspec-rails (2.13.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.9.0)
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    sprockets (2.1.2)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    sinatra (1.2.9)
+      backports
+      rack (~> 1.1, < 1.5)
+      tilt (>= 1.2.2, < 2.0)
     thor (0.14.6)
-    tilt (1.3.3)
-    timecop (0.3.5)
+    tilt (1.3.6)
+    timecop (0.6.1)
+    tzinfo (0.3.37)
     vegas (0.1.11)
       rack (>= 1.0.0)
 
@@ -100,6 +82,5 @@ DEPENDENCIES
   jeweler
   rake
   resque
-  resque-history!
   rspec-rails
   timecop

data/VERSION

@@ -1 +1 @@
-1.9.5
+1.10.0

data/lib/resque-history/helpers/helper.rb

@@ -18,7 +18,11 @@ module Resque
         end
       end
 
+      def resque_history_total_jobs
+        Resque.redis.llen(Resque::Plugins::History::HISTORY_SET_NAME)
+      end
+
     end
   end
 
-end
+end

data/lib/resque-history/server/views/history.erb

@@ -1,4 +1,4 @@
-<% size = Resque.redis.llen(Resque::Plugins::History::HISTORY_SET_NAME) %>
+<% size = resque_history_total_jobs %>
 <% start = params[:start].to_i %>
 <% history = Resque.redis.lrange(Resque::Plugins::History::HISTORY_SET_NAME, start, start + 20)%>
 
@@ -10,7 +10,13 @@
   </form>
 <% end %>
 
-<p class='intro'>Showing <%=start%> to <%= start + 20 %> of <b><%= size = Resque.redis.llen(Resque::Plugins::History::HISTORY_SET_NAME) %></b> jobs</p>
+<p class='intro'>Showing <%= start %> to
+  <% if size > 20 %>
+    <%= start + 20 %> of <b><%= size %></b>
+  <% else %>
+    <%= size %>
+  <% end %>jobs</p>
+
 <div id="main">
   <%= partial :next_more, :start => params[:start].to_i, :size => size %>
 

data/resque-history.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "resque-history"
-  s.version = "1.9.5"
+  s.version = "1.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Katzmopolitan"]
-  s.date = "2012-09-30"
+  s.date = "2013-03-24"
   s.description = "Show history of recently executed jobs"
   s.email = "ilyakatz@gmail.com"
   s.extra_rdoc_files = [
@@ -49,46 +49,34 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://github.com/ilyakatz/resque-history"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "Show history of recently executed jobs"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<resque-history>, [">= 0"])
-      s.add_runtime_dependency(%q<rake>, [">= 0"])
       s.add_runtime_dependency(%q<resque>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rspec-rails>, [">= 0"])
       s.add_development_dependency(%q<timecop>, [">= 0"])
-      s.add_development_dependency(%q<timecop>, [">= 0"])
-      s.add_development_dependency(%q<timecop>, [">= 0"])
-      s.add_development_dependency(%q<timecop>, [">= 0"])
     else
-      s.add_dependency(%q<resque-history>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<resque>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, [">= 0"])
       s.add_dependency(%q<timecop>, [">= 0"])
-      s.add_dependency(%q<timecop>, [">= 0"])
-      s.add_dependency(%q<timecop>, [">= 0"])
-      s.add_dependency(%q<timecop>, [">= 0"])
     end
   else
-    s.add_dependency(%q<resque-history>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<resque>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, [">= 0"])
     s.add_dependency(%q<timecop>, [">= 0"])
-    s.add_dependency(%q<timecop>, [">= 0"])
-    s.add_dependency(%q<timecop>, [">= 0"])
-    s.add_dependency(%q<timecop>, [">= 0"])
   end
 end
 

data/spec/redis-test.conf

@@ -109,7 +109,3 @@ databases 16
 
 ############################### ADVANCED CONFIG ###############################
 
-# Glue small output buffers together in order to send small replies in a
-# single TCP packet. Uses a bit more CPU but most of the times it is a win
-# in terms of number of queries per second. Use 'yes' if unsure.
-glueoutputbuf yes

data/spec/resque-web_spec.rb

@@ -41,6 +41,11 @@ describe ResqueHistory::Server do
     last_response.body.should_not include("HistoryJob")
   end
 
+  it "should not show full message if there is small number of jobs in the history" do
+    get '/history'
+    last_response.body.should =~ /Showing 0 to.*jobs/m
+  end
+
 end
 
 class HistoryJob
@@ -49,4 +54,4 @@ class HistoryJob
 
   def self.perform(*args)
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-history
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-30 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: resque-history
+  name: resque
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -35,23 +35,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: resque
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -123,54 +107,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Show history of recently executed jobs
 email: ilyakatz@gmail.com
 executables: []
@@ -222,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -612062995805631978
+      hash: 3341239409612412022
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -231,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Show history of recently executed jobs