Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

changed check for old BSON implementation #48

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

changed check for old BSON implementation #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d52697c
changed check for old BSON implementation
jeremy6d Jul 7, 2014
26a81fb
replace other instances of bad constant
jeremy6d Jul 7, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/mongoid/grid_fs.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ def put(readable, attributes = {})
end

def binary_for(*buf)
if defined?(Moped::BSON)
if defined?(Moped::BSON::Binary)
Moped::BSON::Binary.new(:generic, buf.join)
else
BSON::Binary.new(buf.join, :generic)
Expand Down Expand Up @@ -428,7 +428,7 @@ def GridFs.build_chunk_model_for(namespace)
self.store_in :collection => "#{ prefix }.chunks"

field(:n, :type => Integer, :default => 0)
field(:data, :type => (defined?(Moped::BSON) ? Moped::BSON::Binary : BSON::Binary))
field(:data, :type => (defined?(Moped::BSON::Binary) ? Moped::BSON::Binary : BSON::Binary))

belongs_to(:file, :foreign_key => :files_id, :class_name => file_model_name)

Expand Down
2 changes: 1 addition & 1 deletion test/mongoid-grid_fs_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@

protected
def object_id_re
object_id = defined?(Moped::BSON) ? Moped::BSON::ObjectId.new : BSON::ObjectId.new
object_id = defined?(Moped::BSON::ObjectId) ? Moped::BSON::ObjectId.new : BSON::ObjectId.new

%r| \w{#{ object_id.to_s.size }} |iomx
end
Expand Down