kelredd-resourceful 0.3.0 → 0.4.0

data/features/step_definitions/model_steps.rb

@@ -3,17 +3,11 @@ Given /^I am user with the screen_name "([^\"]*)"$/ do |screen_name|
 end
 
 When /^I load my "([^\"]*)" user model$/ do |klass|
-  name = "User#{klass}"
-  constant = ::Object
-  model_klass = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
-  @result = model_klass.find(@screen_name)
+  @result = "User#{klass}".constantize.find(@screen_name)
 end
 
 When /^I load the "([^\"]*)" status "([^\"]*)"$/ do |klass, collection|
-  name = "Status#{klass}"
-  constant = ::Object
-  model_klass = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
-  @result = model_klass.find(collection)
+  @result = "Status#{klass}".constantize.find(collection)
 end
 
 Then /^the result should be a valid User model$/ do
@@ -32,23 +26,38 @@ Then /^the result should be a valid User model$/ do
   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)
 
-  [:id, :text, :source, :truncated, :favorited, :reply_status, :reply_user, :user_id, :user_screen_name, :user].each do |attribute|
+  [: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
-  
-  [:id, :text, :truncated, :favorited, :user_id, :user_screen_name, :user].each do |attribute|
+  [: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/support/models.rb

@@ -19,6 +19,8 @@ class UserXml < Resourceful::Model::Xml
   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
 
@@ -43,6 +45,8 @@ class UserJson < Resourceful::Model::Json
   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
 
@@ -65,9 +69,7 @@ class StatusXml < Resourceful::Model::Xml
   attribute :user_id, :integer, :path => "user/id"
   attribute :user_screen_name, :integer, :path => "user/screen_name"
 
-  def user
-    @user ||= (get_node('./user') ? UserXml.new(get_node('./user')) : nil)
-  end
+  has_one :user, :path => "user", :klass => "UserXml"
   
 end
 
@@ -88,10 +90,8 @@ class StatusJson < Resourceful::Model::Json
   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"
+  attribute :user_screen_name, :string, :path => "user/screen_name"
 
-  def user
-    @user ||= UserXml.find(self.user_screen_name)
-  end
+  belongs_to :user, :klass => "UserJson"
 
 end

data/lib/resourceful/agent/rest_client.rb

@@ -1,5 +1,4 @@
 require 'rest_client'
-require File.join(File.dirname(__FILE__), '..', 'resource', 'format.rb')
 require File.join(File.dirname(__FILE__), 'base.rb')
 
 module Resourceful

data/lib/resourceful/extensions.rb

@@ -28,6 +28,32 @@ module Resourceful
         end
       end
       
+      unless "".respond_to?(:constantize) 
+        if Module.method(:const_get).arity == 1
+          def constantize #:nodoc:
+            names = self.split('::')
+            names.shift if names.empty? || names.first.empty?
+
+            constant = ::Object
+            names.each do |name|
+              constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+            end
+            constant
+          end
+        else # Ruby 1.9 version
+          def constantize #:nodoc:
+            names = self.split('::')
+            names.shift if names.empty? || names.first.empty?
+
+            constant = ::Object
+            names.each do |name|
+              constant = constant.const_get(name, false) || constant.const_missing(name)
+            end
+            constant
+          end
+        end
+      end
+      
     end
   end
 end

data/lib/resourceful/model/base.rb

@@ -20,7 +20,9 @@ module Resourceful
       
       protected
       
-      def self.attribute(name, type, config)
+      def self.attribute(name, type, config={})
+        config ||= {}
+        config[:path] ||= name
         content_method = case type.to_sym
         when :string
           'to_s'
@@ -38,7 +40,61 @@ module Resourceful
           'to_s'
         end
         define_method(name) do
-          instance_variable_get("@#{name}") || instance_variable_set("@#{name}", ((a = attribute(config)) && a.kind_of?(String)) ? a.send(content_method) : a)
+          instance_variable_get("@#{name}") || \
+            instance_variable_set("@#{name}", \
+              if ((a = attribute(config)) && a.kind_of?(String))
+                a.send(content_method)
+              else
+                a
+              end
+            )
+        end
+      end
+
+      def self.has_one(name, config={})
+        config ||= {}
+        config[:path] ||= name
+        define_method(name) do
+          instance_variable_get("@#{name}") || \
+            instance_variable_set("@#{name}", \
+              if (c = child(config))
+                config[:klass].constantize.new(c) rescue c
+              else
+                c
+              end
+            )
+        end
+      end
+
+      def self.has_many(name, config={})
+        config ||= {}
+        config[:path] ||= name
+        define_method(name) do
+          instance_variable_get("@#{name}") || \
+            instance_variable_set("@#{name}", \
+              if ((c = child(config)) && c.respond_to?(:collect))
+                c.collect do |item|
+                  config[:klass].constantize.new(item) rescue item
+                end
+              else
+                c
+              end
+            )
+        end
+      end
+
+      def self.belongs_to(name, config={})
+        config ||= {}
+        config[:id] ||= "#{name}_id"
+        define_method(name) do
+          instance_variable_get("@#{name}") || \
+            instance_variable_set("@#{name}", \
+              if ((k = config[:klass].constantize) && k.respond_to?(:find))
+                self.respond_to?(config[:id]) ? k.find(self.send(config[:id])) : nil
+              else
+                nil
+              end
+            )
         end
       end
 

data/lib/resourceful/model/json.rb

@@ -25,22 +25,31 @@ module Resourceful
       end
 
       def initialize(json)
-        @json = json
+        raise Resourceful::Exceptions::ModelError, "trying to initialize a Resourceful::Model::Json model with '#{json.class.name}' data" unless json.kind_of?(::Hash)
+        @data = json
       end
       
       protected
       
-      def self.attribute(name, type, config={})
-        config[:path] ||= name
-        super(name, type, config)
-      end
-      
       def attribute(config)
-        paths = config[:path].to_s.split('/')
-        paths.inject(@json) { |val,path| val.fetch(path, nil) rescue nil }
+        begin
+          get_node(config[:path])
+        rescue Exception => err
+          nil
+        end
+      end        
+
+      def child(config)
+        attribute(config)
       end
         
-
+      def self.get_node(json, path_config)
+        paths = path_config.to_s.split('/')
+        paths.inject(json) { |val,path| val.fetch(path, nil) rescue nil }
+      end
+      def get_node(path_config)
+        self.class.get_node(@data, path_config)
+      end
     end
 
   end

data/lib/resourceful/model/xml.rb

@@ -25,33 +25,40 @@ module Resourceful
       end
 
       def initialize(xml)
-        @xml = xml
+        raise Resourceful::Exceptions::ModelError, "trying to initialize a Resourceful::Model::Xml model with '#{xml.class.name}' data" unless xml.kind_of?(Nokogiri::XML::NodeSet) || xml.kind_of?(Nokogiri::XML::Element)
+        @data = xml
       end
       
       protected
       
-      def self.attribute(name, type, config={})
-        config[:path] ||= name
-        super(name, type, config)
-      end
-      
       def attribute(config)
-        node = get_node("./#{config[:path]}")
-        node.content rescue nil
+        begin
+          get_node("./#{config[:path]}").content
+        rescue Exception => err
+          nil
+        end          
+      end
+        
+      def child(config)
+        begin
+          get_node("./#{config[:path]}")
+        rescue Exception => err
+          nil
+        end
       end
         
       def self.get_node(xml, path)
         xml.xpath(path.to_s).first
       end
       def get_node(path)
-        self.class.get_node(@xml, path)
+        self.class.get_node(@data, path)
       end
 
       def self.xml_root_name(xml)
         xml.root.name
       end
       def xml_root_name
-        self.class.xml_root_name(@xml)
+        self.class.xml_root_name(@data)
       end
 
     end

data/lib/resourceful/version.rb

@@ -2,7 +2,7 @@ module Resourceful
   module Version
     
     MAJOR = 0
-    MINOR = 3
+    MINOR = 4
     TINY  = 0
     
     def self.to_s # :nodoc:

metadata

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