kelredd-resourceful 0.4.2 → 0.4.3

data/lib/resourceful/agent/base.rb

@@ -6,15 +6,61 @@ module Resourceful
     class Base
       
       attr_reader :logger, :cache
+
+      ATTRS = [:host, :user, :password]
+      ATTRS.each { |a| attr_reader a }
       
       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.add(Log4r::StdoutOutputter.new('console'))
       end
       
+      def get(path, opts={}, &block)
+        path, opts = check_config(path, opts)
+        format = Resourceful::Resource::Format.get(opts[:format])
+        
+        full_resource_path = self.class.resource_path(path, format, opts[:params])
+        resource_summary = summary('get', full_resource_path)
+        cache_key = Resourceful::Resource::Cache.key(@host, 'get', full_resource_path)
+        
+        if opts[:force] || (resp = cache.read(cache_key)).nil?
+          log "Resource call: #{resource_summary}"
+          resp = cache.write(cache_key, block.call(full_resource_path))
+        else
+          log "Resource call: [CACHE] #{resource_summary}"
+        end
+        format.build(resp)
+      end
+    
       protected
 
+      def check_config(path, opts) # :nodoc:
+        raise Resourceful::Exceptions::ConfigurationError, "invalid Mechanize agent" unless agent && agent_url && !agent_url.empty?
+        opts ||= {}
+        opts[:force] ||= false
+        if path =~ /^(.+)\.(.+)$/
+          path = $1
+          opts[:format] ||= $2
+        end
+        opts[:format] ||= Resourceful::Resource::Json.to_s
+        opts[:params] ||= {}
+        [path, opts]
+      end
+      
+      def self.resource_path(path, format, params) # :nodoc:
+        "#{path}.#{format}#{params.to_http_query_str unless params.empty?}"
+      end
+      
+      def summary(verb, full_resource_path) # :nodoc:
+        "#{verb.upcase} #{agent_url}#{full_resource_path}"
+      end
+        
+      def agent_url
+        @host
+      end
+      
       def log(msg, level = :info) # :nodoc:
         if(msg)
           if @logger && @logger.respond_to?(level)

data/lib/resourceful/agent/mechanize.rb

@@ -0,0 +1,34 @@
+require 'mechanize'
+require File.join(File.dirname(__FILE__), 'base.rb')
+
+module Resourceful
+  module Agent
+    class Mechanize < Resourceful::Agent::Base
+      
+      def initialize(args={})
+        super(args)
+        self.log = yield if block_given?
+        @mechanize = ::WWW::Mechanize.new
+      end
+
+      def get(path, opts={})
+        super(path, opts) do |path|
+          @mechanize.get("#{@host}#{path}") do |page|
+            if block_given?
+              yield page
+            else
+              page
+            end
+          end.body
+        end
+      end
+    
+      protected
+      
+      def agent
+        @mechanize
+      end
+      
+    end
+  end
+end

data/lib/resourceful/agent/rest_client.rb

@@ -5,56 +5,24 @@ module Resourceful
   module Agent
     class RestClient < Resourceful::Agent::Base
       
-      ATTRS = [:host, :user, :password]
-      ATTRS.each { |a| attr_reader a }
-      
-      def initialize(args={})
-        ATTRS.each { |a| instance_variable_set("@#{a.to_s}", args.delete(a)) }
+     def initialize(args={})
         super(args)
         self.log = ::RestClient.log = yield if block_given?
-        @agent = ::RestClient::Resource.new(@host, :user => @user, :password => @password)
+        @rest_client = ::RestClient::Resource.new(@host, :user => @user, :password => @password)
       end
 
       def get(path, opts={})
-        path, opts = check_config(path, opts)
-        format = Resourceful::Resource::Format.get(opts[:format])
-        
-        full_resource_path = self.class.resource_path(path, format, opts[:params])
-        resource_summary = summary('get', full_resource_path)
-        cache_key = Resourceful::Resource::Cache.key(@host, 'get', full_resource_path)
-        
-        if opts[:force] || (resp = cache.read(cache_key)).nil?
-          log "Resource call: #{resource_summary}"
-          resp = cache.write(cache_key, @agent[full_resource_path].get)
-        else
-          log "Resource call: [CACHE] #{resource_summary}"
+        super(path, opts) do |path|
+          @rest_client[path].get
         end
-        format.build(resp)
       end
-    
+      
       protected
-    
-      def check_config(path, opts)
-        raise Resourceful::Exceptions::ConfigurationError, "invalid RestClient agent" unless @agent && @agent.url
-        opts ||= {}
-        opts[:force] ||= false
-        if path =~ /^(.+)\.(.+)$/
-          path = $1
-          opts[:format] ||= $2
-        end
-        opts[:format] ||= Resourceful::Resource::Json.to_s
-        opts[:params] ||= {}
-        [path, opts]
-      end
       
-      def self.resource_path(path, format, params) # :nodoc:
-        "#{path}.#{format}#{params.to_http_query_str unless params.empty?}"
+      def agent
+        @rest_client
       end
       
-      def summary(verb, full_resource_path) # :nodoc:
-        "#{verb.upcase} #{@agent.url}#{full_resource_path}"
-      end
-        
     end
   end
 end

data/lib/resourceful/version.rb

@@ -3,7 +3,7 @@ module Resourceful
     
     MAJOR = 0
     MINOR = 4
-    TINY  = 2
+    TINY  = 3
     
     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.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Kelly Redding
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-29 00:00:00 -07:00
+date: 2009-08-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,6 +76,7 @@ files:
 - lib/resourceful
 - lib/resourceful/agent
 - lib/resourceful/agent/base.rb
+- lib/resourceful/agent/mechanize.rb
 - lib/resourceful/agent/rest_client.rb
 - lib/resourceful/agent.rb
 - lib/resourceful/exceptions.rb
@@ -91,7 +92,7 @@ files:
 - lib/resourceful/resource.rb
 - lib/resourceful/version.rb
 - lib/resourceful.rb
-has_rdoc: true
+has_rdoc: false
 homepage: ""
 licenses: 
 post_install_message: 
@@ -117,7 +118,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A ruby gem to abstract web resource handling.
 test_files: []