caboose-cms 0.4.49 → 0.4.50

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2Y4YWZhODBhMmEyYmJjYmI4MDJjZjBmMWNlYmQ2NTk0ODA3NTU2Mg==
+    NjVkMTFlNjhiNDVlM2QxY2U5NDI1OGFlMjdiOTZlNTBiNzkxOTEzMA==
   data.tar.gz: !binary |-
-    ZWE0N2ZlM2JjZDJhNDA3ZWIxNzhmMGJkYzQ0YzYwOTYyNDFhMWNjZA==
+    YmI5ODI3ZGRjZDhjMGVhZjA5MjE3YzgyNzNkY2JjZTBlMjA0ZGZiOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTQwODIyMDA4ZTE4YzY1ZjgyYmFkNGYyOTcyM2YwMTM0NjZjOGQ2YWI1YmIx
-    MjE4NjUyMzcyMDQyMGIyMzFiYzkzMDkyNzlhM2UxZTYwNGYyZTU5ZjcxMDU5
-    MWI1MTc3OTFmMzM1MjU4ODUyOGI2MzlhNmQ4MGU3MGMzZmVmYzk=
+    N2I4Y2Q0NzcwZjQxOWNiYzU3MDVhNmViOGNiNDFkZTg4N2RiZDQ2ZGZkOTBl
+    ZGMzY2QwM2I5ZTNhY2RhN2ZiMzcwMmYxOTFjYjYxMTk4NTVkNGMxZDdmMzc2
+    ODVkNmVmZWE4YzgxMTA0ZmMyNTMyOTM0NThiMTUzZTU4MDJhNmQ=
   data.tar.gz: !binary |-
-    ZTdjMTE3Y2E5YjM3Njk2MWI2M2U3ZmRjMjRjNjJlZmE3MzJiNDRhMWYyNDgz
-    ZjIzOWQ5ZGFkOGI3OGQ0MmZiOTc0ZmNjMjExZjRiZGY1ZDQwYjA0NjNkMTVi
-    N2VjNTExYTI3NzQxODcwNWIwZWZhYmYwZjViNGVjNTI5ZTU5OTA=
+    ODU1OGE5OGZjN2M5YjFiMDU5YjdhMTQwM2EwYzZkNmQ5NDgzZmRhNDY2MWQ4
+    MDg1NzBjOTg2MWRlNzEyNTJlOTczZDk3ZDgyZGY1YzZmZGYwYjYxYWE1MDhi
+    ZTUwZmNmYWVhMDA1NDFlM2U4ZmM3YTkwZGU1OGUzOGRjMjYxZmY=

data/app/assets/javascripts/caboose/jquery.iframe-transport.js

@@ -0,0 +1 @@
+(function(a,b){a.ajaxPrefilter(function(d,c,e){if(d.iframe){d.originalURL=d.url;return"iframe"}});a.ajaxTransport("iframe",function(l,j,k){var f=null,i=null,e="iframe-"+a.now(),d=a(l.files).filter(":file:enabled"),h=null,c=null;function g(){d.each(function(o,n){var m=a(n);m.data("clone").replaceWith(m)});f.remove();i.one("load",function(){i.remove()});i.attr("src","javascript:false;")}l.dataTypes.shift();l.data=j.data;if(d.length){f=a("<form enctype='multipart/form-data' method='post'></form>").hide().attr({action:l.originalURL,target:e});if(typeof(l.data)==="string"&&l.data.length>0){a.error("data must not be serialized")}a.each(l.data||{},function(m,n){if(a.isPlainObject(n)){m=n.name;n=n.value}a("<input type='hidden' />").attr({name:m,value:n}).appendTo(f)});a("<input type='hidden' value='IFrame' name='X-Requested-With' />").appendTo(f);if(l.dataTypes[0]&&l.accepts[l.dataTypes[0]]){c=l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", */*; q=0.01":"")}else{c=l.accepts["*"]}a("<input type='hidden' name='X-HTTP-Accept'>").attr("value",c).appendTo(f);h=d.after(function(m){var o=a(this),n=o.clone().prop("disabled",true);o.data("clone",n);return n}).next();d.appendTo(f);return{send:function(n,m){i=a("<iframe src='javascript:false;' name='"+e+"' id='"+e+"' style='display:none'></iframe>");i.one("load",function(){i.one("load",function(){var u=this.contentWindow?this.contentWindow.document:(this.contentDocument?this.contentDocument:this.document),q=u.documentElement?u.documentElement:u.body,p=q.getElementsByTagName("textarea")[0],r=p&&p.getAttribute("data-type")||null,o=p&&p.getAttribute("data-status")||200,t=p&&p.getAttribute("data-statusText")||"OK",s={html:q.innerHTML,text:r?p.value:q?(q.textContent||q.innerText):null};g();m(o,t,s,r?("Content-Type: "+r):null)});f[0].submit()});a("body").append(f,i)},abort:function(){if(i!==null){i.unbind("load").attr("src","javascript:false;");g()}}}}})})(jQuery);

data/app/controllers/caboose/images_controller.rb

@@ -19,8 +19,7 @@ module Caboose
     # GET /admin/images/new
     def admin_new
       return unless user_is_allowed('images', 'add')
-      @parent_id = params[:parent_id] ? params[:parent_id] : 1
-      @parent = Page.find(@parent_id)
+      @media_category_id = params[:media_category_id]             
       render :layout => 'caboose/admin'
     end
     
@@ -217,52 +216,98 @@ module Caboose
       render json: resp
     end       
     
-    # PUT /admin/images/sign-s3
+    ## PUT /admin/images/sign-s3
+    #def admin_sign_s3
+    #  return unless user_is_allowed('images', 'add')
+    #        
+    #  config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]      
+    #  access_key = config['access_key_id']
+    #  secret_key = config['secret_access_key']
+    #  bucket     = config['bucket']
+    #  s3 = AWS::S3.new(
+    #    :access_key_id => access_key,
+    #    :secret_access_key => secret_key
+    #  )
+    #  
+    #  name = params[:name]      
+    #  mi = MediaImage.create(
+    #    :media_category_id => params[:media_category_id], 
+    #    :name => params[:name]
+    #  )      
+    #  pp = s3.buckets[bucket].presigned_post(              
+    #    :key => "media-images/test.jpg", #{mi.id}.#{File.extname(name)}",
+    #    :expires => DateTime.now + 10.seconds,
+    #    :success_action_status => 201, 
+    #    :acl => :public_read
+    #  )
+    #  
+    #  render :json => {
+    #    'media_image' => mi,
+    #    'presigned_post' => {
+    #      'url' => pp.url.to_s,
+    #      'fields' => pp.fields
+    #    }
+    #  }
+    #  
+    #  #expires = (DateTime.now.utc + 10.seconds).to_i
+    #  #amz_headers = "x-amz-acl:public-read"      
+    #  #put_request = "PUT\n\n#{mime_type}\n#{expires}\n#{amz_headers}\n/#{bucket}/media-images/#{object_name}"
+    #  #signature = CGI.escape(Base64.encode64("#{OpenSSL::HMAC.digest('sha1', secret_key, put_request)}\n"))      
+    #  ##signature = base64.encodestring(hmac.new(secret_key, put_request, sha1).digest())
+    #  ##signature = urllib.quote_plus(signature.strip())
+    #  #render :json => {
+    #  #  'signed_request' => "#{url}?AWSAccessKeyId=#{access_key}&Expires=#{expires}&Signature=#{signature}",
+    #  #  'url' => url
+    #  #}
+    #
+    #  #pp = AWS::S3::PresignedPost.new(s3.buckets[bucket], 
+    #  #  :key => "media-images/#{object_name}",
+    #  #  :expires => DateTime.now + 10.seconds,
+    #  #  :content_type => mime_type
+    #  #)            
+    #  #url = "#{pp.url.to_s}#{pp.key}" #"https://#{pp.bucket.name}.s3.amazonaws.com/#{pp.key}"
+    #  #render :json => {
+    #  #  'signed_request' => "#{url}?AWSAccessKeyId=#{access_key}&Expires=#{pp.expires.to_time.to_i}&Signature=#{pp.fields[:signature]}",
+    #  #  'url' => url
+    #  #}                              
+    #  
+    #end
+         
     def admin_sign_s3
-      return unless user_is_allowed('images', 'add')
-            
-      config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]
-      Caboose.log(config)
-      access_key = config['access_key_id']
-      secret_key = config['secret_access_key']
-      bucket     = config['bucket']
-      s3 = AWS::S3.new(
-        :access_key_id => access_key,
-        :secret_access_key => secret_key
-      )
+      @document = Document.create(params[:doc])
       
-      object_name = params[:s3_object_name]
-      mime_type   = params[:s3_object_type]      
+      policy = {"expiration" => 10.seconds.from_now.utc.xmlschema,
+        "conditions" =>  [
+          {"bucket" => 'cabooseit'},           
+          {"acl" => "public-read"},
+          {"success_action_status" => "200"}          
+        ]
+      }
+      policy = Base64.encode64(policy.to_json).gsub(/\n/,'')
       
-      #expires = (DateTime.now.utc + 10.seconds).to_i
-      #amz_headers = "x-amz-acl:public-read"      
-      #put_request = "PUT\n\n#{mime_type}\n#{expires}\n#{amz_headers}\n/#{bucket}/media-images/#{object_name}"
-      #signature = CGI.escape(Base64.encode64("#{OpenSSL::HMAC.digest('sha1', secret_key, put_request)}\n"))      
-      ##signature = base64.encodestring(hmac.new(secret_key, put_request, sha1).digest())
-      ##signature = urllib.quote_plus(signature.strip())
-      #render :json => {
-      #  'signed_request' => "#{url}?AWSAccessKeyId=#{access_key}&Expires=#{expires}&Signature=#{signature}",
-      #  'url' => url
-      #}
-
-      pp = AWS::S3::PresignedPost.new(s3.buckets[bucket], 
-        :key => "media-images/#{object_name}",
-        :expires => DateTime.now + 10.seconds,
-        :content_type => mime_type
-      )            
-      url = "#{pp.url.to_s}#{pp.key}" #"https://#{pp.bucket.name}.s3.amazonaws.com/#{pp.key}"
       render :json => {
-        'signed_request' => "#{url}?AWSAccessKeyId=#{access_key}&Expires=#{pp.expires.to_time.to_i}&Signature=#{pp.fields[:signature]}",
-        'url' => url
+        :policy => policy, 
+        :signature => s3_upload_signature, 
+        :key => @document.s3_key, 
+        :success_action_redirect => document_upload_success_document_url(@document)
       }
-      
-      @s3_direct_post = S3_BUCKET.presigned_post(
-        :key => "uploads/#{SecureRandom.uuid}/${filename}", 
-        :success_action_status => 201, 
-        :acl => :public_read
-      )
-            
-      
+    end
+     
+    def s3_upload_policy_document      
+      ret = {"expiration" => 10.seconds.from_now.utc.xmlschema,
+        "conditions" =>  [
+          {"bucket" => 'cabooseit'},           
+          {"acl" => "public-read"},
+          {"success_action_status" => "200"}          
+        ]
+      }
+      return Base64.encode64(ret.to_json).gsub(/\n/,'')
+    end
+    
+    # sign our request by Base64 encoding the policy document.
+    def s3_upload_signature
+      signature = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'), 
+        YOUR_SECRET_KEY, s3_upload_policy_document)).gsub("\n","")
     end
 		
   end

data/app/models/caboose/page.rb

@@ -73,7 +73,7 @@ class Caboose::Page < ActiveRecord::Base
     uri.chop! if uri.end_with?('/')
     uri[0] = '' if uri.starts_with?('/')
       
-    return self.index_page if uri.length == 0
+    return self.index_page(host_with_port) if uri.length == 0
 
     page = false
     parts = uri.split('/')

data/app/views/caboose/images/admin_new.html.erb

@@ -1,9 +1,10 @@
 
 <h1>Upload Images</h1>
 
-<input type="file" id="file" onchange="s3_upload();"/>
-<p id="status">Please select a file</p>
-<div id="preview"><img src="/static/default.png"  /></div>
+<form action='https://cabooseit.s3.amazonaws.com' method='post' id='new_image_form' enctype='multipart/form-data'>    
+  <input type="file" name="new_image" id="new_image" />  
+  <div class='#progress'><div class='#bar'></div></div>  
+<form>
 
 <% content_for :caboose_css do %>
 <style type='text/css'>
@@ -14,49 +15,47 @@
 
 <% content_for :caboose_js do %>
 <%= javascript_include_tag 'jquery.ui.all' %>
+<%= javascript_include_tag 'caboose/jquery.iframe-transport.js' %>
 <%= javascript_include_tag 'caboose/jquery.fileupload.js' %>
 <script type='text/javascript'>
 
-$(function() {
-  $('.directUpload').find("input:file").each(function(i, elem) {
-  
-    var fileInput    = $(elem);
-    var form         = $(fileInput.parents('form:first'));
-    var submitButton = form.find('input[type="submit"]');
-    var progressBar  = $("<div class='bar'></div>");
-    var barContainer = $("<div class='progress'></div>").append(progressBar);
+$(document).ready(function() {
+  $('#new_image').fileupload({
+    forceIframeTransport: true,
+    autoUpload: true,
     
-    fileInput.after(barContainer);
-    fileInput.fileupload({
-      fileInput:       fileInput,
-      url:             '', // @s3_direct_post.url
-      type:            'POST',
-      autoUpload:       true,
-      formData:         '', // @s3_direct_post.fields.to_json.html_safe
-      paramName:        'file', // S3 does not like nested name fields i.e. name="user[avatar_url]"
-      dataType:         'XML',  // S3 returns XML if success_action_status is set to 201
-      replaceFileInput: false,
-      fileuploadsubmit: function() {
-        alert('Testing');
-      },
-      progressall: function (e, data) {
-        var progress = parseInt(data.loaded / data.total * 100, 10);
-        progressBar.css('width', progress + '%')
-      },
-      start: function (e) {
-        submitButton.prop('disabled', true);
-        progressBar.css('background', 'green').css('display', 'block').css('width', '0%').text("Loading...");
-      },
-      done: function(e, data) {
-        submitButton.prop('disabled', false);
-        progressBar.text("Uploading done");        
-      },
-      fail: function(e, data) {
-        submitButton.prop('disabled', false);
-        progressBar.css("background", "red").text("Failed");
-      }
-    });
-  });
+    //fileInput: $('#new_image'),
+    //url: pp.url,
+    type: 'POST',    
+    //formData: pp.fields,
+    //paramName: 'file', // S3 does not like nested name fields i.e. name="user[avatar_url]"
+    //dataType: 'XML',  // S3 returns XML if success_action_status is set to 201
+    replaceFileInput: false,
+    
+    add: function(e, data) {
+      $.ajax({
+        url: '/admin/images/sign-s3',
+        type: 'get',
+        data: {
+          name: document.getElementById('new_image').value,
+          media_category_id: <%= @media_category_id %>
+        },
+        async: false,
+        success: function(resp) {
+          pp = resp.presigned_post;    
+          var form = $('#new_image_form');
+          for (var i in pp.fields)
+            form.append($('<input/>').attr('type', 'hidden').attr('name', i).val(pp.fields[i]));
+          //form.attr('action', pp.url);
+        }
+      });
+      data.submit();
+    },                
+    progressall: function (e, data) { $('#bar').css('width', parseInt(data.loaded / data.total * 100, 10) + '%') },
+    start: function (e) { $('#bar').css('background', 'green').css('display', 'block').css('width', '0%').text("Loading..."); },
+    done: function(e, data) { $('#bar').text("Uploading done"); },
+    fail: function(e, data) { $('#bar').css("background", "red").text("Failed"); }
+  });  
 });
 
 </script>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.49'
+  VERSION = '0.4.50'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.49
+  version: 0.4.50
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -196,6 +196,7 @@ files:
 - app/assets/javascripts/caboose/application.js
 - app/assets/javascripts/caboose/jquery.detect.js
 - app/assets/javascripts/caboose/jquery.fileupload.js
+- app/assets/javascripts/caboose/jquery.iframe-transport.js
 - app/assets/javascripts/caboose/jquery.placeholder.js
 - app/assets/javascripts/caboose/lodash.min.js
 - app/assets/javascripts/caboose/main.js