afterparty 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: 5d17a9d413c53f3fbac4701c2c6b3019141b94f3
-  data.tar.gz: de82e598bc016faa80d7fa4879ca0084f372588c
+  metadata.gz: 1cd702bf393ba9846ebeea3e8195dd7f76914488
+  data.tar.gz: a7f24532f757b22660d31720ccd0bec948ba7545
 !binary "U0hBNTEy":
-  metadata.gz: abb7fba4469a92003e3a439ae9514088e5f9312547216a75386856af95cd3e6ecda7d7e0b4259556fb778bc67a4d3db0b10618a3c01a13dcd15545901ac49472
-  data.tar.gz: 7d475a34daa110341d5401cb08a6f1186add9a584aaffe4f0551e5337d8633e4431aca2c9b66d2c91d45e87827975d9e6f9712aa7c2ba64038925f2fbfd5b45a
+  metadata.gz: 86e634284043827e87dcdc3fce39e5be359a3592077dca1427041faa9f1fd147e9d1ed374b6241643836617b5393da9822fca6d985db39d5c6431fa53d5667b1
+  data.tar.gz: c49dbbed658e44ab6a7eb1cc55d0528621a6eb17612744e7f733a00cf91770d0c398d360f1628b7c20cf44310f1657f515c41b773d6f61263479470698493ec2

data/.travis.yml

@@ -2,7 +2,5 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-services:
-  - redis-server
 env:
   - AFTERPARTY_JOB_TIME=15 AFTERPARTY_SLOW_TIME=50

data/README.md

@@ -57,11 +57,13 @@ mailer_job.execute_at = Time.now + 20.minutes
 Rails.configuration.queue << mailer_job
 
 job = Afterparty::BasicJob.new @user, :reset_password
-Rails.configuration.queue << mailer_job
+Rails.configuration.queue << job
 ~~~
 
 ### Dashboard
 
+![dashboard screenshot](https://raw.github.com/hstove/afterparty/master/docs/dashboard.png)
+
 This gem provides a handy dashboard for inspecting, debugging, and re-running jobs.
 
 Visit [http://localhost:3000/afterparty/](http://localhost:3000/afterparty/) and login with
@@ -90,6 +92,10 @@ before_fork do |server, worker|
 
 This has the advantage of, for example, staying within Heroku's free tier by not running a worker dyno.
 
+## TODO
+
+* Finish namespacing support by adding documentation and allowing a worker rake task to pull jobs from a custom (or all) queues.
+
 ## Contributing
 
 1. Fork it

data/lib/afterparty/afterparty_job.rb

@@ -5,6 +5,7 @@ class AfterpartyJob < ::ActiveRecord::Base
 
   validates_presence_of :job_dump, :execute_at, :queue
 
+  scope :namespaced, lambda { |name| where(queue: name) }
   scope :incomplete, -> { where(completed: false).order("execute_at") }
   scope :valid, -> { incomplete.where(execute_at: 10.years.ago..DateTime.now) }
   scope :completed, -> { where(completed: true).order("execute_at desc") }
@@ -28,4 +29,13 @@ class AfterpartyJob < ::ActiveRecord::Base
       j.run
     end
   end
+
+  # def self.namespaced name
+  #   where(queue: name)
+  # end
+
+  # def namespaced name
+  #   where(queue: name)
+  # end
+
 end

data/lib/afterparty/queue.rb

@@ -3,16 +3,6 @@ module Afterparty
     attr_accessor :options, :temp_namespace, :login_block
     include Afterparty::QueueHelpers
 
-    def initialize options={}, consumer_options={}
-      # @consumer = ThreadedQueueConsumer.new(self, consumer_options).start
-      @options = options
-      @options[:namespace] ||= "default"
-      # Afterparty.add_queue @options[:namespace]
-      @options[:sleep] ||= 5
-      @mutex = Mutex.new
-      @options[:logger] ||= Logger.new($stderr)
-    end
-
     def push job
       # @mutex.synchronize do
         return nil if job.nil?
@@ -27,8 +17,6 @@ module Afterparty
       # @mutex.synchronize do
         while true do
           unless (_job = AfterpartyJob.valid.first).nil?
-            ap "poppin job"
-            _job.completed = true
             _job.save
             return _job
           end
@@ -41,7 +29,7 @@ module Afterparty
   class TestQueue < Queue
     attr_accessor :completed_jobs
     
-    def initialize opts={}, consumer_opts={}
+    def initialize opts={}
       super
       @completed_jobs = []
       @exceptions = []

data/lib/afterparty/queue_helpers.rb

@@ -1,36 +1,25 @@
 module Afterparty
   module QueueHelpers
-    def [] namespace
-      @temp_namespace = namespace
+
+    def initialize options = {}
+      @options = options
+      @options[:namespace] ||= :default
+      @options[:sleep] ||= 10
+      @options[:logger] ||= Logger.new($stderr)
+      self
     end
 
-    def redis_queue_name  
-      puts (a = Afterparty.redis_queue_name(@temp_namespace || @options[:namespace]))
-      a
+    def [] namespace
+      @temp_namespace = namespace
     end
 
     def clear
       # redis_call :del
-      AfterpartyJob.destroy_all
-    end
-
-    def redis_call command, *args
-      result = Afterparty.redis_call (@temp_namespace || @options[:namespace]), command, *args
-      @temp_namespace = nil
-      result
-    end
-
-    def async_redis_call &block
-      Afterparty.redis.pipelined &block
+      AfterpartyJob.namespaced(@options[:namespace]).destroy_all
     end
 
     def jobs
-      # _jobs = redis_call(:zrange, 0, -1)
-      # _jobs.each_with_index do |job, i|
-      #   _jobs[i] = Marshal.load(job)
-      # end
-      # _jobs
-      AfterpartyJob.incomplete
+      AfterpartyJob.namespaced(@options[:namespace]).incomplete
     end
 
     def jobs_with_scores
@@ -38,41 +27,27 @@ module Afterparty
     end
 
     def valid_jobs
-      # redis_call :zrangebyscore, 0, Time.now.to_i
-      AfterpartyJob.valid
+      AfterpartyJob.namespaced(@options[:namespace]).valid
     end
 
     def next_valid_job
-      # valid_jobs.first
-      AfterpartyJob.valid.first
+      AfterpartyJob.namespaced(@options[:namespace]).valid.first
     end
 
     def jobs_empty?
-      # count = total_jobs_count
-      # # ap count
-      # count == 0
-      AfterpartyJob.valid.empty?
+      AfterpartyJob.namespaced(@options[:namespace]).valid.empty?
     end
 
     def total_jobs_count
-      # redis_call(:zcount, "-inf", "+inf")
-      AfterpartyJob.incomplete.count
-    end
-
-    def redis
-      @@redis
+      AfterpartyJob.namespaced(@options[:namespace]).incomplete.count
     end
 
     def last_completed
-      # @temp_namespace = "completed"
-      # redis_call(:zrange, -1, -1).first
-      AfterpartyJob.completed.first
+      AfterpartyJob.namespaced(@options[:namespace]).completed.first
     end
 
     def completed
-      # @temp_namespace = "completed"
-      # redis_call(:zrange, -20, -1).reverse
-      AfterpartyJob.completed
+      AfterpartyJob.namespaced(@options[:namespace]).completed
     end
 
     def completed_with_scores
@@ -121,14 +96,6 @@ module Afterparty
 
     private
 
-    def hash_from_scores raw
-      arr = []
-      raw.each do |group|
-        arr << Afterparty::JobContainer.new(group[0], group[1])
-      end
-      arr
-    end
-
     # returns true if job has an :execute_at value
     def job_valid? job
       job.respond_to?(:execute_at) && !job.execute_at.nil?

data/lib/afterparty/version.rb

@@ -1,3 +1,3 @@
 module Afterparty
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/afterparty/worker.rb

@@ -2,15 +2,6 @@ module Afterparty
   class Worker
     include QueueHelpers
 
-    def initialize options = {}
-      @options = options
-      @options[:adapter] ||= :redis
-      @options[:namespace] ||= :default
-      @options[:sleep] ||= 10
-      @options[:logger] ||= Logger.new($stderr)
-      self
-    end
-
     def consume
       @stopped = false
       # puts "starting worker with namespace [#{@options[:namespace]}]."

data/spec/afterparty_job_spec.rb

@@ -10,8 +10,8 @@ describe AfterpartyJob do
     job = AfterpartyJob.make_with_job tester
     job.reload
     (reloaded = job.reify).class.should == tester.class
-    reloaded.execute_at.should == tester.execute_at
-    job.execute_at.should == reloaded.execute_at
+    reloaded.execute_at.utc.to_i.should == tester.execute_at.utc.to_i
+    job.execute_at.utc.to_i.should == reloaded.execute_at.utc.to_i
   end
 
 end

data/spec/helpers.rb

@@ -16,7 +16,7 @@ module Afterparty
 end
 
 class TestJob
-  attr_accessor :execute_at
+  attr_accessor :execute_at, :name
 
   def initialize &block
     @block = block

data/spec/queue_functional_spec.rb

@@ -1,11 +1,7 @@
 require 'spec_helper'
 describe Afterparty::Queue do
   before do
-    # require 'open-uri'
-    # uri = URI.parse("redis://localhost:6379")
-    # redis = Redis.new(:host => uri.host, :port => uri.port, :password => uri.password)
-    # Afterparty.redis = redis
-    @q = Afterparty::TestQueue.new({sleep: 0.5, namespace: "master_test"})
+    @q = Afterparty::Queue.new({sleep: 0.5})
   end
 
   after do
@@ -14,7 +10,6 @@ describe Afterparty::Queue do
 
   before :each do
     @worker = Afterparty::Worker.new({sleep: 0.5})
-    # @worker.consume
     @q.clear
     @job_time = (ENV['AFTERPARTY_JOB_TIME'] || 5).to_i
     @slow_job_time = (ENV['AFTERPARTY_SLOW_TIME'] || 7).to_i
@@ -54,7 +49,6 @@ describe Afterparty::Queue do
     lambda {
       @worker.consume_next
     }.should change{ @q.total_jobs_count }.by(0)
-    # @q.jobs.size.should eq(1)
   end
 
   it "waits the correct amount of time to execute a job" do

data/spec/queue_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+describe Afterparty::Queue do
+  before do
+    @q = Afterparty::Queue.new
+  end
+
+  before :each do
+    @q.clear
+  end
+
+  it "should make a wrapper job when a job is pushed" do
+    job = nil
+    tester = test_job
+    time = tester.execute_at = Time.now + 10.seconds
+    -> {
+      job = @q.push tester
+    }.should change{ AfterpartyJob.count }.by(1)
+    job.execute_at.utc.to_i.should == tester.execute_at.utc.to_i
+  end
+
+  it "should return a wrapper job for #push" do
+    @q.push(test_job).class.should == AfterpartyJob
+  end
+
+  it "only returns valid jobs for #pop" do
+    tester = test_job(60)
+    @q.push tester
+    tester2 = test_job
+    tester2.name = "testable"
+    @q.push tester2
+    wrapper = @q.pop
+    popped_job = wrapper.reify
+    popped_job.name.should == tester2.name
+    popped_job.execute_at.should == nil
+  end
+
+  it "supports namespacing" do
+    queue = Afterparty::Queue.new namespace: "tester"
+    queue.clear
+    @q.clear
+    tester = test_job
+    tester.name = 'testy'
+    job = queue.push(tester)
+    job.queue.should == "tester"
+    wrapper = queue.pop
+    (inner = wrapper.reify).name.should == "testy"
+    wrapper.queue.should == "tester"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: afterparty
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Hank Stoever
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -88,6 +88,7 @@ files:
 - app/controllers/afterparty/dashboard_controller.rb
 - app/views/afterparty/dashboard/index.html.haml
 - config/routes.rb
+- docs/dashboard.png
 - dump.rdb
 - lib/afterparty.rb
 - lib/afterparty/afterparty_job.rb
@@ -109,6 +110,7 @@ files:
 - spec/helpers.rb
 - spec/queue_functional_spec.rb
 - spec/queue_helpers_spec.rb
+- spec/queue_spec.rb
 - spec/schema.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -142,6 +144,7 @@ test_files:
 - spec/helpers.rb
 - spec/queue_functional_spec.rb
 - spec/queue_helpers_spec.rb
+- spec/queue_spec.rb
 - spec/schema.rb
 - spec/spec_helper.rb
 has_rdoc: