Merge into master release 2

.gitignore

@@ -8,8 +8,8 @@
 /.bundle
 
 # Ignore the default SQLite database.
-/db/*.sqlite3
-/db/*.sqlite3-journal
+#/db/*.sqlite3
+#/db/*.sqlite3-journal
 
 # Ignore all logfiles and tempfiles.
 /log/*.log
@@ -31,3 +31,9 @@ coverage/.last_run.json
 coverage/.resultset.json
 
 coverage/index.html
+
+coverage/index.html
+
+coverage/.last_run.json
+
+coverage/.resultset.json

.travis.yml

@@ -0,0 +1,20 @@
+language: ruby
+
+before_script: gem install rspec rspec-rails simplecov
+
+script: bundle exec rspec spec
+
+rvm:
+  - 2.2.0 
+notifications:
+  email:
+    recipients:
+      - johnnys.ribeiro@gmail.com
+      - icyrvnd@gmail.com
+      - simiaosimis@gmail.com
+      - tmb0710@gmail.com
+      - fazzolino29@gmail.com
+branches:
+  only:
+
+  - dev

Gemfile

@@ -3,8 +3,6 @@ source 'https://rubygems.org'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '4.1.0'
-# Use sqlite3 as the database for Active Record
-gem 'sqlite3'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 4.0.3'
 # Use Uglifier as compressor for JavaScript assets
@@ -27,13 +25,18 @@ gem 'bootstrap-sass', '~> 3.2.0'
 gem 'autoprefixer-rails'
 gem 'bootstrap-datepicker-rails'
 
-gem 'json', '~> 1.8.2'
-
+gem 'json', '~> 1.8.3'
 
+gem 'mail_form'
+gem 'simple_form'
 
 group :development, :test do
 # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
 gem 'spring'
+
+# Use sqlite3 as the database for Active Record only in development mode
+gem 'sqlite3'
+
 end
 
 group :production do
@@ -45,10 +48,18 @@ group :test do
 	gem 'mini_backtrace', '0.1.3'
 	gem 'guard-minitest', '2.3.1'
 	gem 'rspec', '~> 3.0'
+  	gem 'rspec-rails'
+  	gem 'cucumber-rails', :require => false
+	gem 'selenium-webdriver'
+  	# database_cleaner is not required, but highly recommended
+  	gem 'database_cleaner'
 	gem 'simplecov', :require => false
 end
 
-
+group :production do
+	gem 'pg'
+	gem 'rails_12factor'
+end	
 
 
 

Gemfile.lock

@@ -37,8 +37,16 @@ GEM
     bootstrap-sass (3.2.0.2)
       sass (~> 3.2)
     builder (3.2.2)
+    capybara (2.4.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
     celluloid (0.16.0)
       timers (~> 4.0.0)
+    childprocess (0.5.6)
+      ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.0)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
@@ -47,12 +55,27 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.9.1.1)
+    cucumber (1.3.20)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    cucumber-rails (1.4.2)
+      capybara (>= 1.1.2, < 3)
+      cucumber (>= 1.3.8, < 2)
+      mime-types (>= 1.16, < 3)
+      nokogiri (~> 1.5)
+      rails (>= 3, < 5)
+    database_cleaner (1.4.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
     erubis (2.7.0)
     execjs (2.5.2)
     ffi (1.9.8)
     formatador (0.2.5)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
     guard (2.12.5)
       formatador (>= 0.2.4)
       listen (~> 2.7)
@@ -74,7 +97,7 @@ GEM
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.2)
+    json (1.8.3)
     libv8 (3.16.14.7)
     listen (2.10.0)
       celluloid (~> 0.16.0)
@@ -84,22 +107,30 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    mail_form (1.5.1)
+      actionmailer (>= 3.2, < 5)
+      activemodel (>= 3.2, < 5)
     method_source (0.8.2)
     mime-types (1.25.1)
     mini_backtrace (0.1.3)
       minitest (> 1.2.0)
       rails (>= 2.3.3)
+    mini_portile (0.6.2)
     minitest (5.6.1)
     minitest-reporters (1.0.5)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     multi_json (1.11.0)
+    multi_test (0.1.2)
     nenv (0.2.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     notiffany (0.0.6)
       nenv (~> 0.1)
       shellany (~> 0.0)
+    pg (0.18.1)
     polyglot (0.3.5)
     pry (0.10.1)
       coderay (~> 1.1.0)
@@ -118,6 +149,11 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.1.0)
       sprockets-rails (~> 2.0)
+    rails_12factor (0.0.3)
+      rails_serve_static_assets
+      rails_stdout_logging
+    rails_serve_static_assets (0.0.4)
+    rails_stdout_logging (0.0.3)
     railties (4.1.0)
       actionpack (= 4.1.0)
       activesupport (= 4.1.0)
@@ -141,8 +177,17 @@ GEM
     rspec-mocks (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
+    rspec-rails (3.2.1)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+      rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
     ruby-progressbar (1.7.5)
+    rubyzip (1.1.7)
     sass (3.2.19)
     sass-rails (4.0.5)
       railties (>= 4.0.0, < 5.0)
@@ -152,7 +197,15 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
+    selenium-webdriver (2.45.0)
+      childprocess (~> 0.5)
+      multi_json (~> 1.0)
+      rubyzip (~> 1.0)
+      websocket (~> 1.0)
     shellany (0.0.1)
+    simple_form (3.0.3)
+      actionpack (~> 4.0)
+      activemodel (~> 4.0)
     simplecov (0.10.0)
       docile (~> 1.1.0)
       json (~> 1.8)
@@ -188,6 +241,9 @@ GEM
     uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    websocket (1.2.2)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
@@ -197,16 +253,24 @@ DEPENDENCIES
   bootstrap-datepicker-rails
   bootstrap-sass (~> 3.2.0)
   coffee-rails (~> 4.0.0)
+  cucumber-rails
+  database_cleaner
   guard-minitest (= 2.3.1)
   jbuilder (~> 2.0)
   jquery-rails
-  json (~> 1.8.2)
+  json (~> 1.8.3)
+  mail_form
   mini_backtrace (= 0.1.3)
   minitest-reporters (= 1.0.5)
+  pg
   rails (= 4.1.0)
+  rails_12factor
   rspec (~> 3.0)
+  rspec-rails
   sass-rails (~> 4.0.3)
   sdoc (~> 0.4.0)
+  selenium-webdriver
+  simple_form
   simplecov
   spring
   sqlite3

app/Exceptions/error.rb

@@ -0,0 +1,28 @@
+module Error
+	class Standard < StandardError
+	end
+
+	class NoDataForSelectedYear < Standard
+		def message
+			"Sorry, but there is no record on DB for this year."
+		end
+	end
+
+	class NoDataForSelectedGrade < Standard
+		def message
+			"Sorry, but there is no record on DB for this grade."
+		end
+	end
+
+	class FinalYearException < Standard
+		def message
+			"Final year reached"
+		end
+	end
+
+	class NullElementAtDB < Standard
+		def message
+			"Sorry, but there's no record on DB for this paramers. Returning an object with 0 in all attributs."
+		end
+	end
+end

app/assets/javascripts/application.js

@@ -15,6 +15,8 @@
 //= require turbolinks
 //= require raphael
 //= require morris
+//= require spin
+//= require spin.min
 //= require bootstrap-sprockets
 //= require_tree .