kelredd-resourceful 0.7.1 → 0.7.3

data/lib/resourceful/model/attribute_types.rb

@@ -0,0 +1,39 @@
+module Resourceful
+  module Model
+    module AttributeTypes
+      
+      module ClassMethods
+        
+        ATTRIBUTE_TYPES = {
+          :string   => { :method => 'to_s',                   :kind => ::String   },
+          :text     => { :method => 'to_s',                   :kind => ::String   },
+          :integer  => { :method => 'to_i',                   :kind => ::Fixnum   },
+          :float    => { :method => 'to_f',                   :kind => ::Float    },
+          :currency => { :method => 'from_currency_to_f',     :kind => ::Float    },
+          :date     => { :method => 'to_date',                :kind => ::Date     },
+          :datetime => { :method => 'to_datetime',            :kind => ::DateTime },
+          :boolean  => { :method => 'to_resourceful_boolean', :kind => ::Object   },
+          :other    => { :method => 'to_s',                   :kind => ::String   }
+        }
+        
+        def attribute_type_to_method(type)
+          (ATTRIBUTE_TYPES.has_key?(type.to_sym) ? ATTRIBUTE_TYPES[type.to_sym] : ATTRIBUTE_TYPES[:other])[:method]
+        end
+
+        def attribute_type_to_kind(type)
+          (ATTRIBUTE_TYPES.has_key?(type.to_sym) ? ATTRIBUTE_TYPES[type.to_sym] : ATTRIBUTE_TYPES[:other])[:kind]
+        end
+
+      end
+      
+      module InstanceMethods
+      end
+      
+      def self.included(receiver)
+        receiver.extend         ClassMethods
+        receiver.send :include, InstanceMethods
+      end
+      
+    end
+  end
+end

data/lib/resourceful/model/base.rb

@@ -1,7 +1,10 @@
+require 'resourceful/model/attribute_types'
+
 module Resourceful
   module Model
 
     class Base
+      include Resourceful::Model::AttributeTypes
       
       @@agent ||= {}
       def self.agent(&block)
@@ -92,24 +95,7 @@ module Resourceful
         add_to_attributes(name.to_s)
         config ||= {}
         config[:path] ||= clean_name
-        content_method = case type.to_sym
-        when :string
-          'to_s'
-        when :integer
-          'to_i'
-        when :float
-          'to_f'
-        when :currency
-          'from_currency_to_f'
-        when :date
-          'to_date'
-        when :datetime
-          'to_datetime'
-        when :boolean
-          'to_resourceful_boolean'
-        else 
-          'to_s'
-        end
+        content_method = attribute_type_to_method(type)
         # method to get the raw attribute variable data (not intended to be overridden)
         define_method("_#{clean_name}") do
           fetch_attribute(clean_name, config, content_method)

data/lib/resourceful/shoulda/test_unit.rb

@@ -5,10 +5,12 @@ module Resourceful
   module Shoulda
     module TestUnit
       
+      protected
+      
       def should_have_resourceful_attribute(name, opts={})
         clean_name = ::Resourceful::Model::Base.cleanup_name(name)
         should_have_instance_methods clean_name, "#{clean_name}=", "_#{clean_name}"
-        # TODO: Validate this attribute is of type opts[:type] if provided
+        should_have_resourceful_typed_attribute(name, opts[:type])
       end unless Test::Unit::TestCase.method_defined? :should_have_resourceful_attribute
       
       def should_have_namespace(ns)
@@ -29,32 +31,71 @@ module Resourceful
       def should_resourcefully_belong_to(name, opts={})
         clean_name = ::Resourceful::Model::Base.cleanup_name(name)
         should_have_instance_methods clean_name
-        # TODO: Validation :class config present, validation that a namespaced klass is defined
-        # TODO: Validate it returns something of that klass
+        should_have_resourceful_association_item(name, opts)
       end
       
       def should_resourcefully_have_many(name, opts={})
         clean_name = ::Resourceful::Model::Base.cleanup_name(name)
         should_have_instance_methods clean_name
-        # TODO: Validation :class config present, validation that a namespaced klass is defined
-        # TODO: Validate returns an array of items of that klass
+        should_have_resourceful_association_collection(name, opts)
       end
       
       def should_resourcefully_contain_one(name, opts={})
         clean_name = ::Resourceful::Model::Base.cleanup_name(name)
         should_have_instance_methods clean_name
-        # TODO: Validation :class config present, validation that a namespaced klass is defined
-        # TODO: Validate it returns something of that klass
+        should_have_resourceful_association_item(name, opts)
       end
       
       def should_resourcefully_contain_many(name, opts={})
         clean_name = ::Resourceful::Model::Base.cleanup_name(name)
         should_have_instance_methods clean_name
-        # TODO: Validation :class config present, validation that a namespaced klass is defined
-        # TODO: Validate returns an array of items of that klass
+        should_have_resourceful_association_collection(name, opts)
       end
       
-      protected
+      
+      
+      # Helpers
+      
+      def should_have_resourceful_typed_attribute(name, type)
+        if type
+          should "have a #{name} resourceful #{type} value" do
+            if subject && (val = subject.send(name))
+              assert_kind_of Resourceful::Model::Base.attribute_type_to_kind(type), val, "#{name} does not have a #{Resourceful::Model::Base.attribute_type_to_kind(type)} kind of value."
+            end
+          end
+        end
+      end
+      
+      def should_have_resourceful_association_item(name, opts)
+        klass = described_type
+        should_have_resourceful_association_class(opts)
+        should "return an item that is a kind of #{opts[:class]}" do
+          if subject && (val = subject.send(name))
+            assert_kind_of klass.get_namespaced_klass(opts[:class]), val, "#{name} should be a kind of #{opts[:class]}"
+          end
+        end
+      end
+      
+      def should_have_resourceful_association_collection(name, opts)
+        klass = described_type
+        should_have_resourceful_association_class(opts)
+        should "return a collection of items that are a kind of #{opts[:class]}" do
+          if subject && (val = subject.send(name))
+            assert_kind_of ::Array, val, "#{name} should be a kind of Array"
+            if (first_item = val.first)
+              assert_kind_of klass.get_namespaced_klass(opts[:class]), first_item, "#{name} first item should be a kind of #{opts[:class]}"
+            end
+          end
+        end
+      end
+      
+      def should_have_resourceful_association_class(opts)
+        klass = described_type
+        should "have a #{opts[:class]} class specified that is defined" do
+          assert opts[:class], "resourceful associations require a :class option"
+          assert klass.get_namespaced_klass(opts[:class]), "a namespaced #{opts[:class]} is not defined"
+        end
+      end
       
       # Ripped from Shoulda::ActiveRecord::Macros
       def should_have_instance_methods(*methods)
@@ -76,7 +117,7 @@ module Resourceful
             assert_respond_to klass, method, "#{klass.name} does not have class method #{method}"
           end
         end
-      end
+      end unless Test::Unit::TestCase.method_defined? :should_have_class_methods
       
     end
   end

data/lib/resourceful/version.rb

@@ -3,7 +3,7 @@ module Resourceful
     
     MAJOR = 0
     MINOR = 7
-    TINY  = 1
+    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.7.1
+  version: 0.7.3
 platform: ruby
 authors: 
 - Kelly Redding
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-11 00:00:00 -07:00
+date: 2009-09-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,6 +92,7 @@ files:
 - lib/resourceful/exceptions.rb
 - lib/resourceful/extensions.rb
 - lib/resourceful/model
+- lib/resourceful/model/attribute_types.rb
 - lib/resourceful/model/base.rb
 - lib/resourceful/model/embedded_associations.rb
 - lib/resourceful/model/external_associations.rb
@@ -110,6 +111,7 @@ files:
 - lib/resourceful.rb
 has_rdoc: false
 homepage: ""
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -131,7 +133,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: 3
 summary: A ruby gem to abstract web resource handling.