Permalink
Browse files

Merge pull request #11 from sgonyea/master

Removed autoloading. This makes Plucky thread safe. It also makes the code uglier. Apologies.
  • Loading branch information...
2 parents 4bb3f69 + 8820e24 commit 1f33a46ad2443434666e4730ad597cd37e437c60 @bkeepers bkeepers committed Jul 20, 2011
Showing with 11 additions and 9 deletions.
  1. +5 −9 lib/plucky.rb
  2. +6 −0 lib/plucky/pagination.rb
View
@@ -2,17 +2,13 @@
require 'set'
require 'mongo'
require 'plucky/extensions'
+require 'plucky/criteria_hash'
+require 'plucky/options_hash'
+require 'plucky/query'
+require 'plucky/pagination'
module Plucky
- autoload :CriteriaHash, 'plucky/criteria_hash'
- autoload :OptionsHash, 'plucky/options_hash'
- autoload :Query, 'plucky/query'
- autoload :Version, 'plucky/version'
-
- module Pagination
- autoload :Decorator, 'plucky/pagination/decorator'
- autoload :Paginator, 'plucky/pagination/paginator'
- end
+ autoload :Version, 'plucky/version'
# Array of methods that actually perform queries
Methods = [
View
@@ -0,0 +1,6 @@
+require 'plucky/pagination/decorator'
+require 'plucky/pagination/paginator'
+
+module Plucky
+ module Pagination; end
+end

0 comments on commit 1f33a46

Please sign in to comment.