caboose-cms 0.6.15 → 0.6.16

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzY2MjdlZGYxZmY2MGE1ZDYxOTVhODYzMGU1ZjgxNzg3ZTg2NjU1Nw==
+    YjI1YjFlNmY3MmZkYWIzMTJlNGFmZjVhZjJjMDk5OTE0ZjUyMWI0YQ==
   data.tar.gz: !binary |-
-    YzMwNjdkYjczNjcxOTVkMDFiMjAxMDYyMDUyZDE2N2Y4OWUxNTVmYw==
+    MTQyNjIxZTRlZWQ0MTFiOTJkYjU0MDZmZGZhMzYxNmJhNWFiZDM1NQ==
 SHA512:
   metadata.gz: !binary |-
-    Yzk1MjBmYjJlN2NjZjNlYWFiYjFmMTkxYzllOGEzYjkwODdiNTU2MjZlNjM2
-    OTNhZTg3MjdhZjk0YTliMzEwOTk5NjQ2MzRhNmI5MjY0ZDRhZjMwM2U2ZTFm
-    YzBmNTJhNjg0YzBmODFkZjdkNjg5MDk5M2NkYjFmZTQ0NDM0OWU=
+    ZGZhNTk2ZmM1YWNjZmRiNjhjYTIzMjUyNDFkNWFiODcxZjU4YTNmOGJiNTdm
+    OGJmZmIzMzllOWZiZGNkYmRmZmQ1NWM4OGFhZTNiN2EzNTFiOGM4OWY0Nzcw
+    Y2NiNmMyZjM4NzVhZDZiNThjMjM1MDg3ZTM1MTJhZGM2MGViZmM=
   data.tar.gz: !binary |-
-    YTQ4YmQwY2E5YzcxNmE5OWI0ZWEwODU1NDFiNTRkMTQ2MzJlMzc2N2MwYzk3
-    MDAxMDIzMTcwMTZhMGExNzJjMWIyZThmYTc4Y2ZlZGQ2NDAyZTBiNGIxOTc5
-    M2Y1NTUwYTcxOTRhYWEwYjkwMTliNWRiZDQ5MTlhMjY3Nzg2YzI=
+    OWQyZDRlMGU4ZTJlNTM5NGQ0YjRkZWZiM2ZhZTIzNzE1MTQwODgyMzNjYmNh
+    MzgzNGNkN2YwNThmNDVlNTMwMTI5ZDVhMDQyYTllZjU5YWZhYWU1NzU1Yjc5
+    YjdlMDVhMzc0NjhjNDJmM2EyZTk4ZGVjMzE5MzNiZWNmYzY5OGQ=

data/app/controllers/caboose/#Untitled-1#

@@ -1,2 +1,3 @@
 
 
+if arr['dog'] && arr['dog']['name'] && arr['dog']['name']['first_name']

data/app/models/caboose/media.rb

@@ -37,13 +37,11 @@ class Caboose::Media < ActiveRecord::Base
     
     config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]
     bucket = config['bucket']
+    bucket = Caboose::uploads_bucket && Caboose::uploads_bucket.strip.length > 0 ? Caboose::uploads_bucket : "#{bucket}-uploads"
         
-    key = "#{self.media_category_id}_#{self.original_name}"
-    Caboose.log("key before encoding: #{key}")
-    key = URI.encode(key.gsub(' ', '+'))
-    Caboose.log("key after encoding: #{key}")
-    uri = "http://#{bucket}-uploads.s3.amazonaws.com/#{key}"
-    Caboose.log("uri: #{uri}")
+    key = "#{self.media_category_id}_#{self.original_name}"    
+    key = URI.encode(key.gsub(' ', '+'))    
+    uri = "http://#{bucket}.s3.amazonaws.com/#{key}"    
     
     image_extensions = ['.jpg', '.jpeg', '.gif', '.png', '.tif']
     ext = File.extname(key).downcase
@@ -64,7 +62,7 @@ class Caboose::Media < ActiveRecord::Base
     #end
            
     # Remove the temp file            
-    bucket = AWS::S3::Bucket.new("#{bucket}-uploads")
+    bucket = AWS::S3::Bucket.new(bucket)
     obj = bucket.objects[key]
     obj.delete
          

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.6.15'
+  VERSION = '0.6.16'
 end

metadata

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