has_media 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/examples/models/document.rb

@@ -0,0 +1,4 @@
+class Document < Medium
+  set_table_name 'media'
+  mount_uploader :file, DocumentUploader
+end

data/examples/uploaders/document_uploader.rb

@@ -0,0 +1,7 @@
+# encoding: utf-8
+
+class DocumentUploader < MediumUploader
+
+  # Choose what kind of storage to use for this uploader
+  storage :file
+end

data/has_media.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_media}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["klacointe", "spk"]
-  s.date = %q{2010-11-05}
+  s.date = %q{2010-11-09}
   s.description = %q{Media Managment Library for ActiveRecord and Carrierwave}
   s.email = %q{kevinlacointe@gmail.com}
   s.extra_rdoc_files = [
@@ -26,10 +26,12 @@ Gem::Specification.new do |s|
      "VERSION",
      "config/locales/en.yml",
      "examples/models/audio.rb",
+     "examples/models/document.rb",
      "examples/models/image.rb",
      "examples/models/pdf.rb",
      "examples/models/video.rb",
      "examples/uploaders/audio_uploader.rb",
+     "examples/uploaders/document_uploader.rb",
      "examples/uploaders/image_uploader.rb",
      "examples/uploaders/pdf_uploader.rb",
      "examples/uploaders/video_uploader.rb",
@@ -68,9 +70,11 @@ Gem::Specification.new do |s|
      "examples/uploaders/pdf_uploader.rb",
      "examples/uploaders/video_uploader.rb",
      "examples/uploaders/audio_uploader.rb",
+     "examples/uploaders/document_uploader.rb",
      "examples/models/image.rb",
      "examples/models/pdf.rb",
      "examples/models/audio.rb",
+     "examples/models/document.rb",
      "examples/models/video.rb"
   ]
 

data/lib/generators/templates/has_media.rb

@@ -1,4 +1,4 @@
-# Set the directory path to use to store media
+# Set the directory path to use to store media in public folder
 HasMedia.directory_path = "media"
 
 # Set the base uri to access media

data/lib/has_media/models/medium.rb

@@ -43,7 +43,7 @@ class Medium < ActiveRecord::Base
       medium_types = [klass]
     end
     klass = medium_types.find do |k|
-      HasMedia.medium_types[k.to_s].include?(mime_type)
+      HasMedia.medium_types[k.to_s].empty? || HasMedia.medium_types[k.to_s].include?(mime_type)
     end
     if klass.nil?
       object.media_errors = [HasMedia.errors_messages[:type_error]]

data/lib/has_media/uploaders/medium_uploader.rb

@@ -13,7 +13,7 @@ class MediumUploader < CarrierWave::Uploader::Base
 
   # see https://gist.github.com/519484
   def root
-    CarrierWave.root
+    Rails.root
   end
 
 end

data/spec/has_media_spec.rb

@@ -16,6 +16,7 @@ class MediumRelatedTest < ActiveRecord::Base
   has_many_media  :audios, :only => :audio
   has_one_medium  :image_no_encode, :only => :image, :encode => false
   has_one_medium  :pdf, :encode => false
+  has_one_medium  :document, :encode => false
 end
 
 
@@ -28,7 +29,8 @@ describe "HasMedia" do
       "Image" => ["image/jpeg"],
       "Audio" => ["audio/wav"],
       "Pdf"   => ["application/pdf"],
-      "Video" => ["video/mp4"]
+      "Video" => ["video/mp4"],
+      "Document"  => []
     }
   end
 
@@ -208,6 +210,27 @@ describe "HasMedia" do
       @medium.save.should be_false
       @medium.errors.full_messages.include?(HasMedia.errors_messages[:type_error])
     end
+    it "should allow to accept all mime types" do
+      HasMedia.medium_types = {
+        "Document" => [],
+      }
+      @pdf = stub_temp_file('Conversational_Capital _Explained.pdf', 'application/pdf')
+      @medium = MediumRelatedTest.new
+      @medium.document = @pdf
+      @medium.valid?
+      @medium.should be_valid
+      @medium.save.should be_true
+      @image = stub_temp_file('image.jpg', 'image/jpeg')
+      @medium.document = @image
+      @medium.valid?
+      @medium.should be_valid
+      @medium.save.should be_true
+      @audio = stub_temp_file('audio.wav', 'audio/wav')
+      @medium.document = @audio
+      @medium.valid?
+      @medium.should be_valid
+      @medium.save.should be_true
+    end
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_media
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - klacointe
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-05 00:00:00 +01:00
+date: 2010-11-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -117,10 +117,12 @@ files:
 - VERSION
 - config/locales/en.yml
 - examples/models/audio.rb
+- examples/models/document.rb
 - examples/models/image.rb
 - examples/models/pdf.rb
 - examples/models/video.rb
 - examples/uploaders/audio_uploader.rb
+- examples/uploaders/document_uploader.rb
 - examples/uploaders/image_uploader.rb
 - examples/uploaders/pdf_uploader.rb
 - examples/uploaders/video_uploader.rb
@@ -187,7 +189,9 @@ test_files:
 - examples/uploaders/pdf_uploader.rb
 - examples/uploaders/video_uploader.rb
 - examples/uploaders/audio_uploader.rb
+- examples/uploaders/document_uploader.rb
 - examples/models/image.rb
 - examples/models/pdf.rb
 - examples/models/audio.rb
+- examples/models/document.rb
 - examples/models/video.rb