Sutto-perennial 0.2.3.5 → 0.2.3.6

data/bin/perennial

@@ -15,8 +15,7 @@ Perennial::Application.processing(ARGV) do |a|
     path     = File.expand_path(path)
     # Check if the folder exists
     if File.exist?(path) && !opts[:force]
-      puts "The path you tried to use, #{path}, already exists. Please try another or pass --force"
-      exit
+      die! "The path you tried to use, #{path}, already exists. Please try another or pass --force"
     end
     # Convert the name and class name.
     app_path   = app_name.underscore

data/lib/perennial/core_ext/attribute_accessors.rb

@@ -1,6 +1,31 @@
 # cattr_* and class_inheritable_* are taken from
 # ActiveSupport. Included here to help keep the
 # codebase simple / clean.
+
+class Object
+  
+  unless respond_to?(:instance_variable_defined?)
+    def instance_variable_defined?(variable)
+      instance_variables.include?(variable.to_s)
+    end
+  end
+
+  def instance_values #:nodoc:
+    instance_variables.inject({}) do |values, name|
+      values[name.to_s[1..-1]] = instance_variable_get(name)
+      values
+    end
+  end
+
+  if RUBY_VERSION >= '1.9'
+    def instance_variable_names
+      instance_variables.map { |var| var.to_s }
+    end
+  else
+    alias_method :instance_variable_names, :instance_variables
+  end
+end
+
 class Class
   def cattr_reader(*syms)
     syms.flatten.each do |sym|

data/lib/perennial/core_ext/misc.rb

@@ -70,8 +70,8 @@ class Module
   
   def add_extension(name, &blk)
     item = name.to_s.camelize.to_sym
-    return unless const_defined?(item)
-    target = const_get(item)
+    target = const_get(item) rescue nil
+    raise "Didn't find library for #{name}" if target.nil?
     if target.is_a?(Class)
       target.class_eval(&blk)
     elsif target.is_a?(Module)

data/lib/perennial/dispatchable.rb

@@ -36,39 +36,52 @@ module Perennial
         self.class.handlers
       end
       
+      def dispatch_queue
+        @dispatch_queue ||= []
+      end
+      
       # Dispatch an 'event' with a given name to the handlers
       # registered on the current class. Used as a nicer way of defining
       # behaviours that should occur under a given set of circumstances.
       # == Params
       # +name+: The name of the current event
       # +opts+: an optional hash of options to pass
-      def dispatch(name, opts = {})
-        # The full handler name is the method we call given it exists.
-        full_handler_name = :"handle_#{name.to_s.underscore}"
-        # First, dispatch locally if the method is defined.
-        self.send(full_handler_name, opts) if self.respond_to?(full_handler_name)
-        # Iterate through all of the registered handlers,
-        # If there is a method named handle_<event_name>
-        # defined we sent that otherwise we call the handle
-        # method on the handler. Note that the handle method
-        # is the only required aspect of a handler. An improved
-        # version of this would likely cache the respond_to?
-        # call.
-        self.handlers.each do |handler|
-          if handler.respond_to?(full_handler_name)
-            handler.send(full_handler_name, opts)
-          else
-            handler.handle name, opts
+      def dispatch(name, opts = {}, force = false)
+        if dispatch_queue.empty? || force
+          Logger.debug "Dispatching #{name} event (#{dispatch_queue.size} queued - on #{self.class.name})"
+          begin
+            # The full handler name is the method we call given it exists.
+            full_handler_name = :"handle_#{name.to_s.underscore}"
+            # First, dispatch locally if the method is defined.
+            self.send(full_handler_name, opts) if self.respond_to?(full_handler_name)
+            # Iterate through all of the registered handlers,
+            # If there is a method named handle_<event_name>
+            # defined we sent that otherwise we call the handle
+            # method on the handler. Note that the handle method
+            # is the only required aspect of a handler. An improved
+            # version of this would likely cache the respond_to?
+            # call.
+            self.handlers.each do |handler|
+              if handler.respond_to?(full_handler_name)
+                handler.send(full_handler_name, opts)
+              else
+                handler.handle name, opts
+              end
+            end
+          # If we get the HaltHandlerProcessing exception, we
+          # catch it and continue on our way. In essence, we
+          # stop the dispatch of events to the next set of the
+          # handlers.
+          rescue HaltHandlerProcessing => e
+            Logger.info "Halting processing chain"
+          rescue Exception => e
+            Logger.log_exception(e)
           end
+          dispatch(*dispatch_queue.shift) unless dispatch_queue.empty?
+        else
+          Logger.debug "Adding #{name} event to the end of the queue (on #{self.class.name})"
+          dispatch_queue << [name, opts, true]
         end
-      # If we get the HaltHandlerProcessing exception, we
-      # catch it and continue on our way. In essence, we
-      # stop the dispatch of events to the next set of the
-      # handlers.
-      rescue HaltHandlerProcessing => e
-        Logger.info "Halting processing chain"
-      rescue Exception => e
-        Logger.log_exception(e)
       end
       
     end

data/lib/perennial.rb

@@ -9,7 +9,7 @@ require 'perennial/exceptions'
 
 module Perennial
   
-  VERSION = "0.2.3.5"
+  VERSION = "0.2.3.6"
   
   has_library :dispatchable, :hookable, :loader, :logger,
               :loggable, :manifest, :settings, :argument_parser,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Sutto-perennial
 version: !ruby/object:Gem::Version 
-  version: 0.2.3.5
+  version: 0.2.3.6
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-08 00:00:00 -07:00
+date: 2009-09-11 00:00:00 -07:00
 default_executable: perennial
 dependencies: []