kelredd-resourceful 0.5.3 → 0.5.4

data/lib/resourceful/agent/base.rb

@@ -13,7 +13,7 @@ module Resourceful
       def initialize(args={})
         ATTRS.each { |a| instance_variable_set("@#{a.to_s}", args.delete(a)) }
         @cache = Resourceful::Resource::Cache.new
-        @logger = Log4r::Logger.new('Resourceful Base')
+        @logger = Log4r::Logger.new('[Resourceful]')
         @logger.add(Log4r::StdoutOutputter.new('console'))
       end
       
@@ -28,10 +28,10 @@ module Resourceful
         cache_key = Resourceful::Resource::Cache.key(@host, verb.to_s, full_resource_path)
         
         if opts[:force] || (resp = cache.read(cache_key)).nil?
-          log "Resource call: #{resource_summary}"
+          log "#{resource_summary}"
           resp = cache.write(cache_key, block.call(full_resource_path))
         else
-          log "Resource call: [CACHE] #{resource_summary}"
+          log "[CACHE] #{resource_summary}"
         end
         format.build(resp)
       end
@@ -61,13 +61,7 @@ module Resourceful
       end
       
       def log(msg, level = :info) # :nodoc:
-        if(msg)
-          if @logger && @logger.respond_to?(level)
-            @logger.send(level.to_s, msg) 
-          else
-            puts "** [#{level.to_s.upcase}]: #{msg}"
-          end
-        end
+        @logger.send(level.to_s, msg) if msg
       end
       
       def log=(file)

data/lib/resourceful/model/base.rb

@@ -3,9 +3,9 @@ module Resourceful
 
     class Base
       
-      @@agent = nil
+      @@agent ||= {}
       def self.agent(&block)
-        @@agent = block;
+        @@agent[self.name.to_s] = block;
       end
       
       def self.get(path, opts={})
@@ -185,10 +185,19 @@ module Resourceful
       end
       
       def self.set_agent
-        unless @@agent.kind_of?(Resourceful::Agent::Base)
-          @@agent = @@agent.call 
+        klass_name = ""
+        self.ancestors.each do |anc|
+          p anc
+          if @@agent[anc.to_s]
+            klass_name = anc.to_s 
+            break
+          end
+        end
+        
+        unless @@agent[klass_name].kind_of?(Resourceful::Agent::Base)
+          @@agent[klass_name] = @@agent[klass_name].call 
         end
-        @@agent
+        @@agent[klass_name]
       end
 
     end

data/lib/resourceful/version.rb

@@ -3,7 +3,7 @@ module Resourceful
     
     MAJOR = 0
     MINOR = 5
-    TINY  = 3
+    TINY  = 4
     
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kelredd-resourceful
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors: 
 - Kelly Redding
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-12 00:00:00 -07:00
+date: 2009-08-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency