beef-has_assets 0.2.3 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.5

data/app/helpers/assets_helper.rb

@@ -1,12 +1,26 @@
 module AssetsHelper
 
   def gallery(assets, size = :square)
-    images_items = assets.images.collect { |asset| content_tag( :li, link_to(image_tag(asset.public_filename(size), :alt => asset.description), asset.public_filename, :title => asset.description, :rel => 'gallery' ) ) }
+    if assets.respond_to? :images and assets.images.any?
+      images = assets.images
+    elsif assets.any?
+      images = assets.reject{|a| !a.content_type.starts_with?('image')}
+    else
+      return
+    end
+    images_items = images.collect { |asset| content_tag( :li, link_to(image_tag(asset.public_filename(size), :alt => asset.description), asset.public_filename, :title => asset.description, :rel => 'gallery' ) ) }
     content_tag :ul, images_items.join, :class => 'gallery' unless images_items.empty?
   end
   
   def documents(assets)
-    documents_items = assets.documents.collect { |asset| content_tag( :li, link_to("Download #{asset.filename} (#{number_to_human_size(asset.size)})", asset.public_filename, :title => asset.description ) ) }
+    if assets.respond_to? :documents and assets.documents.any?
+      documents = assets.documents
+    elsif assets.any?
+      documents = assets.reject{|a| a.content_type.starts_with?('image')}
+    else
+      return
+    end
+    documents_items = documents.collect { |asset| content_tag( :li, link_to("Download #{asset.filename} (#{number_to_human_size(asset.size)})", asset.public_filename, :title => asset.description ) ) }
     content_tag :ul, documents_items.join, :class => 'documents' unless documents_items.empty?
   end
 end

data/app/models/asset.rb

@@ -8,9 +8,9 @@ class Asset < ActiveRecord::Base
   has_many :assetings, :dependent => :delete_all
   belongs_to :assetable, :polymorphic => true
   
-  named_scope :not_thumbnails, :conditions => 'parent_id IS NULL', :order => 'filename'
-  named_scope :images, :conditions => "content_type LIKE 'image%'", :order => 'filename'
-  named_scope :documents, :conditions => "content_type NOT LIKE 'image%'", :order => 'filename'
+  named_scope :not_thumbnails, :conditions => 'parent_id IS NULL'
+  named_scope :images, :conditions => "content_type LIKE 'image%'"
+  named_scope :documents, :conditions => "content_type NOT LIKE 'image%'"
                  
   validates_as_attachment
   # validates_presence_of :description, :unless => :is_thumbnail?

data/has_assets.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_assets}
-  s.version = "0.2.3"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2009-08-04}
+  s.date = %q{2009-08-05}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-has_assets
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-04 00:00:00 -07:00
+date: 2009-08-05 00:00:00 -07:00
 default_executable: 
 dependencies: []