caboose-cms 0.3.89 → 0.3.90

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmYwNzdhZTIzMjlhMzhjMzg0MGZlNTMwODk2M2RkNjc1NDg3MTM4Nw==
+    ZTUzNGI0MTc3Mzc3Njg0ZGMyZWRmNDM1OThjOTU4YTUwMWIxZjMyOQ==
   data.tar.gz: !binary |-
-    MzZmMTAxMWUyZjA2YWVmNGE5MTNlYTEyMzI0NjJhOTdjNmFlMmYxZQ==
+    NmJlMDY1NDE5OTg1YzlmZjRmYmJkNmFmODE2ZGQ4MDczOGRlODM3Mw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Zjk2ZTY3MTFjYmRkZTM4MTg2N2Q3YTk0NWFlY2FjYWY4YWZjMGQ3MzRkMDM5
-    NzdiZWM3YjJlYWY4OGFkMTk5MTFiMDM0ZDY4ZWM0NDIxOWEwY2YzM2NjOTIx
-    OTQ2ZjIxYmJmN2U5M2NlZjYzYzcyYjRmZWViODRmN2VmZGQ5MWY=
+    NzdiYmNlNDFhZTg2YWE2NTFhNDlmMzA0YjhmZGE0MTI0ZjVhNTBjMTU3NzY5
+    N2UyNWUxNDU1MGE1ZDViMTJkNTIyODFkNjU1ZWM2MTY3Y2RmOGZhMzAxMGVi
+    NjJlMzAyNTkyMDg5OTU0MGYyNjg1N2FmNTJhMjRlMzYyOTg5ODg=
   data.tar.gz: !binary |-
-    MTY3NGU0M2U2Yzc4MDc3YTkzMjk2YjY3ZjdkNDE0Y2FlODJiZWQ3MzgxYjFi
-    NDk0M2U5ZTA1YzczMjdiNzhkYThjZDUwNzhlZmFiMjg1NTQ3ZmFkMWY1N2Fh
-    OTk4MTJkNzAwZDc0MDhkOGFjZjNhMWQ4NzhiNWQzNGMxM2M5Yzg=
+    ZGJjZGI5MmIzOWZlODAzOTAwODQ3M2JmNDNkMzY3ZjRmNTEzMDBmODE0ZjYw
+    N2YyN2RmYTY2YjU4YTA1MDMyMzNhZDUyZDA4NWIxYThkNjdhODE2NmU1Yjgz
+    ZTg0MzYyMTgzODM5NGRjYTdhZTYyZWIwMzcwYWYwMTRiMjI0YzA=

data/app/assets/javascripts/caboose/model/all.js

@@ -1,11 +1,13 @@
 //= require caboose/model/class
 //= require caboose/model/model
+//= require caboose/model/s3
 //= require caboose/model/attribute
 //= require caboose/model/model_binder
 //= require caboose/model/bound_control
 //= require caboose/model/bound_checkbox
 //= require caboose/model/bound_checkbox_multiple
 //= require caboose/model/bound_image
+//= require caboose/model/bound_s3_image
 //= require caboose/model/bound_file
 //= require caboose/model/bound_select
 //= require caboose/model/bound_text

data/app/assets/javascripts/caboose/model/bound_s3_image.js

