paperclip-webmerge 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8f6abbc6698c4131b6557f6c22006be00ca0713
-  data.tar.gz: 4cb92d7fd9605cf7271d07143100e9d141191870
+  metadata.gz: b795930f146a50111f9bdde3f02d6408d6ba971f
+  data.tar.gz: 8588ae9a7e332563de12f2f618ce35dac8e08e64
 SHA512:
-  metadata.gz: f04e61dd84e9218a6eb0723aa910266bd1dfde5ac6c80f9bd735095d2795806f600d9ef3518e2785a52ce56325588a1eb0874f04324e8aa96c364b692181ff10
-  data.tar.gz: ce14e3963b14fd479d1e9b932427be2e5850b5f8d0cab29588e73686a862aee79baaf5bd7014fde9bce250ceed39f027315e1bc35d2b83150fd5d0b758970855
+  metadata.gz: e38cb89f1d4643823d9a47596cb0cb498cfbef252238c1f3b9320abba29b031ae5c74acfed07f353aa588ea7820b38ccabba1efdddf54e076879c7e0c68ac016
+  data.tar.gz: e75fb3dbfbd00199f57d03d6c20ef60e3770a3658eb9fb38f9a9870855d15b6fa345fc92880c101227eaa81f543fd6db67422150a8d0beaecf12b0c06b4f130d

data/lib/paperclip_web_merge.rb

@@ -1,4 +1,5 @@
 require 'paperclip_web_merge/version'
+require 'ostruct'
 require 'web_merge'
 
 module Paperclip
@@ -48,6 +49,9 @@ module Paperclip
       end
 
       def file_type(file)
+        correct_file_type = MIME::Types.type_for(file.path).first.to_s
+        file = OpenStruct.new(content_type: correct_file_type) if ['application/zip', 'application/octect-stream'].include?(file.content_type)
+
         {
           'application/vnd.openxmlformats-officedocument.wordprocessingml.document'   => 'docx',
           'application/pdf'                                                           => 'pdf',
@@ -56,8 +60,6 @@ module Paperclip
           'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'         => 'xlsx',
           'application/vnd.openxmlformats-officedocument.presentationml.presentation' => 'pptx',
           'application/vnd.ms-powerpoint'                                             => 'pptx',
-          'application/zip'                                                           => -> { MIME::Types.type_for(file.path).first.to_s },
-          'application/octet-stream'                                                  => -> { MIME::Types.type_for(file.path).first.to_s }
         }[file.content_type]
       end
 

data/lib/paperclip_web_merge/version.rb

@@ -1,7 +1,7 @@
 module Paperclip
   module Storage
     module WebMerge
-      VERSION = '0.0.1'
+      VERSION = '0.0.2'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-webmerge
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Joshua Plicque
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler