ende 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 362630c766baff3cccabe5443ddb2be3d2b66050
-  data.tar.gz: 5afeec7b37e493bf49ed30bcbbcbc02981124b47
+  metadata.gz: 7f1fa726cca4d5dea9d79728ab4514c94cfe2e66
+  data.tar.gz: cbcfa0d7032b6ece8813f9aefe6e0c7368b62ec8
 SHA512:
-  metadata.gz: 479fccebac6fdcbed5fba140c3cca96691e9dd7a6d84cff785628ad83e9e24ac40e4cf9699fe2cb685abc22dfd1c9ced7f878e7646c4336851041fa3541cf9c7
-  data.tar.gz: 3a3beb85a7627e57a4f924a14a5ae077f7d6cd297f4174d493eb95db9d350418ccc4be3057deded4d7a5c85d2fc658947da6cbe8accae02900c9db1064ee0af4
+  metadata.gz: 5aa132ef4d935ea74a64ebc8da48ba450db1be31153ac5576546d3ff20ea16538054d28a1133fb0a5a57aa5e046671e429e667f647fcc58c6d7a013e3a999d09
+  data.tar.gz: 7c23fc7d605efa748596c8771b14e15f761e444e82cac8d550aa7629e8ca9e6d4435b9d0ff7b6b156bc4a0ff7f98afe9a0fbd9de661d1a5b1e22867257d1399e

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

@@ -107,10 +107,20 @@ define 'aura/extensions/devise', () ->
       # make delete requests
       session.instance.id = 0
       session.instance.destroy()
-        .done ->
+        .done (response, status, xhr) ->
           sandbox.current_user = null
           sandbox.signed_in    = false
           mediator.emit 'user.signed_out', @
+
+          # 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 able to log in again!" unless token
+          $('meta[name="csrf-token"]').attr 'content', token
+
+
         .fail (xhr) ->
           mediator.emit 'session.destruction_failed', @
 
@@ -200,8 +210,6 @@ define 'aura/extensions/devise', () ->
               # TODO move session.restoring check outside this method
               mediator.emit 'password.update_failed'       , @
 
-
-
   domain =
     action_unauthorized: ->
       # Try to restore session in case of forbindness
@@ -226,7 +234,7 @@ define 'aura/extensions/devise', () ->
 
   # Extension definition
   name: 'devise'
-  version: '1.0.0'
+  version: '1.0.1'
   initialize: (application) ->
     {core, sandbox} = application
     {mediator} = core

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

@@ -20,7 +20,6 @@ end
 
 %>
 
-
 'use strict'
 
 root = exports ? this

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

@@ -7,7 +7,7 @@ define 'aura/extensions/states', ['application/states'], (states) ->
     {dom, mediator} = core
 
     state =
-      current: 'initializing'
+      current: 'initialization'
       list: []
       previous: null
       change: (transition) ->
@@ -63,7 +63,7 @@ define 'aura/extensions/states', ['application/states'], (states) ->
         logger.error "states.flow.failed: Failed autostarting widget! \n Message: #{exception.message}", exception
 
 
-    version: '0.2.1'
+    version: '0.2.2'
 
     initialize: (application) ->
       mediator.on 'state.change' , state.change

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

@@ -27,6 +27,8 @@ define ->
     else
       @sandbox.once "content.#{@identifier}.load", @, @load
 
+    @$el.addClass "content"
+    @$el.attr 'id', @identifier
   load: ->
     options = @sandbox.util._.omit @options, 'el', 'ref', '_ref', 'name', 'require', 'baseUrl'
     options = $.extend {}, defaults, options
@@ -39,6 +41,13 @@ define ->
     # Will also initialize sandbox!
     @html response
 
-  failed: ->
+  failed: (xhr) ->
+    if @sandbox.debug.enabled
+      html  = "<h2>Content Widget: Failed to load Content</h2>"
+      html += xhr.responseText
+      html  = html.replace /\n/g, '<br/>'
+      @html html
 
-    @html 'Failed to load content'
+    else
+      # TODO prettier message
+      html  = "Failed to load content."

data/lib/ende/{users_controller_extensions.rb → csrf_extensions.rb}

@@ -1,14 +1,13 @@
 # TODO move to DeviseSessions controller and figure out how to set
 # headers after a redirect. Or even, if this is the right approach
-module UsersControllerExtensions
+module CsrfExtensions
   extend ActiveSupport::Concern
 
   included do
-    before_filter :add_new_csrf_token, only: :show
 
     private
     def add_new_csrf_token
-      response.headers['X-CSRF-Token'] = form_authenticity_token
+      response.headers['X-CSRF-Token'] = form_authenticity_token if request.xhr?
     end
   end
 end

data/lib/ende/version.rb

@@ -1,3 +1,3 @@
 module Ende
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

data/lib/ende.rb

@@ -1,10 +1,13 @@
 require "ende/version"
 
+# TODO add csrf extensions to autoloadpaths
+require "ende/csrf_extensions"
+
 module Ende
   class Railtie < Rails::Railtie
-
     config.to_prepare do
       current_dir = Pathname.new(__FILE__).parent.parent
+
       assets      = Ende.assets
 
       assets.paths << current_dir.join('lib', 'assets', 'javascripts').to_s
@@ -13,13 +16,26 @@ module Ende
       # assets.paths << current_dir.join('vendor', 'assets', 'stylesheets').to_s uncomment if you use
     end
 
-# Check if devise exists and extend devise controllers to send
-#    authenticity (csrf) token
-#    initializer :user_controller_extensions do |config|
-#      UsersController.class_eval do
-#         include, UsersControllerExtensions if devise_controller?
-#      end
-#    end
+    # Check if devise exists and extend devise controllers to send
+    # authenticity (csrf) token
+    # TODO move each extension to its own folder
+    initializer :csrf_extensions do |app|
+      app.config.to_prepare do
+        # TODO map devise configurations and seek for show route for
+        # each defined resource
+        if defined? UsersController
+          UsersController.class_eval do
+            include ::CsrfExtensions
+            after_action :add_new_csrf_token, only: :show
+          end
+        end
+
+        Devise::SessionsController.class_eval do
+          include ::CsrfExtensions
+          after_action :add_new_csrf_token, only: [:create, :destroy]
+        end
+      end
+    end
   end
 
   def Ende.load_widget_extensions

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ende
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Heitor Salazar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,7 +119,7 @@ files:
 - lib/assets/stylesheets/sprite.styl
 - lib/assets/stylesheets/ssprites.styl
 - lib/ende.rb
-- lib/ende/users_controller_extensions.rb
+- lib/ende/csrf_extensions.rb
 - lib/ende/version.rb
 - lib/tasks/.gitkeep
 - lib/tasks/component.thor