lib/cacheable_flash.rb in cacheable_flash-0.3.2 vs lib/cacheable_flash.rb in cacheable_flash-0.3.3

@@ -1,12 +1,12 @@
 require 'json'
 require 'stackable_flash'
 
 module CacheableFlash
-  if defined?(Rails) && ::Rails::VERSION::MAJOR == 3
+  if defined?(Rails) && (::Rails::VERSION::MAJOR >= 3)
     require 'cacheable_flash/middleware'
-    require 'cacheable_flash/engine' if ::Rails::VERSION::MINOR >= 1
+    require 'cacheable_flash/engine' if (::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR >= 1) || ::Rails::VERSION::MAJOR > 3
     require 'cacheable_flash/railtie'
   else
     # For older rails use generator
   end
 
@@ -15,11 +15,11 @@
   #   config[:stacking] = true
   #   config[:append_as] = :br # Pick a value, set your own proc, or don't: passes the JSON'd array to the cookie
   # end
   StackableFlash.stacking = false
 
-  # The configure will override the above default
+  # The configure will override the above defaults
   require 'cacheable_flash/config'
   require 'cacheable_flash/cookie_flash'
   include CacheableFlash::CookieFlash
 
   def self.included(base)
@@ -28,13 +28,15 @@
   end
 
   def write_flash_to_cookie
     yield if block_given?
 
+
     # Base must define cookies, as in Rails
-    cookies['flash'] = cookie_flash(flash, cookies)
+    domain = CacheableFlash::Config.config[:domain]
+    cookies['flash'] = { :value => cookie_flash(flash, cookies), :domain => domain }
     # Base must define flash, as in Rails
-    # TODO: Does not support flash.now feature of the FlashHash in Rails, 
+    # TODO: Does not support flash.now feature of the FlashHash in Rails,
     #       because flashes are only removed from cookies when they are used.
     flash.clear
   end
 
   # simply abstracts the StackableFlash.stacking method