caboose-cms 0.3.30 → 0.3.31

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGVhNGIyYmU4ZmE5M2VjMTYyMjdiMDViMjEyNmI0ZmE0MDVlYmVmOA==
+    NDI4ZDcyZjQ4MTY4MzNmNTg0NmQ0Yjc0NTJiNmZlMWNmMjhkZGFhYg==
   data.tar.gz: !binary |-
-    ZGJhZjBhYjhlMzEwYWYyYzgwMTVkYTNjOTJjMzVjYTBjOWJkOGQwZA==
+    MTMyZTdhY2YwZWJhMDVjNDllMWFjMzE3YTExZWNlOWYwODY2ZDZhMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTc1MWExZTIzZWNkNTJkYmZiODQ1MTE4Y2UxYzk2MDdlNzdkNzg1YTE0ZWI0
-    MDkzZTJhOWMwNjM3NmYzZWE5Njg5NDkzODUyYWIwZjIwNDA4NTY0MjA3ZWQ1
-    OTBhOGMzNWE2NzQzMGQwZjRkNTc4ZDA2Y2Y2YzhhYjRmZWY3Y2Q=
+    MzJhOWVmYTg3N2I0YTMyZmM2NGU3MDU3Mzk5ZGExYTE5NDUzODYyMGI3YzE1
+    MzViY2JlZGQ3NDI3YTc1YjE1YjRhNzlhNjhjNmU0Y2I3Y2IwYWVkY2Q2ZjRk
+    NDMwYTRlYzI4NDUzZmY0MzJjMzY0MWY3MzZkYzY3ODFkMjU0MDM=
   data.tar.gz: !binary |-
-    MTE3ZTU5N2U3OTQ3ZDY3MGQwZjUyY2I1NzU3MDRhOGMyOWI5MWNlNjdhNWVj
-    MWU3ZTdiNGNhMjE1ZjdiYmMxNjY5YTNiMGVkNzUxNmE3YzI3OWNmZjQ2NDI1
-    NTJjYTIzYzMzMWZmMjA1Yzg3Mzg5ZDYzMTI1ZjQxYTM5Zjc3OTQ=
+    ZWVjMTY1YWFkZTM2MTZmZDYyYjc3OWUwNmRjMTUxNDJmMTM3YTkwNGUwOThh
+    ZDk4Y2RmY2Q3NjVlNzA1YjA0MGY4NmRmMGRmYzE3OGYyOTQ2NjIwY2ZmNTM4
+    Zjk1NjIxMGI4N2YxOTA0NjI3NzNjZDdkN2VhZjdmNjA1YmJmZTM=

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

@@ -6,6 +6,7 @@
 //= require caboose/model/bound_checkbox
 //= require caboose/model/bound_checkbox_multiple
 //= require caboose/model/bound_image
+//= require caboose/model/bound_file
 //= require caboose/model/bound_select
 //= require caboose/model/bound_text
 //= require caboose/model/bound_textarea

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

@@ -0,0 +1,119 @@
+
+BoundFile = BoundControl.extend({
+  
+  width: 100,
+  authenticity_token: false,
+  placeholder: 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;
+    this.placeholder = this.el + '_placeholder';
+         
+    var this2 = this;
+    $('#'+this.el).wrap($('<div/>').attr('id', this.el + '_container').css('position', 'relative'));
+    $('#'+this.el+'_container').empty();
+        
+    var tr = $('<tr/>');
+        
+    if (this.attribute.fixed_placeholder == true)
+    {
+      tr.append($('<td/>')
+        .attr('id', this.placeholder)
+        .addClass('placeholder')
+        .css('position', 'relative')
+        .append($('<span/>').html(this.attribute.nice_name + ': '))
+      );
+    }
+    
+    tr.append($('<td/>').append($('<a/>')
+      .attr('id', this.el + '_link')
+      .attr('href', this.attribute.value)
+      .html('Download current file')
+      .css('margin-right', 10)      
+    ));    
+    
+    tr.append($('<td/>').append($('<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(); });  
+      })
+      .append($('<input/>').attr('type', 'hidden').attr('name', 'authenticity_token').val(this.binder.authenticity_token))
+      .append($('<input/>').attr('type', 'button').val('Update ' + this.attribute.nice_name).click(function() { 
+        $('#'+this2.el+'_container input[type="file"]').click(); 
+      }))
+      .append($('<input/>')
+        .attr('type', 'file')
+        .attr('name', this.attribute.name)
+        .css('display', 'none')
+        .on('change', function() { $('#'+this2.el+'_container form').submit(); })
+      )
+    ));
+    
+    $('#'+this.el+'_container').append($('<table/>').append($('<thead/>').append(tr)));
+        
+    $('#'+this.el+'_container').append($('<div/>')
+      .attr('id', this.el + '_message')
+    );
+    iframe = $('<iframe/>')
+      .attr('name', this.el + '_iframe')
+      .attr('id', this.el + '_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'));
+  },
+  
+  post_upload: function() {
+    $('#'+this.el+'_message').empty();
+    
+    var str = frames[this.el+'_iframe'].document.documentElement.innerHTML;
+    str = str.replace(/.*?{(.*?)/, '{$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
+    {
+      $('#'+this.el+'_container a').attr('href', this.attribute.value);      
+      //$('#'+this.el+'_container img').attr('src', this.attribute.value);
+    }
+  },
+    
+  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/model_binder.js

@@ -58,6 +58,7 @@ ModelBinder.prototype = {
         binder: this2
       };
       var control = false;
+      
       if (attrib.type == 'text')                   control = new BoundText(opts);
       else if (attrib.type == 'select')            control = new BoundSelect(opts);
       else if (attrib.type == 'checkbox')          control = new BoundCheckbox(opts);
@@ -65,6 +66,14 @@ ModelBinder.prototype = {
       else if (attrib.type == 'textarea')          control = new BoundTextarea(opts);
       else if (attrib.type == 'richtext')          control = new BoundRichText(opts);
       else if (attrib.type == 'image')             control = new BoundImage(opts);
+      else if (attrib.type == 'file')              control = new BoundFile(opts);
+      else
+      {
+        control_class = "";
+        $.each(attrib.type.split('-'), function(j, word) { control_class += word.charAt(0).toUpperCase() + word.toLowerCase().slice(1); });
+        control = eval("new Bound" + control_class + "(opts)"); 
+      }
+      
       this2.controls.push(control);    
     });
     

data/app/models/caboose/utilities/schema.rb

@@ -52,7 +52,7 @@ class Caboose::Utilities::Schema
         
         # Special case for attachments
         if col[1] == :attachment          
-          c.add_attachment tbl, col[1] if !c.column_exists?(tbl, "#{col[1]}_file_size")            
+          c.add_attachment tbl, col[0] if !c.column_exists?(tbl, "#{col[0]}_file_size")            
           next
         end
                 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.30'
+  VERSION = '0.3.31'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.30
+  version: 0.3.31
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -137,6 +137,7 @@ files:
 - app/assets/javascripts/caboose/model/bound_checkbox.js
 - app/assets/javascripts/caboose/model/bound_checkbox_multiple.js
 - app/assets/javascripts/caboose/model/bound_control.js
+- 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_select.js