luca 0.8.3 → 0.8.06

data/CHANGELOG

@@ -1,16 +1,3 @@
 0.7.3:
   - Models being loaded by the FormView will now call
-    beforeFormLoad methods if they exist on those models
-
-0.8.1
-  - Adds many style fixes for GridView
-  - Fixes style conflicts for Bootstrap grid-* css selectors
-  - Adds getForm() and getModel() methods to Luca.Field classes that belong to a form
-
-0.8.2
-  - Adds checkbox group field component ( thanks nick desteffen )
-
-0.8.3
-  - Stop mixing in underscore.string onto the global underscore object
-  - the ctype property used to create objects from hashes, can now be named 'type'
-  - Adds Luca.util.classify function for converting strings into class names
+    beforeFormLoad methods if they exist on those models

data/Guardfile

@@ -5,23 +5,18 @@ javascript_path = File.join( assets_path, 'javascripts' )
 stylesheets_path = File.join( assets_path, 'stylesheets' )
 
 unless ENV['TEST_MODE']
-  unless ENV['SKIP_JAVASCRIPTS']
-    guard 'sprockets2', :clean=>false, :assets_path => javascript_path, :sprockets => App.sprockets, :precompile=>[/^luca-ui.+(coffee|js)$/], :digest => false, :gz => false do
-      watch(%r{^src/.+$})
-      watch(%r{^spec/.+$})
-    end
+  guard 'sprockets2', :clean=>false, :assets_path => javascript_path, :sprockets => App.sprockets, :precompile=>[/^luca-ui.+(coffee|js)$/], :digest => false, :gz => false do
+    watch(%r{^src/.+$})
+    watch(%r{^spec/.+$})
   end
 
-  unless ENV['SKIP_STYLESHEETS']
-    guard 'sprockets2', :clean=>false, :assets_path => stylesheets_path, :sprockets => App.sprockets, :precompile=>[/^luca-ui.+(scss|css)$/], :digest => false, :gz => false do
-      watch(%r{^src/stylesheets/.+$})
-    end
+  guard 'sprockets2', :clean=>false, :assets_path => stylesheets_path, :sprockets => App.sprockets, :precompile=>[/^luca-ui.+(scss|css)$/], :digest => false, :gz => false do
+    watch(%r{^src/stylesheets/.+$})
   end
 end
 
-unless ENV['COMPILE_MODE']
-  guard 'jasmine' do
-    watch(%r{src/(.+)\.coffee}) {|m| "spec/#{ m[1] }_spec.coffee" }
-    watch(%r{spec/(.+)_spec\.coffee})
-  end
+# TODO: Couldn't detect phantomjs
+guard 'jasmine' do
+  watch(%r{src/(.+)\.coffee}) {|m| "spec/#{ m[1] }_spec.coffee" }
+  watch(%r{spec/(.+)_spec\.coffee})
 end

data/lib/luca/rails/version.rb

@@ -1,6 +1,6 @@
 module Luca
   module Rails
-    VERSION = "0.8.3"
+    VERSION = "0.8.06"
   end
 end
 

data/src/components/collection_loader_view.coffee

@@ -24,10 +24,9 @@ Luca.components.CollectionLoaderView = Luca.components.Template.extend
       loaded   = @manager.loadedCollectionsCount()
       total    = @manager.totalCollectionsCount()
       progress = parseInt((loaded / total) * 100)
-      collectionName = _.string.titleize( _.string.humanize( name ) )
 
       @modalContainer().find('.progress .bar').attr("style", "width: #{progress}%;")
-      @modalContainer().find('.message').html("Loaded #{ collectionName }...")
+      @modalContainer().find('.message').html("Loaded #{ _(name).chain().humanize().titleize().value() }...")
 
     @manager.bind "all_collections_loaded", ()=>
       @modalContainer().find('.message').html("All done!")

data/src/components/form_view.coffee

@@ -93,15 +93,8 @@ Luca.components.FormView = Luca.core.Container.extend
     _( @components ).each (component)->
       component.container = container
 
