has_media 0.1.2 → 0.1.3

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+uploads

data/README.rdoc

@@ -1,8 +1,10 @@
-= has_media
+= Has Media
 
 Media Managment Library for ActiveRecord and Carrierwave
 
-Easy way to link media (ie image, audio, pdf for now) on other activerecords models
+Easy way to link media (ie image, audio, video, pdf, ...) on other activerecords models
+
+Use branch rails2.3 for Rails 2.3.x and rails3 for Rails 3
 
 === Create migrations
 
@@ -27,8 +29,7 @@ Examples are in the /examples directory...
 
 == Configuration
 
- * Set custom uploaders/models path to overload has_media ones
-  HasMedia.custom_models_path = File.dirname(__FILE__) + '/../../app/models/has_media'
+ * Configuration take place in config/initializers/has_media.rb
 
  * Set the directory path to use to store media
   HasMedia.directory_path = "media"
@@ -39,6 +40,21 @@ Examples are in the /examples directory...
  * Set custom error messages
   HasMedia.errors_messages = {:type_error => I18n.t('has_media.errors.type_error')}
 
+ * Set the allowed medium types for your application (used if no :only option given)
+  HasMedia.medium_types = [Image, Video, Audio]
+
+ * Set the extension of encoded files to use for each medium types (used in file_uri and file_path)
+  HasMedia.encoded_extensions = {
+    :image => 'png',
+    :audio => 'ogg',
+    :video => 'flv'
+  }
+
+ * Require you uploaders 
+  Dir.glob(File.dirname(__FILE__) + '/../app/uploaders/*.rb').each do |uploader|
+    require uploader
+  end
+
 == Testing
 
 Factory example using factory_girl :
@@ -52,9 +68,13 @@ Factory example using factory_girl :
     f.file {ActionController::TestUploadedFile.new(File.join(Rails.root, '/spec/factories/image.jpg'), 'image/jpeg')}
   end
 
-== TODO
-
-* Add a video class
+== TODO 
+ * Doc for testing (ActionController::TestUploadedFile is now obsolete in rails 3), add HasMediaTestHelper with stub_temp_file method
+ * Generator for initializer
+ * Add controller and views examples with overload system (form fields, display, ...)
+ * Fix problem with migrations generator timestamps
+ * Generator for models and uploaders (Type in Image, Video, Audio, Pdf) :
+  rails generate has_media_model Type Name
 
 == Contributors
 

data/Rakefile

@@ -1,5 +1,10 @@
-require 'rake'
-require 'rubygems'
+#require 'rake'
+#require 'rake/rdoctask'
+#require 'rubygems'
+#require 'rspec'
+#require 'rspec/core'
+#require 'rspec/core/rake_task'
+#Spec::Core::RakeTask.new(:spec)
 
 begin
   require 'jeweler'
@@ -8,40 +13,39 @@ begin
     gem.summary = %Q{Media Managment Library for ActiveRecord and Carrierwave}
     gem.description = %Q{Media Managment Library for ActiveRecord and Carrierwave}
     gem.email = "kevinlacointe@gmail.com"
-    gem.homepage = "http://github.com/AF83/has_media"
+    gem.homepage = "http://github.com/klacointe/has_media"
     gem.authors = ["klacointe", "spk"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_dependency('carrierwave', '>=0.4.2')
-    gem.add_dependency('activerecord', '>=2.3.4')
-    gem.add_dependency('activesupport', '>=2.3.4')
+    gem.add_development_dependency "rspec", "<=1.3.0"
+    gem.add_dependency('carrierwave', '=0.4.5')
+    gem.add_dependency('activerecord', '=2.3.8')
+    gem.add_dependency('activesupport', '=2.3.8')
+    gem.add_dependency('mime-types', '>=1.16')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "has_media #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+#Spec::Rake::SpecTask.new(:spec) do |spec|
+#  spec.libs << 'lib' << 'spec'
+#  spec.spec_files = FileList['spec/**/*_spec.rb']
+#end
+#
+#Spec::Rake::SpecTask.new(:rcov) do |spec|
+#  spec.libs << 'lib' << 'spec'
+#  spec.pattern = 'spec/**/*_spec.rb'
+#  spec.rcov = true
+#end
+#
+#task :spec => :check_dependencies
+#
+#task :default => :spec
+#
+#Rake::RDocTask.new do |rdoc|
+#  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+#
+#  rdoc.rdoc_dir = 'rdoc'
+#  rdoc.title = "has_media #{version}"
+#  rdoc.rdoc_files.include('README*')
+#  rdoc.rdoc_files.include('lib/**/*.rb')
+#end

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/has_media.gemspec

@@ -0,0 +1,99 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{has_media}
+  s.version = "0.1.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["klacointe", "spk"]
+  s.date = %q{2010-10-06}
+  s.description = %q{Media Managment Library for ActiveRecord and Carrierwave}
+  s.email = %q{kevinlacointe@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     ".rspec",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "examples/models/audio.rb",
+     "examples/models/image.rb",
+     "examples/models/pdf.rb",
+     "examples/models/video.rb",
+     "examples/uploaders/audio_uploader.rb",
+     "examples/uploaders/image_uploader.rb",
+     "examples/uploaders/pdf_uploader.rb",
+     "examples/uploaders/video_uploader.rb",
+     "generators/has_media/has_media_generator.rb",
+     "generators/has_media/templates/create_media.rb",
+     "generators/has_media/templates/create_media_links.rb",
+     "has_media.gemspec",
+     "lib/has_media.rb",
+     "lib/has_media/models/media_link.rb",
+     "lib/has_media/models/medium.rb",
+     "lib/has_media/uploaders/medium_uploader.rb",
+     "lib/tasks/rspec.rake",
+     "spec/fixtures/media/Conversational_Capital _Explained.pdf",
+     "spec/fixtures/media/audio.wav",
+     "spec/fixtures/media/image.jpg",
+     "spec/fixtures/media/image_bis.jpg",
+     "spec/fixtures/media/lc_pdf_overview_format.pdf",
+     "spec/fixtures/models/image.rb",
+     "spec/fixtures/uploaders/uploader_with_exception.rb",
+     "spec/has_media_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/klacointe/has_media}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Media Managment Library for ActiveRecord and Carrierwave}
+  s.test_files = [
+    "spec/spec_helper.rb",
+     "spec/fixtures/models/image.rb",
+     "spec/fixtures/uploaders/uploader_with_exception.rb",
+     "spec/has_media_spec.rb",
+     "examples/models/image.rb",
+     "examples/models/pdf.rb",
+     "examples/models/audio.rb",
+     "examples/models/video.rb",
+     "examples/uploaders/pdf_uploader.rb",
+     "examples/uploaders/audio_uploader.rb",
+     "examples/uploaders/video_uploader.rb",
+     "examples/uploaders/image_uploader.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, ["<= 1.3.0"])
+      s.add_runtime_dependency(%q<carrierwave>, ["= 0.4.5"])
+      s.add_runtime_dependency(%q<activerecord>, ["= 2.3.8"])
+      s.add_runtime_dependency(%q<activesupport>, ["= 2.3.8"])
+      s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
+    else
+      s.add_dependency(%q<rspec>, ["<= 1.3.0"])
+      s.add_dependency(%q<carrierwave>, ["= 0.4.5"])
+      s.add_dependency(%q<activerecord>, ["= 2.3.8"])
+      s.add_dependency(%q<activesupport>, ["= 2.3.8"])
+      s.add_dependency(%q<mime-types>, [">= 1.16"])
+    end
+  else
+    s.add_dependency(%q<rspec>, ["<= 1.3.0"])
+    s.add_dependency(%q<carrierwave>, ["= 0.4.5"])
+    s.add_dependency(%q<activerecord>, ["= 2.3.8"])
+    s.add_dependency(%q<activesupport>, ["= 2.3.8"])
+    s.add_dependency(%q<mime-types>, [">= 1.16"])
+  end
+end
+

data/lib/has_media/models/medium.rb

@@ -15,13 +15,6 @@ class Medium < ActiveRecord::Base
   ENCODE_NOT_READY = 4
   NO_ENCODING      = 5
 
-  EXTENSIONS = {
-    :image => 'png',
-    :audio => 'mp3',
-    :pdf   => 'pdf',
-    :video => 'flv'
-  }
-
   # Allowed MIME types for upload
   # need custom configuration
   # TODO: add errors if not type of file
@@ -51,16 +44,20 @@ class Medium < ActiveRecord::Base
     return name.downcase
   end
 
-  # FIXME : get medium types from available classes, use has_media.medium_types
   def self.new_from_value(object, value, context, encode, only)
+    if value.respond_to?(:content_type)
+      mime_type = value.content_type
+    else
+      mime_type = MIME::Types.type_for(value.path).first.content_type
+    end
     only ||= ""
     medium_types = HasMedia.medium_types
-    if only != "" and klass = Kernel.const_get(only.capitalize)
+    if only != "" and klass = Kernel.const_get(only.camelize)
       medium_types = [klass]
     end
     klass = medium_types.find do |k|
       if k.respond_to?(:handle_content_type?)
-        k.handle_content_type?(value.content_type)
+        k.handle_content_type?(mime_type)
       end
     end
     if klass.nil?
@@ -68,9 +65,13 @@ class Medium < ActiveRecord::Base
       return
     end
     medium = klass.new
-    medium.filename = self.sanitize(value.original_filename)
+    if value.respond_to?(:original_filename)
+      medium.filename = self.sanitize(value.original_filename)
+    else
+      medium.filename = self.sanitize(File.basename(value.path))
+    end
     medium.file = value
-    medium.content_type = value.content_type
+    medium.content_type = mime_type
     medium.context = context
     medium.encode_status = (encode == "false" ? NO_ENCODING : ENCODE_WAIT)
     medium.save
@@ -121,18 +122,22 @@ class Medium < ActiveRecord::Base
     self.file.store_dir
   end
   # system path for a medium
-  def file_path(thumbnail = nil)
-    final_name = filename.gsub /\.[^.]+$/, '.' + file_extension
-    final_name[-4,0] = "_#{thumbnail}" if thumbnail
-    File.join(directory_path, final_name)
+  def file_path(version = nil)
+    File.join(directory_path, encoded_file_name(version))
   end
 
   # http uri for a medium
-  def file_uri(thumbnail = nil)
-    final_name = filename.gsub /\.[^.]+$/, '.' + file_extension
-    final_name[-4,0] = "_#{thumbnail}" if thumbnail
-    File.join(directory_uri, final_name)
+  def file_uri(version = nil)
+    File.join(directory_uri, encoded_file_name(version))
   end
+
+  def encoded_file_name(version = nil)
+    # remove original extension and add the encoded extension
+    final_name = filename.gsub(/\.[^.]{1,4}$/, "") + '.' + file_extension
+    final_name[-4,0] = "_#{version}" if version
+    final_name
+  end
+
   # http uri of directory which stores media
   def directory_uri
     File.join(HasMedia.directory_uri,
@@ -145,7 +150,11 @@ class Medium < ActiveRecord::Base
   end
 
   def file_extension
-    EXTENSIONS[type.to_s.downcase.to_sym]
+    sym = type.underscore.to_sym
+    unless HasMedia.encoded_extensions.keys.include?(sym)
+      raise Exception.new("You need to add encoded extension configuration for :#{sym}")
+    end
+    HasMedia.encoded_extensions[sym]
   end
 
 private
@@ -161,6 +170,6 @@ private
   # TODO : remove all files, not only the original one
   def remove_file_from_fs
     require 'fileutils'
-    FileUtils.rm_rf(self.original_file_path)
+    FileUtils.rm_rf(self.directory_path)
   end
 end

data/lib/has_media.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'active_record'
 require 'active_support'
 require 'carrierwave'
+require 'mime/types'
 
 module HasMedia
 
@@ -51,6 +52,12 @@ module HasMedia
     'video/x-flv',
     'video/x-msvideo'
   ]
+  @@encoded_extensions = {
+    :image => 'png',
+    :audio => 'mp3',
+    :pdf   => 'pdf',
+    :video => 'flv'
+  }
 
   def self.medium_types=(value)
     @@medium_types = value
@@ -58,6 +65,12 @@ module HasMedia
   def self.medium_types
     @@medium_types
   end
+  def self.encoded_extensions=(value)
+    @@encoded_extensions = value
+  end
+  def self.encoded_extensions
+    @@encoded_extensions
+  end
   def self.directory_path=(value)
     @@store_dir = value
   end

data/lib/tasks/rspec.rake

@@ -0,0 +1,39 @@
+begin
+  require 'rspec/core'
+  require 'rspec/core/rake_task'
+rescue MissingSourceFile
+  module RSpec
+    module Core
+      class RakeTask
+        def initialize(name)
+          task name do
+            # if rspec-rails is a configured gem, this will output helpful material and exit ...
+            require File.expand_path(File.dirname(__FILE__) + "/../../config/environment")
+
+            # ... otherwise, do this:
+            raise <<-MSG
+
+#{"*" * 80}
+*  You are trying to run an rspec rake task defined in
+*  #{__FILE__},
+*  but rspec can not be found in vendor/gems, vendor/plugins or system gems.
+#{"*" * 80}
+MSG
+          end
+        end
+      end
+    end
+  end
+end
+
+Rake.application.instance_variable_get('@tasks').delete('default')
+
+task :default => :spec
+
+namespace :spec do
+  desc "Run the code examples in spec"
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.pattern = "./spec/*_spec.rb"
+  end
+end
+

data/spec/has_media_spec.rb

@@ -1,182 +1,196 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+# load models and uploaders examples
+Dir.glob(File.dirname(__FILE__) + '/../examples/uploaders/*.rb').each do |uploader|
+  require uploader
+end
+
+Dir.glob(File.dirname(__FILE__) + '/../examples/models/*.rb').each do |model|
+  require model
+end
+class MediumRelatedTest < ActiveRecord::Base
+  include HasMedia
+  has_one_medium  :image, :only => :image
+  has_many_media  :images, :only => :image
+  has_one_medium  :audio, :only => :audio
+  has_many_media  :audios, :only => :audio
+  has_one_medium  :image_no_encode, :only => :image, :encode => false
+  has_one_medium  :pdf, :encode => false
+end
+
+
 describe "HasMedia" do
 
   before :all do
-    # load models and uploaders examples
-    Dir.glob(File.dirname(__FILE__) + '/../examples/uploaders/*.rb').each do |uploader|
-      require uploader
-    end
-
-    Dir.glob(File.dirname(__FILE__) + '/../examples/models/*.rb').each do |model|
-      require model
-    end
-    
-    class MediumRelatedTest < ActiveRecord::Base
-      include HasMedia
-      has_one_medium  :image, :only => :image
-      has_many_media  :images, :only => :image
-      has_one_medium  :audio, :only => :audio
-      has_many_media  :audios, :only => :audio
-      has_one_medium  :image_no_encode, :only => :image, :encode => false
-      has_one_medium  :pdf, :encode => false
-    end
     HasMedia.directory_path = 'tmp'
     HasMedia.directory_uri = '/media'
-    HasMedia.medium_types = [Image, Video, Pdf, Audio]
   end
 
-  before :each do
-    @medium = MediumRelatedTest.new
-    @image = ActionController::TestUploadedFile.new('spec/fixtures/media/image.jpg', 'image/jpeg')
-    @audio = ActionController::TestUploadedFile.new('spec/fixtures/media/audio.wav', 'audio/wav')
-    @image_bis = ActionController::TestUploadedFile.new('spec/fixtures/media/image_bis.jpg', 'image/jpeg')
-    @pdf = ActionController::TestUploadedFile.new('spec/fixtures/media/Conversational_Capital _Explained.pdf', 'application/pdf')
-  end
+  describe "fonctionalities" do
 
-  it 'should not have 2 has_one_medium with same context' do
-    lambda {
-    class Prout < ActiveRecord::Base
-      include HasMedia
-      has_one_medium  :prout, :only => :image
-      has_one_medium  :prout, :only => :audio
+    before :each do
+      HasMedia.medium_types = [Image, Video, Pdf, Audio]
+      @medium = MediumRelatedTest.new
+      @image = stub_temp_file('image.jpg', 'image/jpeg')
+      @audio = stub_temp_file('audio.wav', 'audio/wav')
+      @image_bis = stub_temp_file('image_bis.jpg', 'image/jpeg')
+      @pdf = stub_temp_file('Conversational_Capital _Explained.pdf', 'application/pdf')
     end
-    }.should raise_error(Exception)
-  end
 
-  it "should define accessors" do
-    @medium.methods.should include("image")
-    @medium.methods.should include("images")
-    @medium.methods.should include("audio")
-    @medium.methods.should include("audios")
-    @medium.methods.should include("pdf")
-  end
+    it 'should not have 2 has_one_medium with same context' do
+      lambda {
+      class Prout < ActiveRecord::Base
+        include HasMedia
+        has_one_medium  :prout, :only => :image
+        has_one_medium  :prout, :only => :audio
+      end
+      }.should raise_error(Exception)
+    end
 
-  it "should define setters" do
-    @medium.methods.should include("image=")
-    @medium.methods.should include("images=")
-    @medium.methods.should include("audio=")
-    @medium.methods.should include("audios=")
-    @medium.methods.should include("pdf=")
-  end
+    it "should define accessors" do
+      @medium.methods.should include("image")
+      @medium.methods.should include("images")
+      @medium.methods.should include("audio")
+      @medium.methods.should include("audios")
+      @medium.methods.should include("pdf")
+    end
 
-  it "should associate image to mediated object" do
-    @medium.image = @image
-    @medium.save!
-    @medium.image.should_not be_nil
-    @medium.image.class.should == Image
-  end
+    it "should define setters" do
+      @medium.methods.should include("image=")
+      @medium.methods.should include("images=")
+      @medium.methods.should include("audio=")
+      @medium.methods.should include("audios=")
+      @medium.methods.should include("pdf=")
+    end
 
-  it "should associate audio to mediated object" do
-    @medium.audio = @audio
-    @medium.save!
-    @medium.audio.should_not be_nil
-    @medium.audio.class.should == Audio
-  end
+    it "should associate image to mediated object" do
+      @medium.image = @image
+      @medium.save!
+      @medium.image.should_not be_nil
+      @medium.image.class.should == Image
+    end
 
-  it "should associate pdf to mediated object" do
-    @medium.pdf = @pdf
-    @medium.save!
-    @medium.pdf.should_not be_nil
-    @medium.pdf.class.should == Pdf
-  end
+    it "should associate audio to mediated object" do
+      @medium.audio = @audio
+      @medium.save!
+      @medium.audio.should_not be_nil
+      @medium.audio.class.should == Audio
+    end
 
-  it "should add both audio and image " do
-    @medium.image = @image
-    @medium.audio = @audio
-    @medium.save!
-    @medium.audio.should_not be_nil
-    @medium.audio.class.should == Audio
-    @medium.audio.filename.should == @audio.original_filename
-    @medium.audio.content_type.should == "audio/wav"
-    @medium.audio
-    @medium.image.should_not be_nil
-    @medium.image.class.should == Image
-    @medium.image.filename.should == @image.original_filename
-    @medium.image.content_type.should == "image/jpeg"
-  end
+    it "should associate pdf to mediated object" do
+      @medium.pdf = @pdf
+      @medium.save!
+      @medium.pdf.should_not be_nil
+      @medium.pdf.class.should == Pdf
+    end
 
-  it "should replace media when in has_one_medium relations" do
-    @medium.image = @image_bis
-    @medium.save
-    @medium.image.filename.should == @image_bis.original_filename
-    @medium.image = @image
-    @medium.save
-    @medium.image.filename.should == @image.original_filename
-  end
+    it "should add both audio and image " do
+      @medium.image = @image
+      @medium.audio = @audio
+      @medium.save!
+      @medium.audio.should_not be_nil
+      @medium.audio.class.should == Audio
+      @medium.audio.filename.should == @audio.original_filename
+      @medium.audio.content_type.should == "audio/wav"
+      @medium.audio
+      @medium.image.should_not be_nil
+      @medium.image.class.should == Image
+      @medium.image.filename.should == @image.original_filename
+      @medium.image.content_type.should == "image/jpeg"
+    end
 
-  it "should destroy files from fs when Related Model is destroyed" do
-    @medium.image = @image
-    @medium.save!
-    path = @medium.image.original_file_path
-    File.exist?(path).should be_true
-    @medium.destroy
-    File.exist?(path).should be_false
-  end
+    it "should replace media when in has_one_medium relations" do
+      @medium.image = @image_bis
+      @medium.save
+      @medium.image.filename.should == @image_bis.original_filename
+      @medium.reload
+      @medium.image = @image
+      @medium.save
+      @medium.image.filename.should == @image.original_filename
+    end
 
-  [:encoding?, :ready?, :failed?].each do |method|
-    [:image, :audio, :images, :audios].each do |context|
-      class_eval %{
-        it "should responds to #{context}.#{method}" do
-          @medium.send("#{context}=", @#{context})
-          @medium.save!
-          media = @medium.send("#{context}")
-          if media.is_a? Array
-            media.each do |medium|
-              [true, false].include?(medium.send("#{method}"))
+    it "should destroy files from fs when Related Model is destroyed" do
+      @medium.image = @image
+      @medium.save!
+      path = @medium.image.original_file_path
+      File.exist?(path).should be_true
+      @medium.destroy
+      File.exist?(path).should be_false
+    end
+
+    [:encoding?, :ready?, :failed?].each do |method|
+      [:image, :audio, :images, :audios].each do |context|
+        class_eval %{
+          it "should responds to #{context}.#{method}" do
+            @medium.send("#{context}=", @#{context})
+            @medium.save!
+            media = @medium.send("#{context}")
+            if media.is_a? Array
+              media.each do |medium|
+                [true, false].include?(medium.send("#{method}"))
+              end
+            else
+              [true, false].include?(media.send("#{method}"))
             end
-          else
-            [true, false].include?(media.send("#{method}"))
           end
-        end
-      }
+        }
+      end
     end
-  end
 
-  it "should add several has_many_media for the same context" do
-    @medium.images = [@image, @image_bis]
-    @medium.save!
-    @medium.media.size.should == 2
-  end
+    it "should add several has_many_media for the same context" do
+      @medium.images = [@image, @image_bis]
+      @medium.save!
+      @medium.media.size.should == 2
+    end
 
-  it "should have the right encode status" do
-    @medium.image_no_encode = @image
-    @medium.save!
-    @medium.image_no_encode.encode_status.should == Medium::NO_ENCODING
-    @medium.image = @image_bis
-    @medium.save!
-    @medium.image.encode_status.should == Medium::ENCODE_WAIT
-  end
+    it "should have the right encode status" do
+      @medium.image_no_encode = @image
+      @medium.save!
+      @medium.image_no_encode.encode_status.should == Medium::NO_ENCODING
+      @medium.image = @image_bis
+      @medium.save!
+      @medium.image.encode_status.should == Medium::ENCODE_WAIT
+    end
 
-  it "should have an original uri" do
-    @medium.image = @image
-    @medium.save!
-    @medium.image.original_file_uri.should == File.join(HasMedia.directory_uri,
-                                                        ActiveSupport::Inflector.underscore(@medium.image.type),
-                                                        @medium.image.id.to_s,
-                                                        @medium.image.filename)
-  end
+    it "should have an original uri" do
+      @medium.image = @image
+      @medium.save!
+      @medium.image.original_file_uri.should == File.join(HasMedia.directory_uri,
+                                                          ActiveSupport::Inflector.underscore(@medium.image.type),
+                                                          @medium.image.id.to_s,
+                                                          @medium.image.filename)
+    end
 
-  it "pdf should exist" do
-    @medium.pdf = @pdf
-    @medium.save!
-    path = @medium.pdf.file_path
-    File.exist?(path).should be_true
-  end
+    it "pdf should exist" do
+      @medium.pdf = @pdf
+      @medium.save!
+      path = @medium.pdf.file_path
+      File.exist?(path).should be_true
+    end
 
-  it "should add errors on parent model if type is not allowed" do
-    @image = ActionController::TestUploadedFile.new('spec/fixtures/media/image.jpg', 'image/jpeg')
-    @medium.audio = @image
-    @medium.valid?
-    @medium.should_not be_valid
-    @medium.save.should be_false
-    @medium.errors.full_messages.include?(HasMedia.errors_messages[:type_error])
+    it "should add errors on parent model if type is not allowed" do
+      @image = stub_temp_file('image.jpg', 'image/jpeg')
+      @medium.audio = @image
+      @medium.valid?
+      @medium.should_not be_valid
+      @medium.save.should be_false
+      @medium.errors.full_messages.include?(HasMedia.errors_messages[:type_error])
+    end
   end
 
-  it "should load custom models" do
-    lambda {
-      HasMedia.custom_models_path = File.join(File.dirname(__FILE__), 'fixtures/models/')
-    }.should raise_error(RuntimeError, "this exception is normal, useful for testing")
+  describe "Configuration" do
+    it "should check allowed medium types if no :only option given" do
+      HasMedia.medium_types = [Image]
+      @pdf = stub_temp_file('Conversational_Capital _Explained.pdf', 'application/pdf')
+      @medium = MediumRelatedTest.new
+      @medium.pdf = @pdf
+      @medium.valid?
+      @medium.should_not be_valid
+      @medium.save.should be_false
+      @medium.errors.full_messages.include?(HasMedia.errors_messages[:type_error])
+    end
+
+
   end
 
 end

data/spec/spec_helper.rb

@@ -1,16 +1,20 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'spec'
-require 'spec/autorun'
 require 'rubygems'
+require 'rspec'
+require 'rspec/core'
+require 'rspec/core/rake_task'
 require 'action_controller'
-require 'action_controller/test_process'
+#require 'action_controller/test_process'
+require 'action_dispatch'
+require 'action_dispatch/testing/test_process'
 require 'has_media'
 
 dbconfig = {
-  :adapter => 'sqlite3',
-  :database => ':memory:',
-#  :database => 'has_media.sqlite'
+  :adapter => 'mysql',
+  :database => 'has_media',
+  :username => 'test',
+  :password => 'test'
 }
 
 ActiveRecord::Base.establish_connection(dbconfig)
@@ -46,8 +50,42 @@ class TestMigration < ActiveRecord::Migration
   end
 end
 
-Spec::Runner.configure do |config|
-    config.before(:all) { TestMigration.up }
-    config.after(:all) { TestMigration.down }
-    config.after(:each) { Medium.destroy_all; MediaLink.destroy_all; MediumRelatedTest.destroy_all; }
+RSpec.configure do |c|
+  c.before(:all) do
+    TestMigration.up
+  end
+  c.before(:each) do
+    @real_world = RSpec.world
+    RSpec.instance_variable_set(:@world, RSpec::Core::World.new)
+  end
+  c.after(:all) do
+    TestMigration.down
+  end
+  c.after(:each) do
+    RSpec.instance_variable_set(:@world, @real_world)
+    Medium.destroy_all
+    MediaLink.destroy_all
+    MediumRelatedTest.destroy_all
+  end
+end
+
+
+def file_path( *paths )
+  File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'media', *paths))
+end
+
+def stub_temp_file(filename, mime_type=nil, fake_name=nil)
+  raise "#{file_path(filename)} file does not exist" unless File.exist?(file_path(filename))
+
+  t = Tempfile.new(filename)
+  FileUtils.copy_file(file_path(filename), t.path)
+
+  # This is stupid, but for some reason rspec won't play nice...
+  eval <<-EOF
+def t.original_filename; '#{fake_name || filename}'; end
+def t.content_type; '#{mime_type}'; end
+def t.local_path; path; end
+  EOF
+
+  return t
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_media
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - klacointe
@@ -15,65 +16,88 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 00:00:00 +02:00
+date: 2010-10-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - <=
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
-        - 2
-        - 9
-        version: 1.2.9
+        - 3
+        - 0
+        version: 1.3.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: carrierwave
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 0
         - 4
-        - 2
-        version: 0.4.2
+        - 5
+        version: 0.4.5
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 2
         - 3
-        - 4
-        version: 2.3.4
+        - 8
+        version: 2.3.8
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 2
         - 3
-        - 4
-        version: 2.3.4
+        - 8
+        version: 2.3.8
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mime-types
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 1
+        - 16
+        version: "1.16"
+  type: :runtime
+  version_requirements: *id005
 description: Media Managment Library for ActiveRecord and Carrierwave
 email: kevinlacointe@gmail.com
 executables: []
@@ -86,6 +110,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- .rspec
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -101,10 +126,12 @@ files:
 - generators/has_media/has_media_generator.rb
 - generators/has_media/templates/create_media.rb
 - generators/has_media/templates/create_media_links.rb
+- has_media.gemspec
 - lib/has_media.rb
 - lib/has_media/models/media_link.rb
 - lib/has_media/models/medium.rb
 - lib/has_media/uploaders/medium_uploader.rb
+- lib/tasks/rspec.rake
 - spec/fixtures/media/Conversational_Capital _Explained.pdf
 - spec/fixtures/media/audio.wav
 - spec/fixtures/media/image.jpg
@@ -113,10 +140,9 @@ files:
 - spec/fixtures/models/image.rb
 - spec/fixtures/uploaders/uploader_with_exception.rb
 - spec/has_media_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/AF83/has_media
+homepage: http://github.com/klacointe/has_media
 licenses: []
 
 post_install_message: 
@@ -125,36 +151,40 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Media Managment Library for ActiveRecord and Carrierwave
 test_files: 
 - spec/spec_helper.rb
-- spec/has_media_spec.rb
-- spec/fixtures/uploaders/uploader_with_exception.rb
 - spec/fixtures/models/image.rb
-- examples/uploaders/image_uploader.rb
-- examples/uploaders/pdf_uploader.rb
-- examples/uploaders/video_uploader.rb
-- examples/uploaders/audio_uploader.rb
+- spec/fixtures/uploaders/uploader_with_exception.rb
+- spec/has_media_spec.rb
 - examples/models/image.rb
 - examples/models/pdf.rb
 - examples/models/audio.rb
 - examples/models/video.rb
+- examples/uploaders/pdf_uploader.rb
+- examples/uploaders/audio_uploader.rb
+- examples/uploaders/video_uploader.rb
+- examples/uploaders/image_uploader.rb