cedar 0.1.5.pre → 0.1.6.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94d2c597a7f479090911653296c9d179b97b7d04
-  data.tar.gz: a9f0edf34cf4e4b371c94918e4798aa7c99a6a89
+  metadata.gz: 864ddc8254855ea4cd9be8c882e123fc3008f751
+  data.tar.gz: bae1dc187c21c92183fe0a20c9f70f04e5c6bc56
 SHA512:
-  metadata.gz: 36937266911e61807abc29ebb2db7c33d83bfec1143fd2984f1a0d927442cb49468b7e45b15483feb1319b7ee8dd14f286d31b4cf14e4938e22595b9e9fe84e1
-  data.tar.gz: e0ba878e2c81318fa8600760ed82a2cf8862657c1e7ef0021908a20a14f352ad63b44bf6fb00f5a6cefcdff54cfca17d35f14a0b43561bdeeb499c500017cff3
+  metadata.gz: 981cc68bfbfee8548d4011d486260c0d13d7a25b65a1b3939e30bff87e033b7f988776d1154542549f1c0154d7eed9b84ecf2ca8cb10098233fa6d40b51b2b43
+  data.tar.gz: aff94b364525d5ffa1fc97b99a38f32467baa0529067ce92a36ff4821a991660fe8b11de172f868d203c1d051cf507fe78cc58aadf874d9a5831a5d3827e5a60

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cedar (0.1.5.pre)
+    cedar (0.1.6.pre)
 
 GEM
   remote: https://rubygems.org/

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

@@ -27,8 +27,20 @@ Handlebars.registerHelper('cedar', function(options) {
     });
   };
 
-  options.el = document.createElement("div");
-  options.el.setAttribute("style", "display: inline");
+  var blockHelperStyle = function() {
+    if (typeof options.fn === "function") {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  var tagName = options.hash.tagName || "span";
+  if (blockHelperStyle()) {
+    tagName = options.hash.tagName || "div";
+  }
+
+  options.el = document.createElement(tagName);
   options.el.id = "cedar-js-" + hashCode(options.hash.id);
 
   new Cedar.ContentEntry({ cedarId: options.hash.id }).retrieve().then(function(contentEntry){
@@ -38,9 +50,7 @@ Handlebars.registerHelper('cedar', function(options) {
       domEl = options.el;
     }
 
-    if (typeof options.fn === "undefined") { // If using inline-style helper
-      domEl.innerHTML = contentEntry.getContent();
-    } else if (typeof options.fn === "function") { // If using block-style helper
+    if (blockHelperStyle()) {
       var output = '';
       if (Cedar.auth.isEditMode()) {
         output += contentEntry.getEditOpen();
@@ -50,6 +60,8 @@ Handlebars.registerHelper('cedar', function(options) {
         output += contentEntry.getEditClose();
       }
       domEl.innerHTML = output;
+    } else {
+      domEl.innerHTML = contentEntry.getContent();
     }
   });
 

data/lib/assets/javascripts/cedar.js

@@ -6,8 +6,9 @@ var Cedar = {
   store: null,
   auth: null,
   config: {
-    api: 'http://jed.cdr.core.plyinc.dev/api',
-    server: 'http://jed.cdr.core.plyinc.dev'
+    api: '',
+    server: '',
+    debug: false
   }
 };
 
@@ -17,11 +18,22 @@ var Cedar = {
 *
 * take care of global initializations
 */
-Cedar.Init = function() {
+Cedar.Init = function(options) {
   if ( Cedar.initialized ) {
     return;
   }
 
+  if ( typeof options.server === 'undefined' ) {
+    throw 'Cedar Error: must provide "server" value on Init()';
+  }
+
+  Cedar.config.server = 'http://' + options.server;
+  Cedar.config.api = 'http://' + options.server + '/api';
+
+  if ( typeof options.debug !== 'undefined' && options.debug ) {
+    Cedar.config.debug = true;
+  }
+
   if ( Cedar.store === null ) {
     Cedar.store = new Cedar.Store();
   }
@@ -50,6 +62,11 @@ Cedar.Init = function() {
   Cedar.initialized = true;
 }
 
+Cedar.debug = function(msg) {
+  if (Cedar.config.debug) {
+    console.log(msg);
+  }
+}
 
 /**
  * Cedar.Auth
@@ -116,7 +133,7 @@ Cedar.Auth.prototype.removeURLParameter = function(url, parameter) {
  */
 Cedar.Store = function() {
   this.loaded = false;
-  console.log("loaded: " + this.loaded);
+  Cedar.debug("loaded: " + this.loaded);
   try {
     return 'localStorage' in window && window['localStorage'] !== null;
   } catch (e) {
@@ -139,12 +156,12 @@ Cedar.Store.prototype.get = function ( object, key ) {
     throw 'Cedar Error: must provide api "get" path';
   }
   if (typeof localStorage[key] !== "undefined") {
-    console.log('getting from cache');
+    Cedar.debug('getting from cache');
     return $.Deferred().resolve(localStorage[key]);
   } else {
-    console.log('getting from server...');
+    Cedar.debug('getting from server...');
     return $.getJSON(Cedar.config.api + object.apiGet() + key, function(json) {
-      console.log('got from server');
+      Cedar.debug('got from server');
       Cedar.store.put(key, json);
     });
   }
@@ -173,23 +190,23 @@ Cedar.Store.prototype.query = function ( path, param, value ) {
  * TODO: (currently hardcoded to content entries - should be avail to any type in future)
  */
 Cedar.Store.prototype.getAll = function () {
-  console.log("loaded: " + Cedar.store.loaded);
+  Cedar.debug("loaded: " + Cedar.store.loaded);
   return $.when(Cedar.store.checkData()).then( function() {
 
-    console.log("loaded: " + Cedar.store.loaded);
+    Cedar.debug("loaded: " + Cedar.store.loaded);
     if (Cedar.store.loaded) {
 
-      console.log("already loaded all items");
+      Cedar.debug("already loaded all items");
       return $.Deferred().resolve({});
 
     } else {
 
-      console.log("loading all items from server...");
+      Cedar.debug("loading all items from server...");
       return $.getJSON(Cedar.config.api + "/queries/contententries/" ).done( function(json) {
-        console.log("Got new stuff from the server");
+        Cedar.debug("Got new stuff from the server");
         $.each(json, function (key, val) {
           Cedar.store.put(val.id, val);
-          console.log("storing: " + val.id + " / " + val);
+          Cedar.debug("storing: " + val.id + " / " + val);
         });
         Cedar.store.loaded = true;
       });
@@ -209,7 +226,7 @@ Cedar.Store.prototype.clear = function(key) {
 }
 
 Cedar.Store.prototype.setVersion = function(id) {
-  console.log("updating to version #" + id);
+  Cedar.debug("updating to version #" + id);
   localStorage["___CEDAR__DATA__FINGERPRINT___"] = id;
 }
 Cedar.Store.prototype.getVersion = function() {
@@ -219,11 +236,11 @@ Cedar.Store.prototype.getVersion = function() {
  * Query the server for the latest version number (ie data freshness)
  */
 Cedar.Store.prototype.checkData = function() {
-  console.log("checking version #" + Cedar.store.getVersion());
+  Cedar.debug("checking version #" + Cedar.store.getVersion());
   return $.getJSON(Cedar.config.api + '/queries/status').done( function(json) {
 
     if ( Cedar.store.getVersion() != json.settings.version ) {
-      console.log("setting version");
+      Cedar.debug("setting version");
       Cedar.store.loaded = false;
       Cedar.store.setVersion(json.settings.version);
     }
@@ -247,8 +264,6 @@ Cedar.Store.prototype.checkData = function() {
  * }
  */
 Cedar.ContentEntry = function(options) {
-  Cedar.Init();
-
   var defaults = {
     el: 'div'
   };
@@ -292,7 +307,7 @@ Cedar.ContentEntry.prototype.setContent = function(json) {
   }
   else {
     this.content = '';
-    console.log('Cedar Error: Unable to parse json');
+    Cedar.debug('Cedar Error: Unable to parse json');
   }
 }
 
@@ -364,5 +379,3 @@ Cedar.ContentEntry.prototype.getEditOpen = function() {
 Cedar.ContentEntry.prototype.getEditClose = function(){
   return '</span>';
 }
-
-Cedar.Init();

data/lib/cedar/version.rb

@@ -1,3 +1,3 @@
 module Cedar
-  VERSION = "0.1.5.pre"
+  VERSION = "0.1.6.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cedar
 version: !ruby/object:Gem::Version
-  version: 0.1.5.pre
+  version: 0.1.6.pre
 platform: ruby
 authors:
 - Jed Murdock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler