cedar 0.1.1.pre → 0.1.2.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3e41500eb184aac2c9bc274cc802fffa66aee72
-  data.tar.gz: e58e773a697d69fe5601792b818fc84cad7ef7f6
+  metadata.gz: 3988489729a5845dbe10d9de748a5dda45fecc1b
+  data.tar.gz: eb6c4a3546167231d00c5897af33684041594ca8
 SHA512:
-  metadata.gz: 2c81982f965d4ffce99a1c2f4d6ba85724688ef98c703c96a017fe4375e99c286d6efe2ce09c7c428f716d4f7cca5e6d6fa0dd29762ed4763e900507b68b8a44
-  data.tar.gz: 811ade0d0b27c6f2f7afb06aa7dd4584a92a9117c8b912fde7d8bdda66e5d925fa845df33375ba2beee03b7d9d6c1ae036e75c9743c12883f69a3c54e5c82ec0
+  metadata.gz: 35109e6090763faadbea1fb0f6f7ebf562ab79ccf2cf272f085b9c697e761aec545f1094857b84237376baea9062e1d99105390f8d737874da55dc2d2d1e4080
+  data.tar.gz: a875809c4d21d0a15d3329e4b5fea6714c1aa70795aa24a156171c99551da74ab85bf68099fdb8e29e94ae23e5021c77d1c2ed01f0492c9f8d65e689f7ed0fcf

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

@@ -0,0 +1,48 @@
+Handlebars.registerHelper('cedar', function(options) {
+  "use strict";
+
+  var hashCode = function(string) {
+    var hash = 0;
+    if (string.length == 0) return hash;
+    for (var i = 0; i < string.length; i++) {
+      var character = string.charCodeAt(i);
+      hash = ((hash << 5) - hash) + character;
+      hash = hash & hash; // Convert to 32bit integer
+    }
+    return hash;
+  };
+
+  var unescapeHtml = function(string) {
+    var MAP = {
+      '&amp;': '&',
+      '&lt;': '<',
+      '&gt;': '>',
+      '&quot;': '"',
+      '&#39;': "'",
+      '&#x27;': "'"
+    };
+
+    return string.replace(/&#?\w+;/g, function(c) {
+      return MAP[c];
+    });
+  };
+
+  options.el = document.createElement("div");
+  options.el.id = "cedar-js-" + hashCode(options.hash.id);
+
+  new Cedar.ContentEntry({ cedarId: options.hash.id }).retrieve().then(function(contentEntry){
+
+    var domEl = document.getElementById(options.el.id);
+    if (domEl === null) {
+      domEl = options.el;
+    }
+
+    if (typeof options.fn === "undefined") {
+      domEl.innerHTML = contentEntry.getContent();
+    } else if (typeof options.fn === "function") {
+      domEl.innerHTML = unescapeHtml(options.fn(contentEntry.toJSON()));
+    }
+  });
+
+  return new Handlebars.SafeString(options.el.outerHTML);
+});

data/lib/assets/javascripts/cedar.js

