0
@@ -61,6 +61,10 @@ class ArticleDrop < BaseDrop
0
   def changes_feed_url
0
     @changes_feed_url ||= url + '/changes.xml'
0
   end
0
+  
0
+  def tags
0
+    @tags ||= @source.tags.collect &:to_liquid
0
+  end
0
 
0
   protected
0
     def body_for_mode(mode)

0
@@ -31,4 +31,16 @@ module DropFilters
0
       articles.collect! { |a| a.to_liquid :site => @context['site'].source, :mode => :single }
0
     end
0
   end
0
+  
0
+  def tagged_articles(tags)
0
+    @context['site'].source.articles.find(:all, :include => :tags, :conditions => ['tags.name in (?)', Tag.parse(tags)], :order => 'contents.created_at desc').collect(&:to_liquid)
0
+  end
0
+  
0
+  def assets_by_type(type)
0
+    @context['site'].source.assets.find_all_by_content_types([type.to_sym], :all, :order => 'created_at desc').collect(&:to_liquid)
0
+  end
0
+  
0
+  def tagged_assets(tags)
0
+    @context['site'].source.assets.find(:all, :include => :tags, :conditions => ['tags.name in (?)', Tag.parse(tags)], :order => 'assets.created_at desc').collect(&:to_liquid)
0
+  end
0
 end
0
\ No newline at end of file

0
@@ -76,6 +76,10 @@ class Asset < ActiveRecord::Base
0
     define_method("#{content}?") { self.class.send("#{content}?", content_type) }
0
   end
0
 
0
+  def to_liquid
0
+    AssetDrop.new self
0
+  end
0
+
0
   protected
0
     def rename_unique_filename
0
       if (@old_filename || new_record?) && errors.empty? && site_id && filename

0
@@ -47,7 +47,6 @@ class Site < ActiveRecord::Base
0
   
0
   has_many  :cached_pages
0
   
0
-  has_many  :assets, :as => :attachable, :order => 'created_at desc'
0
   has_many  :assets, :order => 'created_at desc', :conditions => 'parent_id is null'
0
 
0
   has_many :memberships, :dependent => :destroy

0
@@ -83,4 +83,8 @@ class ArticleDropTest < Test::Unit::TestCase
0
     t = Time.now.utc - 3.days
0
     assert_equal "/#{t.year}/#{t.month}/#{t.day}/welcome-to-mephisto/changes.xml", @article.changes_feed_url
0
   end
0
+
0
+  specify "should show taggable tags" do
0
+    assert_equal %w(rails), contents(:another).to_liquid.tags
0
+  end
0
 end

0
@@ -1,6 +1,6 @@
0
 require File.dirname(__FILE__) + '/../test_helper'
0
 context "Drop Filters" do
0
-  fixtures :sites, :sections, :contents, :assigned_sections
0
+  fixtures :sites, :sections, :contents, :assigned_sections, :assets
0
   include DropFilters, CoreFilters
0
 
0
   def setup
0
@@ -55,4 +55,27 @@ context "Drop Filters" do
0
     assert_models_equal sections(:home).articles.find_all_in_month(Time.now.year, Time.now.month), monthly_articles(sections(:home).to_liquid).collect(&:source)
0
   end
0
 
0
+  specify "should find movies" do
0
+    assert_models_equal [assets(:swf), assets(:mov)], assets_by_type('movie').collect(&:source)
0
+  end
0
+
0
+  specify "should find audio" do
0
+    assert_models_equal [assets(:mp3)], assets_by_type('audio').collect(&:source)
0
+  end
0
+
0
+  specify "should find images" do
0
+    assert_models_equal [assets(:png), assets(:gif)], assets_by_type('image').collect(&:source)
0
+  end
0
+
0
+  specify "should find others" do
0
+    assert_models_equal [assets(:word), assets(:pdf)], assets_by_type('other').collect(&:source)
0
+  end
0
+
0
+  specify "should find assets by tag" do
0
+    assert_models_equal [contents(:welcome)], tagged_articles("rails").collect(&:source)
0
+  end
0
+
0
+  specify "should find assets by tag" do
0
+    assert_models_equal [assets(:gif)], tagged_assets("ruby").collect(&:source)
0
+  end
0
 end