growlyflash 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b15ba027b5bb449f0ab3a2d18a0a8273d73867e
-  data.tar.gz: 5acfd64725e4a5faa2614800696d0b2d818f841f
+  metadata.gz: c4fe2e425f9270e864559a019546d124c48240bb
+  data.tar.gz: d5933ef2d1f5f593f6c064607725ece3904f787a
 SHA512:
-  metadata.gz: f0554c4b4fdca37baa13ec0fa115884c39ceaef8dd72fce7631070c7d1aab35fb8cc3bc71fdb6ad5c3db2500841748684152a8b60cc9d04d1be4bbcf0880eb41
-  data.tar.gz: a647b4016db94cbeff98a44ec18b91af0b5800b8bfe430fdd0459726403c992e47bd9e612ad36d0c34e0d332b924a0d7b34c24e80e3e6c41a8ddab37c82defc4
+  metadata.gz: c875f93ca757ddbc7be54ec7e30f7ac0a56807739ff0b23f1527be98ad950a0fe949487320f67ef4da1c7b768b9a34013f825f89fa63adc3df0818f448528fd9
+  data.tar.gz: eeffa29ebc62987c1c2cd9450e4da8971f68971347cb73fc7bb1b5a7e5c373707e1245d5f8513962c43ea4d5d1897fc160a852c6e9ae916d0b48b93c2c692930

data/app/assets/javascripts/growlyflash/alert.coffee

@@ -1,77 +1,82 @@
 class Growlyflash
-window.Growlyflash ?= Growlyflash
-
-Growlyflash.defaults =
-  align:   'right'  # horizontal aligning (left, right or center)
-  delay:   4000     # auto-dismiss timeout (false to disable auto-dismiss)
-  dismiss: yes      # allow to show close button
-  spacing: 10       # spacing between alerts
-  target:  'body'   # selector to target element where to place alerts
-  title:   no       # switch for adding a title
-  type:    null     # bootstrap alert class by default
-  class:   ['alert', 'growlyflash', 'fade']
-  
-  # customizable callback to set notification position before it shows
-  before_show: (options) -> 
-    @el.css @calc_css_position()
-
-Growlyflash.KEY_MAPPING =
-  alert:   'warning'
-  error:   'danger'
-  notice:  'info'
-  success: 'success'
-
-class Growlyflash.FlashStruct
-  shown: no
-  constructor: (@msg, @key) -> @type = Growlyflash.KEY_MAPPING[@key]
-  growl: -> $.growlyflash this
-  is_equal: (other) -> (@key is other.key) and (@msg is other.msg)
-  isnt_equal: (other) -> not @is_equal other
-
-class Growlyflash.Alert
-  constructor: (@flash, options) ->
-    {@title, @align, @dismiss, @msg, @spacing, @type, @class} = options
-    
-    @el = ($ '<div>', 
-      class: @_classes().join(' ')
-      html: "#{@_dismiss()}#{@_title()}#{@msg}"
-    ).appendTo(options.target)
-    
-    options.before_show.call(this, options)
-    @show()
-    
-    return unless options.delay
-    setTimeout => 
-      @hide -> ($ @).remove()
-    , options.delay
-  
-  show: -> @el.toggleClass 'in'
-  hide: (fn) -> @el.fadeOut(fn)
-  
-  _classes: -> 
-    @class.concat ("alert-#{type}" for type in [@type] when type?), ["growlyflash-#{@align}"]
-  
-  _dismiss: ->
-    return "" unless @dismiss?
-    """<a class="close" data-dismiss="alert" href="#">&times;</a>"""
-  
-  _title: ->
-    return ""  if @title is no
-    """<strong>#{@type.charAt(0).toUpperCase()}#{@type.substring(1)}!</strong>"""
-  
-  calc_top_offset: ->
-    amount = parseInt(@el.css 'top')
-    (@el.siblings '.growlyflash').each (_, el) =>
-      amount = Math.max(amount, parseInt(($ el).css 'top') + ($ el).outerHeight() + @spacing)
-    amount
-  
-  calc_css_position: ->
-    css = {}
-    css.top        = "#{@calc_top_offset()}px"
-    css.marginLeft = "-#{@el.width() / 2}px" if @align is 'center'
-    css
+  @defaults =
+    align:   'right'  # horizontal aligning (left, right or center)
+    delay:   4000     # auto-dismiss timeout (false to disable auto-dismiss)
+    dismiss: yes      # allow to show close button
+    spacing: 10       # spacing between alerts
+    target:  'body'   # selector to target element where to place alerts
+    title:   no       # switch for adding a title
+    type:    null     # bootstrap alert class by default
+    class:   ['alert', 'growlyflash', 'fade']
+
+    # customizable callback to set notification position before it shows
+    before_show: ->
+      @el.css @calc_css_position()
+
+  @KEY_MAPPING =
+    alert:   'warning'
+    error:   'danger'
+    notice:  'info'
+    success: 'success'
+
+  @DISMISS = """<button type="close" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>"""
+
+  _titleize = (s) -> s.replace /^./, (m) -> do m.toUpperCase
+
+  h = @helpers =
+    dismiss: -> Growlyflash.DISMISS
+    title: (s) -> "<strong>#{_titleize(s)}!</strong> "
+
+  # Flash message struct
+  class @FlashStruct
+    toString: -> JSON.stringify "#{@msg}": @key
+    constructor: (@msg, @key) ->
+      @type = Growlyflash.KEY_MAPPING[@key]
+
+  class @Alert
+    _add = (orig, add) -> @splice -~@indexOf(orig), 0, "#{orig}-#{add}"
+    _top = (e) -> parseInt ($ e).css('top')
+
+    constructor: (@flash, @opts) ->
+      {title, target, dismiss, delay, before_show} = @opts
+
+      html = ""
+      html += h.dismiss() if dismiss
+      html += h.title(@opts) if title
+      html += @flash.msg
+
+      @el = ($ '<div>', html: html, class: @class_list().join(' '), role: "alert")
+      @el.appendTo(target)
+
+      before_show?.call(this)
+      @show()
+      setTimeout(@close, @opts.delay) if delay
+
+    class_list: ->
+      list = [].concat(@opts.class)
+      add = _add.bind(list)
+      add 'alert', "dismissable"     if @opts.dismiss
+      add 'alert', @opts.type        if @opts.type?
+      add 'growlyflash', @opts.align if @opts.align?
+      list
+
+    show:  => @el.toggleClass('in', on)
+    close: => @el.alert('close')
+
+    calc_top_offset: ({spacing}) ->
+      amount = _top(@el)
+      (@el.siblings '.growlyflash').each ->
+        amount = Math.max(amount, _top(@) + ($ @).outerHeight() + spacing)
+      return amount
+
+    calc_css_position: (css = {}) ->
+      css.top        = "#{@calc_top_offset(@opts)}px"
+      css.marginLeft = "-#{@el.outerWidth() / 2}px" if @opts.align is 'center'
+      css
+
+window.Growlyflash = Growlyflash
 
 $.growlyflash = (flash, options = {}) ->
-  settings = $.extend on, {}, Growlyflash.defaults, msg: flash.msg, type: flash.type, options
-  alert = new Growlyflash.Alert(flash, settings)
+  options = $.extend on, {}, Growlyflash.defaults, type: flash.type, options
+  alert   = new Growlyflash.Alert(flash, options)
   if flash instanceof Growlyflash.FlashStruct then flash else alert

data/app/assets/javascripts/growlyflash/listener.coffee

@@ -1,40 +1,40 @@
 class Growlyflash.Listener
-  HEADER = 'X-Message'
-  EVENTS = 'ajax:complete ajaxComplete'
-  
   # Alerts stack
-  class Stack extends Array
-    constructor: (items...) ->
-      @splice 0, 0, items...
-    has_uniq_in: (alerts, counter = 0) ->
-      return true unless @length > 0
-      recent = @slice -alerts.length
-      counter++ for id, item of alerts when recent[id].isnt_equal? item
-      counter > 0
-    push_all: (alerts) ->
-      @push alert.growl() for alert in alerts
-      this
-    push_once: (alerts) ->
-      @push_all alerts if @has_uniq_in alerts
-      @purge()
+  class Stack
+    constructor: (@items...) ->
+
     purge: ->
-      setTimeout (=> @splice 0), 100
-  
+      setTimeout (=> @items.splice(0)), 100
+
+    push: (alert, dumped) ->
+      $.growlyflash(alert)
+      @items.push(dumped ? alert.toString())
+
+    push_only_fresh: (alerts) ->
+      recent = @items[-alerts.length..]
+      for alert in alerts
+        dumped = alert.toString()
+        @push(alert, dumped) if dumped not in recent
+      do @purge
+
+  HEADER = 'X-Message'
+  EVENTS = 'ajax:complete ajaxComplete'
+
   process = (alerts = {}) ->
     new Growlyflash.FlashStruct(msg, type) for type, msg of alerts when msg?
-  
+
   process_from_header = (source) ->
     return [] unless source?
-    process $.parseJSON(decodeURIComponent source)
-  
+    process $.parseJSON(decodeURIComponent(source))
+
   constructor: (context) ->
     @stack ?= new Stack()
     @process_static() if window.flashes?
     ($ context).on EVENTS, (_, xhr) =>
-      @stack.push_once process_from_header(xhr.getResponseHeader HEADER)
-      return
+      @stack.push_only_fresh process_from_header(xhr.getResponseHeader(HEADER))
+
   process_static: ->
-    @stack.push_all process(window.flashes)
+    @stack.push alert for alert in process(window.flashes)
     delete window.flashes
 
 Growlyflash.listen_on = (context) ->

data/app/assets/javascripts/growlyflash.bs2.js.coffee

@@ -4,4 +4,6 @@ Growlyflash.KEY_MAPPING =
   warning: null
   error:   'error'
   notice:  'info'
-  success: 'success'
+  success: 'success'
+
+Growlyflash.DISMISS = """<a class="close" data-dismiss="alert" href="#">&times;</a>"""

data/growlyflash.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.version       = Growlyflash::VERSION
   spec.authors       = ['Tõnis Simo']
   spec.email         = ['anton.estum@gmail.com']
-  spec.summary       = %q{Growl-styled flash messages for Ruby on Rails with Bootstrap.}
-  spec.description   = %q{Growl-styled flash messages for Ruby on Rails with Bootstrap. For XHR requests flash messages are transfering in 'X-Messages' headers, otherwise they are storing in js variables.}
+  spec.summary       = %q{Popup ActionDispatch::Flash within Bootstrap alert in Rails app like a growl notification.}
+  spec.description   = %q{This gem popups Rails' ActionDispatch::Flash within Bootstrap alert like a growl notification. It serves messages with both of AJAX (XHR) and regular requests inside HTTP headers.}
   spec.homepage      = 'https://github.com/estum/growlyflash'
   spec.license       = "MIT"
 

data/lib/growlyflash/version.rb

@@ -1,3 +1,3 @@
 module Growlyflash
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: growlyflash
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Tõnis Simo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -72,9 +72,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Growl-styled flash messages for Ruby on Rails with Bootstrap. For XHR
-  requests flash messages are transfering in 'X-Messages' headers, otherwise they
-  are storing in js variables.
+description: This gem popups Rails' ActionDispatch::Flash within Bootstrap alert like
+  a growl notification. It serves messages with both of AJAX (XHR) and regular requests
+  inside HTTP headers.
 email:
 - anton.estum@gmail.com
 executables: []
@@ -120,5 +120,6 @@ rubyforge_project:
 rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
-summary: Growl-styled flash messages for Ruby on Rails with Bootstrap.
+summary: Popup ActionDispatch::Flash within Bootstrap alert in Rails app like a growl
+  notification.
 test_files: []