Skip to content

Commit

Permalink
MS; updated to released rails
Browse files Browse the repository at this point in the history
  • Loading branch information
maxwell committed Sep 7, 2010
1 parent 41afd86 commit 804777f
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 14 deletions.
21 changes: 11 additions & 10 deletions Gemfile
@@ -1,24 +1,25 @@
source 'http://rubygems.org'

#gem 'rails', '3.0.0.rc'
#gem 'bundler', '1.0.0.rc.5'
gem 'rails', '3.0.0.beta4'
gem 'bundler', '0.9.26'
gem 'rails', '3.0.0'
gem 'bundler', '1.0.0'


#Security
gem 'devise', :git => 'http://github.com/BadMinus/devise.git'

#Mongo
gem 'mongo_mapper', :git => 'http://github.com/BadMinus/mongomapper.git'
#gem 'mongo_mapper', :git => 'http://github.com/jnunemaker/mongomapper.git'
gem 'jnunemaker-validatable', :git => 'http://github.com/BadMinus/validatable.git'
#gem 'mongo_mapper', :git => 'http://github.com/BadMinus/mongomapper.git'
gem 'mongo_mapper', :git => 'http://github.com/jnunemaker/mongomapper.git'
#gem 'mongo_mapper', :git => 'http://github.com/collectiveidea/mongomapper.git', :branch => 'rails3'
#gem 'jnunemaker-validatable', :git => 'http://github.com/BadMinus/validatable.git'
gem 'jnunemaker-validatable', :git => 'http://github.com/jnunemaker/validatable.git'
gem 'mongo_ext'
gem 'bson_ext', '1.0.4'
gem 'bson', '1.0.4'
gem 'bson_ext', '1.0.7'
gem 'bson', '1.0.7'

#Views
gem 'haml'
gem 'will_paginate', '3.0.pre'
gem 'will_paginate', '3.0.pre2'

#Uncatagorized
gem 'roxml', :git => 'git://github.com/Empact/roxml.git'
Expand Down
2 changes: 1 addition & 1 deletion app/models/post.rb
Expand Up @@ -25,7 +25,7 @@ class Post
after_destroy :destroy_comments

def self.instantiate params
self.create params
self.create params.to_hash
end

#ENCRYPTION
Expand Down
2 changes: 1 addition & 1 deletion app/models/user.rb
Expand Up @@ -85,7 +85,7 @@ def post(class_name, options = {})
group_ids = options.delete(:to)
end

group_ids = [group_ids] if group_ids.is_a? BSON::ObjectID
group_ids = [group_ids] if group_ids.is_a? BSON::ObjectId
raise ArgumentError.new("You must post to someone.") if group_ids.nil? || group_ids.empty?

model_class = class_name.to_s.camelize.constantize
Expand Down
1 change: 1 addition & 0 deletions config/application.rb
Expand Up @@ -16,6 +16,7 @@ class Application < Rails::Application

# Add additional load paths for your own custom dirs
#config.autoload_paths += %W(#{config.root}/lib)
config.autoload_paths += %W(#{config.root}/lib)

# Only load the plugins named here, in the order given (default is alphabetical).
# :all can be used as a placeholder for all plugins not explicitly named
Expand Down
4 changes: 2 additions & 2 deletions lib/mongo_mapper/bson_id.rb
@@ -1,9 +1,9 @@
class String
def to_id
BSON::ObjectID self
BSON::ObjectId self
end
end
class BSON::ObjectID
class BSON::ObjectId
def to_id
self
end
Expand Down

0 comments on commit 804777f

Please sign in to comment.