caboose-cms 0.3.67 → 0.3.68

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2I0NzE2M2NkNDMwOTYzZDc0NGI2MjcyYWI2ODYyMTVkMDdmNjQ0Nw==
+    NzU5ZTdiY2ZkNjU3ZDRhMDY0NmZkNzI2OWYwMTFjMGViYzVhZmM3ZQ==
   data.tar.gz: !binary |-
-    YzZlNzg0NzVlODhjOTQ5NmJlNWJmZDg4MWYxNzQxYzUzNWFhNWQwNw==
+    ODMyOTBmMTBiNDRmNTZkN2Q4MDcxNDE0ODcxOWU2ZmY3OWVkYTlkZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjQ1ODJiNTJhOTQyOTgwZjljNjg2OTc2ZTY5MmUwZDQ2NTlmMjRlOGMyYjgx
-    NTVmNzhiNTBiMTNmNzU4YzlkY2M1OWRiMzU3MjcxYzU5NDhiZGJlZjQ3OTA2
-    ZThhYjNjMGUxYWM3YmExMzM5MmZkODEwNzdhOTdiN2I4ZjAwOTQ=
+    Njg0NmM3YmU4YmE5Y2E3ZTI5MzVkZGViNGZhMzliYmFjODNiZDFhZDBmNzI3
+    YmUzNDdmODE3NmI5N2M4OTlhYWU1MDk5NWI3OTNmNzk2ZTdiMDQwYTI3ZDcw
+    NGRjYmIxZDM4OWQ1NTMzNTBiMzNiZjI4ZWJmOWNmY2I4NThmMDk=
   data.tar.gz: !binary |-
-    NGQ5ZGY5ODg3ZTQyOWExOTNhOWYzYzM1ZTVmYjY4YmY5YTA1Y2RmNmRkOTc5
-    ZTRmODE5ZTc5NmM0NGZjMTg0MWQzOGRiMzQ1MjJhMTA4MGIzMmI4MjJkNTJk
-    ZWZlZGFiYTU1ZTUxZDEwMmQ1MmY2ZjE2ZDJlNDEwNGQ3ZTY5OWI=
+    MjNmNDZlMGQ2OWQ5YTFlM2M4NTY0YzZmM2Q3MjEwMTRhMTY3OWFlMjhhZTg2
+    YWZmOWJlZmZmMTEwZTViMzMwZGVjNmRlNDEyYjAxOWVjYmI0YWRhZTIzMDBj
+    Y2JiM2M4ZDY2MDQwMGQ2NzMzYTkwNjhkMTBjYTJhZTBhOWFmOTI=

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

@@ -28,7 +28,8 @@ Attribute.prototype = {
   
   update_url: false,
   options_url: false,
-  options: false, 
+  options: false,
+  s3: false,
   
   save: function(after) {
     if (this.before_update) this.before_update();    

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

@@ -0,0 +1,142 @@
+
+BoundS3Image = BoundControl.extend({
+
+  //el: false,
+  //model: false,
+  //attribute: false,
+  //binder: false,
+  
+  width: 100,
+  style: 'medium',
+  authenticity_token: false,
+ 
+  init: function(params) {
+    for (var thing in params)
+      this[thing] = params[thing];
+    
+    this.el = this.el ? this.el : this.model.name.toLowerCase() + '_' + this.model.id + '_' + this.attribute.name;
+    
+    if (!this.attribute.update_url)
+      this.attribute.update_url = this.model.update_url;
+         
+    var this2 = this;
+    $('#'+this.el).wrap($('<div/>')
+      .attr('id', this.el + '_container')
+      .addClass('mb_container')
+      .css('position', 'relative')
+    );
+    $('#'+this.el+'_container').empty();
+    
+    $('#'+this.el+'_container').append($('<img/>')
+      .attr('src', this.attribute.value)
+      .css('width', this.width)
+      .css('float', 'left')
+      .css('margin-right', 10)
+    );    
+    
+
+    $('#'+this.el+'_container')
+      .append($('<form target="' + this.el + '_iframe"></form>')
+        .attr('id', this.el + '_form')
+        .attr('action', this.attribute.update_url)
+        .attr('method', 'post')
+        .attr('enctype', 'multipart/form-data')
+        .attr('encoding', 'multipart/form-data')
+        //.attr('target', this.el + '_iframe')
+        .on('submit', function() {           
+           $('#'+this2.el+'_message').html("<p class='loading'>Uploading...</p>");
+           $('#'+this2.el+'_iframe').on('load', function() { this2.post_upload(); });
+           return true;
+        })
+        .append($('<input/>').attr('type', 'hidden').attr('name', 'authenticity_token').val(this.binder.authenticity_token))        
+        .append($('<div/>')
+          .attr('id', this.el + '_fake_file_input')
+          .addClass('mb_fake_file_input')          
+          .append($('<input/>')            
+            .attr('type', 'button')
+            .attr('id', this.el + '_update_button')
+            .val('Update ' + this.attribute.nice_name)
+            .click(function() { $('#'+this2.el+'_file').click(); })
+          )
+          .append($('<input/>')
+            .attr('type', 'file')
+            .attr('id', this.el + '_file')
+            .attr('name', this.attribute.name)            
+            .change(function() { $('#'+this2.el+'_form').trigger('submit'); })
+          )
+          .append($('<input/>')
+            .attr('type', 'submit')            
+            .val('Submit')
+          )
+        )
+      );
+    $('#'+this.el+'_container').append($('<div/>')
+      .attr('id', this.el + '_message')
+    );
+    iframe = $("<iframe name=\"" + this.el + "_iframe\" id=\"" + this.el + "_iframe\" src=''></iframe>");          
+    if (this.attribute.debug)      
+      iframe.css('width', '100%').css('height', 600).css('background', '#fff');
+    else
+      iframe.css('width', 0).css('height', 0).css('border', 0);         
+    $('#'+this.el+'_container').append(iframe);    
+    $('#'+this.el+'_container').append($('<br/>').css('clear', 'both'));
+        
+    var w = $('#' + this.el + '_update_button').outerWidth(true);
+    $('#' + this.el + '_fake_file_input').css('width', '' + w + 'px');      
+  },
+  
+  post_upload: function() {
+    $('#'+this.el+'_message').empty();
+    
+    var str = frames[this.el+'_iframe'].document.documentElement.innerHTML;
+    str = str.replace(/[\s\S]*?{([\s\S]*?)/, '{$1');
+    str = str.substr(0, str.lastIndexOf('}')+1);
+    var resp = $.parseJSON(str);    
+    if (resp.success)
+		{		  
+		  if (resp.attributes && resp.attributes[this.attribute.name])
+		    for (var thing in resp.attributes[this.attribute.name])
+		      this.attribute[thing] = resp.attributes[this.attribute.name][thing];
+		  this.attribute.value_clean = this.attribute.value;
+		}
+				
+    if (resp.error)
+      this.error(resp.error);
+    else
+    {
+      if (this.attribute.image_refresh_delay)
+      {
+        var that = this;
+        setTimeout(function() { that.refresh_image(); }, this.attribute.image_refresh_delay);
+      }
+      else
+      {
+        this.refresh_image();
+      }        
+    }
+  },
+  
+  refresh_image: function() {
+    var src = this.attribute.value;
+    if (src.indexOf('?') > 0)
+      src = src.split('?')[0];    
+    src = src + '?' + Math.random();    
+    $('#'+this.el+'_container img').attr('src', src);
+  },
+    
+  error: function(str) {
+    if (!$('#'+this.el+'_message').length)
+    {
+      $('#'+this.el+'_container').append($('<div/>')
+        .attr('id', this.el + '_message')
+        .css('width', $('#'+this.el).outerWidth())
+      );
+    }
+    $('#'+this.el+'_message').hide();
+    $('#'+this.el+'_message').html("<p class='note error'>" + str + "</p>");
+    $('#'+this.el+'_message').slideDown();
+    var this2 = this;
+    setTimeout(function() { $('#'+this2.el+'_message').slideUp(function() { $(this).empty(); }); }, 3000);
+  }
+  
+});

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

@@ -0,0 +1,29 @@
+
+var S3 = function(params) {
+  for (var thing in params)
+    this[thing] = params[thing];    
+};
+
+S3.prototype = {    
+  access_key_id: '',
+  secret_access_key: '',
+    
+  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	
+
+};
+
+

data/app/controllers/caboose/posts_controller.rb

@@ -68,18 +68,11 @@ module Caboose
       save = true
       params.each do |name, value|    
         case name
-          when 'category_id'
-            post.category_id = value
-          when 'title'            
-            post.title = value
-          when 'body'
-            post.body = value
-          when 'image'
-            post.image = value
-          when 'published'
-            post.published = value.to_i == 1
-          when 'created_at'
-            post.created_at = DateTime.parse(value)
+          when 'category_id'    then post.category_id = value
+          when 'title'          then post.title = value
+          when 'body'           then post.body = value          
+          when 'published'      then post.published = value.to_i == 1
+          when 'created_at'     then post.created_at = DateTime.parse(value)
         end
       end
       resp.success = save && post.save
@@ -89,6 +82,19 @@ module Caboose
       render :json => resp
     end
     
+    # POST /admin/posts/:id/image
+    def admin_update_image
+      return if !user_is_allowed('posts', 'edit')
+      
+      resp = Caboose::StdClass.new
+      post = Post.find(params[:id])
+      post.image = params[:image]            
+      resp.success = post.save
+      resp.attributes = { 'image' => { 'value' => post.image.url(:thumb) }}
+      
+      render :text => resp.to_json
+    end
+    
     # GET /admin/posts/new
     def admin_new
       return if !user_is_allowed('posts', 'new')  

data/app/controllers/caboose/users_controller.rb

@@ -57,10 +57,10 @@ module Caboose
       return if !user_is_allowed('users', 'view')
       
       @gen = PageBarGenerator.new(params, {
-    		  'first_name'  => '',
-    		  'last_name'		=> '',
-    		  'username'	  => '',
-    		  'email' 		  => '',
+    		  'first_name_like' => '',
+    		  'last_name_like'	=> '',
+    		  'username_like'	  => '',
+    		  'email_like' 		  => '',
     		},{
     		  'model'          => 'Caboose::User',
     	    'sort'			     => 'last_name, first_name',

data/app/models/caboose/post.rb

@@ -18,5 +18,6 @@ class Caboose::Post < ActiveRecord::Base
       :thumb => '150x150>',
       :large => '400x400>'
     }
+  do_not_validate_attachment_file_type :image
 
 end

data/app/views/caboose/posts/admin_edit_general.html.erb

@@ -20,7 +20,7 @@ $(document).ready(function() {
     attributes: [
       { name: 'published'   , nice_name: 'Published'  , type: 'checkbox'  , value: <%= raw @post.published ? true : false         %>, width: 600 },      
       { name: 'title'       , nice_name: 'Title'      , type: 'text'      , value: <%= raw Caboose.json(@post.title)              %>, width: 600 },
-      { name: 'image'       , nice_name: 'Image'      , type: 'image'     , value: <%= raw Caboose.json(@post.image.url(:thumb))  %>, width: 600 }      
+      { name: 'image'       , nice_name: 'Image'      , type: 'image'     , value: <%= raw Caboose.json(@post.image.url(:thumb))  %>, width: 600, update_url: '/admin/posts/<%= @post.id %>/image' }      
     ]
   });
 });

data/app/views/caboose/users/index.html.erb

@@ -1,7 +1,10 @@
 <h1>Users</h1>
 
 <form action='/admin/users' method='get' class='search_form'>
-<input type='text' name='search' placeholder='Search' />
+<input type='text' name='first_name_like' placeholder='First name' />
+<input type='text' name='last_name_like'  placeholder='Last name' />
+<input type='text' name='email_like'      placeholder='Email' />
+<input type='submit' value='Search' />
 </form>
 
 <table class='data' id='users_table'>

data/config/routes.rb

@@ -121,7 +121,7 @@ Caboose::Engine.routes.draw do
   get     "admin/posts/:id/remove-from-category"  => "posts#admin_remove_from_category"
   get     "admin/posts/:id/delete"                => "posts#admin_delete_form"
   put     "admin/posts/:id"                       => "posts#admin_update"
-  post    "admin/posts/:id"                       => "posts#admin_update"
+  post    "admin/posts/:id/image"                 => "posts#admin_update_image"
   get     "admin/posts"                           => "posts#admin_index"
   post    "admin/posts"                           => "posts#admin_add"  
   delete  "admin/posts/:id"                       => "posts#admin_delete"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.67'
+  VERSION = '0.3.68'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.67
+  version: 0.3.68
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -171,12 +171,14 @@ files:
 - app/assets/javascripts/caboose/model/bound_file.js
 - app/assets/javascripts/caboose/model/bound_image.js
 - app/assets/javascripts/caboose/model/bound_richtext.js
+- app/assets/javascripts/caboose/model/bound_s3_image.js
 - app/assets/javascripts/caboose/model/bound_select.js
 - app/assets/javascripts/caboose/model/bound_text.js
 - app/assets/javascripts/caboose/model/bound_textarea.js
 - app/assets/javascripts/caboose/model/class.js
 - app/assets/javascripts/caboose/model/model.js
 - app/assets/javascripts/caboose/model/model_binder.js
+- app/assets/javascripts/caboose/model/s3.js
 - app/assets/javascripts/caboose/model.form.page.js
 - app/assets/javascripts/caboose/model.form.user.js
 - app/assets/javascripts/caboose/shortcut.js