Merge branch 'hotfix/0.1.5' into develop

CHANGELOG.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+0.1.5
+-----
+* Updated gems
+* Improved README
+* Improved spec_helper
+* Improved gemfile
+
 0.1.4
 -----
 * Added postgresql spec configuration

Gemfile

@@ -11,20 +11,20 @@ gem 'unicorn'
 gem 'simpleconfig'
 
 # API
-gem 'rabl'
+# gem 'rabl'
 
 # ORM
 gem 'pg'
 
 # Performance and Exception management
-gem 'airbrake'
-gem 'newrelic_rpm'
+# gem 'airbrake'
+# gem 'newrelic_rpm'
 
 # Security
-gem 'secure_headers'
+# gem 'secure_headers'
 
 # Miscellanea
-gem 'google-analytics-rails'
+# gem 'google-analytics-rails'
 gem 'haml'
 gem 'http_accept_language'
 gem 'jquery-rails'

Gemfile.lock

@@ -32,10 +32,6 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.33)
     addressable (2.3.4)
-    airbrake (3.1.11)
-      activesupport
-      builder
-      json
     arel (4.0.0)
     atomic (1.1.8)
     better_errors (0.8.0)
@@ -43,7 +39,6 @@ GEM
       erubis (>= 2.6.6)
     binding_of_caller (0.7.1)
       debug_inspector (>= 0.0.1)
-    brwsr (1.1.1)
     builder (3.1.4)
     bullet (4.6.0)
       uniform_notifier
@@ -84,7 +79,7 @@ GEM
     debugger-ruby_core_source (1.2.0)
     delorean (2.1.0)
       chronic
-    diff-lcs (1.2.3)
+    diff-lcs (1.2.4)
     email_spec (1.4.0)
       launchy (~> 2.1)
       mail (~> 2.2)
@@ -100,7 +95,6 @@ GEM
     faker (1.1.2)
       i18n (~> 0.5)
     ffi (1.7.0)
-    google-analytics-rails (0.0.4)
     haml (4.0.2)
       tilt
     haml_assets (0.2.1)
@@ -139,22 +133,19 @@ GEM
       rack-contrib
       railties
     method_source (0.8.1)
-    mime-types (1.22)
-    minitest (4.7.2)
+    mime-types (1.23)
+    minitest (4.7.3)
     mono_logger (1.0.1)
     multi_json (1.7.2)
-    newrelic_rpm (3.6.0.83)
     nokogiri (1.5.9)
     pg (0.15.1)
     polyglot (0.3.3)
-    pry (0.9.12)
+    pry (0.9.12.1)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
     pry-rails (0.2.2)
       pry (>= 0.9.10)
-    rabl (0.8.3)
-      activesupport (>= 2.3.14)
     rack (1.5.2)
     rack-contrib (1.1.0)
       rack (>= 0.9.1)
@@ -176,7 +167,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.17.0, < 2.0)
-    raindrops (0.10.0)
+    raindrops (0.11.0)
     rake (10.0.4)
     rdoc (3.12.2)
       json (~> 1.4)
@@ -214,8 +205,6 @@ GEM
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0.rc0)
       tilt (~> 1.3)
-    secure_headers (0.4.1)
-      brwsr (>= 1.1.1)
     selenium-webdriver (2.32.1)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
@@ -231,7 +220,7 @@ GEM
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
     slop (3.4.4)
-    sprockets (2.9.2)
+    sprockets (2.9.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -282,7 +271,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  airbrake
   better_errors
   binding_of_caller
   bullet
@@ -295,7 +283,6 @@ DEPENDENCIES
   email_spec
   factory_girl_rails
   faker
-  google-analytics-rails
   haml
   haml_assets
   handlebars_assets
@@ -306,19 +293,16 @@ DEPENDENCIES
   launchy
   less-rails
   meta_request
-  newrelic_rpm
   nokogiri
   pg
   pry
   pry-rails
-  rabl
   rails (= 4.0.0.beta1)
   resque
   rest-client
   rspec
   rspec-rails
   sass-rails (~> 4.0.0.beta1)
-  secure_headers
   selenium-webdriver
   simpleconfig
   simplecov

README.md

@@ -1,9 +1,14 @@
 Starter App [![Build Status](https://travis-ci.org/diowa/ruby2-rails4-bootstrap-heroku.png?branch=master)](https://travis-ci.org/diowa/ruby2-rails4-bootstrap-heroku) [![Dependency Status](https://gemnasium.com/diowa/ruby2-rails4-bootstrap-heroku.png)](https://gemnasium.com/diowa/ruby2-rails4-bootstrap-heroku) [![Code Climate](https://codeclimate.com/github/diowa/ruby2-rails4-bootstrap-heroku.png)](https://codeclimate.com/github/diowa/ruby2-rails4-bootstrap-heroku) [![Coverage Status](https://coveralls.io/repos/diowa/ruby2-rails4-bootstrap-heroku/badge.png?branch=master)](https://coveralls.io/r/diowa/ruby2-rails4-bootstrap-heroku)
 ===========
 
+This is a starter web application based on the following technology stack:
+
 * Ruby 2
 * Rails 4
 * PostgreSQL
-* Twitter Bootstrap
-* Heroku
 * RSpec
+* Twitter Bootstrap
+
+Starter App is deployable on Heroku. Demo: http://ruby2-rails4-bootstrap-heroku.herokuapp.com/
+
+```Gemfile``` also contains a set of useful gems for performance, security, api building...

VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

spec/spec_helper.rb

@@ -43,7 +43,7 @@ RSpec.configure do |config|
   config.order = 'random'
 
   config.include Delorean
-  config.include MailerMacros
+
   ActionMailer::Base.perform_deliveries = false
   ActionMailer::Base.raise_delivery_errors = false
   ActionMailer::Base.delivery_method = :test

spec/support/mailer_macros.rb

@@ -7,3 +7,7 @@ module MailerMacros
     ActionMailer::Base.deliveries = []
   end
 end
+
+RSpec.configure do |config|
+  config.include MailerMacros
+end