caboose-cms 0.6.5 → 0.6.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWMwNGE5MzMwM2M5YzliNTA3ZDcyNDQwMTljZGZlMTQxMTZkOWE2MA==
+    OTIzN2Y4OGIxMGM5NTU5MDEzN2UxZmEyZGY3Nzc1ZWFkMTY2MWQ4ZQ==
   data.tar.gz: !binary |-
-    NTk3NDg3MDlmMTVhZWFlY2E1MmJiY2MwZWI2YWViMzk1MWM1NDZkNQ==
+    YjhlYjk4ODE3NDIyYzNjYmU5ZWM1YjI4MzU2NDk3NzJkOTMzMGM1OQ==
 SHA512:
   metadata.gz: !binary |-
-    ZmM0ZjE0NmI3MjI2ZmUyMzJhM2FlYmQ0YmNkZmQ5ZGIzZDZmNmMyMDA3ZmUw
-    NmI1YzI3ODJhMDhhMWM4MjJkOGUxOTE0ODJmZGNkNWJlZGU3NWVmZWU2Yjk1
-    MTNmOGEwZTUxNDBjODY4ODUxYTU0NDcxYThiMDkzZDUzM2QyNzA=
+    MzRjYjNkNWIwYjk2MDUxODM3YmQyZDZhMjFkNTMwN2EwOGQ0Mzc3NjMzMTJl
+    Yjc5Mzk1NjUzMDgxZTUxMDRmMzI5NGNkZWQzM2E2MjY0ZjU0NGM2MjBhZWMw
+    ZDViYjVjNjU5MmE0ZWI1ZTYyMjQxNGZiOWNlM2YzYTc1M2JmN2Y=
   data.tar.gz: !binary |-
-    M2ZkMmIzMjNkMTk1MjI5MzAwMzk3N2UzM2I2ZDY2ZTk4ZTQ5M2ExZmE3OTJj
-    Mzg5MDIwY2RkNDNmM2YxNmYyYTlhMDQzMzczYWVmY2IzNmJlZmZmNDc3MzFk
-    NDRiYTNkNmViNGFmMWNlNzVmYTUxNTZkODQ5ZmQ4MjFiNDlkYzc=
+    NGQ0NjI2OTZjZWYwYjFiOGY2ZDY4ZWVjYmRkZTFhZTdiOWMyZDM2MzE1MjMy
+    ODRkMjVkYmZmZWNiYTZmMWMzMmEzOWY1ZjMxY2Q5NDQzNTkxMTU2MjAyNWFl
+    Mjg0MGE1NmRmMjMzYzU0YjMwYmI2ZGQzNTdiZDZiMWI0Y2Q2MDA=

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

@@ -230,7 +230,7 @@ MediaController.prototype = {
     if (that.cat.media.length > 0)
     {      
       $.each(that.cat.media, function(i, m) {
-        if (m.image_urls && m.processed == false)
+        if (m.media_type == 'image' && m.processed == false)
           processing = true
         var li = $('<li/>')          
           .attr('id', 'media' + m.id)
@@ -261,7 +261,7 @@ MediaController.prototype = {
         start: function() { $(this).data("origPosition", $(this).position()); }
       });
     });    
-  },
+  },     
   
   //============================================================================
         

data/app/models/caboose/media.rb

@@ -74,10 +74,18 @@ class Caboose::Media < ActiveRecord::Base
       :description  => self.description,
       :processed    => self.processed,
       :image_urls   => self.image_urls,
-      :file_url     => self.file ? self.file.url : nil       
+      :file_url     => self.file ? self.file.url : nil,
+      :media_type   => self.is_image? ? 'image' : 'file'
     }    
   end
   
+  def is_image?
+    image_extensions = ['.jpg', '.jpeg', '.gif', '.png', '.tif']
+    ext = File.extname(self.original_name).downcase
+    return true if image_extensions.include?(ext)
+    return false    
+  end
+          
   def image_urls
     return nil if self.image.nil? || self.image.url(:tiny).starts_with?('http://placehold.it')
     return {

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.6.5'
+  VERSION = '0.6.6'
 end

metadata

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