poodle-rb 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 148d0f4cd6fb2c57e9b8e00fa0f2fecc475f333a
-  data.tar.gz: 29df628f0d01994f956cd73ea4a58b6c9394d418
+  metadata.gz: 46cbbbe48bc7958f15aded22f185be127b0b88ea
+  data.tar.gz: 85b1020570c215a6f4bde307c13c98428da51259
 SHA512:
-  metadata.gz: 805334ef3bc567ec4fe2f93eef62df67a08af93f29f781955c247aaf5a6da2306db769a4d6bf2feca18bdd57d39ed22b1817a7ca1bad971518d96e7197217e98
-  data.tar.gz: e29766968915d98137d0717eb2b1631e20aa720a1bf0af1e23f4dfec78b26720a01bd7eaeb5b14b7666faca189761c1ac525d9b2abab86e89336b5e7456cf990
+  metadata.gz: 7d43379cf0c3b58bb4ecdefdf146920be834818dd6d95324bf773f74cc0a3e1b736ba3a264177da456791d104c267ae859cc368b7a0a1e3b22b38999a9ab552e
+  data.tar.gz: f9c86b081919b448fba2c8d77fcdca2bb03e2ee1bc2506a9033809eee599a44b16ffd8124141c2f417e6c3aad21231ef5395d1e98d93f6fb89f3aa699912f5b8

data/app/helpers/poodle/flash_helper.rb

@@ -2,10 +2,13 @@ module Poodle
   module FlashHelper
     # This function will set a flash message depending up on the request type (ajax - xml http or direct http)
     # Example
-    #   set_flash_message("The message has been sent successfully", :success)
+    #   set_flash_message("The message has been sent successfully", :success, false)
     #   set_flash_message("Permission denied", :error)
-    def set_flash_message(message, type)
-      if request.xhr?
+    #
+    # Difference between flash and flash.now
+    # http://trace.adityalesmana.com/2010/10/difference-between-flash-and-flash-now-in-ruby/
+    def set_flash_message(message, type, now=true)
+      if now
         flash.now[type] = message
       else
         flash[type] = message
@@ -13,9 +16,10 @@ module Poodle
     end
 
     # Example
-    # message = get_flash_message()
-    def get_flash_message
-      if request.xhr?
+    # ajax_notice = get_flash_message(true)
+    # notice = get_flash_message(false)
+    def get_flash_message(now=true)
+      if now
         message = flash.now[:success] || flash.now[:notice] || flash.now[:alert] || flash.now[:error]
       else
         message = flash[:success] || flash[:notice] || flash[:alert] || flash[:error]
@@ -27,8 +31,8 @@ module Poodle
     # <div id="div_flash_message">
     #   <%= flash_message() -%>
     # </div>
-    def flash_message
-      message = get_flash_message
+    def flash_message(now=true)
+      message = get_flash_message(now)
       cls_name = "alert-info"
       cls_name = 'alert-success' if flash.now[:success] || flash[:success]
       cls_name = 'alert-warning' if flash.now[:alert] || flash[:alert]
@@ -37,7 +41,7 @@ module Poodle
       message = message.strip if message
 
       content_tag(:div, class: "alert #{cls_name} fade in mb-10", "data-alert" => "alert") do
-        raw(link_to("×",nil, class: "close", "data-dismiss" => "alert") + content_tag(:p, message))
+        raw(link_to("×", "#", class: "close", "data-dismiss" => "alert") + content_tag(:p, message))
       end unless message.blank?
     end
   end

data/app/views/layouts/poodle/application.html.erb

@@ -26,7 +26,7 @@
 
         <%#* Show flash messages if controller has set any. -%>
         <div id="div_flash_message">
-          <%= flash_message() -%>
+          <%= flash_message(false) -%>
         </div>
 
         <%#* Page Content Starts here -%>

data/app/views/layouts/poodle/public.html.erb

@@ -20,7 +20,7 @@
 
       <%#* Show flash messages if controller has set any. -%>
       <div id="div_flash_message">
-        <%= flash_message() -%>
+        <%= flash_message(false) -%>
       </div>
 
       <%#* Page Content Starts here -%>

data/lib/poodle/version.rb

@@ -1,3 +1,3 @@
 module Poodle
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: poodle-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Krishnaprasad Varma