@@ -34,7 +34,10 @@ Cedar.Init = function() {
     $(document).ready(function() {
       var $body = $('body');
       var globalActions = '<div class="cedar-cms-global-actions">' +
-        // '<a href="#" onclick="window.location.reload(true);return false;">[refresh]</a>' +
+        '<a href="#" class="cedar-cms-global-action" onclick="window.location.reload();">' +
+        '<span class="cedar-cms-icon cedar-cms-icon-edit"></span> ' +
+        '<span class="cedar-cms-global-action-label">Refresh</span>' +
+        '</a><br>' +
         '<a class="cedar-cms-global-action" href="' + Cedar.auth.getLogOffURL() + '">' +
         '<span class="cedar-cms-icon cedar-cms-icon-edit"></span> ' +
         '<span class="cedar-cms-global-action-label">Log Off Cedar</span>' +
@@ -107,35 +110,90 @@ Cedar.Auth.prototype.removeURLParameter = function(url, parameter) {
  * Cedar.Store
  *
  * responsible for retrieving Cedar elements from server or local cache.
+ *
+ * different cedar types may use different api paths, therefore the paths
+ * are passed into some functions
  */
 Cedar.Store = function() {
-  this._cache = {};
+  this.loaded = false;
+  try {
+    return 'localStorage' in window && window['localStorage'] !== null;
+  } catch (e) {
+    return false;
+  }
 }
 
 Cedar.Store.prototype.put = function ( key, item ) {
-  this._cache[key] = item;
+  localStorage[key] = JSON.stringify(item);
 }
 
-// different cedar types may use different api paths
-Cedar.Store.prototype.find = function ( key, getPath ) {
-  if ( getPath === null )
-    console.log('Cedar Error: must provide api "get" path');
+/**
+ * get a single item based on id (key)
+ * if the item isn't in the local store, then get it from the server
+ *
+ * @param Cedar 'object'
+ * @param string 'key'
+ */
+Cedar.Store.prototype.get = function ( object, key ) {
+  if ( object.apiGet() === null ) {
+    throw 'Cedar Error: must provide api "get" path';
+  }
 
-  if (typeof this._cache[key] === 'undefined'){
-    return $.getJSON(Cedar.config.api + getPath + key, function(json) {
+  if (typeof localStorage[key] !== "undefined") {
+    console.log('retrieved from cache');
+    return $.Deferred().resolve(localStorage[key]);
+  } else {
+    console.log('retrieved from server');
+    return $.getJSON(Cedar.config.api + object.apiGet() + key, function(json) {
       this.put(key, json);
-      console.log('retrieved from server');
     }.bind(this));
   }
-  else {
-    console.log('retrieved from cache');
-    return $.Deferred().resolve(this._cache[key]);
+}
+
+/**
+ * query the api and fill the local store with the results
+ *
+ * @param string 'path'
+ * @param string 'param'
+ * @param string 'value'
+ *
+ */
+Cedar.Store.prototype.query = function ( path, param, value ) {
+
+  jQuery.getJSON(Cedar.config.api + path + '?' + param + '=' + value ).done( function(json) {
+    $.each(json, function (key, val){
+      Cedar.store.put(key, val);
+    });
+  }.bind(this));
+
+}
+
+/**
+ * get all objects and store locally
+ * TODO: (currently hardcoded to content entries - should be avail to any type in future)
+ */
+Cedar.Store.prototype.getAll = function () {
+
+  if (this.loaded) {
+    return $.Deferred().resolve({});
+  } else {
+    return $.getJSON(Cedar.config.api + "/queries/contententries/" ).done( function(json) {
+      $.each(json, function (key, val) {
+        this.put(val.id, val);
+        this.loaded = true;
+      }.bind(this));
+    }.bind(this));
   }
-  return false;
+
 }
 
+/**
+ * remove a single locally store item by key
+ *
+ * @param ID key
+ */
 Cedar.Store.prototype.clear = function(key) {
-  delete this._cache[key];
+  localStorage.removeItem(key);
 }
 
 
@@ -164,11 +222,32 @@ Cedar.ContentEntry = function(options) {
   this.cedarId = this.options.cedarId;
   this.el = this.options.el;
   this.$el = $(this.el);
-  this.apiGet = '/objects/contententries/';
 }
 
+Cedar.ContentEntry.query = function(thing) {
+  Cedar.store.query( "/queries/contententries/", "guidfilter", thing );
+}
+
+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";
+};
+
+
 // parse the json for the relevant content
 Cedar.ContentEntry.prototype.setContent = function(json) {
+  if (typeof json === "undefined") return;
   if (json.code == "UNKNOWN_ID"){
     this.content = '&nbsp;'; // if an element is new, fill with blank space to allow edit box to display
   }
@@ -209,12 +288,20 @@ Cedar.ContentEntry.prototype.fill = function(element) {
 
 // check store for content
 Cedar.ContentEntry.prototype.retrieve = function() {
-  return Cedar.store.find(this.cedarId, this.apiGet ).then(function(response) {
+  return Cedar.store.get(this, this.cedarId).then(function(response) {
+    if (typeof response === "string") {
+      response = JSON.parse(response);
+    }
     this.setContent(response);
     return this;
   }.bind(this));
 }
 
+// query filtered on object name matches
+Cedar.ContentEntry.prototype.query = function(filter) {
+  return Cedar.store.query(filter, this);
+}
+
 // fill the asssociated element with the retrieved content
 Cedar.ContentEntry.prototype.render = function() {
   this.retrieve().done(function() {
@@ -241,3 +328,5 @@ Cedar.ContentEntry.prototype.getEditOpen = function(id) {
 Cedar.ContentEntry.prototype.getEditClose = function(){
   return '</span>';
 }
+
+Cedar.Init();

data/lib/cedar/version.rb

@@ -1,3 +1,3 @@
 module Cedar
-  VERSION = "0.1.1.pre"
+  VERSION = "0.1.2.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cedar
 version: !ruby/object:Gem::Version
-  version: 0.1.1.pre
+  version: 0.1.2.pre
 platform: ruby
 authors:
 - Jed Murdock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-14 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,6 +51,7 @@ files:
 - Rakefile
 - cedar.gemspec
 - lib/assets/images/cedar-display-tools-sprite.png
+- lib/assets/javascripts/cedar.handlebars.js
 - lib/assets/javascripts/cedar.js
 - lib/assets/javascripts/cedar.marionette.js
 - lib/assets/javascripts/cedarInit.js.erb
@@ -65,6 +66,7 @@ files:
 - pkg/cedar-0.0.8.pre.gem
 - pkg/cedar-0.0.9.pre.gem
 - pkg/cedar-0.1.0.pre.gem
+- pkg/cedar-0.1.1.pre.gem
 homepage: http://plyinteractive.com
 licenses:
 - MIT