resque-kawai 0.1.5 → 0.1.6

data/.gitignore

@@ -4,3 +4,4 @@ locks
 *.gem
 *.log
 .bundle
+Gemfile.lock

data/README.md

@@ -10,13 +10,9 @@ gem 'resque-kawai'
 
     rails generate rq:add bla
 
-And add to config/application.rb
-
-    config.autoload_paths += %W( #{config.root}/app/models/resque )
-    
 Consumer
 --------
-app/models/resque/rq_bla.rb
+app/workers/rq_bla.rb
 
 ``` ruby
 class RqBla < RqQueue
@@ -41,7 +37,7 @@ Insert event into queue like this:
     RqBla.add_event(:some_method2, some_x)
     
 
-Logger for this consumer: Rails.root/log/resque/bla.log
+Logger for this consumer: Rails.root/log/workers/bla.log
 
 
  
@@ -68,3 +64,12 @@ Usefull in specs
 ```
 
 When code call RqBla.some_method1(a,b,c) this would be convert into RqBla.new.some_method1(a,b,c)
+
+
+### Insert event with Resque-scheduler
+
+``` ruby
+  RqBla.add_event_in(10.seconds, :some_method1, 1, 2, 3)
+  
+  RqBla.enqueue_in(10.seconds, :some_method1, 1, 2, 3)
+```

data/lib/generators/rq/add_generator.rb

@@ -6,8 +6,8 @@ if Rails::VERSION::MAJOR >= 3
       source_root File.expand_path("../templates", __FILE__)
 
       def add_files
-        template "consumer.rb", "app/models/resque/rq_#{file_path}.rb"
-        template "spec.rb", "spec/models/resque/rq_#{file_path}_spec.rb"
+        template "consumer.rb", "app/workers/rq_#{file_path}.rb"
+        template "spec.rb", "spec/workers/rq_#{file_path}_spec.rb"
       end
     end
   end
@@ -20,8 +20,8 @@ if Rails::VERSION::MAJOR == 2
   class RqAddGenerator < Rails::Generator::NamedBase
     def manifest
       record do |m|
-        m.template "consumer.rb", "app/models/bin/rq_#{file_path}.rb"
-        m.template "spec.rb", "spec/models/bin/rq_#{file_path}_spec.rb"
+        m.template "consumer.rb", "app/workers/rq_#{file_path}.rb"
+        m.template "spec.rb", "spec/workers/rq_#{file_path}_spec.rb"
       end
     end
   end

data/lib/rq_queue.rb

@@ -24,14 +24,34 @@ class RqQueue
   def self.queue_name
     @queue
   end
+  
+  
 
   def self.add_event(method_name, *args)
     Resque.enqueue(self, method_name.to_s, args)
   end
   
+  def self.enqueue(method_name, *args)
+    add_event method_name, *args
+  end
+  
   def self.method_missing(method, *args)
     add_event(method, *args)
   end
+
+
+  
+  # For resque-scheduler
+  def self.add_event_in(times, method_name, *args)
+    Resque.enqueue_in(times, self, method_name.to_s, args)
+  end          
+
+  # For resque-scheduler
+  def self.enqueue_in(times, method_name, *args)
+    add_event_in(times, method_name, *args)
+  end
+
+  
   
   def self.logger
     @logger ||= Logger.new(logger_path).tap do |logger|
@@ -53,7 +73,8 @@ class RqQueue
     logger.info "done #{method_name}, #{"%.6f" % (Time.now - start_time)} s" if benchmark
    
   rescue => ex
-    logger.error "!Failed event: #{method_name} => #{ex.message}"
+    logger.error "!Failed event: #{method_name} => #{ex.message}"    
+    notify_about_error(ex)
     raise ex
   end
 
@@ -72,7 +93,7 @@ class RqQueue
     
     def logger_path 
       @logger_path ||= begin        
-        "#{Rails.root}/log/resque/#{extract_queue_name}.log"
+        "#{Rails.root}/log/workers/#{extract_queue_name}.log"
       end
     end
     
@@ -87,4 +108,8 @@ class RqQueue
     self.class.queue_name
   end
   
+  def self.notify_about_error(exception)
+    # stub
+  end
+  
 end

data/lib/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding: utf-8 -*-
 module Rq
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/resque-kawai.gemspec

@@ -23,5 +23,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'resque'
   s.add_development_dependency "rspec"
   s.add_development_dependency "rake"
+  s.add_development_dependency "json"
   
-end
+end

data/spec/rq_queue_spec.rb

@@ -62,7 +62,22 @@ describe RqQueue do
   it "should insert event with custom method" do
     Resque.should_receive(:enqueue).with(RqTest, 'super', [[1, 2, 3]])
     RqTest.add_event(:super, [1, 2, 3])
-  end              
+  end
+  
+  it "should insert event with custom method enqueue" do
+    Resque.should_receive(:enqueue).with(RqTest, 'super', [1, 2, 3])
+    RqTest.enqueue(:super, 1, 2, 3)
+  end
+  
+  it "enqueue in" do
+    Resque.should_receive(:enqueue_in).with(10, RqTest, 'super', [1, 2, 3])
+    RqTest.enqueue_in(10, :super, 1, 2, 3)
+  end
+  
+  it "add event in" do
+    Resque.should_receive(:enqueue_in).with(10, RqTest, 'super', [1, 2, 3])
+    RqTest.add_event_in(10, :super, 1, 2, 3)
+  end         
   
   describe "consume" do
     before :each do

metadata

@@ -1,91 +1,105 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: resque-kawai
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 5
-  version: 0.1.5
+version: !ruby/object:Gem::Version
+  version: 0.1.6
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Makarchev Konstantin
 autorequire: resque-kawai.rb
 bindir: bin
 cert_chain: []
-
-date: 2012-05-11 00:00:00 +04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: resque
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  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 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: Syntax sugar for Resque consumers. Each consumer is a class, with clean interface, and custom logger. Usefull when count of different events ~100 and more.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Syntax sugar for Resque consumers. Each consumer is a class, with clean
+  interface, and custom logger. Usefull when count of different events ~100 and more.
 email: kostya27@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -99,39 +113,35 @@ files:
 - spec/rq_queue_spec.rb
 - spec/spec_helper.rb
 - spec/test_class.rb
-has_rdoc: true
 homepage: http://github.com/kostya/resque-kawai
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -858566573
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -858566573
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Syntax sugar for Resque consumers. Each consumer is a class, with clean interface, and custom logger. Usefull when count of different events ~100 and more.
+summary: Syntax sugar for Resque consumers. Each consumer is a class, with clean interface,
+  and custom logger. Usefull when count of different events ~100 and more.
 test_files: []
-

data/Gemfile.lock

@@ -1,51 +0,0 @@
-PATH
-  remote: .
-  specs:
-    resque-kawai (0.1.4)
-      activesupport
-      resque
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.2.3)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    diff-lcs (1.1.3)
-    i18n (0.6.0)
-    multi_json (1.3.2)
-    rack (1.4.1)
-    rack-protection (1.2.0)
-      rack
-    rake (0.9.2.2)
-    redis (2.2.2)
-    redis-namespace (1.0.3)
-      redis (< 3.0.0)
-    resque (1.20.0)
-      multi_json (~> 1.0)
-      redis-namespace (~> 1.0.2)
-      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.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    tilt (1.3.3)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rake
-  resque-kawai!
-  rspec