caboose-cms 0.5.24 → 0.5.25

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWZjNzQwNTBmMzQ5YzA2ZjIzMzJkODhjODY0MWIxZjU0OWViMTA0ZA==
+    MzJhYjVlMzc1MzgwNzk3MzUyYzc3NDMyZTQ1OGM5M2MwNTNmMWQ4Ng==
   data.tar.gz: !binary |-
-    YjE2ZTA2YzBlNDM3OTY1M2RlYjI3ZmNlNGY5NjU1OTJiMmU5ZjYyNg==
+    MDBmZThjYTNiODg4MDQ1N2EwZTQxYTQ4ODg3MTJiMjliODM3MmVhNA==
 SHA512:
   metadata.gz: !binary |-
-    YzI2NzAwZGQwOWRhYjZiMjZkZTA4MDAxOGYzYTYzZmU4OWRkYjZlYzQzOTll
-    NzQzMWU2MzA2NTdlNzY2NzQ3ZmIwZGE5NmNiZjRlMGMwYzRkZTY1OWRiYmI1
-    OTZjYjdhN2ZhMWU2ZTA0NDg3ZDUzZDM5ZTFjMzU4NDQ4MjIxYzY=
+    Yjg3ZmM2NTFkNDcwYzQ5YWQ3ZTFhMmFhNWU0NjcwZGY5ZjRjZmYxM2U4YmJj
+    YzRmYjYwZjQ1OWIzOTBlYjUyOWZhYTJiOTQxMTQyZTkzOGZmN2JkNGYwN2Uz
+    ODJiMjllNTEzNTllZTEwNjNkOTZmMDFlZDA2NWY3YzQyZDRmMTk=
   data.tar.gz: !binary |-
-    ZWRiMDIzYTkwYzUyMjZjNGY4MjY5YjE2Yjk2NmRhMWNlZGQ2MTg2MzM3OGRj
-    OTUwMTViYjI3MGM1YzIwYTdiZDU3Y2VkNTFkMjllMjkyODAyOWYwNDkxODkz
-    ZWJjNzU4ZDZjYzkwM2ZiNzliZDg4ZWI4OTkxNjgzZjJlZGM5NjY=
+    MmEyMDQzZDc0MjQ0YWM0NWYzMWI2NGZkYWVlMjE5M2ZmMjUyZGRiMmZhZDQy
+    MTExZTdiYmVlMjExOGNhN2M4YmQ0Y2NlYzUyMWNlODcyYjZkMmYzYTY3ZjRh
+    NDgxYWFjOWFjYmE4YWU5ZGZiMTZiZjE1YTNkZjMxMDA1NWJiMDM=

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

data/app/models/caboose/category.rb

@@ -13,8 +13,8 @@ module Caboose
     has_many :products, :through => :category_memberships, :order => 'title'
     has_many :category_memberships
     
-    has_attached_file :image,      
-      :path => 'categories/:id_:style.:extension',      
+    has_attached_file :image,    
+      :url => ':cdn_domain/categories/:id_:style.:extension',      
       :default_url => 'http://placehold.it/300x300',
       :s3_protocol => :https,
       :styles => {

data/lib/caboose.rb

@@ -121,3 +121,12 @@ module Caboose
   @@from_address = ''
   
 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] : '' 
+end

data/lib/caboose/version.rb

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

metadata

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