ayl 0.2.1 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/ayl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ayl"
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dave Sieh"]
-  s.date = "2013-07-22"
+  s.date = "2013-08-07"
   s.description = "Invoke code At Your Leisure. ayl is a small framework that simplifies the process of implementing asynchronous method calls in Ruby."
   s.email = "j0hnds@gmail.com"
   s.extra_rdoc_files = [

data/lib/ayl/message.rb

@@ -21,7 +21,7 @@ module Ayl
       Message.new(nil, nil, MessageOptions.new).tap do | m |
         m.send(:message_hash=, message_hash)
         m.send(:code=, code)
-        m.options.decay_failed_job = message_hash[:decay_failed_job] if message_hash[:decay_failed_job]
+        m.options.failed_job_handler = message_hash[:failed_job_handler] if message_hash[:failed_job_handler]
       end
       
     end
@@ -33,7 +33,7 @@ module Ayl
     def to_hash
       @message_hash ||= {
         :type => :ayl,
-        :decay_failed_job => options.decay_failed_job,
+        :failed_job_handler => options.failed_job_handler,
         :code => to_rrepr
       }
     end

data/lib/ayl/message_options.rb

@@ -2,12 +2,14 @@ module Ayl
 
   class MessageOptions
 
-    OPTIONS = [ :priority, :fuzz, :delay, :time_to_run, :queue_name, :decay_failed_job ]
+    OPTIONS = [ :priority, :fuzz, :delay, :time_to_run, :queue_name, :failed_job_handler ]
+
+    VALID_FAILED_JOB_HANDLERS = %W{ bury decay delete }
 
     attr_accessor *OPTIONS
 
     class << self
-      attr_accessor :default_priority, :default_fuzz, :default_delay, :default_time_to_run, :default_queue_name, :default_decay_failed_job
+      attr_accessor :default_priority, :default_fuzz, :default_delay, :default_time_to_run, :default_queue_name, :default_failed_job_handler
     end
 
     # Set the default options
@@ -16,7 +18,7 @@ module Ayl
     self.default_delay = 0
     self.default_time_to_run = 120
     self.default_queue_name = 'default'
-    self.default_decay_failed_job = false
+    self.default_failed_job_handler = 'delete'
 
     def initialize(opts=nil)
       opts ||= {}
@@ -24,6 +26,11 @@ module Ayl
       unknown_options = opts.keys - OPTIONS
       raise "unknown options specified: #{unknown_options}" unless unknown_options.empty?
       OPTIONS.each do |o|
+        if o == :failed_job_handler
+          if !(v = opts[o]).nil?
+            raise "value for :failed_job_handler must be one of: #{VALID_FAILED_JOB_HANDLERS.join(', ')}" unless VALID_FAILED_JOB_HANDLERS.include?(v)
+          end
+        end
         send("#{o}=".to_sym, opts.fetch(o, self.class.send("default_#{o}".to_sym)))
       end
     end

data/spec/message_options_spec.rb

@@ -10,7 +10,7 @@ describe Ayl::MessageOptions do
       Ayl::MessageOptions.default_delay.should == 0
       Ayl::MessageOptions.default_time_to_run.should == 120
       Ayl::MessageOptions.default_queue_name.should == 'default'
-      Ayl::MessageOptions.default_decay_failed_job.should == false
+      Ayl::MessageOptions.default_failed_job_handler.should == 'delete'
     end
 
     it "should reflect the changes if changes have been made" do
@@ -19,14 +19,14 @@ describe Ayl::MessageOptions do
       Ayl::MessageOptions.default_delay = 2300
       Ayl::MessageOptions.default_time_to_run = 1
       Ayl::MessageOptions.default_queue_name = 'different'
-      Ayl::MessageOptions.default_decay_failed_job = true
+      Ayl::MessageOptions.default_failed_job_handler = 'bury'
 
       Ayl::MessageOptions.default_priority.should == 256
       Ayl::MessageOptions.default_fuzz.should == 18
       Ayl::MessageOptions.default_delay.should == 2300
       Ayl::MessageOptions.default_time_to_run.should == 1
       Ayl::MessageOptions.default_queue_name.should == 'different'
-      Ayl::MessageOptions.default_decay_failed_job.should == true
+      Ayl::MessageOptions.default_failed_job_handler.should == 'bury'
     end
 
   end
@@ -41,7 +41,7 @@ describe Ayl::MessageOptions do
       mo.delay.should == Ayl::MessageOptions.default_delay
       mo.time_to_run.should == Ayl::MessageOptions.default_time_to_run
       mo.queue_name.should == Ayl::MessageOptions.default_queue_name
-      mo.decay_failed_job.should == Ayl::MessageOptions.default_decay_failed_job
+      mo.failed_job_handler.should == Ayl::MessageOptions.default_failed_job_handler
     end
 
     it "should respond with the correct defaults when initialized with nil" do
@@ -52,7 +52,7 @@ describe Ayl::MessageOptions do
       mo.delay.should == Ayl::MessageOptions.default_delay
       mo.time_to_run.should == Ayl::MessageOptions.default_time_to_run
       mo.queue_name.should == Ayl::MessageOptions.default_queue_name
-      mo.decay_failed_job.should == Ayl::MessageOptions.default_decay_failed_job
+      mo.failed_job_handler.should == Ayl::MessageOptions.default_failed_job_handler
     end
 
     it "should respond with the correct defaults when initialized with no parameter" do
@@ -63,11 +63,11 @@ describe Ayl::MessageOptions do
       mo.delay.should == Ayl::MessageOptions.default_delay
       mo.time_to_run.should == Ayl::MessageOptions.default_time_to_run
       mo.queue_name.should == Ayl::MessageOptions.default_queue_name
-      mo.decay_failed_job.should == Ayl::MessageOptions.default_decay_failed_job
+      mo.failed_job_handler.should == Ayl::MessageOptions.default_failed_job_handler
     end
 
     it "should respond with the correct values when all are specified in the options" do
-      opts = { :priority => 22, :fuzz => 88, :delay => 99, :time_to_run => 11, :queue_name => 'stub', :decay_failed_job => true }
+      opts = { :priority => 22, :fuzz => 88, :delay => 99, :time_to_run => 11, :queue_name => 'stub', :failed_job_handler => 'decay' }
       mo = Ayl::MessageOptions.new(opts)
 
       mo.priority.should == opts[:priority]
@@ -75,7 +75,7 @@ describe Ayl::MessageOptions do
       mo.delay.should == opts[:delay]
       mo.time_to_run.should == opts[:time_to_run]
       mo.queue_name.should == opts[:queue_name]
-      mo.decay_failed_job.should == opts[:decay_failed_job]
+      mo.failed_job_handler.should == opts[:failed_job_handler]
     end
 
     it "should respond with the correct values when some values are specified in the options" do
@@ -87,7 +87,7 @@ describe Ayl::MessageOptions do
       mo.delay.should == opts[:delay]
       mo.time_to_run.should == Ayl::MessageOptions.default_time_to_run
       mo.queue_name.should == Ayl::MessageOptions.default_queue_name
-      mo.decay_failed_job.should == Ayl::MessageOptions.default_decay_failed_job
+      mo.failed_job_handler.should == Ayl::MessageOptions.default_failed_job_handler
     end
 
     it "should raise an exception when an invalid option is provided in the hash" do

data/spec/message_spec.rb

@@ -9,7 +9,7 @@ describe Ayl::Message do
     Ayl::MessageOptions.default_delay = 0
     Ayl::MessageOptions.default_time_to_run = 120
     Ayl::MessageOptions.default_queue_name = 'default'
-    Ayl::MessageOptions.default_decay_failed_job = false
+    Ayl::MessageOptions.default_failed_job_handler = 'decay'
   end
 
   context "Initialization" do
@@ -57,14 +57,14 @@ describe Ayl::Message do
     it "should package up the message into a hash" do
       options = Ayl::MessageOptions.new
       m = Ayl::Message.new("object", :method_name, options, "arg1", "arg2")
-      m.to_hash.should == { :type => :ayl, :decay_failed_job => false, :code => "\"object\".method_name(\"arg1\", \"arg2\")" }
+      m.to_hash.should == { :type => :ayl, :failed_job_handler => 'decay', :code => "\"object\".method_name(\"arg1\", \"arg2\")" }
     end
 
     it "should package up the message into a hash when the decay failed job has been set" do
       options = Ayl::MessageOptions.new
-      options.decay_failed_job = true
+      options.failed_job_handler = 'decay'
       m = Ayl::Message.new("object", :method_name, options, "arg1", "arg2")
-      m.to_hash.should == { :type => :ayl, :decay_failed_job => true, :code => "\"object\".method_name(\"arg1\", \"arg2\")" }
+      m.to_hash.should == { :type => :ayl, :failed_job_handler => 'decay', :code => "\"object\".method_name(\"arg1\", \"arg2\")" }
     end
 
     it "should be able to create a message from a hash with code that has arguments" do
@@ -104,27 +104,28 @@ describe Ayl::Message do
     end
 
     it "should create a message with decay_failed job set to false if not in the original hash" do
+      Ayl::MessageOptions.default_failed_job_handler = 'delete'
       m_hash = { :type => :ayl, :code => "String._ayl_after_create(2.to_s(2))" }
       m = Ayl::Message.from_hash(m_hash)
       m.options.is_a?(Ayl::MessageOptions).should be_true
       m.to_hash.should === m_hash
-      m.options.decay_failed_job.should be_false
+      m.options.failed_job_handler.should == 'delete'
     end
 
     it "should create a message with decay_failed job set to false if in the original hash as false" do
-      m_hash = { :type => :ayl, :decay_failed_job => false, :code => "String._ayl_after_create(2.to_s(2))" }
+      m_hash = { :type => :ayl, :failed_job_handler => 'delete', :code => "String._ayl_after_create(2.to_s(2))" }
       m = Ayl::Message.from_hash(m_hash)
       m.options.is_a?(Ayl::MessageOptions).should be_true
       m.to_hash.should === m_hash
-      m.options.decay_failed_job.should be_false
+      m.options.failed_job_handler.should == 'delete'
     end
 
     it "should create a message with decay_failed job set to true if in the original hash as true" do
-      m_hash = { :type => :ayl, :decay_failed_job => true, :code => "String._ayl_after_create(2.to_s(2))" }
+      m_hash = { :type => :ayl, :failed_job_handler => 'decay', :code => "String._ayl_after_create(2.to_s(2))" }
       m = Ayl::Message.from_hash(m_hash)
       m.options.is_a?(Ayl::MessageOptions).should be_true
       m.to_hash.should === m_hash
-      m.options.decay_failed_job.should be_true
+      m.options.failed_job_handler.should == 'decay'
     end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ayl
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3676915364557125950
+      hash: 831016271210020708
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: