Skip to content

Commit

Permalink
updated gems
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Dickey committed Feb 24, 2012
1 parent ce67017 commit e41f344
Show file tree
Hide file tree
Showing 15 changed files with 198 additions and 146 deletions.
48 changes: 48 additions & 0 deletions .rvmrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#!/usr/bin/env bash

# This is an RVM Project .rvmrc file, used to automatically load the ruby
# development environment upon cd'ing into the directory

# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
# Only full ruby name is supported here, for short names use:
# echo "rvm use 1.9.2" > .rvmrc
environment_id="ruby-1.9.2-p290@jeffdickey-blog"

# Uncomment the following lines if you want to verify rvm version per project
# rvmrc_rvm_version="1.10.2" # 1.10.1 seams as a safe start
# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
# echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
# return 1
# }

# First we attempt to load the desired environment directly from the environment
# file. This is very fast and efficient compared to running through the entire
# CLI and selector. If you want feedback on which environment was used then
# insert the word 'use' after --create as this triggers verbose mode.
if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
&& -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
then
\. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
[[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
\. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
else
# If the environment file has not yet been created, use the RVM CLI to select.
rvm --create "$environment_id" || {
echo "Failed to create RVM environment '${environment_id}'."
return 1
}
fi

# If you use bundler, this might be useful to you:
# if [[ -s Gemfile ]] && {
# ! builtin command -v bundle >/dev/null ||
# builtin command -v bundle | grep $rvm_path/bin/bundle >/dev/null
# }
# then
# printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
# gem install bundler
# fi
# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
# then
# bundle install | grep -vE '^Using|Your bundle is complete'
# fi
2 changes: 2 additions & 0 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ gem 'thin'
gem 'pg'
gem 'newrelic_rpm'
gem 'exception_notification'
gem 'heroku'

gem 'fog'
gem 'carrierwave'
Expand All @@ -20,6 +21,7 @@ gem 'htmlentities'

group :development do
gem 'sqlite3'
gem 'taps'
end

group :assets do
Expand Down
208 changes: 118 additions & 90 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,167 +1,193 @@
GEM
remote: http://rubygems.org/
specs:
actionmailer (3.1.2)
actionpack (= 3.1.2)
mail (~> 2.3.0)
actionpack (3.1.2)
activemodel (= 3.1.2)
activesupport (= 3.1.2)
actionmailer (3.2.1)
actionpack (= 3.2.1)
mail (~> 2.4.0)
actionpack (3.2.1)
activemodel (= 3.2.1)
activesupport (= 3.2.1)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
rack (~> 1.3.5)
journey (~> 1.0.1)
rack (~> 1.4.0)
rack-cache (~> 1.1)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.0)
activeadmin (0.3.4)
sprockets (~> 2.1.2)
activeadmin (0.4.2)
bourbon (>= 1.0.0)
devise (>= 1.1.2)
fastercsv
formtastic (< 2.0.0)
inherited_resources (< 1.3.0)
kaminari (>= 0.12.4)
formtastic (>= 2.0.0)
inherited_resources (> 0)
jquery-rails (>= 1.0.0)
kaminari (>= 0.13.0)
meta_search (>= 0.9.2)
rails (>= 3.0.0)
sass (>= 3.1.0)
activemodel (3.1.2)
activesupport (= 3.1.2)
activemodel (3.2.1)
activesupport (= 3.2.1)
builder (~> 3.0.0)
i18n (~> 0.6)
activerecord (3.1.2)
activemodel (= 3.1.2)
activesupport (= 3.1.2)
arel (~> 2.2.1)
activerecord (3.2.1)
activemodel (= 3.2.1)
activesupport (= 3.2.1)
arel (~> 3.0.0)
tzinfo (~> 0.3.29)
activeresource (3.1.2)
activemodel (= 3.1.2)
activesupport (= 3.1.2)
activesupport (3.1.2)
activeresource (3.2.1)
activemodel (= 3.2.1)
activesupport (= 3.2.1)
activesupport (3.2.1)
i18n (~> 0.6)
multi_json (~> 1.0)
acts-as-taggable-on (2.1.1)
rails
arel (2.2.1)
acts-as-taggable-on (2.2.2)
rails (~> 3.0)
arel (3.0.2)
bcrypt-ruby (3.0.1)
bourbon (1.4.0)
sass (>= 3.1)
builder (3.0.0)
carrierwave (0.5.8)
activesupport (~> 3.0)
coderay (1.0.4)
coffee-rails (3.1.1)
coderay (1.0.5)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.1.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.1.3)
daemons (1.1.4)
devise (1.5.0)
coffee-script-source (1.2.0)
configuration (1.3.1)
daemons (1.1.8)
devise (2.0.4)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
warden (~> 1.1)
railties (~> 3.1)
warden (~> 1.1.1)
erubis (2.7.0)
eventmachine (0.12.10)
exception_notification (2.5.2)
actionmailer (>= 3.0.4)
excon (0.7.6)
execjs (1.2.9)
excon (0.6.6)
execjs (1.3.0)
multi_json (~> 1.0)
fastercsv (1.5.4)
fog (1.1.1)
fog (0.9.0)
builder
excon (~> 0.7.4)
formatador (~> 0.2.0)
excon (~> 0.6.1)
formatador (>= 0.1.3)
json
mime-types
multi_json (~> 1.0.3)
net-scp (~> 1.0.4)
net-ssh (>= 2.1.3)
nokogiri (~> 1.5.0)
net-scp (>= 1.0.4)
net-ssh (>= 2.1.4)
nokogiri (>= 1.4.4)
ruby-hmac
formatador (0.2.1)
formtastic (1.2.4)
actionpack (>= 2.3.7)
activesupport (>= 2.3.7)
i18n (~> 0.4)
haml (3.1.3)
formtastic (2.0.2)
rails (~> 3.0)
haml (3.1.4)
has_scope (0.5.1)
heroku (2.20.1)
launchy (>= 0.3.2)
rest-client (~> 1.6.1)
rubyzip
term-ansicolor (~> 1.0.5)
hike (1.2.1)
htmlentities (4.3.0)
htmlentities (4.3.1)
httparty (0.8.1)
multi_json
multi_xml
i18n (0.6.0)
inherited_resources (1.2.2)
inherited_resources (1.3.0)
has_scope (~> 0.5.0)
responders (~> 0.6.0)
jquery-rails (1.0.18)
railties (~> 3.0)
journey (1.0.3)
jquery-rails (2.0.0)
railties (>= 3.2.0.beta, < 5.0)
thor (~> 0.14)
json (1.6.1)
kaminari (0.12.4)
rails (>= 3.0.0)
mail (2.3.0)
json (1.6.5)
kaminari (0.13.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
railties (>= 3.0.0)
launchy (0.3.7)
configuration (>= 0.0.5)
rake (>= 0.8.1)
mail (2.4.1)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
meta_search (1.1.1)
actionpack (~> 3.1.0)
activerecord (~> 3.1.0)
activesupport (~> 3.1.0)
meta_search (1.1.3)
actionpack (~> 3.1)
activerecord (~> 3.1)
activesupport (~> 3.1)
polyamorous (~> 0.5.0)
mime-types (1.17.2)
multi_json (1.0.3)
multi_json (1.1.0)
multi_xml (0.4.1)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-ssh (2.2.1)
newrelic_rpm (3.3.0)
net-ssh (2.3.0)
newrelic_rpm (3.3.2)
nokogiri (1.5.0)
orm_adapter (0.0.5)
pg (0.11.0)
orm_adapter (0.0.6)
pg (0.13.2)
polyamorous (0.5.0)
activerecord (~> 3.0)
polyglot (0.3.3)
rack (1.3.5)
rack (1.4.1)
rack-cache (1.1)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
rails (3.1.2)
actionmailer (= 3.1.2)
actionpack (= 3.1.2)
activerecord (= 3.1.2)
activeresource (= 3.1.2)
activesupport (= 3.1.2)
rails (3.2.1)
actionmailer (= 3.2.1)
actionpack (= 3.2.1)
activerecord (= 3.2.1)
activeresource (= 3.2.1)
activesupport (= 3.2.1)
bundler (~> 1.0)
railties (= 3.1.2)
railties (3.1.2)
actionpack (= 3.1.2)
activesupport (= 3.1.2)
railties (= 3.2.1)
railties (3.2.1)
actionpack (= 3.2.1)
activesupport (= 3.2.1)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
rdoc (3.11)
rdoc (3.12)
json (~> 1.4)
redcarpet (1.17.2)
responders (0.6.4)
responders (0.6.5)
rest-client (1.6.7)
mime-types (>= 1.16)
rmagick (2.13.1)
ruby-hmac (0.4.0)
sass (3.1.10)
sass-rails (3.1.5)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
sass (~> 3.1.10)
tilt (~> 1.3.2)
rubyzip (0.9.6.1)
sass (3.1.15)
sass-rails (3.2.4)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
sequel (3.20.0)
sinatra (1.0)
rack (>= 1.0)
sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.4)
sqlite3 (1.3.5)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
taps (0.3.23)
rack (>= 1.0.1)
rest-client (>= 1.4.0, < 1.7.0)
sequel (~> 3.20.0)
sinatra (~> 1.0.0)
sqlite3-ruby (~> 1.2)
term-ansicolor (1.0.7)
thin (1.3.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
Expand All @@ -172,10 +198,10 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.31)
uglifier (1.1.0)
uglifier (1.2.3)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
warden (1.1.0)
warden (1.1.1)
rack (>= 1.0)

PLATFORMS
Expand All @@ -190,6 +216,7 @@ DEPENDENCIES
exception_notification
fog
haml
heroku
htmlentities
httparty
jquery-rails
Expand All @@ -200,5 +227,6 @@ DEPENDENCIES
rmagick
sass-rails
sqlite3
taps
thin
uglifier
2 changes: 1 addition & 1 deletion app/admin/posts.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
image_tag resource.image if resource.image.url
end
row :body do
Redcarpet.new(resource.body).to_html.html_safe
markdown resource.body
end
end
active_admin_comments
Expand Down
6 changes: 0 additions & 6 deletions app/controllers/posts_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ def tag
render :index
end

def archive
@post_months = Post
.where('draft = ? and post_date <= ?', 'f', Time.zone.today)
.group_by { |p| p.post_date.beginning_of_month }
end

def show
@post = Post.find_by_slug(params[:id])
@post ||= Post.find(params[:id])
Expand Down
Loading

0 comments on commit e41f344

Please sign in to comment.