Permalink
Browse files

Merge pull request #17 from rposborne/master

Updating to Rails 3.2.3 / Full dependency Update
  • Loading branch information...
2 parents b16e4af + 80ba045 commit 25849980665992bd6072e512fa3bd3013535e695 @rapind committed May 6, 2012
View
16 Gemfile
@@ -1,10 +1,7 @@
source 'http://rubygems.org'
-gem 'rails', '3.1.3'
+gem 'rails', '3.2.3'
-# Temporarily include earlier rack to get rid of a ruby warning.
-# See: http://stackoverflow.com/questions/7624661/rake-already-initialized-constant-warning
-# gem 'rack', '1.3.3'
# Needed by heroku
gem 'thin'
@@ -27,7 +24,7 @@ gem 'inherited_resources', '~> 1.3.0'
gem 'acts_as_list', '~> 0.1.4'
# Forms - TODO: Switch to a stable gem once the wrapper stuff is released.
-gem 'simple_form', :git => 'git://github.com/plataformatec/simple_form.git', :ref => "da92c45953"
+gem 'simple_form', '~> 2.0.2'
# Image uploads
gem 'rack-cache', :require => 'rack/cache'
@@ -58,11 +55,10 @@ gem "enkoder_rails", git: "git://github.com/supapuerco/hivelogic-enkoder-rails.g
# Gems used only for assets and not required
# In production environments by default.
group :assets do
- gem 'sass-rails', '~> 3.1.0'
- gem 'coffee-rails', '~> 3.1.0'
- gem 'uglifier', '~> 1.2.1'
- #gem 'haml_coffee_assets', '~> 0.7.0'
- #gem 'execjs', '~> 1.3.0'
+ gem 'sass-rails', '~> 3.2.3'
+ gem 'coffee-rails', '~> 3.2.1'
+ gem 'uglifier', '>= 1.0.3'
+ gem 'execjs', '1.3.0' # Remove once execjs v1.3.2 or 1.3.1.1
end
group :development, :test do
View
@@ -6,15 +6,6 @@ GIT
annotate (2.4.0)
GIT
- remote: git://github.com/plataformatec/simple_form.git
- revision: da92c45953e907aed0fbb1e38477d845a7c3bc11
- ref: da92c45953
- specs:
- simple_form (2.0.0.rc)
- actionpack (~> 3.0)
- activemodel (~> 3.0)
-
-GIT
remote: git://github.com/supapuerco/hivelogic-enkoder-rails.git
revision: 91824571a69540c2386686edbdd852234f14412c
specs:
@@ -24,51 +15,50 @@ GIT
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.3)
- actionpack (= 3.1.3)
- mail (~> 2.3.0)
- actionpack (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
+ actionmailer (3.2.3)
+ actionpack (= 3.2.3)
+ mail (~> 2.4.4)
+ actionpack (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.5)
- rack-cache (~> 1.1)
- rack-mount (~> 0.8.2)
+ journey (~> 1.0.1)
+ rack (~> 1.4.0)
+ rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.3)
- activemodel (3.1.3)
- activesupport (= 3.1.3)
+ sprockets (~> 2.1.2)
+ activemodel (3.2.3)
+ activesupport (= 3.2.3)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
- arel (~> 2.2.1)
+ activerecord (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
+ arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
- activesupport (3.1.3)
+ activeresource (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
+ activesupport (3.2.3)
+ i18n (~> 0.6)
multi_json (~> 1.0)
- acts_as_list (0.1.4)
- addressable (2.2.7)
- ansi (1.3.0)
- arel (2.2.1)
+ acts_as_list (0.1.6)
+ addressable (2.2.8)
+ ansi (1.4.2)
+ arel (3.0.2)
bcrypt-ruby (3.0.1)
builder (3.0.0)
- coffee-rails (3.1.1)
+ 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)
+ coffee-script-source (1.3.1)
daemons (1.1.8)
dalli (1.1.5)
- database_cleaner (0.7.0)
- delayed_job (3.0.1)
+ database_cleaner (0.7.2)
+ delayed_job (3.0.2)
activesupport (~> 3.0)
delayed_job_active_record (0.3.2)
activerecord (> 2.1.0)
@@ -78,12 +68,12 @@ GEM
orm_adapter (~> 0.0.3)
warden (~> 1.1)
diff-lcs (1.1.3)
- dragonfly (0.9.11)
+ dragonfly (0.9.12)
rack
erubis (2.7.0)
eventmachine (0.12.10)
excon (0.6.6)
- execjs (1.2.12)
+ execjs (1.3.0)
multi_json (~> 1.0)
factory_girl (2.0.5)
factory_girl_rails (1.1.0)
@@ -107,76 +97,74 @@ GEM
haml (~> 3.0)
railties (~> 3.0)
has_scope (0.5.1)
- heroku (2.21.2)
+ heroku (2.25.0)
launchy (>= 0.3.2)
+ netrc (~> 0.7.1)
rest-client (~> 1.6.1)
rubyzip
- term-ansicolor (~> 1.0.5)
heroku_san (1.2.3)
heroku (>= 2)
rails (>= 2)
hike (1.2.1)
- hirefireapp (0.0.5)
+ hirefireapp (0.0.7)
i18n (0.6.0)
- inherited_resources (1.3.0)
+ inherited_resources (1.3.1)
has_scope (~> 0.5.0)
- responders (~> 0.6.0)
+ responders (~> 0.6)
+ journey (1.0.3)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
- json (1.6.5)
+ json (1.6.7)
kaminari (0.13.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
railties (>= 3.0.0)
- launchy (2.0.5)
+ launchy (2.1.0)
addressable (~> 2.2.6)
- mail (2.3.0)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.17.2)
+ mime-types (1.18)
multi_json (1.0.4)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-ssh (2.1.4)
- newrelic_rpm (3.3.2)
+ netrc (0.7.1)
+ newrelic_rpm (3.3.4.1)
nokogiri (1.5.2)
- orm_adapter (0.0.6)
- pg (0.12.0)
- rake-compiler (~> 0.7)
+ orm_adapter (0.0.7)
+ pg (0.13.2)
polyglot (0.3.3)
- rack (1.3.5)
- rack-cache (1.1)
+ rack (1.4.1)
+ rack-cache (1.2)
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.3)
- actionmailer (= 3.1.3)
- actionpack (= 3.1.3)
- activerecord (= 3.1.3)
- activeresource (= 3.1.3)
- activesupport (= 3.1.3)
+ rails (3.2.3)
+ actionmailer (= 3.2.3)
+ actionpack (= 3.2.3)
+ activerecord (= 3.2.3)
+ activeresource (= 3.2.3)
+ activesupport (= 3.2.3)
bundler (~> 1.0)
- railties (= 3.1.3)
- railties (3.1.3)
- actionpack (= 3.1.3)
- activesupport (= 3.1.3)
+ railties (= 3.2.3)
+ railties (3.2.3)
+ actionpack (= 3.2.3)
+ activesupport (= 3.2.3)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
- rake-compiler (0.7.9)
- rake
rdiscount (1.6.8)
- rdoc (3.11)
+ rdoc (3.12)
json (~> 1.4)
- responders (0.6.4)
+ responders (0.9.1)
+ railties (~> 3.1)
rest-client (1.6.7)
mime-types (>= 1.16)
rspec (2.7.0)
@@ -193,20 +181,21 @@ GEM
railties (~> 3.0)
rspec (~> 2.7.0)
ruby-hmac (0.4.0)
- rubyzip (0.9.6.1)
- sass (3.1.11)
- sass-rails (3.1.5)
- actionpack (~> 3.1.0)
- railties (~> 3.1.0)
- sass (~> 3.1.10)
- tilt (~> 1.3.2)
+ rubyzip (0.9.8)
+ sass (3.1.16)
+ sass-rails (3.2.5)
+ railties (~> 3.2.0)
+ sass (>= 3.1.10)
+ tilt (~> 1.3)
shoulda (2.11.3)
- sprockets (2.0.3)
+ simple_form (2.0.2)
+ actionpack (~> 3.0)
+ activemodel (~> 3.0)
+ sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.5)
- term-ansicolor (1.0.7)
+ sqlite3 (1.3.6)
thin (1.3.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
@@ -218,8 +207,8 @@ GEM
polyglot (>= 0.3.1)
turn (0.8.3)
ansi
- tzinfo (0.3.31)
- uglifier (1.2.3)
+ tzinfo (0.3.33)
+ uglifier (1.2.4)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
warden (1.1.1)
@@ -231,7 +220,7 @@ PLATFORMS
DEPENDENCIES
acts_as_list (~> 0.1.4)
annotate!
- coffee-rails (~> 3.1.0)
+ coffee-rails (~> 3.2.1)
daemons (~> 1.1.5)
dalli (~> 1.1.4)
database_cleaner (~> 0.7.0)
@@ -240,6 +229,7 @@ DEPENDENCIES
devise (~> 1.5.3)
dragonfly (~> 0.9.11)
enkoder_rails!
+ execjs (= 1.3.0)
factory_girl_rails (~> 1.1.0)
fog (~> 0.10.0)
haml (~> 3.1.4)
@@ -254,13 +244,13 @@ DEPENDENCIES
newrelic_rpm (~> 3.3.1)
pg
rack-cache
- rails (= 3.1.3)
+ rails (= 3.2.3)
rdiscount (~> 1.6.8)
rspec-rails (~> 2.7.0)
- sass-rails (~> 3.1.0)
+ sass-rails (~> 3.2.3)
shoulda (~> 2.11.3)
- simple_form!
+ simple_form (~> 2.0.2)
sqlite3 (~> 1.3.5)
thin
turn (~> 0.8.3)
- uglifier (~> 1.2.1)
+ uglifier (>= 1.0.3)
View
@@ -2,7 +2,7 @@
Grokphoto is a professional photographer's client gallery solution.
-This version is work in progress / port to rails 3.1.3
+This version is work in progress / port to rails 3.2.3
For the stable rails 2 version please see the version 2 branch:
[Version 2](https://github.com/rapind/grokphoto/tree/v2.0)
@@ -43,21 +43,16 @@ At this point you should have a working site with some basic seed data that you
## Initial Configuration
-1. Login to the administration area (/admin) using photographer@grokphoto.org / password
+1. Login to the administration area (/admin) using grok@grokphoto.org / password
2. Click on the Settings tab.
3. Enter your own information and update the settings.
## Heroku Deployment
heroku create --stack cedar
-
-Setup your own values in the next command, using your own email address, the name of your application for the session key and "rake secret" to generate a new secret key.
-
- heroku config:add SENDER_EMAIL=change_to_to_your_email@address.com SESSION_KEY=_change_me_to_your_app_name SECRET_KEY=result_of_rake_secret_goes_here
git push heroku master
- heroku run rake db:migrate
-
+
Before you seed the database you'll need to setup an amazon s3 account and bucket to have somewhere to store the files. Heroku has a temporary filesystem which is not an appropriate place to store images.
* Go to: https://console.aws.amazon.com/s3/home
@@ -83,12 +78,21 @@ You can check to make sure all of your heroku environment variables have been pr
heroko config
-Once done, seed the database and launch the app.
-
+Once done, migrate and seed the database and launch the app.
+
+ heroku run rake db:migrate
heroku run rake db:seed
+
+Make sure you also enable Memchacd on heroku with the below command.
+
+ heroku addons:add memcache:5mb
+
+Open up your shiny new grokphoto instance!
+
heroku open
+
## Features
* Personalize your site via the configuration / settings page.
@@ -9,6 +9,7 @@
= form.input :email, :required => true, :hint => 'Your business email address.'
= form.input :name, :hint => 'Your business name.'
= form.input :phone, :hint => 'Your business phone number if you want to show it.'
+ = form.input :tagline, :hint => 'A brief phrase to be displayed on the homepage.'
= form.input :description, :as => :text, :hint => 'A brief summary of the services you provide to be displayed on the home page below the slide show.'
= form.input :time_zone, :collection => ActiveSupport::TimeZone.zones_map.keys, :hint => 'Please select your local time zone.'
= form.input :portfolio_url, :hint => 'The URL to the portfolio site to use instead of the GrokPhoto provided portfolio.'
Oops, something went wrong.

0 comments on commit 2584998

Please sign in to comment.