Permalink
Browse files

Merge remote branch 'purcell/basic_object_as_blank_slate'

  • Loading branch information...
2 parents b905a6e + 98de254 commit 66b4dcf0551cead8ef662079d186bd490b1675ac @pat committed Sep 15, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/thinking_sphinx/index/builder.rb
@@ -1,4 +1,4 @@
-require 'blankslate'
+require 'blankslate' unless defined?(BasicObject)
module ThinkingSphinx
class Index
@@ -14,7 +14,7 @@ class Index
# set_property allows you to set some settings on a per-index basis. Check
# out each method's documentation for better ideas of usage.
#
- class Builder < BlankSlate
+ class Builder < (defined?(BasicObject) ? BasicObject : BlankSlate)
def self.generate(model, name = nil, &block)
index = ThinkingSphinx::Index.new(model)
index.name = name unless name.nil?

0 comments on commit 66b4dcf

Please sign in to comment.