polyblock 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a527a2ed4ca8ccdfa6f46e746685b8b21a07675d
-  data.tar.gz: fee974748739cbe8fc0c3163f4aab3324d312d17
+  metadata.gz: f90d9a8b87c33d93fa53b4375dfc0ef66656f946
+  data.tar.gz: 38e9eb0ef543fb5c7c730ed7fdeb8c6f76177ff9
 SHA512:
-  metadata.gz: 202c3aa20cc4a09768c930018e733a3fc61e8c8adbcdc08d5be8726b1390071f9ddbb43f290773a4f26a83fc0cd16ca05894d623797ac383349807f943db68c5
-  data.tar.gz: a83e3f2c1d8ef15844b2cf1e808b62dd47fb9a210b45b8e83ff6788cf86ea3ff2f7c5694d8e756e31b2b9623e88406cfb6988040d34430da8c44a0e10357b3bf
+  metadata.gz: 5146456f7ed05f01740d5679e8686e1d3624075d876418f5ce2eb35c38ad649145829aae379e42c6fc4755f933cc181aa6289505ad3c818990354e4f9c7e380b
+  data.tar.gz: c643e453ad1c736024a845c643baf0413dfd5fe75ec845cd865a68c894bb2e6aeaaf0ab97e4c44a28c527ac4c3b82c4d398cd2965a0821d987aadfd45ac410fb

data/app/models/ckeditor/attachment_file.rb

@@ -2,9 +2,10 @@ class Ckeditor::AttachmentFile < Ckeditor::Asset
   has_attached_file :data,
                     :url => "/ckeditor_assets/attachments/:id/:filename",
                     :path => ":rails_root/public/ckeditor_assets/attachments/:id/:filename"
-  
-  validates_attachment_size :data, :less_than => 100.megabytes
+
   validates_attachment_presence :data
+  validates_attachment_size :data, :less_than => 100.megabytes
+  do_not_validate_attachment_file_type :data
 
   def url_thumb
     @url_thumb ||= Ckeditor::Utils.filethumb(filename)

data/app/models/ckeditor/picture.rb

@@ -4,8 +4,10 @@ class Ckeditor::Picture < Ckeditor::Asset
                     :path => ":rails_root/public/ckeditor_assets/pictures/:id/:style_:basename.:extension",
                     :styles => { :content => '800>', :thumb => '118x100#' }
 
-  validates_attachment_size :data, :less_than => 2.megabytes
   validates_attachment_presence :data
+  validates_attachment_size :data, :less_than => 2.megabytes
+  validates_attachment_content_type :data, :content_type => /\Aimage/
+  do_not_validate_attachment_file_type :data
 
   def url_content
     url(:content)

data/lib/polyblock/version.rb

@@ -1,3 +1,3 @@
 module Polyblock
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end