ende 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eeb1e113cf8c0b0728f31f8dfd4c50350e581011
-  data.tar.gz: 70e038bea66f4b68321ef3b5e6320e07e699cb63
+  metadata.gz: d16802734857d0dd2c41903be9133eae36249ab9
+  data.tar.gz: 56497874bf1b5d72b063cb83cb794f726efed3a2
 SHA512:
-  metadata.gz: 055f6631dbfed08d4bb071105d3c07cf75734fb98e37a129e1cf98a98e1b2a41bca2010b78b674f084a41d2dbe4b7045be4615d0bd7c7f0caa74af8140aab802
-  data.tar.gz: 8bf7be6c35be1c2ac93bc6d2f31aa907dc6deb54376fcefa1589e00d3202ec521ee941e98a0217ad52550c76956068a7e54e1561dba42bba7344e2d2ad64ca61
+  metadata.gz: 6155c21110a59cbd24160b74c86f5c49c90413387d3b18251a329540829379c08bce9bca21ec718b2a8dd78a479d6a6528a3ab4111eee1570fd5820031c5d00b
+  data.tar.gz: 2f28469461acf1e97c2a6b4aa6061012658917033e912a431025939bbf2de2bc2bc3ded0e2c714ebeb40f220b3d33015e6f99ff8b5d73340b7cc5a2bf53de315

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

@@ -1,6 +1,6 @@
 'use strict'
 
-define 'aura/extensions/states', ['application/states'], (states) ->
+define 'aura/extensions/states', ['states'], (states) ->
 
   (application) ->
     {core, logger}  = application
@@ -33,24 +33,35 @@ define 'aura/extensions/states', ['application/states'], (states) ->
     flow =
 
       changed: (transition) ->
+        {domain}                   = application
         unormalized_widget_options = states[transition.to]
 
+        # TODO update aura and use native start method
+        # TODO move domain flow logic to a domain extension
+        #
+        domain_flow                = domain?[transition.to]
+
         # TODO cache rendered widgets!
         if unormalized_widget_options
           widgets_options = @normalize_widget_options unormalized_widget_options, transition
 
-          # TODO update aura and use native start method
-          # TODO move this logic to a domain extension
-          {domain}  = application
-
           injection = core.inject(widgets_options).fail flow.failed
 
-          domain?[transition.to]?.ready ||= injection.done
+          # TODO let this code more legible
+          domain_flow?.ready ||= injection.then((widgets...) ->
+            # TODO use es6-shim promises
+            $.Deferred().resolveWith domain_flow, widgets
+          ).done
 
           # To prevent reinstation upon changing to this state for the
           # second time, delete stored configuration for this state
           delete states[transition.to]
 
+        if domain_flow and not domain_flow.ready
+          # TODO use es6-shim promises
+          domain_flow.ready = $.Deferred().resolveWith(domain_flow, []).done
+
+
       normalize_widget_options: (unormalized_widget_options, transition_widgets_options) ->
         widgets = []
 
@@ -130,8 +141,7 @@ define 'aura/extensions/states', ['application/states'], (states) ->
       if (application.startOptions.widgets)
         application.state = "default"
       else
-        current_start = application.core.start
-        application.core.start = ->
+        application.core.metabolize = ->
           # If any initialized flow changed the application state
           # before the widgets initialization, store its state pass
           # through the default state and go back to the old state
@@ -141,8 +151,7 @@ define 'aura/extensions/states', ['application/states'], (states) ->
           current_state = application.state if application.state != 'initialization'
           application.state = "default"
 
-          application.core.start = current_start
-          startup = current_start.apply @, arguments
+          startup = application.core.start.apply @, arguments
 
           application.state = current_state if current_state?
 

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

@@ -121,13 +121,19 @@ define 'config/load_components', ['application_components'], ->
         module = loader.loaders.discovered.apply @, params
 
       catch e
-        # TODO better loggin support
-        (app?.logger || console).warn "loader: Failed to load '#{params[0]}' with #{using}: \n Exception: '#{e.message}'. Trying with requirejs."
-
-        loader.activate 'requirejs'
-        module = loader.loaders.discovered.apply @, params unless module
+        if e.require
+          # TODO better loggin support
+          if 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
+          loader.activate 'requirejs'
+          unless module
+            module = loader.loaders.discovered.apply @, params
+        else
+          throw e
 
-      # Always let requirjs active by default
+        # Always let requirejs active by default
       loader.activate 'requirejs'
 
       module

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

@@ -1,7 +1,9 @@
 define ->
 
   type: 'Base'
+
   version: '0.1.1'
+
   options:
     autoload: true
 

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

@@ -61,7 +61,7 @@ define ['./states/index', './presenter'], (templates, presenter) ->
 
     # Forward the models to the presenter
 
-    model.all (records) ->
+    model.every (records) ->
 
       # Bind presenter to template
       presentation = presenter records, luna

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

@@ -256,7 +256,7 @@ define [
 
     else if @options.autofetch
 
-      deferred = @scope.all()
+      deferred = @scope.every()
 
     else
 

data/lib/ende/version.rb

@@ -1,3 +1,3 @@
 module Ende
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end