ende 0.3.13 → 0.4.0

data/vendor/components/indefinido-indemma/src/lib/record/restfulable.coffee

@@ -3,11 +3,12 @@ type       = require 'type'
 observable = require('observable').mixin
 $          = require 'jquery' # TODO remove jquery dependency and use simple promises implementation
 rest       = require './rest.js'
+root       = exports ? @
 
 util =
   model:
-    map: (models) ->
-      @ model for model in models
+    map: (records) ->
+      @ record for record in records
 
 
 restful =
@@ -32,9 +33,9 @@ restful =
 
     # returns a promise
     # TODO move to scopable
-    all: (conditions = {}, callback) ->
+    all: (conditions = {}, doned, failed) ->
       if typeof conditions == 'function'
-        callback   = conditions
+        doned      = conditions
         conditions = {}
 
       # TODO Consider parent resources
@@ -44,7 +45,8 @@ restful =
 
       $.when(rest.get.call @, conditions)
        .then(util.model.map             )
-       .done callback
+       .done(doned                      )
+       .fail failed
 
     first: (conditions = {}, callback) ->
       if typeof conditions == 'function'
@@ -61,9 +63,15 @@ restful =
     # TODO better treating of arguments
     get: (action, data = {}) ->
       # TODO better way to override route
-      old_route  = @route
-      @route     = "/#{model.pluralize @resource.name}"
-      @route    += "/#{action}" if action
+      old_route     = @route
+      default_route = "/#{model.pluralize @resource.name}"
+      @route        = default_route unless default_route == @route
+
+      if action
+        # TODO Get own property descriptor, or better way do override route
+        Object.defineProperty @, 'route',
+          value: "#{default_route}/#{action}"
+          configurable: true
 
       # TODO not allow resource overriding
       resource   = data.resource
@@ -76,7 +84,10 @@ restful =
 
       promise = rest.get.call @, data
 
-      route   = old_route
+      # TODO Get own property descriptor, or better way do override route
+      Object.defineProperty @, 'route',
+        value: old_route
+        configurable: true
 
       promise
 
@@ -84,6 +95,7 @@ restful =
     delete: rest.delete
 
   record:
+    ready: (callback) -> callback.call @
     reload: (params...) ->
 
       # TODO better signature implementation
@@ -94,6 +106,12 @@ restful =
       promise.done @assign_attributes
       promise.fail @failed
 
+      @reloading = promise
+      # Assign ready callback before, to allow promise override
+      @ready = ->
+        console.warn "resource.ready was deprecated, please use resource.reloading.done"
+        promise.done arguments...
+
       # Bind one time save callbacks
       promise.done param for param in params
 
@@ -163,8 +181,14 @@ restful =
 
       # Assign remaining attributes
       # TODO see if it is a best practice not overriding unchanged attributes
-      for attribute of attributes when attribute isnt @[attribute]
-        @[attribute] = attributes[attribute]
+      # TODO rename attributes for properties
+      for name, attribute of attributes when attribute isnt @[name]
+        # TODO faster object property assignment, get from model definition, instead of checking every attribute
+        # TODO implement custom comparator for each object when es7 is out
+        if type(attribute) == 'object'
+          @[name] = attributes[name] if JSON.stringify(attribute) != JSON.stringify @[name]
+        else
+          @[name] = attributes[name]
 
     destroy: (doned, failed, data) ->
       throw new Error 'Can\'t delete record without id!' unless @id? or @_id?
@@ -182,18 +206,28 @@ restful =
     saving: false
     salvation: null
     save: (doned, failed, data) ->
-      return @salvation if @saving
+      lock = JSON.stringify @json()
+
+      # When saving and receive save command again check if the model
+      # has changed, then abort the salvation operation and send a new
+      # save request
+      # TODO check dirty property instead of lock!
+      if @saving
+        if @lock == lock
+          return @salvation
+        else
+          @salvation.abort()
 
       # TODO better lock generation
-      @lock = JSON.stringify @json()
+      @lock = lock
 
       # TODO remove jquery dependency
       # TODO think with wich value makes more sense to resolve the
       # absence of need to save the model
       salvation   = $.Deferred().resolveWith @, null unless @dirty
+      @saving     = true
       salvation ||= rest[if @_id then 'put' else 'post'].call @, data
       @salvation  = salvation
-      @saving     = true
 
       salvation.done @saved
       salvation.fail @failed
@@ -211,9 +245,6 @@ restful =
       if @lock == JSON.stringify(@json())
         @dirty = false
         delete @lock
-      # Delayed optimistic lock
-      else
-        return @save()
 
       @assign_attributes data if data?
 
@@ -225,13 +256,22 @@ restful =
       try payload ||= JSON.parse(xhr.responseText) catch e
       payload     ||= xhr.responseText
 
-
       # When client fail
       switch xhr.status
         # TODO move to validatable
+        when 0
+          message = status or xhr.statusText
+          switch message
+            when 'abort'
+              console.info "salvation probably aborted"
+            when 'error'
+              console.info "server probably unreachable"
+            else
+              throw new Error 'Unhandled status code for xhr'
+
         when 422
 
-          definition = model[@resource]
+          definition = model[@resource.toString()]
 
           for attribute_name, messages of payload.errors
 
@@ -258,8 +298,9 @@ restful =
         else
           message  = "Fail in #{@resource}.save:\n"
           message += "Record: #{@}\n"
-          message += "Status: #{status} (#{payload.status || xhr.status})\n"
+          message += "Status: #{status} (#{(payload || xhr).status})\n"
           message += "Error : #{payload.error || payload.message || payload}"
+          console.log message
 
       # Finish saving
       @saving = false
@@ -272,8 +313,17 @@ restful =
     json: (methods = {}) ->
       json = {}
 
-      for name, value of @ when type(value) isnt 'function'
-        continue unless value?  # Bypass null, and undefined values
+      definition = model[@resource.toString()]
+
+      for name of @ when type(value)
+        # TODO treat other associations to!
+        # TODO create association reflection for god sake!
+        continue if definition.belongs_to.indexOf(name) != -1 and @nested_attributes.indexOf(name) == -1
+
+        # TODO Bypass only undefined values so we can erase data on server
+        value = @[name]
+        continue unless value?
+        continue if type(value) == 'function'
 
         if type(value) == 'object'
 
@@ -302,16 +352,23 @@ restful =
       delete json.resource
       delete json.route
       delete json.initial_route # TODO implement better initial_route and remove attribute from here
+
       delete json.after_initialize
       delete json.before_initialize
       delete json.parent_resource
       delete json.nested_attributes
+
+      delete json.reloading
+      delete json.ready
+
       delete json.saving
       delete json.salvation
       delete json.sustained
+
       delete json.element
       delete json.default
       delete json.lock
+
       delete json.validated
       delete json.validation
 

data/vendor/components/indefinido-indemma/src/lib/record/scopable.coffee

@@ -1,13 +1,20 @@
 require './restfulable'
 require './resource'
 
-stampit = require '../../vendor/stampit'
-extend  = require 'assimilate'
-merge   = extend.withStrategy 'deep'
-$       = require 'jquery'
-rest    = require './rest'
-
+stampit    = require '../../vendor/stampit'
+extend     = require 'assimilate'
+observable = require('observable').mixin
+merge      = extend.withStrategy 'deep'
+$          = require 'jquery'
+rest       = require './rest'
+
+# TODO merge all with fetch and remove this util object
+util =
+  model:
+    map: (records) ->
+      (@build or @).call @, record for record, index in records
 
+# TODO better responsibilty division for this code
 scopable =
   builder: stampit().enclose ->
 
@@ -35,7 +42,13 @@ scopable =
       fail:     []
       declared: []
       fetch: (data, done, fail) ->
+
+        if typeof data == 'function'
+          done = data
+          data = {}
+
         scope = extend {}, @scope.data
+        observable.unobserve scope
 
         if scope.noned?
           deferred = $.Deferred()
@@ -44,8 +57,9 @@ scopable =
           deferred = rest.get.call(@, extend scope, data)
 
         deferred
-          .done(@scope.then.concat done)
-          .fail([@scope.fail, fail])
+          .then(util.model.map)
+          .done(@scope.then.concat [done])
+          .fail(@scope.fail.concat [fail])
 
         @scope.clear()
 
@@ -85,7 +99,12 @@ scopable =
       @scope.data.noned = true
       @
 
+    # TODO merge with all object
     fetch: (data, done, fail) ->
+      if typeof data == 'function'
+        done = data
+        data = null
+
       @scope.fetch.call @, data, done, fail
 
     # TODO optmize this iterations or add support for stampit on associable and merge factories

data/vendor/components/indefinido-indemma/src/lib/record/storable.coffee

@@ -19,7 +19,7 @@ storable = stampit
       @writes++
 
       # TODO use object.defineProperty
-      value.sustained = true
+      value.sustained ||= true
       collection[key] = value
 
   values: ->

data/vendor/components/indefinido-indemma/src/lib/record/validatable.coffee

@@ -1,6 +1,6 @@
 require './translationable'
 
-root       = exports ? window
+root       = exports ? @
 stampit    = require '../../vendor/stampit'
 observable = require('observable').mixin
 type       = require 'type'
@@ -90,9 +90,9 @@ initializers =
     # TODO only execute save operation if record is valid
     @before 'save', -> @validate() if @save
 
-    # TODO move this functionality control to validatorable
+    # TODO move this functionality control to validatable
     @validated = false
-    @subscribe 'dirty', (value) -> @validated = false
+    @subscribe 'dirty', (value) -> value and @validated = false
 
     Object.defineProperty @, 'valid',
       get: ->
@@ -173,7 +173,16 @@ extensions =
       @validation.fail failed
 
       # TODO store this callback
-      @validation.then (record) -> record.validated = true
+      @validation.then (record) ->
+        # Disable dirty checking to prevent validation believe that
+        # the model values has changed
+        old_dirty        = record.dirty
+        record.dirty     = null
+
+        record.validated ||= true
+
+        # Restore dirty state
+        record.dirty     = old_dirty
 
       @validation
 
@@ -188,11 +197,6 @@ manager =
   #   builder = @validators[name] ||= require "validations/#{name}"
 
 
-validatable = stampit
-  validate: -> throw new Error 'Composed factory must override the validate method'
-  validate_each: -> throw new Error 'Composed factory must override the validate each method'
-
-
 # TODO better stampit integration
 model.mix (modelable) ->
   jQuery.extend modelable, extensions.model
@@ -204,14 +208,11 @@ model.mix (modelable) ->
 
   model.validators = manager.validators
 
-# Globalize definitions
-root.validatable = validatable
-root.manager     = manager
-
 # TODO async validator loading
-require './validations/confirmation'
-require './validations/associated'
-require './validations/presence'
-require './validations/remote'
-require './validations/type'
-require './validations/cpf'
+manager.validators.confirmation = require './validations/confirmation'
+manager.validators.associated   = require './validations/associated'
+manager.validators.presence     = require './validations/presence'
+manager.validators.remote       = require './validations/remote'
+manager.validators.type         = require './validations/type'
+manager.validators.cpf          = require './validations/cpf'
+

data/vendor/components/indefinido-indemma/src/lib/record/validations/associated.coffee

@@ -1,10 +1,9 @@
 # TODO Add base settings to validation
 # model = window.model
-
 # TODO implement method
+
 # model[resource].validators_on 'field' # Get all validators related to this field
 
-validations = require '../validatable'
 stampit     = require '../../../vendor/stampit'
 
 associationable = stampit
@@ -26,7 +25,6 @@ associationable = stampit
       associated_validation
 
 
-composed = stampit.compose(validations.validatable, associationable)
+composed = stampit.compose(require('./validatorable'), associationable)
 composed.definition_key = 'validates_associated'
-
-validations.manager.validators.association = composed
+module.exports = composed

data/vendor/components/indefinido-indemma/src/lib/record/validations/confirmation.coffee

@@ -4,7 +4,6 @@
 # TODO implement method
 # model[resource].validators_on 'field' # Get all validators related to this field
 
-validations = require '../validatable'
 stampit     = require '../../../vendor/stampit'
 
 confirmationable = stampit
@@ -13,7 +12,6 @@ confirmationable = stampit
       record.errors.add "#{attribute}_confirmation", 'confirmation', @options
 
 
-composed = stampit.compose(validations.validatable, confirmationable)
+composed = stampit.compose require('./validatorable'), confirmationable
 composed.definition_key = 'validates_confirmation_of'
-
-validations.manager.validators.confirmation = composed
+module.exports = composed

data/vendor/components/indefinido-indemma/src/lib/record/validations/cpf.coffee

@@ -4,7 +4,6 @@
 # TODO implement method
 # model[resource].validators_on 'field' # Get all validators related to this field
 
-validations = require '../validatable'
 stampit     = require '../../../vendor/stampit'
 
 cpfable = stampit
@@ -24,7 +23,7 @@ cpfable = stampit
     v  = false
     i  = 0
 
-    for i in [1..9]
+    for i in [0..9]
       d1 += c.charAt(i) * (10 - i)
 
     return false if d1 == 0
@@ -35,7 +34,7 @@ cpfable = stampit
     return false if +dv.charAt(0) != d1
 
     d1 *= 2
-    for i in [1..9]
+    for i in [0..9]
       d1 += c.charAt(i) * (11 - i)
 
 
@@ -53,6 +52,6 @@ cpfable = stampit
 
 
 
-composed = stampit.compose validations.validatable, cpfable
+composed = stampit.compose require('./validatorable'), cpfable
 composed.definition_key = 'validates_cpf_format'
-validations.manager.validators.cpf = composed
+module.exports = composed

data/vendor/components/indefinido-indemma/src/lib/record/validations/presence.coffee

@@ -4,7 +4,6 @@
 # TODO implement method
 # model[resource].validators_on 'field' # Get all validators related to this field
 
-validations = require '../validatable'
 stampit     = require '../../../vendor/stampit'
 
 presenceable = stampit
@@ -12,8 +11,6 @@ presenceable = stampit
     if value == null or value == '' or value == undefined
       record.errors.add attribute, 'blank', @options
 
-
-composed = stampit.compose(validations.validatable, presenceable)
+composed = stampit.compose require('./validatorable'), presenceable
 composed.definition_key = 'validates_presence_of'
-
-validations.manager.validators.presence = composed
+module.exports = composed

data/vendor/components/indefinido-indemma/src/lib/record/validations/remote.coffee

@@ -1,12 +1,9 @@
 # TODO Add base settings to validation
 # model = window.model
 
-  # TODO implement method
+# TODO implement method
 # model[resource].validators_on 'field' # Get all validators related to this field
 
-root  = exports ? window
-
-validations = require '../validatable'
 rest        = require '../rest'
 stampit     = require '../../../vendor/stampit'
 
@@ -59,7 +56,6 @@ remoteable = stampit
   @
 
 
-composed = stampit.compose(validations.validatable, remoteable)
+composed = stampit.compose require('./validatorable'), remoteable
 composed.definition_key = 'validates_remotely'
-
-validations.manager.validators.remote = composed
+module.exports = composed

data/vendor/components/indefinido-indemma/src/lib/record/validations/type.coffee

@@ -26,7 +26,6 @@ typeable = stampit
         throw new Error "Invalid attribute value type! Found #{typeof value} expected #{@type.name}"
 
 
-composed = stampit.compose(validations.validatable, typeable)
+composed = stampit.compose require('./validatorable'), typeable
 composed.definition_key = 'validates_type_of'
-
-validations.manager.validators.type = composed
+module.exports = composed

data/vendor/components/indefinido-indemma/src/lib/record/validations/validatorable.coffee

@@ -0,0 +1,5 @@
+stampit     = require '../../../vendor/stampit'
+
+module.exports = stampit
+  validate: -> throw new Error 'Composed factory must override the validate method'
+  validate_each: -> throw new Error 'Composed factory must override the validate each method'

data/vendor/components/indefinido-indemma/src/spec/record/restfulable_spec.coffee

@@ -105,6 +105,14 @@ describe 'restfulable', ->
             belongs_to: 'person'
 
         # TODO implement setter on has many association and move this code to there
+        it 'should not assign attribute with the same value twice', ->
+          object     = {}
+
+          arthur     = person name: object
+          arthur.assign_attributes name: {}
+
+          arthur.name.should.not.be.eq object
+
         it 'assigns associations properly', ->
           arthur     = person name: 'Arthur Dent'
           ford       = friend name: 'Ford Perfect'

data/vendor/components/indefinido-indemma/src/spec/record/validatable_spec.coffee

@@ -13,11 +13,11 @@ describe 'model',  ->
     person.should.have.property 'validators'
     person.validators.should.be.an 'array'
 
-  describe '#()', ->
+  describe '(validates_... : ...)', ->
 
     describe 'validators instatiation',  ->
 
-      it 'should instantiate validators with prefix validates_', ->
+      it 'should have validators', ->
         person = model.call
           resource  : 'person'
           name      : String
@@ -27,7 +27,7 @@ describe 'model',  ->
         validator = person.validators[0]
         validator.should.have.property 'attribute_name', 'name'
 
-      it 'should instantiate validators with in the key validates'
+      it 'should have validators with in the key validates'
         #person = model.call
         #  resource  : 'person'
         #  name      : String
@@ -35,7 +35,7 @@ describe 'model',  ->
 
         #person.validators.should.have.key 'name'
 
-    describe '#validate_attribute', ->
+    describe '.validate_attribute()', ->
 
       beforeEach ->
         # TODO implement better model redefinition pattern

data/vendor/components/indefinido-indemma/src/spec/record/validations/associated_spec.coffee

@@ -2,7 +2,7 @@ root = exports ? window
 
 require 'indemma/lib/record/validatable'
 
-describe 'model #() validates_associated',  ->
+describe 'model ( validates_associated: ... )',  ->
 
   describe 'basic usage', ->
     model  = root.model
@@ -23,7 +23,7 @@ describe 'model #() validates_associated',  ->
       person.validators.length  = 0
       address.validators.length = 0
 
-    describe '#validate', ->
+    describe '.validate()', ->
 
       it 'should add error to record when fields does not match', ->
         arthur = person {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ende
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.4.0
 platform: ruby
 authors:
 - Heitor Salazar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,7 +79,6 @@ files:
 - lib/assets/javascripts/aura/extensions/rivets.js.coffee
 - lib/assets/javascripts/aura/extensions/rivets/accounting.js.coffee
 - lib/assets/javascripts/aura/extensions/rivets/formatters.js.coffee
-- lib/assets/javascripts/aura/extensions/rivets/formatters.js.coffee~
 - lib/assets/javascripts/aura/extensions/routes.js.coffee
 - lib/assets/javascripts/aura/extensions/states.js.coffee
 - lib/assets/javascripts/aura/extensions/widget/eventable.js.coffee
@@ -87,6 +86,7 @@ files:
 - lib/assets/javascripts/aura/extensions/widget/napable.js.coffee
 - lib/assets/javascripts/aura/extensions/widget/presentable.js.coffee
 - lib/assets/javascripts/aura/presentable.js.coffee
+- lib/assets/javascripts/config/initializers.js.coffee
 - lib/assets/javascripts/config/initializers/jquery.js.coffee
 - lib/assets/javascripts/config/initializers/requirejs.js.coffee
 - lib/assets/javascripts/config/load_components.js.coffee
@@ -140,8 +140,10 @@ files:
 - lib/ende/version.rb
 - lib/tasks/.gitkeep
 - vendor/assets/components/build.css
+- vendor/assets/components/build.js
 - vendor/assets/components/ende_build.css
 - vendor/assets/components/ende_build.js
+- vendor/assets/components/indemma_with_none.js
 - vendor/assets/javascripts/accounting/accounting.js
 - vendor/assets/javascripts/ende/build.js
 - vendor/assets/javascripts/jquery/inputmask.extensions.js
@@ -150,6 +152,7 @@ files:
 - vendor/assets/javascripts/jquery/inview.js
 - vendor/assets/javascripts/lennon/lennon.js
 - vendor/assets/javascripts/shims/es6-map-shim.js
+- vendor/assets/javascripts/spin/spin.js
 - vendor/assets/javascripts/stampit/stampit.js
 - vendor/components/KapIT-observe-utils/component.json
 - vendor/components/KapIT-observe-utils/lib/observe-utils.js
@@ -286,6 +289,8 @@ files:
 - vendor/components/indefinido-indemma/lib/record/validations/presence.js
 - vendor/components/indefinido-indemma/lib/record/validations/remote.js
 - vendor/components/indefinido-indemma/lib/record/validations/type.js
+- vendor/components/indefinido-indemma/lib/record/validations/validatorable.js
+- vendor/components/indefinido-indemma/package.json
 - vendor/components/indefinido-indemma/spec/record/associable_spec.js
 - vendor/components/indefinido-indemma/spec/record/persistable_spec.js
 - vendor/components/indefinido-indemma/spec/record/queryable_spec.js
@@ -325,6 +330,7 @@ files:
 - vendor/components/indefinido-indemma/src/lib/record/validations/presence.coffee
 - vendor/components/indefinido-indemma/src/lib/record/validations/remote.coffee
 - vendor/components/indefinido-indemma/src/lib/record/validations/type.coffee
+- vendor/components/indefinido-indemma/src/lib/record/validations/validatorable.coffee
 - vendor/components/indefinido-indemma/src/spec/record/associable_spec.coffee
 - vendor/components/indefinido-indemma/src/spec/record/persistable_spec.coffee
 - vendor/components/indefinido-indemma/src/spec/record/queryable_spec.coffee