riaction 1.2.5 → 1.2.6

data/.gitignore

@@ -1 +1,2 @@
 pkg/*
+db/riaction.db

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG #
 
+## 1.2.6 ##
+
+* resque jobs will re-enqeue on a timeout error
+
 ## 1.2.5 ##
 
 * fixing bug with optional display name argument in profiles

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    riaction (1.2.2)
+    riaction (1.2.6)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
       rake

data/MIT-LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2011-2012 Christopher Eberz
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/riaction/event_performer.rb

@@ -26,7 +26,7 @@ module Riaction
       # event_object no longer exists; no means to recover
     rescue IActionable::Error::BadRequest => e
       # Log event should never throw this as of IActionable API v3
-    rescue IActionable::Error::Internal => e
+    rescue IActionable::Error::Internal, Faraday::Error::TimeoutError, Timeout::Error => e
       # upon an intenal error from IActionable, retry some set number of times by requeueing the task through Resque 
       # after the max number of attempts, re-raise
       if attempt < ::Riaction::Constants.retry_attempts_for_internal_error

data/lib/riaction/profile_creator.rb

@@ -27,7 +27,7 @@ module Riaction
     rescue IActionable::Error::BadRequest => e
       # This should only be thrown if the profile type names specified in the model don't match what's on IActionable's dashboard 
       raise e
-    rescue IActionable::Error::Internal => e
+    rescue IActionable::Error::Internal, Faraday::Error::TimeoutError, Timeout::Error => e
       # upon an intenal error from IActionable, retry some set number of times by requeueing the task through Resque 
       # after the max number of attempts, re-raise
       if attempt < ::Riaction::Constants.retry_attempts_for_internal_error

data/lib/riaction/version.rb

@@ -1,3 +1,3 @@
 module Riaction
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

data/riaction.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib", "spec"]
 
   
-  s.add_development_dependency "rspec", ">= 2.6"
+  s.add_development_dependency "rspec", ">= 2.8"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "ruby-debug19"
   

data/spec/event_performer_spec.rb

@@ -224,6 +224,36 @@ describe "sending an event to IActionable from the name of a riaction class and
         ::Riaction::EventPerformer.perform(:make_a_comment, 'Comment', @comment.id)
       end
     end
+    
+    describe "when the call to IActionable, through API wrapper, times out" do
+      before do
+        @api.stub!(:log_event).and_raise(Timeout::Error)
+        Comment.class_eval do
+          riaction :event, :name => :make_a_comment, :trigger => :create, :profile => :user, :profile_type => :npc, :params => {:foo => 'bar'}
+        end
+        @comment = Comment.riactionless{ Comment.create(:user_id => @user.id, :content => 'this is a comment') }
+      end
+      
+      it "should re-enqueue the job with an attempt count" do
+        Resque.should_receive(:enqueue).once.with(Riaction::EventPerformer, :make_a_comment, 'Comment', @comment.id, 1)
+        ::Riaction::EventPerformer.perform(:make_a_comment, 'Comment', @comment.id)
+      end
+    end
+    
+    describe "when the call to IActionable, through API wrapper, times out with a faraday-wrapped timeout" do
+      before do
+        @api.stub!(:log_event).and_raise(Faraday::Error::TimeoutError.new(""))
+        Comment.class_eval do
+          riaction :event, :name => :make_a_comment, :trigger => :create, :profile => :user, :profile_type => :npc, :params => {:foo => 'bar'}
+        end
+        @comment = Comment.riactionless{ Comment.create(:user_id => @user.id, :content => 'this is a comment') }
+      end
+      
+      it "should re-enqueue the job with an attempt count" do
+        Resque.should_receive(:enqueue).once.with(Riaction::EventPerformer, :make_a_comment, 'Comment', @comment.id, 1)
+        ::Riaction::EventPerformer.perform(:make_a_comment, 'Comment', @comment.id)
+      end
+    end
   
     describe "when the arguments passed to perform() are all strings" do
       before do

data/spec/profile_creation_spec.rb

@@ -126,6 +126,36 @@ describe "automatic profile creation from riaction definitions:" do
         ::Riaction::ProfileCreator.perform('User', @user.id, 0)
       end
     end
+    
+    describe "when the call to IActionable, through API wrapper, times out" do
+      before do
+        @api.stub!(:create_profile).and_raise(Timeout::Error)
+        User.class_eval do
+          riaction :profile, :type => :player, :custom => :id, :username => :name
+        end
+        @user = User.riactionless{ User.create(:name => 'zortnac') }
+      end
+      
+      it "should re-enqueue the job with an attempt count" do
+        Resque.should_receive(:enqueue).once.with(Riaction::ProfileCreator, "User", @user.id, 1)
+        ::Riaction::ProfileCreator.perform('User', @user.id, 0)
+      end
+    end
+    
+    describe "when the call to IActionable, through API wrapper, times out with a faraday-wrapped timeout" do
+      before do
+        @api.stub!(:create_profile).and_raise(Faraday::Error::TimeoutError.new(""))
+        User.class_eval do
+          riaction :profile, :type => :player, :custom => :id, :username => :name
+        end
+        @user = User.riactionless{ User.create(:name => 'zortnac') }
+      end
+      
+      it "should re-enqueue the job with an attempt count" do
+        Resque.should_receive(:enqueue).once.with(Riaction::ProfileCreator, "User", @user.id, 1)
+        ::Riaction::ProfileCreator.perform('User', @user.id, 0)
+      end
+    end
   
     describe "when the arguments passed to perform are all strings" do
       before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riaction
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000Z
+date: 2012-03-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153231200 !ruby/object:Gem::Requirement
+  requirement: &2165342760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *2153231200
+  version_requirements: *2165342760
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2153230660 !ruby/object:Gem::Requirement
+  requirement: &2165342180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153230660
+  version_requirements: *2165342180
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2153230200 !ruby/object:Gem::Requirement
+  requirement: &2165341600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153230200
+  version_requirements: *2165341600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153229780 !ruby/object:Gem::Requirement
+  requirement: &2165341020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153229780
+  version_requirements: *2165341020
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2153229260 !ruby/object:Gem::Requirement
+  requirement: &2165340240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153229260
+  version_requirements: *2165340240
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153228760 !ruby/object:Gem::Requirement
+  requirement: &2165339740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153228760
+  version_requirements: *2165339740
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2153228380 !ruby/object:Gem::Requirement
+  requirement: &2165339280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153228380
+  version_requirements: *2165339280
 - !ruby/object:Gem::Dependency
   name: ruby-iactionable
-  requirement: &2153227800 !ruby/object:Gem::Requirement
+  requirement: &2165338400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153227800
+  version_requirements: *2165338400
 description: Wrapper for IActionable's restful API and an "acts-as" style interface
   for models to behave as profiles and drive game events.
 email:
@@ -111,6 +111,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- MIT-LICENSE.txt
 - README.md
 - Rakefile
 - db/riaction.db