caboose-cms 0.7.14 → 0.7.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc63e0f94ea800ace427a96010732e9d08a5d233
-  data.tar.gz: 801499e59836aa02693aa29580c2752d43d0c3b1
+  metadata.gz: d3bc91a68ac489055a20331a782782326c88372c
+  data.tar.gz: 77c3b560746c55e2041fc8fdc582f467f59df528
 SHA512:
-  metadata.gz: 018e8cc00963a46b964e6fdc584cda66159d37abe8f0364ecef6a4b2b7105b6efc2aabf0645d3b63d682d741c3378c85ea456bd1fef45eaefec985955543e911
-  data.tar.gz: 3de04440df1c8697f81f590c6447b25e11b6175e1172fab2ae75a7f331f53963658cbdcf420eaed247d92be14bfdcbb06267ee062a01275ecc021f56b055592a
+  metadata.gz: 313817ce1e2ef39a0a17e1fb8bbeed8e6d01e8b7b0bd9da1c5ef4f714a7be5f04b8690ccc7707e4460d9bdb05db2447580323fbe20e43b8b36681327863b1531
+  data.tar.gz: 5e837e9d369992d23e50abfe29060c18a6aee1c0c7d3b85471a69653857ae29d392efc86e2e977d5a915e5b1e06ce8fcbc25d6a8ca9581390008c425a0eb1c45

data/app/controllers/caboose/my_account_line_items_controller.rb

@@ -43,8 +43,12 @@ module Caboose
       end
       
       # Generate the download URL and redirect to it
-      sc = @site.store_config
-      config = YAML.load_file("#{::Rails.root}/config/aws.yml")        
+      sc = @site.store_config              
+      config = YAML.load_file("#{::Rails.root}/config/aws.yml")
+      AWS.config({ 
+        :access_key_id => config[Rails.env]['access_key_id'],
+        :secret_access_key => config[Rails.env]['secret_access_key']  
+      })          
       bucket = AWS::S3::Bucket.new(config[Rails.env]['bucket'])
       s3object = AWS::S3::S3Object.new(bucket, li.variant.download_path)
       url = s3object.url_for(:read, :expires => sc.download_url_expires_in.to_i.minutes).to_s

data/app/controllers/caboose/variants_controller.rb

@@ -96,7 +96,11 @@ module Caboose
       if !v.downloadable
         resp.error = "This variant is not downloadable."
       else
-        config = YAML.load_file("#{::Rails.root}/config/aws.yml")        
+        config = YAML.load_file("#{::Rails.root}/config/aws.yml")
+        AWS.config({ 
+          :access_key_id => config[Rails.env]['access_key_id'],
+          :secret_access_key => config[Rails.env]['secret_access_key']  
+        })        
         bucket = AWS::S3::Bucket.new(config[Rails.env]['bucket'])
         s3object = AWS::S3::S3Object.new(bucket, v.download_path)
         resp.url = s3object.url_for(:read, :expires => expires_in.minutes).to_s

data/app/models/caboose/media.rb

@@ -35,7 +35,11 @@ class Caboose::Media < ActiveRecord::Base
   def process
     #return if self.processed
     
-    config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]
+    config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]    
+    AWS.config({ 
+      :access_key_id => config['access_key_id'],
+      :secret_access_key => config['secret_access_key']  
+    })
     bucket = config['bucket']
     bucket = Caboose::uploads_bucket && Caboose::uploads_bucket.strip.length > 0 ? Caboose::uploads_bucket : "#{bucket}-uploads"
         

data/app/views/caboose/pages/admin_edit_content.html.erb

@@ -63,7 +63,7 @@ $(document).ready(function() {
   $('body').append($('<div/>')        
     .attr('id', 'tiny_header')
     .append($('<a/>').attr('href', '/admin/pages').html("< Back"))
-    .append($('<a/>').attr('href', '#').html('Custom Fields').click(function(e) { e.preventDefault(); caboose_modal_url('/admin/pages/<%= @page.id %>/custom-fields'); }))
+    .append($('<a/>').attr('href', '#').html('Page Options').click(function(e) { e.preventDefault(); caboose_modal_url('/admin/pages/<%= @page.id %>/custom-fields'); }))
     .append($('<a/>').attr('href', '/admin/pages/<%= @page.id %>/layout').html("Layout"))
     .append($('<a/>').attr('href', '/admin/pages/<%= @page.id %>').html("Settings"))    
   );    

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.14'
+  VERSION = '0.7.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.14
+  version: 0.7.15
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-22 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg