neat-rails 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0917bb29396d40820cd7ea76add02769a75ebf06
-  data.tar.gz: 215afdec3ef8a2ea45eed909282ce24b33cb573a
+  metadata.gz: 695ee4ffacf2d5ff9962b563842796a8e19f1133
+  data.tar.gz: 5d86e89f8d9fa6bd3d8bcf4b890bac853047b568
 SHA512:
-  metadata.gz: 881a5a3ee3673cf59dcb969c1fb92be12f0cc1851e238f7ab4842191ff28bd60667427c97d7479b5665ecd0b8e540412118e9aab8ee8f8741a843671f875a3c4
-  data.tar.gz: a383cfcdfcf454b35d9a5d2d4486a127f2482de763ae076b6472338e05eb3455bc89ece97427f6af4e0fcfe2e7891c753c72a5185608fa179751fce892f66e33
+  metadata.gz: 26244d4b5882ee55c5413495fe5897dbb93473f4f1135bd3610a0059e368e6cc3f38a41b7037398e3bfe0608670bc038ae5a1e0ebf18e39eebaf9e2a5674cb5f
+  data.tar.gz: 110fbfca1f62d9101e10f605ac46663a5dbff5ebb7428d765b529d4ba8cebcd9a6baf5299fd40d2f83f9b3acd7aa95d71424216c72637e5317d44af172a0fa3f

data/lib/neat/rails/version.rb

@@ -1,5 +1,5 @@
 module Neat
   module Rails
-    VERSION = "0.0.2"
+    VERSION = "0.1.0"
   end
 end

data/vendor/assets/javascripts/neat.js

@@ -6,6 +6,7 @@
 //
 //= require_self
 //= require ./neat/lib/inflect
+//= require ./neat/lib/observer
 //= require ./neat/lib/paginated_list
 //= require ./neat/lib/delayed_action
 //= require ./neat/lib/jquery_extensions

data/vendor/assets/javascripts/neat/collection_editor.coffee

@@ -20,14 +20,13 @@ class window.Neat.CollectionEditor extends Backbone.View
   sortAliases: {}
   templateOptions: {}
   pageSize: 30
-  
-  keyDownHandlers:
-    ESC:    -> @viewInEdit?.cancelEdit()
-    RETURN: -> @viewInEdit?.save()
-    UP:     -> @edit @prevView()
-    DOWN:   -> @edit @nextView()
+  useKeyboardToChangeRows: true
+  cancelOnEsc: true
+  saveOnEnter: true
   
   initialize: ->
+    @keyDownHandlers = {}
+    
     @viewPath = @viewPath ? @resource
     @singular = inflect.singularize(@resource) # e.g. "calendar"
     @modelView = @modelView ? (()=>
@@ -43,9 +42,9 @@ class window.Neat.CollectionEditor extends Backbone.View
       always_show: false
     @paginator.onPageChange _.bind(@renderPage, @)
     
-    @collection.bind 'reset',  @render, @
-    @collection.bind 'add',    @rerenderPage, @
-    @collection.bind 'remove', @rerenderPage, @
+    @collection.bind 'reset',   @__reset, @
+    @collection.bind 'add',     @__add, @
+    @collection.bind 'remove',  @__remove, @
     
     # We need to rerender the page if a model's attributes
     # have changed just in case this would affect how the
@@ -67,13 +66,24 @@ class window.Neat.CollectionEditor extends Backbone.View
     # has settled into new state.
     #
     @delayedRerender = new Lail.DelayedAction(_.bind(@rerenderPage, @), delay: 500)
-    @collection.bind 'change', @delayedRerender.trigger
+    @collection.bind 'change', =>
+      @delayedRerender.trigger() if @sortedBy
     
     # If the view's headers are 'a' tags, this view will try
     # to sort the collection using the header tags.
     $(@el).delegate '.header a', 'click', _.bind(@sort, @)
     $(@el).delegate '.editor', 'keydown', _.bind(@onKeyDown, @)
     
+    if @cancelOnEsc
+      @keyDownHandlers['ESC']    = -> @viewInEdit?.cancelEdit()
+    
+    if @saveOnEnter
+      @keyDownHandlers['RETURN'] = -> @viewInEdit?.save()
+    
+    if @useKeyboardToChangeRows
+      @keyDownHandlers['UP']     = -> @edit @prevView()
+      @keyDownHandlers['DOWN']   = -> @edit @nextView()
+    
     @views = []
     @viewInEdit = null
     @templateOptions = {}
@@ -93,8 +103,8 @@ class window.Neat.CollectionEditor extends Backbone.View
   
   render: ->
     $el = $(@el)
-    $el.html @template(collection: @collection)
-    $el.cssHover '.row.interactive'
+    $el.html @template(@context())
+    $el.cssHover '.neat-row.neat-interactive'
     
     @afterRender()
     
@@ -104,6 +114,9 @@ class window.Neat.CollectionEditor extends Backbone.View
     @repaginate()
     @
   
+  context: ->
+    collection: @collection
+  
   afterRender: ->
     @
   
@@ -208,6 +221,17 @@ class window.Neat.CollectionEditor extends Backbone.View
   
   
   
+  __reset: ->
+    @render()
+  
+  __add: ->
+    @rerenderPage()
+  
+  __remove: ->
+    @rerenderPage()
+  
+  
+  
   debug: (o...)->
     @log(o...) if Neat.debug
   

data/vendor/assets/javascripts/neat/lib/observer.js

@@ -0,0 +1,42 @@
+/* Observer: this awesome class is described by The Grubbsian
+   http://www.thegrubbsian.com/?p=100 */
+/* modified to use prototype extensions */
+
+var Observer = (function(){
+  var Observation = function(name, func) {
+    this.name = name;
+    this.func = func;
+  };
+  var constructor = function() {
+    this.observations = [];
+  };
+  constructor.prototype = {
+    observe: function(name, func) {
+      var exists = this.observations.find(function(i) {
+        return (i.name==name) && (i.func==func);
+      });
+      if(!exists) {
+        this.observations.push(new Observation(name, func));
+      }
+    },
+    unobserve: function(name, func) {
+      for(var i=0; i<this.observations.length;) {
+        var observation = this.observations[i];
+        if((observation.name==name) && (observation.func==func)) {
+          this.observations.splice(i, 1);
+        } else {
+          i += 1;
+        }
+      }
+    },
+    fire: function(name, data, scope) {
+      if(!(data instanceof Array)) data = [data];
+      this.observations.each(function(i) {
+        if(i.name == name) {
+          i.func.apply(scope, data);
+        }
+      });
+    }
+  };
+  return constructor;    
+})();

data/vendor/assets/javascripts/neat/model_editor.coffee

@@ -1,67 +1,78 @@
 class window.Neat.ModelEditor extends Backbone.View
   tagName: 'li'
-  className: 'row interactive editable'
+  className: 'neat-row neat-interactive neat-editable'
   
   initialize: (options)->
     options = options ? {}
     @templateOptions = options.templateOptions ? {}
     @viewPath = @viewPath ? options.viewPath
     @resource = @resource ? window.inflect.singularize(options.resource)
-    $(@el).addClass(@resource)
+    @$el.addClass(@resource)
+    
+    @model.bind 'change', @render, @
     
     # Renders the 'show' template normally,
     # renders 'edit' when in edit mode.
-    @showTemplate = JST["#{@viewPath}/show"]
-    @editTemplate = JST["#{@viewPath}/edit"]
+    @showTemplate = Neat.template["#{@viewPath}/show"]
+    @editTemplate = Neat.template["#{@viewPath}/edit"]
     
     # Wire up events.
     # Don't use Backbone's events hash because if subclasses
     # use that more familiar syntax, they'll blow away events
     # defined in this class.
-    $(@el).delegate('.save-button',   'click', _.bind(@save, @))
-    $(@el).delegate('.delete-button', 'click', _.bind(@delete, @))
-    $(@el).delegate('.cancel-button', 'click', _.bind(@cancelEdit, @))
+    @$el.delegate('.save-button',   'click', _.bind(@save, @))
+    @$el.delegate('.delete-button', 'click', _.bind(@delete, @))
+    @$el.delegate('.cancel-button', 'click', _.bind(@cancelEdit, @))
     
     # Begin editing when this resource is clicked
     # unless the user clicked a link or button.
-    $(@el).click (e)=>
+    @$el.click (e)=>
       @edit() if @canEdit() and !$(e.target).isIn('input, button, a, label')
   
   render: ->
     json = _.extend(@model.toJSON(), {options: @templateOptions})
-    $(@el).html @template()(json)
-    $(@el).attr('id', "#{@resource}_#{@model.get('id')}") # e.g. "calendar_5"
+    @$el.html @template()(json)
+    @$el.attr('id', "#{@resource}_#{@model.get('id')}") # e.g. "calendar_5"
+    
+    @afterRender()
     @
   
-  inEdit: -> $(@el).hasClass('editor')
-  canEdit: -> $(@el).hasClass('editable') and !@inEdit()
+  afterRender: ->
+    @
+  
+  inEdit: -> @$el.hasClass('editor')
+  canEdit: -> @$el.hasClass('neat-editable') and !@inEdit()
   template: -> if @inEdit() then @editTemplate else @showTemplate
   
   cancelEdit: (e)->
     e?.preventDefault()
     e?.stopImmediatePropagation()
     if @inEdit()
-      $(@el).removeClass('editor').addClass('editable')
+      @$el.find(':focus').blur()
+      @$el.removeClass('editor').addClass('neat-editable')
       @render()
       @trigger('edit:end')
     @
   
   edit: ->
     unless @inEdit()
-      $el = $(@el)
-      $el.addClass('editor').removeClass('editable hovered')
+      @$el.addClass('editor').removeClass('neat-editable hovered')
       @trigger('edit:begin')
       @render()
-      $el.find(':input:visible').first().focus()
+      @autofocus()
     @
   
+  autofocus: ->
+    @$el.find(':input:visible').first().focus()
+  
   save: (e)->
     e?.preventDefault()
-    $form = $(@el).closest('form')
-    newAttributes = $form.serializeObject()
+    newAttributes = @attributesFromForm(@$el)
     @debug 'saving: ', newAttributes
     attributes =  @model.changedAttributes(newAttributes)
     
+    return unless @okToSave(attributes)
+    
     if attributes
       previousAttributes = @model.toJSON()
       
@@ -75,21 +86,45 @@ class window.Neat.ModelEditor extends Backbone.View
     
     @cancelEdit()
   
+  okToSave: (attributes)->
+    true
+  
+  attributesFromForm: ($el)->
+    attrs = {}
+    $el.find('input, select, textarea').each ->
+      elem = $(this)
+      name = elem.attr('name')
+      if name
+        elemType = elem.attr('type')
+        value = elem.val()
+
+        if name.substr(-2) == '[]'
+          name = name.substring(0, name.length - 2)
+          attrs[name] = attrs[name] || []
+          attrs[name].push elem.val()
+
+        else if elemType == 'checkbox' || elemType == 'radio'
+          attrs[name] = '' if typeof(attrs[name]) == 'undefined'
+          attrs[name] = value if elem.prop('checked')
+
+        else
+          attrs[name] = value
+    attrs
+  
   delete: (e)->
     e?.preventDefault()
-    if @confirmDelete(@resource)
-      $(@el).removeClass('editable').addClass('deleted')
+    @confirmDelete @resource, =>
+      @$el.removeClass('neat-editable').addClass('deleted')
       
       @model.destroy
         wait: true
-        success: =>
-          @model.collection.remove(@model) if @model.collection
-          @onDeleteSuccess
+        success: => @onDeleteSuccess
         error: _.bind(@onSaveError, @)
       @cancelEdit()
   
-  confirmDelete: (resource)->
-    confirm("Delete this #{resource}?")
+  confirmDelete: (resource, callback)->
+    if confirm("Delete this #{resource}?")
+      callback()
   
   
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neat-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Bob Lail
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -47,6 +47,7 @@ files:
 - vendor/assets/javascripts/neat/lib/delayed_action.js
 - vendor/assets/javascripts/neat/lib/inflect.js
 - vendor/assets/javascripts/neat/lib/jquery_extensions.coffee
+- vendor/assets/javascripts/neat/lib/observer.js
 - vendor/assets/javascripts/neat/lib/paginated_list.js
 - vendor/assets/javascripts/neat/model_editor.coffee
 homepage: ''
@@ -68,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: It's like FreightTrain for Backbone. That's pretty neat!