ende 0.3.13 → 0.4.0

data/lib/assets/javascripts/config/load_components.js.coffee

@@ -1,95 +1,118 @@
-#= require require/require
-#= require build
-# TODO Move this file outside the initializers folder
-
 root = exports ? this
 
-# if jQuery is already included in the default build, we need to load
-# 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
-  # 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
-
-  # TODO!! Try to improve requirejs and components require integrationod
-
-# Little object class to merge component require and requirejs require
-loader =
-  shim: ->
-    # Store loaders functions
-    loader.loaders.component = require
-    loader.loaders.requirejs = requirejs
-    loader.activate.define   = root.define
-
-    # Expand require fuction with requirejs configurations
-    # so we can require without great problems
-    loader.require.config  = requirejs.config
-    loader.require.s       = requirejs.s
-
-  initialize: ->
-    extend = require 'segmentio-extend'
-    extend loader.require, require
-
-    # Override global require for ower one
-    root.require = loader.require
-    root.loader = loader
-
-  # Resource loaders compatibility
-  loaders:
-    requirejs : null
-    component : null
-    discovered: null
-
-  discover: (params...) ->
-
-    if params[0] instanceof Array
-      requirer = 'requirejs'
-    else
-      requirer = 'component'
-
-    @activate (requirer) and requirer
-
-  activate: (requirer) ->
-    switch requirer
-      when 'component'
-        root.define = null
-      when 'requirejs'
-        root.define = @activate.define
+# Prevent aura from defining jquery erroniously
+define 'jquery'    , ['config/load_components'], -> require 'component-jquery'
+# TODO define 'underscore', ['config/load_components'], -> require 'lodash'
+
+# TODO figure out how to use rjs optmizer to include component builds
+# Use call method to avoid optmization at all
+define 'ende_components', ['ende_build'], {}
+define 'application_components', ['ende_components', 'build'], {}
+
+requirejs.config
+  shim:
+    build:
+      # FIXME check that the build was loaded in a more elegant way
+      # probably create a undefined plug-in for component builder
+      exports: 'require.modules.seminovos/vendor/loaded'
+      deps: ['ende_build']
+    ende_build:
+      exports: 'require.register'
+
+# In order to start, application and ende components must be loaded
+define 'config/load_components', ['application_components'], ->
+
+  # TODO remove and use r.js optmizer wrapShim option, when
+  # optimizer gets updated
+  define 'jquery.inview'                  , ['jquery'], ->
+    require 'ened/vendor/assets/javascripts/jquery/inview.js'
+
+  define 'jquery.mask'                    , ['jquery'], ->
+    inner_lazy_require = 'ened/vendor/assets/javascripts/jquery/inputmask.js'
+    require inner_lazy_require
+
+  define 'jquery.mask_extensions'         , ['jquery'], ->
+    inner_lazy_require = 'ened/vendor/assets/javascripts/jquery/inputmask.extensions.js'
+    require inner_lazy_require
+
+  define 'jquery.mask_numeric_extensions' , ['jquery'], ->
+    inner_lazy_require = 'ened/vendor/assets/javascripts/jquery/inputmask.numeric.extensions.js'
+    require inner_lazy_require
+
+  # Object.defineProperty window, 'jQuery',
+  #   get: -> require 'component-jquery'
+  #   set: -> debugger
+
+  # This may be included in build, and loaded before aurajs requires for them
+  # TODO also preload eventemitter2
+  # TODO also preload require-jstext
+
+  # Little object class to merge component require and requirejs require
+  loader =
+    shim: ->
+      # Store loaders functions
+      loader.loaders.component = require
+      loader.loaders.requirejs = requirejs
+      loader.activate.define   = root.define
+
+      # Expand require fuction with requirejs configurations
+      # so we can require without great problems
+      loader.require.config  = requirejs.config
+      loader.require.s       = requirejs.s
+
+    initialize: ->
+      with_component = 'segmentio-extend'
+      extend = require with_component
+      extend loader.require, require
+
+      # Override global require for ower one
+      root.require = loader.require
+      root.loader = loader
+
+    # Resource loaders compatibility
+    loaders:
+      requirejs : null
+      component : null
+      discovered: null
+
+    discover: (params...) ->
+
+      if params[0] instanceof Array
+        requirer = 'requirejs'
       else
-        false
+        requirer = 'component'
 
-    @loaders.discovered = @loaders[requirer]
+      @activate (requirer) and requirer
 
-    true
+    activate: (requirer) ->
+      switch requirer
+        when 'component'
+          root.define = null
+        when 'requirejs'
+          root.define = @activate.define
+        else
+          false
 
-  require: (params...) ->
-    using = loader.discover params...
+      @loaders.discovered = @loaders[requirer]
 
-    try
+      true
 
-      module = loader.loaders.discovered.apply @, params
+    require: (params...) ->
+      using = loader.discover params...
 
-    catch e
-      console.warn 'Failed to load \'', params[0], "' with #{using}: Error: '", e.message, '\'. Trying with requirejs.'
-      loader.activate 'requirejs'
-      module = loader.loaders.discovered.apply @, params unless module
+      try
+
+        module = loader.loaders.discovered.apply @, params
 
-    # Always let requirjs active by default
-    loader.activate 'requirejs'
+      catch e
+        console.warn 'Failed to load \'', params[0], "' with #{using}: Error: '", e.message, '\'. Trying with requirejs.'
+        loader.activate 'requirejs'
+        module = loader.loaders.discovered.apply @, params unless module
+
+      # Always let requirjs active by default
+      loader.activate 'requirejs'
 
-    module
+      module
 
-loader.shim()
-loader.initialize()
+  loader.shim()
+  loader.initialize()

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

@@ -1,4 +1,13 @@
-#= 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
+# TODO think if require jquery and jquery inview in this place is actualy a good idead
+
+# TODO use requirejs alias / packing modules definition for this
+define 'ende', ['config/load_components', 'config/initializers'], ->
+
+  # Override defaults components definition
+  # TODO better way to forward component modules to application
+  define 'observable', [], -> require("indefinido-observable").mixin
+  define 'advisable' , [], -> require("indefinido-advisable").mixin
+
+  # TODO FIX THIS!
+  require.register('observable', (r, e, module) -> module.exports = require("indefinido-observable").mixin)
+  require.register('advisable' , (r, e, module) -> module.exports = require("indefinido-advisable").mixin )

data/lib/assets/javascripts/widgets/authenticator/presenter.js.coffee

@@ -1,6 +1,7 @@
 'use strict'
-define ->
-  observable = require('observable').mixin
+
+lazy_require = 'observable'
+define [lazy_require], (observable) ->
 
   (authenticator, recoverer, base) ->
 

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

@@ -84,9 +84,13 @@ define ->
   initialize: (options) ->
     @sandbox.logger.log "initialized!"
 
-    # TODO integrate component and requirejs
-    dialog  = require('dialog').Dialog
-    overlay = require 'component-overlay'
+    # TODO integrate component and requirejs in a more consize way
+    with_component = 'dialog'
+    dialog  = require(with_component).Dialog
+
+    with_component = 'component-overlay'
+    overlay = require with_component
+
     @sandbox.util.extend dialog.prototype, dialog_extensions
 
     # Initialize fundamental style

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

@@ -1,8 +1,7 @@
-# TODO bettter require
-stampit    = require 'indefinido-indemma/vendor/stampit.js'
-observable = require('observable').mixin
+'use strict';
 
-define ->
+lazy_require = 'observable'
+define ['stampit/stampit', lazy_require], (stampit, observable) ->
 
   handlers =
     adapter_loaded: (composable) ->

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

@@ -1,17 +1,13 @@
 'use strict';
 
+lazy_requires = ['observable', 'advisable']
 define [
   './states/index',
   './presenters/default',
-  './presenters/default',
-  '/assets/jquery/inview',
-  'stampit/stampit'], (templates, presenter, inview, stampit) ->
-
-  observable   = require('observable').mixin
-  advisable    = require('advisable').mixin
-
-  # TODO define componentjs required packages, as requirejs packages
-  stampit    ||= require 'stampit/stampit'
+  'jquery.inview',
+  'stampit/stampit',
+  lazy_requires[0],
+  lazy_requires[1]], (templates, presenter, inview, stampit, observable, advisable) ->
 
   scopable = (widget) ->
     deferred = widget.sandbox.data.deferred()
@@ -129,32 +125,7 @@ define [
     viewed: (event, in_view, horizontal, vertical) ->
       boo[if in_view then 'pride' else 'shame'] event.target
 
-
-  # TODO Move each handler to independent features
-  handleable = stampit
-    handleables:
-      item:
-        hover: (event, models) ->
-          if event.type == 'mouseenter'
-            @hover models.item
-          else if event.type == 'mouseleave'
-            @hover null
-          else
-            throw new TypeError 'viewer.handlers.hover: Event type incompatible with hovering.'
-
-        clicked: (event, models) -> @select models.item
-
-  , {}, ->
-
-    throw new TypeError "Widget property is mandatory for handleable stamp" unless @widget?
-
-    @handlers =
-      item:
-        clicked: $.proxy @handleables.item.clicked, @widget
-        hover  : $.proxy @handleables.item.hover  , @widget
-
-    @
-  version: '0.2.4'
+  version: '0.2.1'
 
   # TODO better separation of concerns
   # TODO Current remote page that is beign displayed
@@ -185,16 +156,8 @@ 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.json?() || item.model
-
-    # TODO change paramters to item, item.model
     @sandbox.emit "viewer.#{@identifier}.selected", item.model
 
-  # Called when hover in and out from model
-  hover: (item) ->
-    # TODO call presenter to do this job
-    # @sandbox.util.extend @presentation.hovered   , item.model.json?() || item.model
-    @sandbox.emit "viewer.#{@identifier}.hovered", item, item && item.model
-
   scope_to: (scope, child_scope) ->
     # Singuralize in order to accept association scopes, since
     # association scopes return almost the same kind as of it's
@@ -202,14 +165,16 @@ define [
     sent_scope    = @inflector.singularize scope.resource.toString()
     current_scope = @inflector.singularize @scope.resource.toString()
 
-    deferred      = @sandbox.data.deferred()
-
     if sent_scope != current_scope
       throw new TypeError "Invalid scope sent to viewer@#{@identifier} sent: '#{sent_scope}', expected: '#{current_scope}'"
 
     # For sobsequent usages we must store the scope
     @scope = scope
 
+    # TODO better hierachical event distribution
+    for { _widget: widget } in @sandbox._children?
+      widget.scope_to? child_scope
+
     @sandbox.emit "viewer.#{@identifier}.scope_changed", @scope
 
     # TODO better scope data binding, and updating
@@ -219,15 +184,6 @@ define [
 
     @repopulate()
 
-  # TODO rename this method
-  # TODO also move this to an external tag
-  statused: (status) ->
-    if status
-      @status = status
-      @sandbox.emit "viewer.#{@identifier}.status_changed", status
-    else
-      @status
-
   repopulate: ->
     unless @fetching?
       if @load?
@@ -238,10 +194,9 @@ define [
 
     # TODO store spinner instance, instead of creating a new one every time
     unless @load?
-      @load   = @sandbox.ui.loader @$results
+      @load   = @sandbox.ui.loader @$el.find '.results .items'
 
       # TODO implement status for viewer widget
-      @statused 'loading'
       @$el.addClass 'idle'
       @$el.removeClass 'loading'
 
@@ -276,7 +231,6 @@ define [
 
     @fetching.always =>
       # TODO implement status for viewer widget
-      @statused 'loading'
       @$el.addClass 'idle'
       @$el.removeClass 'loading'
 
@@ -285,11 +239,12 @@ define [
         @load = null
 
 
-  populate: ->
-    @load   = @sandbox.ui.loader @$el
+  populate: (handlers) ->
+    sandbox = @sandbox
+
+    @load   = @sandbox.ui.loader @$results
 
     # TODO implement status for viewer widget
-    @statused 'loading'
     @$el.removeClass 'idle'
     @$el.addClass 'loading'
 
@@ -314,12 +269,9 @@ define [
 
       @load.stop()
 
-      # TODO do not send records as parameter
-      @presentation = @presenter records, @scope, @handleable
+      @presentation = @presenter records, @scope
 
-      # Initialize elements
       @$el.html templates[@options.resource]
-      @$results = @$el.find '.results .items'
 
       if records.length
         # boo.initialize @$el.find '.results .items'
@@ -346,7 +298,7 @@ define [
 
 
   plugins: (options) ->
-    deferreds = [@]
+    deferreds = []
 
     deferreds.push paginable  widget: @ if options.page
     deferreds.push scrollable widget: @ if options.scroll
@@ -357,7 +309,6 @@ define [
   # TODO move this method to an extension
   syncronize_children: ->
     @sandbox._children ||= []
-    @sandbox._widget   ||= @
 
     # Add possible new childs
     @constructor.startAll(@$el).done (widgets...) =>
@@ -367,12 +318,6 @@ define [
 
       @sandbox._children = @sandbox._children.concat widgets
 
-      for widget in widgets
-        # TODO emit this event only when all siblings have initialized
-        @sandbox.emit "#{widget.name}.#{widget.identifier}.siblings_initialized", @sandbox._children
-
-      true
-
     # TODO better internal aura widget selection
     # Prevent other child to be instantiated
     @$el.find('[data-aura-widget]').each (i, element) ->
@@ -456,56 +401,43 @@ define [
   initialize: (options) ->
     # TODO import core extensions in another place
     @resource      = @sandbox.resource options.resource
-    @scope         = @resource
-
-    # Instantiate it's on handleable factory
-    widget         = @
-    widgetable     = stampit().enclose -> @widget = widget; @
-    @handleable    = stampit.compose widgetable, handleable
+    @scope         = model = @resource
 
     {sandbox: {util: {@inflector}}}   = @
 
     @sandbox.on "viewer.#{@identifier}.scope", @scope_to, @
 
-    # Initalize plugins
-    # TODO think how to implement plugins api
+    # Iniitalize plugins
     loading = @plugins options
 
-    @statused 'idle'
     @$el.addClass "viewer widget #{@inflector.cssify @identifier} idle clearfix"
 
-    loading.done (widget) ->
-      widget.require_custom options.resource
-
-  # TODO externalize this code to an extension
-  require_custom: (resource) ->
-    deferred = @sandbox.data.deferred()
+    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
     # TODO handle case where custom presenter does not exist!
     require [
-      "text!./widgets/viewer/templates/default/#{resource}.html"
-      "./widgets/viewer/presenters/#{resource}"
+      "text!./widgets/viewer/templates/default/#{options.resource}.html"
+      "./widgets/viewer/presenters/#{options.resource}"
       ], (custom_default_template, custom_presenter) =>
 
-      unless presenter.hasOwnProperty 'handlers'
-        Object.defineProperty presenter, 'handlers',
-          get: -> throw new Error "presenter.hanlder is deprecated, please compose upon handleable"
-          set: -> throw new Error "presenter.hanlder is deprecated, please compose upon handleable"
+      # TODO Better way to preserve widgets handlers
+      handlers     =
+        item:
+          clicked: (event, models) =>
+            @select models.item
 
-      custom_default_template and templates[resource] = custom_default_template
-      @presenter  = @sandbox.util.extend custom_presenter, presenter if custom_presenter
+      presenter.handlers = handlers
 
-      # Fetch default data
-      @populate()
+      custom_default_template and templates[options.resource] = custom_default_template
+      @presenter = @sandbox.util.extend custom_presenter, presenter if custom_presenter
 
-      deferred.resolveWith @, [resource]
+      @$results = @$el.find '.results .items'
 
-    , (error) =>
-      # TODO handle other status codes with xhr error
-      @sandbox.logger.error "Error when loading presenter and template for resource '#{resource}':\n\n", error.message + "\n\n", error
-      deferred.rejectWith @, arguments
+      # Fetch default data
+      @populate handlers
 
-    deferred
+    true

data/lib/assets/javascripts/widgets/viewer/presenters/default.js.coffee

@@ -3,10 +3,8 @@
 # TODO implement default presenter
 # define ['aura/presenterable'], (presenterable) ->
 #  presenterable()
-# TODO move observable to requirejs
-observable = require('observable').mixin
-
-define ['stampit/stampit'], (stampit) ->
+lazy_require = 'observable'
+define ['stampit/stampit', lazy_require], (stampit, observable) ->
 
   itemable = stampit().enclose -> observable @
 

data/lib/ende/version.rb

@@ -1,3 +1,3 @@
 module Ende
-  VERSION = "0.3.13"
+  VERSION = "0.4.0"
 end