game-queue 0.2.4 → 0.2.5

data/Gemfile.lock

@@ -10,7 +10,7 @@ GEM
       rdoc
     json (1.7.5)
     multi_json (1.3.7)
-    rake (10.0.0)
+    rake (10.0.2)
     rdoc (3.12)
       json (~> 1.4)
     redis (3.0.2)

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/game-queue.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "game-queue"
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["V_M"]
-  s.date = "2012-11-14"
+  s.date = "2012-11-27"
   s.description = "Simple game queue for redis"
   s.email = "nobody@nowhere.com"
   s.extra_rdoc_files = [

data/lib/game-queue.rb

@@ -21,18 +21,28 @@ class GameQueue
   # ==== Parameters
   # message_name<String>: тип сообщения
   # message_body<Object>:: любой ruby объект с простыми данными, хэш, массив, число, строка...
-  def push(message_name, message_body)
-    redis.lpush(queue_name, Marshal.dump([message_name.to_s, message_body]))
+  # errors_counter<Integer>:: счетчик ошибок, которые возникают при попытке обработать взятую из очереди запись
+  # если запись после этого снова возвращается в очередь, его следует увеличить.
+  def push(message_name, message_body, errors_counter = 0)
+    redis.lpush(queue_name, Marshal.dump([message_name.to_s, message_body, errors_counter]))
+  end
+
+  # Сделать отложенный асинхронный push
+  # ==== Parameters
+  # delay<Integer>:: время задержки в секундах
+  # params  (См. push)
+  def async_push_with_delay(delay, *params)
+    Thread.new { sleep delay; push *params }
   end
 
   # См. push
   def async_push(*params)
-    Thread.new { push *params }
+    async_push_with_delay(0, params)
   end
 
 
   # ==== Returns
-  # <Array[String, Object]>::
+  # <Array[String, Object, Integer]>::
   def pop
     result = redis.rpop(queue_name)
     Marshal.load(result) if result

data/spec/game-queue_spec.rb

@@ -6,6 +6,7 @@ describe "GameQueue" do
     $redis =  Redis.new(:host => 'localhost', :port => 6379)
     GameQueue.redis = $redis
     GameQueue.queue_name = 'skyburg_main_queue_test'
+    @data  = {"cool" => "data", "something" => "else", "started_at" => Time.now}
   end
 
   before(:each) do
@@ -19,12 +20,11 @@ describe "GameQueue" do
   context "after push" do
 
     before(:each) do
-      @data  = {"cool" => "data", "something" => "else", "started_at" => Time.now}
       GameQueue.push(:event, @data)
     end
 
     it "should pull right data on pull" do
-      GameQueue.pop.should == ["event", @data]
+      GameQueue.pop.should == ["event", @data, 0]
     end
 
     it "should delete everything on clean!" do
@@ -34,4 +34,19 @@ describe "GameQueue" do
     end
   end
 
+  context "async_push_with_delay" do
+
+    before(:each) { GameQueue.async_push_with_delay(1, :event, @data) }
+
+    it "should not push nothing immediately" do
+      GameQueue.pop.should be_nil
+    end
+
+    it "should push message after delay" do
+      sleep 1.1
+      GameQueue.pop.should == ["event", @data, 0]
+    end
+
+  end
+
 end

metadata

@@ -1,112 +1,112 @@
 --- !ruby/object:Gem::Specification
 name: game-queue
 version: !ruby/object:Gem::Version
-  version: 0.2.4
   prerelease: 
+  version: 0.2.5
 platform: ruby
 authors:
 - V_M
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.1
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.1
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.12'
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.4
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.4
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
 description: Simple game queue for redis
 email: nobody@nowhere.com
 executables: []
@@ -139,10 +139,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -492318733
+      hash: 316375981
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: