ende 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5ab945e667fab4518f897b641e41c3a63a2ccad
-  data.tar.gz: 5bf29f25cf19c73e0ae910b05efae3111b927658
+  metadata.gz: 508121894c529c825b8be23734809551052843b0
+  data.tar.gz: c1bb6a5676fcff34bb0c33b60f869bf96c8d4989
 SHA512:
-  metadata.gz: 79b8f2332cb04cfb54dc58115022a507d83188aff1e5570f494e7e365858dbc2b0d4331c9c923424b5edf28bad80e58e2e9f42b103cb81e15a8292125183dd99
-  data.tar.gz: fbcfe1d946d46ce49dec149c7dbc793a49f0f27040edd0f328d90c60a373a81a8b8dc3c28a386a62b9fc333ae86a28a3f63e805287604c22f27f334e808f6d1b
+  metadata.gz: e1ace745145b3787b7b74fbc1ea6d022137e26c98d4d3ac9e0bec815fca1d0144a808f00eb60ee5a057e2a4b2fcbb0d1eb20dd11624cec82886bd022058edb6a
+  data.tar.gz: a1e37960784210d21d53baef5aa9dc4a8065ec2d33ae6e6620ffe5a91643315b0e25fbbeb863d7cd12a50fbb3560f2a626cd290783dc8bcbe080e144529158a9

data/component.json

@@ -1,12 +1,11 @@
 {
   "name": "ened",
   "repo": "indefinido/ened",
-  "description": "Core web application functionality",
-  "version": "0.0.1",
+  "description": "Core web application functionacility",
+  "version": "0.1.0",
   "keywords": [],
   "dependencies": {
-    "mikeric/rivets": "*",
-    "KapIT/observe-utils": "*",
+    "mikeric/rivets": "v0.5.12",
     "segmentio/extend": "*",
     "pluma/assimilate": "*",
     "paulmillr/es6-shim": "*",
@@ -32,4 +31,4 @@
     "vendor/assets/javascripts"
   ],
   "license": "MIT"
-}
+}

data/lib/assets/javascripts/aura/extensions/loader.js.coffee

@@ -2,15 +2,10 @@ define 'aura/extensions/loader', ->
 
   'use strict';
 
-  try
-    Spinner = require 'seminovos/vendor/assets/javascripts/spin/spin'
-  catch e
-    Spinner = require 'modacad/vendor/assets/javascripts/spin/spin'
-
+  Spinner = null
 
   (application) ->
-    core     = application.core
-    mediator = core.mediator
+    {core}     = application
 
     loader =
 
@@ -41,8 +36,17 @@ define 'aura/extensions/loader', ->
         new Spinner(core.util.extend {}, @options, options).spin target[0]
 
     name: 'loader'
+    version: '0.1.0'
     initialize: (application) ->
-      core.ui ||= {}
-      application.sandbox.ui = core.ui
-      core.ui.loader = ->
-        loader.create arguments...
+      {sandbox}   = application
+
+      # TODO add a default spinner on ende, and add application load
+      # paths
+      try
+        Spinner = require 'seminovos/vendor/assets/javascripts/spin/spin'
+      catch e
+        Spinner = require 'modacad/vendor/assets/javascripts/spin/spin'
+
+      # Extend application
+      sandbox.ui = core.util.extend sandbox.ui, loader: -> loader.create arguments...
+      core.ui    = core.util.extend core.ui   , loader: -> loader.create arguments...

data/lib/assets/javascripts/aura/extensions/mask.js.coffee

@@ -20,25 +20,25 @@ $.extend $.inputmask.defaults.aliases,
       digits         : 2
       allowMinus     : false
       allowPlus      : false
-      
+
     plate:
       mask           : 'AAA-9999'
-      
+
     meters:
       alias          : 'integer'
       allowMinus     : false
       allowPlus      : false
       integerDigits  : 6
-      
+
     cpf:
       mask           : '999.999.999-99'
-      
+
     cnpj:
       mask           : '99.999.999/9999-99'
-      
+
     phone:
       mask           : '(99) 9999[9]-9999'
-    
+
 
 
 define 'aura/extensions/mask', (mask) ->
@@ -47,79 +47,15 @@ define 'aura/extensions/mask', (mask) ->
 
 
   (application) ->
-    
-    
+
+
     mask = (selector, mask, options) ->
       $(selector).inputmask mask, options
-    
 
-    # version: '0.1.0'
+
+    version: '0.1.0'
 
     initialize: (application) ->
-      application.sandbox.ui.mask = mask
-
-    afterAppStart: (application) ->
-      #
-
-
-
-
-
-
-  # 
-  # 
-  # 
-  # 
-  # # TODO Remove .call null
-  # # TODO Remove .call null
-  # loader.require.call null, 'modernizr'
-  # loader.require.call null, 'ened/vendor/assets/javascripts/lennon/lennon.js'
-  # query  = loader.require.call null, 'querystring'
-  # router = null
-  # 
-  # # TODO rename to router stationg
-  # (application) ->
-  #   core     = application.core
-  #   mediator = core.mediator
-  # 
-  #   # TODO unify router api
-  #   router = new Lennon
-  #     # TODO implement logger api for lennon or change lennon library
-  #     # logger: application.logger
-  #     publishEvent: (name, params) ->
-  # 
-  #       current_route = window.location.href
-  #       if router.last_route != current_route
-  #         mediator.emit 'route.changed'
-  #         router.last_route = current_route
-  # 
-  #       # TODO method parsing (get, delete, put, post)
-  #       mediator.emit name, params
-  # 
-  #   router.location = (href, process = true) ->
-  #     if Modernizr.history
-  #       window.history.pushState null, null, href
-  #     else
-  #       # TODO parse href and extract path!
-  #       window.location.hash = href
-  # 
-  #     process and router.process()
-  # 
-  # 
-  #   application.core.router = router
-  # 
-  #   location = Object.create null,
-  #     # TODO cache query parsing
-  #     query:
-  #       get: -> query.parse window.location.search.substring(1)
-  # 
-  #     toString: -> window.location
-  # 
-  #   version: '0.2.1'
-  # 
-  #   initialize: (application) ->
-  #     application.sandbox.ui.mask = mask
-  # 
-  #   afterAppStart: (application) ->
-  #     router.process()
-  # 
+      {core, sandbox} = application
+
+      sandbox.ui = sandbox.util.extend sandbox.ui, mask: mask

data/lib/assets/javascripts/aura/extensions/models.js.coffee.erb

@@ -61,7 +61,7 @@ define 'aura/extensions/models', <%= models_list.to_json  %>, (models...) ->
     core.resource = core.model  = sandbox.resource = sandbox.model = (name) ->
       # TODO use a Map internally in indemma
       model = indemma.model[name]
-      throw new Error unless model?
+      throw new TypeError "resources: Resource was not defined: #{name}" unless model?
       model
 
     # TODO rename core.models and core.domain, to core.resources, completely

data/lib/assets/javascripts/aura/extensions/rivets.js.coffee

@@ -16,6 +16,7 @@ define 'aura/extensions/rivets', ['extensions/rivets/formatters'], (formatters)-
 
   rivets.configure observable_configuration
   rivets.configure
+    prefix: ''
     templateDelimiters: ['{{', '}}']
 
   # Custom rivets view because we don't want to prefix attributes

data/lib/assets/javascripts/aura/extensions/routes.js.coffee

@@ -5,6 +5,7 @@ define 'aura/extensions/routes', (routes) ->
   # TODO Remove .call null
   # TODO Remove .call null
   loader.require.call null, 'modernizr'
+  # TODO rename from ened to ende
   loader.require.call null, 'ened/vendor/assets/javascripts/lennon/lennon.js'
   query  = loader.require.call null, 'querystring'
   router = null
@@ -28,17 +29,21 @@ define 'aura/extensions/routes', (routes) ->
         # TODO method parsing (get, delete, put, post)
         mediator.emit name, params
 
-    router.location = (href, process = true) ->
-      if Modernizr.history
-        window.history.pushState null, null, href
-      else
-        # TODO parse href and extract path!
-        window.location.hash = href
+    lennon_extensions =
+      location: (href, process = true) ->
+        if Modernizr.history
+          window.history.pushState null, null, href
+        else
+          # TODO parse href and extract path!
+          window.location.hash = href
 
-      process and router.process()
+        process and router.process()
 
+      define: ->
+        return false
 
-    application.core.router = router
+
+    application.core.router = core.util.extend router, lennon_extensions
 
     location = Object.create null,
       # TODO cache query parsing
@@ -53,5 +58,5 @@ define 'aura/extensions/routes', (routes) ->
       application.sandbox.location = location
 
     afterAppStart: (application) ->
-      router.process()
+      # router.process()
 

data/lib/assets/javascripts/aura/extensions/states.js.coffee

@@ -35,48 +35,53 @@ define 'aura/extensions/states', ['application/states'], (states) ->
         unormalized_widget_options = states[transition.to]
 
         # TODO cache rendered widgets!
-
         if unormalized_widget_options
-          widgets = []
-
-          for name, options of unormalized_widget_options
-            widget_name        = options.name || name
-            options.resource ||= name                 unless name == widget_name
-
-            # To allow user controlling the application change the
-            # widget configuration at runtime, we check the transition
-            # for widget options
-            widgets.push
-              name: widget_name
-              options: core.util.extend transition[widget_name], options
-
-            # TODO document why we delete this?
-            delete options.name
+          widgets_options = @normalize_widget_options unormalized_widget_options, transition
 
           # TODO update aura and use native start method
-          # {domain}  = application
-          # injection = core.inject(widgets).fail flow.failed
-          core.inject(widgets).fail flow.failed
+          # TODO move this logic to a domain extension
+          {domain}  = application
+
+          injection = core.inject(widgets_options).fail flow.failed
 
-          #domain?[transition.to]?.ready = injection.done
+          domain?[transition.to]?.ready ||= injection.done
 
           # To prevent reinstation upon changing to this state for the
           # second time, delete stored configuration for this state
           delete states[transition.to]
 
+      normalize_widget_options: (unormalized_widget_options, transition_widgets_options) ->
+        widgets = []
+
+        for name, options of unormalized_widget_options
+          widget_name        = options.name || name
+          options.resource ||= name                 unless name == widget_name
+
+          # To allow user controlling the application change the
+          # widget configuration at runtime, we check the transition
+          # for widget options
+          widgets.push
+            name: widget_name
+            options: core.util.extend transition_widgets_options[widget_name], options
+
+          # TODO document why we delete this?
+          delete options.name
+
+        widgets
 
       failed: (exception) ->
         logger.error "states.flow.failed: Failed autostarting widget! \n Message: #{exception.message}", exception
 
 
-    version: '0.2.2'
+    version: '0.2.3'
 
     initialize: (application) ->
       mediator.on 'state.change' , state.change
       mediator.on 'state.changed', state.changed
 
       # TODO load widgets before state.changed, load on state.change
-      mediator.on 'state.changed', flow.changed
+      # TODO use function hanlder
+      mediator.on 'state.changed', -> flow.changed arguments...
 
       # TODO better integration with router to remove initial states widgets
       mediator.on 'states.list', ->

data/lib/assets/javascripts/config/initializers/jquery.js.coffee

@@ -1,7 +1,7 @@
-root = exports ? @
-
-# TODO figure out a better place to put the crsft token initialization
-# root.$.ajaxSetup
-#   beforeSend: (xhr) ->
-#     token = $('meta[name="csrf-token"]').attr('content')
-#     xhr.setRequestHeader 'X-CSRF-Token', token
+require ['jquery'], ($) ->
+  # TODO use prefilter instead of beforeSend
+  # $.ajaxPrefilter(function(options, originalOptions, xhr){ if ( !options.crossDomain ) { rails.CSRFProtection(xhr); }});
+  $.ajaxSetup
+    beforeSend: (xhr) ->
+      token = $('meta[name="csrf-token"]').attr('content')
+      token and xhr.setRequestHeader 'X-CSRF-Token', token

data/lib/assets/javascripts/config/initializers/requirejs.js.coffee

@@ -1,3 +1,4 @@
 requirejs.config({
   baseUrl: '/assets'
+  waitSeconds: 15
 });

data/lib/assets/javascripts/config/{initializers/load_components.js.coffee → load_components.js.coffee}

@@ -1,6 +1,5 @@
 #= require require/require
 #= require build
-#= require ./jquery
 # TODO Move this file outside the initializers folder
 
 root = exports ? this
@@ -9,14 +8,18 @@ root = exports ? this
 # it and globalize it, because aurajs does not know we are using
 # component.io loader and thinks jquery must be shipped within it
 # TODO think in away to not use a global jquery
-try
-  root.jQuery = root.$ = require 'component-jquery'
-catch e
+# try
+#   root.jQuery = root.$ = require 'component-jquery'
+# catch e
   # jQuery was not included in the component build, soo the application will fallback to the
   # jquery builded in aurajs
 
+define 'jquery', [], -> require 'component-jquery'
+root.jQuery = root.$ = require 'component-jquery'
+
 # This may be included in build, and loaded before aurajs requires for them
 # TODO also preload underscorejs
+# define 'underscore', require 'lodash'
 # TODO also preload eventemitter2
 # TODO also preload require-jstext
 

data/lib/assets/javascripts/ende.js.coffee

@@ -1,3 +1,4 @@
 #= require ende_build
+#= require config/load_components
 #= require_tree ./config/initializers
 # TODO think if require jquery and jquery inview in this place is actualy a good idead

data/lib/assets/javascripts/widgets/viewer/main.js.coffee

@@ -7,15 +7,20 @@ define [
   '/assets/jquery/inview',
   'stampit/stampit'], (templates, presenter, inview, stampit) ->
 
-  observable   = require('indefinido-observable').mixin
+  observable   = require('observable').mixin
+  advisable    = require('advisable').mixin
 
   # TODO define componentjs required packages, as requirejs packages
   stampit    ||= require 'stampit/stampit'
 
   scopable = (widget) ->
+    deferred = widget.sandbox.data.deferred()
+
     # TODO add widget plug-in as an extension for a widget
     require ['widgets/viewer/plugins/scopable'], (scopable) ->
-      scopable widget
+      deferred.resolveWith scopable, [scopable widget]
+
+    deferred
 
   paginable = stampit
     flip_to: (page) ->
@@ -154,7 +159,7 @@ define [
 
     # We extend presentation.selected just to assign all values of the item model
     # TODO call presenter to do this job
-    @sandbox.util.extend @presentation.selected   , item.model
+    @sandbox.util.extend @presentation.selected   , item.model.json?() || item.model
     @sandbox.emit "viewer.#{@identifier}.selected", item.model
 
   scope_to: (scope, child_scope) ->
@@ -167,6 +172,11 @@ define [
 
     @sandbox.emit "viewer.#{@identifier}.scope_changed", @scope
 
+    # TODO better scope data binding, and updating
+    if @view? and scope.scope?.data
+      @view.update
+        scope_data: observable scope.scope.data
+
     @repopulate()
 
   repopulate: ->
@@ -175,7 +185,7 @@ define [
         @load.stop()
         @load = null
     else
-      @fetching?.abort()
+      @fetching?.abort?()
 
     # TODO store spinner instance, instead of creating a new one every time
     unless @load?
@@ -212,7 +222,7 @@ define [
         @$el.addClass 'empty'
         @$el.removeClass 'filled'
 
-      @sandbox.emit "viewer.#{@identifier}.populated", records
+      @sandbox.emit "viewer.#{@identifier}.populated", records, @
 
     @fetching.always =>
       # TODO implement status for viewer widget
@@ -254,7 +264,7 @@ define [
 
       @load.stop()
 
-      @presentation = @presenter records
+      @presentation = @presenter records, @scope
 
       @$el.html templates[@options.resource]
 
@@ -274,7 +284,7 @@ define [
 
       @handles 'click', 'back', '.back'
 
-      @sandbox.emit "viewer.#{@identifier}.populated", records
+      @sandbox.emit "viewer.#{@identifier}.populated", records, @
 
 
     deferred.fail =>
@@ -283,10 +293,13 @@ define [
 
 
   plugins: (options) ->
+    deferreds = []
 
-    paginable  widget: @ if options.page
-    scrollable widget: @ if options.scroll
-    scopable   @         if options.scope or options.scopable
+    deferreds.push paginable  widget: @ if options.page
+    deferreds.push scrollable widget: @ if options.scroll
+    deferreds.push scopable   @         if options.scope or options.scopable
+
+    @sandbox.data.when deferreds...
 
   # TODO move this method to an extension
   syncronize_children: ->
@@ -308,10 +321,11 @@ define [
       element.setAttribute 'aura-widget', current
 
   # TODO move this method to an extension
-  # TODO listen for future parent presentation changes
   inherit_parent_presentation: ->
     return unless view = @sandbox?._parent?._view
+    advisable view unless view.after?
 
+    # TODO move this method to sandbox
     isDescendant = (parent, child) ->
       node = child.parentNode
 
@@ -321,24 +335,63 @@ define [
 
       false
 
-    models = {}
+    inherited = []
     # Copy default models
     # TODO think if its a good idea to notify about model name conflicts
-    for name, model of view.models
-      @presentation[name] ||= model # By default do not child models with parent models
+    for name, model of view.models when not @presentation[name] # By default do not override child models with parent models
+      @presentation[name] = model
+      inherited.push name
+
+    # TODO store bindings instead of searching every time
+    for binding in view.bindings when binding.iterated
+      for subview in binding.iterated
+        if isDescendant subview.els[0], @$el.get(0)
+          for name, model of subview.models when not @presentation[name]
+            advisable subview
+            @presentation[name] = model
+            inherited.push name
+
+          break
 
-    for binding in view.bindings
-      # Copy each binding models
-      if binding.iterated
-        for view in binding.iterated
-          if isDescendant view.els[0], @$el.get(0)
-            for name, model of view.models
-              @presentation[name] ||= model
+    # Schedule update of copied models
+    view.after 'update', (models) =>
+      @update_inherited_models view, models, inherited
 
-            break
+    subview.after 'update', (models) =>
+      @update_inherited_models view, models, inherited
 
     true
 
+  update_inherited_models: (parent, models, inherited) ->
+    # Only update inherited models
+    models = @sandbox.util._.pick models, inherited
+
+    isDescendant = (parent, child) ->
+      node = child.parentNode
+
+      while (node != null)
+        return true if (node == parent)
+        node = node.parentNode
+
+      false
+
+    # Copy default models
+    # TODO think if its a good idea to notify about model name conflicts
+    for name, model of models
+      @presentation[name] = model
+
+    @view.update models
+
+    # TODO store bindings instead of searching every time
+    for binding in parent.bindings when binding.iterated
+      for subview in binding.iterated
+        if isDescendant subview.els[0], @$el.get(0)
+          models = @sandbox.util._.pick subview.models, inherited
+          @view.update models
+          @presentation[name] = model for model in models
+          break
+
+    true
 
   initialize: (options) ->
     # TODO import core extensions in another place
@@ -349,10 +402,14 @@ define [
     @sandbox.on "viewer.#{@identifier}.scope", @scope_to, @
 
     # Iniitalize plugins
-    @plugins options
+    loading = @plugins options
 
     @$el.addClass "viewer widget #{cssify @identifier} idle clearfix"
 
+    loading.done =>
+      @require_custom options
+
+  require_custom: (options) ->
     # Fetch custom templates
     # TODO better custom templates structure and custom presenter
     # TODO better segregation of concerns on this code