caboose-cms 0.7.70 → 0.7.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94e48a620f536176ccf6ee33e90e59b8331c752d
-  data.tar.gz: 7dc5ab55f600522400b39c22979643e23ebbc94b
+  metadata.gz: 7ef12fa6392d39fa4faf8be10245f0e0532ce088
+  data.tar.gz: 49253e331627337f49c57c13cb38663876b2d89f
 SHA512:
-  metadata.gz: a5127d554da77f633376092e414714fc973f7e1a16f079b371e267e2beefc3725b2c1938dd5fc3f6469e485f1e39a3cea3394654260541351e31ede0cbfb34c7
-  data.tar.gz: 2f223ec65ff19aa7e7098b6d7b64d2e12fe3353633122d57f8fd1088a1b01960a252a2d8e8c27b37710d0d79b365780950aa663ee55e3122a36cd59a6fe7d13a
+  metadata.gz: 4a7973212ed78b8282de7dceece1989b2e6efa373b2946657c4f16bfc0674fce4c3111e95b09c63ae53c41e32c0a4d8d3ad4f34b0b84e219affa6407d904ad4a
+  data.tar.gz: d6224a2867094144f871a41eaf098275777082fbf63b3fa39363456e9a81f1c650042fbb0aa98413503daae333ca15a31ad02fa427f6aa5e2f48ecc2d039cdd0

data/app/assets/javascripts/caboose/admin_media_index.js

@@ -83,7 +83,8 @@ MediaController.prototype = {
               type: 'post',
               data: {
                 media_category_id: that.cat_id,
-                name: file.name 
+                name: file.name,
+                file_type: file.type
               },
               success: function(resp) {},
               async: false          

data/app/controllers/caboose/media_controller.rb

@@ -167,9 +167,15 @@ module Caboose
       media_category_id = params[:media_category_id]
       original_name = params[:name]
       name = Caboose::Media.upload_name(original_name)                        
+      file_type = params[:file_type]
+      if ['image/gif', 'image/jpeg', 'image/png', 'image/tiff'].include? file_type
+        image_content_type = file_type
+      else
+        file_content_type = file_type
+      end
       m = Media.where(:media_category_id => media_category_id, :original_name => original_name, :name => name).first
       if m.nil?
-        m = Media.create(:media_category_id => media_category_id, :original_name => original_name, :name => name, :processed => false)
+        m = Media.create(:media_category_id => media_category_id, :original_name => original_name, :name => name, :image_content_type => image_content_type, :file_content_type => file_content_type, :processed => false)
       end
       p = Product.where(:media_category_id => media_category_id).last
       if p

data/app/models/caboose/media.rb

@@ -24,7 +24,9 @@ class Caboose::Media < ActiveRecord::Base
     :name,
     :original_name,
     :description, 
-    :processed
+    :processed,
+    :image_content_type,
+    :file_content_type
     
    has_attached_file :sample
    
@@ -47,20 +49,24 @@ class Caboose::Media < ActiveRecord::Base
     key = "#{self.media_category_id}_#{self.original_name}"    
     key = URI.encode(key.gsub(' ', '+'))    
     uri = "http://#{bucket}.s3.amazonaws.com/#{key}"    
-    
-    image_extensions = ['.jpg', '.jpeg', '.gif', '.png', '.tif']
-    ext = File.extname(key).downcase
-    mimetype = Caboose::Mimetype.mimetype_for_extension(ext)        
-    if image_extensions.include?(ext)    
+
+    content_type = self.image_content_type || self.file_content_type
+
+    if is_image?
       self.image = URI.parse(uri)
-      self.image_content_type = mimetype if mimetype
+      self.image_content_type = content_type
     else
       self.file = URI.parse(uri)
-      self.file_content_type = mimetype if mimetype      
-    end    
+      self.file_content_type = content_type
+    end
     self.processed = true
     self.save
-    
+
+    # Set the content-type metadata on S3
+    if !is_image?
+      self.set_file_content_type(content_type)
+    end
+
     # Remember when the last upload processing happened
     s = Caboose::Setting.where(:site_id => self.media_category.site_id, :name => 'last_upload_processed').first
     s = Caboose::Setting.create(:site_id => self.media_category.site_id, :name => 'last_upload_processed') if s.nil?
@@ -80,7 +86,8 @@ class Caboose::Media < ActiveRecord::Base
       :access_key_id => config['access_key_id'],
       :secret_access_key => config['secret_access_key']  
     })
-    bucket = config['bucket']
+    s3 = AWS::S3.new
+    bucket = s3.buckets[config['bucket']]
     ext = File.extname(self.image_file_name)[1..-1]
     self.image.styles.each do |style|
       k = "media/#{self.id}_#{self.name}_#{style}.#{ext}"
@@ -94,9 +101,10 @@ class Caboose::Media < ActiveRecord::Base
       :access_key_id => config['access_key_id'],
       :secret_access_key => config['secret_access_key']  
     })
-    bucket = config['bucket']
-    ext = File.extname(self.image_file_name)[1..-1]
-    has_attached_file :file, :path => ':caboose_prefixmedia/:id_:media_name.:extension'
+    s3 = AWS::S3.new
+    bucket = s3.buckets[config['bucket']]
+    ext = File.extname(self.file_file_name)[1..-1]
+    # has_attached_file :file, :path => ':caboose_prefixmedia/:id_:media_name.:extension'
     k = "media/#{self.id}_#{self.name}.#{ext}"
     bucket.objects[k].copy_from(k, :content_type => content_type) # a copy needs to be done to change the content-type    
   end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.70'
+  VERSION = '0.7.71'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.70
+  version: 0.7.71
 platform: ruby
 authors:
 - William Barry