cedar 0.2.75.pre → 0.2.77.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8253c7cd2893000d1de5444f423af695008e01fc
-  data.tar.gz: b6262ffdb67d035a7256d022c41bd5e662cbe845
+  metadata.gz: b63877f8b178af1ed5069637495d6aeb9006e933
+  data.tar.gz: f03d617296b6bd81a5947174b11cf0fa38294763
 SHA512:
-  metadata.gz: 52eb54e19bceb547f2d670798343809715ad43813397a493497963d7cbc983638e84a65d8d50f61efbbac45567c483cc145f669182cd9fa50e7cf8620ff460e7
-  data.tar.gz: b7b54fbf1f0adb1347b3189bedc775cf9a7e12a4032b1e97128922a5da0d3269b2a0bc21bafbca939075c72d5eabd5e53878025e202ae4644df216e8c30e4383
+  metadata.gz: 8e4763372fb260e068e9372900311372b5c1f4bdbb856a19658b7946959c84f20a49b27ad1e2eb0d276364601d658aec76e57ce3e327a22058117e7c2fe42537
+  data.tar.gz: d62a6ace3bac056ee9517f046e389fbb73c401732615f81f7bf31afefcc95bdc43e2a45acd892fec9223a424d9de906c264171846caf80100a8bf78eefb1b09d

data/lib/assets/javascripts/cedar_config.js.erb

@@ -1,3 +1,9 @@
 window.Cedar = window.Cedar || {};
 window.Cedar.config = window.Cedar.config || {};
+window.Cedar.config.server = "<%= Cedar.config.server %>"
+window.Cedar.config.debug = <%= Cedar.config.debug %>
+window.Cedar.config.wait = <%= Cedar.config.wait %>
+window.Cedar.config.fetch = <%= Cedar.config.fetch %>
+window.Cedar.config.forceHttps = <%= Cedar.config.force_https %>
+window.Cedar.config.objectNameFilter = "<%= Cedar.config.object_name_filter %>"
 window.Cedar.config.liveMode = <%= Cedar.config.live_mode %>

data/lib/assets/javascripts/cedar_handlebars.js

@@ -64,18 +64,22 @@ Handlebars.registerHelper('cedar', function(options) {
   var output = '';
 
   var type = options.hash.type || 'ContentEntry';
+  var cedarClass = blockHelperStyle() ? 'ContentObject' : 'ContentEntry'
+
+  Cedar.store.get(type, {id: options.hash.id}).then(function(data){
+    var cedarObject = new window.Cedar[cedarClass]({ cedarId: options.hash.id, cedarType: type, defaultContent: options.hash.default });
+    cedarObject.setContent(data);
 
-  new window.Cedar[type]({ cedarId: options.hash.id, defaultContent: options.hash.default }).load().then(function(contentEntry){
     if (blockHelperStyle()) {
       if (Cedar.auth.isEditMode()) {
-        output += contentEntry.getEditOpen();
+        output += cedarObject.getEditOpen();
       }
-      output += unescapeHtml(options.fn(contentEntry.toJSON()));
+      output += unescapeHtml(options.fn(cedarObject.toJSON()));
       if (Cedar.auth.isEditMode()) {
-        output += contentEntry.getEditClose();
+        output += cedarObject.getEditClose();
       }
     } else {
-      output = contentEntry.toString();
+      output = cedarObject.toString();
     }
 
     replaceElement(outputEl.id, output);

data/lib/assets/javascripts/cedar_source.js

@@ -7,9 +7,7 @@ window.Cedar = $.extend({}, window.Cedar, {
   store: null,
   auth: null
 });
-window.Cedar.config = window.Cedar.config || {
-  liveMode: true
-};
+window.Cedar.config = window.Cedar.config || {};
 
 /**
 * Cedar.Init
@@ -52,10 +50,12 @@ Cedar.Application = function(options) {
     debug: false,
     fetch: true,
     wait: false,
-    forceHttps: false
+    forceHttps: false,
+    objectNameFilter: '',
+    liveMode: true
   };
 
-  this.options = $.extend({}, defaults, options);
+  this.options = $.extend({}, $.extend({}, window.Cedar.config, defaults), options);
 
   if (this.options.server === undefined) {
     throw 'Cedar Error: must provide "server" value on Init()';
@@ -66,6 +66,8 @@ Cedar.Application = function(options) {
   Cedar.config.debug = this.options.debug;
   Cedar.config.wait = this.options.wait;
   Cedar.config.fetch = this.options.fetch;
+  Cedar.config.objectNameFilter = this.options.objectNameFilter;
+  Cedar.config.liveMode = this.options.liveMode;
 
   if (Cedar.events === undefined) {
     Cedar.events = new Cedar.Events();
@@ -243,18 +245,23 @@ Cedar.Store = function() {
 };
 
 /**
- * store a single json item by key
- *
- * @param <string> 'key'
- * @param <json> 'item'
+ * get formatted version of type
+ */
+Cedar.Store.prototype.formattedType = function (type) {
+  return "cedar_" + s(_(type).pluralize()).underscored().value();
+};
+
+/**
+ * store a collection of items by type
  */
-Cedar.Store.prototype.put = function ( key, item ) {
-  this.cache[key] = typeof item === "string" ? item : JSON.stringify(item);
+Cedar.Store.prototype.putCollection = function ( type, collection ) {
+  var formattedType = this.formattedType(type);
+  this.cache[formattedType] = JSON.stringify(collection);
 };
 
 // Return promise of parsed content from local or remote storage
-Cedar.Store.prototype.get = function(key) {
-  return this.getDeferred(key).then(function(data) {
+Cedar.Store.prototype.get = function(type, attributes) {
+  return this.getDeferred(this.formattedType(type), attributes).then(function(data) {
     try {
       return JSON.parse(data);
     } catch (e) {
@@ -263,29 +270,43 @@ Cedar.Store.prototype.get = function(key) {
   });
 };
 
+// Retrieve the locally-stored model or collection if it exists
+Cedar.Store.prototype.cachedObject = function(type, attributes) {
+  var cachedCollection = _((this.cache[type] && JSON.parse(this.cache[type]) || []));
+  var result;
+  if (attributes && attributes.hasOwnProperty('id')) {
+    result = cachedCollection.findWhere(attributes);
+  } else {
+    result = cachedCollection.where(attributes);
+  }
+  return result;
+};
+
 // 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);
+Cedar.Store.prototype.getDeferred = function(type, attributes) {
+  var cachedDeferred = this.cachedDeferred(type, attributes);
+  var remoteDeferred = this.remoteDeferred(type, attributes);
 
-  if (Cedar.config.wait || !this.cache[key]) {
-    Cedar.debug('checking remote: ' + key);
+  if (Cedar.config.wait || _(this.cachedObject(type, attributes)).isEmpty()) {
+    if (Cedar.config.liveMode) {
+      Cedar.debug('checking remote: ' + type + '/' + JSON.stringify(attributes));
+    }
     return remoteDeferred;
   } else {
-    Cedar.debug('get from cache: ' + key);
+    Cedar.debug('get from cache: ' + type + '/' + JSON.stringify(attributes));
     return cachedDeferred;
   }
 };
 
 // Deferred object containing local content
-Cedar.Store.prototype.cachedDeferred = function(key) {
-  return $.Deferred().resolve(this.cache[key]);
+Cedar.Store.prototype.cachedDeferred = function(type, attributes) {
+  return $.Deferred().resolve(this.cachedObject(type, attributes));
 };
 
 // Refresh local storage if needed and then return content
-Cedar.Store.prototype.remoteDeferred = function(key) {
+Cedar.Store.prototype.remoteDeferred = function(type, attributes) {
   return this.refresh().then(function() {
-    return this.cachedDeferred(key);
+    return this.cachedDeferred(type, attributes);
   }.bind(this));
 };
 
@@ -303,23 +324,23 @@ Cedar.Store.prototype.refresh = function() {
 // Get content objects from server and save to local storage
 Cedar.Store.prototype.getRemote = function(options) {
   var defaultOptions = {
-    path: '/queries/contententries/'
+    path: '/queries/all/'
   };
   options = $.extend({}, defaultOptions, options);
   var defaultParams = {};
   var params = $.extend({}, defaultParams, {
-    guidfilter: options.filter
+    filter: Cedar.config.objectNameFilter,
+    references: "all",
+    expand: "yes"
   });
 
   return this.lockedRequest({
     path: options.path,
     params: params,
     success: function(response) {
-      $.each(response, function (index, value) {
-        if (value.hasOwnProperty('id') && value.settings.hasOwnProperty('content')) {
-          this.put(value.id, value);
-          Cedar.debug("storing: " + value.id);
-        }
+      _.chain(response).each(function(collection, type) {
+        this.putCollection(type, collection);
+        Cedar.debug("storing: " + type);
       }.bind(this));
       Cedar.debug("local storage was updated");
       this.loaded = true;
@@ -415,6 +436,7 @@ Parent class for all Cedar content object types
 */
 Cedar.ContentObject = function(options) {
   var defaults = {
+    cedarType: 'ContentEntry',
     el: '<div />'
   };
   this.options = $.extend({}, defaults, options);
@@ -429,18 +451,18 @@ Cedar.ContentObject.prototype = {
   },
 
   load: function() {
-    return Cedar.store.get(this.options.cedarId).then(function(data) {
+    return Cedar.store.get(this.options.cedarType, this.options.cedarId).then(function(data) {
       this.setContent(data);
       return this;
     }.bind(this));
   },
 
   getContent: function() {
-    return this.content || this.options.defaultContent;
+    return (this.content || this.options.defaultContent) || '';
   },
 
   setContent: function(data) {
-    this.content = data;
+    this.content = data || '';
   },
 
   getContentWithEditTools: function() {
@@ -452,9 +474,11 @@ Cedar.ContentObject.prototype = {
   },
 
   toJSON: function() {
-    return {
-      content: this.getContent()
-    };
+    return _.chain(this.content)
+      .pairs()
+      .map(function(pair) { return [ s.camelize(pair[0]), pair[1] ]; })
+      .object()
+      .value();
   },
 
   getEditOpen: function() {
@@ -466,7 +490,9 @@ Cedar.ContentObject.prototype = {
     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=' +
+             '/cmsadmin/EditData?cdr=1&t=' +
+             this.options.cedarType +
+             '&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>';
@@ -492,23 +518,11 @@ Cedar.ContentEntry.prototype = Object.create(Cedar.ContentObject.prototype);
 Cedar.ContentEntry.prototype.constructor = Cedar.ContentEntry;
 
 Cedar.ContentEntry.prototype.setContent = function(data) {
-  this.content = (data && (data.settings && data.settings.content)) || '';
-};
-
-/*
-Cedar.Program
-program object class
-*/
-Cedar.Program = function(options) {
-  Cedar.ContentObject.call(this, options);
+  this.content = (data && data.content) || '';
 };
-Cedar.Program.prototype = Object.create(Cedar.ContentObject.prototype);
-Cedar.Program.prototype.constructor = Cedar.Program;
 
-Cedar.Program.prototype.setContent = function(data) {
-  this.content = (data && (data.settings && JSON.parse(data.settings.content))) || '';
-};
-
-Cedar.Program.prototype.toJSON = function(data) {
-  return this.content;
+Cedar.ContentEntry.prototype.toJSON = function(data) {
+  return {
+    content: this.getContent()
+  };
 };

data/lib/cedar/config.rb

@@ -5,9 +5,15 @@
 
 module Cedar
   class Config
-    attr_accessor :live_mode
+    attr_accessor :server, :debug, :wait, :fetch, :force_https, :object_name_filter, :live_mode
 
     def initialize
+      @server = ''
+      @debug = false
+      @wait = false
+      @fetch = true
+      @force_https = false
+      @object_name_filter = ''
       @live_mode = true
     end
   end

data/lib/cedar/version.rb

@@ -1,3 +1,3 @@
 module Cedar
-  VERSION = "0.2.75.pre"
+  VERSION = "0.2.77.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cedar
 version: !ruby/object:Gem::Version
-  version: 0.2.75.pre
+  version: 0.2.77.pre
 platform: ruby
 authors:
 - Jed Murdock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler