ende 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 508121894c529c825b8be23734809551052843b0
-  data.tar.gz: c1bb6a5676fcff34bb0c33b60f869bf96c8d4989
+  metadata.gz: 387fd35051f7507b9378515433c49a59673177c5
+  data.tar.gz: 36894b94c636fb11ea5ccf35e47d119091c9ec3a
 SHA512:
-  metadata.gz: e1ace745145b3787b7b74fbc1ea6d022137e26c98d4d3ac9e0bec815fca1d0144a808f00eb60ee5a057e2a4b2fcbb0d1eb20dd11624cec82886bd022058edb6a
-  data.tar.gz: a1e37960784210d21d53baef5aa9dc4a8065ec2d33ae6e6620ffe5a91643315b0e25fbbeb863d7cd12a50fbb3560f2a626cd290783dc8bcbe080e144529158a9
+  metadata.gz: 1a57d4ba49ddcfa92e58a69c004301e52ba57ca52ca06bd56801fabb280cbc4b1368e6fcfe9888b9fc3f823f8c5503667e7d4774d18d628c8aec266a5ffeae7b
+  data.tar.gz: 0eafb7dd7a3475901306b3d1f6822cd2508422d854741983ee8d2cfe2a6ab3c6566f3aa43fcc5f227e5c38e1d2b991824ae284c414b09716a0638e2f6af3839d

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

@@ -17,6 +17,7 @@ end.compact!
 models_list.each do |model_file|
   require_asset model_file
 end
+
 %>
 
 'use strict'
@@ -61,7 +62,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 TypeError "resources: Resource was not defined: #{name}" unless model?
+      throw new TypeError unless model?
       model
 
     # TODO rename core.models and core.domain, to core.resources, completely

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

@@ -14,33 +14,98 @@ define 'aura/extensions/routes', (routes) ->
   (application) ->
     core     = application.core
     mediator = core.mediator
+    history  = Modernizr.history
 
-    # TODO unify router api
-    router = new Lennon
-      # TODO implement logger api for lennon or change lennon library
-      # logger: application.logger
+    # TODO use diferent routers depending if history is enabled or not
+    lennon_extensions =
       publishEvent: (name, params) ->
 
-        current_route = window.location.href
-        if router.last_route != current_route
-          mediator.emit 'route.changed'
-          router.last_route = current_route
+        if router.last_route != router.current_route
+          mediator.emit 'route.changed', router.current_route
 
         # TODO method parsing (get, delete, put, post)
         mediator.emit name, params
 
-    lennon_extensions =
+      process: ->
+        context = {}
+
+        if history
+          path = window.location.pathname
+        else
+          path = window.location.hash.replace('#!', '') || '/'
+          [path, search]  = path.split('?') if path.indexOf('?') != -1
+
+        #-- If we land on the page with a hash value and history is enabled, redirect to the non-hash page
+        if ( window.location.hash.indexOf('#!') != -1 && history )
+            window.location.href = window.location.hash.replace('#!', '')
+
+        #-- If we land on the page with a path and history is disabled, redirect to the hash page
+        else if ( '/' != window.location.pathname && !history )
+            window.location.href = '/#!' + window.location.pathname
+
+
+        #-- Process the route
+        application.logger.info('Processing path', path)
+        for route in @routes
+
+            #-- See if the currently evaluated route matches the current path
+            params = path.match route.pattern
+
+            #-- If there is a match, extract the path values and match them to their variable names for context
+            if ( params )
+                paramKeys = route.path.match /:(\w*)/g,"(\\w*)"
+
+                j = 1
+                while j <= route.paramCount
+                    context[paramKeys[j - 1].replace(/:/g, '')] = params[j]
+                    j++
+
+                if ( @current_route )
+
+                    #-- Don't dispatch the route we are already on
+                    if ( @current_route.path == route.path && @current_route.search == search)
+                        return false
+
+                    #-- Dispatch the exit event for the route we are leaving
+                    if (  @current_route.exitEventName )
+
+                        application.logger.info('Exiting', @current_route.path, 'with', context || {})
+
+                        #-- Execute the callback
+                        if ( 'function' == typeof @current_route.exitEventName )
+                            @current_route.exitEventName(context || {})
+                        #-- Run the publish event
+                            options.publishEvent(@current_route.exitEventName, context || {})
+
+                #-- Update the current route
+                @last_route    = @current_route
+                @current_route = route
+
+                #-- Update the current route search string
+                @current_route.search = search
+
+                #-- Dispatch
+                return @dispatch(route, context)
+
+
+        #-- No route has been found, hence, nothing dispatched
+        application.logger.warn('No route dispatched')
+
       location: (href, process = true) ->
-        if Modernizr.history
+        # TODO load router depending of history api
+        if history
           window.history.pushState null, null, href
         else
           # TODO parse href and extract path!
-          window.location.hash = href
+          window.location.hash = '!' + href
 
-        process and router.process()
+        process and @process()
 
-      define: ->
-        return false
+    # TODO unify router api
+    router = new Lennon
+      # TODO implement logger api for lennon or change lennon library
+      # logger: application.logger
+      publishEvent: lennon_extensions.publishEvent
 
 
     application.core.router = core.util.extend router, lennon_extensions
@@ -48,15 +113,23 @@ define 'aura/extensions/routes', (routes) ->
     location = Object.create null,
       # TODO cache query parsing
       query:
-        get: -> query.parse window.location.search.substring(1)
+        get: ->
+          # TODO move routers implementation outside this file
+          if history
+            query.parse window.location.search.substring(1)
+          else
+            query.parse window.location.hash.split('?')[1]
+
 
       toString: -> window.location
 
     version: '0.2.1'
 
     initialize: (application) ->
+      {logger} = application
       application.sandbox.location = location
 
-    afterAppStart: (application) ->
-      # router.process()
-
+      # TODO pull request on aura to add info method on logger
+      # TODO better argument checking
+      logger._info = (-> console.info arguments[0], arguments[1], arguments[2]) || logger._log
+      logger.info  = -> this.write this._info, arguments

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

@@ -3,7 +3,7 @@ define ['./states/index', './presenter'], (templates, presenter) ->
   # If some extension provides you can use the type defined in there
   # to extend your widget. Defaults to Base constructor.
   #
-  # type: 'Base'
+  type: 'Base'
 
 
   # TODO add support for authentication keys

data/lib/ende/version.rb

@@ -1,3 +1,3 @@
 module Ende
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/vendor/assets/components/build.js

@@ -27469,6 +27469,8 @@ require.register("ened/vendor/assets/javascripts/lennon/lennon.js", function(exp
 
                 if ( !initialized ) {
 
+                    router.routes = routes
+
                     $(document).on('click', options.linkSelector, function() {
                         var $this = $(this),
                             href = $this.attr('href');

data/vendor/assets/components/ende_build.js

@@ -27469,6 +27469,8 @@ require.register("ened/vendor/assets/javascripts/lennon/lennon.js", function(exp
 
                 if ( !initialized ) {
 
+                    router.routes = routes
+
                     $(document).on('click', options.linkSelector, function() {
                         var $this = $(this),
                             href = $this.attr('href');

data/vendor/assets/javascripts/lennon/lennon.js

@@ -41,6 +41,8 @@
 
                 if ( !initialized ) {
 
+                    router.routes = routes
+
                     $(document).on('click', options.linkSelector, function() {
                         var $this = $(this),
                             href = $this.attr('href');

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ende
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Heitor Salazar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler