@@ -1,4 +1,4 @@ *.db log/ -uploads/* +public/uploads/* pkg/ .gitignore @@ -2,8 +2,11 @@ class MediaRocket::Media include DataMapper::Resource property :id, Serial - property :path, String, :nullable => false - # property :md5sum, String, :length => 32, :default => Proc.new { |r, p| Digest::MD5.hexdigest(r.path.read) if r.path } + property :path, FilePath, :nullable => false + property :md5sum, String, :length => 32, :default => Proc.new { |r, p| Digest::MD5.hexdigest(r.path.read) if r.path } + property :title, String + property :description, String + property :position, Integer property :created_at, DateTime property :deleted_at, ParanoidDateTime property :deleted, ParanoidBoolean @@ -73,8 +76,9 @@ class MediaRocket::Media # FIX: rework using unique sha1 hash for basename unique = 0 path = File.join(path, File.basename(options[:file][:filename])) + extension = File.extname(options[:file][:filename]) while File.exist?(path) - path = File.join(File.dirname(path), File.basename(options[:file][:filename]) + unique.to_s) + path = File.join(File.dirname(path), File.basename(options[:file][:filename], extension) + unique.to_s + extension) unique += 1 end @@ -83,8 +87,7 @@ class MediaRocket::Media FileUtils.mkdir_p File.dirname(path) unless File.exist?(File.dirname(path)) FileUtils.mv options[:file][:tempfile].path, path - #@path = Pathname.new(path) - @path = path + self.path = Pathname.new path else return nil end app/models/media.rb @@ -14,7 +14,7 @@ <div id="last_media" class="box prepend-top"> <h2 class="caps">Last media</h2> - <%= media_list_last %> + <%= media_list_last :width => "150px" %> </div> </div> \ No newline at end of file app/views/main/index.html.erb @@ -78,12 +78,12 @@ if defined?(Merb::Plugins) use_orm :datamapper - merb_version = ">= 1.0" + merb_version = ">= 1.0.7.1" dependency 'merb-assets', merb_version dependency 'merb-helpers', merb_version dependency 'merb_datamapper', merb_version - dm_gems_version = ">= 0.9.8" + dm_gems_version = ">= 0.9.9" dependency "dm-core", dm_gems_version dependency "dm-aggregates", dm_gems_version dependency "dm-migrations", dm_gems_version lib/media_rocket.rb @@ -5,10 +5,8 @@ module MediaRocket def media_list_last(options = {}, &block) medias = "" limit = options[:limit] || 10 - medias = MediaRocket::Media.all(:order => [:created_at.desc]) - - medias[0...limit].each do |media| - medias << tag(:a, self_closing_tag(:img, :src => media.url), :href => media.url) + MediaRocket::Media.all(:order => [:created_at.desc])[0...limit].each do |media| + medias << tag(:a, self_closing_tag(:img, :src => media.url, :width => options[:width]), :href => media.url) end medias end @@ -46,6 +44,10 @@ module MediaRocket output end + def media_categories(options = {}, &block) + + end + end end end \ No newline at end of file lib/media_rocket/helpers/content.rb @@ -24,6 +24,11 @@ describe MediaRocket::Media do @media.url.should == "/uploads/image.png" end + it "should save a new Media with image" do + @media = MediaRocket::Media.new :file => test_file + @media.save.should == true + end + it "should create a unique Media if conflict on name" do @media = MediaRocket::Media.new :file => test_file spec/models/media_spec.rb 1e02b9c1269c74d8fce111c1fe70982ad858c1a5 Alexandre Girard alx.girard@gmail.com http://github.com/alx/media_rocket/commit/e2760984324fe5fefe465977c01cbb7693d4d447 e2760984324fe5fefe465977c01cbb7693d4d447 2009-01-10T11:35:33-08:00 2009-01-10T11:35:33-08:00 Correct problem with media path. Change dependencies version numbers. Add option to media_last_list 4363ea82cb777c9afbd937c31539ab497ea345f8 Alexandre Girard alx.girard@gmail.com