More bundler friendly paths

jbbarth · Apr 20, 2011 · 114358e · 114358e
1 parent ad352fc
commit 114358e
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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 → lib/mongoid-ancestry/class_methods.rb b/lib/mongoid/ancestry/class_methods.rb → lib/mongoid-ancestry/class_methods.rb
diff --git a/lib/mongoid/ancestry/exceptions.rb → lib/mongoid-ancestry/exceptions.rb b/lib/mongoid/ancestry/exceptions.rb → lib/mongoid-ancestry/exceptions.rb
diff --git a/lib/mongoid/ancestry/instance_methods.rb → lib/mongoid-ancestry/instance_methods.rb b/lib/mongoid/ancestry/instance_methods.rb → lib/mongoid-ancestry/instance_methods.rb
diff --git a/lib/mongoid/ancestry.rb b/lib/mongoid/ancestry.rb
diff --git a/spec/mongoid/ancestry_spec.rb → spec/lib/ancestry_spec.rb b/spec/mongoid/ancestry_spec.rb → 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 → ...ib/mongoid-ancestry/class_methods_spec.rb b/spec/mongoid/ancestry/class_methods_spec.rb → ...ib/mongoid-ancestry/class_methods_spec.rb
diff --git a/...mongoid/ancestry/instance_methods_spec.rb → ...mongoid-ancestry/instance_methods_spec.rb b/...mongoid/ancestry/instance_methods_spec.rb → ...mongoid-ancestry/instance_methods_spec.rb
diff --git 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
@@ -1,6 +1,3 @@
-require 'mongoid/ancestry'
-
-
 class MongoidAncestry
 
   def self.with_model options = {}