Try to bring this to the modern age

matthewrudy · Jul 24, 2013 · 930726c · 930726c
1 parent 1f6ab14
commit 930726c
Show file tree

Hide file tree

Showing 12 changed files with 192 additions and 121 deletions.
diff --git a/.rspec b/.rspec
@@ -0,0 +1,2 @@
+--color
+--format progress
diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,7 @@
+# A sample Gemfile
+source "https://rubygems.org"
+
+gem "activesupport"
+gem "activerecord"
+gem "mysql2"
+gem "rspec"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -0,0 +1,46 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.0)
+    atomic (1.1.10)
+    builder (3.1.4)
+    diff-lcs (1.2.4)
+    i18n (0.6.4)
+    minitest (4.7.5)
+    multi_json (1.7.7)
+    mysql2 (0.3.13)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.4)
+    rspec-expectations (2.14.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.1)
+    thread_safe (0.1.2)
+      atomic
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord
+  activesupport
+  mysql2
+  rspec
diff --git a/Rakefile b/Rakefile
@@ -1,19 +1,10 @@
-require 'rake'
-require 'spec'
-require 'spec/rake/spectask'
-require 'rake/rdoctask'
-
-desc 'Default: run the specs.'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
 
-desc 'Run specs for rude_q plugin'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts = ['--options', "\"spec/spec.opts\""]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
-
+require 'rdoc/task'
 desc 'Generate documentation for the rude_q plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
+RDoc::Task.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'RudeQ'
   rdoc.options << '--line-numbers' << '--inline-source'

diff --git a/lib/rude_q.rb b/lib/rude_q.rb
@@ -31,7 +31,7 @@ module ClassMethods
     def cleanup!(expiry=1.hour)
       self.delete_all(["processed = ? AND updated_at < ?", true, expiry.to_i.ago])
     end
-  
+
     # Add any serialize-able +data+ to the queue +queue_name+ (strings and symbols are treated the same)
     #   RudeQueue.set(:sausage_queue, Sausage.new(:sauce => "yummy"))
     #   RudeQueue.set("sausage_queue", Sausage.new(:other => true))
@@ -62,7 +62,7 @@ def set(queue_name, data)
     #   -> nil
     def get(queue_name)
       qname = sanitize_queue_name(queue_name)
-      
+
       fetch_with_lock(qname) do |record|
         if record
           processed!(record)
@@ -109,7 +109,7 @@ def backlog(queue_name=nil)
       end
       self.count(:conditions => conditions)
     end
-    
+
     def fetch_with_lock(qname, &block) # :nodoc:
       lock = case queue_options[:lock]
       when :pessimistic then RudeQ::PessimisticLock
@@ -119,7 +119,7 @@ def fetch_with_lock(qname, &block) # :nodoc:
       end
       lock.fetch_with_lock(self, qname, &block)
     end
-    
+
     # class method to make it more easily stubbed
     def processed!(record) # :nodoc:
       case queue_options[:processed]
@@ -132,7 +132,7 @@ def processed!(record) # :nodoc:
       end
     end
     protected :processed!
-    
+
     # configure your RudeQ
     # ==== :processed - what do we do after retrieving a queue item?
     # * <tt>:set_flag</tt> - set the +processed+ flag to +true+ (keep data in the db) [*default*]
@@ -152,33 +152,33 @@ def data=(value) # :nodoc:
       self[:data] = YAML.dump(value)
     end
     private
-    
+
     def sanitize_queue_name(queue_name) # :nodoc:
       queue_name.to_s
     end
   end
-  
+
   # uses standard ActiveRecord :lock => true
   # this will invoke a lock on the particular queue
   #   eg. daemon1: RudeQueue.get(:abc)
   #       daemon2: RudeQueue.get(:abc) - will have to wait for daemon1 to finish
   #       daemon3: RudeQueue.get(:def) - will avoid the lock
   module PessimisticLock
     class << self
-      
+
       def fetch_with_lock(klass, qname) # :nodoc:
         klass.transaction do
           record = klass.find(:first,
             :conditions => {:queue_name => qname, :processed => false},
             :lock => true, :order => "id ASC", :limit => 1)
-      
+
           return yield(record)
         end
       end
-    
+
     end
   end
-  
+
   # a crazy hack around database locking
   # that I thought was a good idea
   # turns out we can't make it use transactions properly
@@ -189,14 +189,15 @@ def fetch_with_lock(klass, qname) # :nodoc:
   # and as of RudeQueue2, you'll need to manually add the "token" column
   module TokenLock
     class << self
-      
+
       require 'digest/sha1'
-
+      require 'socket'
+
       def fetch_with_lock(klass, qname) # :nodoc:
         token = get_unique_token
         klass.update_all(["token = ?", token], ["queue_name = ? AND processed = ? AND token IS NULL", qname, false], :limit => 1, :order => "id ASC")
         record = klass.find_by_queue_name_and_token_and_processed(qname, token, false)
-      
+
         return yield(record)
       end
 

diff --git a/lib/rude_q/worker.rb b/lib/rude_q/worker.rb
@@ -1,3 +1,5 @@
+require 'rude_q/scope'
+
 # example worker class: lib/my_worker.rb
 #   class MyWorker < RudeQ::Worker
 #     def queue_name
@@ -25,11 +27,11 @@ class Worker
     def queue_name
       raise NotImplementedError
     end
-    
+
     def do_work(data)
       raise NotImplementedError
     end
-    
+
     def do!
       logger.info("starting up")
       if work = self.queue.get
@@ -39,8 +41,8 @@ def do!
         logger.info("couldn't find any work")
       end
       logger.info("finished for now")
-    end      
-  
+    end
+
     def logger
       unless @logger
         @logger = Logger.new(RAILS_ROOT + "/log/#{self.class.to_s.underscore}_#{RAILS_ENV}.log")

diff --git a/spec/database.yml b/spec/database.yml
@@ -1,4 +1,8 @@
+# CREATE USER 'rude_q'@'localhost';
+# GRANT ALL PRIVILEGES ON rude_q_test.* to 'rude_q'@'localhost';
+# CREATE DATABASE rude_q_test
+
 rude_q_test:
-  adapter: mysql
+  adapter: mysql2
   username: rude_q
   database: rude_q_test
diff --git a/spec/models/rude_queue.rb b/spec/models/rude_queue.rb
@@ -1,14 +1,17 @@
+require 'rude_q'
+
 class RudeQueue < ActiveRecord::Base
   include RudeQ
-  
+
   class << self
     def processed_with_raise_hack!(*args)
       processed_without_raise_hack!(*args)
       raise RuntimeError if raise_on_processed # want to be able to raise afterwards to check transactions
     end
-    alias_method_chain :processed!, :raise_hack
+    alias :processed_without_raise_hack! :processed!
+    alias :processed! :processed_with_raise_hack!
     attr_accessor :raise_on_processed
   end
-    
+
 end