From 114358e47659c7343172aef4a0bab514798c7d54 Mon Sep 17 00:00:00 2001
From: Anton Orel <eagle.anton@gmail.com>
Date: Wed, 20 Apr 2011 23:14:51 +0400
Subject: [PATCH] More bundler friendly paths

---
 Gemfile.lock                                       |  2 +-
 Guardfile                                          |  4 ++--
 lib/mongoid-ancestry.rb                            | 14 ++++++++++++++
 .../ancestry => mongoid-ancestry}/class_methods.rb |  0
 .../ancestry => mongoid-ancestry}/exceptions.rb    |  0
 .../instance_methods.rb                            |  0
 lib/mongoid/ancestry.rb                            | 14 --------------
 spec/{mongoid => lib}/ancestry_spec.rb             |  2 +-
 .../mongoid-ancestry}/class_methods_spec.rb        |  0
 .../mongoid-ancestry}/instance_methods_spec.rb     |  0
 spec/spec_helper.rb                                |  2 ++
 spec/support/models.rb                             |  3 ---
 12 files changed, 20 insertions(+), 21 deletions(-)
 create mode 100644 lib/mongoid-ancestry.rb
 rename lib/{mongoid/ancestry => mongoid-ancestry}/class_methods.rb (100%)
 rename lib/{mongoid/ancestry => mongoid-ancestry}/exceptions.rb (100%)
 rename lib/{mongoid/ancestry => mongoid-ancestry}/instance_methods.rb (100%)
 delete mode 100644 lib/mongoid/ancestry.rb
 rename spec/{mongoid => lib}/ancestry_spec.rb (98%)
 rename spec/{mongoid/ancestry => lib/mongoid-ancestry}/class_methods_spec.rb (100%)
 rename spec/{mongoid/ancestry => lib/mongoid-ancestry}/instance_methods_spec.rb (100%)

diff --git a/Gemfile.lock b/Gemfile.lock
index ab17e11b..66b4ba20 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongoid-ancestry (0.1.0)
+    mongoid-ancestry (0.2.0)
       bson_ext (~> 1.3)
       mongoid (~> 2.0)
       mongoid-ancestry
diff --git a/Guardfile b/Guardfile
index 34003c40..5cbd265e 100644
--- a/Guardfile
+++ b/Guardfile
@@ -3,8 +3,8 @@
 
 guard 'rspec', :version => 2, :cli => "--format Fuubar" do
   watch(%r{^spec/.+_spec\.rb})
-  watch(%r{^lib/mongoid/ancestry/(.+)\.rb})     { |m| "spec/mongoid/ancestry/#{m[1]}_spec.rb" }
-  watch('lib/mongoid/ancestry.rb')      { "spec" }
+  watch(%r{^lib/mongoid-ancestry/(.+)\.rb})     { |m| "spec/lib/mongoid-ancestry/#{m[1]}_spec.rb" }
+  watch('lib/mongoid-ancestry.rb')      { "spec" }
   watch(%r{^spec/support/(.+)\.rb})     { "spec" }
   watch('spec/spec_helper.rb')          { "spec" }
 end
diff --git a/lib/mongoid-ancestry.rb b/lib/mongoid-ancestry.rb
new file mode 100644
index 00000000..7c5ee6b7
--- /dev/null
+++ b/lib/mongoid-ancestry.rb
@@ -0,0 +1,14 @@
+module Mongoid
+  module Ancestry
+    extend ActiveSupport::Concern
+
+    autoload :ClassMethods,    'mongoid-ancestry/class_methods'
+    autoload :InstanceMethods, 'mongoid-ancestry/instance_methods'
+    autoload :Error,           'mongoid-ancestry/exceptions'
+
+    included do
+      cattr_accessor :base_class
+      self.base_class = self
+    end
+  end
+end
diff --git a/lib/mongoid/ancestry/class_methods.rb b/lib/mongoid-ancestry/class_methods.rb
similarity index 100%
rename from lib/mongoid/ancestry/class_methods.rb
rename to lib/mongoid-ancestry/class_methods.rb
diff --git a/lib/mongoid/ancestry/exceptions.rb b/lib/mongoid-ancestry/exceptions.rb
similarity index 100%
rename from lib/mongoid/ancestry/exceptions.rb
rename to lib/mongoid-ancestry/exceptions.rb
diff --git a/lib/mongoid/ancestry/instance_methods.rb b/lib/mongoid-ancestry/instance_methods.rb
similarity index 100%
rename from lib/mongoid/ancestry/instance_methods.rb
rename to lib/mongoid-ancestry/instance_methods.rb
diff --git a/lib/mongoid/ancestry.rb b/lib/mongoid/ancestry.rb
deleted file mode 100644
index e3d98361..00000000
--- a/lib/mongoid/ancestry.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-module Mongoid
-  module Ancestry
-    extend ActiveSupport::Concern
-
-    autoload :ClassMethods,    'mongoid/ancestry/class_methods'
-    autoload :InstanceMethods, 'mongoid/ancestry/instance_methods'
-    autoload :Error,           'mongoid/ancestry/exceptions'
-
-    included do
-      cattr_accessor :base_class
-      self.base_class = self
-    end
-  end
-end
diff --git a/spec/mongoid/ancestry_spec.rb b/spec/lib/ancestry_spec.rb
similarity index 98%
rename from spec/mongoid/ancestry_spec.rb
rename to spec/lib/ancestry_spec.rb
index 12b0fda9..d62fdf29 100644
--- a/spec/mongoid/ancestry_spec.rb
+++ b/spec/lib/ancestry_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-require 'mongoid/ancestry/exceptions'
+require 'mongoid-ancestry/exceptions'
 
 
 describe MongoidAncestry do
diff --git a/spec/mongoid/ancestry/class_methods_spec.rb b/spec/lib/mongoid-ancestry/class_methods_spec.rb
similarity index 100%
rename from spec/mongoid/ancestry/class_methods_spec.rb
rename to spec/lib/mongoid-ancestry/class_methods_spec.rb
diff --git a/spec/mongoid/ancestry/instance_methods_spec.rb b/spec/lib/mongoid-ancestry/instance_methods_spec.rb
similarity index 100%
rename from spec/mongoid/ancestry/instance_methods_spec.rb
rename to spec/lib/mongoid-ancestry/instance_methods_spec.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e777cc31..1044aa21 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -4,6 +4,8 @@
 require 'mongoid'
 require 'rspec'
 
+require 'mongoid-ancestry'
+
 Mongoid.configure do |config|
   logger = Logger.new('log/test.log')
   config.master = Mongo::Connection.new('localhost', 27017,
diff --git a/spec/support/models.rb b/spec/support/models.rb
index 15204a9e..59421e23 100644
--- a/spec/support/models.rb
+++ b/spec/support/models.rb
@@ -1,6 +1,3 @@
-require 'mongoid/ancestry'
-
-
 class MongoidAncestry
 
   def self.with_model options = {}