pgq 0.1.2 → 0.1.3

data/.gitignore

@@ -1,4 +1,8 @@
 TODO
 *.gem
 lib/serv
-README2
+README2
+Gemfile.lock
+pgq_test.ini
+log/
+tmp/

data/README.md

@@ -1,7 +1,7 @@
-Pgq Rails
-=========
+Pgq
+===
 
-Queues system for AR/Rails based on PgQ Skytools for PostgreSQL, like Resque on Redis. Rails 3! only tested.
+Queues system for AR/Rails based on PgQ Skytools for PostgreSQL, like Resque on Redis. Rails 2.3 and 3 compatible.
  
 About PgQ
 *  http://wiki.postgresql.org/wiki/SkyTools#PgQ
@@ -22,9 +22,9 @@ Gemfile:
 gem 'pgq'
 ```
 
-Create ticker configs:
+Create ticker configs from database.yml:
 
-    $ rails generate pgq:config
+    $ rake pgq:generate_configs 
     edit config: config/pgq_development.ini
 
 
@@ -46,7 +46,7 @@ Daemon run once, bind to the database. (If worker not consuming check that daemo
 
 Last, add to config/application.rb
 
-    config.autoload_paths += %W( #{config.root}/app/models/pgq )
+    config.autoload_paths += %W( #{config.root}/app/workers )
     
 
 Create Pgq consumer
@@ -55,7 +55,7 @@ Create Pgq consumer
     $ rails generate pgq:add my
 
 
-This creates file app/models/pgq/pgq_my.rb and migration
+This creates file app/workers/pgq_my.rb and migration
 
     $ rake db:migrate
 
@@ -174,7 +174,7 @@ class Pgq::Consumer
 
   # specify coder  
   def self.coder
-    Pgq::Marshal64Coder
+    Marshal64 # class/module with self methods dump/load
   end
     
 end
@@ -188,4 +188,17 @@ Usefull in specs
 ```
  
 When code call PgqMy.some_method1(a,b,c) this would be convert into PgqMy.new.some_method1(a,b,c)
-  
+  
+  
+### for Rails 2.3
+
+Add to Rakefile:
+```
+load 'tasks/pgq.rake'
+```
+
+Copy generators from gem to lib/generators.
+
+```
+./script/generate pgq bla
+```

data/Rakefile

@@ -3,7 +3,24 @@ require 'bundler/setup'
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
+load 'lib/tasks/pgq.rake'
+
 require 'rspec/core/rake_task'
 
 task :default => :spec
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec)
+
+desc "set_env" 
+task :set_env do
+  ENV["PGQFILE"] = File.join(File.dirname(__FILE__), %w{ spec app config pgq_test.ini })
+  ENV["RAILS_ROOT"] = File.join(File.dirname(__FILE__), %w{ spec app })
+  ENV["RAILS_ENV"] = "test"        
+end
+
+desc "prepare test"
+task :prepare_test => :set_env do
+  Rake::Task["pgq:generate_config"].invoke
+  Rake::Task["pgq:install"].invoke
+end
+
+task :spec => :prepare_test

data/lib/generators/pgq/add_generator.rb

@@ -1,8 +1,10 @@
+# for Rails 3
+if defined?(Rails) && Rails::VERSION::MAJOR >= 3
+
 module Pgq
-  class AddGenerator < Rails::Generators::Base
+  class AddGenerator < Rails::Generators::NamedBase
     include Rails::Generators::Migration
-    source_root File.expand_path("../add_templates", __FILE__)
-    argument :queue_name, :type => :string
+    source_root File.expand_path("../templates", __FILE__)
     
     def self.next_migration_number(path)
       Time.now.utc.strftime("%Y%m%d%H%M%S")
@@ -21,20 +23,12 @@ module Pgq
     end
     
     def add_files
-      template "pgq_class.rb", "app/models/pgq/pgq_#{name}.rb"
-      template "spec.rb", "spec/models/pgq/pgq_#{name}_spec.rb"
-      migration_template "migration.rb", "db/migrate/create_#{name}_queue.rb"
-    end
-    
-  private
-  
-    def name 
-      queue_name.underscore
-    end
-    
-    def name_c
-      name.camelize
+      template "pgq_class.rb", "app/workers/pgq_#{file_path}.rb"
+      template "spec.rb", "spec/workers/pgq_#{file_path}_spec.rb"
+      migration_template "migration.rb", "db/migrate/create_#{file_path}_queue.rb"
     end
   end
   
 end
+
+end

data/lib/generators/pgq/pgq_generator.rb

@@ -0,0 +1,34 @@
+# for Rails 2
+if defined?(Rails) && Rails::VERSION::MAJOR == 2
+
+module Pgq
+
+  class PgqGenerator < Rails::Generator::NamedBase
+    def manifest
+      record do |m|
+        m.template "pgq_class.rb", "app/workers/pgq_#{file_path}.rb"
+        m.directory "spec/workers"
+        m.template "spec.rb", "spec/workers/pgq_#{file_path}_spec.rb"
+        m.template "migration.rb", "db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_#{file_path}_queue.rb"
+        
+        add_to_queues_list
+      end
+    end
+    
+  private
+    def add_to_queues_list
+      filename = Rails.root + 'config/queues_list.yml'
+      if File.exists?(filename)
+        x = YAML.load_file(filename)
+        x << name
+        File.open(filename, 'w'){|f| f.write(YAML.dump(x))}
+      else
+        x = [name]
+        File.open(filename, 'w'){|f| f.write(YAML.dump(x))}
+      end
+    end
+  end
+
+end
+
+end

data/lib/generators/pgq/templates/migration.rb

@@ -0,0 +1,9 @@
+class Create<%= class_name %>Queue < ActiveRecord::Migration
+  def self.up
+    Pgq::Consumer.add_queue :<%= file_path %>
+  end
+
+  def self.down
+    Pgq::Consumer.remove_queue :<%= file_path %>
+  end
+end

data/lib/generators/pgq/{add_templates → templates}/pgq_class.rb

@@ -1,6 +1,6 @@
-class Pgq<%= name_c %> < Pgq::Consumer
+class Pgq<%= class_name %> < Pgq::Consumer
 
-  # to insert event: Pgq<%= name_c %>.my_event(1, 2, 3)
+  # insert event: Pgq<%= class_name %>.my_event(1, 2, 3)
   
   # async execute
   def my_event(a, b, c)

data/lib/generators/pgq/templates/spec.rb

@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Pgq<%= class_name %> do
+  before(:each) do
+    @consumer = Pgq<%= class_name %>.new
+  end
+  
+end

data/lib/pgq.rb

@@ -1,5 +1,6 @@
 require 'active_support'
 require 'active_record'
+require 'marshal64'
 
 module Pgq
 end

data/lib/pgq/api.rb

@@ -68,7 +68,7 @@ module Pgq::Api
   end
   
   def pgq_failed_event_list queue_name, consumer_name, limit = nil, offset = nil, order = 'desc'
-    order = (order.to_s == 'desc') ? order : 'asc'
+    order = (order.to_s == 'desc') ? 'desc' : 'asc'
     connection.select_all(sanitize_sql_array ["SELECT * FROM pgq.failed_event_list(?, ?, ?, ?) ORDER BY ev_id #{order.upcase}", queue_name, consumer_name, limit.to_i, offset.to_i])
   end
 
@@ -128,5 +128,9 @@ module Pgq::Api
 
     events.length
   end
-
+  
+  def pgq_force_tick(queue_name)
+    connection.select_value(sanitize_sql_array ["SELECT pgq.force_tick(?)", queue_name]).to_i
+  end
+  
 end

data/lib/pgq/consumer_base.rb

@@ -60,7 +60,7 @@ class Pgq::ConsumerBase
   # == coder
 
   def self.coder
-    Pgq::Marshal64Coder
+    Marshal64
   end
   
   def coder

data/lib/pgq/event.rb

@@ -4,13 +4,13 @@ class Pgq::Event
   def initialize(consumer, event)
     @id = event['ev_id']
     @type = event['ev_type']
-    @data = consumer.coder.load(event['ev_data']) if event['ev_data']
     @consumer = consumer
+    @data = @consumer.coder.load(event['ev_data']) if event['ev_data']
   end
 
   def failed!(ex)
     h = {:class => ex.class.to_s, :message => ex.message, :backtrace => ex.backtrace}
-    @consumer.event_failed @id, consumer.coder.dump(h)
+    @consumer.event_failed @id, @consumer.coder.dump(h)
   end
   
   def retry!(seconds = 0)
@@ -29,8 +29,8 @@ Backtrace: #{e.backtrace.join("\n") rescue ''}
   def exception_message(e)
     <<-EXCEPTION
 Exception happend
-Type: #{type.inspect}
-Data: #{data.inspect}
+Type: #{@type.inspect}
+Data: #{@data.inspect}
 Error occurs: #{e.class.inspect}(#{e.message})
 Backtrace: #{e.backtrace.join("\n") rescue ''}
     EXCEPTION

data/lib/pgq/version.rb

@@ -1,3 +1,3 @@
 module Pgq
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/pgq/worker.rb

@@ -33,7 +33,9 @@ class Pgq::Worker
     raise "Queue not selected" if @queues.blank?
     
     if @queues == ['all'] || @queues == 'all'
-      if defined?(Rails) && File.exists?(Rails.root + "config/queues_list.yml")
+      if h[:queues_list]
+        @queues = YAML.load_file(h[:queues_list])
+      elsif defined?(Rails) && File.exists?(Rails.root + "config/queues_list.yml")
         @queues = YAML.load_file(Rails.root + "config/queues_list.yml")
       else
         raise "You shoud create config/queues_list.yml for all queues"

data/lib/tasks/pgq.rake

@@ -1,10 +1,15 @@
+if defined?(Rails)
+  ENV['RAILS_ROOT'] ||= Rails.root.to_s
+  ENV['RAILS_ENV'] ||= Rails.env.to_s
+end
+
 namespace :pgq do
 
   desc "Start worker params: QUEUES, LOGGER, WATCH_FILE"
   task :worker => [:environment] do 
     queues = ENV['QUEUES']
-    logger_file = ENV['LOGGER'] || Rails.root.join("log/pgq_#{queues}.log")
-    watch_file = ENV['WATCH_FILE'] || Rails.root.join("tmp/pgq_#{queues}.stop")
+    logger_file = ENV['LOGGER'] || "#{ENV['RAILS_ROOT']}/log/pgq_#{queues}.log"
+    watch_file = ENV['WATCH_FILE'] || "#{ENV['RAILS_ROOT']}/tmp/pgq_#{queues}.stop"
     logger = Logger.new(logger_file)
     w = Pgq::Worker.new(:logger => logger, :queues => queues, :watch_file => watch_file)
     w.run
@@ -12,7 +17,7 @@ namespace :pgq do
 
   desc "Install PgQ to database RAILS_ENV"
   task :install do
-    Dir["#{Rails.root}/config/pgq_#{Rails.env}*.ini"].each do |conf|
+    Dir["#{ENV['RAILS_ROOT']}/config/pgq_#{ENV['RAILS_ENV']}*.ini"].each do |conf|
       ENV['PGQFILE']=conf
       Rake::Task['pgq:install_from_file'].invoke
     end
@@ -34,13 +39,57 @@ namespace :pgq do
       raise "Something went wrong(see above)... Check that you install skytools package and create #{conf}"
     end
   end
+
+  desc "Generate Pgq config from database.yml and RAILS_ENV"
+  task :generate_config do
+    require 'yaml'
+    raise "RAILS_ROOT should be" unless ENV['RAILS_ROOT']
+    raise "RAILS_ENV should be" unless ENV['RAILS_ENV']
+    
+    cfg = if ENV['DATABASE_YML']
+      YAML.load_file(ENV['DATABASE_YML']) if File.exists?(ENV['DATABASE_YML'])
+    else
+      file = File.join(ENV['RAILS_ROOT'], %w{config database.yml})
+      YAML.load_file(file) if File.exists?(file)
+    end
+    
+    raise "Not found database.yml" unless cfg
+    cfg = cfg[ ENV["RAILS_ENV"] ]
   
+    pgq_config = <<-SQL
+[pgqadm]
+job_name = #{cfg['database']}_pgqadm
+db = host=#{cfg['host'] || '127.0.0.1'} dbname=#{cfg['database']} user=#{cfg['username']} password=#{cfg['password']} port=#{cfg['port'] || 5432}
+
+# how often to run maintenance [seconds]
+maint_delay = 500
+
+# how often to check for activity [seconds]
+loop_delay = 0.05
+
+logfile = log/%(job_name)s.log
+pidfile = tmp/%(job_name)s.pid
+    SQL
+    
+    output = ENV["PGQ_CONFIG"] || File.join(ENV["RAILS_ROOT"], ["config", "pgq_#{ENV["RAILS_ENV"]}.ini"])
+    File.open(output, 'w'){|f| f.write(pgq_config) }
+    puts "Config #{ENV["RAILS_ENV"]} generated to '#{output}'"
+  end  
+  
+  desc "Generate Pgq configs from database.yml for all environments"
+  task :generate_configs do
+    task = Rake::Task["pgq:generate_config"]
+    %w{development test production}.each do |env|
+      ENV['RAILS_ENV'] = env
+      task.execute
+    end
+  end
   
   namespace :ticker do
   
     desc "Start PgQ ticker daemon"
     task :start do
-      conf = Rails.root.join("config/pgq_#{Rails.env}.ini")
+      conf = "#{ENV['RAILS_ROOT']}/config/pgq_#{ENV['RAILS_ENV']}.ini"
       output = `which pgqadm.py && pgqadm.py #{conf} -d ticker 2>&1 || which pgqadm && pgqadm #{conf} -d ticker 2>&1`
       if output.empty?
         puts "ticker daemon started"
@@ -51,7 +100,7 @@ namespace :pgq do
   
     desc "Stop PgQ ticker daemon"
     task :stop do
-      conf = Rails.root.join("config/pgq_#{Rails.env}.ini")
+      conf = "#{ENV['RAILS_ROOT']}/config/pgq_#{ENV['RAILS_ENV']}.ini"
       output = `which pgqadm.py && pgqadm.py #{conf} -s 2>&1 || which pgqadm && pgqadm #{conf} -s 2>&1`
       if output.empty?
         puts "ticker daemon stoped"

data/pgq.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
   s.authors = ["Makarchev Konstantin"]
   s.autorequire = %q{init}
   
-  s.description = %q{Queues system for AR/Rails based on PgQ Skytools for PostgreSQL, like Resque on Redis. Rails 3! only tested.}
-  s.summary = %q{Queues system for AR/Rails based on PgQ Skytools for PostgreSQL, like Resque on Redis. Rails 3! only tested.}
+  s.description = %q{Queues system for AR/Rails based on PgQ Skytools for PostgreSQL, like Resque on Redis. Rails 2.3 and 3 compatible.}
+  s.summary = %q{Queues system for AR/Rails based on PgQ Skytools for PostgreSQL, like Resque on Redis. Rails 2.3 and 3 compatible.}
   
   s.email = %q{kostya27@gmail.com}
   s.homepage = %q{http://github.com/kostya/pgq}
@@ -20,9 +20,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'activesupport', ">=2.3.2"  
-  s.add_dependency 'activerecord', ">=2.3.2"
+  s.add_dependency 'activesupport', ">= 2.3.2"
+  s.add_dependency 'activerecord', ">= 2.3.2"
   s.add_dependency 'pg'
+  s.add_dependency 'marshal64'
   
   s.add_development_dependency "rspec"
   s.add_development_dependency "rake"

data/spec/api_spec.rb

@@ -0,0 +1,48 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Pgq::Api do
+  before :each do
+    re_queues
+  end
+  
+  after :each do
+    stop_ticker rescue nil
+  end
+
+  it "should insert event" do
+    x = ActiveRecord::Base.pgq_insert_event('bla', 'tp', '1,2,3', '5,6,7')
+    x.should > 0
+  end
+  
+  it "consuming" do
+    ActiveRecord::Base.pgq_insert_event('bla', 'tp', '1,2,3', '5,6,7')
+
+    bid, events = api_extract_batch('bla')
+    
+    events.size.should == 1
+    event = events.first
+    
+    event['ev_extra1'].should == '5,6,7'
+    event['ev_type'].should == 'tp'
+    event['ev_id'].to_i.should >= 1
+    event['ev_data'].should == '1,2,3'
+  end
+  
+  it "failed event and retry" do
+    ActiveRecord::Base.pgq_failed_event_count('bla', 'default').should == 0
+    ActiveRecord::Base.pgq_failed_event_list('bla', 'default').should == []
+
+    ActiveRecord::Base.pgq_insert_event('bla', 'tp', '1,2,3', '5,6,7')
+
+    bid, events = api_extract_batch('bla')
+    
+    ActiveRecord::Base.pgq_event_failed(bid, events[0]['ev_id'], 'aaa')
+
+    ActiveRecord::Base.pgq_finish_batch(bid)
+
+    ActiveRecord::Base.pgq_force_tick('bla')
+    ActiveRecord::Base.pgq_failed_event_count('bla', 'default').should == 1
+    # ActiveRecord::Base.pgq_failed_event_list('bla', 'default').should == [...]
+  end
+  
+end

data/spec/app/config/database.yml

@@ -0,0 +1,6 @@
+test:
+  database: gem_pgq_test
+  adapter: postgresql
+  username: kostya
+  password: password
+  

data/spec/benchmark/insert_bench.rb

@@ -0,0 +1,30 @@
+require 'rubygems'
+require "bundler"
+Bundler.setup
+
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'pgq'
+require 'benchmark'
+
+require File.join(File.dirname(__FILE__), %w{.. support spec_support})
+
+N = 5000
+puts 'start benchmark'
+
+re_queues
+tm = Benchmark.realtime{ N.times{ PgqBla.bla } }
+puts "insert without arguments method missing #{tm}"
+
+re_queues
+tm = Benchmark.realtime{ N.times{ PgqBla.add_event 'bla' } }
+puts "insert without arguments add_event #{tm}"
+
+x = (0..100).to_a.map{|c| {1 => c, :b => "a#{c}", 2 => c + 2}}
+
+re_queues
+tm = Benchmark.realtime{ N.times{ PgqBla.bla x } }
+puts "insert arguments method missing #{tm}"
+
+re_queues
+tm = Benchmark.realtime{ N.times{ PgqBla.add_event 'bla', x } }
+puts "insert arguments add_event #{tm}"

data/spec/consumer_base_spec.rb

@@ -150,4 +150,4 @@ describe Pgq::ConsumerBase do
     $b.should == 'abc'
   end
 
-end
+end

data/spec/consumer_intergration_spec.rb

@@ -0,0 +1,4 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Pgq::ConsumerBase do
+end

data/spec/consumer_spec.rb

@@ -1,15 +1,5 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-class PgqHaha < Pgq::Consumer
-
-  def ptest2(a, b)
-    $a = a
-    $b = b
-    10
-  end
-
-end
-
 describe PgqHaha do
   before :each do
     @consumer = PgqHaha.new

data/spec/event_spec.rb

@@ -2,8 +2,7 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe Pgq::Event do
   before :each do
-    kl = Class.new(Pgq::ConsumerGroup) do
-    end
+    kl = Class.new(Pgq::ConsumerGroup){}
     @consumer = kl.new
     @consumer.stub!(:get_next_batch).and_return ''
     @consumer.stub!(:finish_batch).and_return ''

data/spec/spec_helper.rb

@@ -3,9 +3,10 @@ require "bundler/setup"
 
 Bundler.require 
 
+require File.join(File.dirname(__FILE__), %w{support spec_support})
+
 class Pgq::Consumer
     # rspec fuckup
   def self.to_ary 
   end
 end
-

data/spec/support/spec_support.rb

@@ -0,0 +1,70 @@
+require 'yaml'
+
+file = File.join(File.dirname(__FILE__), %w{.. app config database.yml})
+cfg = YAML.load_file(file)
+
+ActiveRecord::Base.establish_connection cfg['test']
+
+def re_queues
+  Pgq::Consumer.remove_queue(:bla) rescue nil
+  Pgq::Consumer.remove_queue(:test) rescue nil
+
+  Pgq::Consumer.add_queue :bla
+  Pgq::Consumer.add_queue :test
+end
+
+re_queues
+
+class PgqBla < Pgq::Consumer
+end
+
+class PgqTest < Pgq::Consumer
+end
+
+class PgqHaha < Pgq::Consumer
+    
+  def ptest2(a, b)
+    $a = a
+    $b = b
+    10
+  end
+  
+end
+
+def start_ticker
+  conf = "#{ENV['RAILS_ROOT']}/config/pgq_#{ENV['RAILS_ENV']}.ini"
+  output = `which pgqadm.py && pgqadm.py #{conf} -d ticker 2>&1 || which pgqadm && pgqadm #{conf} -d ticker 2>&1`
+end
+
+def stop_ticker
+  conf = "#{ENV['RAILS_ROOT']}/config/pgq_#{ENV['RAILS_ENV']}.ini"
+  output = `which pgqadm.py && pgqadm.py #{conf} -s 2>&1 || which pgqadm && pgqadm #{conf} -s 2>&1`
+end
+
+def api_extract_batch(queue_name, consumer_name = 'default')
+  start_ticker
+  bid = nil
+  events = []
+  count = 0
+  
+  loop do
+    100.times{ ActiveRecord::Base.pgq_force_tick(queue_name) }
+    
+    bid = ActiveRecord::Base.pgq_next_batch(queue_name, consumer_name)
+    
+    if bid
+      events = ActiveRecord::Base.pgq_get_batch_events(bid)
+      if events.present?
+        break 
+      end
+    end
+    
+    count += 1
+    raise "count > 100" if count > 100
+  end
+
+  return [bid, events]
+
+ensure
+  stop_ticker
+end

data/spec/utils_spec.rb

@@ -0,0 +1,14 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Pgq::Utils do
+  after :each do
+    Pgq::Consumer.remove_queue :hoho
+  end
+  
+  it "queues list" do
+    Pgq::Consumer.queues_list.sort.should == %w{bla test}.sort
+    
+    Pgq::Consumer.add_queue :hoho
+    Pgq::Consumer.queues_list.sort.should == %w{bla test hoho}.sort
+  end
+end

data/spec/worker_spec.rb

@@ -1,9 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe Pgq::Worker do
-  class PgqBla < Pgq::Consumer
-  end
-
   it "should find class not in hash" do
     Pgq::Worker.predict_queue_class('bla').should == PgqBla
     Pgq::Worker.predict_queue_class('bla_1').should == PgqBla

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pgq
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 29
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Makarchev Konstantin
@@ -15,13 +15,11 @@ autorequire: init
 bindir: bin
 cert_chain: []
 
-date: 2012-05-26 00:00:00 +04:00
+date: 2012-09-22 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,12 +30,12 @@ dependencies:
         - 3
         - 2
         version: 2.3.2
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
+  requirement: *id001
+  name: activesupport
 - !ruby/object:Gem::Dependency 
-  name: activerecord
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,12 +46,12 @@ dependencies:
         - 3
         - 2
         version: 2.3.2
+  prerelease: false
   type: :runtime
-  version_requirements: *id002
+  requirement: *id002
+  name: activerecord
 - !ruby/object:Gem::Dependency 
-  name: pg
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,12 +60,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :runtime
-  version_requirements: *id003
+  requirement: *id003
+  name: pg
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: *id004
+  name: marshal64
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -76,12 +88,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id004
+  requirement: *id005
+  name: rspec
 - !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -90,9 +102,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id005
-description: Queues system for AR/Rails based on PgQ Skytools for PostgreSQL, like Resque on Redis. Rails 3! only tested.
+  requirement: *id006
+  name: rake
+description: Queues system for AR/Rails based on PgQ Skytools for PostgreSQL, like Resque on Redis. Rails 2.3 and 3 compatible.
 email: kostya27@gmail.com
 executables: []
 
@@ -103,36 +117,38 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - init.rb
 - lib/generators/pgq/add_generator.rb
-- lib/generators/pgq/add_templates/migration.rb
-- lib/generators/pgq/add_templates/pgq_class.rb
-- lib/generators/pgq/add_templates/spec.rb
-- lib/generators/pgq/config_generator.rb
-- lib/generators/pgq/config_templates/pgq.rb
+- lib/generators/pgq/pgq_generator.rb
+- lib/generators/pgq/templates/migration.rb
+- lib/generators/pgq/templates/pgq_class.rb
+- lib/generators/pgq/templates/spec.rb
 - lib/pgq.rb
 - lib/pgq/api.rb
 - lib/pgq/consumer.rb
 - lib/pgq/consumer_base.rb
 - lib/pgq/consumer_group.rb
 - lib/pgq/event.rb
-- lib/pgq/marshal64_coder.rb
 - lib/pgq/railtie.rb
 - lib/pgq/utils.rb
 - lib/pgq/version.rb
 - lib/pgq/worker.rb
 - lib/tasks/pgq.rake
 - pgq.gemspec
+- spec/api_spec.rb
+- spec/app/config/database.yml
+- spec/benchmark/insert_bench.rb
 - spec/consumer_base_spec.rb
 - spec/consumer_group_spec.rb
+- spec/consumer_intergration_spec.rb
 - spec/consumer_spec.rb
 - spec/event_spec.rb
-- spec/marshal64_coder_spec.rb
 - spec/spec_helper.rb
+- spec/support/spec_support.rb
+- spec/utils_spec.rb
 - spec/worker_spec.rb
 has_rdoc: true
 homepage: http://github.com/kostya/pgq
@@ -164,9 +180,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
-summary: Queues system for AR/Rails based on PgQ Skytools for PostgreSQL, like Resque on Redis. Rails 3! only tested.
+summary: Queues system for AR/Rails based on PgQ Skytools for PostgreSQL, like Resque on Redis. Rails 2.3 and 3 compatible.
 test_files: []
 

data/Gemfile.lock

@@ -1,46 +0,0 @@
-PATH
-  remote: .
-  specs:
-    pgq (0.1.2)
-      activerecord (>= 2.3.2)
-      activesupport (>= 2.3.2)
-      pg
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
-      builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.3)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    i18n (0.6.0)
-    multi_json (1.3.5)
-    pg (0.13.2)
-    rake (0.9.2.2)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.0)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    tzinfo (0.3.33)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  pgq!
-  rake
-  rspec

data/lib/generators/pgq/add_templates/migration.rb

@@ -1,9 +0,0 @@
-class Create<%= name_c %>Queue < ActiveRecord::Migration
-  def self.up
-    Pgq::Consumer.add_queue :<%= name %>
-  end
-
-  def self.down
-    Pgq::Consumer.remove_queue :<%= name %>
-  end
-end

data/lib/generators/pgq/add_templates/spec.rb

@@ -1,8 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-describe Pgq<%= name_c %> do
-  before(:each) do
-    @consumer = Pgq<%= name_c %>.new
-  end
-  
-end

data/lib/generators/pgq/config_generator.rb

@@ -1,18 +0,0 @@
-module Pgq
-  class ConfigGenerator < Rails::Generators::Base
-    source_root File.expand_path("../config_templates", __FILE__)
-    
-    def copy_configs
-      self.env_name = 'development'
-      template "pgq.rb", "config/pgq_development.ini"
-      self.env_name = 'test'
-      template "pgq.rb", "config/pgq_test.ini"
-      self.env_name = 'production'
-      template "pgq.rb", "config/pgq_production.ini"
-    end
-    
-  private  
-    attr_accessor :env_name
-    
-  end
-end

data/lib/generators/pgq/config_templates/pgq.rb

@@ -1,12 +0,0 @@
-[pgqadm]
-job_name = pgqadm_<%= env_name %>
-db = dbname=dbname user=user password=password host=127.0.0.1 port=5432
-
-# how often to run maintenance [seconds]
-maint_delay = 600
-
-# how often to check for activity [seconds]
-loop_delay = 0.1
-
-logfile = log/%(job_name)s.log
-pidfile = tmp/%(job_name)s.pid

data/lib/pgq/marshal64_coder.rb

@@ -1,13 +0,0 @@
-require 'base64'
-
-module Pgq::Marshal64Coder
-
-  def self.dump(s)
-    Base64::encode64(Marshal.dump(s))
-  end
-
-  def self.load(s)
-    Marshal.load(Base64::decode64(s))
-  end
-
-end

data/spec/marshal64_coder_spec.rb

@@ -1,22 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe Pgq::Marshal64Coder do
-  before :each do
-    @coder = Pgq::Marshal64Coder
-  end
-
-  it "work" do
-    data = {:a => [1, 2, 3, {:b => 'c'}]}
-    s = @coder.dump(data)
-    @coder.load(s).should == data
-  end
-
-  it "work on large data" do
-    data = {}
-    10000.times{|i| data["#{i}".to_sym] = [i, "i_#{i}"]}
-    
-    s = @coder.dump(data)
-    @coder.load(s).should == data
-  end
-  
-end