[dm-tags] Update spec for Tagging#taggable and require dm-validations

* Added dm-validations
* use validates_present instead of an if statment
* updated spec

dm-tags/lib/dm-tags/dm_tags.rb

@@ -1,7 +1,9 @@
 require 'rubygems'
 
 gem 'dm-core', '~>0.9.11'
+gem 'dm-validations', '~>0.9.11'
 require 'dm-core'
+require 'dm-validations'
 
 module DataMapper
   module Resource

dm-tags/lib/dm-tags/tagging.rb

@@ -9,9 +9,9 @@ class Tagging
 
   belongs_to :tag
 
+  validates_present :taggable_type, :taggable_id
+
   def taggable
-    if taggable_type and taggable_id
-      Object.const_get(taggable_type).send(:get!, taggable_id)
-    end
+    Object.const_get(taggable_type).send(:get!, taggable_id)
   end
 end

dm-tags/spec/dm-tags/tagging_spec.rb

@@ -6,6 +6,7 @@
 describe Tagging do
   before do
     @tagging = Tagging.new
+    @tagged_model =TaggedModel.create
   end
 
   it "should be a model which includes DataMapper::Resource" do
@@ -18,8 +19,6 @@
     @tagging.attributes.should have_key(:tag_id)
     @tagging.attributes.should have_key(:taggable_id)
     @tagging.attributes.should have_key(:taggable_type)
-    # @tagging.attributes.should have_key(:tagger_id)
-    # @tagging.attributes.should have_key(:tagger_type)
     @tagging.attributes.should have_key(:tag_context)
   end
 
@@ -42,10 +41,8 @@
 
   it "should have a method Tagging#taggable which returns the associated taggable instance" do
     @tagging.should respond_to(:taggable)
-    @tagging.taggable.should_not be
-    @tagging.taggable_id = 11111
-    @tagging.taggable_type = "TaggedModel"
-    TaggedModel.should_receive(:get!).with(11111)
-    @tagging.taggable
+    @tagging.taggable_id =  @tagged_model.id
+    @tagging.taggable_type = @tagged_model.class.to_s
+    @tagging.taggable.should == @tagged_model
   end
 end