ende 0.5.0 → 0.5.1

data/lib/assets/javascripts/aura/extensions/widget/#composable.js.coffee#

@@ -0,0 +1,135 @@
+'use strict';
+
+define 'aura/extensions/widget/composable', ->
+  stamp = extend = null
+
+  advisorable = (advisor) ->
+    # TODO merge advices in the composition chain
+    advice_names = ['before', 'after', 'around']
+
+    extract_advices = (object) ->
+      found = []
+      for key of object when key.indexOf('_') isnt -1
+        [name, adviced] = key.split '_'
+
+        if advice_names.indexOf(name) != -1
+          callbacks = if object[key].length then object[key] else [object[key]]
+
+          delete object[key]
+
+          found.push
+            key: key
+            name: name
+            adviced: adviced
+            callbacks: callbacks
+
+      found
+
+    advisor.advice = (widget) ->
+
+      advices = extract_advices widget
+
+      for advice in advices
+
+        # in order to preserve declaration order, we must reverse the callbacks order
+        advice.callbacks.reverse() if advice.name == 'before'
+
+        # Advice with all callbacks
+        widget[advice.name] advice.adviced, callback for callback in advice.callbacks
+
+      widget
+
+    advisor.advisable = (factory) ->
+      original = factory.compose
+
+      stamp.mixIn factory,
+        compose: (stamps...) ->
+          {fixed: {methods: composition_methods}} = @composition
+          advices = extract_advices composition_methods
+
+          for stamped in stamps
+            {fixed: {methods: stamp_methods}} = stamped
+            advices = advices.concat extract_advices stamp_methods
+
+          adviced_stamp = {}
+          for advice in advices
+            adviced_stamp[advice.key] ||= []
+            adviced_stamp[advice.key] = adviced_stamp[advice.key].concat advice.callbacks
+
+          # Create a ultimate stamp with all advices arrays or functions merged
+          # TODO do not store advices definitions in the prototype chain
+          stamps.push stamp adviced_stamp
+
+          original.apply factory, stamps
+
+        advice: advisor.advice
+
+    advisor
+
+  composerable = (compositor) ->
+    compositor.composable  = (methods, state, enclose) ->
+      factory = (options) ->
+
+        # Inherit defaults from widget
+        options = _.defaults options, factory.composition.fixed.methods.options
+
+        # Composition only will compose methods and state!
+        instance = factory.composition options: options
+        enclose.call instance, options
+
+      # TODO check if it is needed to inherit compositions
+      # if methods.composition
+      #   composition = methods.composition
+      #   delete methods.composition
+      #   composition = stamp.compose composition, stamp methods, state
+      # else
+      #   composition = stamp methods, state
+
+      stamp.mixIn factory,
+        composition: stamp methods, state
+        # Suport an extension with multiple compositions
+        compose: -> @composition = stamp.compose @composition, arguments...
+
+        extend: ->
+          `var methods, state`
+          {fixed}      = @composition
+          initializers = [enclose]
+          methods      = {}
+          state        = {}
+
+          for definition in arguments
+            {methods: definition_methods, state: definition_state} = definition
+
+            methods = extend methods, fixed.methods, definition_methods or definition
+            state   = extend state  , fixed.state  , definition_state
+
+            initializers.push fixed.enclose      if fixed.enclose
+            initializers.push definition.enclose if definition.enclose
+
+          enclosed = (properties) ->
+            initializers.forEach (initializer) => initializer.call @, properties
+            @
+
+          compositor.composable methods, state, enclosed or enclose
+
+    compositor
+
+  version: '0.1.2'
+
+  initialize: (application) ->
+    advisable = require 'ineadvisable'
+
+    {core: {Widgets, util: {extend}, stamp}} = application
+
+    Widgets = composerable advisorable Widgets
+
+    # THINK how to at the same time respect aura ways of instantiating
+    # widgets and preserve widget logic composability
+    Widgets.Default = Widgets.Base
+    delete Widgets.Default.extend
+
+    Widgets.Base    = Widgets.advisable Widgets.composable advisable(Widgets.Default.prototype), null, (options) ->
+      Object.defineProperty @, 'constructor', value: Widgets.Default, enumerable: false, configurable: false, writable: false
+      Widgets.Default.call Widgets.advice(@), options
+
+

data/lib/assets/javascripts/aura/extensions/widget/composable.js.coffee

