caboose-cms 0.5.215 → 0.5.216

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDA4ODMwZTZhOGNhYTU0NGJlMzk2NmRlMmIzM2Q0ZGQ3ODk5YzY1OQ==
+    YWU3YzQzNmViZGE1NjI4ZjQ2MmRiZmU5ODFhMTVlNTU4ZWE2MzY1OA==
   data.tar.gz: !binary |-
-    ZTQxOWYwNTVmZTgyMDhlYjJiOGY3YjlhNGI0NDc4NmYyZjEyYjdhZA==
+    YWJjZmNjYWViYWZhZjI0OWJlY2FiNDc4OTExY2Q1ZjRjNjJkZjQ0MQ==
 SHA512:
   metadata.gz: !binary |-
-    MmZiOTNkZTQzZjI4ZmUyMzNjYWI1Y2ZjNTU2NGQxZGYxZGViM2E1NTVjNmNl
-    Yjc0YTViMDFkNDBmOTg5NDFhNTY2MjNiOGIxOGNjZWVjYzM5NzZhNGVhZTc4
-    M2MxYmNhNDFjZWVkZDg2MDU3MDc3NWI4ZDU3MGVhMTNiMzIzOWM=
+    NmVlNmI2MmQ4NTI0ZjA3ODc2ZWVkNTA3YWEwMWJlOGFlYmRhYjVmMzM2OWZl
+    ZmJkYWUyNzg4N2ZiNWU2ZjAzNzE1OWNhYzE3MTUwNWM3MWM1MGY1ZDFjZDdh
+    ZTE2ZjU3MTNiZTQzMzRjNTQ2MDIyMDE5YjkwNmZjYzU1NmQ2Nzg=
   data.tar.gz: !binary |-
-    NGI2NzEyODFlOWY1MDQ1OTUwZTZlMzlhNTE2OWQyNTM0OTBlMThkMDI0NDhl
-    NWUxMjBkODMxMzE2ZmQ2NmZmMGQ4NTg0NzJmNzVlNmRjODhhZjA0YWQ2M2Qz
-    MjkxMzc5NGFiZDM2NWU2NWY3N2JkZTcyYmE0MWZhMTY0NGI5ODk=
+    N2MyYmEyYzE4Y2QwZjRkOWY0NGMwODM3OTZiYWE4NDJiZGMxNGZmZTcyYzMw
+    MTE3MDRmMWIyMmY3ODliM2Y2ZTUzZWRhNmIwODY2MTFlOTE4MWIyYTY5NjQw
+    YjdjMTFhNWE2ZmQyNmE1OTNjMzc4ODY4YTk5ZjMyOTc0ZDg2NGQ=

data/app/controllers/caboose/blocks_controller.rb

@@ -371,6 +371,13 @@ module Caboose
       resp = StdClass.new({'attributes' => {}})
       b = Block.find(params[:id])
       b.image = params[:value]
+      
+      str = params[:value].original_filename
+      arr = str.split('.')
+      arr.pop
+      str = arr.join('.')      
+      b.image_upload_name = b.unique_image_upload_name(str)      
+      
       b.save
       resp.success = true 
       resp.attributes = { 'value' => { 'value' => b.image.url(:tiny) }}
@@ -386,6 +393,13 @@ module Caboose
       resp = StdClass.new({'attributes' => {}})
       b = Block.find(params[:id])
       b.file = params[:value]
+      
+      str = params[:value].original_filename
+      arr = str.split('.')
+      arr.pop
+      str = arr.join('.')      
+      b.file_upload_name = b.unique_file_upload_name(str)
+      
       b.save
       resp.success = true      
       resp.attributes = { 'value' => { 'value' => b.file.url }}

data/app/controllers/caboose/users_controller.rb

@@ -116,7 +116,8 @@ module Caboose
             :last_name  => last_name,
             :email      => email,
             :username   => username,          
-            :password   => Digest::SHA1.hexdigest(Caboose::salt + password)
+            :password   => Digest::SHA1.hexdigest(Caboose::salt + password),
+            :site_id    => @site.id
           )
           good_count = good_count + 1
         end
@@ -142,6 +143,7 @@ module Caboose
       
       user = User.new()
       user.email = params[:email] ? params[:email].strip.downcase : nil
+      user.site_id = @site.id
       
       if user.email.length == 0
         resp.error = "Please enter a valid email address."

data/app/models/caboose/block.rb

@@ -9,10 +9,10 @@ class Caboose::Block < ActiveRecord::Base
   belongs_to :block_type
   belongs_to :parent, :foreign_key => 'parent_id', :class_name => 'Caboose::Block'   
   has_many :children, :foreign_key => 'parent_id', :class_name => 'Caboose::Block', :dependent => :delete_all, :order => 'sort_order'
-  has_attached_file :file, :path => ':path_prefixuploads/:id.:extension'
-  do_not_validate_attachment_file_type :file
+  has_attached_file :file, :path => ':path_prefixuploads/:block_file_upload_name.:extension'
+  do_not_validate_attachment_file_type :file  
   has_attached_file :image,
-    :path => ':path_prefixuploads/:id_:style.:extension',
+    :path => ':path_prefixuploads/:block_image_upload_name_:style.:extension',
     :default_url => "http://placehold.it/300x300",
     :styles => {
       :tiny  => '160x120>',
@@ -445,5 +445,49 @@ class Caboose::Block < ActiveRecord::Base
     end
     return true
   end
+  
+  def unique_file_upload_name(str)
+    base = str.downcase.gsub(' ', '-').gsub(/[^\w-]/, '')
+    str = "#{base}"
+    i = 1
+    while Caboose::Block.where("id <> ? and file_upload_name = ?", self.id, str).exists? && i < 100 do
+      str = "#{base}-#{i}"
+      i = i + 1
+    end
+    return str              
+  end
+  
+  def unique_image_upload_name(str)
+    base = str.downcase.gsub(' ', '-').gsub(/[^\w-]/, '')
+    str = "#{base}"
+    i = 1
+    while Caboose::Block.where("id <> ? and image_upload_name = ?", self.id, str).exists? && i < 100 do
+      str = "#{base}-#{i}"
+      i = i + 1
+    end
+    return str              
+  end
+  
+  def self.unique_file_upload_name(str)
+    base = str.downcase.gsub(' ', '-').gsub(/[^\w-]/, '')
+    str = "#{base}"
+    i = 1
+    while Caboose::Block.where("file_upload_name = ?", str).exists? && i < 100 do
+      str = "#{base}-#{i}"
+      i = i + 1
+    end
+    return str              
+  end
+  
+  def self.unique_image_upload_name(str)
+    base = str.downcase.gsub(' ', '-').gsub(/[^\w-]/, '')
+    str = "#{base}"
+    i = 1
+    while Caboose::Block.where("image_upload_name = ?", str).exists? && i < 100 do
+      str = "#{base}-#{i}"
+      i = i + 1
+    end
+    return str              
+  end
 
 end

data/app/models/caboose/schema.rb

@@ -146,17 +146,19 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :extension      , :string     ]
       ],
       Caboose::Block => [
-        [ :page_id               , :integer ],
-        [ :post_id               , :integer ],
-        [ :parent_id             , :integer ],
-        [ :block_type_id         , :integer ],
-        [ :sort_order            , :integer , { :default => 0 }],
-        [ :constrain             , :boolean , { :default => false }],
-        [ :full_width            , :boolean , { :default => false }],
-        [ :name                  , :string  ],
-        [ :value                 , :text    ],
+        [ :page_id               , :integer    ],
+        [ :post_id               , :integer    ],
+        [ :parent_id             , :integer    ],
+        [ :block_type_id         , :integer    ],
+        [ :sort_order            , :integer     , { :default => 0     }],
+        [ :constrain             , :boolean     , { :default => false }],
+        [ :full_width            , :boolean     , { :default => false }],
+        [ :name                  , :string     ],
+        [ :value                 , :text       ],
         [ :file                  , :attachment ],
-        [ :image                 , :attachment ]
+        [ :file_upload_name      , :string     ],
+        [ :image                 , :attachment ],
+        [ :image_upload_name     , :string     ]
       ],
       Caboose::BlockType => [        
         [ :parent_id                       , :integer ],

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.215'
+  VERSION = '0.5.216'
 end

data/lib/caboose.rb

@@ -141,3 +141,15 @@ Paperclip.interpolates :model_url do |attachment, style|
   # Otherwise S3
   return "#{Caboose::cdn_domain}/#{attachment.path}"
 end
+
+Paperclip.interpolates :block_file_upload_name do |attachment, style|
+  b = attachment.instance
+  return b.id if b.file_upload_name.nil? || b.file_upload_name.strip.length == 0
+  return b.file_upload_name        
+end
+
+Paperclip.interpolates :block_image_upload_name do |attachment, style|
+  b = attachment.instance
+  return b.id if b.image_upload_name.nil? || b.image_upload_name.strip.length == 0
+  return b.image_upload_name        
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.215
+  version: 0.5.216
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg