kelredd-resourceful 0.4.0 → 0.4.1

data/Rakefile

@@ -16,7 +16,7 @@ spec = Gem::Specification.new do |s|
   s.author           = 'Kelly Redding'
   s.email            = 'kelly@kelredd.com'
   s.homepage         = ''
-  s.files            = %w(README.rdoc Rakefile) + Dir.glob("{features,lib,test}/**/*")
+  s.files            = %w(README.rdoc Rakefile) + Dir.glob("{lib}/**/*")
   # s.executables    = ['resourceful']
   
   s.add_dependency('nokogiri')

data/lib/resourceful/model/base.rb

@@ -4,15 +4,15 @@ module Resourceful
     class Base
       
       @@agent = nil
-      def self.agent(a)
-        @@agent = a
+      def self.agent(&block)
+        @@agent = block;
       end
       
       def self.get(path, opts={})
-        @@agent.get(path, opts)
+        set_agent.get(path, opts)
       end
       def self.get_collection(path, opts={})
-        (yield @@agent.get(path, opts)).collect{|data| new(data)}
+        (yield set_agent.get(path, opts)).collect{|data| new(data)}
       end
 
       def initialize(data)
@@ -97,6 +97,15 @@ module Resourceful
             )
         end
       end
+      
+      private
+      
+      def self.set_agent
+        unless @@agent.kind_of?(Resourceful::Agent::Base)
+          @@agent = @@agent.call 
+        end
+        @@agent
+      end
 
     end
 

data/lib/resourceful/version.rb

@@ -3,7 +3,7 @@ module Resourceful
     
     MAJOR = 0
     MINOR = 4
-    TINY  = 0
+    TINY  = 1
     
     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.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Kelly Redding
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-26 00:00:00 -07:00
+date: 2009-07-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,15 +73,6 @@ extra_rdoc_files:
 files: 
 - README.rdoc
 - Rakefile
-- features/models.feature
-- features/rest_client.feature
-- features/step_definitions
-- features/step_definitions/model_steps.rb
-- features/step_definitions/rest_client_steps.rb
-- features/step_definitions/support
-- features/step_definitions/support/env.rb
-- features/step_definitions/support/helpers.rb
-- features/step_definitions/support/models.rb
 - lib/resourceful
 - lib/resourceful/agent
 - lib/resourceful/agent/base.rb
@@ -100,9 +91,9 @@ files:
 - lib/resourceful/resource.rb
 - lib/resourceful/version.rb
 - lib/resourceful.rb
-- test/test_helper.rb
 has_rdoc: true
 homepage: ""
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -124,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: A ruby gem to abstract web resource handling.

data/features/models.feature

@@ -1,22 +0,0 @@
-Feature:  Models
-  In order to consume rest based resources
-  As an object
-  I want to define and initialize a model class from resource data
-  
-  Scenario: Get JSON user
-    Given I am user with the screen_name "kelredd"
-    When I load my "Json" user model
-    Then the result should be a valid User model
-    
-  Scenario: Get XML user
-    Given I am user with the screen_name "kelredd"
-    When I load my "Xml" user model
-    Then the result should be a valid User model
-
-  Scenario: Get JSON status collection
-    When I load the "Json" status "public_timeline"
-    Then the result should be a collection of valid Status models
-    
-  Scenario: Get XML status collection
-    When I load the "Xml" status "public_timeline"
-    Then the result should be a collection of valid Status models

data/features/rest_client.feature

@@ -1,61 +0,0 @@
-Feature: Get Resource
-  In order to consume rest based resources
-  As an object
-  I want to get data from a web resource as a formatted object
-  
-  Scenario: JSON Format definition
-    Given I want to use the json resource format
-    Then the format should be .json
-  
-  Scenario: XML Format definition
-    Given I want to use the xml resource format
-    Then the format should be .xml
-  
-  Scenario: Host not configured
-    Given I have no host server configured
-    Then resourceful should complain about a configuration error
-
-  Scenario: Host configured
-    Given I have a configured resource host
-    Then the host should be set
-
-  Scenario: Resource logger
-    Given I have a configured resource host set to log
-    Then verify the log settings
-
-  Scenario: Resource logging
-    Given I have a configured resource host set to log
-    When I get a json formatted resource
-    Then the set log file should exist
-
-
-
-  Scenario: Get JSON resource
-    Given I have a configured resource host
-    When I get a json formatted resource
-    Then the result should be a hash object
-    
-  Scenario: Get XML resource
-    Given I have a configured resource host
-    When I get an xml formatted resource
-    Then the result should be an xml object
-    
-  Scenario: Get an implicit format JSON resource
-    Given I have a configured resource host
-    When I get a json formatted implicitly resource
-    Then the result should be a hash object
-    
-  Scenario: Get an implicit format XML resource
-    Given I have a configured resource host
-    When I get an xml formatted implicitly resource
-    Then the result should be an xml object
-    
-  Scenario: Get resource with format not supported
-    Given I have a configured resource host
-    When I get an poop formatted resource
-    Then resourceful should complain about a format error
-    
-  Scenario: Get non existent resource
-    Given I have a configured resource host
-    When I get a resource that does not exist
-    Then resourceful should complain about the resource not being found

data/features/step_definitions/model_steps.rb

@@ -1,63 +0,0 @@
-Given /^I am user with the screen_name "([^\"]*)"$/ do |screen_name|
-  @screen_name = screen_name
-end
-
-When /^I load my "([^\"]*)" user model$/ do |klass|
-  @result = "User#{klass}".constantize.find(@screen_name)
-end
-
-When /^I load the "([^\"]*)" status "([^\"]*)"$/ do |klass, collection|
-  @result = "Status#{klass}".constantize.find(collection)
-end
-
-Then /^the result should be a valid User model$/ do
-  [:id, :name, :screen_name, :location, :description, :profile_image_url, :url, :protected, :followers_count, :friends_count, :created_on, :last_status_at, :last_status].each do |attribute|
-    assert @result.respond_to?(attribute)
-  end
-  {
-    :id => 38225297,
-    :name => "Kelly Redding",
-    :screen_name => "kelredd",
-    :protected => false,
-    :created_on => Date.strptime("2009-05-06")
-  }.each do |k,v|
-    assert_equal v, @result.send(k.to_s)
-  end
-  assert_kind_of DateTime, @result.last_status_at
-  assert !@result.last_status.nil?
-  assert @result.last_status != ''
-  
-  assert_kind_of Resourceful::Model::Base, @result.last_status
-  assert_valid_status(@result.last_status)
-end
-
-Then /^the result should be a collection of valid Status models$/ do
-  assert_kind_of Array, @result
-  assert_equal 20, @result.length
-  assert_valid_status(@result.first)
-
-  [:user_id, :user_screen_name, :user].each do |attribute|
-    assert @result.first.respond_to?(attribute)
-    assert_nothing_raised do
-      @result.first.send(attribute.to_s)
-    end
-  end
-  [:user_id, :user_screen_name, :user].each do |attribute|
-    assert !@result.first.send(attribute.to_s).nil?
-  end
-  assert_kind_of Resourceful::Model::Base, @result.first.user  
-end
-
-def assert_valid_status(status)
-  [:id, :text, :source, :truncated, :favorited, :reply_status, :reply_user].each do |attribute|
-    assert status.respond_to?(attribute)
-    assert_nothing_raised do
-      status.send(attribute.to_s)
-    end
-  end
-  
-  [:id, :text, :truncated, :favorited].each do |attribute|
-    assert !status.send(attribute.to_s).nil?
-  end
-  
-end

data/features/step_definitions/rest_client_steps.rb

@@ -1,84 +0,0 @@
-Given /^I want to use the (.+) resource format$/ do |format|
-  @format = Resourceful::Resource::Format.get(format)
-end
-
-Given /^I have no host server configured$/ do
-  @agent = Resourceful::Agent::RestClient.new
-end
-
-Given /^I have a configured resource host$/ do
-  @agent = Resourceful::Agent::RestClient.new(:host => RESOURCE_CONFIG[:host])
-end
-
-Given /^I have a configured resource host set to log$/ do
-  log_file = File.expand_path(RESOURCE_CONFIG[:log])
-  FileUtils.rm(log_file) if File.exists?(log_file)
-  @agent = Resourceful::Agent::RestClient.new(:host => RESOURCE_CONFIG[:host]) {
-    RESOURCE_CONFIG[:log]
-  }
-end
-
-Then /^the format should be \.(.+)$/ do |format|
-  assert_equal @format.to_s, format
-end
-
-Then /^the host should be set$/ do
-  assert_equal @agent.host, RESOURCE_CONFIG[:host]
-end
-
-Then /^resourceful should complain about a configuration error$/ do
-  assert_raise Resourceful::Exceptions::ConfigurationError do
-    @agent.get RESOURCE_CONFIG[:resource], :format => 'json', :params => RESOURCE_CONFIG[:params]
-  end
-end
-
-Then /^verify the log settings$/ do
-  assert_equal @agent.logger.outputters.detect{|out| out.respond_to?('filename')}.filename, RESOURCE_CONFIG[:log]
-end
-
-Then /^the set log file should exist$/ do
-  log_file = File.expand_path(RESOURCE_CONFIG[:log])  
-  assert File.exists?(log_file)
-  FileUtils.rm(log_file) if File.exists?(log_file)
-end
-
-
-
-
-When /^I get a[n]* (.+) formatted resource$/ do |format|
-  @result = ResourcefulFeature::Helpers.safe_run_get do
-    @agent.get RESOURCE_CONFIG[:resource], :format => format, :params => RESOURCE_CONFIG[:params]
-  end
-end
-
-When /^I get a[n]* (.+) formatted implicitly resource$/ do |format|
-  @result = ResourcefulFeature::Helpers.safe_run_get do
-    @agent.get RESOURCE_CONFIG[:resource]+".#{format}", :params => RESOURCE_CONFIG[:params]
-  end
-end
-
-When /^I get a resource that does not exist$/ do
-  @result = ResourcefulFeature::Helpers.safe_run_get do
-    @agent.get '/unknown', :format => 'xml', :params => RESOURCE_CONFIG[:params]
-  end
-end
-
-Then /^the result should be a hash object$/ do
-  assert_kind_of Hash, @result.first
-end
-
-Then /^the result should be an xml object$/ do
-  assert_kind_of Nokogiri::XML::Document, @result
-end
-
-Then /^resourceful should complain about a format error$/ do
-  assert @result
-  assert_kind_of Resourceful::Exceptions::FormatError, @result
-  assert @result.message.length > 0
-end
-
-Then /^resourceful should complain about the resource not being found$/ do
-  assert @result
-  assert_kind_of RestClient::ResourceNotFound, @result
-  assert @result.message.length > 0
-end

data/features/step_definitions/support/env.rb

@@ -1,14 +0,0 @@
-require 'test/unit/assertions'
-World(Test::Unit::Assertions)
-
-RESOURCE_CONFIG = {
-  :host => 'http://twitter.com',
-  :resource => '/statuses/public_timeline',
-  :params => {},
-  :log => "./test.log"
-}
-
-require File.dirname(__FILE__) + '/../../../lib/resourceful'
-
-REST_CLIENT_TWITTER = Resourceful::Agent::RestClient.new(:host => RESOURCE_CONFIG[:host])
-

data/features/step_definitions/support/helpers.rb

@@ -1,13 +0,0 @@
-module ResourcefulFeature
-  module Helpers
-    
-    def self.safe_run_get
-      begin
-        yield
-      rescue Exception => err
-        err
-      end
-    end
-
-  end
-end

data/features/step_definitions/support/models.rb

@@ -1,97 +0,0 @@
-class UserXml < Resourceful::Model::Xml
-  
-  agent REST_CLIENT_TWITTER
-  
-  def self.find(screen_name, force=false)
-    get("/users/#{screen_name}", {}, "//user")
-  end
-  
-  attribute :id, :integer
-  attribute :name, :string
-  attribute :screen_name, :string
-  attribute :location, :string
-  attribute :description, :string
-  attribute :profile_image_url, :string
-  attribute :url, :string
-  attribute :protected, :boolean
-  attribute :followers_count, :integer
-  attribute :friends_count, :integer
-  attribute :created_on, :date, :path => 'created_at'
-  attribute :last_status_at, :datetime, :path => "status/created_at"
-  attribute :last_status, :string, :path => "status/text"
-  
-  has_one :last_status, :path => "status", :klass => "StatusXml"
-
-end
-
-class UserJson < Resourceful::Model::Json
-  
-  agent REST_CLIENT_TWITTER
-  
-  def self.find(screen_name, force=false)
-    get("/users/#{screen_name}", {})
-  end
-  
-  attribute :id, :integer
-  attribute :name, :string
-  attribute :screen_name, :string
-  attribute :location, :string
-  attribute :description, :string
-  attribute :profile_image_url, :string
-  attribute :url, :string
-  attribute :protected, :boolean
-  attribute :followers_count, :integer
-  attribute :friends_count, :integer
-  attribute :created_on, :date, :path => 'created_at'
-  attribute :last_status_at, :datetime, :path => "status/created_at"
-  attribute :last_status, :string, :path => "status/text"
-  
-  has_one :last_status, :path => "status", :klass => "StatusJson"
-
-end
-
-class StatusXml < Resourceful::Model::Xml
-  
-  agent REST_CLIENT_TWITTER
-  
-  def self.find(collection, force=false)
-    get_collection("/statuses/#{collection}", {}, "//statuses/status")
-  end
-  
-  attribute :id, :integer
-  attribute :text, :string
-  attribute :source, :string
-  attribute :created_on, :date, :path => 'created_at'
-  attribute :truncated, :boolean
-  attribute :favorited, :boolean
-  attribute :reply_status, :integer, :path => 'in_reply_to_status_id'
-  attribute :reply_user, :integer, :path => 'in_reply_to_user_id'
-  attribute :user_id, :integer, :path => "user/id"
-  attribute :user_screen_name, :integer, :path => "user/screen_name"
-
-  has_one :user, :path => "user", :klass => "UserXml"
-  
-end
-
-class StatusJson < Resourceful::Model::Json
-  
-  agent REST_CLIENT_TWITTER
-  
-  def self.find(collection, force=false)
-    get_collection("/statuses/#{collection}", {})
-  end
-  
-  attribute :id, :integer
-  attribute :text, :string
-  attribute :source, :string
-  attribute :created_on, :date, :path => 'created_at'
-  attribute :truncated, :boolean
-  attribute :favorited, :boolean
-  attribute :reply_status, :integer, :path => 'in_reply_to_status_id'
-  attribute :reply_user, :integer, :path => 'in_reply_to_user_id'
-  attribute :user_id, :integer, :path => "user/id"
-  attribute :user_screen_name, :string, :path => "user/screen_name"
-
-  belongs_to :user, :klass => "UserJson"
-
-end

data/test/test_helper.rb

@@ -1,9 +0,0 @@
-# http://sneaq.net/textmate-wtf
-$:.reject! { |e| e.include? 'TextMate' }
-
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-require File.dirname(__FILE__) + '/../lib/resourceful'
-