caboose-cms 0.5.25 → 0.5.26

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzJhYjVlMzc1MzgwNzk3MzUyYzc3NDMyZTQ1OGM5M2MwNTNmMWQ4Ng==
+    ZDAxOGViYzYwNjhiYzBmZTBkZGI1Nzg1ZjhlYjJlNmJlOTFkM2MwMw==
   data.tar.gz: !binary |-
-    MDBmZThjYTNiODg4MDQ1N2EwZTQxYTQ4ODg3MTJiMjliODM3MmVhNA==
+    Y2YyZDg3ZjZlM2Q0ODdhMjkwZjcyNWM0NjE1OWRhZTFmOThhNjhkZg==
 SHA512:
   metadata.gz: !binary |-
-    Yjg3ZmM2NTFkNDcwYzQ5YWQ3ZTFhMmFhNWU0NjcwZGY5ZjRjZmYxM2U4YmJj
-    YzRmYjYwZjQ1OWIzOTBlYjUyOWZhYTJiOTQxMTQyZTkzOGZmN2JkNGYwN2Uz
-    ODJiMjllNTEzNTllZTEwNjNkOTZmMDFlZDA2NWY3YzQyZDRmMTk=
+    YjZmYmZkZjczNTA4MzdjM2MzYmMxYWQwOTI3ODZiMTljMGE0YmJmYTU1ZDQ0
+    YTNjYzJhYmFlM2QwZTA3NzMxYjA3MjU1M2RhOTZmMzkzNzVjYzkwMGUyY2Nm
+    NjhiODdmZTE5YjVjMzRhZjhjZTYwM2Y4ODc3ZjI1M2EzZmJkY2Y=
   data.tar.gz: !binary |-
-    MmEyMDQzZDc0MjQ0YWM0NWYzMWI2NGZkYWVlMjE5M2ZmMjUyZGRiMmZhZDQy
-    MTExZTdiYmVlMjExOGNhN2M4YmQ0Y2NlYzUyMWNlODcyYjZkMmYzYTY3ZjRh
-    NDgxYWFjOWFjYmE4YWU5ZGZiMTZiZjE1YTNkZjMxMDA1NWJiMDM=
+    MDgwNGJmNjA3ZDFmMzcxMjQ3ZDc1ZWFlODIyN2EyYzJjZDk2OWQ1MGJhYjBh
+    ZTQ2MWMzMDQyZmYyNWEwNjY0ZDU2Mjc1YjE4N2Q5MTA1M2VmZDBhYzhiMjdl
+    NjkzYWUxY2Y0ZTA1YTZjNTEyMDU5ZjNiNWEwNDJjN2EwMjI3MWE=

data/app/models/caboose/block.rb

@@ -8,10 +8,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, :url => ':cdn_domain/uploads/:id.:extension'
+  has_attached_file :file, :path => ':path_prefixuploads/:id.:extension'
   do_not_validate_attachment_file_type :file
   has_attached_file :image,
-    :url => ':cdn_domain/uploads/:id_:style.:extension',
+    :path => ':path_prefixuploads/:id_:style.:extension',
     :default_url => "http://placehold.it/300x300",
     :styles => {
       :tiny  => '160x120>',

data/app/models/caboose/category.rb

@@ -14,7 +14,7 @@ module Caboose
     has_many :category_memberships
     
     has_attached_file :image,    
-      :url => ':cdn_domain/categories/:id_:style.:extension',      
+      :path => ':path_prefixcategories/:id_:style.:extension',      
       :default_url => 'http://placehold.it/300x300',
       :s3_protocol => :https,
       :styles => {

data/app/models/caboose/media_file.rb

@@ -2,7 +2,7 @@ class Caboose::MediaFile < ActiveRecord::Base
 
   self.table_name = "media_files"
   belongs_to :media_category
-  has_attached_file :file, :path => 'media-files/:id.:extension'
+  has_attached_file :file, :path => ':path_prefixmedia-files/:id.:extension'
   do_not_validate_attachment_file_type :file  
   attr_accessible :id, :media_category_id, :name, :description
   

data/app/models/caboose/media_image.rb

@@ -6,7 +6,7 @@ class Caboose::MediaImage < ActiveRecord::Base
   self.table_name = "media_images"
   belongs_to :media_category  
   has_attached_file :image, 
-    :path => 'media-images/:id_:style.:extension',
+    :path => ':path_prefixmedia-images/:id_:style.:extension',
     :default_url => 'http://placehold.it/300x300',    
     :styles => {
       :tiny  => '150x200>',

data/app/models/caboose/post.rb

@@ -14,7 +14,7 @@ class Caboose::Post < ActiveRecord::Base
     :published,
     :created_at
   has_attached_file :image, 
-    :path => 'posts/:id_:style.:extension',
+    :path => ':path_prefixposts/:id_:style.:extension',
     :default_url => 'http://placehold.it/300x300',
     :styles => {
       :tiny  => '75x75>',

data/app/models/caboose/product_image.rb

@@ -20,7 +20,7 @@ module Caboose
       :square_scale_factor
       
     has_attached_file :image,      
-      :path => 'products/:product_id_:id_:style.:extension',      
+      :path => ':path_prefixproducts/:product_id_:id_:style.:extension',      
       :default_url => 'http://placehold.it/300x300',
       :s3_protocol => :https,
       :styles      => {

data/app/models/caboose/user.rb

@@ -4,7 +4,7 @@ class Caboose::User < ActiveRecord::Base
   has_many :role_memberships
   has_many :roles, :through => :role_memberships
   has_attached_file :image, 
-    :path => 'users/:id_:style.:extension',    
+    :path => ':path_prefixusers/:id_:style.:extension',    
     :default_url => 'http://placehold.it/300x300',    
     :styles => {
       :tiny  => '150x200>',

data/lib/caboose.rb

@@ -122,11 +122,7 @@ module Caboose
   
 end
 
-Paperclip.interpolates :cdn_domain do |attachment, style|
-  return Caboose::cdn_domain == '/' ? '' : Caboose::cdn_domain
-end
-
-Paperclip.interpolates :path_without_cdn do |attachment, style|
-  x = Caboose::cdn_domain.nil? || Caboose::cdn_domain == '/' ? 1 : Caboose::cdn_domain.length
-  return attachment.url && attachment.url.length > 0 ? attachment.url[x..-1] : '' 
+Paperclip.interpolates :path_prefix do |attachment, style|  
+  return "#{Rails.root}/public/" if Caboose::cdn_domain.nil? || Caboose::cdn_domain == '/'
+  return ''   
 end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.25'
+  VERSION = '0.5.26'
 end

metadata

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