Skip to content

Commit

Permalink
Replace requires with autoloads
Browse files Browse the repository at this point in the history
  • Loading branch information
durran committed Dec 9, 2011
1 parent b5ef45e commit 3d02cf3
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 49 deletions.
6 changes: 4 additions & 2 deletions lib/origin.rb
@@ -1,3 +1,5 @@
# encoding: utf-8
require "origin/queryable"
require "origin/version"
module Origin
autoload :Queryable, "origin/queryable"
autoload :Version, "origin/version"
end
31 changes: 16 additions & 15 deletions lib/origin/optional.rb
@@ -1,21 +1,22 @@
# encoding: utf-8
require "origin/optional/batch_size"
require "origin/optional/hint"
require "origin/optional/limit"
require "origin/optional/max_scan"
require "origin/optional/no_timeout"
require "origin/optional/only"
require "origin/optional/read"
require "origin/optional/return_key"
require "origin/optional/show_disk_loc"
require "origin/optional/skip"
require "origin/optional/slice"
require "origin/optional/snapshot"
require "origin/optional/transformer"
require "origin/optional/without"

module Origin
module Optional

autoload :BatchSize, "origin/optional/batch_size"
autoload :Hint, "origin/optional/hint"
autoload :Limit, "origin/optional/limit"
autoload :MaxScan, "origin/optional/max_scan"
autoload :NoTimeout, "origin/optional/no_timeout"
autoload :Only, "origin/optional/only"
autoload :Read, "origin/optional/read"
autoload :ReturnKey, "origin/optional/return_key"
autoload :ShowDiskLoc, "origin/optional/show_disk_loc"
autoload :Skip, "origin/optional/skip"
autoload :Slice, "origin/optional/slice"
autoload :Snapshot, "origin/optional/snapshot"
autoload :Transformer, "origin/optional/transformer"
autoload :Without, "origin/optional/without"

include BatchSize
include Hint
include Limit
Expand Down
10 changes: 6 additions & 4 deletions lib/origin/queryable.rb
@@ -1,11 +1,13 @@
# encoding: utf-8
require "origin/ext"
require "origin/optional"
require "origin/options"
require "origin/selection"
require "origin/selector"

module Origin

autoload :Optional, "origin/optional"
autoload :Options, "origin/options"
autoload :Selection, "origin/selection"
autoload :Selector, "origin/selector"

module Queryable
include Optional
include Selection
Expand Down
56 changes: 28 additions & 28 deletions lib/origin/selection.rb
@@ -1,34 +1,33 @@
# encoding: utf-8
require "origin/selection/all"
require "origin/selection/and"
require "origin/selection/between"
require "origin/selection/elem_match"
require "origin/selection/exists"
require "origin/selection/gt"
require "origin/selection/gte"
require "origin/selection/in"
require "origin/selection/key"
require "origin/selection/lt"
require "origin/selection/lte"
require "origin/selection/max_distance"
require "origin/selection/mod"
require "origin/selection/ne"
require "origin/selection/near"
require "origin/selection/near_sphere"
require "origin/selection/nin"
require "origin/selection/nor"
require "origin/selection/or"
require "origin/selection/size"
require "origin/selection/strategies"
require "origin/selection/type"
require "origin/selection/where"
require "origin/selection/within_box"
require "origin/selection/within_circle"
require "origin/selection/within_spherical_circle"

module Origin
module Selection
include Strategies

autoload :All, "origin/selection/all"
autoload :And, "origin/selection/and"
autoload :Between, "origin/selection/between"
autoload :ElemMatch, "origin/selection/elem_match"
autoload :Exists, "origin/selection/exists"
autoload :Gt, "origin/selection/gt"
autoload :Gte, "origin/selection/gte"
autoload :In, "origin/selection/in"
autoload :Key, "origin/selection/key"
autoload :Lt, "origin/selection/lt"
autoload :Lte, "origin/selection/lte"
autoload :MaxDistance, "origin/selection/max_distance"
autoload :Mod, "origin/selection/mod"
autoload :Ne, "origin/selection/ne"
autoload :Near, "origin/selection/near"
autoload :NearSphere, "origin/selection/near_sphere"
autoload :Nin, "origin/selection/nin"
autoload :Nor, "origin/selection/nor"
autoload :Or, "origin/selection/or"
autoload :Size, "origin/selection/size"
autoload :Strategies, "origin/selection/strategies"
autoload :Type, "origin/selection/type"
autoload :Where, "origin/selection/where"
autoload :WithinBox, "origin/selection/within_box"
autoload :WithinCircle, "origin/selection/within_circle"
autoload :WithinSphericalCircle, "origin/selection/within_spherical_circle"

include All
include And
Expand All @@ -49,6 +48,7 @@ module Selection
include Nor
include Or
include Size
include Strategies
include Type
include Where
include WithinBox
Expand Down

0 comments on commit 3d02cf3

Please sign in to comment.