@@ -1,3 +1,33 @@
+/*
+{
+  "expiration": "2007-12-01T12:00:00.000Z",
+  "conditions": [
+    {"bucket": "johnsmith"},
+    ["starts-with", "$key", "user/eric/"],
+    {"acl": "public-read"},
+    {"success_action_redirect": "http://johnsmith.s3.amazonaws.com/successful_upload.html"},
+    ["starts-with", "$Content-Type", "image/"],
+    {"x-amz-meta-uuid": "14365123651274"},
+    ["starts-with", "$x-amz-meta-tag", ""]
+  ]
+}
+key = '1234'
+signature = 'abcdef'
+return Base64.encode64(OpenSSL::HMAC.digest('sha1', key, signature))
+
+<form action="http://johnsmith.s3.amazonaws.com/" method="post" enctype="multipart/form-data">
+<input type="hidden" name="AWSAccessKeyId"          value="AKIAIOSFODNN7EXAMPLE" />
+<input type="hidden" name="acl"                     value="public-read" />
+<input type="hidden" name="policy"                  value="POLICY" />
+<input type="hidden" name="Signature"               value="SIGNATURE" />
+<input type="hidden" name="success_action_status"   value="200" />
+<input type="hidden" name="key"                     value="uploads/1.jpg" />
+
+File:          <input type="file" name="file"                               /><br />
+
+<input type="submit" name="submit" value="Upload to Amazon S3" />
+</form>
+*/
 
 BoundS3Image = BoundControl.extend({
 
@@ -34,21 +64,33 @@ BoundS3Image = BoundControl.extend({
       .css('margin-right', 10)
     );    
     
-
+    var s3 = this.attribute.s3;
     $('#'+this.el+'_container')
       .append($('<form target="' + this.el + '_iframe"></form>')
         .attr('id', this.el + '_form')
-        .attr('action', this.attribute.update_url)
+        .attr('action', 'http://' + this.attribute.s3.bucket + '.s3.amazonaws.com/')
         .attr('method', 'post')
         .attr('enctype', 'multipart/form-data')
-        .attr('encoding', 'multipart/form-data')
-        //.attr('target', this.el + '_iframe')
+        .attr('encoding', 'multipart/form-data')        
         .on('submit', function() {           
            $('#'+this2.el+'_message').html("<p class='loading'>Uploading...</p>");
-           $('#'+this2.el+'_iframe').on('load', function() { this2.post_upload(); });
+           $('#'+this2.el+'_iframe').on('load', function() {
+             $.ajax({
+               url: this2.attribute.update_url,
+               type: 'post',
+               success: function(resp) {
+                 this2.post_upload();
+               }
+             });             
+           });
            return true;
         })
-        .append($('<input/>').attr('type', 'hidden').attr('name', 'authenticity_token').val(this.binder.authenticity_token))        
+        .append($('<input/>').attr('type','hidden').attr('name', "AWSAccessKeyId"        ).val(s3.access_key_id))
+        .append($('<input/>').attr('type','hidden').attr('name', "acl"                   ).val(s3.acl))
+        .append($('<input/>').attr('type','hidden').attr('name', "policy"                ).val(s3.policy))
+        .append($('<input/>').attr('type','hidden').attr('name', "Signature"             ).val(s3.signature))
+        .append($('<input/>').attr('type','hidden').attr('name', "success_action_status" ).val("200"))
+        .append($('<input/>').attr('type','hidden').attr('name', "key"                   ).val(s3.key))                
         .append($('<div/>')
           .attr('id', this.el + '_fake_file_input')
           .addClass('mb_fake_file_input')          
@@ -61,7 +103,7 @@ BoundS3Image = BoundControl.extend({
           .append($('<input/>')
             .attr('type', 'file')
             .attr('id', this.el + '_file')
-            .attr('name', this.attribute.name)            
+            .attr('name', 'file')            
             .change(function() { $('#'+this2.el+'_form').trigger('submit'); })
           )
           .append($('<input/>')

data/app/assets/javascripts/caboose/model/s3.js

@@ -4,26 +4,11 @@ var S3 = function(params) {
     this[thing] = params[thing];    
 };
 
-S3.prototype = {    
-  access_key_id: '',
-  secret_access_key: '',
-    
+S3.prototype = {
+  bucket: '',
+  access_key_id: '',      
   acl: 'public-read',
-  key: '',
   policy: '',
   signature: '',
-  redirect: ''
-      
-  access_key_id: '', // AWSAccessKeyId	
-  acl: 'public-read',
-  bucket: '',	
-  key: '',
-  policy: '',
-  redirect: '', // success_action_redirect	
-  signature: '',
-  security_token: '', // x-amz-security-token
-  file	
-
+  key: ''
 };
-
-

data/app/controllers/caboose/application_controller.rb

@@ -12,6 +12,12 @@ module Caboose
       # Modify the built-in params array with URL params if necessary
       parse_url_params if Caboose.use_url_params
       
+      # Make sure someone is logged in
+      if !logged_in?      
+        elo = User.find(User::LOGGED_OUT_USER_ID)        
+        login_user(elo)
+      end
+      
       session['use_redirect_urls'] = true if session['use_redirect_urls'].nil?
       
       # Initialize AB Testing
@@ -76,7 +82,7 @@ module Caboose
     def logged_in?
       validate_token
       validate_cookie
-      return true if !session["app_user"].nil? && session["app_user"] != false && session["app_user"].id != -1    
+      return true if !session["app_user"].nil? && session["app_user"] != false && session["app_user"].id != -1 && session["app_user"].id != User::LOGGED_OUT_USER_ID     
       return false
     end
     

data/app/controllers/caboose/pages_controller.rb

@@ -19,9 +19,9 @@ module Caboose
         return
       end
 
-      user = logged_in_user
+      user = logged_in_user      
       if !user.is_allowed(page, 'view')
-        if user.id == User.logged_out_user_id	
+        if user.id == User::LOGGED_OUT_USER_ID	
           redirect_to "/modal/login?return_url=" + URI.encode(request.fullpath)		  		
           return
         else

data/app/models/caboose/schema.rb

@@ -229,7 +229,11 @@ class Caboose::Schema < Caboose::Utilities::Schema
       admin_user.password = Digest::SHA1.hexdigest(Caboose::salt + 'caboose')
       admin_user.save
     end
-    admin_user = Caboose::User.where(:username => 'admin').first if admin_user.nil?
+    admin_user = Caboose::User.where(:username => 'admin').first if admin_user.nil?    
+    
+    if !Caboose::User.where(:id => Caboose::User::LOGGED_OUT_USER_ID).exists?
+      Caboose::User.create(:id => Caboose::User::LOGGED_OUT_USER_ID, :first_name => 'Logged', :last_name => 'Out', :username => 'elo', :email => 'elo@nine.is')            
+    end    
     
     Caboose::Role.create(:parent_id => -1           , :name => 'Admin'               ) if !Caboose::Role.exists?(:name =>  'Admin'               )
     admin_role  = Caboose::Role.where(:name => 'Admin'               ).first

data/app/models/caboose/user.rb

@@ -12,8 +12,11 @@ class Caboose::User < ActiveRecord::Base
       :large => '600x800>'
     }
   do_not_validate_attachment_file_type :image
-  attr_accessible :email, :first_name, :last_name, :username, :token, :password, :phone
-
+  attr_accessible :id, :email, :first_name, :last_name, :username, :token, :password, :phone
+  
+  ADMIN_USER_ID = 1
+  LOGGED_OUT_USER_ID = 2
+  
   before_save do
     self.email = self.email.downcase if self.email
   end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.89'
+  VERSION = '0.3.90'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.89
+  version: 0.3.90
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails