spec/data/article.rb in dm-is-remixable-0.9.11 vs spec/data/article.rb in dm-is-remixable-0.10.0

@@ -1,17 +1,17 @@
-require Pathname(__FILE__).dirname / "image"
-require Pathname(__FILE__).dirname / "commentable"
-require Pathname(__FILE__).dirname / "viewable"
-require Pathname(__FILE__).dirname / "taggable"
-require Pathname(__FILE__).dirname / "user"
-require Pathname(__FILE__).dirname / "bot"
-require Pathname(__FILE__).dirname / "tag"
+require 'data/image'
+require 'data/commentable'
+require 'data/viewable'
+require 'data/taggable'
+require 'data/user'
+require 'data/bot'
+require 'data/tag'
 
 class Article
   include DataMapper::Resource
 
-  property :id, Integer, :key => true, :serial => true
+  property :id, Serial
   property :title, String
   property :url, String
 
 
   remix 1, :images, :as => "pics"
@@ -20,12 +20,12 @@
 
   remix n, :commentables, :as => "comments", :for => "User"
 
   remix n, "My::Nested::Remixable::Rating", :as => :ratings
 
-  remix n, :taggable, :as => "user_taggings", :for => "User", :class_name => "UserTagging"
+  remix n, :taggable, :as => "user_taggings", :for => "User", :model => "UserTagging"
 
-  remix n, :taggable, :as => "bot_taggings", :for => "Bot", :class_name => "BotTagging"
+  remix n, :taggable, :as => "bot_taggings", :for => "Bot", :model => "BotTagging"
 
   enhance :viewables do
     belongs_to :user
   end