scrivito_sdk 1.1.0.rc1 → 1.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12a55c387b16a4a537845c0ef7d10d00b4c6bd4a
-  data.tar.gz: e79c326cc3f757de2d46b05d4287ab0548550aeb
+  metadata.gz: a74fbb94276191a2a93a9bc371135f056a17dd91
+  data.tar.gz: 92608b0a4cc5523941e4bbd0c25e09635ecbb3c7
 SHA512:
-  metadata.gz: 1a9338acbdbd0901b6ed31bc8962c1278f9057c507f2af2791c83291de9480f0d8230fb58acd1c039753a34ab18fd5a2033c39676f67d09ba0205b9c92b7e4e0
-  data.tar.gz: cd8ba88553f5bf4a3974a7a1901391dda745100e3749b54801e3507825caa8e52817506fe0c3622f105363311db88841596a53c5df4e2b15a3ee88843750c0ff
+  metadata.gz: 625a81d42efb11d2476a03fa71ea7ac995989bdf7e9758c6844008a0635f3f3395c9f6efb5ca589f535f77bfc6c46322ebd3b023693ec8a742c6da23f9967699
+  data.tar.gz: 234c9870ee5c7af5c102d86a0e95764f6cad72595caa62f2907933a8c788f72dcb33e17ac310409f1b338be3401916b5ebdc182aa57855acc62a064f334bf8fe

data/config/ca-bundle.crt

@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Fri Jan  8 14:27:07 2016
+## Certificate data from Mozilla as of: Thu Jan 14 17:21:14 2016
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates

data/lib/assets/javascripts/scrivito_ui.js

@@ -31946,13 +31946,16 @@ var scrivito = {}; // jshint ignore:line
   };
 
   var serialize_copied_binary = function(attr_name, attr_value) {
-    return [attr_name, {copy: {
+    var copy_params = {
       obj_id: attr_value.obj_id,
       widget_id: attr_value.widget_id,
-      attribute_name: attr_value.attr_name,
-      filename: attr_value.filename,
-      content_type: attr_value.content_type
-    }}];
+      attribute_name: attr_value.attr_name
+    };
+
+    if (attr_value.filename) { copy_params.filename = attr_value.filename; }
+    if (attr_value.content_type) { copy_params.content_type = attr_value.content_type; }
+
+    return [attr_name, {copy: copy_params}];
   };
 
   var is_uploaded_binary = function(object) {
@@ -32057,6 +32060,8 @@ var scrivito = {}; // jshint ignore:line
       },
 
       upload_binary: function(params) {
+        assert_valid_params(params);
+
         var blob = params.blob || params.file;
         if (!blob) { $.error('need blob or file'); }
         if (!params.content_type) { params.content_type = blob.type; }
@@ -32067,6 +32072,17 @@ var scrivito = {}; // jshint ignore:line
         params.filename = params.filename.replace(/[^\w\-_\.$]/g, '-');
 
         return $.extend(params, {is_uploaded_binary: true});
+      },
+
+      copy_binary: function(obj_id, widget_id, attr_name, params) {
+        assert_valid_params(params);
+
+        return _.extend({
+          is_copied_binary: true,
+          obj_id: obj_id,
+          widget_id: widget_id,
+          attr_name: attr_name
+        }, params);
       }
     }
   });
@@ -32099,6 +32115,16 @@ var scrivito = {}; // jshint ignore:line
       content_type: content_type
     }});
   };
+
+  var assert_valid_params = function(params) {
+    if (_.has(params, 'filename') && !params.filename) {
+      $.error('filename cannot be blank');
+    }
+
+    if (_.has(params, 'content_type') && !params.content_type) {
+      $.error('content_type cannot be blank');
+    }
+  };
 }());
 (function() {
   _.extend(scrivito, {
@@ -32614,12 +32640,12 @@ var scrivito = {}; // jshint ignore:line
               },
 
               copy: function(params) {
-                return _.extend({
-                  is_copied_binary: true,
-                  obj_id: that.obj().id(),
-                  widget_id: that.widget() && that.widget().id(),
-                  attr_name: that.field_name()
-                }, params || {});
+                return scrivito.blob.copy_binary(
+                  that.obj().id(),
+                  that.widget() && that.widget().id(),
+                  that.field_name(),
+                  params
+                );
               }
             });
           }
@@ -37061,8 +37087,6 @@ var scrivito = {}; // jshint ignore:line
   };
 })();
 (function() {
-  var focus;
-  var focus_stack = [];
   var dragging;
 
   // GEOMETRY UTILS
@@ -37070,8 +37094,8 @@ var scrivito = {}; // jshint ignore:line
   // distance between point and rectangle
   // returns 0 if point is inside rectangle
   var distance_point_rectangle = function(point, rect) {
-    var clamped_x = Math.max(Math.min(point.x, rect.x + rect.width), rect.x);
-    var clamped_y = Math.max(Math.min(point.y, rect.y + rect.height), rect.y);
+    var clamped_x = Math.max(Math.min(point.x, rect.x2), rect.x1);
+    var clamped_y = Math.max(Math.min(point.y, rect.y2), rect.y1);
 
     var dist_x = point.x - clamped_x;
     var dist_y = point.y - clamped_y;
@@ -37079,6 +37103,55 @@ var scrivito = {}; // jshint ignore:line
     return Math.sqrt(dist_x * dist_x + dist_y * dist_y);
   };
 
+  // given a rectangle, calculate it's center
+  var center_of_rectangle = function(rect) {
+    return { x: (rect.x1 + rect.x2) / 2, y: (rect.y1 + rect.y2) / 2 };
+  };
+
+  // given a rectangle, return it's edges.
+  // the edges are returned as rectangles with either
+  // width=0 for left and right, or
+  // heigth=0 for top and bottom.
+  var edges_of_rectangle = function(rect) {
+    return {
+      left: {
+        x1: rect.x1,
+        y1: rect.y1,
+        x2: rect.x1,
+        y2: rect.y2
+      },
+      right: {
+        x1: rect.x2,
+        y1: rect.y1,
+        x2: rect.x2,
+        y2: rect.y2
+      },
+      top: {
+        x1: rect.x1,
+        y1: rect.y1,
+        x2: rect.x2,
+        y2: rect.y1
+      },
+      bottom: {
+        x1: rect.x1,
+        y1: rect.y2,
+        x2: rect.x2,
+        y2: rect.y2
+      }
+    };
+  };
+
+  // calculate the rectangle that results from cropping the rectangle `rect`
+  // to be inside the rectangle `crop`.
+  var crop_rectangle = function(rect, crop) {
+    return {
+      x1: Math.min(crop.x2, Math.max(crop.x1, rect.x1)),
+      y1: Math.min(crop.y2, Math.max(crop.y1, rect.y1)),
+      x2: Math.min(crop.x2, Math.max(crop.x1, rect.x2)),
+      y2: Math.min(crop.y2, Math.max(crop.y1, rect.y2))
+    };
+  };
+
   var is_wrap_between = function(column, next_column) {
     var column_offset = column.offset();
     var next_column_offset = next_column.offset();
@@ -37115,10 +37188,10 @@ var scrivito = {}; // jshint ignore:line
     }
 
     return {
-      x: offset.left,
-      y: offset.top,
-      width: element.outerWidth(),
-      height: height
+      x1: offset.left,
+      y1: offset.top,
+      x2: offset.left + element.outerWidth(),
+      y2: offset.top + height
     };
   };
 
@@ -37215,70 +37288,15 @@ var scrivito = {}; // jshint ignore:line
     }
   };
 
-  // FOCUS MARKER
-
-  var focus_marker = function() {
-    var focus_marker;
-
-    var rects;
-
-    var show_rectangle = function(num, x1, y1, x2, y2) {
-      var rect = $(rects[num]);
-
-      rect.offset({left: x1, top: y1});
-      rect.width(x2 - x1);
-      rect.height(y2 - y1);
-
-      rect.show();
-    };
-
-    return {
-      init: function() {
-        rects = _.map(_.range(4), function() {
-          var rect = $("<div class='focus_marker'></div>");
-          rect.css("pointer-events", "none");
-          rect.css("background", "rgba(255, 159, 0, 0.25)");
-          rect.css("position", "absolute");
-          rect.hide();
-
-          $("body").append(rect);
-
-          return rect;
-        });
-      },
-
-      show: function(focus) {
-        var offset = scrivito.cms_document.offset(focus)
-        var bounds = bounding_rectangle(focus);
-        var width = bounds.width;
-        var height = bounds.height;
-
-        // FIXME, use actual values
-        var window_bottom = 2048;
-        var window_right = 2048;
-
-        show_rectangle(0, 0, 0, offset.left, window_bottom);
-        show_rectangle(1, offset.left + width, 0, window_right, window_bottom);
-
-        show_rectangle(2, offset.left, 0, offset.left + width, offset.top);
-        show_rectangle(3, offset.left, offset.top + height, offset.left + width, window_bottom);
-      },
-
-      hide: function() {
-        _.each(rects, function(rect) { $(rect).hide(); });
-      }
-    };
-  }();
-
   var find_selectable_targets = function(root) {
     root = $(root);
 
-    if (root.is('[data-scrivito-widget-obj-class=ColumnWidget]')) {
+    if (root.is('[data-scrivito-widget-obj-class=ColumnWidget]') ||
+      root.is('[data-scrivito-widget-obj-class=ColumnContainerWidget]')) {
       return root.children();
     }
 
-    var widgetlists = root.find('[data-scrivito-field-type=widgetlist]')
-      .addBack('[data-scrivito-field-type=widgetlist]');
+    var widgetlists = root.find('[data-scrivito-field-type=widgetlist]');
     widgetlists = _.reject(widgetlists, function(widgetlist) {
       // Reject if not a top-level widgetlist.
       var wrapping_widgetlist = $(widgetlist).parent()
@@ -37299,93 +37317,150 @@ var scrivito = {}; // jshint ignore:line
     return selectable_targets;
   };
 
-  var find_gesture_targets = function(mouse, focus) {
-    var selectable_targets = find_selectable_targets(focus);
-    var target_row = detect_closest(mouse, selectable_targets);
-    var target;
+  var find_gesture_targets = function(mouse, root) {
+    var selectable_targets = find_selectable_targets(root);
+    var target = detect_closest(mouse, selectable_targets);
 
-    if ($(target_row).is("[data-scrivito-widget-obj-class=ColumnContainerWidget]")) {
-      target = detect_closest(mouse, $(target_row).children());
-    } else {
-      target = target_row;
+    if (!target) {
+      return [];
     }
 
-    return {
-      target_row: target_row,
-      target: target
+    if (target === dragging) {
+      return [target];
+    }
+
+    return [target].concat(find_gesture_targets(mouse, target));
+  };
+
+  // given a list of boxes containing each other and the center,
+  // calculate an adjusted list of boxes so that the edges of successive boxes
+  // do not touch each other, i.e. there is free space between successive boxes.
+  // the boxes are adjusted by making successor boxes smaller to create space.
+  // the first box is never adjusted.
+  // if the overall space is to tight to create the desired amount of space,
+  // as much as possible is created, distributed equally between all boxes.
+  // all adjustments are made with respect to the center,
+  // i.e. box edges are moved towards the center, but never across the center.
+  var disperse_boxes = function(center, boxes) {
+    var box = boxes[0];
+    var successor_box = boxes[1];
+
+    if (!successor_box) { return boxes; }
+
+    // the desired amount of space between edges of successive boxes, in pixels.
+    var desired_space = 20;
+
+    // calculate maximum amount of adjustment for each edge
+    // in order to leave enough space for successive boxes.
+    var max_x1 = (center.x - box.x1) / boxes.length;
+    var max_y1 = (center.y - box.y1) / boxes.length;
+    var max_x2 = (box.x2 - center.x) / boxes.length;
+    var max_y2 = (box.y2 - center.y) / boxes.length;
+
+    // the largest possible box within `box` that leaves enough space
+    var maximum_box = {
+      x1: box.x1 + Math.min(desired_space, max_x1),
+      y1: box.y1 + Math.min(desired_space, max_y1),
+      x2: box.x2 - Math.min(desired_space, max_x2),
+      y2: box.y2 - Math.min(desired_space, max_y2)
     };
+
+    // crop successor_box to fit inside the largest possible box
+    var adjusted_box = crop_rectangle(successor_box, maximum_box);
+
+    // recurse on remaining boxes
+    var remaining_boxes = [adjusted_box].concat(boxes.slice(2));
+    return [box].concat(disperse_boxes(center, remaining_boxes));
   };
 
-  var detect_gesture = function(mouse, target, target_row) {
-    if ($(target).is('[data-scrivito-field-type=widgetlist]')) {
-      return {
-        name: 'row_insert'
-      };
-    }
+  var adjust_boxes = function(boxes) {
+    var innermost_box = boxes[boxes.length - 1];
+
+    // crop innermost box to lie inside all outer boxes
+    _.each(boxes, function(box) {
+      innermost_box = crop_rectangle(innermost_box, box);
+    });
 
-    target_row = $(target_row);
-    var rowY = target_row.offset().top;
-    var rowHeight = target_row.height();
+    return disperse_boxes(center_of_rectangle(innermost_box), boxes);
+  };
 
-    var targetY = $(target).offset().top;
-    var targetHeight = $(target).height();
+  var build_edges_for = function(target, box) {
+    target = $(target);
 
-    var event_row_y = (mouse.y - rowY) / rowHeight;
-    var event_target_y_abs = mouse.y - targetY;
-    var event_target_y = event_target_y_abs / targetHeight;
+    var box_edges = edges_of_rectangle(box);
 
-    var is_row_insert_before = event_row_y < (1 / 4) && event_target_y < (1 /4) &&
-      event_target_y_abs < 20;
-    var is_row_insert_after = event_row_y > (3 / 4) && event_target_y > (3 /4) &&
-      event_target_y_abs > (targetHeight - 20);
+    if (target.is('[data-scrivito-widget-obj-class=ColumnWidget]')) {
+      // inserting directly above or below does not make sense
+      // for a Column (user should insert inside the Column instead)
+      delete box_edges.top;
+      delete box_edges.bottom;
+    }
 
-    if (is_row_insert_before || is_row_insert_after) {
+    if (target.is('[data-scrivito-widget-obj-class=ColumnContainerWidget]')) {
+      // inserting directly left or right does not make sense
+      // for a ColumnContainer
+      // (user should insert a new Column inside the Container instead)
+      delete box_edges.left;
+      delete box_edges.right;
+    }
+
+    if (
+      target.parent().is('[data-scrivito-widget-obj-class=ColumnWidget]') &&
+      target.siblings().length === 0
+    ) {
+      // inserting directly left or right does not make sense
+      // for the only item inside a Column
+      // (user should insert a new Column instead)
+      delete box_edges.left;
+      delete box_edges.right;
+    }
+
+    if (target.is('[data-scrivito-field-type=widgetlist]')) {
+      // inserting left, right or at the bottom does not make sense
+      // for an empty widgetlist
+      // (user should insert a first Row before inserting Columns)
+      delete box_edges.left;
+      delete box_edges.right;
+      delete box_edges.bottom;
+    }
+
+    return _.map(box_edges, function(rectangle, name) {
       return {
-        name: 'row_insert',
-        before: is_row_insert_before
+        rectangle: rectangle,
+        target: target,
+        name: name
       };
-    } else {
-      var targetX = $(target).offset().left;
-      var targetWidth = $(target).width();
-      var event_target_x_abs = mouse.x - targetX;
-      var eventX = event_target_x_abs / targetWidth;
-
-      var widget_obj_class = $(target).attr("data-scrivito-widget-obj-class");
-      var contains_widgetlist = !!$(target).find('[data-scrivito-field-type=widgetlist]').length;
-      var is_applicable_for_insert_inside = (contains_widgetlist || widget_obj_class === 'ColumnWidget') &&
-        dragging !== target;
-
-      var is_col_insert_before = eventX < (1 / 4) && event_target_x_abs < 20;
-      var is_col_insert_after = eventX > (3 / 4) && event_target_x_abs > (targetWidth - 20);
-      var distance = distance_point_rectangle(mouse, bounding_rectangle(target));
-      if (is_applicable_for_insert_inside && !is_col_insert_before && !is_col_insert_after && distance < 20) {
-        return {
-          name: 'insert_inside',
-          before: event_target_y < (1 / 2)
-        };
-      } else {
-        return {
-          name: 'col_insert',
-          before: eventX < 0.5
-        };
-      }
-    }
+    });
   };
 
-  var loose_focus = function(mouse, focus) {
-    if (focus) {
-      var distance = distance_point_rectangle(mouse, bounding_rectangle(focus));
-      if (distance > 20) {
-        return focus_stack.pop();
-      } else {
-        var targets = find_gesture_targets(mouse, _.last(focus_stack) || $(focus).closest('body'));
-        if (targets.target && targets.target !== focus) {
-          return focus_stack.pop();
-        }
-      }
-    }
+  var detect_gesture = function(mouse, root) {
+    var targets = find_gesture_targets(mouse, root);
 
-    return focus;
+    var boxes = adjust_boxes(_.map(targets, bounding_rectangle));
+
+    var edges = [];
+    _.each(targets, function(target, index) {
+      edges = edges.concat(build_edges_for(target, boxes[index]));
+    });
+
+    var closest_edge = _.min(edges, function(edge) {
+      return distance_point_rectangle(mouse, edge.rectangle);
+    });
+
+    var edge_name = closest_edge.name;
+
+    /*
+    return {
+      target: closest_edge.target,
+      type: edge_name === "left" || edge_name === "right" ? 'column' : 'row',
+      before: edge_name === "left" || edge_name === "top"
+    };
+    */
+
+    return {
+      target: closest_edge.target,
+      edge_name: edge_name,
+    };
   };
 
   var offset_center = function(element, element_offset, next_element, next_element_offset) {
@@ -37413,11 +37488,7 @@ var scrivito = {}; // jshint ignore:line
         cursor.hide();
         $("body").append(cursor);
 
-        focus_marker.init();
-
-        var insert_at;
-        var insert_type;
-        var insert_before;
+        var last_gesture;
 
         scrivito.gui.on('document', function(document) {
           var body = document.dom_element().find("body");
@@ -37429,7 +37500,6 @@ var scrivito = {}; // jshint ignore:line
               e.preventDefault(); // Necessary. Allows us to drop.
             }
 
-
             // REPLACE ORIGINAL WITH PLACEHOLDER
             if (!hidden) {
               $(dragging).css("opacity", "0.5");
@@ -37440,18 +37510,9 @@ var scrivito = {}; // jshint ignore:line
             // see https://github.com/jquery/jquery/issues/1925
             var mouse = {x: e.originalEvent.pageX, y: e.originalEvent.pageY}
 
-            focus = loose_focus(mouse, focus);
+            var gesture = detect_gesture(mouse, body);
 
-            if (focus) {
-              focus_marker.show(focus);
-            }
-            else {
-              focus_marker.hide();
-            }
-
-            var targets = find_gesture_targets(mouse, focus || body);
-            var target_row = $(targets.target_row);
-            var target = targets.target;
+            var target = $(gesture.target);
 
             // This should NEVER happen!
             if (!target) {
@@ -37459,79 +37520,38 @@ var scrivito = {}; // jshint ignore:line
               return;
             }
 
-            var gesture = detect_gesture(mouse, target, target_row);
-
-            // TODO take widget into account: if small widget,
-            // only upper 1/3 of widget should count as "row"
-            if (gesture.name === 'row_insert') {
-              var before = gesture.before;
+            if (gesture.target.get(0) === dragging) {
+              return;
+            }
 
+            if (gesture.edge_name === 'top' || gesture.edge_name === 'bottom') {
               // CURSOR
               cursor.height("0px");
-              cursor.width(target_row.parent().outerWidth());
+              cursor.width(target.parent().outerWidth());
 
               // TODO update Cursor position on scroll
-              // FIXME: why that - offset.top -= 0.5 * cursor.outerHeight();
-
-              var offset = scrivito.cms_document.offset(target_row);
+              var offset = scrivito.cms_document.offset(target);
 
-              if (before) {
-                var prev_row = target_row.prev();
+              if (gesture.edge_name === 'top') {
+                var prev_row = target.prev();
                 if (prev_row.length) {
                   var prev_row_offset = scrivito.cms_document.offset(prev_row);
-                  offset.top = offset_center(prev_row, prev_row_offset, target_row, offset).top;
+                  offset.top = offset_center(prev_row, prev_row_offset, target, offset).top;
                 }
               } else {
-                var next_row = target_row.next();
+                var next_row = target.next();
                 if (next_row.length) {
                   var next_row_offset = scrivito.cms_document.offset(next_row);
-                  offset.top = offset_center(target_row, offset, next_row, next_row_offset).top;
+                  offset.top = offset_center(target, offset, next_row, next_row_offset).top;
                 } else {
-                  offset.top += target_row.outerHeight();
+                  offset.top += target.outerHeight();
                 }
               }
 
-              offset.left = scrivito.cms_document.offset(target_row.parent()).left;
+              offset.left = scrivito.cms_document.offset(target.parent()).left;
               cursor.offset(offset);
               cursor.show();
-
-              // REMEMBER
-              insert_at = target_row;
-              insert_type = "row";
-              insert_before = before;
-            } else if (gesture.name === 'insert_inside') {
-              // CURSOR
-
-              var bounds = bounding_rectangle(target);
-              cursor.width(bounds.width);
-              cursor.height(bounds.height);
-
-              // TODO update Cursor position on scroll
-              var offset = scrivito.cms_document.offset(target);
-              cursor.offset(offset);
-              cursor.show();
-
-              if (insert_at === target && insert_type === "inside") {
-                var focus_time = (new Date()) - focus_since;
-
-                if (focus_time > 500) {
-                  if (focus) {
-                    focus_stack.push(focus);
-                  }
-                  focus = target;
-                  focus_since = undefined;
-                }
-              } else {
-                focus_since = new Date();
-                // REMEMBER
-                insert_at = target;
-                insert_type = "inside";
-              }
-
-              insert_before = gesture.before;
-            } else if (gesture.name === 'col_insert') {
-              var before = gesture.before;
-
+            } else if (gesture.edge_name === 'left' || gesture.edge_name === 'right') {
               // CURSOR
               cursor.height($(target).outerHeight());
               cursor.width("0px");
@@ -37540,7 +37560,7 @@ var scrivito = {}; // jshint ignore:line
               var offset = scrivito.cms_document.offset(target);
               var target_jq = $(target);
 
-              if (before) {
+              if (gesture.edge_name === 'left') {
                 var prev_column = target_jq.prev();
                 if (prev_column.length && !is_wrap_between(prev_column, target_jq)) {
                   offset.left = offset_center(prev_column, scrivito.cms_document.offset(prev_column),
@@ -37560,14 +37580,11 @@ var scrivito = {}; // jshint ignore:line
 
               cursor.offset(offset);
               cursor.show();
-
-              // REMEMBER
-              insert_at = target;
-              insert_type = "col";
-              insert_before = before;
             } else {
               $.error('Unknown gesture: ' + gesture);
             }
+
+            last_gesture = gesture;
           });
 
         });
@@ -37598,15 +37615,6 @@ var scrivito = {}; // jshint ignore:line
             //e.originalEvent.dataTransfer.setDragImage(dragIcon, -10, -10);
 
             dragging = $(this).parent()[0];
-            // FIXME: Find also the structure widget.
-            focus = $(dragging).closest("[data-scrivito-widget-obj-class=ColumnWidget]")[0];
-
-            if ($(focus).children().length === 1) { // TODO: Only for ColumnContainerWidget
-              // if dragging the only widget inside a column
-              // focussing that column does not make sense
-              focus = $(focus).parent().
-                closest("[data-scrivito-widget-obj-class=ColumnWidget]")[0];
-            }
 
             hidden = false;
           });
@@ -37615,32 +37623,24 @@ var scrivito = {}; // jshint ignore:line
 
             if (window.debugdrag) { return }
 
-            if (insert_at == dragging) {
+            var gesture = last_gesture;
+
+            if (gesture.target == dragging) {
               // dragged a widget on itself - do nothing
               $(dragging).css("opacity", "1");
             }
-            else if (insert_at) {
+            else if (gesture.target) {
+              var target = gesture.target;
               var old_parent = $(dragging).parent();
 
-              if (insert_type == "inside") {
-                // TODO do noting if not ColumnContainerWidget
-                // INSIDE EXISTING COLUMN
-                $(dragging).hide();
-                $(insert_at)[insert_before ? "prepend" : "append"](dragging);
-                $(dragging).slideDown(100);
-
-                $(dragging).css("opacity", "1");
-
-                garbage_collect(old_parent);
-              }
-              else if (insert_type == "row") {
+              if (gesture.edge_name === 'top' || gesture.edge_name === 'bottom') {
                 // ROW INSERT
                 $(dragging).hide();
 
-                if (insert_before === undefined) {
-                  $(insert_at).append(dragging);
+                if (target.is('[data-scrivito-field-type=widgetlist]')) {
+                  $(target).append(dragging);
                 } else {
-                  $(insert_at)[insert_before ? "before" : "after"](dragging);
+                  $(target)[gesture.edge_name === 'top' ? "before" : "after"](dragging);
                 }
                 $(dragging).css("opacity", "1");
 
@@ -37650,21 +37650,21 @@ var scrivito = {}; // jshint ignore:line
               }
               else {
                 // COL INSERT
-                var insert_at_obj_class = $(insert_at).attr("data-scrivito-widget-obj-class");
+                var insert_at_obj_class = $(target).attr("data-scrivito-widget-obj-class");
                 if (insert_at_obj_class !== "ColumnWidget") {
-                  $(insert_at).wrap(
+                  $(target).wrap(
                     "<div class='row' data-scrivito-widget-obj-class=ColumnContainerWidget>" +
                     "<div class='col-md-12' data-scrivito-widget-obj-class=ColumnWidget></div>" +
                     "</div>");
 
-                  insert_at = $(insert_at).parent();
+                  target = $(target).parent();
                 }
 
                 $(dragging).detach();
                 $(dragging).wrap("<div class='col-md-12' data-scrivito-widget-obj-class=ColumnWidget></div>");
                 var insert_column = $(dragging).parent();
 
-                $(insert_at)[insert_before ? "before" : "after"](insert_column);
+                $(target)[gesture.edge_name === 'left' ? "before" : "after"](insert_column);
 
                 $(dragging).css("opacity", "1");
                 $(dragging).show(100);
@@ -37673,12 +37673,11 @@ var scrivito = {}; // jshint ignore:line
                 // since it could be inside the same row
                 garbage_collect(old_parent);
 
-                resize_row($(insert_at).closest(".row"));
+                resize_row($(target).closest(".row"));
               }
             }
 
             cursor.hide();
-            focus_marker.hide();
 
             return false;
           });

data/lib/scrivito/binary.rb

@@ -6,6 +6,12 @@ module Scrivito
 class Binary
   attr_reader :id, :transformation_definition
 
+  def self.assert_valid_options(options)
+    options.each_pair do |key, value|
+      raise ArgumentError, "#{key} cannot be blank" if value.blank?
+    end
+  end
+
   def initialize(id, is_public, transformation_definition: nil, original: nil)
     @id = id
     @is_public = !!is_public
@@ -13,47 +19,62 @@ class Binary
     @original = original
   end
 
+  #
   # @api public
+  #
   # Uploads a local file to the CMS.
-  # @example Upload a single file
-  #   @obj.update(blob: Scrivito::Binary.upload("/Desktop/kitten.jpg"))
-  #
-  #   # equivalent to
-  #   @obj.update(blob: File.new("/Desktop/kitten.jpg"))
-  # @example Upload a file with a different filename and content type
-  #   @obj.update(blob: Scrivito::Binary.upload(
-  #       "/Desktop/rick_astley", content_type: "Video/MP4", filename: "ufo_landing.m4v"))
-  # @param file_or_path [File, String] the file to be uploaded or
-  #   the path of the file to be uploaded.
-  # @param filename [String, Nil] the desired filename. If +nil+,
-  #   the name of the given file is used.
-  # @param content_type [String, Nil] the desired content type. If +nil+,
-  #   the content type is calculated based on the extension of the filename.
+  #
+  # @param file_or_path [File, String] the file to be uploaded or the path of the file to be uploaded.
+  # @param options [Hash]
+  # @option options [String] filename the desired filename. Defaults to the name of the given file.
+  # @option options [String] content_type the desired content type. By default, the content type is
+  #   calculated based on the extension of the filename.
+  #
   # @return [Scrivito::FutureBinary] the returned object should be inserted into the binary field
   #   of an {Scrivito::BasicObj Obj} or {Scrivito::BasicWidget Widget}.
-  def self.upload(file_or_path, filename: nil, content_type: nil)
-    if file_or_path.is_a?(File)
-      file = file_or_path
-    else
-      file = File.new(file_or_path)
-    end
-    new_filename = filename || File.basename(file_or_path)
-    FutureBinary.new(content_type: content_type, filename: new_filename, file_to_be_uploaded: file)
+  #
+  # @raise ArgumentError if given +filename+ or +content_type+ is blank.
+  #
+  # @example Upload a single file
+  #   @obj.update(blob: Scrivito::Binary.upload("./kitten.jpg"))
+  #
+  #   # Is equivalent to
+  #   @obj.update(blob: File.new("./kitten.jpg"))
+  #
+  # @example Upload a file with a different +filename+ and +content_type+
+  #   @obj.update(blob: Scrivito::Binary.upload("./rick_astley",
+  #     filename: "ufo_landing.m4v", content_type: "video/mp4"))
+  #
+  def self.upload(file_or_path, options = {})
+    assert_valid_options(options)
+    FutureBinary.new(options.reverse_merge(
+      filename: File.basename(file_or_path),
+      file_to_upload: file_or_path.is_a?(File) ? file_or_path : File.new(file_or_path)
+    ))
   end
 
+  #
   # @api public
-  # Create a copy of this Binary with a different filename and/or content type.
-  # @example Change filename and content_type of an existing binary. Binary content remains the same.
-  #   @obj.update(blob: @obj.blob.copy(filename: "cute_kitten.jpg", content_type: "video/mp4"))
-  # @param filename [String, Nil] the desired filename. If +nil+,
-  #   the filename of the original binary is used.
-  # @param content_type [String, Nil] the desired content type. If +nil+,
-  #   the content type is calculated based on the extension of the filename.
+  #
+  # Create a copy of this {Scrivito::Binary Binary} with a different filename and/or content type.
+  #
+  # @param options [Hash]
+  # @option options [String] filename the desired filename. Defaults to the +filename+ of the
+  #   original binary.
+  # @option options [String] content_type the desired content type. By default, the content type is
+  #   calculated based on the extension of the filename.
+  #
   # @return [Scrivito::FutureBinary] the returned object should be inserted into the binary field
-  #   of an Obj or Widget.
-  def copy(content_type: nil, filename: nil)
-    new_filename = filename || self.filename
-    FutureBinary.new(content_type: content_type, filename: new_filename, id_to_be_copied: id)
+  #   of an {Scrivito::BasicObj Obj} or {Scrivito::BasicWidget Widget}.
+  #
+  # @raise ArgumentError if given +filename+ or +content_type+ is blank.
+  #
+  # @example Change +filename+ and +content_type+ of an existing binary. Binary content remains the same.
+  #   @obj.update(blob: @obj.blob.copy(filename: "cute_kitten.jpg", content_type: "video/mp4"))
+  #
+  def copy(options = {})
+    self.class.assert_valid_options(options)
+    FutureBinary.new(options.reverse_merge(filename: self.filename, id_to_copy: id))
   end
 
   # @api public

data/lib/scrivito/cms_rest_api.rb

@@ -68,17 +68,14 @@ module Scrivito
       @number_of_requests
     end
 
-    def self.upload_future_binary(binary, obj_id)
-      if binary.id_to_be_copied
-        id = normalize_path_component(binary.id_to_be_copied)
-        put("blobs/#{id}/copy", destination_obj_id: obj_id, filename: binary.filename,
-          content_type: binary.content_type)
+    def self.upload_future_binary(future_binary, obj_id)
+      if future_binary.id_to_copy
+        id = normalize_path_component(future_binary.id_to_copy)
+        put("blobs/#{id}/copy", future_binary.to_h.merge(destination_obj_id: obj_id))
       else
-        upload_permission = get('blobs/upload_permission')
-        upload = perform_file_upload(binary.file_to_be_uploaded, binary.content_type,
-          upload_permission)
-        activate_upload(upload: upload, obj_id: obj_id, filename: binary.filename,
-          content_type: binary.content_type)
+        permission = get('blobs/upload_permission')
+        upload = upload_file(future_binary.file_to_upload, future_binary.content_type, permission)
+        activate_upload(future_binary.to_h.merge(upload: upload, obj_id: obj_id))
       end
     end
 
@@ -185,7 +182,7 @@ module Scrivito
         end
       end
 
-      def perform_file_upload(file, content_type, upload_permission)
+      def upload_file(file, content_type, upload_permission)
         uri = URI.parse(upload_permission['url'])
 
         File.open(file) do |open_file|

data/lib/scrivito/future_binary.rb

@@ -1,22 +1,27 @@
 module Scrivito
 
+#
 # @api public
+#
 # The FutureBinary class represents the data to be stored in a binary field.
 # See {Scrivito::Binary.upload} and {Scrivito::Binary#copy} for details.
+#
+# @see Scrivito::Binary.upload
+# @see Scrivito::Binary#copy
+#
 class FutureBinary
-  attr_reader :filename, :content_type, :id_to_be_copied, :file_to_be_uploaded
+  attr_reader :filename, :content_type, :id_to_copy, :file_to_upload
 
-  def initialize(filename:, content_type:, id_to_be_copied: nil, file_to_be_uploaded: nil)
-    @filename = filename
-    @content_type = content_type || content_type_of_filename(filename)
-    @id_to_be_copied = id_to_be_copied
-    @file_to_be_uploaded = file_to_be_uploaded
+  def initialize(options = {})
+    @filename, @content_type, @id_to_copy, @file_to_upload =
+      options.values_at(:filename, :content_type, :id_to_copy, :file_to_upload)
   end
 
-  private
-
-  def content_type_of_filename(filename)
-    MIME::Types.type_for(filename).first.try(:content_type)
+  def to_h
+    {
+      filename: filename,
+      content_type: content_type,
+    }.compact
   end
 end
 

data/lib/scrivito/obj_params_parser.rb

@@ -71,7 +71,7 @@ module Scrivito
       end
 
       if binary = (widget || obj)[params[:attribute_name]]
-        binary.copy(filename: params[:filename], content_type: params[:content_type])
+        binary.copy(params.slice(:filename, :content_type).compact)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_sdk
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc1
+  version: 1.1.0.rc2
 platform: ruby
 authors:
 - Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable