Module.clear_nsurls => Module.reset_nsurls

yrashk · May 4, 2008 · bea81c9 · bea81c9
1 parent caa9bd3
commit bea81c9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/lib/strokedb/nsurl.rb b/lib/strokedb/nsurl.rb
@@ -1,7 +1,9 @@
 Module.module_eval do
 
-  def self.clear_nsurls
+  def self.reset_nsurls
     @@nsurls = {}
+    ::Module.nsurl ''
+    ::StrokeDB.nsurl StrokeDB::STROKEDB_NSURL    
   end
   def self.find_by_nsurl(url)
     @@nsurls[url]
@@ -19,5 +21,4 @@ def nsurl(url = nil)
 
 end
 
-Module.nsurl ''
-StrokeDB.nsurl StrokeDB::STROKEDB_NSURL
+Module.reset_nsurls
diff --git a/spec/lib/strokedb/nsurl_spec.rb b/spec/lib/strokedb/nsurl_spec.rb
@@ -4,7 +4,11 @@
 
   before(:each) do
     @module = Module.new
-    Module.clear_nsurls
+    Module.reset_nsurls
+  end
+
+  after(:each) do
+    Module.reset_nsurls
   end
 
   it "should have nil nsurl by default" do
@@ -38,9 +42,14 @@
 
 
   before(:each) do
-    Module.clear_nsurls
+    Module.reset_nsurls
   end
 
+  after(:each) do
+    Module.reset_nsurls
+  end
+
+
   it "should have empty nsurl by default" do
     Module.nsurl.should be_empty
   end
@@ -50,7 +59,11 @@
 describe StrokeDB do
 
   before(:each) do
-    Module.clear_nsurls
+    Module.reset_nsurls
+  end
+
+  after(:each) do
+    Module.reset_nsurls
   end
 
   it "should have #{STROKEDB_NSURL} nsurl by default" do