growlyflash 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWY1NDI1MzcxMzgyZTMyZjBjM2Q4MzRlZmYzNGFlNWZmZTBkOWExYw==
+    MTk4OGQ3ZGM2Y2JlNzZiNTE5MDY2ODQzODc4ODRjMjBjN2Q5YzdhMA==
   data.tar.gz: !binary |-
-    NzBkNGY1NTJmN2EyZmExMWQ3NjZiZGQwNjk3NzBjNGU0N2RiY2IyZA==
+    MTZmNTliNjdmM2IxMjY2MzkzODEyMzQ0MzgxNDM4ODEwYWRkOGY5ZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzRhMzU4OWE2NzI1Mjg3YjVmZTQzNjRjMWNiYjZhZDlmYmRmZWVmN2U2NTQx
-    ZGZlOThiZGFiNDhkNmE0NzQ1NWQ3NDRiM2FjMWRhMDUwMmI5YTMyYzM2Zjcw
-    ZWQ1N2ZmYWI2ZWI0ZTUwYWNiYTlkNTE0N2QxMDVlZTQ0Yjc1ZmE=
+    N2U4ODA2MDczYTQ0ZDE5NDE1MDMxNzAxMmNlOTEwMDkzZDgzMTk3NWQxOTJk
+    ZjRhNjc4NDc4YmEzMWY3M2M4NmZmNzkwMjgyODhiZjJhMzM1NTY2OWFlMzU3
+    NWViM2RhMzg1ODM5Zjg0OTQzM2MxM2RmMGU0OGE3ODVmOTVjOTM=
   data.tar.gz: !binary |-
-    ZGU3ODg0ODA4YTAzNTg3NGJmZWUwNTg4MTAyNDEzODg3OTdiOWRkYzVhN2Jl
-    MDEwYmNkY2YyNzljMmY1YTEwOWQ0NmZjNDJiZTEzYWUwNTI3MzVjNzgyN2E0
-    NDYxMTc4ODI3ODJhMmZiNzA5ZTI2Yzc2NmZkNTQxMmMzZTBiZGQ=
+    ZDRmNTk4ZDdhMDY0MTk0MzU3NjRkN2Q5ZjQ2OWVkZTRlMmZiZGRhZjA4ZTFm
+    N2JlOGIzODE2NDhhNzc3MDM5OTVkOTY3ZDRlZjY1NjgxOTYzZjgzOTI2NjNk
+    MDVmNjVmMTRiNDA2Yzk2MTY0NDRjNjgwMWFlNWUzNGNhYmIzNzM=

data/growlyflash.gemspec

@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'growlyflash/version'

data/lib/growlyflash.rb

@@ -1,22 +1,52 @@
+# encoding: utf-8
+
 require "growlyflash/version"
-require "growlyflash/controller"
-require "growlyflash/helpers"
+require "uri"
 
 module Growlyflash
-  # Your code goes here...
-  def self.initialize
-    return if @initialized
-    raise "ActionController is not available yet." unless defined?(ActionController)
-    ActionController::Base.send(:helper, Growlyflash::Helpers)
-    ActionController::Base.send(:include, Growlyflash::Controller)
-    @initialized = true
+  # class << self
+  #   def logger
+  #     @@logger ||= nil
+  #   end
+  # 
+  #   def logger=(logger)
+  #     @@logger = logger
+  #   end
+  # end
+  
+  module XMessageHeaders
+    def flash_to_headers
+      # logger.info(response.headers)
+      xmessage = URI.escape(Hash[flash].to_json)  # URI escape to fix strange things with headers encoding
+      response.headers['X-Message'] = xmessage    
+      flash.discard                               # discard flash to prevent it appear again after refreshing page
+    end
+    
+    private
+      def is_xhr_request?
+        request.xhr?
+      end
+  end
+  
+  module NoticeHelpers
+    def growlyflash_static_notices
+      return nil unless flash.any?
+      javascript_tag("window.flashes = #{ raw(Hash[ flash ].to_json) };", defer: 'defer')
+    end
+  end
+  
+  class Engine < ::Rails::Engine
+    initializer :growlyflash_xmessage_headers do |config|
+      # Growlyflash.logger = ::Rails.logger
+      
+      ActionController::Base.class_eval do
+        include XMessageHeaders
+        helper NoticeHelpers
+        
+        after_filter :flash_to_headers, if: :is_xhr_request?
+      end
+      
+    end
   end
-end
-
-if defined?(Rails)
-  require 'growlyflash/engine'
-end
 
-if defined?(Rails::Railtie)
-  require 'growlyflash/railtie'
 end

data/lib/growlyflash/version.rb

@@ -1,3 +1,3 @@
 module Growlyflash
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/vendor/assets/javascripts/growlyflash/bootstrap-growl.js.coffee

@@ -16,8 +16,6 @@ $.extend
     
     settings = $.extend settings, options
     
-    console.log settings
-  
     html_attrs = 
       class: 'bootstrap-growl alert'
       html: ''

data/vendor/assets/javascripts/growlyflash/growlyflash.js.coffee

@@ -11,41 +11,30 @@ class Growlyflash
     notice : 'info'
     success: 'success'
 
-  constructor: () ->
-    @flashes_log = []
+  constructor: (@context) ->
     @growl(window.flashes) if window.flashes?
-    $(document).on 'ajax:complete', @ajax_complete
-    $(document).ajaxComplete @ajax_complete
+    $(@context).on 'ajax:complete ajaxComplete', @ajax_complete
     
   growl: (flashes) ->
     for type, msg of flashes when msg?
-      @flashes_log.push type:type, msg:msg
-      $.bootstrapGrowl msg, 
-        type: TYPE_MAPPING[type]
+      $.bootstrapGrowl msg, type: TYPE_MAPPING[type]
   
   messages: (flashes) ->
     { type:type, msg:msg } for type, msg of flashes
-
-  ajax_complete: (e, req) =>
-    flashes = $.parseJSON req.getResponseHeader 'X-Message'
-    return false if $.isEmptyObject flashes
-    
-    messages = @messages flashes
-    
-    if @flashes_log.length > 0
-      last_log    = @flashes_log.slice( - messages.length )
-      not_matches = 0
-      not_matches++ for id, f of messages when (last_log[id].type isnt f.type) and (last_log[id].msg isnt f.msg)
-      unless not_matches > 0
-        @flashes_log = []
-        return true
-    
-    $.merge @flashes_log, messages
-    @growl flashes
+  
+  ajax_complete: (e, response, settings) =>
+    xmessage = @get_x_message.call response
+    if xmessage?
+      flashes  = $.parseJSON xmessage
+      @growl flashes
     true
+  
+  get_x_message: ->
+    encoded = @getResponseHeader('X-Message')
+    decodeURIComponent encoded
+    
 
 root.Growlyflash = Growlyflash
 
 jQuery ->
-  
-  new Growlyflash()
+  growlyflash = new Growlyflash document

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: growlyflash
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tõnis Simo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-06 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -94,10 +94,6 @@ files:
 - Rakefile
 - growlyflash.gemspec
 - lib/growlyflash.rb
-- lib/growlyflash/controller.rb
-- lib/growlyflash/engine.rb
-- lib/growlyflash/helpers.rb
-- lib/growlyflash/railtie.rb
 - lib/growlyflash/version.rb
 - vendor/assets/javascripts/growlyflash/bootstrap-growl.js.coffee
 - vendor/assets/javascripts/growlyflash/growlyflash.js.coffee
@@ -127,3 +123,4 @@ specification_version: 4
 summary: Tiny gem which provides growl-styled flash messages for Ruby on Rails with
   Bootstrap.
 test_files: []
+has_rdoc: 

data/lib/growlyflash/controller.rb

@@ -1,22 +0,0 @@
-require 'active_support/concern'
-
-module Growlyflash
-  module Controller
-    extend ActiveSupport::Concern
-    
-    included do
-      after_filter :flash_to_headers, if: :is_xhr_request?
-      
-      def flash_to_headers
-        flash_json = Hash[ flash.map { |type, msg| [type, msg] } ].to_json
-        response.headers['X-Message'] = flash_json.clone
-        flash.discard # don't want the flash to appear when you reload page
-      end
-      
-      private
-        def is_xhr_request?
-          request.xhr?
-        end
-    end
-  end
-end

data/lib/growlyflash/engine.rb

@@ -1,6 +0,0 @@
-module Growlyflash
-  module Rails
-    class Engine < ::Rails::Engine
-    end
-  end
-end

data/lib/growlyflash/helpers.rb

@@ -1,11 +0,0 @@
-module Growlyflash
-  module Helpers
-    
-    # Insert in head tag in your layout before any js.
-    def growlyflash_static_notices
-      if flash.any?
-        javascript_tag "window.flashes = #{ raw(Hash[ flash.map { |type, msg| [type, msg] } ].to_json) };", defer: 'defer'
-      end
-    end
-  end  
-end

data/lib/growlyflash/railtie.rb

@@ -1,14 +0,0 @@
-if defined?(Rails::Railtie)
-  module Growlyflash
-    
-    class Railtie < ::Rails::Railtie
-      # initializer 'growlyflash.active_controller' do
-      initializer :growlyflash do
-        Growlyflash.initialize
-        # ActiveSupport.on_load(:action_controller) do
-        #   include Growlyflash::Controller
-        # end
-      end
-    end
-  end
-end