has_media 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/examples/models/video.rb

@@ -0,0 +1,9 @@
+class Video < Medium
+  set_table_name 'media'
+
+  mount_uploader :file, VideoUploader
+
+  def self.handle_content_type?(content_type)
+    content_type.starts_with? 'audio/'
+  end
+end

data/examples/uploaders/video_uploader.rb

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

data/lib/has_media/models/medium.rb

@@ -19,13 +19,14 @@ class Medium < ActiveRecord::Base
     :image => 'png',
     :audio => 'mp3',
     :pdf   => 'pdf',
+    :video => 'flv'
   }
 
   # Allowed MIME types for upload
   # need custom configuration
   # TODO: add errors if not type of file
   @@mime_types = {
-    :video => ['video/mpeg', 'video/mp4', 'video/quicktime', 'video/x-ms-wmv', 'video/x-flv', 'video/x-msvideo'],
+    :video => HasMedia.videos_content_types,
     :image => HasMedia.images_content_types,
     :audio => ['audio/mpeg', 'audio/x-ms-wma', 'audio/x-wav'],
     :flash => ['application/x-shockwave-flash'],
@@ -50,9 +51,10 @@ 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)
     only ||= ""
-    medium_types = [Image, Audio, Pdf]
+    medium_types = HasMedia.medium_types
     if only != "" and klass = Kernel.const_get(only.capitalize)
       medium_types = [klass]
     end
@@ -143,7 +145,7 @@ class Medium < ActiveRecord::Base
   end
 
   def file_extension
-    EXTENSIONS[type.downcase.to_sym]
+    EXTENSIONS[type.to_s.downcase.to_sym]
   end
 
 private

data/lib/has_media.rb

@@ -7,6 +7,7 @@ module HasMedia
 
   VERSION = "0.0.1"
 
+  @@medium_types = []
   @@store_dir = '/tmp'
   @@directory_uri = ''
   @@custom_models_path = nil
@@ -42,7 +43,21 @@ module HasMedia
     'image/gi_',
     'image/x-citrix-pjpeg'
   ]
+  @@videos_content_types = [
+    'video/mpeg',
+    'video/mp4',
+    'video/quicktime',
+    'video/x-ms-wmv',
+    'video/x-flv',
+    'video/x-msvideo'
+  ]
 
+  def self.medium_types=(value)
+    @@medium_types = value
+  end
+  def self.medium_types
+    @@medium_types
+  end
   def self.directory_path=(value)
     @@store_dir = value
   end
@@ -70,6 +85,9 @@ module HasMedia
   def self.images_content_types
     @@images_content_types
   end
+  def self.videos_content_types
+    @@videos_content_types
+  end
   def self.errors_messages
     @@errors_messages
   end

data/spec/has_media_spec.rb

@@ -23,6 +23,7 @@ describe "HasMedia" do
     end
     HasMedia.directory_path = 'tmp'
     HasMedia.directory_uri = '/media'
+    HasMedia.medium_types = [Image, Video, Pdf, Audio]
   end
 
   before :each do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: has_media
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - klacointe
@@ -10,49 +15,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 +02:00
+date: 2010-06-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: carrierwave
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 2
         version: 0.4.2
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 4
         version: 2.3.4
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 4
         version: 2.3.4
-    version: 
+  type: :runtime
+  version_requirements: *id004
 description: Media Managment Library for ActiveRecord and Carrierwave
 email: kevinlacointe@gmail.com
 executables: []
@@ -72,9 +93,11 @@ files:
 - 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
@@ -105,29 +128,33 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Media Managment Library for ActiveRecord and Carrierwave
 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/pdf.rb
-- examples/models/image.rb
-- examples/models/audio.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
+- examples/models/image.rb
+- examples/models/pdf.rb
+- examples/models/audio.rb
+- examples/models/video.rb