@@ -103,8 +103,8 @@ define 'aura/extensions/widget/composable', ->
             methods = extend methods, fixed.methods, definition_methods or definition
             state   = extend state  , fixed.state  , definition_state
 
-            initializers.push fixed.enclose      if fixed.enclose
-            initializers.push definition.enclose if definition.enclose
+            initializers = initializers.concat fixed.enclose      if fixed.enclose
+            initializers = initializers.concat definition.enclose if definition.enclose
 
           enclosed = (properties) ->
             initializers.forEach (initializer) => initializer.call @, properties

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

@@ -20,13 +20,13 @@ requirejs.config
 
 # Prevent aura from defining jquery erroniously
 define 'jquery'    , ['config/load_components'], ->
-  window.jQuery = window.$ = require 'component-jquery'
+  window.jQuery = window.$ = require 'component~jquery@1.9.1'
 
 define 'modernizr' , ['config/load_components'], ->
-  require 'modernizr'
+  require 'components~modernizr@2.6.2'
   window.Modernizr
 
-define 'rivets', ['config/load_components'], -> require 'rivets'
+define 'rivets', ['config/load_components'], -> require 'mikeric~rivets@v0.5.12'
 
 # TODO define 'underscore', ['config/load_components'], -> require 'lodash'
 
@@ -41,18 +41,18 @@ 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'
+    require 'ende/vendor/assets/javascripts/jquery/inview.js'
 
   define 'jquery.mask'                    , ['jquery'], ->
-    inner_lazy_require = 'ened/vendor/assets/javascripts/jquery/inputmask.js'
+    inner_lazy_require = 'ende/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'
+    inner_lazy_require = 'ende/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'
+    inner_lazy_require = 'ende/vendor/assets/javascripts/jquery/inputmask.numeric.extensions.js'
     require inner_lazy_require
 
   # Object.defineProperty window, 'jQuery',
@@ -127,9 +127,9 @@ define 'config/load_components', ['application_components'], ->
         mod = loader.loaders.discovered.apply @, params
 
       catch e
-        if e.require
+        if e.toString().indexOf('failed to require') != -1
           # TODO better loggin support
-          if app.debug
+          if not app? or app.debug
             (app?.logger || console).warn "loader: Failed to load '#{params[0]}' with #{using}: \n Exception: '#{e.message}'. Trying with requirejs."
 
           # Since it failed to load with component, try to load with requirejs
@@ -145,4 +145,4 @@ define 'config/load_components', ['application_components'], ->
       mod
 
   loader.shim()
-  loader.initialize()
+  loader.initialize()

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

@@ -1,15 +1,9 @@
-# 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', 'jquery.ujs', 'es6-shim'], ->
-
-  # 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 )
-
-# TODO rename ened to ende, move shims to an extension
-define 'es5-shim'     , ['config/load_components'], -> require "ened/vendor/assets/javascripts/polyfills/es5-shim.js"
+# TODO move shims to an extension
+define 'es5-shim'     , ['config/load_components'], -> require "ende/vendor/assets/javascripts/polyfills/es5-shim.js"
 define 'es6-map-shim' , ['es5-shim'  , 'config/load_components'], ->
-  require "indefinido-observable/vendor/shims/object.create.js"
+  # TODO use a better require
+  require "indefinido~observable@es6-modules/vendor/shims/object.create.js"
+
 
   # TODO improve map shimming
   if (!Object.defineProperties)
@@ -20,22 +14,31 @@ define 'es6-map-shim' , ['es5-shim'  , 'config/load_components'], ->
 
       object
 
-  require "ened/vendor/assets/javascripts/polyfills/es6-map-shim.js"
+  require "ende/vendor/assets/javascripts/polyfills/es6-map-shim.js"
 
   delete Object.defineProperties if undefine
 
+# TODO extract this es6-shim to a component
 define 'es6-shim'     , ['es6-map-shim', 'es5-shim'  , 'config/load_components'], ->
   # Fix wrong object order definition in internet explorer
   # TODO send a pull request to use dependency only after object definition
-  require "paulmillr-es6-shim"
-
-  # TODO only load relevante polyfills for getter and setters
-  require "indefinido-observable"
+  require "paulmillr~es6-shim@0.10.1"
 
+  require "indefinido~observable@es6-modules"
 
 # Override defaults components definition, and force observable
 # loading after es6-shim, so it does not define collectionShims
 #
 # TODO better way to forward component modules to application
-define 'observable'    , ['es6-shim', 'config/load_components'], -> require("indefinido-observable").mixin
-define 'advisable'     , ['config/load_components'], -> require("indefinido-advisable").mixin
+define 'observable'    , ['es6-shim', 'config/load_components'], -> require("indefinido~observable@es6-modules").mixin
+define 'advisable'     , ['config/load_components'], -> require("indefinido~advisable@master").mixin
+
+# TODO think if require jquery and jquery inview in this place is actualy a good idea
+# TODO use requirejs alias / packing modules definition for this
+define 'ende', ['config/load_components', 'config/initializers', 'es6-shim'], ->
+  require ['jquery.ujs']
+
+  # TODO FIX THIS!
+  require.register('observable', (e, module) -> module.exports = require "indefinido~observable@es6-modules"  )
+  require.register('advisable' , (e, module) -> module.exports = require("indefinido~advisable@master").mixin )
+

data/lib/assets/javascripts/widgets/support/adapters/olark.js

@@ -1,7 +1,4 @@
-define(function () {
-    // TODO bettter require
-    stampit = require('indefinido-indemma/vendor/stampit.js');
-
+define(['stampit'], function (stampit) {
     root = window || exports;
 
     root.olark || (function (c) {

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

@@ -256,9 +256,6 @@ define [
       # use it here instead of overriding all records
       viewer.items = records
 
-      # Start widgets created by bindings
-      @syncronize_children()
-
     @fetching.done (records) =>
       if viewer.items.length
         # boo.initialize @$el.find '.results .items'
@@ -325,7 +322,14 @@ define [
 
       # TODO move binders to application
       @inherit_parent_presentation()
-      @bind @presentation, @presenter.presentation
+      # TODO on bind execute presentation_options method and extend and inherit from presenter what needed
+      @bind @presentation, @sandbox.util.extend(true, @presenter.presentation, @options.presentation)
+
+      @presentation.viewer.subscribe 'items', =>
+        # Start possible widgets created by items with widget
+        # instantiation markup
+        @syncronize_children()
+
 
       # Start widgets that may have been created by bindings
       @sandbox.emit 'aura.sandbox.start', @sandbox

data/lib/assets/javascripts/widgets/viewer/plugins/scopable.js.coffee

@@ -46,15 +46,15 @@ define ['stampit/stampit', 'observable'], (stampit, observable) ->
         else
           @scope[scope_name] data
 
-    enhancable_presenter: (presenter) ->
+    scopable_presentation_options: (options) ->
       widget    = @
       scoping   = scopingable widget: @
       scoping.start()
 
       # Update presenter interface to support binders customization
-      presenter.presentation         ||= {binders: {}}
-      presenter.presentation.binders ||= {}
-      {presentation: {binders}}        = presenter
+      options.presentation         ||= {binders: {}}
+      options.presentation.binders ||= {}
+      {presentation: {binders}}      = options
 
       # Create custom bindings for this scope, for storing scope
       # changes per widget instance
@@ -91,9 +91,8 @@ define ['stampit/stampit', 'observable'], (stampit, observable) ->
       # widget.subscribe 'scope', ->
 
       # TODO @widget.scopings = scopings = []
-      @widget.scopings = []
-      @enhancable_presenter.call @widget, @widget.presenter
-      @widget.subscribe 'presenter', @widget.enhancable_presenter
+      @widget.scopings = {}
+      @scopable_presentation_options.call @widget, @widget.options
 
       @widget
 

data/lib/ende/version.rb

@@ -1,3 +1,3 @@
 module Ende
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/vendor/assets/components/build.css

@@ -1,3 +1,4 @@
+
 .overlay {
   position: absolute;
   top: 0;
@@ -7,7 +8,6 @@
   height: 100%;
   background: rgba(0,0,0,.75);
   -webkit-transition: opacity 300ms;
-  -moz-transition: opacity 300ms;
   transition: opacity 300ms;
   z-index: 500;
 }
@@ -17,6 +17,7 @@
   opacity: 0;
 }
 
+
 #dialog {
   position: fixed;
   left: 50%;
@@ -100,7 +101,6 @@
 
 #dialog.scale {
   -webkit-transition: -webkit-transform 300ms;
-  -moz-transition: -moz-transform 300ms;
   -webkit-transform: scale(1);
   -moz-transform: scale(1);
 }
@@ -108,4 +108,5 @@
 #dialog.scale.hide {
   -webkit-transform: scale(0);
   -moz-transform: scale(0);
-}
+}
+