cedar 0.2.7.pre → 0.2.71.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9c980b3de672b93662b23e08a879e81f9c7e9da
-  data.tar.gz: 72193bb99f7f11772dae56de64741d69b4236bb2
+  metadata.gz: 696cc2ffba4ca376b32859a715257eb2aa25fea0
+  data.tar.gz: 3be314db6d0c8210e48a4c7a76e6b44bb12950b7
 SHA512:
-  metadata.gz: c660ffbe590e81075bb2572c157d0b1f0f2299b432b6ddffd64d27e953e087a5106e6871bab7c9dc69ab38e87cc8802cf402797e4a18513c4d5c5c943d8daa26
-  data.tar.gz: e8de287e35c70abe45254de4ee134f3481449a48ccd249c94b3b6a80639b73e8803eba1bd27f16fa11f05fa07d928bd06a5cb801ccf4e127419804d6170a6411
+  metadata.gz: 7793c6d630eff653866a244c436a69c95a2a7ad39955fa76d3f3ea98715427f16e38ff2fc11b984ddb6e84d434386058964f78d095c0f48cd017ddc892554958
+  data.tar.gz: 10ff6451e258e2e9631bcb948d3e903e180cb3325c95c10433b681befcbf79f83182e3f3e31e4359b6ab3820996d02dc79948a2cca1c0893a3606a7fe1c17d61

data/lib/assets/javascripts/cedar.handlebars.js

@@ -63,7 +63,9 @@ Handlebars.registerHelper('cedar', function(options) {
 
   var output = '';
 
-  new Cedar.ContentEntry({ cedarId: options.hash.id }).retrieve().then(function(contentEntry){
+  var type = options.hash.type || 'ContentEntry';
+
+  new window.Cedar[type]({ cedarId: options.hash.id }).load().then(function(contentEntry){
     if (blockHelperStyle()) {
       if (Cedar.auth.isEditMode()) {
         output += contentEntry.getEditOpen();
@@ -73,7 +75,7 @@ Handlebars.registerHelper('cedar', function(options) {
         output += contentEntry.getEditClose();
       }
     } else {
-      output = contentEntry.getContent();
+      output = contentEntry.toString();
     }
 
     replaceElement(outputEl.id, output);

data/lib/assets/javascripts/cedar.js

@@ -205,7 +205,11 @@ Cedar.Auth.prototype.removeURLParameter = function(url, parameter) {
 Cedar.Store = function() {
   this.loaded = false;
 
-  this.cache = window.hasOwnProperty('localStorage') ? window.localStorage : {};
+  try {
+    this.cache = window.localStorage;
+  } catch (e) {
+    this.cache = {};
+  }
 
   if (Cedar.config.fetch) {
     this.refresh();
@@ -225,11 +229,22 @@ Cedar.Store = function() {
  * @param <json> 'item'
  */
 Cedar.Store.prototype.put = function ( key, item ) {
-  this.cache[key] = JSON.stringify(item);
+  this.cache[key] = typeof item === "string" ? item : JSON.stringify(item);
 };
 
-// Return local content immediately if possible. Otherwise return deferred remote content
+// Return promise of parsed content from local or remote storage
 Cedar.Store.prototype.get = function(key) {
+  return this.getDeferred(key).then(function(data) {
+    try {
+      return JSON.parse(data);
+    } catch (e) {
+      return data;
+    }
+  });
+};
+
+// Return local content immediately if possible. Otherwise return deferred remote content
+Cedar.Store.prototype.getDeferred = function(key) {
   var cachedDeferred = this.cachedDeferred(key);
   var remoteDeferred = this.remoteDeferred(key);
 
@@ -368,156 +383,107 @@ Cedar.Store.prototype.lockedRequest = function(options) {
     }.bind(this)));
 };
 
-/**
- * Cedar.ContentEntry
- *
- * basic content block class
- *
- * options:
- *
- * {
- *  el (element or jQuery selector)
- * }
- */
-Cedar.ContentEntry = function(options) {
+
+/*
+Cedar.ContentObject
+Parent class for all Cedar content object types
+*/
+Cedar.ContentObject = function(options) {
   var defaults = {
     el: '<div />'
   };
-
-  this.options = $.extend( {}, defaults, options );
-
-  this.cedarId = this.options.cedarId;
-  this.el = this.options.el;
-  this.$el = $(this.el);
-};
-
-Cedar.ContentEntry.prototype.apiGet = function() {
-  return '/objects/contententries/';
-};
-
-Cedar.ContentEntry.prototype.apiQuery = function() {
-  return '/queries/contententries/';
-};
-
-Cedar.ContentEntry.prototype.apiFilter = function() {
-  return 'guidfilter';
-};
-
-Cedar.ContentEntry.prototype.apiList = function() {
-  return 'guidlist';
+  this.options = $.extend({}, defaults, options);
+  this.$el = $(this.options.el);
 };
 
-/**
- * parse the json for content and set this object's content
- *
- * @param <json>
- */
-Cedar.ContentEntry.prototype.setContent = function(data) {
-  if (typeof data === 'string') {
-    data = JSON.parse(data);
-  }
+Cedar.ContentObject.prototype = {
+  render: function() {
+    this.load().then(function() {
+      this.$el.html(this.toString());
+    }.bind(this));
+  },
 
-  if (!data || data.code === 'UNKNOWN_ID'){
-    this.content = '';
-  } else if (data.settings.hasOwnProperty('content')) {
-    this.content = data.settings.content;
-  } else {
-    this.content = '';
-    Cedar.debug('Cedar Error: Unable to parse json');
-  }
-};
+  load: function() {
+    return Cedar.store.get(this.options.cedarId).then(function(data) {
+      this.setContent(data);
+      return this;
+    }.bind(this));
+  },
 
-/**
- * return the object's content - takes into account edit mode styling
- *
- * @return <HTML>
- */
-Cedar.ContentEntry.prototype.getContent = function(){
-  if (Cedar.auth.isEditMode()) {
-    return this.getEditOpen() + this.content + this.getEditClose();
-  }
-  else {
+  getContent: function() {
     return this.content;
+  },
+
+  setContent: function(data) {
+    this.content = data;
+  },
+
+  getContentWithEditTools: function() {
+    return this.getEditOpen() + this.getContent() + this.getEditClose();
+  },
+
+  toString: function() {
+    return Cedar.auth.isEditMode() ? this.getContentWithEditTools() : this.getContent();
+  },
+
+  toJSON: function() {
+    return {
+      content: this.getContent()
+    };
+  },
+
+  getEditOpen: function() {
+    var jsString = "if(event.stopPropagation){event.stopPropagation();}" +
+    "event.cancelBubble=true;" +
+    "window.location.href=this.attributes.href.value + \'&referer=' + encodeURIComponent(window.location.href) + '\';" +
+    "return false;";
+
+    var block = '<span class="cedar-cms-editable clearfix">';
+    block += '<span class="cedar-cms-edit-tools">';
+    block += '<a onclick="' + jsString + '" href="' + Cedar.config.server +
+             '/cmsadmin/EditData?cdr=1&t=ContentEntry&o=' +
+             encodeURIComponent(this.options.cedarId) +
+             '" class="cedar-cms-edit-icon cedar-js-edit" >';
+    block += '<i class="cedar-cms-icon cedar-cms-icon-right cedar-cms-icon-edit"></i></a>';
+    block += '</span>';
+    return block;
+  },
+
+  getEditClose: function() {
+    return '</span>';
   }
 };
 
-/**
- * is this a content entry json structure?
- *
- * @param <json>
- * @return <bool>
- */
-Cedar.ContentEntry.prototype.isContentEntry = function (json) {
-  if (json === undefined) {
-    return false;
-  }
-  if (json.hasOwnProperty('settings') && json.settings.hasOwnProperty('content')) {
-    return false;
-  }
-
-  return true;
-};
-
-/**
- * @return <json>
- */
-Cedar.ContentEntry.prototype.toJSON = function(){
-  return {
-    content: this.content
-  };
-};
+Cedar.ContentObject.prototype.constructor = Cedar.ContentObject;
 
-/**
- * fill self or provided element with content
- *
- * @param <element> optional
- */
-Cedar.ContentEntry.prototype.fill = function(element) {
-  if (element !== undefined) {
-    $(element).html(this.getContent());
-  } else if (this.$el instanceof jQuery) {
-    this.$el.html(this.getContent());
-  }
+/*
+Cedar.ContentEntry
+basic content block class
+*/
+Cedar.ContentEntry = function(options) {
+  Cedar.ContentObject.call(this, options);
 };
+Cedar.ContentEntry.prototype = Object.create(Cedar.ContentObject.prototype);
+Cedar.ContentEntry.prototype.constructor = Cedar.ContentEntry;
 
-/**
- * check store for this object's content
- */
-Cedar.ContentEntry.prototype.retrieve = function() {
-  return Cedar.store.get(this.cedarId).then(function(response) {
-    this.setContent(response);
-    return this;
-  }.bind(this));
+Cedar.ContentEntry.prototype.setContent = function(data) {
+  this.content = (data && (data.settings && data.settings.content)) || '';
 };
 
-/**
- * retrive and fill the associated element
- */
-Cedar.ContentEntry.prototype.render = function() {
-  this.retrieve().done(function() {
-    this.fill();
-  }.bind(this));
+/*
+Cedar.Program
+program object class
+*/
+Cedar.Program = function(options) {
+  Cedar.ContentObject.call(this, options);
 };
+Cedar.Program.prototype = Object.create(Cedar.ContentObject.prototype);
+Cedar.Program.prototype.constructor = Cedar.Program;
 
-/**
- * provides styling for edit box
- */
-Cedar.ContentEntry.prototype.getEditOpen = function() {
-  var jsString = "if(event.stopPropagation){event.stopPropagation();}" +
-  "event.cancelBubble=true;" +
-  "window.location.href=this.attributes.href.value + \'&referer=' + encodeURIComponent(window.location.href) + '\';" +
-  "return false;";
-
-  var block = '<span class="cedar-cms-editable clearfix">';
-  block += '<span class="cedar-cms-edit-tools">';
-  block += '<a onclick="' + jsString + '" href="' + Cedar.config.server +
-           '/cmsadmin/EditData?cdr=1&t=ContentEntry&o=' + encodeURIComponent(this.cedarId) +
-           '" class="cedar-cms-edit-icon cedar-js-edit" >';
-  block += '<i class="cedar-cms-icon cedar-cms-icon-right cedar-cms-icon-edit"></i></a>';
-  block += '</span>';
-  return block;
+Cedar.Program.prototype.setContent = function(data) {
+  this.content = (data && (data.settings && JSON.parse(data.settings.content))) || '';
 };
 
-Cedar.ContentEntry.prototype.getEditClose = function(){
-  return '</span>';
+Cedar.Program.prototype.toJSON = function(data) {
+  return this.content;
 };

data/lib/assets/stylesheets/cedar.scss

@@ -1,6 +1,6 @@
 /* This file should be used for any Rails-specific Sass code */
 
-@import 'cedar_source';
+@import 'cedar_source.css';
 
 .cedar-cms-icon {
   background-image: asset-url("cedar-display-tools-sprite.png");

data/lib/cedar/version.rb

@@ -1,3 +1,3 @@
 module Cedar
-  VERSION = "0.2.7.pre"
+  VERSION = "0.2.71.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cedar
 version: !ruby/object:Gem::Version
-  version: 0.2.7.pre
+  version: 0.2.71.pre
 platform: ruby
 authors:
 - Jed Murdock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,7 +51,7 @@ files:
 - lib/assets/javascripts/cedar.handlebars.js
 - lib/assets/javascripts/cedar.js
 - lib/assets/stylesheets/cedar.scss
-- lib/assets/stylesheets/cedar_source.scss
+- lib/assets/stylesheets/cedar_source.css
 - lib/cedar.rb
 - lib/cedar/version.rb
 homepage: http://plyinteractive.com