0
@@ -1,5 +1,6 @@
0
 module Merb
0
-module Admin::ArticlesHelper
0
-  
0
+  module Admin
0
+    module ArticlesHelper
0
+    end
0
   end
0
 end
0
\ No newline at end of file

0
@@ -1,5 +1,6 @@
0
 module Merb
0
-module Admin::CommentsHelper
0
-  
0
+  module Admin
0
+    module CommentsHelper
0
+    end
0
   end
0
 end
0
\ No newline at end of file

0
@@ -1,5 +1,6 @@
0
 module Merb
0
-module Admin::UsersHelper
0
-  
0
+  module Admin
0
+    module UsersHelper
0
+    end
0
   end
0
 end
0
\ No newline at end of file

0
@@ -1,5 +1,5 @@
0
 module Merb
0
-module ArticlesHelper
0
+  module ArticlesHelper
0
   
0
   end
0
 end

0
@@ -1,5 +1,5 @@
0
 module Merb
0
-module Admin::CommentsHelper
0
+  module CommentsHelper
0
   
0
   end
0
 end

0
@@ -1,5 +1,5 @@
0
 module Merb
0
-module Admin::UsersHelper
0
+  module UsersHelper
0
   
0
   end
0
 end

0
@@ -1,9 +1,6 @@
0
 module Permalinker
0
 
0
   def self.included(base)
0
-    base.class_eval do
0
-      property :slug, :string, :lazy => false
0
-    end
0
     base.send(:extend,ClassMethods)
0
   end
0
 
0
@@ -12,6 +9,7 @@ module Permalinker
0
       include InstanceMethods
0
       class_eval do
0
         extend SingletonMethods
0
+        property :slug, :string, :lazy => false
0
         validates_presence_of :slug
0
         validates_uniqueness_of :slug
0
         before_validation { |record| record.set_identifier!(source) }

0
@@ -1,4 +1,4 @@
0
-require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
0
+require File.join(File.dirname(__FILE__), '../..', 'spec_helper.rb')
0
 
0
 describe "Admin::Settings Controller", "edit action" do
0
   before(:each) do

0
@@ -5,7 +5,7 @@ describe Articles do
0
   include DefaultControllerHelper
0
   include ArticleSpecHelper
0
 
0
-  it_should_behave_like "default controller behavior"
0
+  #it_should_behave_like "default controller behavior"
0
   
0
   describe "#index" do
0
     it "should return a list of all articles in reverse order of creation" do