resque-history 1.11.1 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa35ed2dfe0f60b32150577161ca889b893b754a
-  data.tar.gz: 7236586bba0430076eb1ba86db5c34fb15eda97b
+  metadata.gz: 490052374b0f9d30b459eca8728055ef86af926e
+  data.tar.gz: 97c09f70ad5d9c1d96c4f550ef5c51e74a21479e
 SHA512:
-  metadata.gz: 00d3f7c8e6f0db8d3f127501dc616fb36857ac01e158ba620bf4788cc1d6af859b961d87b5cdb20d68cf51688efe0dd9c3306f2840adfbceb8616ee351f41ace
-  data.tar.gz: 155ab5aef8e9deac61b9bff159a60e248dfa397e93c6d1cc203296257cc3bae7dad806b45e1f286928f13804706bc198253ffc80b3c6262feacb71922d3294fe
+  metadata.gz: 65722fb443ad4a41d9f239c2225bac36d93d9ab66ff64c44ef0d9407a412b93b2df4567a8742220ff2eeb9b08c8c3e10168c7404dbf900ad66b02df144dad9fe
+  data.tar.gz: bfa4894efca67f0ca4df54a2c8dce5d01494139a9d5590965b10b2d4f04079e6c64f95e47bc5d5c4c0ef8b99ff8d65a104244533deeb9ba8aa833a00532b35d0

data/.travis.yml

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

data/Gemfile.lock

@@ -1,51 +1,50 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.5)
+    addressable (2.3.6)
     backports (3.1.1)
     builder (3.2.2)
-    diff-lcs (1.2.2)
-    faraday (0.8.8)
+    diff-lcs (1.2.5)
+    faraday (0.8.9)
       multipart-post (~> 1.2.0)
-    git (1.2.6)
-    github_api (0.10.1)
+    git (1.2.8)
+    github_api (0.10.2)
       addressable
-      faraday (~> 0.8.1)
+      faraday (~> 0.8.7)
       hashie (>= 1.2)
       multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
+      nokogiri (~> 1.6.0)
       oauth2
-    hashie (2.0.5)
-    highline (1.6.20)
-    httpauth (0.2.0)
-    jeweler (1.8.8)
+    hashie (3.3.1)
+    highline (1.6.21)
+    jeweler (2.0.1)
       builder
-      bundler (~> 1.0)
+      bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
     json (1.8.1)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
+    jwt (1.0.0)
+    mini_portile (0.6.0)
     multi_json (1.7.1)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
     rack (1.4.5)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.1.0)
-    rdoc (4.0.1)
+    rake (10.3.2)
+    rdoc (4.1.1)
       json (~> 1.4)
     redis (3.0.3)
     redis-namespace (1.2.1)
@@ -55,17 +54,21 @@ GEM
       redis-namespace (~> 1.0)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.1)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.0)
+      rspec-support (~> 3.1.0)
     rspec-rails (1.3.2)
       rack (>= 1.0.0)
       rspec (>= 1.3.0)
+    rspec-support (3.1.0)
     sinatra (1.2.9)
       backports
       rack (~> 1.1, < 1.5)

data/LICENSE

@@ -1,20 +1,21 @@
-Copyright (c) Ilya Katz (ilyakatz@gmail.com)
+The MIT License (MIT)
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Copyright (c) 2013 Ilya Katz
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/VERSION

@@ -1 +1 @@
-1.11.1
+1.12.0

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

@@ -1,12 +1,20 @@
-<% if  start - 20 >= 0 || start + 20 <= size %>
-    <p class='pagination'>
-      <% if start - 20 >= 0 %>
-          <a href="<%= current_page %>?start=<%= start - 20 %>" class='less'>&laquo; less</a>
-      <% end %>
-      <% if start + 20 < size %>
-          <a href="<%= current_page %>?start=<%= start + 20 %>" class='more'>more &raquo;</a>
-      <% end %>
-    </p>
-<% end %>
+<% per_page ||= 20 %>
+<%if  start - per_page >= 0 || start + per_page <= size%>
+<p class='pagination'>
+  <% if start - per_page >= 0 %>
+    <a href="<%= current_page %>?start=<%= start - per_page %>" class='less'>&laquo; Previous</a>
+  <% end %>
 
+  <% (0...(size / per_page.to_f).ceil).each do |page_num| %>
+    <% if start == page_num * per_page %>
+       <%= page_num + 1 %>
+    <% else %>
+      <a href="<%= current_page %>?start=<%= page_num * per_page %>"> <%= page_num + 1 %></a>
+    <% end %>
+  <% end %>
 
+  <% if start + per_page <= size %>
+    <a href="<%= current_page %>?start=<%= start + per_page %>" class='more'>Next &raquo;</a>
+  <% end %>
+</p>
+<%end%>

data/resque-history.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: resque-history 1.12.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "resque-history"
-  s.version = "1.11.1"
+  s.version = "1.12.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Katzmopolitan"]
-  s.date = "2013-11-14"
+  s.date = "2014-09-07"
   s.description = "Show history of recently executed jobs"
   s.email = "ilyakatz@gmail.com"
   s.extra_rdoc_files = [
@@ -18,7 +20,6 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
-    ".rvmrc",
     ".travis.yml",
     "Changelog.md",
     "Gemfile",
@@ -36,6 +37,7 @@ Gem::Specification.new do |s|
     "lib/version.rb",
     "resque-history.gemspec",
     "spec/redis-test.conf",
+    "spec/redis/.keep",
     "spec/resque-history/plugins/history_spec.rb",
     "spec/resque-history/resque_history_helper_spec.rb",
     "spec/resque-web_spec.rb",
@@ -44,8 +46,7 @@ Gem::Specification.new do |s|
     "test/test_resque-history.rb"
   ]
   s.homepage = "https://github.com/ilyakatz/resque-history"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.0"
+  s.rubygems_version = "2.2.0"
   s.summary = "Show history of recently executed jobs"
 
   if s.respond_to? :specification_version then

data/spec/redis-test.conf

@@ -1,111 +1,16 @@
-# Redis configuration file example
-
-# By default Redis does not run as a daemon. Use 'yes' if you need it.
-# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
 daemonize yes
-
-# When run as a daemon, Redis write a pid file in /var/run/redis.pid by default.
-# You can specify a custom pid file location here.
-pidfile ./spec/redis-test.pid
-
-# Accept connections on the specified port, default is 6379
+pidfile redis-test.pid
 port 9736
-
-# If you want you can bind a single interface, if the bind option is not
-# specified all the interfaces will listen for connections.
-#
-# bind 127.0.0.1
-
-# Close the connection after a client is idle for N seconds (0 to disable)
 timeout 300
 
-# Save the DB on disk:
-#
-#   save <seconds> <changes>
-#
-#   Will save the DB if both the given number of seconds and the given
-#   number of write operations against the DB occurred.
-#
-#   In the example below the behaviour will be to save:
-#   after 900 sec (15 min) if at least 1 key changed
-#   after 300 sec (5 min) if at least 10 keys changed
-#   after 60 sec if at least 10000 keys changed
 save 900 1
 save 300 10
 save 60 10000
 
-# The filename where to dump the DB
 dbfilename dump.rdb
 
-# For default save/load DB in/from the working directory
-# Note that you must specify a directory not a file name.
-dir ./spec/
+dir ./spec/redis
 
-# Set server verbosity to 'debug'
-# it can be one of:
-# debug (a lot of information, useful for development/testing)
-# notice (moderately verbose, what you want in production probably)
-# warning (only very important / critical messages are logged)
 loglevel debug
-
-# Specify the log file name. Also 'stdout' can be used to force
-# the demon to log on the standard output. Note that if you use standard
-# output for logging but daemonize, logs will be sent to /dev/null
 logfile stdout
-
-# Set the number of databases. The default database is DB 0, you can select
-# a different one on a per-connection basis using SELECT <dbid> where
-# dbid is a number between 0 and 'databases'-1
-databases 16
-
-################################# REPLICATION #################################
-
-# Master-Slave replication. Use slaveof to make a Redis instance a copy of
-# another Redis server. Note that the configuration is local to the slave
-# so for example it is possible to configure the slave to save the DB with a
-# different interval, or to listen to another port, and so on.
-
-# slaveof <masterip> <masterport>
-
-################################## SECURITY ###################################
-
-# Require clients to issue AUTH <PASSWORD> before processing any other
-# commands.  This might be useful in environments in which you do not trust
-# others with access to the host running redis-server.
-#
-# This should stay commented out for backward compatibility and because most
-# people do not need auth (e.g. they run their own servers).
-
-# requirepass foobared
-
-################################### LIMITS ####################################
-
-# Set the max number of connected clients at the same time. By default there
-# is no limit, and it's up to the number of file descriptors the Redis process
-# is able to open. The special value '0' means no limts.
-# Once the limit is reached Redis will close all the new connections sending
-# an error 'max number of clients reached'.
-
-# maxclients 128
-
-# Don't use more memory than the specified amount of bytes.
-# When the memory limit is reached Redis will try to remove keys with an
-# EXPIRE set. It will try to start freeing keys that are going to expire
-# in little time and preserve keys with a longer time to live.
-# Redis will also try to remove objects from free lists if possible.
-#
-# If all this fails, Redis will start to reply with errors to commands
-# that will use more memory, like SET, LPUSH, and so on, and will continue
-# to reply to most read-only commands like GET.
-#
-# WARNING: maxmemory can be a good idea mainly if you want to use Redis as a
-# 'state' server or cache, not as a real DB. When Redis is used as a real
-# database the memory usage will grow over the weeks, it will be obvious if
-# it is going to use too much memory in the long run, and you'll have the time
-# to upgrade. With maxmemory after the limit is reached you'll start to get
-# errors for write operations, and this may even lead to DB inconsistency.
-
-# maxmemory <bytes>
-
-############################### ADVANCED CONFIG ###############################
-
+databases 1

data/spec/resque-history/plugins/history_spec.rb

@@ -34,22 +34,25 @@ describe Resque::Plugins::History do
       arr = Resque.redis.lrange(Resque::Plugins::History::HISTORY_SET_NAME, 0, -1)
 
       arr.count.should == 1
-      JSON.parse(arr.first).should == {"class"=>"HistoryJob", "args"=>[12], "time"=>"2000-09-01 12:00", "execution"=>0}
+      expected = {
+        "class" => "HistoryJob", "args" => [12],
+        "time" => "2000-09-01 12:00", "execution" => 0
+      }
+      expect(JSON.parse(arr.first)).to eq(expected)
     end
   end
 
   it "should use the max_history size of the history list" do
-    MaxHistoryJob.maximum_history_size.should == 15
+    expect(MaxHistoryJob.maximum_history_size).to eq 15
   end
 
-
   it "should set the default size of the history list to be 500" do
     HistoryJob.maximum_history_size.should == 500
   end
 
   it "should truncate the maximum" do
 
-    HistoryJob.stub(:maximum_history_size).and_return { 3 }
+    expect(HistoryJob).to receive(:maximum_history_size).at_least(:once).and_return(3)
 
     Resque.enqueue(HistoryJob, 15)
     Resque.enqueue(HistoryJob, 13)
@@ -94,14 +97,12 @@ describe Resque::Plugins::History do
 
     Resque.reset_history
 
-
     arr = Resque.redis.lrange(Resque::Plugins::History::HISTORY_SET_NAME, 0, -1)
 
     arr.count.should == 0
 
   end
 
-
   describe "record execution time" do
 
     it "should record execution time" do
@@ -157,12 +158,10 @@ describe Resque::Plugins::History do
 
       arr = Resque.redis.lrange(Resque::Plugins::History::HISTORY_SET_NAME, 0, -1)
 
-
       JSON.parse(arr.first)["class"].should =="SleepyHistoryJob"
       JSON.parse(arr.first)["args"].should ==[1]
       JSON.parse(arr.first)["execution"].should ==1
 
-
       JSON.parse(arr.last)["class"].should =="SleepyHistoryJob"
       JSON.parse(arr.last)["args"].should ==[3]
       JSON.parse(arr.last)["execution"].should ==3
@@ -178,7 +177,6 @@ describe Resque::Plugins::History do
       lambda { job.perform }.should raise_exception
       arr = Resque.redis.lrange(Resque::Plugins::History::HISTORY_SET_NAME, 0, -1)
 
-
       arr.count.should == 1
 
       JSON.parse(arr.first)["class"].should =="ExceptionJob"

data/spec/spec_helper.rb

@@ -45,19 +45,19 @@ RSpec.configure do |config|
     `redis-server #{File.dirname(File.expand_path(__FILE__))}/redis-test.conf`
     pid = ''
     while pid.empty? do
-      pid = `ps -e -o pid,command | grep [r]edis-test`.split(" ")[0]
+      pid = `cat #{File.dirname(File.expand_path(__FILE__))}/redis/redis-test.pid`
     end
+    puts "redis pid is #{pid}"
     Resque.redis = '127.0.0.1:9736'
   end
 
   config.before(:each) do
     Resque.redis.flushall
-    Kernel.stub!(:sleep)
   end
 
   config.after(:suite) do
-    pid = `ps -e -o pid,command | grep [r]edis-test`.split(" ")[0]
-    puts '', "Killing test redis server..."
+    pid = `cat #{File.dirname(File.expand_path(__FILE__))}/redis/redis-test.pid`
+    puts "Killing test redis server (pid: #{pid})..."
     Process.kill("KILL", pid.to_i)
     `rm -f #{File.dirname(File.expand_path(__FILE__))}/dump.rdb`
   end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: resque-history
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.12.0
 platform: ruby
 authors:
 - Katzmopolitan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2014-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Show history of recently executed jobs
@@ -130,9 +130,8 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .document
-- .rvmrc
-- .travis.yml
+- ".document"
+- ".travis.yml"
 - Changelog.md
 - Gemfile
 - Gemfile.lock
@@ -149,6 +148,7 @@ files:
 - lib/version.rb
 - resque-history.gemspec
 - spec/redis-test.conf
+- spec/redis/.keep
 - spec/resque-history/plugins/history_spec.rb
 - spec/resque-history/resque_history_helper_spec.rb
 - spec/resque-web_spec.rb
@@ -164,17 +164,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Show history of recently executed jobs

data/.rvmrc

@@ -1,2 +0,0 @@
-rvm ruby-1.9.3
-rvm gemset use resque-history --create