Merge branch 'master' into wip/feat/0107_comments

Gemfile

@@ -99,6 +99,10 @@ group :test do
   gem 'coveralls', :require => false
   gem 'coveralls', :require => false
 end
 end
 
 
+group :development, :test do
+  gem 'rspec-rails'
+end
+
 # tree structure
 # tree structure
 gem 'ancestry'
 gem 'ancestry'
 
 

Gemfile.lock

@@ -48,13 +48,13 @@ GEM
     ast (1.1.0)
     ast (1.1.0)
     atomic (1.1.14)
     atomic (1.1.14)
     bcrypt-ruby (3.1.2)
     bcrypt-ruby (3.1.2)
-    better_errors (1.1.0)
+    better_errors (1.0.1)
       coderay (>= 1.0.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
       erubis (>= 2.6.6)
     binding_of_caller (0.7.2)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
       debug_inspector (>= 0.0.1)
     builder (3.1.4)
     builder (3.1.4)
-    capybara (2.1.0)
+    capybara (2.2.0)
       mime-types (>= 1.16)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack (>= 1.0.0)
@@ -62,7 +62,7 @@ GEM
       xpath (~> 2.0)
       xpath (~> 2.0)
     celluloid (0.15.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
       timers (~> 1.1.0)
-    cliver (0.2.2)
+    cliver (0.3.2)
     coderay (1.1.0)
     coderay (1.1.0)
     coffee-rails (4.0.1)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       coffee-script (>= 2.2.0)
@@ -112,10 +112,10 @@ GEM
       lumberjack (~> 1.0)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
       thor (>= 0.18.1)
-    guard-rspec (4.2.0)
-      guard (>= 2.1.1)
+    guard-rspec (4.2.3)
+      guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
       rspec (>= 2.14, < 4.0)
-    guard-rubocop (1.0.0)
+    guard-rubocop (1.0.1)
       guard (~> 2.0)
       guard (~> 2.0)
       rubocop (~> 0.10)
       rubocop (~> 0.10)
     guard-spring (0.0.4)
     guard-spring (0.0.4)
@@ -131,7 +131,7 @@ GEM
     i18n_generators (1.2.1)
     i18n_generators (1.2.1)
       mechanize
       mechanize
       rails (>= 3.0.0)
       rails (>= 3.0.0)
-    jbuilder (2.0.1)
+    jbuilder (1.5.3)
       activesupport (>= 3.0.0)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
       multi_json (>= 1.2.0)
     jquery-rails (3.0.4)
     jquery-rails (3.0.4)
@@ -140,7 +140,7 @@ GEM
     json (1.8.1)
     json (1.8.1)
     jwt (0.1.8)
     jwt (0.1.8)
       multi_json (>= 1.5)
       multi_json (>= 1.5)
-    launchy (2.4.0)
+    launchy (2.4.2)
       addressable (~> 2.3)
       addressable (~> 2.3)
     listen (2.4.0)
     listen (2.4.0)
       celluloid (>= 0.15.2)
       celluloid (>= 0.15.2)
@@ -188,12 +188,12 @@ GEM
       oauth2 (~> 0.8.0)
       oauth2 (~> 0.8.0)
       omniauth (~> 1.0)
       omniauth (~> 1.0)
     orm_adapter (0.5.0)
     orm_adapter (0.5.0)
-    parser (2.0.0)
+    parser (2.1.2)
       ast (~> 1.1)
       ast (~> 1.1)
       slop (~> 3.4, >= 3.4.5)
       slop (~> 3.4, >= 3.4.5)
-    poltergeist (1.4.1)
-      capybara (~> 2.1.0)
-      cliver (~> 0.2.1)
+    poltergeist (1.5.0)
+      capybara (~> 2.1)
+      cliver (~> 0.3.1)
       multi_json (~> 1.0)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
       websocket-driver (>= 0.2.0)
     polyglot (0.3.3)
     polyglot (0.3.3)
@@ -225,9 +225,9 @@ GEM
       activesupport (= 4.0.2)
       activesupport (= 4.0.2)
       rake (>= 0.8.7)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
       thor (>= 0.18.1, < 2.0)
-    rainbow (1.1.4)
-    rake (10.1.1)
-    rb-fsevent (0.9.3)
+    rainbow (1.99.1)
+    rake (10.1.0)
+    rb-fsevent (0.9.4)
     rb-inotify (0.9.3)
     rb-inotify (0.9.3)
       ffi (>= 0.5.0)
       ffi (>= 0.5.0)
     rdoc (3.12.2)
     rdoc (3.12.2)
@@ -249,11 +249,11 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rubocop (0.15.0)
-      parser (~> 2.0)
+    rubocop (0.16.0)
+      parser (~> 2.1)
       powerpack (~> 0.0.6)
       powerpack (~> 0.0.6)
       rainbow (>= 1.1.4)
       rainbow (>= 1.1.4)
-    sass (3.2.13)
+    sass (3.2.12)
     sass-rails (4.0.1)
     sass-rails (4.0.1)
       railties (>= 4.0.0, < 5.0)
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
       sass (>= 3.1.10)
@@ -294,7 +294,7 @@ GEM
       polyglot
       polyglot
       polyglot (>= 0.3.1)
       polyglot (>= 0.3.1)
     tzinfo (0.3.38)
     tzinfo (0.3.38)
-    uglifier (2.4.0)
+    uglifier (2.3.2)
       execjs (>= 0.3.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
       json (>= 1.8.0)
     unf (0.1.3)
     unf (0.1.3)
@@ -304,7 +304,7 @@ GEM
     warden (1.2.3)
     warden (1.2.3)
       rack (>= 1.0)
       rack (>= 1.0)
     webrobots (0.1.1)
     webrobots (0.1.1)
-    websocket-driver (0.3.0)
+    websocket-driver (0.3.2)
     xpath (2.0.0)
     xpath (2.0.0)
       nokogiri (~> 1.3)
       nokogiri (~> 1.3)
 
 

app/controllers/posts_controller.rb

@@ -97,7 +97,7 @@ class PostsController < ApplicationController
   def destroy
   def destroy
     @post.destroy
     @post.destroy
     respond_to do |format|
     respond_to do |format|
-      format.html { redirect_to posts_url, flash: { success: 'Post successfully deleted.' }}
+      format.html { redirect_to posts_url, flash: { success: 'Post successfully deleted.' } }
       format.json { head :no_content }
       format.json { head :no_content }
     end
     end
   end
   end

config/database.yml

@@ -7,11 +7,11 @@ development:
   adapter: mysql2
   adapter: mysql2
   encoding: utf8
   encoding: utf8
   reconnect: false
   reconnect: false
-  database: rendezvous_development
+  database: <%= ENV['DB_DEVELOPMENT_DATABASE'] %>
   pool: 5
   pool: 5
   username: <%= ENV['DB_DEVELOPMENT_USER'] %>
   username: <%= ENV['DB_DEVELOPMENT_USER'] %>
   password: <%= ENV['DB_DEVELOPMENT_PASS'] %>
   password: <%= ENV['DB_DEVELOPMENT_PASS'] %>
-  host: localhost
+  host: <%= ENV['DB_DEVELOPMENT_HOST'] %>
 
 
 # Warning: The database defined as "test" will be erased and
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # re-generated from your development database when you run "rake".
@@ -25,11 +25,11 @@ test:
   adapter: mysql2
   adapter: mysql2
   encoding: utf8
   encoding: utf8
   reconnect: false
   reconnect: false
-  database: rendezvous_test
+  database: <%= ENV['DB_TEST_DATABASE'] %>
   pool: 5
   pool: 5
   username: <%= ENV['DB_TEST_USER'] %>
   username: <%= ENV['DB_TEST_USER'] %>
   password: <%= ENV['DB_TEST_PASS'] %>
   password: <%= ENV['DB_TEST_PASS'] %>
-  host: localhost
+  host: <%= ENV['DB_TEST_HOST'] %>
 
 
 production:
 production:
   adapter: sqlite3
   adapter: sqlite3