carrierwave-magic 0.0.1 → 0.0.2

data/README.md

@@ -2,12 +2,30 @@
 
 This allows to set file type with ruby-filemagic instead of an extension
 
-It also sets correct file extension with mime-types gem.
-
-I recommend using 'mime_types' gem from git:
+To set correct file extension on resulting files:
+1) Add 'mime-types' gem I reccomend using 'mime_types' 1.20 from git:
 
     gem 'mime-types', github: 'halostatue/mime-types'
 
+2) Add this to your uploader (or any other way)
+
+  def filename
+    if original_filename.present?
+      ext = MIME::Types[file.content_type].nil? ? file.extension : MIME::Types[file.content_type].first.extensions.first
+      if version_name != :jpg
+        "#{secure_token(10)}.#{ext}"
+      else
+        "#{secure_token(10)}.jpg"
+      end
+    end
+  end
+
+  protected
+  def secure_token(length=16)
+    var = :"@#{mounted_as}_secure_token"
+    model.instance_variable_get(var) or model.instance_variable_set(var, SecureRandom.hex(length/2))
+  end
+
 
 Idea and some of the code from this pull request: https://github.com/jnicklas/carrierwave/pull/949
 

data/carrierwave-magic.gemspec

@@ -19,5 +19,4 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency "ruby-filemagic"
   gem.add_runtime_dependency "carrierwave"
-  gem.add_runtime_dependency "mime-types"
 end

data/lib/carrierwave-magic.rb

@@ -27,6 +27,12 @@ module CarrierWave
       end
     end
 
+    GENERIC_CONTENT_TYPES = %w[application/octet-stream binary/octet-stream]
+
+    def generic_content_type?(content_type)
+      GENERIC_CONTENT_TYPES.include? content_type
+    end
+
     ##
     # Changes the file content_type using the ruby-filemagic gem
     #
@@ -39,14 +45,6 @@ module CarrierWave
         else
           file.instance_variable_set(:@content_type, new_content_type)
         end
-
-        unless MIME::Types[new_content_type].first.nil?
-          if file.respond_to?(:extension=)
-            file.extension = MIME::Types[new_content_type].first.extensions.first
-          else
-            file.instance_variable_set(:@extension, MIME::Types[new_content_type].first.extensions.first)
-          end
-        end
       end
     rescue ::Exception => e
       raise CarrierWave::ProcessingError, I18n.translate(:"errors.messages.magic_mime_types_processing_error", e: e, default: 'Failed to process file with FileMagic, Original Error: %{e}')

data/lib/carrierwave-magic/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module Magic
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-magic
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: ruby-filemagic and mime-types for carrierwave
 email:
 - glebtv@gmail.com