xhr_flash 0.0.2 → 0.0.3

data/README.md

@@ -66,3 +66,7 @@ Yes, you can customize it a bit. You can pass the following parameters to xhrfla
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/ungue/xhr_flash/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/lib/xhr_flash/version.rb

@@ -1,3 +1,3 @@
 module XhrFlash
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/vendor/assets/javascript/jquery.xhrflash.coffee

@@ -1,64 +1,45 @@
-$ = jQuery
-
-class Flash
-  
-  constructor: (object, settings) ->
-    # Set timeout to hide current alerts if any
-    @msgArea  = object
-    @msgList  = settings.msgs
-    @tag      = settings.tag
-    @class    = settings.class
-    @timeout  = settings.timeout
-
-    @slideUpTimer() if @msgArea.find('.alert').length > 0
-
-    $(document).ajaxComplete (e, xhr) =>
-      # Removes previous messages
-      headers = @flashHeaders(xhr)
-      
-      @msgArea.hide().empty()
-      return if $.isEmptyObject(headers)
-
-      @msgArea.append(@messageTag(type, msg)) for type, msg of headers
-      @msgArea.slideDown('fast', @slideUpTimer)
-
-  messageTag: (type, msg) -> 
-    "<#{@tag} class=\"#{@class} #{@class}-#{type.toLowerCase()}\">#{msg}</#{@tag}>"
-
-  flashHeaders: (xhr) ->
-    @msgList.reduce(
-      (h, type) ->
-        msg = xhr.getResponseHeader("X-Flash-#{type}")
-        h[type.toLowerCase()] = msg if msg?
-        h
-      , {}
-    )
-
-  slideUpTimer: =>
-    clearTimeout(@_timer) if @_timer?
-    @_timer = setTimeout(
-      => 
-        @msgArea.slideUp()
-      , @timeout
-    )
-
-$.fn.xhrflash = (options) ->
-  $container = @
-  
-  settings =
-    msgs    : ['Success', 'Warning', 'Error', 'Notice']
-    tag     : 'div'
-    class   : 'alert'
-    timeout : 5000
-
-  settings = $.extend settings, options
-
-  @each ->
-    $this = $(@)
-    data  = $this.data 'xhrflash'
-
-    unless data
-      # Logic
-      new Flash($this, settings)
-
-      $this.data 'xhrflash', true
+do ($ = jQuery) ->
+
+  class Flash
+
+    defaults:
+      msgs      : ['Success', 'Warning', 'Error', 'Notice', 'Alert']
+      timeout   : 5000
+      template  : (data) ->
+        fn = -> 
+          messages = for messageType, msg of @
+            "<div class='alert alert-#{messageType}'>#{msg}</div>"
+          messages.join ''
+        fn.call(data)
+
+    constructor: (el, settings) ->
+      @$el = el
+      {@msgs, @timeout, @template} = $.extend({}, @defaults, settings)
+
+      @$el.delay(@timeout).slideUp('fast') unless @$el.is(':empty')
+
+      $(document).ajaxComplete (e, xhr) =>
+        headers = @flashHeaders(xhr)
+        html = ''
+        html = @template(headers) unless $.isEmptyObject(headers)
+
+        @$el.html html
+        @$el.stop(true, true).slideDown('fast')
+          .delay(@timeout)
+          .slideUp('fast')
+
+    flashHeaders: (xhr) ->
+      @msgs.reduce(
+        (h, type) ->
+          msg = xhr.getResponseHeader("X-Flash-#{type}")
+          h[type.toLowerCase()] = msg if msg?
+          h
+        , {}
+      )
+
+  $.fn.xhrflash = (options) ->
+    @each ->
+      $this = $(@)
+      data  = $this.data 'xhrflash'
+
+      $this.data('xhrflash', new Flash($this, options)) unless data

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xhr_flash
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-12 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &10222960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *10222960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &10222100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *10222100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &10221440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10221440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &10220940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10220940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - javier.rodriguez@h1labs.com
@@ -131,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Flash object management in AJAX requests