-  afterComponents: ()->
-    Luca.core.Container::afterComponents?.apply(@, arguments)
-    @eachField (field)=>
-      field.getForm = ()=> @
-      field.getModel = ()=> @currentModel()
-
   render: ()->
     $( @container ).append( @$el )
-    @
 
   wrapper: ()->
     @$el.parents('.luca-ui-form-view-wrapper')
@@ -115,9 +108,6 @@ Luca.components.FormView = Luca.core.Container.extend
         toolbar = Luca.util.lazyComponent(toolbar)
         toolbar.render()
 
-  eachField: (iterator)->
-    _( @getFields() ).map( iterator )
-
   getField: (name)->
     _( @getFields('name', name) ).first()
 
@@ -200,8 +190,8 @@ Luca.components.FormView = Luca.core.Container.extend
 
       skip = false
       skip = true if options.skip_buttons and field.ctype is "button_field"
-      skip = true if options.reject_blank is true and _.string.isBlank(value)
-      skip = true if field.input_name is "id" and _.string.isBlank(value)
+      skip = true if options.reject_blank is true and _.isBlank(value)
+      skip = true if field.input_name is "id" and _.isBlank(value)
 
       memo[ key ] = value unless skip is true
 

data/src/core/container.coffee

@@ -182,7 +182,6 @@ Luca.core.Container = Luca.View.extend
         console.log "Error Rendering Component #{ component.name || component.cid }", component
         console.log e.message
         console.log e.stack
-        throw e unless Luca.silenceRenderErrors? is true
 
   #### Container Activation
   #

data/src/core/view.coffee

@@ -141,7 +141,7 @@ _.extend Luca.View.prototype,
       parts = eventId.split(':')
       prefix = parts.shift()
 
-      parts = _( parts ).map (p)-> _.string.capitalize(p)
+      parts = _( parts ).map (p)-> _.capitalize(p)
       fn = prefix + parts.join('')
 
       @bind eventId, ()=> @[fn].apply @, arguments if @[fn]

data/src/framework.coffee

@@ -1,17 +1,19 @@
+_.mixin( _.string )
+
 window.Luca =
-  VERSION: "0.8.3"
+  VERSION: "0.8.06"
   core: {}
   containers: {}
   components: {}
   modules: {}
-  util: {}
   fields: {}
-  component_cache:
-    cid_index: {}
-    name_index: {}
+  util: {}
   registry:
     classes: {}
     namespaces:["Luca.containers","Luca.components"]
+  component_cache:
+    cid_index: {}
+    name_index: {}
 
 
 # let's use the Twitter 2.0 Bootstrap Framework
@@ -56,18 +58,12 @@ Luca.cache = (needle, component)->
   Luca.component_cache.cid_index[ lookup_id ]
 
 # Takes an string like "deep.nested.value" and an object like window
-# and returns the value of window.deep.nested.value.  useful for defining
-# references on objects which don't yet exist, as strings, which get
-# evaluated at runtime when such references will be available
+# and returns the value of window.deep.nested.value
 Luca.util.nestedValue = (accessor, source_object)->
   _( accessor.split(/\./) ).inject (obj,key)->
     obj = obj?[key]
   , source_object
 
-# turns a word like form_view into FormView
-Luca.util.classify = (string="")->
-  _.string.camelize( _.string.capitalize( string ) )
-
 # Lookup a component in the Luca component registry
 # by it's ctype identifier.  If it doesn't exist,
 # check any other registered namespace
@@ -76,18 +72,16 @@ Luca.registry.lookup = (ctype)->
 
   return c if c?
 
-  className = Luca.util.classify(ctype)
+  className = _.camelize _.capitalize( ctype )
 
   parents = _( Luca.registry.namespaces ).map (namespace)-> Luca.util.nestedValue(namespace, (window || global))
 
   _.first _.compact _( parents ).map (parent)-> parent[className]
 
-# one of the main benefits of Luca is the ability to structure your app as
-# large blocks of JSON configuration.  In order to convert an object into
-# a Luca component, we lookup the object's class by converting its ctype / type
-# property into a class that has been registered in the component registry
+# creates a new object from a hash with a ctype property
+# matching something in the Luca registry
 Luca.util.lazyComponent = (config)->
-  ctype = config.ctype || config.type
+  ctype = config.ctype
 
   componentClass = Luca.registry.lookup( ctype )
 
@@ -102,7 +96,7 @@ Luca.register = (component, constructor_class)->
   exists = Luca.registry.classes[component]
 
   if exists?
-    console.log "Can not register component with the signature #{ component }. Already exists"
+    throw "Can not register component with the signature #{ component }. Already exists"
   else
     Luca.registry.classes[component] = constructor_class
 

data/src/managers/collection_manager.coffee

@@ -125,7 +125,7 @@ class Luca.CollectionManager
     @get(key) || @create(key,collectionOptions,initialModels,false)
 
   guessCollectionClass: (key)->
-    classified = Luca.util.classify( key )
+    classified = _( key ).chain().capitalize().camelize().value()
     guess = (@collectionNamespace || (window || global) )[ classified ]
     guess ||= (@collectionNamespace || (window || global) )[ "#{classified}Collection" ]
     guess

data/vendor/assets/javascripts/luca-ui-base.js

@@ -1,20 +1,22 @@
 (function() {
 
+  _.mixin(_.string);
+
   window.Luca = {
-    VERSION: "0.8.3",
+    VERSION: "0.8.06",
     core: {},
     containers: {},
     components: {},
     modules: {},
-    util: {},
     fields: {},
-    component_cache: {
-      cid_index: {},
-      name_index: {}
-    },
+    util: {},
     registry: {
       classes: {},
       namespaces: ["Luca.containers", "Luca.components"]
+    },
+    component_cache: {
+      cid_index: {},
+      name_index: {}
     }
   };
 
@@ -57,16 +59,11 @@
     }, source_object);
   };
 
-  Luca.util.classify = function(string) {
-    if (string == null) string = "";
-    return _.string.camelize(_.string.capitalize(string));
-  };
-
   Luca.registry.lookup = function(ctype) {
     var c, className, parents;
     c = Luca.registry.classes[ctype];
     if (c != null) return c;
-    className = Luca.util.classify(ctype);
+    className = _.camelize(_.capitalize(ctype));
     parents = _(Luca.registry.namespaces).map(function(namespace) {
       return Luca.util.nestedValue(namespace, window || global);
     });
@@ -77,7 +74,7 @@
 
   Luca.util.lazyComponent = function(config) {
     var componentClass, constructor, ctype;
-    ctype = config.ctype || config.type;
+    ctype = config.ctype;
     componentClass = Luca.registry.lookup(ctype);
     if (!componentClass) {
       throw "Invalid Component Type: " + ctype + ".  Did you forget to register it?";
@@ -90,7 +87,7 @@
     var exists;
     exists = Luca.registry.classes[component];
     if (exists != null) {
-      return console.log("Can not register component with the signature " + component + ". Already exists");
+      throw "Can not register component with the signature " + component + ". Already exists";
     } else {
       return Luca.registry.classes[component] = constructor_class;
     }
@@ -269,14 +266,6 @@
   Luca.templates || (Luca.templates = {});
   Luca.templates["fields/button_field_link"] = function(obj){var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('<a class=\'btn ', input_class ,'\'>\n  '); if(icon_class.length) { __p.push('\n  <i class=\'', icon_class ,'\'></i>\n  '); } __p.push('\n  ', input_value ,'\n</a>\n');}return __p.join('');};
 }).call(this);
-(function() {
-  Luca.templates || (Luca.templates = {});
-  Luca.templates["fields/checkbox_array"] = function(obj){var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('<div class=\'form-horizontal\'>\n  <div class=\'control-group\'>\n    <label for=\'', input_id ,'\'>\n      ', label ,'\n    </label>\n    <div class=\'controls\'></div>\n  </div>\n</div>\n');}return __p.join('');};
-}).call(this);
-(function() {
-  Luca.templates || (Luca.templates = {});
-  Luca.templates["fields/checkbox_array_item"] = function(obj){var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('<label for=\'', input_id ,'\'>\n  <input id=\'', input_id ,'\' name=\'', input_name ,'\' type=\'checkbox\' value=\'', value ,'\' />\n  ', label ,'\n</label>\n');}return __p.join('');};
-}).call(this);
 (function() {
   Luca.templates || (Luca.templates = {});
   Luca.templates["fields/checkbox_field"] = function(obj){var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('<label for=\'', input_id ,'\'>\n  ', label ,'\n  <input name=\'', input_name ,'\' style=\'', inputStyles ,'\' type=\'checkbox\' value=\'', input_value ,'\' />\n</label>\n'); if(helperText) { __p.push('\n<p class=\'helper-text help-block\'>\n  ', helperText ,'\n</p>\n'); } __p.push('\n');}return __p.join('');};
@@ -447,7 +436,7 @@
         parts = eventId.split(':');
         prefix = parts.shift();
         parts = _(parts).map(function(p) {
-          return _.string.capitalize(p);
+          return _.capitalize(p);
         });
         fn = prefix + parts.join('');
         return _this.bind(eventId, function() {
@@ -924,8 +913,7 @@
         } catch (e) {
           console.log("Error Rendering Component " + (component.name || component.cid), component);
           console.log(e.message);
-          console.log(e.stack);
-          if ((Luca.silenceRenderErrors != null) !== true) throw e;
+          return console.log(e.stack);
         }
       });
     },
@@ -1107,7 +1095,7 @@
 
     CollectionManager.prototype.guessCollectionClass = function(key) {
       var classified, guess;
-      classified = Luca.util.classify(key);
+      classified = _(key).chain().capitalize().camelize().value();
       guess = (this.collectionNamespace || (window || global))[classified];
       guess || (guess = (this.collectionNamespace || (window || global))["" + classified + "Collection"]);
       return guess;

data/vendor/assets/javascripts/luca-ui-spec.js

@@ -1,20 +1,22 @@
 (function() {
 
+  _.mixin(_.string);
+
   window.Luca = {
-    VERSION: "0.8.3",
+    VERSION: "0.8.06",
     core: {},
     containers: {},
     components: {},
     modules: {},
-    util: {},
     fields: {},
-    component_cache: {
-      cid_index: {},
-      name_index: {}
-    },
+    util: {},
     registry: {
       classes: {},
       namespaces: ["Luca.containers", "Luca.components"]
+    },
+    component_cache: {
+      cid_index: {},
+      name_index: {}
     }
   };
 
@@ -57,16 +59,11 @@
     }, source_object);
   };
 
-  Luca.util.classify = function(string) {
-    if (string == null) string = "";
-    return _.string.camelize(_.string.capitalize(string));
-  };
-
   Luca.registry.lookup = function(ctype) {
     var c, className, parents;
     c = Luca.registry.classes[ctype];
     if (c != null) return c;
-    className = Luca.util.classify(ctype);
+    className = _.camelize(_.capitalize(ctype));
     parents = _(Luca.registry.namespaces).map(function(namespace) {
       return Luca.util.nestedValue(namespace, window || global);
     });
@@ -77,7 +74,7 @@
 
   Luca.util.lazyComponent = function(config) {
     var componentClass, constructor, ctype;
-    ctype = config.ctype || config.type;
+    ctype = config.ctype;
     componentClass = Luca.registry.lookup(ctype);
     if (!componentClass) {
       throw "Invalid Component Type: " + ctype + ".  Did you forget to register it?";
@@ -90,7 +87,7 @@
     var exists;
     exists = Luca.registry.classes[component];
     if (exists != null) {
-      return console.log("Can not register component with the signature " + component + ". Already exists");
+      throw "Can not register component with the signature " + component + ". Already exists";
     } else {
       return Luca.registry.classes[component] = constructor_class;
     }
@@ -269,14 +266,6 @@
   Luca.templates || (Luca.templates = {});
   Luca.templates["fields/button_field_link"] = function(obj){var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('<a class=\'btn ', input_class ,'\'>\n  '); if(icon_class.length) { __p.push('\n  <i class=\'', icon_class ,'\'></i>\n  '); } __p.push('\n  ', input_value ,'\n</a>\n');}return __p.join('');};
 }).call(this);
-(function() {
-  Luca.templates || (Luca.templates = {});
-  Luca.templates["fields/checkbox_array"] = function(obj){var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('<div class=\'form-horizontal\'>\n  <div class=\'control-group\'>\n    <label for=\'', input_id ,'\'>\n      ', label ,'\n    </label>\n    <div class=\'controls\'></div>\n  </div>\n</div>\n');}return __p.join('');};
-}).call(this);
-(function() {
-  Luca.templates || (Luca.templates = {});
-  Luca.templates["fields/checkbox_array_item"] = function(obj){var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('<label for=\'', input_id ,'\'>\n  <input id=\'', input_id ,'\' name=\'', input_name ,'\' type=\'checkbox\' value=\'', value ,'\' />\n  ', label ,'\n</label>\n');}return __p.join('');};
-}).call(this);
 (function() {
   Luca.templates || (Luca.templates = {});
   Luca.templates["fields/checkbox_field"] = function(obj){var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('<label for=\'', input_id ,'\'>\n  ', label ,'\n  <input name=\'', input_name ,'\' style=\'', inputStyles ,'\' type=\'checkbox\' value=\'', input_value ,'\' />\n</label>\n'); if(helperText) { __p.push('\n<p class=\'helper-text help-block\'>\n  ', helperText ,'\n</p>\n'); } __p.push('\n');}return __p.join('');};
@@ -447,7 +436,7 @@
         parts = eventId.split(':');
         prefix = parts.shift();
         parts = _(parts).map(function(p) {
-          return _.string.capitalize(p);
+          return _.capitalize(p);
         });
         fn = prefix + parts.join('');
         return _this.bind(eventId, function() {
@@ -924,8 +913,7 @@
         } catch (e) {
           console.log("Error Rendering Component " + (component.name || component.cid), component);
           console.log(e.message);
-          console.log(e.stack);
-          if ((Luca.silenceRenderErrors != null) !== true) throw e;
+          return console.log(e.stack);
         }
       });
     },
@@ -1107,7 +1095,7 @@
 
     CollectionManager.prototype.guessCollectionClass = function(key) {
       var classified, guess;
-      classified = Luca.util.classify(key);
+      classified = _(key).chain().capitalize().camelize().value();
       guess = (this.collectionNamespace || (window || global))[classified];
       guess || (guess = (this.collectionNamespace || (window || global))["" + classified + "Collection"]);
       return guess;
@@ -1775,13 +1763,12 @@
     setupBindings: function() {
       var _this = this;
       this.manager.bind("collection_loaded", function(name) {
-        var collectionName, loaded, progress, total;
+        var loaded, progress, total;
         loaded = _this.manager.loadedCollectionsCount();
         total = _this.manager.totalCollectionsCount();
         progress = parseInt((loaded / total) * 100);
-        collectionName = _.string.titleize(_.string.humanize(name));
         _this.modalContainer().find('.progress .bar').attr("style", "width: " + progress + "%;");
-        return _this.modalContainer().find('.message').html("Loaded " + collectionName + "...");
+        return _this.modalContainer().find('.message').html("Loaded " + (_(name).chain().humanize().titleize().value()) + "...");
       });
       return this.manager.bind("all_collections_loaded", function() {
         _this.modalContainer().find('.message').html("All done!");
@@ -1941,89 +1928,6 @@
 
   Luca.register("button_field", "Luca.fields.ButtonField");
 
-}).call(this);
-(function() {
-
-  Luca.fields.CheckboxArray = Luca.core.Field.extend({
-    template: "fields/checkbox_array",
-    events: {
-      "click input": "clickHandler"
-    },
-    initialize: function(options) {
-      this.options = options != null ? options : {};
-      _.extend(this, this.options);
-      _.extend(this, Luca.modules.Deferrable);
-      _.bindAll(this, "populateCheckboxes", "clickHandler", "_updateModel");
-      Luca.core.Field.prototype.initialize.apply(this, arguments);
-      this.input_id || (this.input_id = _.uniqueId('field'));
-      this.input_name || (this.input_name = this.name);
-      this.label || (this.label = this.name);
-      this.valueField || (this.valueField = "id");
-      this.displayField || (this.displayField = "name");
-      return this.selectedItems = [];
-    },
-    afterInitialize: function(options) {
-      this.options = options != null ? options : {};
-      try {
-        this.configure_collection();
-      } catch (e) {
-        console.log("Error Configuring Collection", this, e.message);
-      }
-      return this.collection.bind("reset", this.populateCheckboxes);
-    },
-    afterRender: function() {
-      var _ref, _ref2;
-      if (((_ref = this.collection) != null ? (_ref2 = _ref.models) != null ? _ref2.length : void 0 : void 0) > 0) {
-        return this.populateCheckboxes();
-      } else {
-        return this.collection.trigger("reset");
-      }
-    },
-    clickHandler: function(event) {
-      var checkbox;
-      checkbox = event.target;
-      if (checkbox.checked) {
-        this.selectedItems.push(checkbox.value);
-      } else {
-        if (this.selectedItems.indexOf(checkbox.value) !== -1) {
-          this.selectedItems = _.without(this.selectedItems, [checkbox.value]);
-        }
-      }
-      return this._updateModel();
-    },
-    populateCheckboxes: function() {
-      var controls,
-        _this = this;
-      controls = $(this.el).find('.controls');
-      controls.empty();
-      this.selectedItems = this.getModel().get(this.name);
-      this.collection.each(function(model) {
-        var input_id, label, value;
-        value = model.get(_this.valueField);
-        label = model.get(_this.displayField);
-        input_id = _.uniqueId('field');
-        controls.append(Luca.templates["fields/checkbox_array_item"]({
-          label: label,
-          value: value,
-          input_id: input_id,
-          input_name: _this.input_name
-        }));
-        if (_this.selectedItems.indexOf(value) !== -1) {
-          return _this.$("#" + input_id).attr("checked", "checked");
-        }
-      });
-      return $(this.container).append(this.$el);
-    },
-    _updateModel: function() {
-      var attributes;
-      attributes = {};
-      attributes[this.name] = this.selectedItems;
-      return this.getModel().set(attributes);
-    }
-  });
-
-  Luca.register("checkbox_array", "Luca.fields.CheckboxArray");
-
 }).call(this);
 (function() {
 
@@ -2431,24 +2335,8 @@
         return component.container = container;
       });
     },
-    afterComponents: function() {
-      var _ref,
-        _this = this;
-      if ((_ref = Luca.core.Container.prototype.afterComponents) != null) {
-        _ref.apply(this, arguments);
-      }
-      return this.eachField(function(field) {
-        field.getForm = function() {
-          return _this;
-        };
-        return field.getModel = function() {
-          return _this.currentModel();
-        };
-      });
-    },
     render: function() {
-      $(this.container).append(this.$el);
-      return this;
+      return $(this.container).append(this.$el);
     },
     wrapper: function() {
       return this.$el.parents('.luca-ui-form-view-wrapper');
@@ -2465,9 +2353,6 @@
         return toolbar.render();
       });
     },
-    eachField: function(iterator) {
-      return _(this.getFields()).map(iterator);
-    },
     getField: function(name) {
       return _(this.getFields('name', name)).first();
     },
@@ -2547,8 +2432,8 @@
         key = field.input_name || field.name;
         skip = false;
         if (options.skip_buttons && field.ctype === "button_field") skip = true;
-        if (options.reject_blank === true && _.string.isBlank(value)) skip = true;
-        if (field.input_name === "id" && _.string.isBlank(value)) skip = true;
+        if (options.reject_blank === true && _.isBlank(value)) skip = true;
+        if (field.input_name === "id" && _.isBlank(value)) skip = true;
         if (skip !== true) memo[key] = value;
         return memo;
       }, {});