caboose-cms 0.5.27 → 0.5.28

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTM0ZGMzOWNmNTk0ODliNzZlZWFmOTJmYWEzZDc4MDE0ZDNkNDQ3Nw==
+    ZjgwMGEzMGQ2YTFmZWI2OWUzZGQ0NzZlY2MyOTllNjk4MmQ1ZDg0Mg==
   data.tar.gz: !binary |-
-    ODk3M2ViYjFkOWE1NjQ5YmM1YjkzN2Q1MTUzYWM4MWFkMTE1MGEzZA==
+    N2Q4ZTJhZGQ2NjJjZWFmZjY3NjI3ZTI5MWEwZmY4N2Y2Zjg5MGM3Yw==
 SHA512:
   metadata.gz: !binary |-
-    NWEwNDc0YjhjMTc4Y2YxMGU0NjdiNjAzZDk2ZTk0YjUxOWE4MzVhZGJjZmEw
-    Y2NlNDlhM2JlZWY0NTk4MjIwMTM3NDg3ODkyMGRmZGM2NDQwMGE5Y2YyZDEx
-    ZWE1OThlYjdjNzZkNjI0YmFhZGJiODhiMzJjZDViOGU4YzcwMmY=
+    NzQxZjliY2RlMGNkNzA5NWY5NmRjNjE5MjRlNDVkZDM5YWQ1ODVmNTEyNjcz
+    NTdmNWE5MGE1ODk5N2M5NTUxZjY3YzE5ZGZhMTJjMTk4NzBkOTAwMTVhYzk4
+    YTQ3MDAxNmM3NzJiYWVkMTg3ZWQ5ZTk3NzIwZjZmMWIzNjAyZGE=
   data.tar.gz: !binary |-
-    OThhOTc2NzQ0MjU0NmIxMjVkMzMzZDM3NmJkMWUwM2UwZTJkMGZlYjA2YjMz
-    YWE3NjYyN2EyZWI0MjYzMzIxMDQyN2IyOWU2OGJmZDRiODgzODAwNmJkYzYz
-    MTExOTZlNzM0YTc3MGFmOTVmNGM5MzUxYTczMzhiZTk3NzNkYWM=
+    NzdhZGFkZmNmYWZkZjJjY2VlMGViNjUwZDE3MTdmYzEyNzE3NWFiNmMwY2Uw
+    NDM1Yzc0N2JlZGE5YWQxYzlmYmQ5YmQyMjJlMDk3Y2IzYWEzNDI1MjVmY2Q4
+    MTQ0ZTU4YzgwMDIzMDE4OWM1YTE4NzM2Yjk3Y2EzY2RkZWYwZjU=

data/lib/caboose.rb

@@ -125,10 +125,15 @@ end
 # These are used so that both local filestorage and S3 can work without having to change paperclip paths in models
 Paperclip.interpolates :path_prefix do |attachment, style|  
   return "#{Rails.root}/public/" if Caboose::cdn_domain.nil? || Caboose::cdn_domain == '/'
-  return ''   
+  return ''
 end
 
 Paperclip.interpolates :model_url do |attachment, style|
-  return "/#{attachment.path}" if Caboose::cdn_domain.nil? || Caboose::cdn_domain == '/'      
+  # Local file storeage
+  if Caboose::cdn_domain.nil? || Caboose::cdn_domain == '/'
+    p = attachment.path.gsub("#{Rails.root}/public/", '')
+    return "/#{p}"
+  end  
+  # Otherwise S3
   return "#{Caboose::cdn_domain}/#{attachment.path}"
 end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.27'
+  VERSION = '0.5.28'
 end

metadata

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