ende 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d9cffdff63f333c6f998182588b91493382b9bc
-  data.tar.gz: e262aa1a947ebf2ac0e6abd335447160c548f157
+  metadata.gz: 67175a38bbf95b8a59dec5180128fd9abb123ee5
+  data.tar.gz: 7efc8d8c9dcf9e72a2d490c13791c9638ed468d1
 SHA512:
-  metadata.gz: 9496216b99e6ad4dd307373dc70a6739e7c6f17c238fd02bfa21c0098813f438105c74ab58ce5b35e55938abed97ba08250bb4e070ea553ab7d0ef86933224f4
-  data.tar.gz: a705a310d3f42b14f2ed2e6fec1787e41a7bf176f969ba0b77646facf5d23268ab32a93a77b9de7b3954acf579e5bf6d307d01c177931e315e1e26b37e2916b9
+  metadata.gz: 4d217f7da63f480a04dbc5715df12e6844fe04e32997715a119668ef589a44267fe93254f05b369a0edc91d09e07f02e6e0e157c93503fe76e5f5457bba06974
+  data.tar.gz: 3f14d88edd2f7b41f4e8d403b32e05c74a525b9dbbed5a4624f642b5331c0ce1162f10d0609f89ad96079abc750bb500707df45a4c0febe6c031a322d8fcd620

data/component.json

@@ -6,7 +6,6 @@
   "keywords": [],
   "dependencies": {
     "mikeric/rivets": "*",
-    "bestiejs/lodash": "*",
     "KapIT/observe-utils": "*",
     "segmentio/extend": "*",
     "pluma/assimilate": "*",
@@ -14,12 +13,15 @@
     "component/type": "*",
     "component/bind": "*",
     "component/jquery": "*",
+    "component/link-delegate": "*",
     "indefinido/indemma": "*",
     "indefinido/observable": "*",
     "indefinido/advisable": "*"
   },
   "scripts": [
-    "vendor/assets/javascripts/stampit/stampit.js"
+    "vendor/assets/javascripts/lennon/lennon.js",
+    "vendor/assets/javascripts/stampit/stampit.js",
+    "vendor/assets/javascripts/jquery/inview.js"
   ],
   "development": {},
   "paths": [

data/ende.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "thor"
 end

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

@@ -34,18 +34,40 @@ define 'aura/extensions/devise', () ->
       user_session
 
     # TODO better and more formal way to restore
+    # Devise::SessionsController#show would be a great solution!
     restore: ->
       # We make a dummy request to the new session path and if user is
       # logged in, devise redirects us to the users/show.json path for
       # the current loged in user
-
-
-      session.restoring = true
+      attempt = core.data.deferred()
 
       # Also find a better way to publish events after all widgets are
       # loaded
-      setTimeout (( ) -> session.create()), 3000
-      # session.create()
+      session.restoring = true # TODO implement #show on devise/sessions_controller
+
+      setTimeout ( () ->
+        restoration = session.create()
+        restoration.done   -> attempt.resolveWith @, arguments
+        restoration.progress -> attempt.notifyWith @, arguments
+        restoration.fail   ->
+          # TODO think what this method should do with other response codes
+          sandbox.signed_in = false
+          mediator.emit 'session.restoration_failed'
+
+          attempt.rejectWith @, arguments
+
+        restoration.always ->
+          # TODO implement #show on devise/sessions_controller, and
+          # try to restore session not by creating a new one, but
+          # trying to retrieve the current one
+          setTimeout ->
+            session.restoring = false
+          , 100
+          mediator.emit 'session.restoration_tried'
+
+      ), 3000
+
+      attempt
 
     create: (user) ->
 
@@ -55,23 +77,42 @@ define 'aura/extensions/devise', () ->
       user_session.dirty = true
 
       user_session
-        .save ->
+        .save (response, status, xhr) ->
           sandbox.current_user = @
           sandbox.signed_in = true
+          mediator.emit 'session.created', @
           mediator.emit 'user.signed_in', @
 
-        .fail ->
+          # When the user logs in, the csrf token changes, so we need
+          # to update it too! The ende gem extends the controller when
+          # devise is included to send it to us
+          # TODO implement as a indemma extension
+          token = xhr.getResponseHeader 'X-CSRF-Token'
+          console.warn "Server did not send the new csrf token.\n User may not be logged in!" unless token
+          $('meta[name="csrf-token"]').attr 'content', token
+
+        .fail (xhr) ->
+          switch xhr.status
+            when 401
+              mediator.emit 'session.creation_unauthorized', @ unless session.restoring  # TODO implement #show on devise/sessions_controller
+            else
+              # TODO move session.restoring check outside this method
+              mediator.emit 'session.creation_failed', @
+
+    destroy: ->
+      # TODO update the csrf token with the new one!
+      session.instance.destroy()
+        .done ->
           sandbox.current_user = null
-          mediator.emit 'user.unauthorized', @ unless session.restoring
-          sandbox.signed_in ||= false
+          sandbox.signed_in    = false
+          mediator.emit 'user.signed_out', @
+        .fail (xhr) ->
+          mediator.emit 'session.destruction_failed', @
 
-        .always ->
-          mediator.emit 'session.restore.tried', @ if session.restoring
-          session.restoring  = false
 
   #      user_password POST   /users/password(.:format)                 devise/passwords#create
   #  new_user_password GET    /users/password/new(.:format)             devise/passwords#new
-  # edit_user_password GET    /users/password/edit(.:format)            devise/passwords#edit
+  # edit_user_password GET    /userss/password/edit(.:format)            devise/passwords#edit
   #                    PATCH  /users/password(.:format)                 devise/passwords#update
   #                    PUT    /users/password(.:format)                 devise/passwords#updaet
   password =
@@ -92,13 +133,36 @@ define 'aura/extensions/devise', () ->
         .save ->
           mediator.emit 'user.password_recovered', @
         .fail ->
+          # TODO improve event naming
           mediator.emit 'user.unauthorized', @
 
+  domain =
+    action_unauthorized: ->
+      # Try to restore session in case of forbindness
+      #
+      # TODO Think if its really necessary to try to restore now its
+      # used only to get initial user
+      #
+      # TODO remove the session.restoring check and implement devise/sessions_controller#show
+      if not session.restoring and (sandbox.signed_in or sandbox.current_user)
+        mediator.off 'action.unauthorized', domain.action_unauthorized
+        session.restore()
+          .done ->
+            mediator.on 'action.unauthorized', domain.action_unauthorized
+
+          .fail (xhr) ->
+            # When the restoration was forbidden by the server, order to
+            # destroy current user session, because if there is one, it
+            # is probably invalid
+            session.destroy() if xhr.status == 401
+
+
+
 
 
   # Extension definition
   name: 'devise'
-  version: '0.1.0'
+  version: '0.2.1'
   initialize: (application) ->
 
     core     = application.core
@@ -108,9 +172,18 @@ define 'aura/extensions/devise', () ->
     # Define callbacks
     # TODO get json with features info from devise
     # gem and only use apropriated listeners
-    mediator.on 'user.sign_in', session.create
+    mediator.on 'user.sign_in' , session.create
+    mediator.on 'user.sign_out', session.destroy
     mediator.on 'user.recover_password', password.create
 
+
+    mediator.on 'action.unauthorized', domain.action_unauthorized
+
+    # TODO add ajax control into an extension and stop using jquery directly
+    jQuery(document).ajaxError (event, xhr) ->
+      if xhr.status == 401
+        mediator.emit 'action.unauthorized', sandbox.current_user unless session.restoring
+
     # Define api
     Object.defineProperty sandbox, 'current_user',
       set: (user) -> session.current_user = user
@@ -118,6 +191,9 @@ define 'aura/extensions/devise', () ->
 
     sandbox.session = session
 
+  define_routes: (router) ->
+    router.route '/users/sessions', 'session.new'
+
   define_resources: (model) ->
 
     # TODO define user session as a record too!
@@ -139,6 +215,9 @@ define 'aura/extensions/devise', () ->
   afterAppStart: (application) ->
     @define_resources application.core.models
 
+    # TODO move to an external module
+    @define_routes application if application.router?
+
     # Restore session if not already
     # TODO Restore only when application is ready
     session.restore()

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

@@ -0,0 +1,21 @@
+define 'aura/extensions/routes', ['application/routes'], (routes) ->
+
+  'use strict'
+
+  router = new require('lennon')()
+
+  (application) ->
+    core     = application.core
+    logger   = application.logger
+    mediator = core.mediator
+    _        = core.util._
+
+    application.router = router
+    application.route  = (params) -> router.apply router, params
+
+    version: '0.1.0'
+
+    initialize: (application) ->
+
+
+    afterAppStart: (application) ->

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

@@ -9,7 +9,7 @@ define 'aura/extensions/states', ['application/states'], (states) ->
     _        = core.util._
 
     state =
-      current: 'default'
+      current: 'initializing'
       list: []
       previous: null
       change: (transition) ->
@@ -73,3 +73,5 @@ define 'aura/extensions/states', ['application/states'], (states) ->
       Object.defineProperty application, 'state',
         set: (to) -> state.change to: to
         get: -> state.current
+
+    afterAppStart: (application) -> application.state = "default"

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

@@ -19,19 +19,33 @@ define 'aura/extensions/widget/eventable', ->
   translations.set 'animation.start',
     'webkitAnimationStart oanimationstart oAnimationStart msAnimationStart animationstart'
 
-
   create_handler = (widget, event_name) ->
     (event) ->
       widget.sandbox.emit "#{widget.name}.#{widget.identifier}.#{event_name}ed", @
       event.preventDefault()
       false
 
+  eventable =
+    # TODO pass this extensions to the identifiable extension
+    # TODO use widget.extend with the constructor property
+    constructor: (options) ->
+      matches     = extractor.exec options._ref
+      @name       = matches[1]
+      @identifier = options.resource ? matches[2]
+
+      eventable.super.constructor.call @, options
+
+      @sandbox.identifier = @identifier
+
+      @
+
 
   (application) ->
 
     initialize: (application) ->
+      Widgets = application.core.Widgets
 
-      extend application.core.Widgets.Base.prototype,
+      extend Widgets.Base.prototype,
       # TODO implement rivets compatibility, instead of generic binding events, alter html
         handles: (event_name, widget_event_name = event_name, selector = @$el) ->
           unless @name
@@ -45,22 +59,6 @@ define 'aura/extensions/widget/eventable', ->
 
           @sandbox.dom.find(selector, context).on event_name, create_handler(@, widget_event_name || event_name)
 
-      parent = application.core.Widgets.Base
-
-      # TODO pass this extensions to the identifiable extension
-      eventableize = (options) ->
-        matches     = extractor.exec options._ref
-        @name       = matches[1]
-        @identifier = options.resource ? matches[2]
-
-        parent.call @, options
-
-        @sandbox.identifier = @identifier
-
-        @
-
-      eventableize.prototype        = new parent _ref: ''
-      extend eventableize, parent
-      application.core.Widgets.Base = eventableize
-
-
+      # TODO replace Base.extend inheritance to stampit composition
+      Widgets.Base = Widgets.Base.extend eventable
+      eventable.super = Widgets.Base.__super__

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

@@ -52,6 +52,17 @@ define 'aura/extensions/widget/lifecycleable', ->
 
       definition
 
+  recyclable =
+    constructor: (options) ->
+      recyclable.super.constructor.call @, options
+
+      # TODO only listen to this specific sandbox stop
+      @sandbox.on 'aura.sandbox.stop', (sandbox) =>
+        @stopped() if @sandbox.ref == sandbox.ref
+
+    stopped: ->
+      @$el.remove()
+
   (application) ->
 
     initialize: (application) ->
@@ -79,4 +90,9 @@ define 'aura/extensions/widget/lifecycleable', ->
         else if not name
           throw new TypeError "app.core.inject: No widget name provided" unless name?
 
-        core.start = lifecycleable.injection options
+        core.start = lifecycleable.injection options
+
+      # Add support for element removal after stoping widget
+      # TODO replace Base.extend inheritance to stampit composition
+      core.Widgets.Base = core.Widgets.Base.extend recyclable
+      recyclable.super  = core.Widgets.Base.__super__

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

@@ -1,6 +1,7 @@
-# window.$  require 'jquery'
-#
-# window.$.ajaxSetup
+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

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

@@ -1,8 +1,27 @@
 #= require require/require
 #= require build
+#= require ./jquery
+# 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
+
+# This may be included in build, and loaded before aurajs requires for them
+# TODO also preload underscorejs
+# 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: ->

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

@@ -1 +1,3 @@
-#= require_tree ./config/initializers
+#= require ende/build
+#= 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/authenticator/main.js.coffee

@@ -66,9 +66,9 @@ define ['./states/index', './presenter'], (templates, presenter) ->
 
 
     # Bind and unbind events depending on state
-    sandbox.on 'user.signed_in'          , authenticator.authenticated
-    sandbox.on 'user.unauthorized'       , authenticator.unauthorized
-    sandbox.on 'user.password_recovered' , recoverer.recovered
+    sandbox.on 'user.signed_in'                , authenticator.authenticated
+    sandbox.on 'session.creation_unauthorized' , authenticator.unauthorized
+    sandbox.on 'user.password_recovered'       , recoverer.recovered
 
 
     # Will also initialize sandbox!