spine-rails 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bc6e555ec210a066a3fe6e5b10517924a9f1c6dd
+  data.tar.gz: 2cd2df11d007b2374837025820afc2b965a144b4
+SHA512:
+  metadata.gz: a1ae34db175522354f034139ea94cf43e81636a5c6c08de7ad423ab2b125c6f9d8a8ce66aff574a94d7fc88201c8e3a60c342836024bd07c0d8df44c1eecfa82
+  data.tar.gz: 7d145f0bce2a4416338831155f47f0c8cddf6ba6ecaf9402d64d62911de601c6c3077d754925c15a860ddf51f159ecc49d126cda847f4bff7958a5090fef490a

data/build/update.sh

@@ -1,4 +1,4 @@
-TAG=v1.1.0
+TAG=v1.2.0
 FILES=( ajax list local manager relation route )
 curl -s -o vendor/assets/javascripts/spine.coffee https://raw.github.com/spine/spine/$TAG/src/spine.coffee
 

data/lib/generators/spine/model/model_generator.rb

@@ -7,11 +7,11 @@ module Spine
       source_root File.expand_path("../templates", __FILE__)
       desc "Generate a Spine model with configured fields"
 
-      argument :fields, desc: 'List of model attributes', type: :array, banner: 'field1 field2'
+      argument :fields, :desc => 'List of model attributes', :type => :array, :banner => 'field1 field2'
 
       def create_model
         template "model.coffee.erb", "app/assets/javascripts/#{app_name}/models/#{file_name}.js.coffee"
       end
     end
   end
-end
+end

data/lib/generators/spine/new/new_generator.rb

@@ -7,7 +7,7 @@ module Spine
 
       desc "This generator installs Spine #{Spine::Rails::SPINE_VERSION} as part of assets pipeline"
 
-      class_option :app, type: :string, default: "app", desc: "app name"
+      class_option :app, :type => :string, :default => "app", :desc => "app name"
 
       def app_name
         options[:app]
@@ -37,7 +37,7 @@ module Spine
         content = File.read(source)
 
         if content.include?("//= require_tree .")
-          inject_into_file source, before: "//= require_tree ." do
+          inject_into_file source, :before => "//= require_tree ." do
             "//= require #{app_name}\n"
           end
         else
@@ -46,4 +46,4 @@ module Spine
       end
     end
   end
-end
+end

data/lib/spine/generators.rb

@@ -1,7 +1,7 @@
 module Spine
   module Generators
     class Base < ::Rails::Generators::NamedBase
-      class_option :app, type: :string, default: "app", desc: "app name"
+      class_option :app, :type => :string, :default => "app", :desc => "app name"
 
       protected
 
@@ -18,4 +18,4 @@ module Spine
         end
     end
   end
-end
+end

data/lib/spine/rails/version.rb

@@ -1,6 +1,6 @@
 module Spine
   module Rails
-    VERSION = "0.1.1"
-    SPINE_VERSION = "1.1.0"
+    VERSION = "0.1.2"
+    SPINE_VERSION = "1.2.0"
   end
 end

data/vendor/assets/javascripts/spine.coffee

@@ -24,36 +24,46 @@ Events =
   listenTo: (obj, ev, callback) ->
     obj.bind(ev, callback)
     @listeningTo or= []
-    @listeningTo.push obj
+    @listeningTo.push {obj, ev, callback}
     this
 
   listenToOnce: (obj, ev, callback) ->
     listeningToOnce = @listeningToOnce or = []
-    listeningToOnce.push obj
-    obj.one ev, ->
-      idx = listeningToOnce.indexOf(obj)
+    obj.bind ev, handler = ->
+      idx = -1
+      for lt, i in listeningToOnce when lt.obj is obj
+        idx = i if lt.ev is ev and lt.callback is callback
+      obj.unbind(ev, handler)
       listeningToOnce.splice(idx, 1) unless idx is -1
       callback.apply(this, arguments)
+    listeningToOnce.push {obj, ev, callback, handler}
     this
 
-  stopListening: (obj, ev, callback) ->
+  stopListening: (obj, events, callback) ->
     if arguments.length is 0
-      retain = []
       for listeningTo in [@listeningTo, @listeningToOnce]
         continue unless listeningTo
-        for obj in listeningTo when not (obj in retain)
-          obj.unbind()
-          retain.push(obj)
+        for lt in listeningTo
+          lt.obj.unbind(lt.ev, lt.handler or lt.callback)
       @listeningTo = undefined
       @listeningToOnce = undefined
 
     else if obj
-      obj.unbind(ev, callback) if ev
-      obj.unbind() unless ev
       for listeningTo in [@listeningTo, @listeningToOnce]
         continue unless listeningTo
-        idx = listeningTo.indexOf(obj)
-        listeningTo.splice(idx, 1) unless idx is -1
+        events = if events then events.split(' ') else [undefined]
+        for ev in events
+          for idx in [listeningTo.length-1..0]
+            lt = listeningTo[idx]
+            if (not ev) or (ev is lt.ev)
+              lt.obj.unbind(lt.ev, lt.handler or lt.callback)
+              listeningTo.splice(idx, 1) unless idx is -1
+            else if ev
+              evts = lt.ev.split(' ')
+              if ~(i = evts.indexOf(ev))
+                evts.splice(i, 1)
+                lt.ev = $.trim(evts.join(' '))
+                lt.obj.unbind(ev, lt.handler or lt.callback)
 
   unbind: (ev, callback) ->
     if arguments.length is 0
@@ -117,10 +127,9 @@ class Module
 class Model extends Module
   @extend Events
 
-  @records: []
-  @irecords: {}
-  @crecords: {}
-  @attributes: []
+  @records    : []
+  @irecords   : {}
+  @attributes : []
 
   @configure: (name, attributes...) ->
     @className = name
@@ -139,28 +148,27 @@ class Model extends Module
     return record
 
   @exists: (id) ->
-    (@records[id] ? @irecords[id])?.clone()
+    @irecords[id]?.clone()
+
+  @addRecord: (record) ->
+    if record.id and @irecords[record.id]
+      @irecords[record.id].remove()
+
+    record.id or= record.cid
+    @records.push(record)
+    @irecords[record.id]  = record
+    @irecords[record.cid] = record
 
   @refresh: (values, options = {}) ->
-    if options.clear
-      @deleteAll()
+    @deleteAll() if options.clear
 
     records = @fromJSON(values)
     records = [records] unless isArray(records)
-
-    for record in records
-    	if record.id and @irecords[record.id]
-    		@records[@records.indexOf(@irecords[record.id])] = record
-    	else
-	      record.id or= record.cid
-	      @records.push(record)
-      @irecords[record.id]  = record
-      @crecords[record.cid] = record
-
+    @addRecord(record) for record in records
     @sort()
 
     result = @cloneArray(records)
-    @trigger('refresh', @cloneArray(records))
+    @trigger('refresh', result, options)
     result
 
   @select: (callback) ->
@@ -194,7 +202,6 @@ class Model extends Module
   @deleteAll: ->
     @records  = []
     @irecords = {}
-    @crecords = {}
 
   @destroyAll: (options) ->
     record.destroy(options) for record in @records
@@ -239,7 +246,7 @@ class Model extends Module
   @sort: ->
     if @comparator
       @records.sort @comparator
-    @records
+    this
 
   # Private
 
@@ -258,7 +265,7 @@ class Model extends Module
   constructor: (atts) ->
     super
     @load atts if atts
-    @cid = @constructor.uid('c-')
+    @cid = atts?.cid or @constructor.uid('c-')
 
   isNew: ->
     not @exists()
@@ -320,27 +327,29 @@ class Model extends Module
     @save(options)
 
   changeID: (id) ->
+    return if id is @id
     records = @constructor.irecords
     records[id] = records[@id]
     delete records[@id]
     @id = id
     @save()
 
-  destroy: (options = {}) ->
-    @trigger('beforeDestroy', options)
-
+  remove: ->
     # Remove record from model
     records = @constructor.records.slice(0)
     for record, i in records when @eql(record)
       records.splice(i, 1)
       break
     @constructor.records = records
-
     # Remove the ID and CID
     delete @constructor.irecords[@id]
-    delete @constructor.crecords[@cid]
+    delete @constructor.irecords[@cid]
 
+  destroy: (options = {}) ->
+    @trigger('beforeDestroy', options)
+    @remove()
     @destroyed = true
+    # handle events
     @trigger('destroy', options)
     @trigger('change', 'destroy', options)
     if @listeningTo
@@ -348,13 +357,13 @@ class Model extends Module
     @unbind()
     this
 
-  dup: (newRecord) ->
-    result = new @constructor(@attributes())
-    if newRecord is false
-      result.cid = @cid
+  dup: (newRecord = true) ->
+    atts = @attributes()
+    if newRecord
+      delete atts.id
     else
-      delete result.id
-    result
+      atts.cid = @cid
+    new @constructor(atts)
 
   clone: ->
     createObject(this)
@@ -365,6 +374,13 @@ class Model extends Module
     @load(original.attributes())
     original
 
+  refresh: (data) ->
+    # go to the source and load attributes
+    root = @constructor.irecords[@id]
+    root.load(data)
+    @trigger('refresh')
+    @
+
   toJSON: ->
     @attributes()
 
@@ -373,8 +389,18 @@ class Model extends Module
 
   fromForm: (form) ->
     result = {}
+
+    for checkbox in $(form).find('[type=checkbox]:not([value])')
+      result[checkbox.name] = $(checkbox).prop('checked')
+
+    for checkbox in $(form).find('[type=checkbox][name$="[]"]')
+      name = checkbox.name.replace(/\[\]$/, '')
+      result[name] or= []
+      result[name].push checkbox.value if $(checkbox).prop('checked')
+
     for key in $(form).serializeArray()
-      result[key.name] = key.value
+      result[key.name] or= key.value
+
     @load(result)
 
   exists: ->
@@ -397,13 +423,10 @@ class Model extends Module
 
   create: (options) ->
     @trigger('beforeCreate', options)
-    @id          = @cid unless @id
-
-    record       = @dup(false)
-    @constructor.records.push(record)
-    @constructor.irecords[@id]  = record
-    @constructor.crecords[@cid] = record
+    @id or= @cid
 
+    record = @dup(false)
+    @constructor.addRecord(record)
     @constructor.sort()
 
     clone        = record.clone()
@@ -435,39 +458,9 @@ class Model extends Module
     args.splice(1, 0, this)
     @constructor.trigger(args...)
 
-  listenTo: (obj, events, callback) ->
-    obj.bind events, callback
-    @listeningTo or= []
-    @listeningTo.push(obj)
-
-  listenToOnce: (obj, events, callback) ->
-    listeningToOnce = @listeningToOnce or= []
-    listeningToOnce.push obj
-    obj.bind events, handler = =>
-      idx = listeningToOnce.indexOf(obj)
-      listeningToOnce.splice(idx, 1) unless idx is -1
-      obj.unbind(events, handler)
-      callback.apply(obj, arguments)
-
-  stopListening: (obj, events, callback) ->
-    if arguments.length is 0
-      retain = []
-      for listeningTo in [@listeningTo, @listeningToOnce]
-        continue unless listeningTo
-        for obj in @listeningTo when not (obj in retain)
-          obj.unbind()
-          retain.push(obj)
-      @listeningTo = undefined
-      @listeningToOnce = undefined
-      return
-
-    if obj
-      obj.unbind() unless events
-      obj.unbind(events, callback) if events
-      for listeningTo in [@listeningTo, @listeningToOnce]
-        continue unless listeningTo
-        idx = listeningTo.indexOf(obj)
-        listeningTo.splice(idx, 1) unless idx is -1
+  listenTo: -> Events.listenTo.apply @, arguments
+  listenToOnce: -> Events.listenToOnce.apply @, arguments
+  stopListening: -> Events.stopListening.apply @, arguments
 
   unbind: (events, callback) ->
     if arguments.length is 0
@@ -515,6 +508,7 @@ class Controller extends Module
 
   release: =>
     @trigger 'release', this
+    # no need to unDelegateEvents since remove will end up handling that
     @el.remove()
     @unbind()
     @stopListening()
@@ -544,7 +538,7 @@ class Controller extends Module
       if selector is ''
         @el.bind(eventName, method)
       else
-        @el.delegate(selector, eventName, method)
+        @el.on(eventName, selector, method)
 
   refreshElements: ->
     for key, value of @elements
@@ -553,6 +547,8 @@ class Controller extends Module
   delay: (func, timeout) ->
     setTimeout(@proxy(func), timeout || 0)
 
+  # keep controllers elements obj in sync with it contents
+
   html: (element) ->
     @el.html(element.el or element)
     @refreshElements()
@@ -576,7 +572,10 @@ class Controller extends Module
     @el
 
   replace: (element) ->
-    [previous, @el] = [@el, $(element.el or element)]
+    element = element.el or element
+    element = $.trim(element) if typeof element is "string"
+    # parseHTML is incompatible with Zepto
+    [previous, @el] = [@el, $($.parseHTML(element)?[0] or element)]
     previous.replaceWith(@el)
     @delegateEvents(@events)
     @refreshElements()
@@ -607,7 +606,7 @@ makeArray = (args) ->
 Spine = @Spine   = {}
 module?.exports  = Spine
 
-Spine.version    = '1.1.0'
+Spine.version    = '1.2.0'
 Spine.isArray    = isArray
 Spine.isBlank    = isBlank
 Spine.$          = $

data/vendor/assets/javascripts/spine/ajax.coffee

@@ -5,13 +5,17 @@ Queue  = $({})
 
 Ajax =
   getURL: (object) ->
-    object and object.url?() or object.url
+    object.url?() or object.url
+
+  getCollectionURL: (object) ->
+    if object
+      if typeof object.url is "function"
+        @generateURL(object)
+      else
+        object.url
 
   getScope: (object) ->
-    scope = object and object.scope?() or object.scope
-    if scope? and scope.charAt(0) is '/'
-      scope = scope.substring(1)
-    scope
+    object.scope?() or object.scope
 
   generateURL: (object, args...) ->
     if object.className
@@ -20,15 +24,20 @@ Ajax =
     else
       if typeof object.constructor.url is 'string'
         collection = object.constructor.url
-        collection = collection.substring(1) if collection.charAt(0) is '/'
       else
         collection = object.constructor.className.toLowerCase() + 's'
       scope = Ajax.getScope(object) or Ajax.getScope(object.constructor)
     args.unshift(collection)
-    if scope?
-      args.unshift(scope)
-    args.unshift(Model.host)
-    args.join('/')
+    args.unshift(scope)
+    # construct and clean url
+    path = args.join('/')
+    path = path.replace /(\/\/)/g, "/"
+    path = path.replace /^\/|\/$/g, ""
+    # handle relative urls vs those that use a host
+    if path.indexOf("../") isnt 0
+      Model.host + "/" + path
+    else
+      path
 
   enabled: true
 
@@ -61,7 +70,7 @@ class Base
   ajax: (params, defaults) ->
     $.ajax @ajaxSettings(params, defaults)
 
-  ajaxQueue: (params, defaults) ->
+  ajaxQueue: (params, defaults, record) ->
     jqXHR    = null
     deferred = $.Deferred()
     promise  = deferred.promise()
@@ -69,6 +78,13 @@ class Base
     settings = @ajaxSettings(params, defaults)
 
     request = (next) ->
+      if record?.id?
+        # for existing singleton, model id may have been updated
+        # after request has been queued
+        settings.url ?= Ajax.getURL(record)
+        settings.data?.id = record.id
+
+      settings.data = JSON.stringify(settings.data)
       jqXHR = $.ajax(settings)
                 .done(deferred.resolve)
                 .fail(deferred.reject)
@@ -93,30 +109,30 @@ class Base
 class Collection extends Base
   constructor: (@model) ->
 
-  find: (id, params) ->
+  find: (id, params, options = {}) ->
     record = new @model(id: id)
     @ajaxQueue(
       params,
       type: 'GET',
-      url:  Ajax.getURL(record)
+      url: options.url or Ajax.getURL(record)
     ).done(@recordsResponse)
      .fail(@failResponse)
 
-  all: (params) ->
+  all: (params, options = {}) ->
     @ajaxQueue(
       params,
       type: 'GET',
-      url:  Ajax.getURL(@model)
+      url: options.url or Ajax.getURL(@model)
     ).done(@recordsResponse)
      .fail(@failResponse)
 
   fetch: (params = {}, options = {}) ->
     if id = params.id
       delete params.id
-      @find(id, params).done (record) =>
+      @find(id, params, options).done (record) =>
         @model.refresh(record, options)
     else
-      @all(params).done (records) =>
+      @all(params, options).done (records) =>
         @model.refresh(records, options)
 
   # Private
@@ -131,39 +147,42 @@ class Singleton extends Base
   constructor: (@record) ->
     @model = @record.constructor
 
-  reload: (params, options) ->
+  reload: (params, options = {}) ->
     @ajaxQueue(
-      params,
-      type: 'GET'
-      url:  Ajax.getURL(@record)
+      params, {
+        type: 'GET'
+        url: options.url
+      }, @record
     ).done(@recordResponse(options))
      .fail(@failResponse(options))
 
-  create: (params, options) ->
+  create: (params, options = {}) ->
     @ajaxQueue(
       params,
       type: 'POST'
       contentType: 'application/json'
-      data: JSON.stringify(@record)
-      url:  Ajax.getURL(@model)
+      data: @record.toJSON()
+      url: options.url or Ajax.getCollectionURL(@record)
     ).done(@recordResponse(options))
      .fail(@failResponse(options))
 
-  update: (params, options) ->
+  update: (params, options = {}) ->
     @ajaxQueue(
-      params,
-      type: 'PUT'
-      contentType: 'application/json'
-      data: JSON.stringify(@record)
-      url:  Ajax.getURL(@record)
+      params, {
+        type: 'PUT'
+        contentType: 'application/json'
+        data: @record.toJSON()
+        url: options.url
+      }, @record
     ).done(@recordResponse(options))
      .fail(@failResponse(options))
 
-  destroy: (params, options) ->
+  destroy: (params, options = {}) ->
     @ajaxQueue(
-      params,
-      type: 'DELETE'
-      url:  Ajax.getURL(@record)
+      params, {
+        type: 'DELETE'
+        url: options.url
+      }, @record
     ).done(@recordResponse(options))
      .fail(@failResponse(options))
 
@@ -171,18 +190,14 @@ class Singleton extends Base
 
   recordResponse: (options = {}) =>
     (data, status, xhr) =>
-      if Spine.isBlank(data) or @record.destroyed
-        data = false
-      else
-        data = @model.fromJSON(data)
 
       Ajax.disable =>
-        if data
+        unless Spine.isBlank(data) or @record.destroyed
           # ID change, need to do some shifting
           if data.id and @record.id isnt data.id
             @record.changeID(data.id)
           # Update with latest data
-          @record.updateAttributes(data.attributes())
+          @record.refresh(data)
 
       @record.trigger('ajaxSuccess', data, status, xhr)
       options.success?.apply(@record) # Deprecated
@@ -233,5 +248,8 @@ Model.Ajax.Methods =
 
 # Globals
 Ajax.defaults   = Base::defaults
+Ajax.Base       = Base
+Ajax.Singleton  = Singleton
+Ajax.Collection = Collection
 Spine.Ajax      = Ajax
 module?.exports = Ajax

data/vendor/assets/javascripts/spine/local.coffee

@@ -9,8 +9,9 @@ Spine.Model.Local =
     result = JSON.stringify(@)
     localStorage[@className] = result
 
-  loadLocal: ->
+  loadLocal: (options = {})->
+    options.clear = true unless options.hasOwnProperty('clear')
     result = localStorage[@className]
-    @refresh(result or [], clear: true)
+    @refresh(result or [], options)
 
 module?.exports = Spine.Model.Local

data/vendor/assets/javascripts/spine/manager.coffee

@@ -26,11 +26,10 @@ class Spine.Manager extends Spine.Module
   # Private
 
   change: (current, args...) ->
-    for cont in @controllers
-      if cont is current
-        cont.activate(args...)
-      else
-        cont.deactivate(args...)
+    for cont in @controllers when cont isnt current
+      cont.deactivate(args...)
+
+    current.activate(args...) if current
 
 Spine.Controller.include
   active: (args...) ->
@@ -81,4 +80,4 @@ class Spine.Stack extends Spine.Controller
     @append(controller)
 
 module?.exports = Spine.Manager
-module?.exports.Stack = Spine.Stack
+module?.exports.Stack = Spine.Stack

data/vendor/assets/javascripts/spine/route.coffee

@@ -18,6 +18,7 @@ class Spine.Route extends Spine.Module
     history: false
     shim: false
     replace: false
+    redirect: false
 
   @add: (path, callback) ->
     if (typeof path is 'object' and path not instanceof RegExp)
@@ -64,10 +65,17 @@ class Spine.Route extends Spine.Module
 
     @trigger('navigate', @path)
 
-    @matchRoute(@path, options) if options.trigger
+    route = @matchRoute(@path, options) if options.trigger
 
     return if options.shim
 
+    if !route 
+      if typeof options.redirect is 'function'
+        return options.redirect.apply this, [@path, options]
+      else 
+        if options.redirect is true
+          @redirect(@path)
+
     if @history and options.replace
       history.replaceState({}, document.title, @path)
     else if @history
@@ -100,6 +108,9 @@ class Spine.Route extends Spine.Module
       @trigger('change', route, path)
       return route
 
+  @redirect: (path) ->
+    window.location = path
+
   constructor: (@path, @callback) ->
     @names = []
 

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: spine-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Alex MacCaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: json2-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem provides Spine for your Rails 3 application.
@@ -104,26 +97,25 @@ files:
 - vendor/assets/javascripts/spine/route.coffee
 homepage: http://rubygems.org/gems/spine-rails
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: spine-rails
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use Spine with Rails 3
 test_files: []