From: Tom Hughes <tom@compton.nu>
Date: Sat, 21 Jan 2012 15:11:35 +0000 (+0000)
Subject: Turn session-persistence plugin into a library
X-Git-Tag: live~5815
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4de07696d51d5b053fa6af2c0a5aa4d0b89d60b7?ds=inline

Turn session-persistence plugin into a library
---

diff --git a/config/initializers/session_persistence.rb b/config/initializers/session_persistence.rb
new file mode 100644
index 000000000..bb6fb3575
--- /dev/null
+++ b/config/initializers/session_persistence.rb
@@ -0,0 +1,3 @@
+require  "session_persistence/session_persistence"
+ActionController::Base.class_eval { include SessionPersistence }
+ActionController::Base.after_filter :_persist_session
diff --git a/vendor/plugins/session-persistence/MIT_LICENSE b/lib/session_persistence/MIT_LICENSE
similarity index 100%
rename from vendor/plugins/session-persistence/MIT_LICENSE
rename to lib/session_persistence/MIT_LICENSE
diff --git a/vendor/plugins/session-persistence/README.rdoc b/lib/session_persistence/README.rdoc
similarity index 100%
rename from vendor/plugins/session-persistence/README.rdoc
rename to lib/session_persistence/README.rdoc
diff --git a/vendor/plugins/session-persistence/lib/session_persistence.rb b/lib/session_persistence/session_persistence.rb
similarity index 100%
rename from vendor/plugins/session-persistence/lib/session_persistence.rb
rename to lib/session_persistence/session_persistence.rb
diff --git a/vendor/plugins/session-persistence/init.rb b/vendor/plugins/session-persistence/init.rb
deleted file mode 100644
index a752ad331..000000000
--- a/vendor/plugins/session-persistence/init.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require  "session_persistence"
-ActionController::Base.class_eval { include SessionPersistence }
-ActionController::Base.after_filter :_persist_session
\ No newline at end of file
diff --git a/vendor/plugins/session-persistence/test/session_timeout_test.rb b/vendor/plugins/session-persistence/test/session_timeout_test.rb
deleted file mode 100644
index 89c6020b2..000000000
--- a/vendor/plugins/session-persistence/test/session_timeout_test.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require "test/unit"
-
-module ActionController
-  class Base
-    def self.after_filter(*args)
-      
-    end
-  end
-end
-
-$LOAD_PATH.push(File.dirname(__FILE__) + "../lib")
-require "../init"
-
-class SessionPersistenceTest < Test::Unit::TestCase
-  def setup
-    @controller = ActionController::Base.new
-    @controller.instance_eval {
-      def session
-        @session ||= {}
-      end
-      
-      def session_persistence_key
-        :mine
-      end
-    }
-  end
-  
-  def test_session_expires_after
-    @controller.instance_eval { session_expires_after 10 }
-    assert_equal 10, @controller.session[:mine]
-  end
-  
-  def test_session_expires_automatically
-    @controller.instance_eval {
-      session_expires_after 10
-      session_expires_automatically
-    }
-    
-    assert !@controller.session.has_key?(:mine)
-  end
-end
\ No newline at end of file