Skip to content

Commit

Permalink
updating deps
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan Fitzgerald committed Apr 8, 2011
1 parent e488149 commit ef36fd1
Show file tree
Hide file tree
Showing 5 changed files with 193 additions and 71 deletions.
2 changes: 1 addition & 1 deletion .rvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rvm ruby-1.9.2-rc2
rvm --create 1.9.2@pergola
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ gem 'thin' # or mongrel

# Component requirements
gem 'haml'
gem 'compass', '>= 0.10.2'
gem 'compass'
gem 'compass-susy-plugin', :require => "susy"
gem 'activerecord', '= 2.3.8', :require => "active_record"
gem 'activerecord', '>= 3.0.0', :require => "active_record"
gem 'sqlite3-ruby', :require => "sqlite3"

gem 'bson_ext'
Expand All @@ -23,4 +23,4 @@ group :test do
end

# Padrino
gem 'padrino', "0.9.14"
gem 'padrino', "0.9.23"
118 changes: 118 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
GEM
remote: http://rubygems.org/
specs:
activemodel (3.0.6)
activesupport (= 3.0.6)
builder (~> 2.1.2)
i18n (~> 0.5.0)
activerecord (3.0.6)
activemodel (= 3.0.6)
activesupport (= 3.0.6)
arel (~> 2.0.2)
tzinfo (~> 0.3.23)
activesupport (3.0.6)
arel (2.0.9)
bson (1.3.0)
bson_ext (1.3.0)
builder (2.1.2)
compass (0.10.6)
haml (>= 3.0.4)
compass-susy-plugin (0.8.1)
compass (>= 0.10.0)
daemons (1.1.2)
diff-lcs (1.1.2)
eventmachine (0.12.10)
git (1.2.5)
haml (3.0.25)
http_router (0.5.4)
rack (>= 1.0.0)
url_mount (~> 0.2.1)
i18n (0.5.0)
mail (2.2.15)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
mocha (0.9.12)
mongo (1.3.0)
bson (>= 1.3.0)
padrino (0.9.23)
padrino-admin (= 0.9.23)
padrino-cache (= 0.9.23)
padrino-core (= 0.9.23)
padrino-gen (= 0.9.23)
padrino-helpers (= 0.9.23)
padrino-mailer (= 0.9.23)
padrino-admin (0.9.23)
padrino-core (= 0.9.23)
padrino-helpers (= 0.9.23)
padrino-cache (0.9.23)
padrino-core (= 0.9.23)
padrino-core (0.9.23)
activesupport (>= 3.0.0)
http_router (~> 0.5.4)
sinatra (~> 1.2.0)
thor (>= 0.14.3)
tzinfo
padrino-gen (0.9.23)
bundler (>= 1.0.2)
git
padrino-core (= 0.9.23)
padrino-helpers (0.9.23)
i18n (>= 0.4.1)
padrino-core (= 0.9.23)
padrino-mailer (0.9.23)
mail (>= 2.2.0)
padrino-core (= 0.9.23)
polyglot (0.3.1)
rack (1.2.2)
rack-flash (0.1.1)
rack
rack-test (0.5.7)
rack (>= 1.0)
rake (0.8.7)
rspec (2.5.0)
rspec-core (~> 2.5.0)
rspec-expectations (~> 2.5.0)
rspec-mocks (~> 2.5.0)
rspec-core (2.5.1)
rspec-expectations (2.5.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.5.0)
sinatra (1.2.1)
rack (~> 1.1)
tilt (< 2.0, >= 1.2.2)
sqlite3 (1.3.3)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
thin (1.2.11)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.14.6)
tilt (1.2.2)
treetop (1.4.9)
polyglot (>= 0.3.1)
tzinfo (0.3.26)
url_mount (0.2.1)
rack

PLATFORMS
ruby

DEPENDENCIES
activerecord (>= 3.0.0)
bson_ext
compass
compass-susy-plugin
haml
mocha
mongo (>= 1.0.5)
padrino (= 0.9.23)
rack-flash
rack-test
rake
rspec
sqlite3-ruby
thin
4 changes: 2 additions & 2 deletions app/helpers/mongo_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ def render_breadcrumb
end

def determin_style_class_for(object)
if object.is_a? BSON::ObjectID
if object.is_a? BSON::ObjectId
return "string"
else
object.class.name.downcase
end
end

def pretty_print(object)
if object.is_a? String or object.is_a? BSON::ObjectID
if object.is_a? String or object.is_a? BSON::ObjectId
"\"#{object}\""
else
object.to_s
Expand Down
Loading

0 comments on commit ef36fd1

Please sign in to comment.