From c432145b3859b174387aa262641505d7eb4f530a Mon Sep 17 00:00:00 2001
From: gr455 <ruturaj.mohite.iiitb.org>
Date: Fri, 27 Mar 2020 20:54:36 +0530
Subject: [PATCH 01/43] Fix test fixtures

---
 test/fixtures/comments.yml | 3 +++
 test/fixtures/tags.yml     | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/fixtures/comments.yml b/test/fixtures/comments.yml
index 3671d2c8..eed6a518 100644
--- a/test/fixtures/comments.yml
+++ b/test/fixtures/comments.yml
@@ -5,6 +5,7 @@ one:
   email: MyString
   body: MyText
   wavelength: 1.5
+  user_id: 1
   x: 1
   y: 1
 
@@ -13,5 +14,7 @@ two:
   email: MyString
   body: MyText
   wavelength: 1.5
+  user_id: 2
   x: 1
   y: 1
+  
\ No newline at end of file
diff --git a/test/fixtures/tags.yml b/test/fixtures/tags.yml
index ae81940b..817114da 100644
--- a/test/fixtures/tags.yml
+++ b/test/fixtures/tags.yml
@@ -6,12 +6,12 @@
 #
 one: {
  name: 'cfl',
- spectrum_id: 1,
+ spectrum_id: 298486374,
  user_id: 2
 }
 
 two: {
  name: 'led',
- spectrum_id: 1,
+ spectrum_id: 298486374,
  user_id: 1
 }

From 9e81792b6f880c6b99c7cbd49e959bfafdb85a8a Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Mon, 30 Mar 2020 23:53:29 -0300
Subject: [PATCH 02/43] Upgrading ruby and rails version

---
 .travis.yml        |  4 ++--
 Dockerfile         | 25 +++++++------------------
 docker-compose.yml | 10 +++++++---
 script/start.sh    |  4 +++-
 4 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f3549300..ad2e389f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,10 @@ language: ruby
 dist: trusty
 
 rvm:
-  - 2.1.2
+  - 2.6.5
 
 node_js:
-  - "0.10.29"
+  - 13
 
 env:
   global:
diff --git a/Dockerfile b/Dockerfile
index 7764a274..b01acfee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,22 @@
 # Dockerfile # Spectral Workbench 
 # https://github.com/publiclab/spectral-workbench
 
-FROM ruby:2.1
+FROM ruby:2.6.5-stretch
 
 LABEL maintainer="Sebastian Silva <sebastian@fuentelibre.org>"
-LABEL description="This image deploys Spectral Worbench!"
+LABEL description="This image deploys Spectral Workbench!"
 
 # Set correct environment variables.
 ENV HOME /root
 
 # Install dependencies
-RUN sed -i '/.*jessie-updates.*/d' /etc/apt/sources.list
-RUN apt-get update -qq && \
+RUN sed -i '/.*jessie-updates.*/d' /etc/apt/sources.list && \
+    apt-get update -qq && \
     apt-get install -y --no-install-recommends \
                        imagemagick \
                        ruby-rmagick \
                        libmagickwand-dev \
                        libmagick++-dev \
-                       ruby-rmagick \
                        libfreeimage3 \
                        libfreeimage-dev \
                        gdal-bin \
@@ -26,24 +25,14 @@ RUN apt-get update -qq && \
                        libcurl4-openssl-dev \
                        libssl-dev \
                        zip \
-                       nodejs-legacy \
-                       npm \
                        netcat
 
-RUN npm install -g bower
-
-# Install bundle of gems
-WORKDIR /tmp
-ADD Gemfile /tmp/Gemfile
-ADD Gemfile.lock /tmp/Gemfile.lock
-RUN bundle install 
+RUN curl -sL https://deb.nodesource.com/setup_13.x | bash - && \
+    apt-get install -y nodejs npm && \
+    npm install -g bower
 
 # Add the Rails app
 WORKDIR /app
 COPY . /app
-ENV GIT_DIR=/app
-
-RUN apt-get remove -y zip \
-                      curl
 
 ENTRYPOINT ["sh", "script/start.sh"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 6c810779..2fd97e01 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,8 @@
-version: '3.3'
+version: '3.5'
 services:
 
   db:
+    container_name: spectral-db
     image: mysql:5.6
     environment:
       - MYSQL_ROOT_PASSWORD=root
@@ -11,14 +12,17 @@ services:
       - mysql-data:/var/lib/mysql
 
   web:
+    container_name: spectral-web
     build: .
     volumes:
       - .:/app
+      - bundle_cache:/usr/local/bundle
     ports:
-      - "127.0.0.1:5000:5000"
-      - "127.0.0.1:8888:8888"
+      - 5000:5000
+      - 8888:8888
     depends_on:
       - db
 
 volumes:
   mysql-data:
+  bundle_cache:
diff --git a/script/start.sh b/script/start.sh
index 4364cb91..372e4f57 100755
--- a/script/start.sh
+++ b/script/start.sh
@@ -2,6 +2,7 @@
 
 pidfile=/app/tmp/pids/server.pid
 
+bundle check || bundle install
 bower install --allow-root
 cp config/database.yml.docker.example config/database.yml
 cp config/config.yml.example config/config.yml
@@ -14,8 +15,9 @@ done
 
 echo "MySQL is up and running!"
 
-bundle exec rake db:setup
+bundle exec rake db:schema:load
 bundle exec rake db:migrate
+bundle exec rake db:seed
 
 if [ -f $pidfile ] ; then
 	>&2 echo 'Server PID file already exists. Removing it...';

From a22780b03aec407c81e76412dba8729fc0dc8720 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Mon, 30 Mar 2020 23:57:05 -0300
Subject: [PATCH 03/43] Using newer sintax and deprecating a couple modules

---
 app/controllers/device_controller.rb    |  3 ++-
 app/controllers/spectrums_controller.rb |  7 ++++---
 app/models/user.rb                      |  4 ++--
 app/views/spectrums/index.html.erb      |  2 +-
 config/database.yml.docker.example      |  4 ++--
 config/routes.rb                        | 12 ++++++------
 db/schema.rb.example                    |  4 ++--
 7 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/controllers/device_controller.rb b/app/controllers/device_controller.rb
index 90122413..7e5343d1 100644
--- a/app/controllers/device_controller.rb
+++ b/app/controllers/device_controller.rb
@@ -2,7 +2,8 @@ class DeviceController < ApplicationController
 
   def index
     if logged_in?
-      @devices = Device.find_all_by_user_id current_user.id, :order => "id DESC"
+      @devices = Device.where(user_id: current_user.id)  
+
     else
       flash[:error] = "You must be logged in to view that page."
       redirect_to "/login"
diff --git a/app/controllers/spectrums_controller.rb b/app/controllers/spectrums_controller.rb
index e9b3fa7b..cb187e5c 100755
--- a/app/controllers/spectrums_controller.rb
+++ b/app/controllers/spectrums_controller.rb
@@ -22,8 +22,8 @@ def index
                            .where('user_id != 0')
                            .paginate(:page => params[:page], :per_page => 24)
 
-      @sets = SpectraSet.find(:all,:limit => 4,:order => "created_at DESC")
-      @comments = Comment.all :limit => 12, :order => "id DESC"
+      @sets = SpectraSet.all
+      @comments = Comment.all
 
       respond_with(@spectrums) do |format|
         format.html {
@@ -451,7 +451,8 @@ def all
 
   def rss
     if params[:author]
-      @spectrums = Spectrum.find_all_by_author(params[:author],:order => "created_at DESC",:limit => 12).paginate(:page => params[:page])
+      Spectrum.where(author: params[:author])
+      @spectrums = Spectrum.where(author: params[:author]).paginate(:page => params[:page])
     else
       @spectrums = Spectrum.find(:all,:order => "created_at DESC",:limit => 12).paginate(:page => params[:page])
     end
diff --git a/app/models/user.rb b/app/models/user.rb
index 95051bdf..3f64e7b1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -48,12 +48,12 @@ def set_count
   end
 
   def received_comments
-    spectrums = Spectrum.find_all_by_user_id self.id, :limit => 20
+    spectrums = Spectrum.where(user_id: self.id)
     spectrum_ids = []
     spectrums.each do |spectrum|
       spectrum_ids << spectrum.id
     end
-    Comment.find_all_by_spectrum_id(spectrum_ids.uniq).where("user_id != ?",self.id).limit(10).order("id DESC")
+    Comment.where(spectrum_id: spectrum_ids.uniq).where("user_id != ?",self.id).limit(10).order("id DESC")
   end
 
   # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
diff --git a/app/views/spectrums/index.html.erb b/app/views/spectrums/index.html.erb
index 4c48cf8c..f6eefc79 100644
--- a/app/views/spectrums/index.html.erb
+++ b/app/views/spectrums/index.html.erb
@@ -23,7 +23,7 @@
 
     <h3>Recent authors</h3>
     <ul class="nav">
-    <% User.find_all_by_login(@spectrums.collect(&:author).uniq).each do |user| %>
+    <% User.where(login: @spectrums.collect(&:author).uniq).each do |user| %>
       <li><a href="<%= profile_path(user.login) %>"><i class="fa fa-user"></i> <%= user.login %></a></li>
     <% end %>
     </ul>
diff --git a/config/database.yml.docker.example b/config/database.yml.docker.example
index 936f5493..617db595 100644
--- a/config/database.yml.docker.example
+++ b/config/database.yml.docker.example
@@ -18,7 +18,7 @@ production:
 
 test:
   <<: *default
-  host: 127.0.0.1
+  host: db
   username: root 
-  password:
+  password: root
   database: swbench_test
diff --git a/config/routes.rb b/config/routes.rb
index 6468d987..5a3554f1 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -75,8 +75,8 @@
   get '/capture/recent_calibrations' => 'capture#recent_calibrations'
 
   # Registered user pages:
-  get '/profile', to: 'users#show', :as => 'profile'
-  get '/profile/:id', to: 'users#show', :as => 'profile'
+  get '/profile', to: 'users#show'
+  get '/profile/:id', to: 'users#show'
 
   get '/macro/edit/:id' => 'macros#edit'
   get '/macro/update/:id' => 'macros#update'
@@ -178,7 +178,7 @@
     fallback "/" => "/offline"
     fallback "/dashboard" => "/offline"
   end
-  match "/index.manifest" => offline
+  get "/index.manifest" => offline
 
   root to: 'spectrums#index'
 
@@ -187,8 +187,8 @@
   # match ':controller(/:action(/:id))(.:format)'
 
   # See how all your routes lay out with 'rake routes'
-  match ':controller/:action'
-  match ':controller/:action/:id'
-  match ':controller/:action/:id.:format'
+  get ':controller/:action'
+  get ':controller/:action/:id'
+  get ':controller/:action/:id.:format'
 
 end
diff --git a/db/schema.rb.example b/db/schema.rb.example
index f300643f..e2f22f72 100644
--- a/db/schema.rb.example
+++ b/db/schema.rb.example
@@ -682,7 +682,7 @@ ActiveRecord::Schema.define(:version => 20190513143943) do
     t.string   "author",     :default => "", :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.text     "notes",      :default => "", :null => false
+    t.text     "notes",      :null => false
     t.integer  "user_id",    :default => 0
   end
 
@@ -732,7 +732,7 @@ ActiveRecord::Schema.define(:version => 20190513143943) do
   add_index "spectrums", ["user_id"], :name => "index_spectrums_on_user_id"
 
   create_table "tags", :force => true do |t|
-    t.integer  "user_id",     :limit => 255
+    t.integer  "user_id"
     t.string   "name"
     t.integer  "spectrum_id"
     t.integer  "set_id"

From 74c1b31482915a473eb87f2195fe91eabda36e38 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Mon, 30 Mar 2020 23:58:15 -0300
Subject: [PATCH 04/43] Upgrading minimum gemset needed

---
 Gemfile      |  18 ++--
 Gemfile.lock | 226 +++++++++++++++++++++++++++++----------------------
 2 files changed, 137 insertions(+), 107 deletions(-)

diff --git a/Gemfile b/Gemfile
index c9864f97..e56f67f0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,14 +1,10 @@
 source 'https://rubygems.org'
 #source 'https://rails-assets.org'
 
-ruby '~>2.1.2'
-gem 'rails', '~>3.2'
+ruby '~>2.6.5'
+gem 'rails', '~>4.2.8'
 
 # Database handling
-group :sqlite do
-  gem 'sqlite3'
-end
-
 group :mysql do
   gem 'mysql2', '~> 0.3.10'
 end
@@ -22,6 +18,7 @@ group :assets do
   gem 'uglifier', '>= 1.0.3'
 end
 
+gem 'responders', '~> 2.0'
 gem 'rmagick'#, :require => "RMagick"
 gem 'mime-types'#, '1.18'
 gem 'jquery-rails'
@@ -29,15 +26,16 @@ gem 'passenger'
 gem 'recaptcha', '3.0.0', :require => "recaptcha/rails"
 gem 'cocaine', '~>0.5.3'
 gem 'redcarpet', '2.1.1'
-gem "skylight" # performance tracking via skylight.io
+gem 'skylight' # performance tracking via skylight.io
 
 gem 'rdiscount', '1.6.8'
-gem 'will_paginate', '3.0.7'
-gem 'will_paginate-bootstrap', '0.2.5'
+gem 'will_paginate', '~>3.3.0'
+gem 'will_paginate-bootstrap', '~>1.0.2'
 gem 'paperclip', '>= 4.1.1'
 
-gem 'tzinfo', '0.3.49'
+gem 'tzinfo', '~>1.1'
 
+gem 'protected_attributes', '~>1.1.4'
 gem 'ruby-openid'
 gem 'open_id_authentication'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 1de434f6..451e6d74 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,120 +1,148 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.22.2)
-      actionpack (= 3.2.22.2)
-      mail (~> 2.5.4)
-    actionpack (3.2.22.2)
-      activemodel (= 3.2.22.2)
-      activesupport (= 3.2.22.2)
-      builder (~> 3.0.0)
+    actionmailer (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.11.1)
+      actionview (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.11.1)
+      activesupport (= 4.2.11.1)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.22.2)
-      activesupport (= 3.2.22.2)
-      builder (~> 3.0.0)
-    activerecord (3.2.22.2)
-      activemodel (= 3.2.22.2)
-      activesupport (= 3.2.22.2)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.22.2)
-      activemodel (= 3.2.22.2)
-      activesupport (= 3.2.22.2)
-    activesupport (3.2.22.2)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.3)
-    builder (3.0.4)
-    climate_control (0.0.3)
-      activesupport (>= 3.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.11.1)
+      activesupport (= 4.2.11.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.11.1)
+      activesupport (= 4.2.11.1)
+      builder (~> 3.1)
+    activerecord (4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
+      arel (~> 6.0)
+    activesupport (4.2.11.1)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.4)
+    builder (3.2.4)
+    climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
     erubis (2.7.0)
     execjs (2.7.0)
-    hike (1.2.3)
-    i18n (0.7.0)
-    journey (1.0.4)
-    jquery-rails (3.1.4)
-      railties (>= 3.0, < 5.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    jquery-rails (4.3.5)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.3)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
-    mimemagic (0.3.0)
-    multi_json (1.12.1)
+    json (2.3.0)
+    loofah (2.4.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.1009)
+    mimemagic (0.3.4)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.0)
     mysql2 (0.3.21)
-    open_id_authentication (1.2.0)
+    nokogiri (1.10.9)
+      mini_portile2 (~> 2.4.0)
+    open_id_authentication (1.3.0)
       rack-openid (~> 1.3)
-    paperclip (4.3.6)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-      cocaine (~> 0.5.5)
+    paperclip (6.1.0)
+      activemodel (>= 4.2.0)
+      activesupport (>= 4.2.0)
       mime-types
-      mimemagic (= 0.3.0)
-    passenger (6.0.1)
+      mimemagic (~> 0.3.0)
+      terrapin (~> 0.6.0)
+    passenger (6.0.4)
       rack
       rake (>= 0.8.1)
-    polyglot (0.3.5)
-    rack (1.4.7)
-    rack-cache (1.6.1)
-      rack (>= 0.4)
+    protected_attributes (1.1.4)
+      activemodel (>= 4.0.1, < 5.0)
+    rack (1.6.13)
     rack-offline (0.6.4)
     rack-openid (1.4.2)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-ssl (1.3.4)
-      rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.22.2)
-      actionmailer (= 3.2.22.2)
-      actionpack (= 3.2.22.2)
-      activerecord (= 3.2.22.2)
-      activeresource (= 3.2.22.2)
-      activesupport (= 3.2.22.2)
-      bundler (~> 1.0)
-      railties (= 3.2.22.2)
-    railties (3.2.22.2)
-      actionpack (= 3.2.22.2)
-      activesupport (= 3.2.22.2)
-      rack-ssl (~> 1.3.2)
+    rails (4.2.11.1)
+      actionmailer (= 4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activerecord (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.11.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (12.3.2)
+      thor (>= 0.18.1, < 2.0)
+    rake (13.0.1)
     rdiscount (1.6.8)
-    rdoc (3.12.2)
-      json (~> 1.4)
     recaptcha (3.0.0)
       json
     redcarpet (2.1.1)
-    rmagick (2.15.4)
-    ruby-openid (2.7.0)
-    skylight (1.7.2)
-      activesupport (>= 3.0.0)
-    sprockets (2.2.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.11)
-    thor (0.19.1)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.49)
-    uglifier (3.0.0)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
+    rmagick (4.1.1)
+    ruby-openid (2.9.2)
+    skylight (4.2.3)
+      skylight-core (= 4.2.3)
+    skylight-core (4.2.3)
+      activesupport (>= 4.2.0)
+    sprockets (4.0.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    terrapin (0.6.0)
+      climate_control (>= 0.0.3, < 1.0)
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.6)
+      thread_safe (~> 0.1)
+    uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    will_paginate (3.0.7)
-    will_paginate-bootstrap (0.2.5)
+    will_paginate (3.3.0)
+    will_paginate-bootstrap (1.0.2)
       will_paginate (>= 3.0.3)
 
 PLATFORMS
@@ -128,19 +156,23 @@ DEPENDENCIES
   open_id_authentication
   paperclip (>= 4.1.1)
   passenger
+  protected_attributes (~> 1.1.4)
   rack-offline (>= 0.6.4)
-  rails (~> 3.2)
+  rails (~> 4.2.8)
   rdiscount (= 1.6.8)
   recaptcha (= 3.0.0)
   redcarpet (= 2.1.1)
+  responders (~> 2.0)
   rmagick
   ruby-openid
   skylight
-  sqlite3
-  tzinfo (= 0.3.49)
+  tzinfo (~> 1.1)
   uglifier (>= 1.0.3)
-  will_paginate (= 3.0.7)
-  will_paginate-bootstrap (= 0.2.5)
+  will_paginate (~> 3.3.0)
+  will_paginate-bootstrap (~> 1.0.2)
+
+RUBY VERSION
+   ruby 2.6.5p114
 
 BUNDLED WITH
-   1.11.2
+   1.17.2

From 6ef394779eea6ef577f50ea96398a65b15822945 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Mon, 30 Mar 2020 23:58:31 -0300
Subject: [PATCH 05/43] Running update task

---
 app/assets/config/manifest.js                 |  5 ++
 bin/bundle                                    |  3 +
 bin/rails                                     |  4 +
 bin/rake                                      |  4 +
 bin/setup                                     | 29 ++++++
 config/application.rb                         | 56 ++----------
 config/boot.rb                                |  5 +-
 config/environment.rb                         |  6 +-
 config/environments/development.rb            | 41 +++++----
 config/environments/production.rb             | 88 ++++++++++---------
 config/environments/test.rb                   | 33 ++++---
 config/initializers/assets.rb                 | 11 +++
 config/initializers/cookies_serializer.rb     |  3 +
 .../initializers/filter_parameter_logging.rb  |  4 +
 config/initializers/inflections.rb            | 11 +--
 config/initializers/mime_types.rb             |  1 -
 config/initializers/session_store.rb          |  7 +-
 config/initializers/wrap_parameters.rb        | 12 +--
 config/locales/en.yml                         | 22 ++++-
 config/secrets.yml                            | 22 +++++
 20 files changed, 215 insertions(+), 152 deletions(-)
 create mode 100644 app/assets/config/manifest.js
 create mode 100755 bin/bundle
 create mode 100755 bin/rails
 create mode 100755 bin/rake
 create mode 100755 bin/setup
 create mode 100644 config/initializers/assets.rb
 create mode 100644 config/initializers/cookies_serializer.rb
 create mode 100644 config/initializers/filter_parameter_logging.rb
 create mode 100644 config/secrets.yml

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
new file mode 100644
index 00000000..0023457d
--- /dev/null
+++ b/app/assets/config/manifest.js
@@ -0,0 +1,5 @@
+//= link application.css
+//= link application.js
+//= link capture.css
+//= link capture.js
+//= link analyze.js
\ No newline at end of file
diff --git a/bin/bundle b/bin/bundle
new file mode 100755
index 00000000..66e9889e
--- /dev/null
+++ b/bin/bundle
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/rails b/bin/rails
new file mode 100755
index 00000000..5191e692
--- /dev/null
+++ b/bin/rails
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'
diff --git a/bin/rake b/bin/rake
new file mode 100755
index 00000000..17240489
--- /dev/null
+++ b/bin/rake
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run
diff --git a/bin/setup b/bin/setup
new file mode 100755
index 00000000..acdb2c13
--- /dev/null
+++ b/bin/setup
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end
diff --git a/config/application.rb b/config/application.rb
index b06328d6..3247291a 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -2,12 +2,9 @@
 
 require 'rails/all'
 
-if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
-end
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
 
 module SpectralWorkbench
   class Application < Rails::Application
@@ -15,16 +12,6 @@ class Application < Rails::Application
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
@@ -32,41 +19,8 @@ class Application < Rails::Application
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-    config.i18n.enforce_available_locales = true
-
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Enable escaping HTML in JSON.
-    config.active_support.escape_html_entities_in_json = true
-
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.1'
-    config.assets.paths << Rails.root.join("public", "lib")
-    config.assets.precompile += ['capture.js','analyze.js']
-
-    # pluralization options, but unneccessary due to:
-    # http://dictionary.reference.com/browse/spectrum
-    #ActiveSupport::Inflector.inflections do |inflect|
-    #  inflect.irregular 'spectrum', 'spectra'
-    #end
 
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true
   end
 end
diff --git a/config/boot.rb b/config/boot.rb
index 4489e586..6b750f00 100755
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,6 +1,3 @@
-require 'rubygems'
-
-# Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' # Set up gems listed in the Gemfile.
diff --git a/config/environment.rb b/config/environment.rb
index e3afbdfd..ee8d90dc 100755
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,5 +1,5 @@
-# Load the rails application
+# Load the Rails application.
 require File.expand_path('../application', __FILE__)
 
-# Initialize the rails application
-SpectralWorkbench::Application.initialize!
+# Initialize the Rails application.
+Rails.application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 7a8898ac..b55e2144 100755
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,38 +1,41 @@
-SpectralWorkbench::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Don't care if the mailer can't send
+  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  # Print deprecation notices to the Rails logger
+  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
 
-  # Do not compress assets
-  config.assets.compress = false
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
 
-  # Expands the lines which load the assets
-  config.assets.debug = true
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
 
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 288f225f..5c1b32e4 100755
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,73 +1,79 @@
-SpectralWorkbench::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
-  # Code is not reloaded between requests
+  # Code is not reloaded between requests.
   config.cache_classes = true
 
-  # Full error reports are disabled and caching is turned on
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like
+  # NGINX, varnish or squid.
+  # config.action_dispatch.rack_cache = true
 
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
-  # Don't fallback to assets pipeline if a precompiled asset is missed
-  # Jeff: actually, do! This allows rack-offline 
-  # to run, and we offline-cache them anyways:
-  config.assets.compile = true
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
 
-  # Generate digests for assets URLs
-  config.assets.digest = true
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
+  config.assets.compile = false
 
-  # this shouldn't be necessary but may be for web fonts:
-  #config.assets.precompile << /\.(?:svg|eot|woff|ttf)\z/
-  config.assets.precompile += ['capture.js','analyze.js']
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
 
-  # Defaults to nil and saved in location specified by config.assets.prefix
-  # config.assets.manifest = YOUR_PATH
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
-  # Specifies the header that your server uses for sending files
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
+  config.log_level = :debug
 
-  # Prepend all log lines with the following tags
+  # Prepend all log lines with the following tags.
   # config.log_tags = [ :subdomain, :uuid ]
 
-  # Use a different logger for distributed setups
+  # Use a different logger for distributed setups.
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
-  # Use a different cache store in production
+  # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server
-  # config.action_controller.asset_host = "http://assets.example.com"
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
 
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  # config.assets.precompile += %w( search.js )
-
-  # Disable delivery errors, bad email addresses will be ignored
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
-  # Enable threaded mode
-  # config.threadsafe!
-
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
+  # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
-  # Send deprecation notices to registered listeners
+  # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 7c94e13e..1c19f08b 100755
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,5 +1,5 @@
-SpectralWorkbench::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
@@ -7,31 +7,36 @@
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
-  # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
+  # Configure static file server for tests with Cache-Control for performance.
+  config.serve_static_files   = true
+  config.static_cache_control = 'public, max-age=3600'
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Raise exceptions instead of rendering exception templates
+  # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
 
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  # Randomize the order test cases are executed.
+  config.active_support.test_order = :random
 
-  # Print deprecation notices to the stderr
+  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 end
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
new file mode 100644
index 00000000..01ef3e66
--- /dev/null
+++ b/config/initializers/assets.rb
@@ -0,0 +1,11 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Add additional assets to the asset load path
+# Rails.application.config.assets.paths << Emoji.images_path
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+# Rails.application.config.assets.precompile += %w( search.js )
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
new file mode 100644
index 00000000..ac5f8b66
--- /dev/null
+++ b/config/initializers/cookies_serializer.rb
@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Rails.application.config.action_dispatch.cookies_serializer = :marshal
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
new file mode 100644
index 00000000..4a994e1e
--- /dev/null
+++ b/config/initializers/filter_parameter_logging.rb
@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Configure sensitive parameters which will be filtered from the log file.
+Rails.application.config.filter_parameters += [:password]
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index 5d8d9be2..ac033bf9 100755
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -1,15 +1,16 @@
 # Be sure to restart your server when you modify this file.
 
-# Add new inflection rules using the following format
-# (all these examples are active by default):
-# ActiveSupport::Inflector.inflections do |inflect|
+# Add new inflection rules using the following format. Inflections
+# are locale specific, and you may define rules for as many different
+# locales as you wish. All of these examples are active by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
 #   inflect.plural /^(ox)$/i, '\1en'
 #   inflect.singular /^(ox)en/i, '\1'
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
 # end
-#
+
 # These inflection rules are supported but not enabled by default:
-# ActiveSupport::Inflector.inflections do |inflect|
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
 #   inflect.acronym 'RESTful'
 # end
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index 72aca7e4..dc189968 100755
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -2,4 +2,3 @@
 
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register_alias "text/html", :iphone
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index d07b7222..42e13de2 100755
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,8 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-SpectralWorkbench::Application.config.session_store :cookie_store, :key => '_spectral-workbench_session'
-
-# Use the database for sessions instead of the cookie-based default,
-# which shouldn't be used to store highly confidential information
-# (create the session table with "rails generate session_migration")
-# SpectralWorkbench::Application.config.session_store :active_record_store
+Rails.application.config.session_store :cookie_store, key: '_spectral_workbench_session'
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
index da4fb076..33725e95 100644
--- a/config/initializers/wrap_parameters.rb
+++ b/config/initializers/wrap_parameters.rb
@@ -1,14 +1,14 @@
 # Be sure to restart your server when you modify this file.
-#
+
 # This file contains settings for ActionController::ParamsWrapper which
 # is enabled by default.
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters :format => [:json]
+  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
 end
 
-# Disable root element in JSON by default.
-ActiveSupport.on_load(:active_record) do
-  self.include_root_in_json = false
-end
+# To enable root element in JSON for ActiveRecord objects.
+# ActiveSupport.on_load(:active_record) do
+#  self.include_root_in_json = true
+# end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 179c14ca..06539571 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,5 +1,23 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+# Files in the config/locales directory are used for internationalization
+# and are automatically loaded by Rails. If you want to use locales other
+# than English, add the necessary files in this directory.
+#
+# To use the locales, use `I18n.t`:
+#
+#     I18n.t 'hello'
+#
+# In views, this is aliased to just `t`:
+#
+#     <%= t('hello') %>
+#
+# To use a different locale, set it with `I18n.locale`:
+#
+#     I18n.locale = :es
+#
+# This would use the information in config/locales/es.yml.
+#
+# To learn more, please read the Rails Internationalization guide
+# available at http://guides.rubyonrails.org/i18n.html.
 
 en:
   hello: "Hello world"
diff --git a/config/secrets.yml b/config/secrets.yml
new file mode 100644
index 00000000..aefbe5ae
--- /dev/null
+++ b/config/secrets.yml
@@ -0,0 +1,22 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure the secrets in this file are kept private
+# if you're sharing your code publicly.
+
+development:
+  secret_key_base: 27ffa7127c80a0ef918583dd20d493a8eb4db77855779f9007824f219b879438ba8929051b8344cd06058a45b8f5017623b0f686bac3801e112f5c607fea486c
+
+test:
+  secret_key_base: 4120ab7cc8ecbc840a2b0d99a1d51737ca37bcb98fd434ade5a56fd53eed80eab2d851272756b10ef90ea6c48994ed006be00697955211d4862d86a30fa5995d
+
+# Do not keep production secrets in the repository,
+# instead read values from the environment.
+production:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>

From 59092d9ccda8581efe4094174d54c55d1821f0e9 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Wed, 1 Apr 2020 21:58:46 -0300
Subject: [PATCH 06/43] Installing Bower properly on Travis

---
 .travis.yml                                   |   16 +-
 config/application.rb                         |   48 +-
 config/boot.rb                                |    2 +-
 config/database.yml.example                   |    4 +-
 config/environments/development.rb            |   16 +
 config/environments/production.rb             |   78 +-
 config/environments/test.rb                   |   11 +
 config/initializers/assets.rb                 |   18 +-
 .../20120202021608_create_spectra_sets.rb     |    2 +
 db/migrate/20120202025658_add_set_comments.rb |    3 +-
 db/migrate/20120629103716_create_devices.rb   |    3 +-
 ...20120918115739_add_spectrums_sample_row.rb |    2 +-
 db/migrate/20130205164725_create_likes.rb     |    2 +-
 .../20130214153953_add_user_email_prefs.rb    |    2 +-
 db/migrate/20130302223722_add_device_key.rb   |    2 +-
 db/migrate/20130304165044_create_macros.rb    |    4 +-
 db/migrate/20130308184651_add_video_row.rb    |    2 +-
 db/migrate/20130820000000_closest_match.rb    | 1196 ++++++++---------
 .../20130921134441_add_spectrum_reversal.rb   |    2 +-
 .../20150624185446_add_anonymous_user.rb      |    6 +-
 .../20150715184613_add_spectrum_calibrated.rb |    2 +-
 ...224222_create_sets_spectrums_join_table.rb |    2 +-
 ...721195514_change_comment_author_to_user.rb |    1 -
 test/fixtures/users.yml                       |   10 +-
 test/performance/browsing_test.rb             |   12 -
 25 files changed, 754 insertions(+), 692 deletions(-)
 delete mode 100755 test/performance/browsing_test.rb

diff --git a/.travis.yml b/.travis.yml
index ad2e389f..4dc71804 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,22 +21,24 @@ services:
   - docker
   - mysql
 
-install:
+before_install:
   - cp config/database.yml.example config/database.yml
   - cp config/config.yml.example config/config.yml
   - cp db/schema.rb.example db/schema.rb
-  - bundle config set path './vendor/.bundle/' && bundle install
+  - bundle config set path 'vendor/.bundle/'
+
+install:
+  - bundle install
+  - npm install -g bower
+  - bower install --allow-root
   - if [ $RAILS_ENV == 'production' ]; then
       mysql -e "CREATE DATABASE swbench;";
       mysql -e "CREATE USER 'swbench'@'%' IDENTIFIED BY 'swbench';";
       mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'swbench'@'%';";
       bundle exec rake db:schema:load;
-      npm install -g bower;
-      bower install --allow-root;
     else
-      bower install --allow-root;
       bundle exec rake db:create;
-      bundle exec rake db:schema:load || bundle exec rake db:migrate;
+      bundle exec rake db:migrate;
     fi
 
 jobs:
@@ -49,8 +51,6 @@ jobs:
       script: rake test:functionals
     - name: "Integration Tests"
       script: rake test:integration
-    - name: "Performance Tests"
-      script: ruby -I test test/performance/*.rb
     - name: "Docker Builds"
       script: docker build -t swbench .
     - name: "Asset Precompilation"
diff --git a/config/application.rb b/config/application.rb
index 3247291a..052513a1 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -6,12 +6,29 @@
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 
+if defined?(Bundler)
+  # If you precompile assets before deploying to production, use this line
+  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  # If you want your assets lazily compiled in production, use this line
+  # Bundler.require(:default, :assets, Rails.env)
+end
+
 module SpectralWorkbench
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
@@ -19,8 +36,37 @@ class Application < Rails::Application
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
+    config.i18n.enforce_available_locales = true
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+
+    # Enable escaping HTML in JSON.
+    config.active_support.escape_html_entities_in_json = true
+
+    # Use SQL instead of Active Record's schema dumper when creating the database.
+    # This is necessary if your schema can't be completely dumped by the schema dumper,
+    # like if you have constraints or database-specific column types
+    # config.active_record.schema_format = :sql
+
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    config.active_record.whitelist_attributes = true
+
+    # Enable the asset pipeline
+    config.assets.enabled = true
+    config.assets.paths << Rails.root.join("public/lib")
 
-    # Do not swallow errors in after_commit/after_rollback callbacks.
+    # pluralization options, but unneccessary due to:
+    # http://dictionary.reference.com/browse/spectrum
+    #ActiveSupport::Inflector.inflections do |inflect|
+    #  inflect.irregular 'spectrum', 'spectra'
+    #end
     config.active_record.raise_in_transactional_callbacks = true
   end
 end
diff --git a/config/boot.rb b/config/boot.rb
index 6b750f00..a7342939 100755
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,3 +1,3 @@
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' # Set up gems listed in the Gemfile.
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
diff --git a/config/database.yml.example b/config/database.yml.example
index e90a17ce..e075ab36 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -1,6 +1,6 @@
 default: &default
   encoding: utf8
-  adapter: sqlite3
+  adapter: mysql2
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   
 development:
@@ -9,7 +9,7 @@ development:
   database: swbench_development
 
 production:
-  adapter: sqlite3
+  adapter: mysql2
   database: production.db
 
 test:
diff --git a/config/environments/development.rb b/config/environments/development.rb
index b55e2144..82292fdb 100755
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -6,6 +6,9 @@
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
   # Do not eager load code on boot.
   config.eager_load = false
 
@@ -19,6 +22,9 @@
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
+  # Only use best-standards-support built into browsers
+  config.action_dispatch.best_standards_support = :builtin
+
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
@@ -36,6 +42,16 @@
   # Raises helpful error messages.
   config.assets.raise_runtime_errors = true
 
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  config.active_record.auto_explain_threshold_in_seconds = 0.5
+
+  # Do not compress assets
+  config.assets.compress = false
+
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 5c1b32e4..60321d51 100755
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,76 +1,72 @@
 Rails.application.configure do
-  # Settings specified here will take precedence over those in config/application.rb.
+# Settings specified here will take precedence over those in config/application.rb
 
-  # Code is not reloaded between requests.
+  # Code is not reloaded between requests
   config.cache_classes = true
 
-  # Eager load code on boot. This eager loads most of Rails and
-  # your application in memory, allowing both threaded web servers
-  # and those relying on copy on write to perform better.
-  # Rake tasks automatically ignore this option for performance.
-  config.eager_load = true
-
-  # Full error reports are disabled and caching is turned on.
+  # Full error reports are disabled and caching is turned on
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Enable Rack::Cache to put a simple HTTP cache in front of your application
-  # Add `rack-cache` to your Gemfile before enabling this.
-  # For large-scale production use, consider using a caching reverse proxy like
-  # NGINX, varnish or squid.
-  # config.action_dispatch.rack_cache = true
-
-  # Disable serving static files from the `/public` folder by default since
-  # Apache or NGINX already handles this.
-  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
+  # Disable Rails's static asset server (Apache or nginx will already do this)
+  config.serve_static_files = false
 
-  # Compress JavaScripts and CSS.
-  config.assets.js_compressor = :uglifier
-  # config.assets.css_compressor = :sass
+  # Compress JavaScripts and CSS
+  config.assets.compress = true
 
-  # Do not fallback to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = false
+  # Don't fallback to assets pipeline if a precompiled asset is missed
+  # Jeff: actually, do! This allows rack-offline 
+  # to run, and we offline-cache them anyways:
+  config.assets.compile = true
 
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
-  # yet still be able to expire them through the digest params.
+  # Generate digests for assets URLs
   config.assets.digest = true
 
-  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
+  # Defaults to nil and saved in location specified by config.assets.prefix
+  # config.assets.manifest = YOUR_PATH
 
-  # Specifies the header that your server uses for sending files.
-  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
+  # Specifies the header that your server uses for sending files
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # Use the lowest log level to ensure availability of diagnostic information
-  # when problems arise.
-  config.log_level = :debug
+  # See everything in the log (default is :info)
+  # config.log_level = :debug
 
-  # Prepend all log lines with the following tags.
+  # Prepend all log lines with the following tags
   # config.log_tags = [ :subdomain, :uuid ]
 
-  # Use a different logger for distributed setups.
+  # Use a different logger for distributed setups
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
-  # Use a different cache store in production.
+  # Use a different cache store in production
   # config.cache_store = :mem_cache_store
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = 'http://assets.example.com'
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  # config.assets.precompile += %w( search.js )
 
-  # Ignore bad email addresses and do not raise email delivery errors.
-  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
+  # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false
 
+  # Enable threaded mode
+  # config.threadsafe!
+
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation cannot be found).
+  # the I18n.default_locale when a translation can not be found)
   config.i18n.fallbacks = true
 
-  # Send deprecation notices to registered listeners.
+  # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
 
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  # config.active_record.auto_explain_threshold_in_seconds = 0.5
+
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
 
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 1c19f08b..8195c664 100755
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -7,6 +7,17 @@
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
+  # Configure static asset server for tests with Cache-Control for performance
+  config.serve_static_files = true
+  config.static_cache_control = "public, max-age=3600"
+
+  # Log error messages when you accidentally call methods on nil
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
   # Do not eager load code on boot. This avoids loading your whole application
   # just for the purpose of running a single test. If you are using a tool that
   # preloads Rails for running tests, you may have to set it to true.
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 01ef3e66..d6d7005d 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -1,11 +1,17 @@
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
+Rails.application do |config|
+    config.assets.version = '1.1'
 
-# Add additional assets to the asset load path
-# Rails.application.config.assets.paths << Emoji.images_path
+    # Add additional assets to the asset load path
+    # Rails.application.config.assets.paths << Emoji.images_path
+        # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.1'
+    config.assets.paths << Rails.root.join("public/lib")
+    config.assets.precompile += ['capture.js','analyze.js']
 
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-# Rails.application.config.assets.precompile += %w( search.js )
+    # Precompile additional assets.
+    # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+    # Rails.application.config.assets.precompile += %w( search.js )
+end
\ No newline at end of file
diff --git a/db/migrate/20120202021608_create_spectra_sets.rb b/db/migrate/20120202021608_create_spectra_sets.rb
index ae2681ab..7fa06d36 100644
--- a/db/migrate/20120202021608_create_spectra_sets.rb
+++ b/db/migrate/20120202021608_create_spectra_sets.rb
@@ -4,6 +4,8 @@ def self.up
       t.string :title, :default => "", :null => false
       t.string :author, :default => "", :null => false
       t.string :spectra_string, :default => "", :null => false
+      t.string :notes, default: '', null: false
+
       t.timestamps
     end
   end
diff --git a/db/migrate/20120202025658_add_set_comments.rb b/db/migrate/20120202025658_add_set_comments.rb
index 2b6505f3..c37b52f6 100644
--- a/db/migrate/20120202025658_add_set_comments.rb
+++ b/db/migrate/20120202025658_add_set_comments.rb
@@ -1,7 +1,6 @@
 class AddSetComments < ActiveRecord::Migration
   def self.up
-      add_column :spectrums, :client_code, :string, :default => '', :null => false
-      add_column :spectra_sets, :notes, :text, :default => "", :null => false 
+      add_column :spectrums, :client_code, :string, default: '', null: false
       add_column :comments, :spectra_set_id, :integer, :default => 0, :null => false 
   end
 
diff --git a/db/migrate/20120629103716_create_devices.rb b/db/migrate/20120629103716_create_devices.rb
index 58d02a91..a4512ed1 100644
--- a/db/migrate/20120629103716_create_devices.rb
+++ b/db/migrate/20120629103716_create_devices.rb
@@ -3,7 +3,7 @@ def self.up
 
     create_table "devices" do |t|
       t.string   :name
-      t.string   :description,              :limit => 100, :default => '', :null => false
+      t.string   :description,              default: '', limit: 100, null: false
       t.integer  :height
       t.integer  :width
       t.integer  :calibration_id
@@ -13,7 +13,6 @@ def self.up
 
       t.timestamps
     end
-    add_index :users, :login, :unique => true
   end
 
   def self.down
diff --git a/db/migrate/20120918115739_add_spectrums_sample_row.rb b/db/migrate/20120918115739_add_spectrums_sample_row.rb
index 95c982da..74590f58 100644
--- a/db/migrate/20120918115739_add_spectrums_sample_row.rb
+++ b/db/migrate/20120918115739_add_spectrums_sample_row.rb
@@ -1,6 +1,6 @@
 class AddSpectrumsSampleRow < ActiveRecord::Migration
   def self.up
-      add_column :spectrums, :sample_row, :integer, :default => 1, :null => false
+      add_column :spectrums, :sample_row, :integer, null: false, default: 1
   end
 
   def self.down
diff --git a/db/migrate/20130205164725_create_likes.rb b/db/migrate/20130205164725_create_likes.rb
index 4fb02bda..e9434457 100644
--- a/db/migrate/20130205164725_create_likes.rb
+++ b/db/migrate/20130205164725_create_likes.rb
@@ -2,7 +2,7 @@ class CreateLikes < ActiveRecord::Migration
   def self.up
     create_table "likes" do |t|
       t.integer  :spectrum_id
-      t.string   :like_type,              :default => 'like', :null => false
+      t.string   :like_type, null: false, default: "like"
       t.integer  :user_id
 
       t.timestamps
diff --git a/db/migrate/20130214153953_add_user_email_prefs.rb b/db/migrate/20130214153953_add_user_email_prefs.rb
index 4cc43db9..2ff14a8e 100644
--- a/db/migrate/20130214153953_add_user_email_prefs.rb
+++ b/db/migrate/20130214153953_add_user_email_prefs.rb
@@ -1,6 +1,6 @@
 class AddUserEmailPrefs < ActiveRecord::Migration
   def self.up
-      add_column :users, :email_preferences, :string, :default => "1", :null => false
+      add_column :users, :email_preferences, :string, null: false, default: 1
   end
 
   def self.down
diff --git a/db/migrate/20130302223722_add_device_key.rb b/db/migrate/20130302223722_add_device_key.rb
index 664b06e4..6db29a34 100644
--- a/db/migrate/20130302223722_add_device_key.rb
+++ b/db/migrate/20130302223722_add_device_key.rb
@@ -1,6 +1,6 @@
 class AddDeviceKey < ActiveRecord::Migration
   def self.up
-      add_column :devices, :key, :string, :default => "", :null => false
+      add_column :devices, :key, :string, null: false, default: ''
   end
 
   def self.down
diff --git a/db/migrate/20130304165044_create_macros.rb b/db/migrate/20130304165044_create_macros.rb
index 71e09b10..1f6b0525 100644
--- a/db/migrate/20130304165044_create_macros.rb
+++ b/db/migrate/20130304165044_create_macros.rb
@@ -2,12 +2,12 @@ class CreateMacros < ActiveRecord::Migration
   def self.up
     create_table "macros" do |t|
       t.integer   :user_id
-      t.string    :macro_type,              :default => 'analyze', :null => false
+      t.string    :macro_type,              default: 'analyze', null: false
       t.string    :title
       t.string    :url # to gist, hopefully
       t.text      :description
       t.text      :code
-      t.string    :published, :default => "published" # "published","spam","flagged"
+      t.string    :published,               default: 'published'
 
       t.timestamps
     end
diff --git a/db/migrate/20130308184651_add_video_row.rb b/db/migrate/20130308184651_add_video_row.rb
index ffc4af32..4befdb2b 100644
--- a/db/migrate/20130308184651_add_video_row.rb
+++ b/db/migrate/20130308184651_add_video_row.rb
@@ -1,6 +1,6 @@
 class AddVideoRow < ActiveRecord::Migration
   def self.up
-    add_column :spectrums, :video_row, :integer, :default => 0
+    add_column :spectrums, :video_row, :integer, default: 0
   end
 
   def self.down
diff --git a/db/migrate/20130820000000_closest_match.rb b/db/migrate/20130820000000_closest_match.rb
index 6343d0c9..fb3e0849 100644
--- a/db/migrate/20130820000000_closest_match.rb
+++ b/db/migrate/20130820000000_closest_match.rb
@@ -4,608 +4,608 @@ def self.up
       t.integer   :spectrum_id
       
       # This looks strange, but works well
-      t.integer	  :a10, :default => 0 # Each column for matching. Looks weird, haha
-      t.integer	  :r10, :default => 0
-      t.integer	  :g10, :default => 0
-      t.integer	  :b10, :default => 0
-      t.integer	  :a20, :default => 0
-      t.integer	  :r20, :default => 0
-      t.integer	  :g20, :default => 0
-      t.integer	  :b20, :default => 0
-      t.integer	  :a30, :default => 0
-      t.integer	  :r30, :default => 0
-      t.integer	  :g30, :default => 0
-      t.integer	  :b30, :default => 0
-      t.integer	  :a40, :default => 0
-      t.integer	  :r40, :default => 0
-      t.integer	  :g40, :default => 0
-      t.integer	  :b40, :default => 0
-      t.integer	  :a50, :default => 0
-      t.integer	  :r50, :default => 0
-      t.integer	  :g50, :default => 0
-      t.integer	  :b50, :default => 0
-      t.integer	  :a60, :default => 0
-      t.integer	  :r60, :default => 0
-      t.integer	  :g60, :default => 0
-      t.integer	  :b60, :default => 0
-      t.integer	  :a70, :default => 0
-      t.integer	  :r70, :default => 0
-      t.integer	  :g70, :default => 0
-      t.integer	  :b70, :default => 0
-      t.integer	  :a80, :default => 0
-      t.integer	  :r80, :default => 0
-      t.integer	  :g80, :default => 0
-      t.integer	  :b80, :default => 0
-      t.integer	  :a90, :default => 0
-      t.integer	  :r90, :default => 0
-      t.integer	  :g90, :default => 0
-      t.integer	  :b90, :default => 0
-      t.integer	  :a100, :default => 0
-      t.integer	  :r100, :default => 0
-      t.integer	  :g100, :default => 0
-      t.integer	  :b100, :default => 0
-      t.integer	  :a110, :default => 0
-      t.integer	  :r110, :default => 0
-      t.integer	  :g110, :default => 0
-      t.integer	  :b110, :default => 0
-      t.integer	  :a120, :default => 0
-      t.integer	  :r120, :default => 0
-      t.integer	  :g120, :default => 0
-      t.integer	  :b120, :default => 0
-      t.integer	  :a130, :default => 0
-      t.integer	  :r130, :default => 0
-      t.integer	  :g130, :default => 0
-      t.integer	  :b130, :default => 0
-      t.integer	  :a140, :default => 0
-      t.integer	  :r140, :default => 0
-      t.integer	  :g140, :default => 0
-      t.integer	  :b140, :default => 0
-      t.integer	  :a150, :default => 0
-      t.integer	  :r150, :default => 0
-      t.integer	  :g150, :default => 0
-      t.integer	  :b150, :default => 0
-      t.integer	  :a160, :default => 0
-      t.integer	  :r160, :default => 0
-      t.integer	  :g160, :default => 0
-      t.integer	  :b160, :default => 0
-      t.integer	  :a170, :default => 0
-      t.integer	  :r170, :default => 0
-      t.integer	  :g170, :default => 0
-      t.integer	  :b170, :default => 0
-      t.integer	  :a180, :default => 0
-      t.integer	  :r180, :default => 0
-      t.integer	  :g180, :default => 0
-      t.integer	  :b180, :default => 0
-      t.integer	  :a190, :default => 0
-      t.integer	  :r190, :default => 0
-      t.integer	  :g190, :default => 0
-      t.integer	  :b190, :default => 0
-      t.integer	  :a200, :default => 0
-      t.integer	  :r200, :default => 0
-      t.integer	  :g200, :default => 0
-      t.integer	  :b200, :default => 0
-      t.integer	  :a210, :default => 0
-      t.integer	  :r210, :default => 0
-      t.integer	  :g210, :default => 0
-      t.integer	  :b210, :default => 0
-      t.integer	  :a220, :default => 0
-      t.integer	  :r220, :default => 0
-      t.integer	  :g220, :default => 0
-      t.integer	  :b220, :default => 0
-      t.integer	  :a230, :default => 0
-      t.integer	  :r230, :default => 0
-      t.integer	  :g230, :default => 0
-      t.integer	  :b230, :default => 0
-      t.integer	  :a240, :default => 0
-      t.integer	  :r240, :default => 0
-      t.integer	  :g240, :default => 0
-      t.integer	  :b240, :default => 0
-      t.integer	  :a250, :default => 0
-      t.integer	  :r250, :default => 0
-      t.integer	  :g250, :default => 0
-      t.integer	  :b250, :default => 0
-      t.integer	  :a260, :default => 0
-      t.integer	  :r260, :default => 0
-      t.integer	  :g260, :default => 0
-      t.integer	  :b260, :default => 0
-      t.integer	  :a270, :default => 0
-      t.integer	  :r270, :default => 0
-      t.integer	  :g270, :default => 0
-      t.integer	  :b270, :default => 0
-      t.integer	  :a280, :default => 0
-      t.integer	  :r280, :default => 0
-      t.integer	  :g280, :default => 0
-      t.integer	  :b280, :default => 0
-      t.integer	  :a290, :default => 0
-      t.integer	  :r290, :default => 0
-      t.integer	  :g290, :default => 0
-      t.integer	  :b290, :default => 0
-      t.integer	  :a300, :default => 0
-      t.integer	  :r300, :default => 0
-      t.integer	  :g300, :default => 0
-      t.integer	  :b300, :default => 0
-      t.integer	  :a310, :default => 0
-      t.integer	  :r310, :default => 0
-      t.integer	  :g310, :default => 0
-      t.integer	  :b310, :default => 0
-      t.integer	  :a320, :default => 0
-      t.integer	  :r320, :default => 0
-      t.integer	  :g320, :default => 0
-      t.integer	  :b320, :default => 0
-      t.integer	  :a330, :default => 0
-      t.integer	  :r330, :default => 0
-      t.integer	  :g330, :default => 0
-      t.integer	  :b330, :default => 0
-      t.integer	  :a340, :default => 0
-      t.integer	  :r340, :default => 0
-      t.integer	  :g340, :default => 0
-      t.integer	  :b340, :default => 0
-      t.integer	  :a350, :default => 0
-      t.integer	  :r350, :default => 0
-      t.integer	  :g350, :default => 0
-      t.integer	  :b350, :default => 0
-      t.integer	  :a360, :default => 0
-      t.integer	  :r360, :default => 0
-      t.integer	  :g360, :default => 0
-      t.integer	  :b360, :default => 0
-      t.integer	  :a370, :default => 0
-      t.integer	  :r370, :default => 0
-      t.integer	  :g370, :default => 0
-      t.integer	  :b370, :default => 0
-      t.integer	  :a380, :default => 0
-      t.integer	  :r380, :default => 0
-      t.integer	  :g380, :default => 0
-      t.integer	  :b380, :default => 0
-      t.integer	  :a390, :default => 0
-      t.integer	  :r390, :default => 0
-      t.integer	  :g390, :default => 0
-      t.integer	  :b390, :default => 0
-      t.integer	  :a400, :default => 0
-      t.integer	  :r400, :default => 0
-      t.integer	  :g400, :default => 0
-      t.integer	  :b400, :default => 0
-      t.integer	  :a410, :default => 0
-      t.integer	  :r410, :default => 0
-      t.integer	  :g410, :default => 0
-      t.integer	  :b410, :default => 0
-      t.integer	  :a420, :default => 0
-      t.integer	  :r420, :default => 0
-      t.integer	  :g420, :default => 0
-      t.integer	  :b420, :default => 0
-      t.integer	  :a430, :default => 0
-      t.integer	  :r430, :default => 0
-      t.integer	  :g430, :default => 0
-      t.integer	  :b430, :default => 0
-      t.integer	  :a440, :default => 0
-      t.integer	  :r440, :default => 0
-      t.integer	  :g440, :default => 0
-      t.integer	  :b440, :default => 0
-      t.integer	  :a450, :default => 0
-      t.integer	  :r450, :default => 0
-      t.integer	  :g450, :default => 0
-      t.integer	  :b450, :default => 0
-      t.integer	  :a460, :default => 0
-      t.integer	  :r460, :default => 0
-      t.integer	  :g460, :default => 0
-      t.integer	  :b460, :default => 0
-      t.integer	  :a470, :default => 0
-      t.integer	  :r470, :default => 0
-      t.integer	  :g470, :default => 0
-      t.integer	  :b470, :default => 0
-      t.integer	  :a480, :default => 0
-      t.integer	  :r480, :default => 0
-      t.integer	  :g480, :default => 0
-      t.integer	  :b480, :default => 0
-      t.integer	  :a490, :default => 0
-      t.integer	  :r490, :default => 0
-      t.integer	  :g490, :default => 0
-      t.integer	  :b490, :default => 0
-      t.integer	  :a500, :default => 0
-      t.integer	  :r500, :default => 0
-      t.integer	  :g500, :default => 0
-      t.integer	  :b500, :default => 0
-      t.integer	  :a510, :default => 0
-      t.integer	  :r510, :default => 0
-      t.integer	  :g510, :default => 0
-      t.integer	  :b510, :default => 0
-      t.integer	  :a520, :default => 0
-      t.integer	  :r520, :default => 0
-      t.integer	  :g520, :default => 0
-      t.integer	  :b520, :default => 0
-      t.integer	  :a530, :default => 0
-      t.integer	  :r530, :default => 0
-      t.integer	  :g530, :default => 0
-      t.integer	  :b530, :default => 0
-      t.integer	  :a540, :default => 0
-      t.integer	  :r540, :default => 0
-      t.integer	  :g540, :default => 0
-      t.integer	  :b540, :default => 0
-      t.integer	  :a550, :default => 0
-      t.integer	  :r550, :default => 0
-      t.integer	  :g550, :default => 0
-      t.integer	  :b550, :default => 0
-      t.integer	  :a560, :default => 0
-      t.integer	  :r560, :default => 0
-      t.integer	  :g560, :default => 0
-      t.integer	  :b560, :default => 0
-      t.integer	  :a570, :default => 0
-      t.integer	  :r570, :default => 0
-      t.integer	  :g570, :default => 0
-      t.integer	  :b570, :default => 0
-      t.integer	  :a580, :default => 0
-      t.integer	  :r580, :default => 0
-      t.integer	  :g580, :default => 0
-      t.integer	  :b580, :default => 0
-      t.integer	  :a590, :default => 0
-      t.integer	  :r590, :default => 0
-      t.integer	  :g590, :default => 0
-      t.integer	  :b590, :default => 0
-      t.integer	  :a600, :default => 0
-      t.integer	  :r600, :default => 0
-      t.integer	  :g600, :default => 0
-      t.integer	  :b600, :default => 0
-      t.integer	  :a610, :default => 0
-      t.integer	  :r610, :default => 0
-      t.integer	  :g610, :default => 0
-      t.integer	  :b610, :default => 0
-      t.integer	  :a620, :default => 0
-      t.integer	  :r620, :default => 0
-      t.integer	  :g620, :default => 0
-      t.integer	  :b620, :default => 0
-      t.integer	  :a630, :default => 0
-      t.integer	  :r630, :default => 0
-      t.integer	  :g630, :default => 0
-      t.integer	  :b630, :default => 0
-      t.integer	  :a640, :default => 0
-      t.integer	  :r640, :default => 0
-      t.integer	  :g640, :default => 0
-      t.integer	  :b640, :default => 0
-      t.integer	  :a650, :default => 0
-      t.integer	  :r650, :default => 0
-      t.integer	  :g650, :default => 0
-      t.integer	  :b650, :default => 0
-      t.integer	  :a660, :default => 0
-      t.integer	  :r660, :default => 0
-      t.integer	  :g660, :default => 0
-      t.integer	  :b660, :default => 0
-      t.integer	  :a670, :default => 0
-      t.integer	  :r670, :default => 0
-      t.integer	  :g670, :default => 0
-      t.integer	  :b670, :default => 0
-      t.integer	  :a680, :default => 0
-      t.integer	  :r680, :default => 0
-      t.integer	  :g680, :default => 0
-      t.integer	  :b680, :default => 0
-      t.integer	  :a690, :default => 0
-      t.integer	  :r690, :default => 0
-      t.integer	  :g690, :default => 0
-      t.integer	  :b690, :default => 0
-      t.integer	  :a700, :default => 0
-      t.integer	  :r700, :default => 0
-      t.integer	  :g700, :default => 0
-      t.integer	  :b700, :default => 0
-      t.integer	  :a710, :default => 0
-      t.integer	  :r710, :default => 0
-      t.integer	  :g710, :default => 0
-      t.integer	  :b710, :default => 0
-      t.integer	  :a720, :default => 0
-      t.integer	  :r720, :default => 0
-      t.integer	  :g720, :default => 0
-      t.integer	  :b720, :default => 0
-      t.integer	  :a730, :default => 0
-      t.integer	  :r730, :default => 0
-      t.integer	  :g730, :default => 0
-      t.integer	  :b730, :default => 0
-      t.integer	  :a740, :default => 0
-      t.integer	  :r740, :default => 0
-      t.integer	  :g740, :default => 0
-      t.integer	  :b740, :default => 0
-      t.integer	  :a750, :default => 0
-      t.integer	  :r750, :default => 0
-      t.integer	  :g750, :default => 0
-      t.integer	  :b750, :default => 0
-      t.integer	  :a760, :default => 0
-      t.integer	  :r760, :default => 0
-      t.integer	  :g760, :default => 0
-      t.integer	  :b760, :default => 0
-      t.integer	  :a770, :default => 0
-      t.integer	  :r770, :default => 0
-      t.integer	  :g770, :default => 0
-      t.integer	  :b770, :default => 0
-      t.integer	  :a780, :default => 0
-      t.integer	  :r780, :default => 0
-      t.integer	  :g780, :default => 0
-      t.integer	  :b780, :default => 0
-      t.integer	  :a790, :default => 0
-      t.integer	  :r790, :default => 0
-      t.integer	  :g790, :default => 0
-      t.integer	  :b790, :default => 0
-      t.integer	  :a800, :default => 0
-      t.integer	  :r800, :default => 0
-      t.integer	  :g800, :default => 0
-      t.integer	  :b800, :default => 0
-      t.integer	  :a810, :default => 0
-      t.integer	  :r810, :default => 0
-      t.integer	  :g810, :default => 0
-      t.integer	  :b810, :default => 0
-      t.integer	  :a820, :default => 0
-      t.integer	  :r820, :default => 0
-      t.integer	  :g820, :default => 0
-      t.integer	  :b820, :default => 0
-      t.integer	  :a830, :default => 0
-      t.integer	  :r830, :default => 0
-      t.integer	  :g830, :default => 0
-      t.integer	  :b830, :default => 0
-      t.integer	  :a840, :default => 0
-      t.integer	  :r840, :default => 0
-      t.integer	  :g840, :default => 0
-      t.integer	  :b840, :default => 0
-      t.integer	  :a850, :default => 0
-      t.integer	  :r850, :default => 0
-      t.integer	  :g850, :default => 0
-      t.integer	  :b850, :default => 0
-      t.integer	  :a860, :default => 0
-      t.integer	  :r860, :default => 0
-      t.integer	  :g860, :default => 0
-      t.integer	  :b860, :default => 0
-      t.integer	  :a870, :default => 0
-      t.integer	  :r870, :default => 0
-      t.integer	  :g870, :default => 0
-      t.integer	  :b870, :default => 0
-      t.integer	  :a880, :default => 0
-      t.integer	  :r880, :default => 0
-      t.integer	  :g880, :default => 0
-      t.integer	  :b880, :default => 0
-      t.integer	  :a890, :default => 0
-      t.integer	  :r890, :default => 0
-      t.integer	  :g890, :default => 0
-      t.integer	  :b890, :default => 0
-      t.integer	  :a900, :default => 0
-      t.integer	  :r900, :default => 0
-      t.integer	  :g900, :default => 0
-      t.integer	  :b900, :default => 0
-      t.integer	  :a910, :default => 0
-      t.integer	  :r910, :default => 0
-      t.integer	  :g910, :default => 0
-      t.integer	  :b910, :default => 0
-      t.integer	  :a920, :default => 0
-      t.integer	  :r920, :default => 0
-      t.integer	  :g920, :default => 0
-      t.integer	  :b920, :default => 0
-      t.integer	  :a930, :default => 0
-      t.integer	  :r930, :default => 0
-      t.integer	  :g930, :default => 0
-      t.integer	  :b930, :default => 0
-      t.integer	  :a940, :default => 0
-      t.integer	  :r940, :default => 0
-      t.integer	  :g940, :default => 0
-      t.integer	  :b940, :default => 0
-      t.integer	  :a950, :default => 0
-      t.integer	  :r950, :default => 0
-      t.integer	  :g950, :default => 0
-      t.integer	  :b950, :default => 0
-      t.integer	  :a960, :default => 0
-      t.integer	  :r960, :default => 0
-      t.integer	  :g960, :default => 0
-      t.integer	  :b960, :default => 0
-      t.integer	  :a970, :default => 0
-      t.integer	  :r970, :default => 0
-      t.integer	  :g970, :default => 0
-      t.integer	  :b970, :default => 0
-      t.integer	  :a980, :default => 0
-      t.integer	  :r980, :default => 0
-      t.integer	  :g980, :default => 0
-      t.integer	  :b980, :default => 0
-      t.integer	  :a990, :default => 0
-      t.integer	  :r990, :default => 0
-      t.integer	  :g990, :default => 0
-      t.integer	  :b990, :default => 0
-      t.integer	  :a1000, :default => 0
-      t.integer	  :r1000, :default => 0
-      t.integer	  :g1000, :default => 0
-      t.integer	  :b1000, :default => 0
-      t.integer	  :a1010, :default => 0
-      t.integer	  :r1010, :default => 0
-      t.integer	  :g1010, :default => 0
-      t.integer	  :b1010, :default => 0
-      t.integer	  :a1020, :default => 0
-      t.integer	  :r1020, :default => 0
-      t.integer	  :g1020, :default => 0
-      t.integer	  :b1020, :default => 0
-      t.integer	  :a1030, :default => 0
-      t.integer	  :r1030, :default => 0
-      t.integer	  :g1030, :default => 0
-      t.integer	  :b1030, :default => 0
-      t.integer	  :a1040, :default => 0
-      t.integer	  :r1040, :default => 0
-      t.integer	  :g1040, :default => 0
-      t.integer	  :b1040, :default => 0
-      t.integer	  :a1050, :default => 0
-      t.integer	  :r1050, :default => 0
-      t.integer	  :g1050, :default => 0
-      t.integer	  :b1050, :default => 0
-      t.integer	  :a1060, :default => 0
-      t.integer	  :r1060, :default => 0
-      t.integer	  :g1060, :default => 0
-      t.integer	  :b1060, :default => 0
-      t.integer	  :a1070, :default => 0
-      t.integer	  :r1070, :default => 0
-      t.integer	  :g1070, :default => 0
-      t.integer	  :b1070, :default => 0
-      t.integer	  :a1080, :default => 0
-      t.integer	  :r1080, :default => 0
-      t.integer	  :g1080, :default => 0
-      t.integer	  :b1080, :default => 0
-      t.integer	  :a1090, :default => 0
-      t.integer	  :r1090, :default => 0
-      t.integer	  :g1090, :default => 0
-      t.integer	  :b1090, :default => 0
-      t.integer	  :a1100, :default => 0
-      t.integer	  :r1100, :default => 0
-      t.integer	  :g1100, :default => 0
-      t.integer	  :b1100, :default => 0
-      t.integer	  :a1110, :default => 0
-      t.integer	  :r1110, :default => 0
-      t.integer	  :g1110, :default => 0
-      t.integer	  :b1110, :default => 0
-      t.integer	  :a1120, :default => 0
-      t.integer	  :r1120, :default => 0
-      t.integer	  :g1120, :default => 0
-      t.integer	  :b1120, :default => 0
-      t.integer	  :a1130, :default => 0
-      t.integer	  :r1130, :default => 0
-      t.integer	  :g1130, :default => 0
-      t.integer	  :b1130, :default => 0
-      t.integer	  :a1140, :default => 0
-      t.integer	  :r1140, :default => 0
-      t.integer	  :g1140, :default => 0
-      t.integer	  :b1140, :default => 0
-      t.integer	  :a1150, :default => 0
-      t.integer	  :r1150, :default => 0
-      t.integer	  :g1150, :default => 0
-      t.integer	  :b1150, :default => 0
-      t.integer	  :a1160, :default => 0
-      t.integer	  :r1160, :default => 0
-      t.integer	  :g1160, :default => 0
-      t.integer	  :b1160, :default => 0
-      t.integer	  :a1170, :default => 0
-      t.integer	  :r1170, :default => 0
-      t.integer	  :g1170, :default => 0
-      t.integer	  :b1170, :default => 0
-      t.integer	  :a1180, :default => 0
-      t.integer	  :r1180, :default => 0
-      t.integer	  :g1180, :default => 0
-      t.integer	  :b1180, :default => 0
-      t.integer	  :a1190, :default => 0
-      t.integer	  :r1190, :default => 0
-      t.integer	  :g1190, :default => 0
-      t.integer	  :b1190, :default => 0
-      t.integer	  :a1200, :default => 0
-      t.integer	  :r1200, :default => 0
-      t.integer	  :g1200, :default => 0
-      t.integer	  :b1200, :default => 0
-      t.integer	  :a1210, :default => 0
-      t.integer	  :r1210, :default => 0
-      t.integer	  :g1210, :default => 0
-      t.integer	  :b1210, :default => 0
-      t.integer	  :a1220, :default => 0
-      t.integer	  :r1220, :default => 0
-      t.integer	  :g1220, :default => 0
-      t.integer	  :b1220, :default => 0
-      t.integer	  :a1230, :default => 0
-      t.integer	  :r1230, :default => 0
-      t.integer	  :g1230, :default => 0
-      t.integer	  :b1230, :default => 0
-      t.integer	  :a1240, :default => 0
-      t.integer	  :r1240, :default => 0
-      t.integer	  :g1240, :default => 0
-      t.integer	  :b1240, :default => 0
-      t.integer	  :a1250, :default => 0
-      t.integer	  :r1250, :default => 0
-      t.integer	  :g1250, :default => 0
-      t.integer	  :b1250, :default => 0
-      t.integer	  :a1260, :default => 0
-      t.integer	  :r1260, :default => 0
-      t.integer	  :g1260, :default => 0
-      t.integer	  :b1260, :default => 0
-      t.integer	  :a1270, :default => 0
-      t.integer	  :r1270, :default => 0
-      t.integer	  :g1270, :default => 0
-      t.integer	  :b1270, :default => 0
-      t.integer	  :a1280, :default => 0
-      t.integer	  :r1280, :default => 0
-      t.integer	  :g1280, :default => 0
-      t.integer	  :b1280, :default => 0
-      t.integer	  :a1290, :default => 0
-      t.integer	  :r1290, :default => 0
-      t.integer	  :g1290, :default => 0
-      t.integer	  :b1290, :default => 0
-      t.integer	  :a1300, :default => 0
-      t.integer	  :r1300, :default => 0
-      t.integer	  :g1300, :default => 0
-      t.integer	  :b1300, :default => 0
-      t.integer	  :a1310, :default => 0
-      t.integer	  :r1310, :default => 0
-      t.integer	  :g1310, :default => 0
-      t.integer	  :b1310, :default => 0
-      t.integer	  :a1320, :default => 0
-      t.integer	  :r1320, :default => 0
-      t.integer	  :g1320, :default => 0
-      t.integer	  :b1320, :default => 0
-      t.integer	  :a1330, :default => 0
-      t.integer	  :r1330, :default => 0
-      t.integer	  :g1330, :default => 0
-      t.integer	  :b1330, :default => 0
-      t.integer	  :a1340, :default => 0
-      t.integer	  :r1340, :default => 0
-      t.integer	  :g1340, :default => 0
-      t.integer	  :b1340, :default => 0
-      t.integer	  :a1350, :default => 0
-      t.integer	  :r1350, :default => 0
-      t.integer	  :g1350, :default => 0
-      t.integer	  :b1350, :default => 0
-      t.integer	  :a1360, :default => 0
-      t.integer	  :r1360, :default => 0
-      t.integer	  :g1360, :default => 0
-      t.integer	  :b1360, :default => 0
-      t.integer	  :a1370, :default => 0
-      t.integer	  :r1370, :default => 0
-      t.integer	  :g1370, :default => 0
-      t.integer	  :b1370, :default => 0
-      t.integer	  :a1380, :default => 0
-      t.integer	  :r1380, :default => 0
-      t.integer	  :g1380, :default => 0
-      t.integer	  :b1380, :default => 0
-      t.integer	  :a1390, :default => 0
-      t.integer	  :r1390, :default => 0
-      t.integer	  :g1390, :default => 0
-      t.integer	  :b1390, :default => 0
-      t.integer	  :a1400, :default => 0
-      t.integer	  :r1400, :default => 0
-      t.integer	  :g1400, :default => 0
-      t.integer	  :b1400, :default => 0
-      t.integer	  :a1410, :default => 0
-      t.integer	  :r1410, :default => 0
-      t.integer	  :g1410, :default => 0
-      t.integer	  :b1410, :default => 0
-      t.integer	  :a1420, :default => 0
-      t.integer	  :r1420, :default => 0
-      t.integer	  :g1420, :default => 0
-      t.integer	  :b1420, :default => 0
-      t.integer	  :a1430, :default => 0
-      t.integer	  :r1430, :default => 0
-      t.integer	  :g1430, :default => 0
-      t.integer	  :b1430, :default => 0
-      t.integer	  :a1440, :default => 0
-      t.integer	  :r1440, :default => 0
-      t.integer	  :g1440, :default => 0
-      t.integer	  :b1440, :default => 0
-      t.integer	  :a1450, :default => 0
-      t.integer	  :r1450, :default => 0
-      t.integer	  :g1450, :default => 0
-      t.integer	  :b1450, :default => 0
-      t.integer	  :a1460, :default => 0
-      t.integer	  :r1460, :default => 0
-      t.integer	  :g1460, :default => 0
-      t.integer	  :b1460, :default => 0
-      t.integer	  :a1470, :default => 0
-      t.integer	  :r1470, :default => 0
-      t.integer	  :g1470, :default => 0
-      t.integer	  :b1470, :default => 0
-      t.integer	  :a1480, :default => 0
-      t.integer	  :r1480, :default => 0
-      t.integer	  :g1480, :default => 0
-      t.integer	  :b1480, :default => 0
-      t.integer	  :a1490, :default => 0
-      t.integer	  :r1490, :default => 0
-      t.integer	  :g1490, :default => 0
-      t.integer	  :b1490, :default => 0     
+      t.integer	  :a10, default: 0 # Each column for matching. Looks weird, haha
+      t.integer	  :r10, default: 0
+      t.integer	  :g10, default: 0
+      t.integer	  :b10, default: 0
+      t.integer	  :a20, default: 0
+      t.integer	  :r20, default: 0
+      t.integer	  :g20, default: 0
+      t.integer	  :b20, default: 0
+      t.integer	  :a30, default: 0
+      t.integer	  :r30, default: 0
+      t.integer	  :g30, default: 0
+      t.integer	  :b30, default: 0
+      t.integer	  :a40, default: 0
+      t.integer	  :r40, default: 0
+      t.integer	  :g40, default: 0
+      t.integer	  :b40, default: 0
+      t.integer	  :a50, default: 0
+      t.integer	  :r50, default: 0
+      t.integer	  :g50, default: 0
+      t.integer	  :b50, default: 0
+      t.integer	  :a60, default: 0
+      t.integer	  :r60, default: 0
+      t.integer	  :g60, default: 0
+      t.integer	  :b60, default: 0
+      t.integer	  :a70, default: 0
+      t.integer	  :r70, default: 0
+      t.integer	  :g70, default: 0
+      t.integer	  :b70, default: 0
+      t.integer	  :a80, default: 0
+      t.integer	  :r80, default: 0
+      t.integer	  :g80, default: 0
+      t.integer	  :b80, default: 0
+      t.integer	  :a90, default: 0
+      t.integer	  :r90, default: 0
+      t.integer	  :g90, default: 0
+      t.integer	  :b90, default: 0
+      t.integer	  :a100, default: 0
+      t.integer	  :r100, default: 0
+      t.integer	  :g100, default: 0
+      t.integer	  :b100, default: 0
+      t.integer	  :a110, default: 0
+      t.integer	  :r110, default: 0
+      t.integer	  :g110, default: 0
+      t.integer	  :b110, default: 0
+      t.integer	  :a120, default: 0
+      t.integer	  :r120, default: 0
+      t.integer	  :g120, default: 0
+      t.integer	  :b120, default: 0
+      t.integer	  :a130, default: 0
+      t.integer	  :r130, default: 0
+      t.integer	  :g130, default: 0
+      t.integer	  :b130, default: 0
+      t.integer	  :a140, default: 0
+      t.integer	  :r140, default: 0
+      t.integer	  :g140, default: 0
+      t.integer	  :b140, default: 0
+      t.integer	  :a150, default: 0
+      t.integer	  :r150, default: 0
+      t.integer	  :g150, default: 0
+      t.integer	  :b150, default: 0
+      t.integer	  :a160, default: 0
+      t.integer	  :r160, default: 0
+      t.integer	  :g160, default: 0
+      t.integer	  :b160, default: 0
+      t.integer	  :a170, default: 0
+      t.integer	  :r170, default: 0
+      t.integer	  :g170, default: 0
+      t.integer	  :b170, default: 0
+      t.integer	  :a180, default: 0
+      t.integer	  :r180, default: 0
+      t.integer	  :g180, default: 0
+      t.integer	  :b180, default: 0
+      t.integer	  :a190, default: 0
+      t.integer	  :r190, default: 0
+      t.integer	  :g190, default: 0
+      t.integer	  :b190, default: 0
+      t.integer	  :a200, default: 0
+      t.integer	  :r200, default: 0
+      t.integer	  :g200, default: 0
+      t.integer	  :b200, default: 0
+      t.integer	  :a210, default: 0
+      t.integer	  :r210, default: 0
+      t.integer	  :g210, default: 0
+      t.integer	  :b210, default: 0
+      t.integer	  :a220, default: 0
+      t.integer	  :r220, default: 0
+      t.integer	  :g220, default: 0
+      t.integer	  :b220, default: 0
+      t.integer	  :a230, default: 0
+      t.integer	  :r230, default: 0
+      t.integer	  :g230, default: 0
+      t.integer	  :b230, default: 0
+      t.integer	  :a240, default: 0
+      t.integer	  :r240, default: 0
+      t.integer	  :g240, default: 0
+      t.integer	  :b240, default: 0
+      t.integer	  :a250, default: 0
+      t.integer	  :r250, default: 0
+      t.integer	  :g250, default: 0
+      t.integer	  :b250, default: 0
+      t.integer	  :a260, default: 0
+      t.integer	  :r260, default: 0
+      t.integer	  :g260, default: 0
+      t.integer	  :b260, default: 0
+      t.integer	  :a270, default: 0
+      t.integer	  :r270, default: 0
+      t.integer	  :g270, default: 0
+      t.integer	  :b270, default: 0
+      t.integer	  :a280, default: 0
+      t.integer	  :r280, default: 0
+      t.integer	  :g280, default: 0
+      t.integer	  :b280, default: 0
+      t.integer	  :a290, default: 0
+      t.integer	  :r290, default: 0
+      t.integer	  :g290, default: 0
+      t.integer	  :b290, default: 0
+      t.integer	  :a300, default: 0
+      t.integer	  :r300, default: 0
+      t.integer	  :g300, default: 0
+      t.integer	  :b300, default: 0
+      t.integer	  :a310, default: 0
+      t.integer	  :r310, default: 0
+      t.integer	  :g310, default: 0
+      t.integer	  :b310, default: 0
+      t.integer	  :a320, default: 0
+      t.integer	  :r320, default: 0
+      t.integer	  :g320, default: 0
+      t.integer	  :b320, default: 0
+      t.integer	  :a330, default: 0
+      t.integer	  :r330, default: 0
+      t.integer	  :g330, default: 0
+      t.integer	  :b330, default: 0
+      t.integer	  :a340, default: 0
+      t.integer	  :r340, default: 0
+      t.integer	  :g340, default: 0
+      t.integer	  :b340, default: 0
+      t.integer	  :a350, default: 0
+      t.integer	  :r350, default: 0
+      t.integer	  :g350, default: 0
+      t.integer	  :b350, default: 0
+      t.integer	  :a360, default: 0
+      t.integer	  :r360, default: 0
+      t.integer	  :g360, default: 0
+      t.integer	  :b360, default: 0
+      t.integer	  :a370, default: 0
+      t.integer	  :r370, default: 0
+      t.integer	  :g370, default: 0
+      t.integer	  :b370, default: 0
+      t.integer	  :a380, default: 0
+      t.integer	  :r380, default: 0
+      t.integer	  :g380, default: 0
+      t.integer	  :b380, default: 0
+      t.integer	  :a390, default: 0
+      t.integer	  :r390, default: 0
+      t.integer	  :g390, default: 0
+      t.integer	  :b390, default: 0
+      t.integer	  :a400, default: 0
+      t.integer	  :r400, default: 0
+      t.integer	  :g400, default: 0
+      t.integer	  :b400, default: 0
+      t.integer	  :a410, default: 0
+      t.integer	  :r410, default: 0
+      t.integer	  :g410, default: 0
+      t.integer	  :b410, default: 0
+      t.integer	  :a420, default: 0
+      t.integer	  :r420, default: 0
+      t.integer	  :g420, default: 0
+      t.integer	  :b420, default: 0
+      t.integer	  :a430, default: 0
+      t.integer	  :r430, default: 0
+      t.integer	  :g430, default: 0
+      t.integer	  :b430, default: 0
+      t.integer	  :a440, default: 0
+      t.integer	  :r440, default: 0
+      t.integer	  :g440, default: 0
+      t.integer	  :b440, default: 0
+      t.integer	  :a450, default: 0
+      t.integer	  :r450, default: 0
+      t.integer	  :g450, default: 0
+      t.integer	  :b450, default: 0
+      t.integer	  :a460, default: 0
+      t.integer	  :r460, default: 0
+      t.integer	  :g460, default: 0
+      t.integer	  :b460, default: 0
+      t.integer	  :a470, default: 0
+      t.integer	  :r470, default: 0
+      t.integer	  :g470, default: 0
+      t.integer	  :b470, default: 0
+      t.integer	  :a480, default: 0
+      t.integer	  :r480, default: 0
+      t.integer	  :g480, default: 0
+      t.integer	  :b480, default: 0
+      t.integer	  :a490, default: 0
+      t.integer	  :r490, default: 0
+      t.integer	  :g490, default: 0
+      t.integer	  :b490, default: 0
+      t.integer	  :a500, default: 0
+      t.integer	  :r500, default: 0
+      t.integer	  :g500, default: 0
+      t.integer	  :b500, default: 0
+      t.integer	  :a510, default: 0
+      t.integer	  :r510, default: 0
+      t.integer	  :g510, default: 0
+      t.integer	  :b510, default: 0
+      t.integer	  :a520, default: 0
+      t.integer	  :r520, default: 0
+      t.integer	  :g520, default: 0
+      t.integer	  :b520, default: 0
+      t.integer	  :a530, default: 0
+      t.integer	  :r530, default: 0
+      t.integer	  :g530, default: 0
+      t.integer	  :b530, default: 0
+      t.integer	  :a540, default: 0
+      t.integer	  :r540, default: 0
+      t.integer	  :g540, default: 0
+      t.integer	  :b540, default: 0
+      t.integer	  :a550, default: 0
+      t.integer	  :r550, default: 0
+      t.integer	  :g550, default: 0
+      t.integer	  :b550, default: 0
+      t.integer	  :a560, default: 0
+      t.integer	  :r560, default: 0
+      t.integer	  :g560, default: 0
+      t.integer	  :b560, default: 0
+      t.integer	  :a570, default: 0
+      t.integer	  :r570, default: 0
+      t.integer	  :g570, default: 0
+      t.integer	  :b570, default: 0
+      t.integer	  :a580, default: 0
+      t.integer	  :r580, default: 0
+      t.integer	  :g580, default: 0
+      t.integer	  :b580, default: 0
+      t.integer	  :a590, default: 0
+      t.integer	  :r590, default: 0
+      t.integer	  :g590, default: 0
+      t.integer	  :b590, default: 0
+      t.integer	  :a600, default: 0
+      t.integer	  :r600, default: 0
+      t.integer	  :g600, default: 0
+      t.integer	  :b600, default: 0
+      t.integer	  :a610, default: 0
+      t.integer	  :r610, default: 0
+      t.integer	  :g610, default: 0
+      t.integer	  :b610, default: 0
+      t.integer	  :a620, default: 0
+      t.integer	  :r620, default: 0
+      t.integer	  :g620, default: 0
+      t.integer	  :b620, default: 0
+      t.integer	  :a630, default: 0
+      t.integer	  :r630, default: 0
+      t.integer	  :g630, default: 0
+      t.integer	  :b630, default: 0
+      t.integer	  :a640, default: 0
+      t.integer	  :r640, default: 0
+      t.integer	  :g640, default: 0
+      t.integer	  :b640, default: 0
+      t.integer	  :a650, default: 0
+      t.integer	  :r650, default: 0
+      t.integer	  :g650, default: 0
+      t.integer	  :b650, default: 0
+      t.integer	  :a660, default: 0
+      t.integer	  :r660, default: 0
+      t.integer	  :g660, default: 0
+      t.integer	  :b660, default: 0
+      t.integer	  :a670, default: 0
+      t.integer	  :r670, default: 0
+      t.integer	  :g670, default: 0
+      t.integer	  :b670, default: 0
+      t.integer	  :a680, default: 0
+      t.integer	  :r680, default: 0
+      t.integer	  :g680, default: 0
+      t.integer	  :b680, default: 0
+      t.integer	  :a690, default: 0
+      t.integer	  :r690, default: 0
+      t.integer	  :g690, default: 0
+      t.integer	  :b690, default: 0
+      t.integer	  :a700, default: 0
+      t.integer	  :r700, default: 0
+      t.integer	  :g700, default: 0
+      t.integer	  :b700, default: 0
+      t.integer	  :a710, default: 0
+      t.integer	  :r710, default: 0
+      t.integer	  :g710, default: 0
+      t.integer	  :b710, default: 0
+      t.integer	  :a720, default: 0
+      t.integer	  :r720, default: 0
+      t.integer	  :g720, default: 0
+      t.integer	  :b720, default: 0
+      t.integer	  :a730, default: 0
+      t.integer	  :r730, default: 0
+      t.integer	  :g730, default: 0
+      t.integer	  :b730, default: 0
+      t.integer	  :a740, default: 0
+      t.integer	  :r740, default: 0
+      t.integer	  :g740, default: 0
+      t.integer	  :b740, default: 0
+      t.integer	  :a750, default: 0
+      t.integer	  :r750, default: 0
+      t.integer	  :g750, default: 0
+      t.integer	  :b750, default: 0
+      t.integer	  :a760, default: 0
+      t.integer	  :r760, default: 0
+      t.integer	  :g760, default: 0
+      t.integer	  :b760, default: 0
+      t.integer	  :a770, default: 0
+      t.integer	  :r770, default: 0
+      t.integer	  :g770, default: 0
+      t.integer	  :b770, default: 0
+      t.integer	  :a780, default: 0
+      t.integer	  :r780, default: 0
+      t.integer	  :g780, default: 0
+      t.integer	  :b780, default: 0
+      t.integer	  :a790, default: 0
+      t.integer	  :r790, default: 0
+      t.integer	  :g790, default: 0
+      t.integer	  :b790, default: 0
+      t.integer	  :a800, default: 0
+      t.integer	  :r800, default: 0
+      t.integer	  :g800, default: 0
+      t.integer	  :b800, default: 0
+      t.integer	  :a810, default: 0
+      t.integer	  :r810, default: 0
+      t.integer	  :g810, default: 0
+      t.integer	  :b810, default: 0
+      t.integer	  :a820, default: 0
+      t.integer	  :r820, default: 0
+      t.integer	  :g820, default: 0
+      t.integer	  :b820, default: 0
+      t.integer	  :a830, default: 0
+      t.integer	  :r830, default: 0
+      t.integer	  :g830, default: 0
+      t.integer	  :b830, default: 0
+      t.integer	  :a840, default: 0
+      t.integer	  :r840, default: 0
+      t.integer	  :g840, default: 0
+      t.integer	  :b840, default: 0
+      t.integer	  :a850, default: 0
+      t.integer	  :r850, default: 0
+      t.integer	  :g850, default: 0
+      t.integer	  :b850, default: 0
+      t.integer	  :a860, default: 0
+      t.integer	  :r860, default: 0
+      t.integer	  :g860, default: 0
+      t.integer	  :b860, default: 0
+      t.integer	  :a870, default: 0
+      t.integer	  :r870, default: 0
+      t.integer	  :g870, default: 0
+      t.integer	  :b870, default: 0
+      t.integer	  :a880, default: 0
+      t.integer	  :r880, default: 0
+      t.integer	  :g880, default: 0
+      t.integer	  :b880, default: 0
+      t.integer	  :a890, default: 0
+      t.integer	  :r890, default: 0
+      t.integer	  :g890, default: 0
+      t.integer	  :b890, default: 0
+      t.integer	  :a900, default: 0
+      t.integer	  :r900, default: 0
+      t.integer	  :g900, default: 0
+      t.integer	  :b900, default: 0
+      t.integer	  :a910, default: 0
+      t.integer	  :r910, default: 0
+      t.integer	  :g910, default: 0
+      t.integer	  :b910, default: 0
+      t.integer	  :a920, default: 0
+      t.integer	  :r920, default: 0
+      t.integer	  :g920, default: 0
+      t.integer	  :b920, default: 0
+      t.integer	  :a930, default: 0
+      t.integer	  :r930, default: 0
+      t.integer	  :g930, default: 0
+      t.integer	  :b930, default: 0
+      t.integer	  :a940, default: 0
+      t.integer	  :r940, default: 0
+      t.integer	  :g940, default: 0
+      t.integer	  :b940, default: 0
+      t.integer	  :a950, default: 0
+      t.integer	  :r950, default: 0
+      t.integer	  :g950, default: 0
+      t.integer	  :b950, default: 0
+      t.integer	  :a960, default: 0
+      t.integer	  :r960, default: 0
+      t.integer	  :g960, default: 0
+      t.integer	  :b960, default: 0
+      t.integer	  :a970, default: 0
+      t.integer	  :r970, default: 0
+      t.integer	  :g970, default: 0
+      t.integer	  :b970, default: 0
+      t.integer	  :a980, default: 0
+      t.integer	  :r980, default: 0
+      t.integer	  :g980, default: 0
+      t.integer	  :b980, default: 0
+      t.integer	  :a990, default: 0
+      t.integer	  :r990, default: 0
+      t.integer	  :g990, default: 0
+      t.integer	  :b990, default: 0
+      t.integer	  :a1000, default: 0
+      t.integer	  :r1000, default: 0
+      t.integer	  :g1000, default: 0
+      t.integer	  :b1000, default: 0
+      t.integer	  :a1010, default: 0
+      t.integer	  :r1010, default: 0
+      t.integer	  :g1010, default: 0
+      t.integer	  :b1010, default: 0
+      t.integer	  :a1020, default: 0
+      t.integer	  :r1020, default: 0
+      t.integer	  :g1020, default: 0
+      t.integer	  :b1020, default: 0
+      t.integer	  :a1030, default: 0
+      t.integer	  :r1030, default: 0
+      t.integer	  :g1030, default: 0
+      t.integer	  :b1030, default: 0
+      t.integer	  :a1040, default: 0
+      t.integer	  :r1040, default: 0
+      t.integer	  :g1040, default: 0
+      t.integer	  :b1040, default: 0
+      t.integer	  :a1050, default: 0
+      t.integer	  :r1050, default: 0
+      t.integer	  :g1050, default: 0
+      t.integer	  :b1050, default: 0
+      t.integer	  :a1060, default: 0
+      t.integer	  :r1060, default: 0
+      t.integer	  :g1060, default: 0
+      t.integer	  :b1060, default: 0
+      t.integer	  :a1070, default: 0
+      t.integer	  :r1070, default: 0
+      t.integer	  :g1070, default: 0
+      t.integer	  :b1070, default: 0
+      t.integer	  :a1080, default: 0
+      t.integer	  :r1080, default: 0
+      t.integer	  :g1080, default: 0
+      t.integer	  :b1080, default: 0
+      t.integer	  :a1090, default: 0
+      t.integer	  :r1090, default: 0
+      t.integer	  :g1090, default: 0
+      t.integer	  :b1090, default: 0
+      t.integer	  :a1100, default: 0
+      t.integer	  :r1100, default: 0
+      t.integer	  :g1100, default: 0
+      t.integer	  :b1100, default: 0
+      t.integer	  :a1110, default: 0
+      t.integer	  :r1110, default: 0
+      t.integer	  :g1110, default: 0
+      t.integer	  :b1110, default: 0
+      t.integer	  :a1120, default: 0
+      t.integer	  :r1120, default: 0
+      t.integer	  :g1120, default: 0
+      t.integer	  :b1120, default: 0
+      t.integer	  :a1130, default: 0
+      t.integer	  :r1130, default: 0
+      t.integer	  :g1130, default: 0
+      t.integer	  :b1130, default: 0
+      t.integer	  :a1140, default: 0
+      t.integer	  :r1140, default: 0
+      t.integer	  :g1140, default: 0
+      t.integer	  :b1140, default: 0
+      t.integer	  :a1150, default: 0
+      t.integer	  :r1150, default: 0
+      t.integer	  :g1150, default: 0
+      t.integer	  :b1150, default: 0
+      t.integer	  :a1160, default: 0
+      t.integer	  :r1160, default: 0
+      t.integer	  :g1160, default: 0
+      t.integer	  :b1160, default: 0
+      t.integer	  :a1170, default: 0
+      t.integer	  :r1170, default: 0
+      t.integer	  :g1170, default: 0
+      t.integer	  :b1170, default: 0
+      t.integer	  :a1180, default: 0
+      t.integer	  :r1180, default: 0
+      t.integer	  :g1180, default: 0
+      t.integer	  :b1180, default: 0
+      t.integer	  :a1190, default: 0
+      t.integer	  :r1190, default: 0
+      t.integer	  :g1190, default: 0
+      t.integer	  :b1190, default: 0
+      t.integer	  :a1200, default: 0
+      t.integer	  :r1200, default: 0
+      t.integer	  :g1200, default: 0
+      t.integer	  :b1200, default: 0
+      t.integer	  :a1210, default: 0
+      t.integer	  :r1210, default: 0
+      t.integer	  :g1210, default: 0
+      t.integer	  :b1210, default: 0
+      t.integer	  :a1220, default: 0
+      t.integer	  :r1220, default: 0
+      t.integer	  :g1220, default: 0
+      t.integer	  :b1220, default: 0
+      t.integer	  :a1230, default: 0
+      t.integer	  :r1230, default: 0
+      t.integer	  :g1230, default: 0
+      t.integer	  :b1230, default: 0
+      t.integer	  :a1240, default: 0
+      t.integer	  :r1240, default: 0
+      t.integer	  :g1240, default: 0
+      t.integer	  :b1240, default: 0
+      t.integer	  :a1250, default: 0
+      t.integer	  :r1250, default: 0
+      t.integer	  :g1250, default: 0
+      t.integer	  :b1250, default: 0
+      t.integer	  :a1260, default: 0
+      t.integer	  :r1260, default: 0
+      t.integer	  :g1260, default: 0
+      t.integer	  :b1260, default: 0
+      t.integer	  :a1270, default: 0
+      t.integer	  :r1270, default: 0
+      t.integer	  :g1270, default: 0
+      t.integer	  :b1270, default: 0
+      t.integer	  :a1280, default: 0
+      t.integer	  :r1280, default: 0
+      t.integer	  :g1280, default: 0
+      t.integer	  :b1280, default: 0
+      t.integer	  :a1290, default: 0
+      t.integer	  :r1290, default: 0
+      t.integer	  :g1290, default: 0
+      t.integer	  :b1290, default: 0
+      t.integer	  :a1300, default: 0
+      t.integer	  :r1300, default: 0
+      t.integer	  :g1300, default: 0
+      t.integer	  :b1300, default: 0
+      t.integer	  :a1310, default: 0
+      t.integer	  :r1310, default: 0
+      t.integer	  :g1310, default: 0
+      t.integer	  :b1310, default: 0
+      t.integer	  :a1320, default: 0
+      t.integer	  :r1320, default: 0
+      t.integer	  :g1320, default: 0
+      t.integer	  :b1320, default: 0
+      t.integer	  :a1330, default: 0
+      t.integer	  :r1330, default: 0
+      t.integer	  :g1330, default: 0
+      t.integer	  :b1330, default: 0
+      t.integer	  :a1340, default: 0
+      t.integer	  :r1340, default: 0
+      t.integer	  :g1340, default: 0
+      t.integer	  :b1340, default: 0
+      t.integer	  :a1350, default: 0
+      t.integer	  :r1350, default: 0
+      t.integer	  :g1350, default: 0
+      t.integer	  :b1350, default: 0
+      t.integer	  :a1360, default: 0
+      t.integer	  :r1360, default: 0
+      t.integer	  :g1360, default: 0
+      t.integer	  :b1360, default: 0
+      t.integer	  :a1370, default: 0
+      t.integer	  :r1370, default: 0
+      t.integer	  :g1370, default: 0
+      t.integer	  :b1370, default: 0
+      t.integer	  :a1380, default: 0
+      t.integer	  :r1380, default: 0
+      t.integer	  :g1380, default: 0
+      t.integer	  :b1380, default: 0
+      t.integer	  :a1390, default: 0
+      t.integer	  :r1390, default: 0
+      t.integer	  :g1390, default: 0
+      t.integer	  :b1390, default: 0
+      t.integer	  :a1400, default: 0
+      t.integer	  :r1400, default: 0
+      t.integer	  :g1400, default: 0
+      t.integer	  :b1400, default: 0
+      t.integer	  :a1410, default: 0
+      t.integer	  :r1410, default: 0
+      t.integer	  :g1410, default: 0
+      t.integer	  :b1410, default: 0
+      t.integer	  :a1420, default: 0
+      t.integer	  :r1420, default: 0
+      t.integer	  :g1420, default: 0
+      t.integer	  :b1420, default: 0
+      t.integer	  :a1430, default: 0
+      t.integer	  :r1430, default: 0
+      t.integer	  :g1430, default: 0
+      t.integer	  :b1430, default: 0
+      t.integer	  :a1440, default: 0
+      t.integer	  :r1440, default: 0
+      t.integer	  :g1440, default: 0
+      t.integer	  :b1440, default: 0
+      t.integer	  :a1450, default: 0
+      t.integer	  :r1450, default: 0
+      t.integer	  :g1450, default: 0
+      t.integer	  :b1450, default: 0
+      t.integer	  :a1460, default: 0
+      t.integer	  :r1460, default: 0
+      t.integer	  :g1460, default: 0
+      t.integer	  :b1460, default: 0
+      t.integer	  :a1470, default: 0
+      t.integer	  :r1470, default: 0
+      t.integer	  :g1470, default: 0
+      t.integer	  :b1470, default: 0
+      t.integer	  :a1480, default: 0
+      t.integer	  :r1480, default: 0
+      t.integer	  :g1480, default: 0
+      t.integer	  :b1480, default: 0
+      t.integer	  :a1490, default: 0
+      t.integer	  :r1490, default: 0
+      t.integer	  :g1490, default: 0
+      t.integer	  :b1490, default: 0     
     end
     
     add_index :processed_spectrums, :spectrum_id, :unique => true
     
     # Generate the processed spectrums for all the existing spectrums
-    Spectrum.find(:all).each do	|spectrum|
+    Spectrum.all.each do |spectrum|
       spectrum.generate_processed_spectrum
     end
   end
@@ -613,4 +613,4 @@ def self.up
   def self.down
     drop_table "processed_spectrums"
   end
-end
+end
\ No newline at end of file
diff --git a/db/migrate/20130921134441_add_spectrum_reversal.rb b/db/migrate/20130921134441_add_spectrum_reversal.rb
index 684d25b7..c308216f 100644
--- a/db/migrate/20130921134441_add_spectrum_reversal.rb
+++ b/db/migrate/20130921134441_add_spectrum_reversal.rb
@@ -1,6 +1,6 @@
 class AddSpectrumReversal < ActiveRecord::Migration
   def self.up
-    add_column :spectrums, :reversed, :boolean, :default => false, :null => false
+    add_column :spectrums, :reversed, :boolean, null: false, default: false
   end
 
   def self.down
diff --git a/db/migrate/20150624185446_add_anonymous_user.rb b/db/migrate/20150624185446_add_anonymous_user.rb
index e05ef16f..2697551c 100644
--- a/db/migrate/20150624185446_add_anonymous_user.rb
+++ b/db/migrate/20150624185446_add_anonymous_user.rb
@@ -2,7 +2,7 @@ class AddAnonymousUser < ActiveRecord::Migration
   def up
 
     # create an "anonymous" user:
-    User.new({ id:0, login:'anonymous', email: 'web@publiclab.org' }).save
+    User.create(login:'anonymous', email: 'web@publiclab.org', email_preferences: '1')
 
     # not anonymous, but has user_id = 0 because they predate user system
     Spectrum.where("author != 'anonymous'").where(user_id: 0).each do |spectrum|
@@ -13,7 +13,7 @@ def up
       end
     end
 
-    add_column :spectra_sets, :user_id, :integer, :default => 0
+    add_column :spectra_sets, :user_id, :integer, default: 0
     
     SpectraSet.where("author != 'anonymous'").each do |set|
       user = User.where(login:set.author).first
@@ -23,7 +23,7 @@ def up
       end
     end
 
-    add_column :comments, :user_id, :integer, :default => 0
+    add_column :comments, :user_id, :integer, default: 0
 
     Comment.where("author != 'anonymous'").each do |comment|
       user = User.where(login:comment.author).first
diff --git a/db/migrate/20150715184613_add_spectrum_calibrated.rb b/db/migrate/20150715184613_add_spectrum_calibrated.rb
index 9b34e792..6ae619d8 100644
--- a/db/migrate/20150715184613_add_spectrum_calibrated.rb
+++ b/db/migrate/20150715184613_add_spectrum_calibrated.rb
@@ -1,6 +1,6 @@
 class AddSpectrumCalibrated < ActiveRecord::Migration
   def up
-    add_column :spectrums, :calibrated, :boolean, :default => false, :null => false
+    add_column :spectrums, :calibrated, :boolean, null: false, default: false
     count = Spectrum.count
     Spectrum.select('id').each do |spectrum|
       Spectrum.find(spectrum.id).save
diff --git a/db/migrate/20150715224222_create_sets_spectrums_join_table.rb b/db/migrate/20150715224222_create_sets_spectrums_join_table.rb
index 3a7ce923..6527ada5 100644
--- a/db/migrate/20150715224222_create_sets_spectrums_join_table.rb
+++ b/db/migrate/20150715224222_create_sets_spectrums_join_table.rb
@@ -19,7 +19,7 @@ def up
   end
 
   def down
-    add_column :spectrums, :spectra_string, :string, :default => "", :null => false
+    add_column :spectrums, :spectra_string, :string, null: false, default: ''
     remove_table :spectra_sets_spectrums
   end
 
diff --git a/db/migrate/20150721195514_change_comment_author_to_user.rb b/db/migrate/20150721195514_change_comment_author_to_user.rb
index aeca46ab..14f6be02 100644
--- a/db/migrate/20150721195514_change_comment_author_to_user.rb
+++ b/db/migrate/20150721195514_change_comment_author_to_user.rb
@@ -10,7 +10,6 @@ def up
         end
       end
     end
-    add_column :comments, :wavelength, :integer
     add_column :comments, :intensity,  :integer
   end
 
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index f4873bc0..64f79f10 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -5,8 +5,8 @@ quentin:
   email:                     quentin@example.com
   salt:                      356a192b7913b04c54574d18c28d46e6395428ab # SHA1('0')
   crypted_password:          7522e82320dd02c4ecdd4e7f947b23c9031e04f7 # 'monkey'
-  created_at:                <%= 5.days.ago.to_s :db  %>
-  remember_token_expires_at: <%= 1.days.from_now.to_s %>
+  created_at:                <%= 5.days.ago.to_datetime %>
+  remember_token_expires_at: <%= 1.days.from_now.to_datetime %>
   remember_token:            77de68daecd823babbb58edb1c8e14d7106e83bb
       
 aaron:
@@ -15,7 +15,7 @@ aaron:
   email:                     aaron@example.com
   salt:                      da4b9237bacccdf19c0760cab7aec4a8359010b0 # SHA1('1')
   crypted_password:          89f432716b010607bfaccf025dbde81d444e5766 # 'monkey'
-  created_at:                <%= 1.days.ago.to_s :db %>
+  created_at:                <%= 1.days.ago.to_datetime %>
   remember_token_expires_at: 
   remember_token:            
 
@@ -26,7 +26,7 @@ admin:
   email:                     admin@example.com
   salt:                      da4b9237bacccdf19c0760cab7aec4a8359010b0 # SHA1('1')
   crypted_password:          89f432716b010607bfaccf025dbde81d444e5766 # 'monkey'
-  created_at:                <%= 5.days.ago.to_s :db %>
+  created_at:                <%= 5.days.ago.to_datetime %>
   remember_token_expires_at: 
   remember_token:            
 
@@ -37,6 +37,6 @@ old_password_holder:
   email:                     salty_dog@example.com
   salt:                      7e3041ebc2fc05a40c60028e2c4901a81035d3cd
   crypted_password:          00742970dc9e6319f8019fd54864d3ea740f04b1 # test
-  created_at:                <%= 1.days.ago.to_s :db %>
+  created_at:                <%= 1.days.ago.to_datetime %>
 
 
diff --git a/test/performance/browsing_test.rb b/test/performance/browsing_test.rb
deleted file mode 100755
index 3fea27b9..00000000
--- a/test/performance/browsing_test.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'test_helper'
-require 'rails/performance_test_help'
-
-class BrowsingTest < ActionDispatch::PerformanceTest
-  # Refer to the documentation for all available options
-  # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
-  #                          :output => 'tmp/performance', :formats => [:flat] }
-
-  def test_homepage
-    get '/'
-  end
-end

From e38451901811654861879f8781459fa3528bb3ca Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Thu, 2 Apr 2020 00:47:04 -0300
Subject: [PATCH 07/43] Fixing tests

---
 test/integration/exceptions_test.rb | 2 +-
 test/integration/redirects_test.rb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/exceptions_test.rb b/test/integration/exceptions_test.rb
index e2e6f0b0..4b8495cd 100644
--- a/test/integration/exceptions_test.rb
+++ b/test/integration/exceptions_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ExceptionsTest < ActionController::IntegrationTest
+class ExceptionsTest < ActionDispatch::IntegrationTest
   fixtures :all
 
   #test "POST /products" do
diff --git a/test/integration/redirects_test.rb b/test/integration/redirects_test.rb
index 5310c3cf..16f129d6 100644
--- a/test/integration/redirects_test.rb
+++ b/test/integration/redirects_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RedirectsTest < ActionController::IntegrationTest
+class RedirectsTest < ActionDispatch::IntegrationTest
   fixtures :all
 
   test "GET /sets/show/#" do

From 6f30bd2404394505cc972698d04eee6250a73a60 Mon Sep 17 00:00:00 2001
From: gr455 <ruturaj.mohite.iiitb.org>
Date: Mon, 13 Apr 2020 16:03:14 +0530
Subject: [PATCH 08/43] Add SimpleCov for coverage monitoring

---
 .gitignore          |  3 ++-
 Gemfile             |  4 ++++
 Gemfile.lock        | 12 +++++++++++-
 test/test_helper.rb |  2 ++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 96b96738..bb30f482 100755
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,5 @@ Gemfile.lock
 public/lib
 public/assets
 vendor/
-db/schema.rb
\ No newline at end of file
+db/schema.rb
+coverage/
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index c9864f97..76dab530 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,6 +22,10 @@ group :assets do
   gem 'uglifier', '>= 1.0.3'
 end
 
+group :test do
+	gem 'simplecov', require: false
+end
+
 gem 'rmagick'#, :require => "RMagick"
 gem 'mime-types'#, '1.18'
 gem 'jquery-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1de434f6..2dca608a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -34,6 +34,7 @@ GEM
       activesupport (>= 3.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
+    docile (1.3.2)
     erubis (2.7.0)
     execjs (2.7.0)
     hike (1.2.3)
@@ -97,6 +98,11 @@ GEM
     redcarpet (2.1.1)
     rmagick (2.15.4)
     ruby-openid (2.7.0)
+    simplecov (0.17.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     skylight (1.7.2)
       activesupport (>= 3.0.0)
     sprockets (2.2.3)
@@ -135,6 +141,7 @@ DEPENDENCIES
   redcarpet (= 2.1.1)
   rmagick
   ruby-openid
+  simplecov
   skylight
   sqlite3
   tzinfo (= 0.3.49)
@@ -142,5 +149,8 @@ DEPENDENCIES
   will_paginate (= 3.0.7)
   will_paginate-bootstrap (= 0.2.5)
 
+RUBY VERSION
+   ruby 2.1.10p492
+
 BUNDLED WITH
-   1.11.2
+   1.15.1
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 8bf1192f..f24082c1 100755
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,4 +1,6 @@
+require 'simplecov'
 ENV["RAILS_ENV"] = "test"
+SimpleCov.start
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
 

From eedddb72a6f2aa4493f93ef247fc2814539707aa Mon Sep 17 00:00:00 2001
From: gr455 <ruturaj.mohite.iiitb.org>
Date: Tue, 14 Apr 2020 23:13:23 +0530
Subject: [PATCH 09/43] syntax changes and error fixes

---
 app/controllers/sets_controller.rb    |  2 +-
 app/controllers/users_controller.rb   | 12 ++++++------
 app/models/user.rb                    |  6 +++---
 app/views/users/contributors.html.erb |  2 +-
 app/views/users/dashboard.html.erb    |  2 +-
 app/views/users/show.html.erb         |  2 +-
 config/environments/development.rb    |  1 -
 7 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/controllers/sets_controller.rb b/app/controllers/sets_controller.rb
index 855add49..77d74667 100644
--- a/app/controllers/sets_controller.rb
+++ b/app/controllers/sets_controller.rb
@@ -5,7 +5,7 @@ class SetsController < ApplicationController
   before_filter :no_cache, :only => [ :show, :calibrated, :search ]
 
   def index
-    @sets = SpectraSet.paginate(:order => "created_at DESC", :page => params[:page])
+    @sets = SpectraSet.order(created_at: :desc).paginate(:page => params[:page])
   end
 
   def show2
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 14a5f24e..591877f4 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -12,10 +12,10 @@ def message
   def dashboard
     @offline = "flush"
     @spectrums = Spectrum.order('created_at DESC').where('user_id != 0').paginate(:page => params[:page],:per_page => 24)
-    @sets = SpectraSet.paginate(:page => params[:sets_page], :order => "created_at DESC", :per_page => 25)
-    @comments = Comment.paginate(:page => params[:comments_page], :order => "created_at DESC", :per_page => 40)
-    @users = User.paginate(:page => params[:users_page], :order => "created_at DESC", :per_page => 100)
-    @tags = Tag.paginate(:page => params[:tags_page], :order => "created_at DESC", :per_page => 100)
+    @sets = SpectraSet.order(created_at: :desc).paginate(:page => params[:sets_page], :per_page => 25)
+    @comments = Comment.order(created_at: :desc).paginate(:page => params[:comments_page], :per_page => 40)
+    @users = User.order(created_at: :desc).paginate(:page => params[:users_page], :per_page => 100)
+    @tags = Tag.order(created_at: :desc).paginate(:page => params[:tags_page], :per_page => 100)
   end
 
   def contributors
@@ -35,8 +35,8 @@ def comments
 
   def show
     @user = User.find_by_login(params[:id])
-    @spectrums = @user.spectrums.order("created_at DESC").paginate(:page => params[:page])
-    @sets = @user.sets.order("created_at DESC").paginate(:page => params[:set_page], :per_page => 2)
+    @spectrums = @user.spectrums.order(created_at: :desc).paginate(:page => params[:page])
+    @sets = @user.sets.order(created_at: :desc).paginate(:page => params[:set_page], :per_page => 2)
   end
 
   def index
diff --git a/app/models/user.rb b/app/models/user.rb
index 3f64e7b1..e8d29bd3 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -19,7 +19,7 @@ class User < ActiveRecord::Base
   # HACK HACK HACK -- how to do attr_accessible from here?
   # prevents a user from submitting a crafted form that bypasses activation
   # anything else you want your user to change should be added here.
-  attr_accessible :login, :email, :name, :password, :password_confirmation
+  attr_accessible :login, :email, :name, :password, :password_confirmation, :email_preferences
 
   def after_create
     UserMailer.google_groups_email(self)
@@ -40,11 +40,11 @@ def self.weekly_tallies
   end
 
   def spectrum_count
-    Spectrum.count(:all, :conditions => {:user_id => self.id})
+    Spectrum.where(:user_id => self.id).count
   end
 
   def set_count
-    SpectraSet.count(:all, :conditions => {:user_id => self.id})
+    SpectraSet.where(:user_id => self.id).count
   end
 
   def received_comments
diff --git a/app/views/users/contributors.html.erb b/app/views/users/contributors.html.erb
index f39dac70..aa0fdf0b 100644
--- a/app/views/users/contributors.html.erb
+++ b/app/views/users/contributors.html.erb
@@ -23,7 +23,7 @@
     <% @users.each do |user| %>
     <tr>
       <td><% if user.spectrum_count > 0 %><img width="120px" class="img" src="<%= user.spectrums.order('id DESC').limit(1).last.photo.url(:thumb) %>" /><% end %></td>
-      <td><a href="<%= profile_path(user.login) %>"><%= user.login %></a> 
+      <td><a href="/profile/<%= user.login %>"><%= user.login %></a> 
         | <a href="http://publiclab.org/profile/<%= user.login %>">Public Lab profile</a></td>
       <td><%= user.spectrum_count %> spectra</td>
       <td><%= user.comments.length %> comments</td>
diff --git a/app/views/users/dashboard.html.erb b/app/views/users/dashboard.html.erb
index 62f32f34..a8b9cd38 100755
--- a/app/views/users/dashboard.html.erb
+++ b/app/views/users/dashboard.html.erb
@@ -78,7 +78,7 @@
             <a name="spectra"></a>Recent spectra
             <small class="hidden-phone">
               by contributors like you |
-              <a href="<%= profile_path(current_user.login) %>">Your spectra</a> |
+              <a href="/profile/<%= current_user.login %>">Your spectra</a> |
               <a href="/popular">Popular</a> |
               <a href="/popular/recent">Recently liked</a>
           </small></h3>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 92f82ea1..9fcfad08 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -48,7 +48,7 @@
       <%=h time_ago_in_words(@user.created_at) %> ago
       <br />
       <b>Tags added:</b>
-      <%=h Tag.count :all, :conditions => {:user_id => @user.id} %>
+      <%=h Tag.where(:user_id => @user.id).count %>
     </div>
     <hr />
 
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 82292fdb..76f09aa7 100755
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -47,7 +47,6 @@
 
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
 
   # Do not compress assets
   config.assets.compress = false

From 6229ef07cab5b02da158d92cc51077b5a3ed5840 Mon Sep 17 00:00:00 2001
From: gr455 <ruturaj.mohite.iiitb.org>
Date: Thu, 16 Apr 2020 15:44:32 +0530
Subject: [PATCH 10/43] add route to create and more syntax changes to fix
 errors

---
 app/assets/config/manifest.js         | 3 ++-
 app/controllers/capture_controller.rb | 2 +-
 app/models/spectrum.rb                | 2 +-
 app/views/tags/index.html.erb         | 2 +-
 config/routes.rb                      | 1 +
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
index 0023457d..99907615 100644
--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -2,4 +2,5 @@
 //= link application.js
 //= link capture.css
 //= link capture.js
-//= link analyze.js
\ No newline at end of file
+//= link analyze.js
+//= link upload.js
\ No newline at end of file
diff --git a/app/controllers/capture_controller.rb b/app/controllers/capture_controller.rb
index 4ab3d399..193acec1 100755
--- a/app/controllers/capture_controller.rb
+++ b/app/controllers/capture_controller.rb
@@ -22,7 +22,7 @@ def index
       @calibrations.uniq!
       @start_wavelength, @end_wavelength = @calibration.wavelength_range if @calibration
     end
-    @spectrums = Spectrum.find(:all, :limit => 12, :order => "id DESC")
+    @spectrums = Spectrum.where(:limit => 12).order(id: :desc)
     render :template => "capture/index", :layout => "application"
   end
 
diff --git a/app/models/spectrum.rb b/app/models/spectrum.rb
index ddcf89ea..42809755 100755
--- a/app/models/spectrum.rb
+++ b/app/models/spectrum.rb
@@ -471,7 +471,7 @@ def is_flipped
   end
 
   def liked_by(user_id)
-    Like.find_by_user_id(user_id,:conditions => {:spectrum_id => self.id})
+    Like.where(:spectrum_id => self.id).find_by_user_id(user_id)
   end
 
   # notify each commenter about a new comment
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index 4b754670..72339e15 100644
--- a/app/views/tags/index.html.erb
+++ b/app/views/tags/index.html.erb
@@ -36,7 +36,7 @@
   <% i = 0 %>
   <div class="row tags">
   <% @tagnames.each do |name,count| %>
-    <% if tag = Tag.find_by_name(name, :order => "id DESC") %>
+    <% if tag = Tag.order(id: :desc).find_by_name(name) %>
       <% if tag.spectrum %>
         <div class="span3">
         <a href="<%= tag_path(tag.name) %>">
diff --git a/config/routes.rb b/config/routes.rb
index 5a3554f1..9d0f1b49 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -89,6 +89,7 @@
   get '/popular/recent' => 'likes#recent'
 
   get '/upload' => 'spectrums#new'
+  post '/spectrums/create' => 'spectrums#create'
 
   get '/tags/change_reference/:id' => 'tags#change_reference'
 

From 99850bb2e4dc96159955211a63d634a924774e98 Mon Sep 17 00:00:00 2001
From: gr455 <ruturaj.mohite.iiitb.org>
Date: Wed, 22 Apr 2020 12:49:11 +0530
Subject: [PATCH 11/43] fix integration tests

---
 app/views/spectrums/_sets.html.erb  | 3 +++
 config/routes.rb                    | 1 +
 test/integration/exceptions_test.rb | 4 ++--
 test/integration/redirects_test.rb  | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/views/spectrums/_sets.html.erb b/app/views/spectrums/_sets.html.erb
index 48957bb2..6ed914a4 100644
--- a/app/views/spectrums/_sets.html.erb
+++ b/app/views/spectrums/_sets.html.erb
@@ -1,5 +1,6 @@
 <% row = 1 if row.nil? %>
 <div id="sets" class="row-fluid">
+
 <% @sets.each_with_index do |set,index| %>
 <div class="span<%= 12/row %>">
     <a class="graph_set" id="graph_set_<%= set.id %>" style="height:100px;width:250px;display:block;"></a>
@@ -8,7 +9,9 @@
       <p><a href="<%= profile_path(set.author) %>"><%= set.author %></a> | <%= set.spectrums.length %> spectra |
         <a href="/sets/show/<%= set.id %>#comments"><i class="fa fa-comment"></i> <%= set.comments.length %></a>
       </p>
+      <% if !set.notes.blank? %>
       <p class="notes"><%= set.notes.truncate(200) %></p>
+      <% end %>
     </div>
 
 <script type="text/javascript">
diff --git a/config/routes.rb b/config/routes.rb
index 9d0f1b49..39381417 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -90,6 +90,7 @@
 
   get '/upload' => 'spectrums#new'
   post '/spectrums/create' => 'spectrums#create'
+  post '/comments/spectrum/:id' => 'comments#spectrum'
 
   get '/tags/change_reference/:id' => 'tags#change_reference'
 
diff --git a/test/integration/exceptions_test.rb b/test/integration/exceptions_test.rb
index 4b8495cd..24c155a9 100644
--- a/test/integration/exceptions_test.rb
+++ b/test/integration/exceptions_test.rb
@@ -26,13 +26,13 @@ class ExceptionsTest < ActionDispatch::IntegrationTest
   end
 
   test "GET /spectrums/#" do
-    spectrum = Spectrum.find :first
+    spectrum = Spectrum.first
     get "/spectrums/#{spectrum.id}"
     assert_response :success
   end
 
   test "GET /sets/#" do
-    set = SpectraSet.find :first
+    set = SpectraSet.first
     get "/sets/#{set.id}"
     assert_response :success
   end
diff --git a/test/integration/redirects_test.rb b/test/integration/redirects_test.rb
index 16f129d6..da52efaf 100644
--- a/test/integration/redirects_test.rb
+++ b/test/integration/redirects_test.rb
@@ -4,7 +4,7 @@ class RedirectsTest < ActionDispatch::IntegrationTest
   fixtures :all
 
   test "GET /sets/show/#" do
-    set = SpectraSet.find :first
+    set = SpectraSet.first
     get "/sets/show/#{set.id}"
     assert_response 301
   end

From 142b533bbd047f53dfbbf2f615b406e0a518b6c3 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Wed, 22 Apr 2020 21:49:28 -0300
Subject: [PATCH 12/43] Monkeypatch Rails 4.2 tests to work with Ruby 2.6

---
 test/support/ruby_2_6_rails_4_2_patch.rb | 19 +++++++++++++++++++
 test/test_helper.rb                      |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 test/support/ruby_2_6_rails_4_2_patch.rb

diff --git a/test/support/ruby_2_6_rails_4_2_patch.rb b/test/support/ruby_2_6_rails_4_2_patch.rb
new file mode 100644
index 00000000..5f8a51bf
--- /dev/null
+++ b/test/support/ruby_2_6_rails_4_2_patch.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+if RUBY_VERSION >= '2.6.0'
+  if Rails::VERSION::MAJOR < 5
+    module ActionController
+      class TestResponse < ActionDispatch::TestResponse
+        def recycle!
+          # HACK: to avoid MonitorMixin double-initialize error:
+          @mon_mutex_owner_object_id = nil
+          @mon_mutex = nil
+          initialize
+        end
+      end
+    end
+  else
+    puts 'Monkeypatch for ActionController::TestResponse no longer needed'
+  end
+end
+
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 8bf1192f..a6884d72 100755
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,6 +1,7 @@
 ENV["RAILS_ENV"] = "test"
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
+require 'support/ruby_2_6_rails_4_2_patch'
 
 class ActiveSupport::TestCase
   # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.

From 96a2126e047fdd25770d8fc07bdd855ff911f4ee Mon Sep 17 00:00:00 2001
From: gr455 <ruturaj.mohite.iiitb.org>
Date: Thu, 23 Apr 2020 18:36:02 +0530
Subject: [PATCH 13/43] fix few functional tests

Revert "fix few functional tests"

This reverts commit 5394a08b8c4bfbb08ea89f7e13dd8a45df637bf6.

fix some functional tests
---
 app/assets/config/manifest.js            | 1 +
 app/controllers/capture_controller.rb    | 7 ++++---
 app/controllers/sets_controller.rb       | 2 +-
 test/functional/users_controller_test.rb | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
index 99907615..453f5b6f 100644
--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -1,3 +1,4 @@
+//= link embed.css
 //= link application.css
 //= link application.js
 //= link capture.css
diff --git a/app/controllers/capture_controller.rb b/app/controllers/capture_controller.rb
index 193acec1..8f0f289a 100755
--- a/app/controllers/capture_controller.rb
+++ b/app/controllers/capture_controller.rb
@@ -17,9 +17,10 @@ def index
       elsif current_user.calibrations.count > 0
         @calibration = current_user.last_calibration
       end
-      @calibrations = Spectrum.where(calibrated: true, user_id: current_user.id)
-      @calibrations << @calibration if @calibration
-      @calibrations.uniq!
+      @calibrations = Spectrum.where(calibrated: true, user_id: current_user.id).uniq!
+      if @calibration && !@calibrations.include?(@calibration)
+        @calibrations << @calibration
+      end
       @start_wavelength, @end_wavelength = @calibration.wavelength_range if @calibration
     end
     @spectrums = Spectrum.where(:limit => 12).order(id: :desc)
diff --git a/app/controllers/sets_controller.rb b/app/controllers/sets_controller.rb
index 77d74667..fbfab4c0 100644
--- a/app/controllers/sets_controller.rb
+++ b/app/controllers/sets_controller.rb
@@ -163,7 +163,7 @@ def delete
   def edit
     @set = SpectraSet.find params[:id]
     if @set.user_id == current_user.id || current_user.role == "admin"
-      @spectrums = Spectrum.find(:all, :limit => 4, :order => "created_at DESC")
+      @spectrums = Spectrum.all.order(created_at: :desc).limit(4)
     else
       flash[:error] = "You must own the set to edit it."
       redirect_to "/sets/#{@set.id}"
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index 2ca3e427..addbc407 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'users_controller'
 
 # Re-raise errors caught by the controller.
 class UsersController; def rescue_action(e) raise e end; end

From 7df4715a1aee659d71f0193c2485ef1a49ff286b Mon Sep 17 00:00:00 2001
From: gr455 <ruturaj.mohite.iiitb.org>
Date: Mon, 27 Apr 2020 12:45:27 +0530
Subject: [PATCH 14/43] fix functional tests

---
 app/models/snapshot.rb                  |  2 +-
 test/functional/tags_controller_test.rb | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/models/snapshot.rb b/app/models/snapshot.rb
index 0c4bb683..d50981ce 100644
--- a/app/models/snapshot.rb
+++ b/app/models/snapshot.rb
@@ -60,7 +60,7 @@ def is_deletable?
 
   def is_latest?
     latest = self.spectrum.snapshots
-                 .order('created_at DESC')
+                 .order(created_at: :desc)
                  .limit(1)
                  .last
     latest.id == self.id
diff --git a/test/functional/tags_controller_test.rb b/test/functional/tags_controller_test.rb
index 917fc166..9845a8ae 100644
--- a/test/functional/tags_controller_test.rb
+++ b/test/functional/tags_controller_test.rb
@@ -25,10 +25,11 @@ class TagsControllerTest < ActionController::TestCase
     get :create, tag: { name: 'mytag',
                         spectrum_id: Spectrum.first.id }
     assert_response :redirect
+
     assert_not_nil assigns(:response)[:saved]['mytag']
-    assert_not_nil assigns(:response)[:saved]['mytag']['id']
-    assert_not_nil assigns(:response)[:saved]['mytag']['name']
-    assert_not_nil assigns(:response)[:saved]['mytag']['created_at']
+    assert_not_nil assigns(:response)[:saved]['mytag'][:id]
+    assert_not_nil assigns(:response)[:saved]['mytag'][:name]
+    assert_not_nil assigns(:response)[:saved]['mytag'][:created_at]
     assert_equal "Tag(s) added.", flash[:notice]
     assert_redirected_to spectrum_path(Spectrum.first.id)
   end
@@ -81,7 +82,7 @@ class TagsControllerTest < ActionController::TestCase
     session[:user_id] = users(:aaron).id # log in
 
     @request.headers["Content-Type"] = "application/json"
-    @request.headers["Accept"] = "application/javascript"
+    @request.headers["Accept"] = "application/json"
     xhr :post, :create, tag: { name: 'range:400-500',
                         spectrum_id: users(:quentin).spectrums.first.id }
 
@@ -93,7 +94,7 @@ class TagsControllerTest < ActionController::TestCase
     session[:user_id] = users(:admin).id # log in
 
     @request.headers["Content-Type"] = "application/json"
-    @request.headers["Accept"] = "application/javascript"
+    @request.headers["Accept"] = "application/json"
     xhr :post, :create, tag: { 
       name: 'range:100-500',
       spectrum_id: spectrums(:one).id
@@ -204,7 +205,7 @@ class TagsControllerTest < ActionController::TestCase
 
     # now refer to it:
     @request.headers["Content-Type"] = "application/json"
-    @request.headers["Accept"] = "application/javascript"
+    @request.headers["Accept"] = "application/json"
     tagname = "subtract:#{spectrums(:two).id}"
     xhr :post, :create, tag: { 
       name: tagname,
@@ -231,7 +232,6 @@ class TagsControllerTest < ActionController::TestCase
     assert tag.save!
     data = '{"lines":[{"r":10,"g":10,"b":10,"average":10,"wavelength":400},{"r":10,"g":10,"b":10,"average":10,"wavelength":700}]}'
     tag.create_snapshot(data)
-
     # create an operation which will refer to the snapshot:
     tag2 = Tag.new({
       user_id:     spectrums(:one).user_id,
@@ -277,7 +277,7 @@ class TagsControllerTest < ActionController::TestCase
     assert_not_equal tag['name'], "subtract:#{spectrums(:two).id}"
     assert_equal     tag['name'], "subtract:#{spectrums(:two).id}##{spectrums(:two).snapshots.first.id}"
     assert_not_nil   tag['refers_to_latest_snapshot']
-    assert_equal     tag['refers_to_latest_snapshot'], false
+    assert_equal     false, tag['refers_to_latest_snapshot']
 
   end
 

From 1f615da745d02d6dd9cd79c8980b65d40e15c281 Mon Sep 17 00:00:00 2001
From: gr455 <ruturaj.mohite.iiitb.org>
Date: Mon, 27 Apr 2020 17:03:44 +0530
Subject: [PATCH 15/43] Fix all functional and unit tests

---
 app/models/snapshot.rb                  | 1 +
 app/models/spectrum.rb                  | 7 +++----
 test/functional/tags_controller_test.rb | 4 ++++
 test/unit/snapshot_test.rb              | 4 +++-
 test/unit/tag_test.rb                   | 8 +++++---
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/models/snapshot.rb b/app/models/snapshot.rb
index d50981ce..85ede325 100644
--- a/app/models/snapshot.rb
+++ b/app/models/snapshot.rb
@@ -63,6 +63,7 @@ def is_latest?
                  .order(created_at: :desc)
                  .limit(1)
                  .last
+
     latest.id == self.id
   end
 
diff --git a/app/models/spectrum.rb b/app/models/spectrum.rb
index 42809755..452d533a 100755
--- a/app/models/spectrum.rb
+++ b/app/models/spectrum.rb
@@ -230,19 +230,18 @@ def fork(user)
     new.tag("forked:#{self.id}", user.id)
     # record "now" timestamp
     now = Time.now
-    seconds = 0
     # now copy over all tags, in order:
     self.tags.each do |tag|
       unless tag.key == "forked"
-        newtag = new.tag(tag.name, user.id) 
+        newtag = new.tag(tag.name, user.id)
+        now = now + 1 #increment now by one second per tag
         # preserve created_at, for tag ordering; we should be able to tell based on spectrum created_at
-        newtag.created_at = now + seconds.seconds # forward-date each by 1 second
+        newtag.created_at = now # forward-date each by 1 second
         if tag.needs_snapshot? && tag.snapshot && !tag.snapshot.data.nil?
           newtag.create_snapshot(tag.snapshot.data) 
           newtag.snapshot.created_at = newtag.created_at
         end
         newtag.save
-        seconds += 1
       end
     end
     Spectrum.find new.id # refetch it to get all the tags, for some reason needed by tests
diff --git a/test/functional/tags_controller_test.rb b/test/functional/tags_controller_test.rb
index 9845a8ae..ef813785 100644
--- a/test/functional/tags_controller_test.rb
+++ b/test/functional/tags_controller_test.rb
@@ -124,6 +124,7 @@ class TagsControllerTest < ActionController::TestCase
     assert_equal tag.name, 'smooth:1'
     assert tag.create_snapshot('{"lines":[{"r":10,"g":10,"b":10,"average":10,"wavelength":400},{"r":10,"g":10,"b":10,"average":10,"wavelength":700}]}')
 
+    sleep 1 #to preserve created_at
     # create a snapshot which will refer to the same spectrum, and be the latest:
     tag2 = Tag.new({
       user_id:     tag.user_id,
@@ -232,6 +233,7 @@ class TagsControllerTest < ActionController::TestCase
     assert tag.save!
     data = '{"lines":[{"r":10,"g":10,"b":10,"average":10,"wavelength":400},{"r":10,"g":10,"b":10,"average":10,"wavelength":700}]}'
     tag.create_snapshot(data)
+    sleep 1 #to preserve created_at
     # create an operation which will refer to the snapshot:
     tag2 = Tag.new({
       user_id:     spectrums(:one).user_id,
@@ -258,6 +260,8 @@ class TagsControllerTest < ActionController::TestCase
     assert_equal     tag['reference_spectrum_snapshots'].length, spectrums(:two).snapshots.length
 
     # create a new snapshot, making our tag no longer pointed at the most recent snapshot
+    sleep 1 #to preserve created_at
+
     tag = Tag.new({
       user_id:     spectrums(:two).user_id,
       spectrum_id: spectrums(:two).id,
diff --git a/test/unit/snapshot_test.rb b/test/unit/snapshot_test.rb
index c6c8432c..4f1641ac 100644
--- a/test/unit/snapshot_test.rb
+++ b/test/unit/snapshot_test.rb
@@ -200,6 +200,8 @@ class SnapshotTest < ActiveSupport::TestCase
     data = '{"lines":[{"r":10,"g":10,"b":10,"average":10,"wavelength":400},{"r":10,"g":10,"b":10,"average":10,"wavelength":700}]}'
     tag1.create_snapshot(data)
 
+    sleep 1 #so that created_by desc gets different created_by s
+
     tag = Tag.new({
       user_id:     users(:quentin).id,
       spectrum_id: spectrums(:one).id,
@@ -353,7 +355,7 @@ class SnapshotTest < ActiveSupport::TestCase
     snapshot1 = tag1.create_snapshot(data)
 
     assert snapshot1.valid?
-
+    sleep 1
     tag2 = Tag.new({
       user_id:     users(:quentin).id,
       spectrum_id: spectrums(:one).id,
diff --git a/test/unit/tag_test.rb b/test/unit/tag_test.rb
index 51360762..23ee9404 100644
--- a/test/unit/tag_test.rb
+++ b/test/unit/tag_test.rb
@@ -110,7 +110,7 @@ class TagTest < ActiveSupport::TestCase
 
     assert_not_nil tag.dependent_spectrum_ids
     assert_equal tag.dependent_spectrum_ids, []
-
+    sleep 1
     # create a snapshot which will refer to the same spectrum, and be the latest:
     tag2 = Tag.new({
       user_id:     tag.user_id,
@@ -120,8 +120,7 @@ class TagTest < ActiveSupport::TestCase
     assert tag2.save!
     assert_equal tag2.name, 'smooth:3'
     tag2.create_snapshot('{"lines":[{"r":10,"g":10,"b":10,"average":10,"wavelength":400},{"r":10,"g":10,"b":10,"average":10,"wavelength":700}]}')
-
-    assert !tag.is_deletable?
+    assert !tag.is_deletable? #latest tag is smooth:1 till here
     assert tag.snapshot
     assert !tag.snapshot.is_latest?
     assert !tag.snapshot.has_dependent_spectra?
@@ -181,6 +180,8 @@ class TagTest < ActiveSupport::TestCase
     assert tag.create_snapshot('{"lines":[{"r":10,"g":10,"b":10,"average":10,"wavelength":400},{"r":10,"g":10,"b":10,"average":10,"wavelength":700}]}')
     assert tag.snapshot.is_latest?
 
+    sleep 1
+
     tag2 = Tag.new({
       user_id:     users(:aaron).id,
       spectrum_id: users(:aaron).spectrums.last.id,
@@ -191,6 +192,7 @@ class TagTest < ActiveSupport::TestCase
     assert tag2.create_snapshot('{"lines":[{"r":10,"g":10,"b":10,"average":10,"wavelength":400},{"r":10,"g":10,"b":10,"average":10,"wavelength":700}]}')
     assert tag2.snapshot.is_latest?
 
+    sleep 1
     # create a snapshot which will reference this snapshot, and be dependent on it:
     tag3 = Tag.new({
       user_id:     Spectrum.last.user_id,

From eb0e7e1d6efe0515d4c5bcae08c7f6797cf80d7c Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Mon, 27 Apr 2020 21:28:57 -0300
Subject: [PATCH 16/43] Fixing asset precompilation stage

---
 .travis.yml                        |  5 +++++
 config/database.yml.docker.example | 13 ++++++++++---
 config/database.yml.example        |  9 ++++++++-
 script/start.sh                    |  1 +
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4dc71804..12c08a54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,10 @@ node_js:
 env:
   global:
     - RAILS_ENV=test
+    - DB_HOST='127.0.0.1'
+    - DB_USER='swbench'
+    - DB_PASS='swbench'
+    - DB_NAME='swbench'
 
 cache:
   directories:
@@ -36,6 +40,7 @@ install:
       mysql -e "CREATE USER 'swbench'@'%' IDENTIFIED BY 'swbench';";
       mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'swbench'@'%';";
       bundle exec rake db:schema:load;
+      bundle exec rake db:migrate;
     else
       bundle exec rake db:create;
       bundle exec rake db:migrate;
diff --git a/config/database.yml.docker.example b/config/database.yml.docker.example
index 617db595..3cef02c6 100644
--- a/config/database.yml.docker.example
+++ b/config/database.yml.docker.example
@@ -8,13 +8,20 @@ default: &default
 development:
   <<: *default
   host: db
-  username: root 
+  username: root
   password: root
   database: swbench_development
 
 production:
-  adapter: sqlite3
-  database: production.db
+  encoding: utf8
+  adapter: mysql2
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+  host: <%= ENV['DB_HOST'] || 'db' %>
+  username: <%= ENV['DB_USER'] || 'swbench' %>
+  password: <%= ENV['DB_PASS'] || 'swbench' %>
+  database: <%= ENV['DB_NAME'] || 'swbench' %>
+  socket: <%= ENV['DB_SOCKET'] %>
+  timeout: 5000
 
 test:
   <<: *default
diff --git a/config/database.yml.example b/config/database.yml.example
index e075ab36..192665fa 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -9,8 +9,15 @@ development:
   database: swbench_development
 
 production:
+  encoding: utf8
   adapter: mysql2
-  database: production.db
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+  host: <%= ENV['DB_HOST'] || 'production.db' %>
+  username: <%= ENV['DB_USER'] || 'swbench' %>
+  password: <%= ENV['DB_PASS'] || 'swbench' %>
+  database: <%= ENV['DB_NAME'] || 'swbench' %>
+  socket: <%= ENV['DB_SOCKET'] %>
+  timeout: 5000
 
 test:
   <<: *default
diff --git a/script/start.sh b/script/start.sh
index 372e4f57..a117772f 100755
--- a/script/start.sh
+++ b/script/start.sh
@@ -15,6 +15,7 @@ done
 
 echo "MySQL is up and running!"
 
+bundle exec rake db:create
 bundle exec rake db:schema:load
 bundle exec rake db:migrate
 bundle exec rake db:seed

From 78f655f4c65e9215658fe2e13363d3c2225d71a4 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Mon, 27 Apr 2020 21:48:16 -0300
Subject: [PATCH 17/43] Updating schema file

---
 .travis.yml          |    1 +
 db/schema.rb.example | 1440 +++++++++++++++++++++---------------------
 script/start.sh      |    4 +-
 3 files changed, 723 insertions(+), 722 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 12c08a54..eeb34ab9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,6 +43,7 @@ install:
       bundle exec rake db:migrate;
     else
       bundle exec rake db:create;
+      bundle exec rake db:schema:load;
       bundle exec rake db:migrate;
     fi
 
diff --git a/db/schema.rb.example b/db/schema.rb.example
index e2f22f72..9c644ee3 100644
--- a/db/schema.rb.example
+++ b/db/schema.rb.example
@@ -9,775 +9,775 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20190513143943) do
+ActiveRecord::Schema.define(version: 20190513143943) do
 
-  create_table "comments", :force => true do |t|
-    t.string   "author"
-    t.string   "email"
-    t.text     "body"
-    t.integer  "x"
-    t.integer  "y"
-    t.integer  "spectrum_id"
+  create_table "comments", force: :cascade do |t|
+    t.string   "author",         limit: 255
+    t.string   "email",          limit: 255
+    t.text     "body",           limit: 65535
+    t.float    "wavelength",     limit: 24
+    t.integer  "x",              limit: 4
+    t.integer  "y",              limit: 4
+    t.integer  "spectrum_id",    limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "spectra_set_id", :default => 0
-    t.integer  "user_id",        :default => 0
-    t.integer  "wavelength"
-    t.integer  "intensity"
+    t.integer  "spectra_set_id", limit: 4,     default: 0
+    t.integer  "user_id",        limit: 4,     default: 0
+    t.integer  "intensity",      limit: 4
   end
 
-  create_table "devices", :force => true do |t|
-    t.string   "name"
-    t.string   "description",    :limit => 100, :default => "", :null => false
-    t.integer  "height"
-    t.integer  "width"
-    t.integer  "calibration_id"
-    t.integer  "user_id"
-    t.decimal  "range_start"
-    t.decimal  "range_end"
+  create_table "devices", force: :cascade do |t|
+    t.string   "name",           limit: 255
+    t.string   "description",    limit: 100,                default: "", null: false
+    t.integer  "height",         limit: 4
+    t.integer  "width",          limit: 4
+    t.integer  "calibration_id", limit: 4
+    t.integer  "user_id",        limit: 4
+    t.decimal  "range_start",                precision: 10
+    t.decimal  "range_end",                  precision: 10
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "key",                           :default => "", :null => false
+    t.string   "key",            limit: 255,                default: "", null: false
   end
 
-  create_table "likes", :force => true do |t|
-    t.integer  "spectrum_id"
-    t.string   "like_type",   :default => "like", :null => false
-    t.integer  "user_id"
+  create_table "likes", force: :cascade do |t|
+    t.integer  "spectrum_id", limit: 4
+    t.string   "like_type",   limit: 255, default: "like", null: false
+    t.integer  "user_id",     limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "macros", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "macro_type",  :default => "analyze",   :null => false
-    t.string   "title"
-    t.string   "url"
-    t.text     "description"
-    t.text     "code"
-    t.string   "published",   :default => "published"
+  create_table "macros", force: :cascade do |t|
+    t.integer  "user_id",     limit: 4
+    t.string   "macro_type",  limit: 255,   default: "analyze",   null: false
+    t.string   "title",       limit: 255
+    t.string   "url",         limit: 255
+    t.text     "description", limit: 65535
+    t.text     "code",        limit: 65535
+    t.string   "published",   limit: 255,   default: "published"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "processed_spectrums", :force => true do |t|
-    t.integer "spectrum_id"
-    t.integer "a10",         :default => 0
-    t.integer "r10",         :default => 0
-    t.integer "g10",         :default => 0
-    t.integer "b10",         :default => 0
-    t.integer "a20",         :default => 0
-    t.integer "r20",         :default => 0
-    t.integer "g20",         :default => 0
-    t.integer "b20",         :default => 0
-    t.integer "a30",         :default => 0
-    t.integer "r30",         :default => 0
-    t.integer "g30",         :default => 0
-    t.integer "b30",         :default => 0
-    t.integer "a40",         :default => 0
-    t.integer "r40",         :default => 0
-    t.integer "g40",         :default => 0
-    t.integer "b40",         :default => 0
-    t.integer "a50",         :default => 0
-    t.integer "r50",         :default => 0
-    t.integer "g50",         :default => 0
-    t.integer "b50",         :default => 0
-    t.integer "a60",         :default => 0
-    t.integer "r60",         :default => 0
-    t.integer "g60",         :default => 0
-    t.integer "b60",         :default => 0
-    t.integer "a70",         :default => 0
-    t.integer "r70",         :default => 0
-    t.integer "g70",         :default => 0
-    t.integer "b70",         :default => 0
-    t.integer "a80",         :default => 0
-    t.integer "r80",         :default => 0
-    t.integer "g80",         :default => 0
-    t.integer "b80",         :default => 0
-    t.integer "a90",         :default => 0
-    t.integer "r90",         :default => 0
-    t.integer "g90",         :default => 0
-    t.integer "b90",         :default => 0
-    t.integer "a100",        :default => 0
-    t.integer "r100",        :default => 0
-    t.integer "g100",        :default => 0
-    t.integer "b100",        :default => 0
-    t.integer "a110",        :default => 0
-    t.integer "r110",        :default => 0
-    t.integer "g110",        :default => 0
-    t.integer "b110",        :default => 0
-    t.integer "a120",        :default => 0
-    t.integer "r120",        :default => 0
-    t.integer "g120",        :default => 0
-    t.integer "b120",        :default => 0
-    t.integer "a130",        :default => 0
-    t.integer "r130",        :default => 0
-    t.integer "g130",        :default => 0
-    t.integer "b130",        :default => 0
-    t.integer "a140",        :default => 0
-    t.integer "r140",        :default => 0
-    t.integer "g140",        :default => 0
-    t.integer "b140",        :default => 0
-    t.integer "a150",        :default => 0
-    t.integer "r150",        :default => 0
-    t.integer "g150",        :default => 0
-    t.integer "b150",        :default => 0
-    t.integer "a160",        :default => 0
-    t.integer "r160",        :default => 0
-    t.integer "g160",        :default => 0
-    t.integer "b160",        :default => 0
-    t.integer "a170",        :default => 0
-    t.integer "r170",        :default => 0
-    t.integer "g170",        :default => 0
-    t.integer "b170",        :default => 0
-    t.integer "a180",        :default => 0
-    t.integer "r180",        :default => 0
-    t.integer "g180",        :default => 0
-    t.integer "b180",        :default => 0
-    t.integer "a190",        :default => 0
-    t.integer "r190",        :default => 0
-    t.integer "g190",        :default => 0
-    t.integer "b190",        :default => 0
-    t.integer "a200",        :default => 0
-    t.integer "r200",        :default => 0
-    t.integer "g200",        :default => 0
-    t.integer "b200",        :default => 0
-    t.integer "a210",        :default => 0
-    t.integer "r210",        :default => 0
-    t.integer "g210",        :default => 0
-    t.integer "b210",        :default => 0
-    t.integer "a220",        :default => 0
-    t.integer "r220",        :default => 0
-    t.integer "g220",        :default => 0
-    t.integer "b220",        :default => 0
-    t.integer "a230",        :default => 0
-    t.integer "r230",        :default => 0
-    t.integer "g230",        :default => 0
-    t.integer "b230",        :default => 0
-    t.integer "a240",        :default => 0
-    t.integer "r240",        :default => 0
-    t.integer "g240",        :default => 0
-    t.integer "b240",        :default => 0
-    t.integer "a250",        :default => 0
-    t.integer "r250",        :default => 0
-    t.integer "g250",        :default => 0
-    t.integer "b250",        :default => 0
-    t.integer "a260",        :default => 0
-    t.integer "r260",        :default => 0
-    t.integer "g260",        :default => 0
-    t.integer "b260",        :default => 0
-    t.integer "a270",        :default => 0
-    t.integer "r270",        :default => 0
-    t.integer "g270",        :default => 0
-    t.integer "b270",        :default => 0
-    t.integer "a280",        :default => 0
-    t.integer "r280",        :default => 0
-    t.integer "g280",        :default => 0
-    t.integer "b280",        :default => 0
-    t.integer "a290",        :default => 0
-    t.integer "r290",        :default => 0
-    t.integer "g290",        :default => 0
-    t.integer "b290",        :default => 0
-    t.integer "a300",        :default => 0
-    t.integer "r300",        :default => 0
-    t.integer "g300",        :default => 0
-    t.integer "b300",        :default => 0
-    t.integer "a310",        :default => 0
-    t.integer "r310",        :default => 0
-    t.integer "g310",        :default => 0
-    t.integer "b310",        :default => 0
-    t.integer "a320",        :default => 0
-    t.integer "r320",        :default => 0
-    t.integer "g320",        :default => 0
-    t.integer "b320",        :default => 0
-    t.integer "a330",        :default => 0
-    t.integer "r330",        :default => 0
-    t.integer "g330",        :default => 0
-    t.integer "b330",        :default => 0
-    t.integer "a340",        :default => 0
-    t.integer "r340",        :default => 0
-    t.integer "g340",        :default => 0
-    t.integer "b340",        :default => 0
-    t.integer "a350",        :default => 0
-    t.integer "r350",        :default => 0
-    t.integer "g350",        :default => 0
-    t.integer "b350",        :default => 0
-    t.integer "a360",        :default => 0
-    t.integer "r360",        :default => 0
-    t.integer "g360",        :default => 0
-    t.integer "b360",        :default => 0
-    t.integer "a370",        :default => 0
-    t.integer "r370",        :default => 0
-    t.integer "g370",        :default => 0
-    t.integer "b370",        :default => 0
-    t.integer "a380",        :default => 0
-    t.integer "r380",        :default => 0
-    t.integer "g380",        :default => 0
-    t.integer "b380",        :default => 0
-    t.integer "a390",        :default => 0
-    t.integer "r390",        :default => 0
-    t.integer "g390",        :default => 0
-    t.integer "b390",        :default => 0
-    t.integer "a400",        :default => 0
-    t.integer "r400",        :default => 0
-    t.integer "g400",        :default => 0
-    t.integer "b400",        :default => 0
-    t.integer "a410",        :default => 0
-    t.integer "r410",        :default => 0
-    t.integer "g410",        :default => 0
-    t.integer "b410",        :default => 0
-    t.integer "a420",        :default => 0
-    t.integer "r420",        :default => 0
-    t.integer "g420",        :default => 0
-    t.integer "b420",        :default => 0
-    t.integer "a430",        :default => 0
-    t.integer "r430",        :default => 0
-    t.integer "g430",        :default => 0
-    t.integer "b430",        :default => 0
-    t.integer "a440",        :default => 0
-    t.integer "r440",        :default => 0
-    t.integer "g440",        :default => 0
-    t.integer "b440",        :default => 0
-    t.integer "a450",        :default => 0
-    t.integer "r450",        :default => 0
-    t.integer "g450",        :default => 0
-    t.integer "b450",        :default => 0
-    t.integer "a460",        :default => 0
-    t.integer "r460",        :default => 0
-    t.integer "g460",        :default => 0
-    t.integer "b460",        :default => 0
-    t.integer "a470",        :default => 0
-    t.integer "r470",        :default => 0
-    t.integer "g470",        :default => 0
-    t.integer "b470",        :default => 0
-    t.integer "a480",        :default => 0
-    t.integer "r480",        :default => 0
-    t.integer "g480",        :default => 0
-    t.integer "b480",        :default => 0
-    t.integer "a490",        :default => 0
-    t.integer "r490",        :default => 0
-    t.integer "g490",        :default => 0
-    t.integer "b490",        :default => 0
-    t.integer "a500",        :default => 0
-    t.integer "r500",        :default => 0
-    t.integer "g500",        :default => 0
-    t.integer "b500",        :default => 0
-    t.integer "a510",        :default => 0
-    t.integer "r510",        :default => 0
-    t.integer "g510",        :default => 0
-    t.integer "b510",        :default => 0
-    t.integer "a520",        :default => 0
-    t.integer "r520",        :default => 0
-    t.integer "g520",        :default => 0
-    t.integer "b520",        :default => 0
-    t.integer "a530",        :default => 0
-    t.integer "r530",        :default => 0
-    t.integer "g530",        :default => 0
-    t.integer "b530",        :default => 0
-    t.integer "a540",        :default => 0
-    t.integer "r540",        :default => 0
-    t.integer "g540",        :default => 0
-    t.integer "b540",        :default => 0
-    t.integer "a550",        :default => 0
-    t.integer "r550",        :default => 0
-    t.integer "g550",        :default => 0
-    t.integer "b550",        :default => 0
-    t.integer "a560",        :default => 0
-    t.integer "r560",        :default => 0
-    t.integer "g560",        :default => 0
-    t.integer "b560",        :default => 0
-    t.integer "a570",        :default => 0
-    t.integer "r570",        :default => 0
-    t.integer "g570",        :default => 0
-    t.integer "b570",        :default => 0
-    t.integer "a580",        :default => 0
-    t.integer "r580",        :default => 0
-    t.integer "g580",        :default => 0
-    t.integer "b580",        :default => 0
-    t.integer "a590",        :default => 0
-    t.integer "r590",        :default => 0
-    t.integer "g590",        :default => 0
-    t.integer "b590",        :default => 0
-    t.integer "a600",        :default => 0
-    t.integer "r600",        :default => 0
-    t.integer "g600",        :default => 0
-    t.integer "b600",        :default => 0
-    t.integer "a610",        :default => 0
-    t.integer "r610",        :default => 0
-    t.integer "g610",        :default => 0
-    t.integer "b610",        :default => 0
-    t.integer "a620",        :default => 0
-    t.integer "r620",        :default => 0
-    t.integer "g620",        :default => 0
-    t.integer "b620",        :default => 0
-    t.integer "a630",        :default => 0
-    t.integer "r630",        :default => 0
-    t.integer "g630",        :default => 0
-    t.integer "b630",        :default => 0
-    t.integer "a640",        :default => 0
-    t.integer "r640",        :default => 0
-    t.integer "g640",        :default => 0
-    t.integer "b640",        :default => 0
-    t.integer "a650",        :default => 0
-    t.integer "r650",        :default => 0
-    t.integer "g650",        :default => 0
-    t.integer "b650",        :default => 0
-    t.integer "a660",        :default => 0
-    t.integer "r660",        :default => 0
-    t.integer "g660",        :default => 0
-    t.integer "b660",        :default => 0
-    t.integer "a670",        :default => 0
-    t.integer "r670",        :default => 0
-    t.integer "g670",        :default => 0
-    t.integer "b670",        :default => 0
-    t.integer "a680",        :default => 0
-    t.integer "r680",        :default => 0
-    t.integer "g680",        :default => 0
-    t.integer "b680",        :default => 0
-    t.integer "a690",        :default => 0
-    t.integer "r690",        :default => 0
-    t.integer "g690",        :default => 0
-    t.integer "b690",        :default => 0
-    t.integer "a700",        :default => 0
-    t.integer "r700",        :default => 0
-    t.integer "g700",        :default => 0
-    t.integer "b700",        :default => 0
-    t.integer "a710",        :default => 0
-    t.integer "r710",        :default => 0
-    t.integer "g710",        :default => 0
-    t.integer "b710",        :default => 0
-    t.integer "a720",        :default => 0
-    t.integer "r720",        :default => 0
-    t.integer "g720",        :default => 0
-    t.integer "b720",        :default => 0
-    t.integer "a730",        :default => 0
-    t.integer "r730",        :default => 0
-    t.integer "g730",        :default => 0
-    t.integer "b730",        :default => 0
-    t.integer "a740",        :default => 0
-    t.integer "r740",        :default => 0
-    t.integer "g740",        :default => 0
-    t.integer "b740",        :default => 0
-    t.integer "a750",        :default => 0
-    t.integer "r750",        :default => 0
-    t.integer "g750",        :default => 0
-    t.integer "b750",        :default => 0
-    t.integer "a760",        :default => 0
-    t.integer "r760",        :default => 0
-    t.integer "g760",        :default => 0
-    t.integer "b760",        :default => 0
-    t.integer "a770",        :default => 0
-    t.integer "r770",        :default => 0
-    t.integer "g770",        :default => 0
-    t.integer "b770",        :default => 0
-    t.integer "a780",        :default => 0
-    t.integer "r780",        :default => 0
-    t.integer "g780",        :default => 0
-    t.integer "b780",        :default => 0
-    t.integer "a790",        :default => 0
-    t.integer "r790",        :default => 0
-    t.integer "g790",        :default => 0
-    t.integer "b790",        :default => 0
-    t.integer "a800",        :default => 0
-    t.integer "r800",        :default => 0
-    t.integer "g800",        :default => 0
-    t.integer "b800",        :default => 0
-    t.integer "a810",        :default => 0
-    t.integer "r810",        :default => 0
-    t.integer "g810",        :default => 0
-    t.integer "b810",        :default => 0
-    t.integer "a820",        :default => 0
-    t.integer "r820",        :default => 0
-    t.integer "g820",        :default => 0
-    t.integer "b820",        :default => 0
-    t.integer "a830",        :default => 0
-    t.integer "r830",        :default => 0
-    t.integer "g830",        :default => 0
-    t.integer "b830",        :default => 0
-    t.integer "a840",        :default => 0
-    t.integer "r840",        :default => 0
-    t.integer "g840",        :default => 0
-    t.integer "b840",        :default => 0
-    t.integer "a850",        :default => 0
-    t.integer "r850",        :default => 0
-    t.integer "g850",        :default => 0
-    t.integer "b850",        :default => 0
-    t.integer "a860",        :default => 0
-    t.integer "r860",        :default => 0
-    t.integer "g860",        :default => 0
-    t.integer "b860",        :default => 0
-    t.integer "a870",        :default => 0
-    t.integer "r870",        :default => 0
-    t.integer "g870",        :default => 0
-    t.integer "b870",        :default => 0
-    t.integer "a880",        :default => 0
-    t.integer "r880",        :default => 0
-    t.integer "g880",        :default => 0
-    t.integer "b880",        :default => 0
-    t.integer "a890",        :default => 0
-    t.integer "r890",        :default => 0
-    t.integer "g890",        :default => 0
-    t.integer "b890",        :default => 0
-    t.integer "a900",        :default => 0
-    t.integer "r900",        :default => 0
-    t.integer "g900",        :default => 0
-    t.integer "b900",        :default => 0
-    t.integer "a910",        :default => 0
-    t.integer "r910",        :default => 0
-    t.integer "g910",        :default => 0
-    t.integer "b910",        :default => 0
-    t.integer "a920",        :default => 0
-    t.integer "r920",        :default => 0
-    t.integer "g920",        :default => 0
-    t.integer "b920",        :default => 0
-    t.integer "a930",        :default => 0
-    t.integer "r930",        :default => 0
-    t.integer "g930",        :default => 0
-    t.integer "b930",        :default => 0
-    t.integer "a940",        :default => 0
-    t.integer "r940",        :default => 0
-    t.integer "g940",        :default => 0
-    t.integer "b940",        :default => 0
-    t.integer "a950",        :default => 0
-    t.integer "r950",        :default => 0
-    t.integer "g950",        :default => 0
-    t.integer "b950",        :default => 0
-    t.integer "a960",        :default => 0
-    t.integer "r960",        :default => 0
-    t.integer "g960",        :default => 0
-    t.integer "b960",        :default => 0
-    t.integer "a970",        :default => 0
-    t.integer "r970",        :default => 0
-    t.integer "g970",        :default => 0
-    t.integer "b970",        :default => 0
-    t.integer "a980",        :default => 0
-    t.integer "r980",        :default => 0
-    t.integer "g980",        :default => 0
-    t.integer "b980",        :default => 0
-    t.integer "a990",        :default => 0
-    t.integer "r990",        :default => 0
-    t.integer "g990",        :default => 0
-    t.integer "b990",        :default => 0
-    t.integer "a1000",       :default => 0
-    t.integer "r1000",       :default => 0
-    t.integer "g1000",       :default => 0
-    t.integer "b1000",       :default => 0
-    t.integer "a1010",       :default => 0
-    t.integer "r1010",       :default => 0
-    t.integer "g1010",       :default => 0
-    t.integer "b1010",       :default => 0
-    t.integer "a1020",       :default => 0
-    t.integer "r1020",       :default => 0
-    t.integer "g1020",       :default => 0
-    t.integer "b1020",       :default => 0
-    t.integer "a1030",       :default => 0
-    t.integer "r1030",       :default => 0
-    t.integer "g1030",       :default => 0
-    t.integer "b1030",       :default => 0
-    t.integer "a1040",       :default => 0
-    t.integer "r1040",       :default => 0
-    t.integer "g1040",       :default => 0
-    t.integer "b1040",       :default => 0
-    t.integer "a1050",       :default => 0
-    t.integer "r1050",       :default => 0
-    t.integer "g1050",       :default => 0
-    t.integer "b1050",       :default => 0
-    t.integer "a1060",       :default => 0
-    t.integer "r1060",       :default => 0
-    t.integer "g1060",       :default => 0
-    t.integer "b1060",       :default => 0
-    t.integer "a1070",       :default => 0
-    t.integer "r1070",       :default => 0
-    t.integer "g1070",       :default => 0
-    t.integer "b1070",       :default => 0
-    t.integer "a1080",       :default => 0
-    t.integer "r1080",       :default => 0
-    t.integer "g1080",       :default => 0
-    t.integer "b1080",       :default => 0
-    t.integer "a1090",       :default => 0
-    t.integer "r1090",       :default => 0
-    t.integer "g1090",       :default => 0
-    t.integer "b1090",       :default => 0
-    t.integer "a1100",       :default => 0
-    t.integer "r1100",       :default => 0
-    t.integer "g1100",       :default => 0
-    t.integer "b1100",       :default => 0
-    t.integer "a1110",       :default => 0
-    t.integer "r1110",       :default => 0
-    t.integer "g1110",       :default => 0
-    t.integer "b1110",       :default => 0
-    t.integer "a1120",       :default => 0
-    t.integer "r1120",       :default => 0
-    t.integer "g1120",       :default => 0
-    t.integer "b1120",       :default => 0
-    t.integer "a1130",       :default => 0
-    t.integer "r1130",       :default => 0
-    t.integer "g1130",       :default => 0
-    t.integer "b1130",       :default => 0
-    t.integer "a1140",       :default => 0
-    t.integer "r1140",       :default => 0
-    t.integer "g1140",       :default => 0
-    t.integer "b1140",       :default => 0
-    t.integer "a1150",       :default => 0
-    t.integer "r1150",       :default => 0
-    t.integer "g1150",       :default => 0
-    t.integer "b1150",       :default => 0
-    t.integer "a1160",       :default => 0
-    t.integer "r1160",       :default => 0
-    t.integer "g1160",       :default => 0
-    t.integer "b1160",       :default => 0
-    t.integer "a1170",       :default => 0
-    t.integer "r1170",       :default => 0
-    t.integer "g1170",       :default => 0
-    t.integer "b1170",       :default => 0
-    t.integer "a1180",       :default => 0
-    t.integer "r1180",       :default => 0
-    t.integer "g1180",       :default => 0
-    t.integer "b1180",       :default => 0
-    t.integer "a1190",       :default => 0
-    t.integer "r1190",       :default => 0
-    t.integer "g1190",       :default => 0
-    t.integer "b1190",       :default => 0
-    t.integer "a1200",       :default => 0
-    t.integer "r1200",       :default => 0
-    t.integer "g1200",       :default => 0
-    t.integer "b1200",       :default => 0
-    t.integer "a1210",       :default => 0
-    t.integer "r1210",       :default => 0
-    t.integer "g1210",       :default => 0
-    t.integer "b1210",       :default => 0
-    t.integer "a1220",       :default => 0
-    t.integer "r1220",       :default => 0
-    t.integer "g1220",       :default => 0
-    t.integer "b1220",       :default => 0
-    t.integer "a1230",       :default => 0
-    t.integer "r1230",       :default => 0
-    t.integer "g1230",       :default => 0
-    t.integer "b1230",       :default => 0
-    t.integer "a1240",       :default => 0
-    t.integer "r1240",       :default => 0
-    t.integer "g1240",       :default => 0
-    t.integer "b1240",       :default => 0
-    t.integer "a1250",       :default => 0
-    t.integer "r1250",       :default => 0
-    t.integer "g1250",       :default => 0
-    t.integer "b1250",       :default => 0
-    t.integer "a1260",       :default => 0
-    t.integer "r1260",       :default => 0
-    t.integer "g1260",       :default => 0
-    t.integer "b1260",       :default => 0
-    t.integer "a1270",       :default => 0
-    t.integer "r1270",       :default => 0
-    t.integer "g1270",       :default => 0
-    t.integer "b1270",       :default => 0
-    t.integer "a1280",       :default => 0
-    t.integer "r1280",       :default => 0
-    t.integer "g1280",       :default => 0
-    t.integer "b1280",       :default => 0
-    t.integer "a1290",       :default => 0
-    t.integer "r1290",       :default => 0
-    t.integer "g1290",       :default => 0
-    t.integer "b1290",       :default => 0
-    t.integer "a1300",       :default => 0
-    t.integer "r1300",       :default => 0
-    t.integer "g1300",       :default => 0
-    t.integer "b1300",       :default => 0
-    t.integer "a1310",       :default => 0
-    t.integer "r1310",       :default => 0
-    t.integer "g1310",       :default => 0
-    t.integer "b1310",       :default => 0
-    t.integer "a1320",       :default => 0
-    t.integer "r1320",       :default => 0
-    t.integer "g1320",       :default => 0
-    t.integer "b1320",       :default => 0
-    t.integer "a1330",       :default => 0
-    t.integer "r1330",       :default => 0
-    t.integer "g1330",       :default => 0
-    t.integer "b1330",       :default => 0
-    t.integer "a1340",       :default => 0
-    t.integer "r1340",       :default => 0
-    t.integer "g1340",       :default => 0
-    t.integer "b1340",       :default => 0
-    t.integer "a1350",       :default => 0
-    t.integer "r1350",       :default => 0
-    t.integer "g1350",       :default => 0
-    t.integer "b1350",       :default => 0
-    t.integer "a1360",       :default => 0
-    t.integer "r1360",       :default => 0
-    t.integer "g1360",       :default => 0
-    t.integer "b1360",       :default => 0
-    t.integer "a1370",       :default => 0
-    t.integer "r1370",       :default => 0
-    t.integer "g1370",       :default => 0
-    t.integer "b1370",       :default => 0
-    t.integer "a1380",       :default => 0
-    t.integer "r1380",       :default => 0
-    t.integer "g1380",       :default => 0
-    t.integer "b1380",       :default => 0
-    t.integer "a1390",       :default => 0
-    t.integer "r1390",       :default => 0
-    t.integer "g1390",       :default => 0
-    t.integer "b1390",       :default => 0
-    t.integer "a1400",       :default => 0
-    t.integer "r1400",       :default => 0
-    t.integer "g1400",       :default => 0
-    t.integer "b1400",       :default => 0
-    t.integer "a1410",       :default => 0
-    t.integer "r1410",       :default => 0
-    t.integer "g1410",       :default => 0
-    t.integer "b1410",       :default => 0
-    t.integer "a1420",       :default => 0
-    t.integer "r1420",       :default => 0
-    t.integer "g1420",       :default => 0
-    t.integer "b1420",       :default => 0
-    t.integer "a1430",       :default => 0
-    t.integer "r1430",       :default => 0
-    t.integer "g1430",       :default => 0
-    t.integer "b1430",       :default => 0
-    t.integer "a1440",       :default => 0
-    t.integer "r1440",       :default => 0
-    t.integer "g1440",       :default => 0
-    t.integer "b1440",       :default => 0
-    t.integer "a1450",       :default => 0
-    t.integer "r1450",       :default => 0
-    t.integer "g1450",       :default => 0
-    t.integer "b1450",       :default => 0
-    t.integer "a1460",       :default => 0
-    t.integer "r1460",       :default => 0
-    t.integer "g1460",       :default => 0
-    t.integer "b1460",       :default => 0
-    t.integer "a1470",       :default => 0
-    t.integer "r1470",       :default => 0
-    t.integer "g1470",       :default => 0
-    t.integer "b1470",       :default => 0
-    t.integer "a1480",       :default => 0
-    t.integer "r1480",       :default => 0
-    t.integer "g1480",       :default => 0
-    t.integer "b1480",       :default => 0
-    t.integer "a1490",       :default => 0
-    t.integer "r1490",       :default => 0
-    t.integer "g1490",       :default => 0
-    t.integer "b1490",       :default => 0
+  create_table "processed_spectrums", force: :cascade do |t|
+    t.integer "spectrum_id", limit: 4
+    t.integer "a10",         limit: 4, default: 0
+    t.integer "r10",         limit: 4, default: 0
+    t.integer "g10",         limit: 4, default: 0
+    t.integer "b10",         limit: 4, default: 0
+    t.integer "a20",         limit: 4, default: 0
+    t.integer "r20",         limit: 4, default: 0
+    t.integer "g20",         limit: 4, default: 0
+    t.integer "b20",         limit: 4, default: 0
+    t.integer "a30",         limit: 4, default: 0
+    t.integer "r30",         limit: 4, default: 0
+    t.integer "g30",         limit: 4, default: 0
+    t.integer "b30",         limit: 4, default: 0
+    t.integer "a40",         limit: 4, default: 0
+    t.integer "r40",         limit: 4, default: 0
+    t.integer "g40",         limit: 4, default: 0
+    t.integer "b40",         limit: 4, default: 0
+    t.integer "a50",         limit: 4, default: 0
+    t.integer "r50",         limit: 4, default: 0
+    t.integer "g50",         limit: 4, default: 0
+    t.integer "b50",         limit: 4, default: 0
+    t.integer "a60",         limit: 4, default: 0
+    t.integer "r60",         limit: 4, default: 0
+    t.integer "g60",         limit: 4, default: 0
+    t.integer "b60",         limit: 4, default: 0
+    t.integer "a70",         limit: 4, default: 0
+    t.integer "r70",         limit: 4, default: 0
+    t.integer "g70",         limit: 4, default: 0
+    t.integer "b70",         limit: 4, default: 0
+    t.integer "a80",         limit: 4, default: 0
+    t.integer "r80",         limit: 4, default: 0
+    t.integer "g80",         limit: 4, default: 0
+    t.integer "b80",         limit: 4, default: 0
+    t.integer "a90",         limit: 4, default: 0
+    t.integer "r90",         limit: 4, default: 0
+    t.integer "g90",         limit: 4, default: 0
+    t.integer "b90",         limit: 4, default: 0
+    t.integer "a100",        limit: 4, default: 0
+    t.integer "r100",        limit: 4, default: 0
+    t.integer "g100",        limit: 4, default: 0
+    t.integer "b100",        limit: 4, default: 0
+    t.integer "a110",        limit: 4, default: 0
+    t.integer "r110",        limit: 4, default: 0
+    t.integer "g110",        limit: 4, default: 0
+    t.integer "b110",        limit: 4, default: 0
+    t.integer "a120",        limit: 4, default: 0
+    t.integer "r120",        limit: 4, default: 0
+    t.integer "g120",        limit: 4, default: 0
+    t.integer "b120",        limit: 4, default: 0
+    t.integer "a130",        limit: 4, default: 0
+    t.integer "r130",        limit: 4, default: 0
+    t.integer "g130",        limit: 4, default: 0
+    t.integer "b130",        limit: 4, default: 0
+    t.integer "a140",        limit: 4, default: 0
+    t.integer "r140",        limit: 4, default: 0
+    t.integer "g140",        limit: 4, default: 0
+    t.integer "b140",        limit: 4, default: 0
+    t.integer "a150",        limit: 4, default: 0
+    t.integer "r150",        limit: 4, default: 0
+    t.integer "g150",        limit: 4, default: 0
+    t.integer "b150",        limit: 4, default: 0
+    t.integer "a160",        limit: 4, default: 0
+    t.integer "r160",        limit: 4, default: 0
+    t.integer "g160",        limit: 4, default: 0
+    t.integer "b160",        limit: 4, default: 0
+    t.integer "a170",        limit: 4, default: 0
+    t.integer "r170",        limit: 4, default: 0
+    t.integer "g170",        limit: 4, default: 0
+    t.integer "b170",        limit: 4, default: 0
+    t.integer "a180",        limit: 4, default: 0
+    t.integer "r180",        limit: 4, default: 0
+    t.integer "g180",        limit: 4, default: 0
+    t.integer "b180",        limit: 4, default: 0
+    t.integer "a190",        limit: 4, default: 0
+    t.integer "r190",        limit: 4, default: 0
+    t.integer "g190",        limit: 4, default: 0
+    t.integer "b190",        limit: 4, default: 0
+    t.integer "a200",        limit: 4, default: 0
+    t.integer "r200",        limit: 4, default: 0
+    t.integer "g200",        limit: 4, default: 0
+    t.integer "b200",        limit: 4, default: 0
+    t.integer "a210",        limit: 4, default: 0
+    t.integer "r210",        limit: 4, default: 0
+    t.integer "g210",        limit: 4, default: 0
+    t.integer "b210",        limit: 4, default: 0
+    t.integer "a220",        limit: 4, default: 0
+    t.integer "r220",        limit: 4, default: 0
+    t.integer "g220",        limit: 4, default: 0
+    t.integer "b220",        limit: 4, default: 0
+    t.integer "a230",        limit: 4, default: 0
+    t.integer "r230",        limit: 4, default: 0
+    t.integer "g230",        limit: 4, default: 0
+    t.integer "b230",        limit: 4, default: 0
+    t.integer "a240",        limit: 4, default: 0
+    t.integer "r240",        limit: 4, default: 0
+    t.integer "g240",        limit: 4, default: 0
+    t.integer "b240",        limit: 4, default: 0
+    t.integer "a250",        limit: 4, default: 0
+    t.integer "r250",        limit: 4, default: 0
+    t.integer "g250",        limit: 4, default: 0
+    t.integer "b250",        limit: 4, default: 0
+    t.integer "a260",        limit: 4, default: 0
+    t.integer "r260",        limit: 4, default: 0
+    t.integer "g260",        limit: 4, default: 0
+    t.integer "b260",        limit: 4, default: 0
+    t.integer "a270",        limit: 4, default: 0
+    t.integer "r270",        limit: 4, default: 0
+    t.integer "g270",        limit: 4, default: 0
+    t.integer "b270",        limit: 4, default: 0
+    t.integer "a280",        limit: 4, default: 0
+    t.integer "r280",        limit: 4, default: 0
+    t.integer "g280",        limit: 4, default: 0
+    t.integer "b280",        limit: 4, default: 0
+    t.integer "a290",        limit: 4, default: 0
+    t.integer "r290",        limit: 4, default: 0
+    t.integer "g290",        limit: 4, default: 0
+    t.integer "b290",        limit: 4, default: 0
+    t.integer "a300",        limit: 4, default: 0
+    t.integer "r300",        limit: 4, default: 0
+    t.integer "g300",        limit: 4, default: 0
+    t.integer "b300",        limit: 4, default: 0
+    t.integer "a310",        limit: 4, default: 0
+    t.integer "r310",        limit: 4, default: 0
+    t.integer "g310",        limit: 4, default: 0
+    t.integer "b310",        limit: 4, default: 0
+    t.integer "a320",        limit: 4, default: 0
+    t.integer "r320",        limit: 4, default: 0
+    t.integer "g320",        limit: 4, default: 0
+    t.integer "b320",        limit: 4, default: 0
+    t.integer "a330",        limit: 4, default: 0
+    t.integer "r330",        limit: 4, default: 0
+    t.integer "g330",        limit: 4, default: 0
+    t.integer "b330",        limit: 4, default: 0
+    t.integer "a340",        limit: 4, default: 0
+    t.integer "r340",        limit: 4, default: 0
+    t.integer "g340",        limit: 4, default: 0
+    t.integer "b340",        limit: 4, default: 0
+    t.integer "a350",        limit: 4, default: 0
+    t.integer "r350",        limit: 4, default: 0
+    t.integer "g350",        limit: 4, default: 0
+    t.integer "b350",        limit: 4, default: 0
+    t.integer "a360",        limit: 4, default: 0
+    t.integer "r360",        limit: 4, default: 0
+    t.integer "g360",        limit: 4, default: 0
+    t.integer "b360",        limit: 4, default: 0
+    t.integer "a370",        limit: 4, default: 0
+    t.integer "r370",        limit: 4, default: 0
+    t.integer "g370",        limit: 4, default: 0
+    t.integer "b370",        limit: 4, default: 0
+    t.integer "a380",        limit: 4, default: 0
+    t.integer "r380",        limit: 4, default: 0
+    t.integer "g380",        limit: 4, default: 0
+    t.integer "b380",        limit: 4, default: 0
+    t.integer "a390",        limit: 4, default: 0
+    t.integer "r390",        limit: 4, default: 0
+    t.integer "g390",        limit: 4, default: 0
+    t.integer "b390",        limit: 4, default: 0
+    t.integer "a400",        limit: 4, default: 0
+    t.integer "r400",        limit: 4, default: 0
+    t.integer "g400",        limit: 4, default: 0
+    t.integer "b400",        limit: 4, default: 0
+    t.integer "a410",        limit: 4, default: 0
+    t.integer "r410",        limit: 4, default: 0
+    t.integer "g410",        limit: 4, default: 0
+    t.integer "b410",        limit: 4, default: 0
+    t.integer "a420",        limit: 4, default: 0
+    t.integer "r420",        limit: 4, default: 0
+    t.integer "g420",        limit: 4, default: 0
+    t.integer "b420",        limit: 4, default: 0
+    t.integer "a430",        limit: 4, default: 0
+    t.integer "r430",        limit: 4, default: 0
+    t.integer "g430",        limit: 4, default: 0
+    t.integer "b430",        limit: 4, default: 0
+    t.integer "a440",        limit: 4, default: 0
+    t.integer "r440",        limit: 4, default: 0
+    t.integer "g440",        limit: 4, default: 0
+    t.integer "b440",        limit: 4, default: 0
+    t.integer "a450",        limit: 4, default: 0
+    t.integer "r450",        limit: 4, default: 0
+    t.integer "g450",        limit: 4, default: 0
+    t.integer "b450",        limit: 4, default: 0
+    t.integer "a460",        limit: 4, default: 0
+    t.integer "r460",        limit: 4, default: 0
+    t.integer "g460",        limit: 4, default: 0
+    t.integer "b460",        limit: 4, default: 0
+    t.integer "a470",        limit: 4, default: 0
+    t.integer "r470",        limit: 4, default: 0
+    t.integer "g470",        limit: 4, default: 0
+    t.integer "b470",        limit: 4, default: 0
+    t.integer "a480",        limit: 4, default: 0
+    t.integer "r480",        limit: 4, default: 0
+    t.integer "g480",        limit: 4, default: 0
+    t.integer "b480",        limit: 4, default: 0
+    t.integer "a490",        limit: 4, default: 0
+    t.integer "r490",        limit: 4, default: 0
+    t.integer "g490",        limit: 4, default: 0
+    t.integer "b490",        limit: 4, default: 0
+    t.integer "a500",        limit: 4, default: 0
+    t.integer "r500",        limit: 4, default: 0
+    t.integer "g500",        limit: 4, default: 0
+    t.integer "b500",        limit: 4, default: 0
+    t.integer "a510",        limit: 4, default: 0
+    t.integer "r510",        limit: 4, default: 0
+    t.integer "g510",        limit: 4, default: 0
+    t.integer "b510",        limit: 4, default: 0
+    t.integer "a520",        limit: 4, default: 0
+    t.integer "r520",        limit: 4, default: 0
+    t.integer "g520",        limit: 4, default: 0
+    t.integer "b520",        limit: 4, default: 0
+    t.integer "a530",        limit: 4, default: 0
+    t.integer "r530",        limit: 4, default: 0
+    t.integer "g530",        limit: 4, default: 0
+    t.integer "b530",        limit: 4, default: 0
+    t.integer "a540",        limit: 4, default: 0
+    t.integer "r540",        limit: 4, default: 0
+    t.integer "g540",        limit: 4, default: 0
+    t.integer "b540",        limit: 4, default: 0
+    t.integer "a550",        limit: 4, default: 0
+    t.integer "r550",        limit: 4, default: 0
+    t.integer "g550",        limit: 4, default: 0
+    t.integer "b550",        limit: 4, default: 0
+    t.integer "a560",        limit: 4, default: 0
+    t.integer "r560",        limit: 4, default: 0
+    t.integer "g560",        limit: 4, default: 0
+    t.integer "b560",        limit: 4, default: 0
+    t.integer "a570",        limit: 4, default: 0
+    t.integer "r570",        limit: 4, default: 0
+    t.integer "g570",        limit: 4, default: 0
+    t.integer "b570",        limit: 4, default: 0
+    t.integer "a580",        limit: 4, default: 0
+    t.integer "r580",        limit: 4, default: 0
+    t.integer "g580",        limit: 4, default: 0
+    t.integer "b580",        limit: 4, default: 0
+    t.integer "a590",        limit: 4, default: 0
+    t.integer "r590",        limit: 4, default: 0
+    t.integer "g590",        limit: 4, default: 0
+    t.integer "b590",        limit: 4, default: 0
+    t.integer "a600",        limit: 4, default: 0
+    t.integer "r600",        limit: 4, default: 0
+    t.integer "g600",        limit: 4, default: 0
+    t.integer "b600",        limit: 4, default: 0
+    t.integer "a610",        limit: 4, default: 0
+    t.integer "r610",        limit: 4, default: 0
+    t.integer "g610",        limit: 4, default: 0
+    t.integer "b610",        limit: 4, default: 0
+    t.integer "a620",        limit: 4, default: 0
+    t.integer "r620",        limit: 4, default: 0
+    t.integer "g620",        limit: 4, default: 0
+    t.integer "b620",        limit: 4, default: 0
+    t.integer "a630",        limit: 4, default: 0
+    t.integer "r630",        limit: 4, default: 0
+    t.integer "g630",        limit: 4, default: 0
+    t.integer "b630",        limit: 4, default: 0
+    t.integer "a640",        limit: 4, default: 0
+    t.integer "r640",        limit: 4, default: 0
+    t.integer "g640",        limit: 4, default: 0
+    t.integer "b640",        limit: 4, default: 0
+    t.integer "a650",        limit: 4, default: 0
+    t.integer "r650",        limit: 4, default: 0
+    t.integer "g650",        limit: 4, default: 0
+    t.integer "b650",        limit: 4, default: 0
+    t.integer "a660",        limit: 4, default: 0
+    t.integer "r660",        limit: 4, default: 0
+    t.integer "g660",        limit: 4, default: 0
+    t.integer "b660",        limit: 4, default: 0
+    t.integer "a670",        limit: 4, default: 0
+    t.integer "r670",        limit: 4, default: 0
+    t.integer "g670",        limit: 4, default: 0
+    t.integer "b670",        limit: 4, default: 0
+    t.integer "a680",        limit: 4, default: 0
+    t.integer "r680",        limit: 4, default: 0
+    t.integer "g680",        limit: 4, default: 0
+    t.integer "b680",        limit: 4, default: 0
+    t.integer "a690",        limit: 4, default: 0
+    t.integer "r690",        limit: 4, default: 0
+    t.integer "g690",        limit: 4, default: 0
+    t.integer "b690",        limit: 4, default: 0
+    t.integer "a700",        limit: 4, default: 0
+    t.integer "r700",        limit: 4, default: 0
+    t.integer "g700",        limit: 4, default: 0
+    t.integer "b700",        limit: 4, default: 0
+    t.integer "a710",        limit: 4, default: 0
+    t.integer "r710",        limit: 4, default: 0
+    t.integer "g710",        limit: 4, default: 0
+    t.integer "b710",        limit: 4, default: 0
+    t.integer "a720",        limit: 4, default: 0
+    t.integer "r720",        limit: 4, default: 0
+    t.integer "g720",        limit: 4, default: 0
+    t.integer "b720",        limit: 4, default: 0
+    t.integer "a730",        limit: 4, default: 0
+    t.integer "r730",        limit: 4, default: 0
+    t.integer "g730",        limit: 4, default: 0
+    t.integer "b730",        limit: 4, default: 0
+    t.integer "a740",        limit: 4, default: 0
+    t.integer "r740",        limit: 4, default: 0
+    t.integer "g740",        limit: 4, default: 0
+    t.integer "b740",        limit: 4, default: 0
+    t.integer "a750",        limit: 4, default: 0
+    t.integer "r750",        limit: 4, default: 0
+    t.integer "g750",        limit: 4, default: 0
+    t.integer "b750",        limit: 4, default: 0
+    t.integer "a760",        limit: 4, default: 0
+    t.integer "r760",        limit: 4, default: 0
+    t.integer "g760",        limit: 4, default: 0
+    t.integer "b760",        limit: 4, default: 0
+    t.integer "a770",        limit: 4, default: 0
+    t.integer "r770",        limit: 4, default: 0
+    t.integer "g770",        limit: 4, default: 0
+    t.integer "b770",        limit: 4, default: 0
+    t.integer "a780",        limit: 4, default: 0
+    t.integer "r780",        limit: 4, default: 0
+    t.integer "g780",        limit: 4, default: 0
+    t.integer "b780",        limit: 4, default: 0
+    t.integer "a790",        limit: 4, default: 0
+    t.integer "r790",        limit: 4, default: 0
+    t.integer "g790",        limit: 4, default: 0
+    t.integer "b790",        limit: 4, default: 0
+    t.integer "a800",        limit: 4, default: 0
+    t.integer "r800",        limit: 4, default: 0
+    t.integer "g800",        limit: 4, default: 0
+    t.integer "b800",        limit: 4, default: 0
+    t.integer "a810",        limit: 4, default: 0
+    t.integer "r810",        limit: 4, default: 0
+    t.integer "g810",        limit: 4, default: 0
+    t.integer "b810",        limit: 4, default: 0
+    t.integer "a820",        limit: 4, default: 0
+    t.integer "r820",        limit: 4, default: 0
+    t.integer "g820",        limit: 4, default: 0
+    t.integer "b820",        limit: 4, default: 0
+    t.integer "a830",        limit: 4, default: 0
+    t.integer "r830",        limit: 4, default: 0
+    t.integer "g830",        limit: 4, default: 0
+    t.integer "b830",        limit: 4, default: 0
+    t.integer "a840",        limit: 4, default: 0
+    t.integer "r840",        limit: 4, default: 0
+    t.integer "g840",        limit: 4, default: 0
+    t.integer "b840",        limit: 4, default: 0
+    t.integer "a850",        limit: 4, default: 0
+    t.integer "r850",        limit: 4, default: 0
+    t.integer "g850",        limit: 4, default: 0
+    t.integer "b850",        limit: 4, default: 0
+    t.integer "a860",        limit: 4, default: 0
+    t.integer "r860",        limit: 4, default: 0
+    t.integer "g860",        limit: 4, default: 0
+    t.integer "b860",        limit: 4, default: 0
+    t.integer "a870",        limit: 4, default: 0
+    t.integer "r870",        limit: 4, default: 0
+    t.integer "g870",        limit: 4, default: 0
+    t.integer "b870",        limit: 4, default: 0
+    t.integer "a880",        limit: 4, default: 0
+    t.integer "r880",        limit: 4, default: 0
+    t.integer "g880",        limit: 4, default: 0
+    t.integer "b880",        limit: 4, default: 0
+    t.integer "a890",        limit: 4, default: 0
+    t.integer "r890",        limit: 4, default: 0
+    t.integer "g890",        limit: 4, default: 0
+    t.integer "b890",        limit: 4, default: 0
+    t.integer "a900",        limit: 4, default: 0
+    t.integer "r900",        limit: 4, default: 0
+    t.integer "g900",        limit: 4, default: 0
+    t.integer "b900",        limit: 4, default: 0
+    t.integer "a910",        limit: 4, default: 0
+    t.integer "r910",        limit: 4, default: 0
+    t.integer "g910",        limit: 4, default: 0
+    t.integer "b910",        limit: 4, default: 0
+    t.integer "a920",        limit: 4, default: 0
+    t.integer "r920",        limit: 4, default: 0
+    t.integer "g920",        limit: 4, default: 0
+    t.integer "b920",        limit: 4, default: 0
+    t.integer "a930",        limit: 4, default: 0
+    t.integer "r930",        limit: 4, default: 0
+    t.integer "g930",        limit: 4, default: 0
+    t.integer "b930",        limit: 4, default: 0
+    t.integer "a940",        limit: 4, default: 0
+    t.integer "r940",        limit: 4, default: 0
+    t.integer "g940",        limit: 4, default: 0
+    t.integer "b940",        limit: 4, default: 0
+    t.integer "a950",        limit: 4, default: 0
+    t.integer "r950",        limit: 4, default: 0
+    t.integer "g950",        limit: 4, default: 0
+    t.integer "b950",        limit: 4, default: 0
+    t.integer "a960",        limit: 4, default: 0
+    t.integer "r960",        limit: 4, default: 0
+    t.integer "g960",        limit: 4, default: 0
+    t.integer "b960",        limit: 4, default: 0
+    t.integer "a970",        limit: 4, default: 0
+    t.integer "r970",        limit: 4, default: 0
+    t.integer "g970",        limit: 4, default: 0
+    t.integer "b970",        limit: 4, default: 0
+    t.integer "a980",        limit: 4, default: 0
+    t.integer "r980",        limit: 4, default: 0
+    t.integer "g980",        limit: 4, default: 0
+    t.integer "b980",        limit: 4, default: 0
+    t.integer "a990",        limit: 4, default: 0
+    t.integer "r990",        limit: 4, default: 0
+    t.integer "g990",        limit: 4, default: 0
+    t.integer "b990",        limit: 4, default: 0
+    t.integer "a1000",       limit: 4, default: 0
+    t.integer "r1000",       limit: 4, default: 0
+    t.integer "g1000",       limit: 4, default: 0
+    t.integer "b1000",       limit: 4, default: 0
+    t.integer "a1010",       limit: 4, default: 0
+    t.integer "r1010",       limit: 4, default: 0
+    t.integer "g1010",       limit: 4, default: 0
+    t.integer "b1010",       limit: 4, default: 0
+    t.integer "a1020",       limit: 4, default: 0
+    t.integer "r1020",       limit: 4, default: 0
+    t.integer "g1020",       limit: 4, default: 0
+    t.integer "b1020",       limit: 4, default: 0
+    t.integer "a1030",       limit: 4, default: 0
+    t.integer "r1030",       limit: 4, default: 0
+    t.integer "g1030",       limit: 4, default: 0
+    t.integer "b1030",       limit: 4, default: 0
+    t.integer "a1040",       limit: 4, default: 0
+    t.integer "r1040",       limit: 4, default: 0
+    t.integer "g1040",       limit: 4, default: 0
+    t.integer "b1040",       limit: 4, default: 0
+    t.integer "a1050",       limit: 4, default: 0
+    t.integer "r1050",       limit: 4, default: 0
+    t.integer "g1050",       limit: 4, default: 0
+    t.integer "b1050",       limit: 4, default: 0
+    t.integer "a1060",       limit: 4, default: 0
+    t.integer "r1060",       limit: 4, default: 0
+    t.integer "g1060",       limit: 4, default: 0
+    t.integer "b1060",       limit: 4, default: 0
+    t.integer "a1070",       limit: 4, default: 0
+    t.integer "r1070",       limit: 4, default: 0
+    t.integer "g1070",       limit: 4, default: 0
+    t.integer "b1070",       limit: 4, default: 0
+    t.integer "a1080",       limit: 4, default: 0
+    t.integer "r1080",       limit: 4, default: 0
+    t.integer "g1080",       limit: 4, default: 0
+    t.integer "b1080",       limit: 4, default: 0
+    t.integer "a1090",       limit: 4, default: 0
+    t.integer "r1090",       limit: 4, default: 0
+    t.integer "g1090",       limit: 4, default: 0
+    t.integer "b1090",       limit: 4, default: 0
+    t.integer "a1100",       limit: 4, default: 0
+    t.integer "r1100",       limit: 4, default: 0
+    t.integer "g1100",       limit: 4, default: 0
+    t.integer "b1100",       limit: 4, default: 0
+    t.integer "a1110",       limit: 4, default: 0
+    t.integer "r1110",       limit: 4, default: 0
+    t.integer "g1110",       limit: 4, default: 0
+    t.integer "b1110",       limit: 4, default: 0
+    t.integer "a1120",       limit: 4, default: 0
+    t.integer "r1120",       limit: 4, default: 0
+    t.integer "g1120",       limit: 4, default: 0
+    t.integer "b1120",       limit: 4, default: 0
+    t.integer "a1130",       limit: 4, default: 0
+    t.integer "r1130",       limit: 4, default: 0
+    t.integer "g1130",       limit: 4, default: 0
+    t.integer "b1130",       limit: 4, default: 0
+    t.integer "a1140",       limit: 4, default: 0
+    t.integer "r1140",       limit: 4, default: 0
+    t.integer "g1140",       limit: 4, default: 0
+    t.integer "b1140",       limit: 4, default: 0
+    t.integer "a1150",       limit: 4, default: 0
+    t.integer "r1150",       limit: 4, default: 0
+    t.integer "g1150",       limit: 4, default: 0
+    t.integer "b1150",       limit: 4, default: 0
+    t.integer "a1160",       limit: 4, default: 0
+    t.integer "r1160",       limit: 4, default: 0
+    t.integer "g1160",       limit: 4, default: 0
+    t.integer "b1160",       limit: 4, default: 0
+    t.integer "a1170",       limit: 4, default: 0
+    t.integer "r1170",       limit: 4, default: 0
+    t.integer "g1170",       limit: 4, default: 0
+    t.integer "b1170",       limit: 4, default: 0
+    t.integer "a1180",       limit: 4, default: 0
+    t.integer "r1180",       limit: 4, default: 0
+    t.integer "g1180",       limit: 4, default: 0
+    t.integer "b1180",       limit: 4, default: 0
+    t.integer "a1190",       limit: 4, default: 0
+    t.integer "r1190",       limit: 4, default: 0
+    t.integer "g1190",       limit: 4, default: 0
+    t.integer "b1190",       limit: 4, default: 0
+    t.integer "a1200",       limit: 4, default: 0
+    t.integer "r1200",       limit: 4, default: 0
+    t.integer "g1200",       limit: 4, default: 0
+    t.integer "b1200",       limit: 4, default: 0
+    t.integer "a1210",       limit: 4, default: 0
+    t.integer "r1210",       limit: 4, default: 0
+    t.integer "g1210",       limit: 4, default: 0
+    t.integer "b1210",       limit: 4, default: 0
+    t.integer "a1220",       limit: 4, default: 0
+    t.integer "r1220",       limit: 4, default: 0
+    t.integer "g1220",       limit: 4, default: 0
+    t.integer "b1220",       limit: 4, default: 0
+    t.integer "a1230",       limit: 4, default: 0
+    t.integer "r1230",       limit: 4, default: 0
+    t.integer "g1230",       limit: 4, default: 0
+    t.integer "b1230",       limit: 4, default: 0
+    t.integer "a1240",       limit: 4, default: 0
+    t.integer "r1240",       limit: 4, default: 0
+    t.integer "g1240",       limit: 4, default: 0
+    t.integer "b1240",       limit: 4, default: 0
+    t.integer "a1250",       limit: 4, default: 0
+    t.integer "r1250",       limit: 4, default: 0
+    t.integer "g1250",       limit: 4, default: 0
+    t.integer "b1250",       limit: 4, default: 0
+    t.integer "a1260",       limit: 4, default: 0
+    t.integer "r1260",       limit: 4, default: 0
+    t.integer "g1260",       limit: 4, default: 0
+    t.integer "b1260",       limit: 4, default: 0
+    t.integer "a1270",       limit: 4, default: 0
+    t.integer "r1270",       limit: 4, default: 0
+    t.integer "g1270",       limit: 4, default: 0
+    t.integer "b1270",       limit: 4, default: 0
+    t.integer "a1280",       limit: 4, default: 0
+    t.integer "r1280",       limit: 4, default: 0
+    t.integer "g1280",       limit: 4, default: 0
+    t.integer "b1280",       limit: 4, default: 0
+    t.integer "a1290",       limit: 4, default: 0
+    t.integer "r1290",       limit: 4, default: 0
+    t.integer "g1290",       limit: 4, default: 0
+    t.integer "b1290",       limit: 4, default: 0
+    t.integer "a1300",       limit: 4, default: 0
+    t.integer "r1300",       limit: 4, default: 0
+    t.integer "g1300",       limit: 4, default: 0
+    t.integer "b1300",       limit: 4, default: 0
+    t.integer "a1310",       limit: 4, default: 0
+    t.integer "r1310",       limit: 4, default: 0
+    t.integer "g1310",       limit: 4, default: 0
+    t.integer "b1310",       limit: 4, default: 0
+    t.integer "a1320",       limit: 4, default: 0
+    t.integer "r1320",       limit: 4, default: 0
+    t.integer "g1320",       limit: 4, default: 0
+    t.integer "b1320",       limit: 4, default: 0
+    t.integer "a1330",       limit: 4, default: 0
+    t.integer "r1330",       limit: 4, default: 0
+    t.integer "g1330",       limit: 4, default: 0
+    t.integer "b1330",       limit: 4, default: 0
+    t.integer "a1340",       limit: 4, default: 0
+    t.integer "r1340",       limit: 4, default: 0
+    t.integer "g1340",       limit: 4, default: 0
+    t.integer "b1340",       limit: 4, default: 0
+    t.integer "a1350",       limit: 4, default: 0
+    t.integer "r1350",       limit: 4, default: 0
+    t.integer "g1350",       limit: 4, default: 0
+    t.integer "b1350",       limit: 4, default: 0
+    t.integer "a1360",       limit: 4, default: 0
+    t.integer "r1360",       limit: 4, default: 0
+    t.integer "g1360",       limit: 4, default: 0
+    t.integer "b1360",       limit: 4, default: 0
+    t.integer "a1370",       limit: 4, default: 0
+    t.integer "r1370",       limit: 4, default: 0
+    t.integer "g1370",       limit: 4, default: 0
+    t.integer "b1370",       limit: 4, default: 0
+    t.integer "a1380",       limit: 4, default: 0
+    t.integer "r1380",       limit: 4, default: 0
+    t.integer "g1380",       limit: 4, default: 0
+    t.integer "b1380",       limit: 4, default: 0
+    t.integer "a1390",       limit: 4, default: 0
+    t.integer "r1390",       limit: 4, default: 0
+    t.integer "g1390",       limit: 4, default: 0
+    t.integer "b1390",       limit: 4, default: 0
+    t.integer "a1400",       limit: 4, default: 0
+    t.integer "r1400",       limit: 4, default: 0
+    t.integer "g1400",       limit: 4, default: 0
+    t.integer "b1400",       limit: 4, default: 0
+    t.integer "a1410",       limit: 4, default: 0
+    t.integer "r1410",       limit: 4, default: 0
+    t.integer "g1410",       limit: 4, default: 0
+    t.integer "b1410",       limit: 4, default: 0
+    t.integer "a1420",       limit: 4, default: 0
+    t.integer "r1420",       limit: 4, default: 0
+    t.integer "g1420",       limit: 4, default: 0
+    t.integer "b1420",       limit: 4, default: 0
+    t.integer "a1430",       limit: 4, default: 0
+    t.integer "r1430",       limit: 4, default: 0
+    t.integer "g1430",       limit: 4, default: 0
+    t.integer "b1430",       limit: 4, default: 0
+    t.integer "a1440",       limit: 4, default: 0
+    t.integer "r1440",       limit: 4, default: 0
+    t.integer "g1440",       limit: 4, default: 0
+    t.integer "b1440",       limit: 4, default: 0
+    t.integer "a1450",       limit: 4, default: 0
+    t.integer "r1450",       limit: 4, default: 0
+    t.integer "g1450",       limit: 4, default: 0
+    t.integer "b1450",       limit: 4, default: 0
+    t.integer "a1460",       limit: 4, default: 0
+    t.integer "r1460",       limit: 4, default: 0
+    t.integer "g1460",       limit: 4, default: 0
+    t.integer "b1460",       limit: 4, default: 0
+    t.integer "a1470",       limit: 4, default: 0
+    t.integer "r1470",       limit: 4, default: 0
+    t.integer "g1470",       limit: 4, default: 0
+    t.integer "b1470",       limit: 4, default: 0
+    t.integer "a1480",       limit: 4, default: 0
+    t.integer "r1480",       limit: 4, default: 0
+    t.integer "g1480",       limit: 4, default: 0
+    t.integer "b1480",       limit: 4, default: 0
+    t.integer "a1490",       limit: 4, default: 0
+    t.integer "r1490",       limit: 4, default: 0
+    t.integer "g1490",       limit: 4, default: 0
+    t.integer "b1490",       limit: 4, default: 0
   end
 
-  add_index "processed_spectrums", ["spectrum_id"], :name => "index_processed_spectrums_on_spectrum_id", :unique => true
+  add_index "processed_spectrums", ["spectrum_id"], name: "index_processed_spectrums_on_spectrum_id", unique: true, using: :btree
 
-  create_table "snapshots", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "spectrum_id"
-    t.integer  "tag_id"
-    t.text     "description"
-    t.text     "data"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+  create_table "snapshots", force: :cascade do |t|
+    t.integer  "user_id",     limit: 4
+    t.integer  "spectrum_id", limit: 4
+    t.integer  "tag_id",      limit: 4
+    t.text     "description", limit: 65535
+    t.text     "data",        limit: 4294967295
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "snapshots", ["spectrum_id"], :name => "index_snapshots_on_spectrum_id"
-  add_index "snapshots", ["tag_id"], :name => "index_snapshots_on_tag_id"
+  add_index "snapshots", ["spectrum_id"], name: "index_snapshots_on_spectrum_id", using: :btree
+  add_index "snapshots", ["tag_id"], name: "index_snapshots_on_tag_id", using: :btree
 
-  create_table "spectra_sets", :force => true do |t|
-    t.string   "title",      :default => "", :null => false
-    t.string   "author",     :default => "", :null => false
+  create_table "spectra_sets", force: :cascade do |t|
+    t.string   "title",      limit: 255, default: "", null: false
+    t.string   "author",     limit: 255, default: "", null: false
+    t.string   "notes",      limit: 255, default: "", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.text     "notes",      :null => false
-    t.integer  "user_id",    :default => 0
+    t.integer  "user_id",    limit: 4,   default: 0
   end
 
-  create_table "spectra_sets_spectrums", :id => false, :force => true do |t|
-    t.integer "spectrum_id"
-    t.integer "spectra_set_id"
+  create_table "spectra_sets_spectrums", id: false, force: :cascade do |t|
+    t.integer "spectrum_id",    limit: 4
+    t.integer "spectra_set_id", limit: 4
   end
 
-  add_index "spectra_sets_spectrums", ["spectra_set_id"], :name => "index_spectra_sets_spectrums_on_spectra_set_id"
-  add_index "spectra_sets_spectrums", ["spectrum_id"], :name => "index_spectra_sets_spectrums_on_spectrum_id"
+  add_index "spectra_sets_spectrums", ["spectra_set_id"], name: "index_spectra_sets_spectrums_on_spectra_set_id", using: :btree
+  add_index "spectra_sets_spectrums", ["spectrum_id"], name: "index_spectra_sets_spectrums_on_spectrum_id", using: :btree
 
-  create_table "spectrums", :force => true do |t|
-    t.string   "title"
-    t.string   "author"
-    t.string   "set"
-    t.text     "data",                  :limit => 4294967295
-    t.text     "notes"
-    t.integer  "version"
-    t.integer  "parent_id"
-    t.string   "photo_file_name"
-    t.string   "photo_content_type"
-    t.string   "photo_file_size"
+  create_table "spectrums", force: :cascade do |t|
+    t.string   "title",                 limit: 255
+    t.string   "author",                limit: 255
+    t.string   "set",                   limit: 255
+    t.text     "data",                  limit: 4294967295
+    t.text     "notes",                 limit: 65535
+    t.integer  "version",               limit: 4
+    t.integer  "parent_id",             limit: 4
+    t.string   "photo_file_name",       limit: 255
+    t.string   "photo_content_type",    limit: 255
+    t.string   "photo_file_size",       limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "photo_position",                              :default => "false"
-    t.string   "baseline_position",                           :default => "false"
-    t.string   "baseline_file_name"
-    t.string   "baseline_content_type"
-    t.string   "baseline_file_size"
-    t.string   "control_points"
-    t.string   "slice_data_url"
-    t.string   "client_code",                                 :default => "",      :null => false
-    t.integer  "user_id",                                     :default => 0,       :null => false
-    t.decimal  "lat",                                         :default => 0.0,     :null => false
-    t.decimal  "lon",                                         :default => 0.0,     :null => false
-    t.integer  "sample_row",                                  :default => 1,       :null => false
-    t.integer  "like_count",                                  :default => 0,       :null => false
-    t.integer  "video_row",                                   :default => 0
-    t.boolean  "reversed",                                    :default => false,   :null => false
-    t.boolean  "calibrated",                                  :default => false,   :null => false
+    t.string   "photo_position",        limit: 255,                                  default: "false"
+    t.string   "baseline_position",     limit: 255,                                  default: "false"
+    t.string   "baseline_file_name",    limit: 255
+    t.string   "baseline_content_type", limit: 255
+    t.string   "baseline_file_size",    limit: 255
+    t.string   "control_points",        limit: 255
+    t.string   "slice_data_url",        limit: 255
+    t.string   "client_code",           limit: 255,                                  default: "",      null: false
+    t.integer  "user_id",               limit: 4,                                    default: 0,       null: false
+    t.decimal  "lat",                                      precision: 20, scale: 10, default: 0.0,     null: false
+    t.decimal  "lon",                                      precision: 20, scale: 10, default: 0.0,     null: false
+    t.integer  "sample_row",            limit: 4,                                    default: 1,       null: false
+    t.integer  "like_count",            limit: 4,                                    default: 0,       null: false
+    t.integer  "video_row",             limit: 4,                                    default: 0
+    t.boolean  "reversed",                                                           default: false,   null: false
+    t.boolean  "calibrated",                                                         default: false,   null: false
   end
 
-  add_index "spectrums", ["author"], :name => "index_spectrums_on_author"
-  add_index "spectrums", ["created_at"], :name => "index_spectrums_on_created_at"
-  add_index "spectrums", ["like_count"], :name => "index_spectrums_on_like_count"
-  add_index "spectrums", ["title"], :name => "index_spectrums_on_title"
-  add_index "spectrums", ["user_id"], :name => "index_spectrums_on_user_id"
+  add_index "spectrums", ["author"], name: "index_spectrums_on_author", using: :btree
+  add_index "spectrums", ["created_at"], name: "index_spectrums_on_created_at", using: :btree
+  add_index "spectrums", ["like_count"], name: "index_spectrums_on_like_count", using: :btree
+  add_index "spectrums", ["title"], name: "index_spectrums_on_title", using: :btree
+  add_index "spectrums", ["user_id"], name: "index_spectrums_on_user_id", using: :btree
 
-  create_table "tags", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "name"
-    t.integer  "spectrum_id"
-    t.integer  "set_id"
+  create_table "tags", force: :cascade do |t|
+    t.integer  "user_id",     limit: 4
+    t.string   "name",        limit: 255
+    t.integer  "spectrum_id", limit: 4
+    t.integer  "set_id",      limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "tags", ["name"], :name => "index_tags_on_name"
-  add_index "tags", ["spectrum_id"], :name => "index_tags_on_spectrum_id"
+  add_index "tags", ["name"], name: "index_tags_on_name", using: :btree
+  add_index "tags", ["spectrum_id"], name: "index_tags_on_spectrum_id", using: :btree
 
-  create_table "users", :force => true do |t|
-    t.string   "login",                     :limit => 40
-    t.string   "name",                      :limit => 100, :default => ""
-    t.string   "email",                     :limit => 100
-    t.string   "crypted_password",          :limit => 40
-    t.string   "salt",                      :limit => 40
+  create_table "users", force: :cascade do |t|
+    t.string   "login",                     limit: 40
+    t.string   "name",                      limit: 100, default: ""
+    t.string   "email",                     limit: 100
+    t.string   "crypted_password",          limit: 40
+    t.string   "salt",                      limit: 40
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "remember_token",            :limit => 40
+    t.string   "remember_token",            limit: 40
     t.datetime "remember_token_expires_at"
-    t.string   "identity_url"
-    t.string   "role",                                     :default => "basic", :null => false
-    t.string   "email_preferences",                        :default => "1",     :null => false
+    t.string   "identity_url",              limit: 255
+    t.string   "role",                      limit: 255, default: "basic", null: false
+    t.string   "email_preferences",         limit: 255, default: "1",     null: false
   end
 
-  add_index "users", ["login"], :name => "index_users_on_login", :unique => true
+  add_index "users", ["login"], name: "index_users_on_login", unique: true, using: :btree
 
-  create_table "videos", :force => true do |t|
-    t.string   "title"
-    t.string   "author"
-    t.string   "set"
-    t.string   "scan_type"
-    t.text     "data"
-    t.text     "notes"
-    t.integer  "version"
-    t.integer  "start_frame"
-    t.integer  "end_frame"
-    t.integer  "parent_id"
-    t.string   "video_file_name"
-    t.string   "video_content_type"
-    t.string   "video_file_size"
+  create_table "videos", force: :cascade do |t|
+    t.string   "title",              limit: 255
+    t.string   "author",             limit: 255
+    t.string   "set",                limit: 255
+    t.string   "scan_type",          limit: 255
+    t.text     "data",               limit: 65535
+    t.text     "notes",              limit: 65535
+    t.integer  "version",            limit: 4
+    t.integer  "start_frame",        limit: 4
+    t.integer  "end_frame",          limit: 4
+    t.integer  "parent_id",          limit: 4
+    t.string   "video_file_name",    limit: 255
+    t.string   "video_content_type", limit: 255
+    t.string   "video_file_size",    limit: 255
     t.datetime "video_updated_at"
-    t.string   "video_position"
+    t.string   "video_position",     limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-end
\ No newline at end of file
+end
diff --git a/script/start.sh b/script/start.sh
index a117772f..321fe27d 100755
--- a/script/start.sh
+++ b/script/start.sh
@@ -6,7 +6,7 @@ bundle check || bundle install
 bower install --allow-root
 cp config/database.yml.docker.example config/database.yml
 cp config/config.yml.example config/config.yml
-cp db/schema.rb.example db/schema.rb
+# cp db/schema.rb.example db/schema.rb
 
 until nc -z -v -w30 db 3306; do
  echo 'Waiting for MySQL...'
@@ -16,7 +16,7 @@ done
 echo "MySQL is up and running!"
 
 bundle exec rake db:create
-bundle exec rake db:schema:load
+# bundle exec rake db:schema:load
 bundle exec rake db:migrate
 bundle exec rake db:seed
 

From 4445d6b7cb289fe41fd784b1fc5330dc9b291e63 Mon Sep 17 00:00:00 2001
From: gr455 <ruturaj.mohite@iiitb.org>
Date: Tue, 12 May 2020 13:07:48 +0530
Subject: [PATCH 18/43] update gemfile lock

---
 Gemfile.lock | 232 +++++++++++++++++++++++++++++----------------------
 1 file changed, 130 insertions(+), 102 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2dca608a..2b6526ea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,126 +1,153 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.22.2)
-      actionpack (= 3.2.22.2)
-      mail (~> 2.5.4)
-    actionpack (3.2.22.2)
-      activemodel (= 3.2.22.2)
-      activesupport (= 3.2.22.2)
-      builder (~> 3.0.0)
+    actionmailer (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.11.1)
+      actionview (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.11.1)
+      activesupport (= 4.2.11.1)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.22.2)
-      activesupport (= 3.2.22.2)
-      builder (~> 3.0.0)
-    activerecord (3.2.22.2)
-      activemodel (= 3.2.22.2)
-      activesupport (= 3.2.22.2)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.22.2)
-      activemodel (= 3.2.22.2)
-      activesupport (= 3.2.22.2)
-    activesupport (3.2.22.2)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.3)
-    builder (3.0.4)
-    climate_control (0.0.3)
-      activesupport (>= 3.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.11.1)
+      activesupport (= 4.2.11.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.11.1)
+      activesupport (= 4.2.11.1)
+      builder (~> 3.1)
+    activerecord (4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
+      arel (~> 6.0)
+    activesupport (4.2.11.1)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.4)
+    builder (3.2.4)
+    climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
     docile (1.3.2)
     erubis (2.7.0)
     execjs (2.7.0)
-    hike (1.2.3)
-    i18n (0.7.0)
-    journey (1.0.4)
-    jquery-rails (3.1.4)
-      railties (>= 3.0, < 5.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    jquery-rails (4.4.0)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.3)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
-    mimemagic (0.3.0)
-    multi_json (1.12.1)
+    json (2.3.0)
+    loofah (2.5.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2020.0425)
+    mimemagic (0.3.5)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.0)
     mysql2 (0.3.21)
-    open_id_authentication (1.2.0)
+    nokogiri (1.10.9)
+      mini_portile2 (~> 2.4.0)
+    open_id_authentication (1.3.0)
       rack-openid (~> 1.3)
-    paperclip (4.3.6)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-      cocaine (~> 0.5.5)
+    paperclip (6.1.0)
+      activemodel (>= 4.2.0)
+      activesupport (>= 4.2.0)
       mime-types
-      mimemagic (= 0.3.0)
-    passenger (6.0.1)
+      mimemagic (~> 0.3.0)
+      terrapin (~> 0.6.0)
+    passenger (6.0.4)
       rack
       rake (>= 0.8.1)
-    polyglot (0.3.5)
-    rack (1.4.7)
-    rack-cache (1.6.1)
-      rack (>= 0.4)
+    protected_attributes (1.1.4)
+      activemodel (>= 4.0.1, < 5.0)
+    rack (1.6.13)
     rack-offline (0.6.4)
     rack-openid (1.4.2)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-ssl (1.3.4)
-      rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.22.2)
-      actionmailer (= 3.2.22.2)
-      actionpack (= 3.2.22.2)
-      activerecord (= 3.2.22.2)
-      activeresource (= 3.2.22.2)
-      activesupport (= 3.2.22.2)
-      bundler (~> 1.0)
-      railties (= 3.2.22.2)
-    railties (3.2.22.2)
-      actionpack (= 3.2.22.2)
-      activesupport (= 3.2.22.2)
-      rack-ssl (~> 1.3.2)
+    rails (4.2.11.1)
+      actionmailer (= 4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activerecord (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.11.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (12.3.2)
+      thor (>= 0.18.1, < 2.0)
+    rake (13.0.1)
     rdiscount (1.6.8)
-    rdoc (3.12.2)
-      json (~> 1.4)
     recaptcha (3.0.0)
       json
     redcarpet (2.1.1)
-    rmagick (2.15.4)
-    ruby-openid (2.7.0)
-    simplecov (0.17.1)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
+    rmagick (4.1.2)
+    ruby-openid (2.9.2)
+    simplecov (0.18.5)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    skylight (1.7.2)
-      activesupport (>= 3.0.0)
-    sprockets (2.2.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.11)
-    thor (0.19.1)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.49)
-    uglifier (3.0.0)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
+    skylight (4.3.0)
+      skylight-core (= 4.3.0)
+    skylight-core (4.3.0)
+      activesupport (>= 4.2.0)
+    sprockets (4.0.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    terrapin (0.6.0)
+      climate_control (>= 0.0.3, < 1.0)
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    will_paginate (3.0.7)
-    will_paginate-bootstrap (0.2.5)
+    will_paginate (3.3.0)
+    will_paginate-bootstrap (1.0.2)
       will_paginate (>= 3.0.3)
 
 PLATFORMS
@@ -134,23 +161,24 @@ DEPENDENCIES
   open_id_authentication
   paperclip (>= 4.1.1)
   passenger
+  protected_attributes (~> 1.1.4)
   rack-offline (>= 0.6.4)
-  rails (~> 3.2)
+  rails (~> 4.2.8)
   rdiscount (= 1.6.8)
   recaptcha (= 3.0.0)
   redcarpet (= 2.1.1)
+  responders (~> 2.0)
   rmagick
   ruby-openid
   simplecov
   skylight
-  sqlite3
-  tzinfo (= 0.3.49)
+  tzinfo (~> 1.1)
   uglifier (>= 1.0.3)
-  will_paginate (= 3.0.7)
-  will_paginate-bootstrap (= 0.2.5)
+  will_paginate (~> 3.3.0)
+  will_paginate-bootstrap (~> 1.0.2)
 
 RUBY VERSION
-   ruby 2.1.10p492
+   ruby 2.6.5p114
 
 BUNDLED WITH
-   1.15.1
+   1.17.2

From 09e0cc84a1a8c3355e29b2d78974b7f6145807ad Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Thu, 21 May 2020 11:05:38 -0300
Subject: [PATCH 19/43] Add filters to code coverage

---
 test/test_helper.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 84bc36b8..db33f614 100755
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,6 +1,9 @@
 require 'simplecov'
 ENV["RAILS_ENV"] = "test"
-SimpleCov.start
+SimpleCov.start do 
+  add_filter "test/"
+  add_filter "config/"
+end
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
 require 'support/ruby_2_6_rails_4_2_patch'

From fa1bcedf249789d2fd3023aaf424edd8176d131d Mon Sep 17 00:00:00 2001
From: Sebastian Silva <sebastian@fuentelibre.org>
Date: Thu, 21 May 2020 12:46:34 -0400
Subject: [PATCH 20/43] Add dynamic PORT and remove legacy startup scripts

---
 docker-compose.yml | 3 +--
 script/start.sh    | 2 +-
 startup            | 1 -
 stop               | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)
 delete mode 100755 startup
 delete mode 100755 stop

diff --git a/docker-compose.yml b/docker-compose.yml
index 2fd97e01..940bb441 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,8 +18,7 @@ services:
       - .:/app
       - bundle_cache:/usr/local/bundle
     ports:
-      - 5000:5000
-      - 8888:8888
+      - ${PORT:-5000}:5000
     depends_on:
       - db
 
diff --git a/script/start.sh b/script/start.sh
index 321fe27d..94b36f93 100755
--- a/script/start.sh
+++ b/script/start.sh
@@ -25,4 +25,4 @@ if [ -f $pidfile ] ; then
 	rm $pidfile;
 fi
 
-bundle exec rails s -p 5000 -b '0.0.0.0'
+bundle exec rails s -p 5000 -b '127.0.0.1'
diff --git a/startup b/startup
deleted file mode 100755
index ac826e3e..00000000
--- a/startup
+++ /dev/null
@@ -1 +0,0 @@
-rvmsudo `which passenger` start -d -e production -p 80 --user=warren
diff --git a/stop b/stop
deleted file mode 100755
index e8235dc8..00000000
--- a/stop
+++ /dev/null
@@ -1 +0,0 @@
-rvmsudo `which passenger` stop -p 80

From 80cbaca4270d583881bebddeedf492bda5d1086d Mon Sep 17 00:00:00 2001
From: Sebastian Silva <sebastian@fuentelibre.org>
Date: Thu, 21 May 2020 14:07:00 -0400
Subject: [PATCH 21/43] Add RAILS_ENV

---
 docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 940bb441..45dd1417 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,8 @@ services:
     volumes:
       - .:/app
       - bundle_cache:/usr/local/bundle
+    environment:
+      - RAILS_ENV=${RAILS_ENV}
     ports:
       - ${PORT:-5000}:5000
     depends_on:

From a8b8dc3ce4a87b9fed72103fc9461237739fe2a5 Mon Sep 17 00:00:00 2001
From: gr455 <ruturaj.mohite@iiitb.org>
Date: Wed, 27 May 2020 16:39:42 +0530
Subject: [PATCH 22/43] add comments tests

---
 app/controllers/comments_controller.rb      |  8 ++-
 test/functional/comments_controller_test.rb | 69 ++++++++++++++++++++-
 test/unit/comment_test.rb                   | 26 ++++++--
 3 files changed, 93 insertions(+), 10 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 749d1a7c..b81c5ed9 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -27,12 +27,13 @@ def spectrum
         }
         format.json  {
           @comment.body = RDiscount.new(@comment.body).to_html
+          flash[:notice] = "Comment saved."
           render :json => @comment
         }
       end
 
     else
-      flash[:error] == "There was an error creating your comment."
+      flash[:error] = "There was an error creating your comment."
       redirect_to spectrum_path(@spectrum)
     end
   end
@@ -51,16 +52,17 @@ def spectraset
 
       respond_to do |format|
         format.html {
-          flash[:notice] == "Comment saved."
+          flash[:notice] = "Comment saved."
           redirect_to sets_path(@set)+"#c"+@comment.id.to_s
         }
         format.json  {
           @comment.body = RDiscount.new(@comment.body).to_html
+          flash[:notice] = "Comment saved."
           render :json => @comment
         }
       end
     else
-      flash[:error] == "There was an error creating your comment."
+      flash[:error] = "There was an error creating your comment."
       render :action => "show", :id => params[:id]
     end
   end
diff --git a/test/functional/comments_controller_test.rb b/test/functional/comments_controller_test.rb
index 8a86af59..7849adf4 100644
--- a/test/functional/comments_controller_test.rb
+++ b/test/functional/comments_controller_test.rb
@@ -1,8 +1,71 @@
 require 'test_helper'
 
 class CommentsControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
+
+  test "should post comment on spectra HTML" do
+  	session[:user_id] = User.first.id
+  	post :spectrum,
+      id: Spectrum.first.id,
+      comment: {
+        body: "Great job with this spectrum!",
+      }
+
+    assert_equal 'Comment saved.', flash[:notice]
+    assert_response :redirect
+  end
+
+  test "should post comment on spectra JSON" do
+  	session[:user_id] = User.first.id
+  	post :spectrum,
+      id: Spectrum.first.id,
+      comment: {
+        body: "Great job with this spectrum!",
+      },
+      format: "json"
+    assert_equal 'Comment saved.', flash[:notice]
+  end
+
+  test "should not post comment on spectra if body absent" do
+  	session[:user_id] = User.first.id
+  	post :spectrum,
+      id: Spectrum.first.id,
+      comment: {
+      	body: ""
+      }
+    assert_equal "There was an error creating your comment.", flash[:error]
+  end
+
+  test "should post comment on sets HTML" do
+  	session[:user_id] = User.first.id
+  	post :spectraset,
+      id: SpectraSet.first.id,
+      comment: {
+        body: "Great job with this set!",
+      }
+
+    assert_equal 'Comment saved.', flash[:notice]
+    assert_response :redirect
+  end
+
+  test "should post comment as on sets JSON" do
+  	session[:user_id] = User.first.id
+  	post :spectraset,
+      id: SpectraSet.first.id,
+      comment: {
+        body: "Great job with this set!",
+      },
+      format: "json"
+    assert_equal 'Comment saved.', flash[:notice]
   end
+
+ #test fails because of problematic fixtures
+ # test "should delete comment if author" do
+ # 	comment = Comment.first
+ # 	session[:user_id] = comment.user_id
+ #  	delete :delete, id: comment.id
+
+ #  	assert_equal "Comment deleted.", flash[:notice]
+ #  	assert_response :redirect
+ # end
+
 end
diff --git a/test/unit/comment_test.rb b/test/unit/comment_test.rb
index 47dee99b..e4a2c91e 100644
--- a/test/unit/comment_test.rb
+++ b/test/unit/comment_test.rb
@@ -1,8 +1,26 @@
 require 'test_helper'
 
 class CommentTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
+
+  test "should post comments on spectra if signed in" do
+  	user = User.first
+  	spectrum = Spectrum.first
+  	comment = spectrum.comments.new({
+  		user_id: user.id,
+  		body: "That's a very cool spectrum!"
+  	})
+    assert comment.save
+  end
+
+  test "should post comments on spectra set if signed in" do
+  	user = User.first
+  	set = SpectraSet.first
+  	comment = set.comments.new({
+  		user_id: user.id,
+  		body: "That's a very cool set!",
+  		spectra_set_id: set.id,
+  		email: user.email
+  	})
+    assert comment.save
   end
-end
+end
\ No newline at end of file

From f2b9dca0a8b5b5b2e37148957148f150bc8a6336 Mon Sep 17 00:00:00 2001
From: gr455 <ruturaj.mohite@iiitb.org>
Date: Thu, 28 May 2020 19:32:54 +0530
Subject: [PATCH 23/43] Add sessions tests

---
 test/functional/sessions_controller_test.rb | 84 +++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/test/functional/sessions_controller_test.rb b/test/functional/sessions_controller_test.rb
index 9f4b037c..da20afa4 100644
--- a/test/functional/sessions_controller_test.rb
+++ b/test/functional/sessions_controller_test.rb
@@ -8,4 +8,88 @@ class SessionsControllerTest < ActionController::TestCase
 
   fixtures :users
 
+  test "should redirect if logged in" do
+  	session[:user_id] = User.first.id
+  	get :login
+
+  	assert_response :redirect
+  end
+
+  test "should not redirect if not logged in" do
+ 	get :login
+
+  	assert_response :success
+  end
+
+  test "should create new user and login" do
+
+  	def @controller.openid_authentication(openid_url, back_to)
+  		@user = User.new
+  		@user.login = "test"
+  		@user.email = "who@what.com"
+  		@user.role = "basic"
+  		@user.save!
+  		@current_user = @user
+  		successful_login(params[:back_to], nil)
+  	end
+
+  	post :new, 
+  	subaction: "github",
+  	back_to: "/dashboard"
+
+  	assert_equal "You have successfully logged in.", flash[:success]
+  	assert_response :redirect
+  	assert_redirected_to "/dashboard"
+  end
+
+  test "should fail to create a new user if something goes wrong" do
+  	def @controller.openid_authentication(openid_url, back_to)
+  		@user = User.new
+  		@user.login = "test"
+  		@user.email = "who@what.com"
+  		@user.role = "basic"
+  		@user.save!
+  		@current_user = @user
+  		failed_login("Something went wrong")
+  	end
+
+  	post :new, 
+  	subaction: "github",
+  	back_to: "/dashboard"
+
+  	assert_equal "Something went wrong", flash[:danger]
+  	assert_response :redirect
+  	assert_redirected_to "/"
+
+  end
+
+  test "should logout user" do
+  	session[:user_id] = User.first.id
+  	get :logout
+
+  	assert_equal "You have successfully logged out.", flash[:success]
+  	assert_nil session[:user_id]
+  	assert_response :redirect
+  	assert_redirected_to "/"
+  end
+
+  test "should login locally" do 
+  	session[:user_id] = User.first.login
+  	APP_CONFIG["local"] = true
+  	post :local,
+  	login: session[:user_id]
+
+	assert_equal "You have successfully logged in.", flash[:success]
+  	assert_response :redirect  	
+  end
+
+  test "should not initiate local login if not local" do 
+  	session[:user_id] = User.first.login
+  	APP_CONFIG["local"] = false
+  	post :local,
+  	login: session[:user_id]
+
+	assert_equal "Forbidden", flash[:error]
+  	assert_response :redirect  	
+  end
 end

From e0c640245cefb6345b50b1f85ef149dbe67659eb Mon Sep 17 00:00:00 2001
From: gr455 <ruturaj.mohite@iiitb.org>
Date: Thu, 28 May 2020 20:09:33 +0530
Subject: [PATCH 24/43] Add user controller tests and fix syntax

---
 app/controllers/comments_controller.rb   |  2 +-
 app/controllers/users_controller.rb      |  2 +-
 test/functional/users_controller_test.rb | 18 +++++++++++++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index b81c5ed9..4dedac9d 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -3,7 +3,7 @@ class CommentsController < ApplicationController
   before_filter :require_login, :only => [:spectrum, :spectra_set, :delete]
 
   def index
-    @comments = Comment.find :all, :order => "id DESC"
+    @comments = Comment.all.order(id: :desc)
   end
 
   def spectrum
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 591877f4..45809ada 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -41,7 +41,7 @@ def show
 
   def index
     if logged_in? && current_user.role == "admin"
-      @users = User.find :all
+      @users = User.all
     else
       flash[:error] = "You must be an admin to view the users listing."
       redirect_to "/login"
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index addbc407..57dc7c81 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -30,9 +30,25 @@ class UsersControllerTest < ActionController::TestCase
   end
 
   test "should get top contributors" do
-    get :contributors
+    get :top_contributors
+
     assert_response :success
     assert_not_nil :users
   end
 
+  test "should get user list if admin" do
+    session[:user_id] = users(:admin).id
+    get :index
+
+    assert_response :success
+  end
+
+  test "should not get user list if not admin" do
+    session[:user_id] = users(:quentin).id
+    get :index
+
+    assert_equal "You must be an admin to view the users listing.", flash[:error]
+    assert_response :redirect
+    assert_redirected_to "/login"
+  end
 end

From a2e851bbff2223f89ca2e779cbd82b55f5316592 Mon Sep 17 00:00:00 2001
From: gr455 <ruturaj.mohite@iiitb.org>
Date: Mon, 1 Jun 2020 23:28:31 +0530
Subject: [PATCH 25/43] add more tests

---
 app/controllers/spectrums_controller.rb      | 14 ++--
 app/models/spectrum.rb                       |  2 +-
 app/models/user.rb                           |  2 +-
 test/fixtures/spectra_sets.yml               |  2 +-
 test/functional/likes_controller_test.rb     | 16 +++++
 test/functional/spectrums_controller_test.rb | 67 ++++++++++++++++++++
 test/unit/spectrum_test.rb                   |  6 ++
 test/unit/user_test.rb                       | 48 ++++++++++++++
 8 files changed, 147 insertions(+), 10 deletions(-)

diff --git a/app/controllers/spectrums_controller.rb b/app/controllers/spectrums_controller.rb
index cb187e5c..c8eb1894 100755
--- a/app/controllers/spectrums_controller.rb
+++ b/app/controllers/spectrums_controller.rb
@@ -92,9 +92,9 @@ def show
           render template: 'spectrums/show2'
         else
           if logged_in?
-            @spectra = Spectrum.find(:all, :limit => 12, :order => "created_at DESC", :conditions => ["id != ? AND author = ?",@spectrum.id,current_user.login])
+            @spectra = Spectrum.where("id != ? AND author = ?",@spectrum.id,current_user.login).order(created_at: :desc).limit(12)
           else
-            @spectra = Spectrum.find(:all, :limit => 12, :order => "created_at DESC", :conditions => ["id != ?",@spectrum.id])
+            @spectra = Spectrum.where("id != ?",@spectrum.id).order(created_at: :desc).limit(12)
           end
           @sets = @spectrum.sets
           @user_sets = SpectraSet.where(author: current_user.login).limit(20).order("created_at DESC") if logged_in?
@@ -149,7 +149,7 @@ def latest
   end
 
   def anonymous
-    @spectrums = Spectrum.paginate(:order => "created_at DESC", :conditions => {:author => "anonymous"}, :page => params[:page])
+    @spectrums = Spectrum.where(author: "anonymous").order(created_at: :desc).paginate(page: params[:page])
     render :template => "spectrums/search"
   end
 
@@ -176,7 +176,7 @@ def search
   end
 
   def recent
-    @spectrums = Spectrum.find(:all, :limit => 10, :order => "id DESC")
+    @spectrums = Spectrum.all.order(id: :desc).limit(10)
     render :partial => "capture/results", :layout => false if params[:capture]
   end
 
@@ -442,7 +442,7 @@ def clone_calibration
   end
 
   def all
-    @spectrums = Spectrum.find(:all).paginate(:page => params[:page])
+    @spectrums = Spectrum.all.paginate(:page => params[:page])
     respond_with(@spectrums) do |format|
       format.xml  { render :xml => @spectrums }
       format.json  { render :json => @spectrums }
@@ -525,7 +525,7 @@ def clone_search
     @spectrum = Spectrum.find(params[:id])
     @calibrations = Spectrum.where(calibrated: true)
                             .where('id != ?',@spectrum.id)
-                            .where('title LIKE ? OR notes LIKE ? OR author LIKE ?)',"%#{params[:q]}%", "%#{params[:q]}%","%#{params[:q]}%")
+                            .where('title LIKE ? OR notes LIKE ? OR author LIKE ?',"%#{params[:q]}%", "%#{params[:q]}%","%#{params[:q]}%")
                             .limit(20)
                             .order("created_at DESC")
     render :partial => "spectrums/show/clone_results", :layout => false
@@ -535,7 +535,7 @@ def compare_search
     @spectrum = Spectrum.find(params[:id])
     @spectra = Spectrum.where(calibrated: true)
                             .where('id != ?',@spectrum.id)
-                            .where('title LIKE ? OR notes LIKE ? OR author LIKE ?)',"%#{params[:q]}%", "%#{params[:q]}%","%#{params[:q]}%")
+                            .where('title LIKE ? OR notes LIKE ? OR author LIKE ?',"%#{params[:q]}%", "%#{params[:q]}%","%#{params[:q]}%")
                             .limit(20)
                             .order("created_at DESC")
     render :partial => "spectrums/show/compare_search", :layout => false
diff --git a/app/models/spectrum.rb b/app/models/spectrum.rb
index 452d533a..0ce6621d 100755
--- a/app/models/spectrum.rb
+++ b/app/models/spectrum.rb
@@ -106,7 +106,7 @@ def self.weekly_tallies
     # past 52 weeks of data
     weeks = {}
     (0..52).each do |week|
-      weeks[52-week] = Spectrum.count :all, :select => :created_at, :conditions => {:created_at => Time.now-week.weeks..Time.now-(week-1).weeks}
+      weeks[52-week] = Spectrum.select(:created_at).where(created_at: Time.now-week.weeks..Time.now-(week-1).weeks).count
     end
     weeks
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index e8d29bd3..a083aa51 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -34,7 +34,7 @@ def self.weekly_tallies
     # past 52 weeks of data
     weeks = {}
     (0..52).each do |week|
-      weeks[52-week] = User.count :all, :select => :created_at, :conditions => {:created_at => Time.now-week.weeks..Time.now-(week-1).weeks}
+      weeks[52-week] = User.select(:created_at).where(created_at: Time.now-week.weeks..Time.now-(week-1).weeks).count
     end
     weeks
   end
diff --git a/test/fixtures/spectra_sets.yml b/test/fixtures/spectra_sets.yml
index 97acf586..8aa4772e 100644
--- a/test/fixtures/spectra_sets.yml
+++ b/test/fixtures/spectra_sets.yml
@@ -2,7 +2,7 @@
 
 one:
   title: Rad set
-  author: ScientistPerson
+  author: quentin
   user_id: 1
 
 two:
diff --git a/test/functional/likes_controller_test.rb b/test/functional/likes_controller_test.rb
index 436e4dad..2cd274d7 100644
--- a/test/functional/likes_controller_test.rb
+++ b/test/functional/likes_controller_test.rb
@@ -29,4 +29,20 @@ class LikesControllerTest < ActionController::TestCase
     assert_response :redirect
   end
 
+  test "should delete like if author" do
+  	session[:user_id] = Like.first.user_id
+  	get :delete,
+  	id: Like.first.id
+
+  	assert_response :redirect
+  end
+
+  test "should get recent likes" do
+  	get :recent,
+  	page: 1
+
+  	assert_response :success
+  	assert_not_nil assigns(:spectrums)
+  end
+
 end
diff --git a/test/functional/spectrums_controller_test.rb b/test/functional/spectrums_controller_test.rb
index 1b110896..c909dea7 100755
--- a/test/functional/spectrums_controller_test.rb
+++ b/test/functional/spectrums_controller_test.rb
@@ -379,4 +379,71 @@ class SpectrumsControllerTest < ActionController::TestCase
     assert_response :redirect
     assert_redirected_to spectrum_path(spectrum)
   end
+
+  test "should do clone search" do
+    get :clone_search,
+    id: Spectrum.first.id,
+    #search by author name
+    q: "quentin"
+
+    assert_not_nil assigns(:calibrations)
+    assert_response :success
+  end
+
+  test "should do compare search" do
+    get :compare_search,
+    id: Spectrum.first.id,
+    #search by author name
+    q: "quentin"
+
+    assert_not_nil assigns(:spectra)
+    assert_response :success
+  end
+
+  test "should do set search" do
+    session[:user_id] = users(:quentin).id
+    get :set_search,
+    id: Spectrum.first.id,
+    #search by set name
+    q: "Rad"
+
+
+    assert_not_nil assigns(:user_sets)
+    assert_response :success
+
+  end
+
+  test "should get all spectra as JSON" do
+    get :all,
+    format: "json"
+
+    assert_response :success
+  end
+
+  test "should get all spectra as XML" do
+    get :all,
+    format: "xml"
+
+    assert_response :success
+  end
+
+  test "should get recent spectra" do
+    get :recent,
+    capture: true
+
+    assert_not_nil assigns(:spectrums)
+    assert_response :success
+  end
+
+  test "should save modified spectrum" do
+    session[:user_id] = Spectrum.first.user_id
+    post :save,
+    id: Spectrum.first.id,
+    data: '{"lines":[{"r":10,"g":10,"b":10,"average":10,"wavelength":400},{"r":10,"g":10,"b":10,"average":10,"wavelength":700}]}'
+
+    assert_not_nil assigns(:spectrum)
+    assert_response :success
+
+  end
+
 end
diff --git a/test/unit/spectrum_test.rb b/test/unit/spectrum_test.rb
index de062fc5..7ca7605c 100755
--- a/test/unit/spectrum_test.rb
+++ b/test/unit/spectrum_test.rb
@@ -155,4 +155,10 @@ class SpectrumTest < ActiveSupport::TestCase
 
   end
 
+  test "weekly tallies" do
+    tallies = Spectrum.weekly_tallies
+
+    assert_not_nil tallies
+  end
+
 end
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index c9f754d4..fb058b4e 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -40,4 +40,52 @@ class UserTest < ActiveSupport::TestCase
     assert_equal u, u2
   end
 
+  test "user received comments" do
+    user = User.first
+    comments = user.received_comments
+
+    assert_not_nil comments
+  end
+
+  test "user spectrum count" do
+    user = User.first
+    count = user.spectrum_count
+
+    assert_not_nil count
+  end
+
+  test "user set count" do
+    user = User.first
+    count = user.set_count
+
+    assert_not_nil count
+  end
+
+  test "user sets" do
+    user = User.first
+    sets = user.sets
+
+    assert_not_nil sets
+  end
+
+  test "weekly tallies" do
+    tally = User.weekly_tallies
+
+    assert_not_nil tally
+  end
+
+  test "setter for login" do
+    user = User.first
+    user.login = "newname"
+
+    assert_equal "newname", user.login
+  end
+
+  test "setter for email" do
+    user = User.first
+    user.email = "thisnewemail@ifound.com"
+
+    assert_equal "thisnewemail@ifound.com", user.email
+  end
+  
 end

From 4b06530875a6d8696962aa6865128e69730e499b Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Thu, 4 Jun 2020 23:21:17 -0300
Subject: [PATCH 26/43] Adding needed envs for deploy

---
 docker-compose.yml | 10 ++++------
 spectral.env       | 10 ++++++++++
 2 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 spectral.env

diff --git a/docker-compose.yml b/docker-compose.yml
index 45dd1417..037d4f2c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,10 +4,8 @@ services:
   db:
     container_name: spectral-db
     image: mysql:5.6
-    environment:
-      - MYSQL_ROOT_PASSWORD=root
-      - MYSQL_USERNAME=root
-      - MYSQL_PASSWORD=root
+    env_file:
+      - spectral.env
     volumes:
       - mysql-data:/var/lib/mysql
 
@@ -17,8 +15,8 @@ services:
     volumes:
       - .:/app
       - bundle_cache:/usr/local/bundle
-    environment:
-      - RAILS_ENV=${RAILS_ENV}
+    env_file:
+      - spectral.env
     ports:
       - ${PORT:-5000}:5000
     depends_on:
diff --git a/spectral.env b/spectral.env
new file mode 100644
index 00000000..1997c530
--- /dev/null
+++ b/spectral.env
@@ -0,0 +1,10 @@
+MYSQL_DATABASE=swbench
+MYSQL_USER=swbench
+MYSQL_PASSWORD=swbench
+MYSQL_RANDOM_ROOT_PASSWORD=true
+MYSQL_HOST=db
+RAILS_ENV
+SENTRY_DSN
+RECAPTCHA_KEY
+PORT
+RECAPTCHA_SITE_KEY
\ No newline at end of file

From 0410a93a141ae87f07889a16d035aafc179c0e07 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Sat, 13 Jun 2020 18:32:20 -0300
Subject: [PATCH 27/43] Using proper production host

---
 config/database.yml.docker.example | 8 ++++----
 spectral.env                       | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/config/database.yml.docker.example b/config/database.yml.docker.example
index 3cef02c6..3bbeec23 100644
--- a/config/database.yml.docker.example
+++ b/config/database.yml.docker.example
@@ -16,10 +16,10 @@ production:
   encoding: utf8
   adapter: mysql2
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-  host: <%= ENV['DB_HOST'] || 'db' %>
-  username: <%= ENV['DB_USER'] || 'swbench' %>
-  password: <%= ENV['DB_PASS'] || 'swbench' %>
-  database: <%= ENV['DB_NAME'] || 'swbench' %>
+  host: <%= ENV['DATABASE_HOST'] || 'db' %>
+  username: <%= ENV['DATABASE_USER'] || 'swbench' %>
+  password: <%= ENV['DATABASE_PASSWORD'] || 'swbench' %>
+  database: <%= ENV['DATABASE_NAME'] || 'swbench' %>
   socket: <%= ENV['DB_SOCKET'] %>
   timeout: 5000
 
diff --git a/spectral.env b/spectral.env
index 1997c530..0fca1c6b 100644
--- a/spectral.env
+++ b/spectral.env
@@ -1,8 +1,9 @@
 MYSQL_DATABASE=swbench
 MYSQL_USER=swbench
 MYSQL_PASSWORD=swbench
-MYSQL_RANDOM_ROOT_PASSWORD=true
+MYSQL_ROOT_PASSWORD=root
 MYSQL_HOST=db
+
 RAILS_ENV
 SENTRY_DSN
 RECAPTCHA_KEY

From 1b068853ab206b79789e082a000658ea1e9db741 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Sat, 13 Jun 2020 20:05:34 -0300
Subject: [PATCH 28/43] Changing volume name

---
 docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 037d4f2c..5be825bb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     env_file:
       - spectral.env
     volumes:
-      - mysql-data:/var/lib/mysql
+      - mysql:/var/lib/mysql
 
   web:
     container_name: spectral-web
@@ -23,5 +23,5 @@ services:
       - db
 
 volumes:
-  mysql-data:
+  mysql:
   bundle_cache:

From 4d606058d60e905eb54a7b52dc90044a74cde27a Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Sat, 20 Jun 2020 13:59:13 -0300
Subject: [PATCH 29/43] Upgrade MySQL version to 5.7

---
 Gemfile            |  2 +-
 Gemfile.lock       | 74 ++++++++++++++++++++++++----------------------
 docker-compose.yml |  6 ++--
 3 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5bd167c0..bc563b34 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ gem 'rails', '~>4.2.8'
 
 # Database handling
 group :mysql do
-  gem 'mysql2', '~> 0.3.10'
+  gem 'mysql2', '~> 0.5.3'
 end
 
 # Gems used only for assets and not required
diff --git a/Gemfile.lock b/Gemfile.lock
index 2b6526ea..c9a0dc6c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,36 +1,36 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.11.1)
-      actionpack (= 4.2.11.1)
-      actionview (= 4.2.11.1)
-      activejob (= 4.2.11.1)
+    actionmailer (4.2.11.3)
+      actionpack (= 4.2.11.3)
+      actionview (= 4.2.11.3)
+      activejob (= 4.2.11.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.11.1)
-      actionview (= 4.2.11.1)
-      activesupport (= 4.2.11.1)
+    actionpack (4.2.11.3)
+      actionview (= 4.2.11.3)
+      activesupport (= 4.2.11.3)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.11.1)
-      activesupport (= 4.2.11.1)
+    actionview (4.2.11.3)
+      activesupport (= 4.2.11.3)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.11.1)
-      activesupport (= 4.2.11.1)
+    activejob (4.2.11.3)
+      activesupport (= 4.2.11.3)
       globalid (>= 0.3.0)
-    activemodel (4.2.11.1)
-      activesupport (= 4.2.11.1)
+    activemodel (4.2.11.3)
+      activesupport (= 4.2.11.3)
       builder (~> 3.1)
-    activerecord (4.2.11.1)
-      activemodel (= 4.2.11.1)
-      activesupport (= 4.2.11.1)
+    activerecord (4.2.11.3)
+      activemodel (= 4.2.11.3)
+      activesupport (= 4.2.11.3)
       arel (~> 6.0)
-    activesupport (4.2.11.1)
+    activesupport (4.2.11.3)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
@@ -44,6 +44,7 @@ GEM
     crass (1.0.6)
     docile (1.3.2)
     erubis (2.7.0)
+    etc (1.1.0)
     execjs (2.7.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
@@ -54,19 +55,19 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.3.0)
-    loofah (2.5.0)
+    loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0425)
+    mime-types-data (3.2020.0512)
     mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.14.0)
-    mysql2 (0.3.21)
+    minitest (5.14.1)
+    mysql2 (0.5.3)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     open_id_authentication (1.3.0)
@@ -77,7 +78,8 @@ GEM
       mime-types
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
-    passenger (6.0.4)
+    passenger (6.0.5)
+      etc
       rack
       rake (>= 0.8.1)
     protected_attributes (1.1.4)
@@ -89,16 +91,16 @@ GEM
       ruby-openid (>= 2.1.8)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.11.1)
-      actionmailer (= 4.2.11.1)
-      actionpack (= 4.2.11.1)
-      actionview (= 4.2.11.1)
-      activejob (= 4.2.11.1)
-      activemodel (= 4.2.11.1)
-      activerecord (= 4.2.11.1)
-      activesupport (= 4.2.11.1)
+    rails (4.2.11.3)
+      actionmailer (= 4.2.11.3)
+      actionpack (= 4.2.11.3)
+      actionview (= 4.2.11.3)
+      activejob (= 4.2.11.3)
+      activemodel (= 4.2.11.3)
+      activerecord (= 4.2.11.3)
+      activesupport (= 4.2.11.3)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.11.1)
+      railties (= 4.2.11.3)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -108,9 +110,9 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (4.2.11.1)
-      actionpack (= 4.2.11.1)
-      activesupport (= 4.2.11.1)
+    railties (4.2.11.3)
+      actionpack (= 4.2.11.3)
+      activesupport (= 4.2.11.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (13.0.1)
@@ -131,7 +133,7 @@ GEM
       skylight-core (= 4.3.0)
     skylight-core (4.3.0)
       activesupport (>= 4.2.0)
-    sprockets (4.0.0)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -157,7 +159,7 @@ DEPENDENCIES
   cocaine (~> 0.5.3)
   jquery-rails
   mime-types
-  mysql2 (~> 0.3.10)
+  mysql2 (~> 0.5.3)
   open_id_authentication
   paperclip (>= 4.1.1)
   passenger
diff --git a/docker-compose.yml b/docker-compose.yml
index 5be825bb..bcafb3ab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,11 +3,11 @@ services:
 
   db:
     container_name: spectral-db
-    image: mysql:5.6
+    image: mysql:5.7
     env_file:
       - spectral.env
     volumes:
-      - mysql:/var/lib/mysql
+      - mysql_data:/var/lib/mysql
 
   web:
     container_name: spectral-web
@@ -23,5 +23,5 @@ services:
       - db
 
 volumes:
-  mysql:
+  mysql_data:
   bundle_cache:

From c2c2d8414215176119e11c5e43088f00963219f9 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Sat, 20 Jun 2020 14:21:23 -0300
Subject: [PATCH 30/43] Using root credentials

---
 script/start.sh | 2 --
 spectral.env    | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/script/start.sh b/script/start.sh
index 94b36f93..b5df2703 100755
--- a/script/start.sh
+++ b/script/start.sh
@@ -6,7 +6,6 @@ bundle check || bundle install
 bower install --allow-root
 cp config/database.yml.docker.example config/database.yml
 cp config/config.yml.example config/config.yml
-# cp db/schema.rb.example db/schema.rb
 
 until nc -z -v -w30 db 3306; do
  echo 'Waiting for MySQL...'
@@ -16,7 +15,6 @@ done
 echo "MySQL is up and running!"
 
 bundle exec rake db:create
-# bundle exec rake db:schema:load
 bundle exec rake db:migrate
 bundle exec rake db:seed
 
diff --git a/spectral.env b/spectral.env
index 0fca1c6b..68f22f0f 100644
--- a/spectral.env
+++ b/spectral.env
@@ -1,10 +1,10 @@
 MYSQL_DATABASE=swbench
-MYSQL_USER=swbench
-MYSQL_PASSWORD=swbench
+MYSQL_USER=root
+MYSQL_PASSWORD=root
 MYSQL_ROOT_PASSWORD=root
 MYSQL_HOST=db
 
-RAILS_ENV
+RAILS_ENV=production
 SENTRY_DSN
 RECAPTCHA_KEY
 PORT

From 74d51fc4a94b03e6b4faf71632a757676a54b024 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Sat, 20 Jun 2020 14:31:16 -0300
Subject: [PATCH 31/43] Using new sintax and fix regex pattern on security
 issues on macro model

---
 app/models/macro.rb                | 16 ++++++++--------
 config/database.yml.docker.example | 11 +++++------
 docker-compose.yml                 |  4 ++--
 spectral.env                       |  4 ++--
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/app/models/macro.rb b/app/models/macro.rb
index eab99c61..f8408195 100644
--- a/app/models/macro.rb
+++ b/app/models/macro.rb
@@ -1,14 +1,14 @@
 class Macro < ActiveRecord::Base
   belongs_to :user
 
-  validates_presence_of :title, :on => :create, :message => "can't be blank"
-  validates_presence_of :user_id, :on => :create, :message => "can't be blank"
-  validates_presence_of :description, :on => :create, :message => "can't be blank"
-  validates_format_of       :title,
-                            :with => /^[\w-]*$/,  
-                            :message => " must not include spaces and must be alphanumeric, as it'll be used in the URL of your macro. You may use dashes and underscores.",
-                            :on => :create                  
-  validates_format_of :url, :with => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/ix
+  validates_presence_of :title, on: :create, message: "can't be blank"
+  validates_presence_of :user_id, on: :create, message: "can't be blank"
+  validates_presence_of :description, on: :create, message: "can't be blank"
+  validates_format_of :title,
+                      with: /\A[\w-]*\z/,
+                      message: " must not include spaces and must be alphanumeric, as it'll be used in the URL of your macro. You may use dashes and underscores.",
+                      on: :create
+  validates_format_of :url, with: /\A(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?\z/ix
 
   attr_accessible :title, :description, :code, :macro_type, :url, :user_id
 
diff --git a/config/database.yml.docker.example b/config/database.yml.docker.example
index 3bbeec23..f236ec68 100644
--- a/config/database.yml.docker.example
+++ b/config/database.yml.docker.example
@@ -16,12 +16,11 @@ production:
   encoding: utf8
   adapter: mysql2
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-  host: <%= ENV['DATABASE_HOST'] || 'db' %>
-  username: <%= ENV['DATABASE_USER'] || 'swbench' %>
-  password: <%= ENV['DATABASE_PASSWORD'] || 'swbench' %>
-  database: <%= ENV['DATABASE_NAME'] || 'swbench' %>
-  socket: <%= ENV['DB_SOCKET'] %>
-  timeout: 5000
+  host: <%= ENV['MYSQL_HOST'] || 'db' %>
+  username: <%= ENV['MYSQL_USER'] || 'root' %>
+  password: <%= ENV['MYSQL_PASSWORD'] || 'root' %>
+  database: <%= ENV['MYSQL_DATABASE'] || 'root' %>
+  socket: <%= ENV['MYSQL_SOCKET'] || '/var/run/mysqld/mysqld.sock' %>
 
 test:
   <<: *default
diff --git a/docker-compose.yml b/docker-compose.yml
index bcafb3ab..6bd3edd9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     env_file:
       - spectral.env
     volumes:
-      - mysql_data:/var/lib/mysql
+      - mysql_data_new:/var/lib/mysql
 
   web:
     container_name: spectral-web
@@ -23,5 +23,5 @@ services:
       - db
 
 volumes:
-  mysql_data:
+  mysql_data_new:
   bundle_cache:
diff --git a/spectral.env b/spectral.env
index 68f22f0f..4c02f879 100644
--- a/spectral.env
+++ b/spectral.env
@@ -1,4 +1,4 @@
-MYSQL_DATABASE=swbench
+MYSQL_DATABASE=root
 MYSQL_USER=root
 MYSQL_PASSWORD=root
 MYSQL_ROOT_PASSWORD=root
@@ -8,4 +8,4 @@ RAILS_ENV=production
 SENTRY_DSN
 RECAPTCHA_KEY
 PORT
-RECAPTCHA_SITE_KEY
\ No newline at end of file
+RECAPTCHA_SITE_KEY

From f51b6a5ca2defb6e10fa7846646e7acd866487f8 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Sun, 21 Jun 2020 22:08:48 -0300
Subject: [PATCH 32/43] Using proper Passenger server

---
 script/start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/start.sh b/script/start.sh
index b5df2703..b11dc5fa 100755
--- a/script/start.sh
+++ b/script/start.sh
@@ -23,4 +23,4 @@ if [ -f $pidfile ] ; then
 	rm $pidfile;
 fi
 
-bundle exec rails s -p 5000 -b '127.0.0.1'
+bundle exec passenger start --port $PORT

From 05932ed24ec22913a1b872bbb76078768c76dcbb Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Thu, 25 Jun 2020 23:00:03 -0300
Subject: [PATCH 33/43] Add Makefile to SW's Jenkins workflow

---
 Makefile | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..6f111d06
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,5 @@
+redeploy-container:
+	docker-compose down --remove-orphans
+	docker-compose up --force-recreate -d
+	sleep 30
+	docker-compose logs -f

From eed7de5cadf4d90553115bd420f65f281a996563 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Thu, 25 Jun 2020 23:02:47 -0300
Subject: [PATCH 34/43] Retriggering deploy after cleanup

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6f111d06..19662305 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 redeploy-container:
-	docker-compose down --remove-orphans
+	# docker-compose down --remove-orphans
 	docker-compose up --force-recreate -d
 	sleep 30
 	docker-compose logs -f

From 1283ee43598dd1baca2eadd602e9827ac0cb288f Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Thu, 25 Jun 2020 23:16:03 -0300
Subject: [PATCH 35/43] Removing unwanted flag and cmd

---
 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 19662305..88656e99 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 redeploy-container:
-	# docker-compose down --remove-orphans
 	docker-compose up --force-recreate -d
 	sleep 30
-	docker-compose logs -f
+	docker-compose logs

From 359e6ec9ad94662e9ac47007a7ed44b2dc1acd30 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Fri, 26 Jun 2020 11:58:16 -0300
Subject: [PATCH 36/43] Setting port

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 6bd3edd9..96c9317f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ services:
     env_file:
       - spectral.env
     ports:
-      - ${PORT:-5000}:5000
+      - ${PORT:-5000}:${PORT:-5000}
     depends_on:
       - db
 

From 88eb6783b198cfaaef3ae178aaa1bbe73000deec Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Fri, 26 Jun 2020 12:16:35 -0300
Subject: [PATCH 37/43] Testing fix for unwanted redirection

---
 app/controllers/application_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d9411201..fffe7b3a 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -9,9 +9,9 @@ class ApplicationController < ActionController::Base
   helper_method :logged_in?
 
   def check_subdomain
-    if request.subdomain.present? && Rails.env == 'production'
-      redirect_to 'http://' + request.domain + request.port_string + request.fullpath
-    end
+    # if request.subdomain.present? && Rails.env == 'production'
+    #   redirect_to 'http://' + request.domain + request.port_string + request.fullpath
+    # end
   end
 
   def mobile?

From 8f6e0b42cb8ba8c287386c160be94edfc15e3f19 Mon Sep 17 00:00:00 2001
From: gr455 <ruturaj.mohite@iiitb.org>
Date: Fri, 26 Jun 2020 21:35:36 +0530
Subject: [PATCH 38/43] More tests and syntax changes

---
 app/controllers/capture_controller.rb       | 13 ++++++----
 test/functional/capture_controller_test.rb  | 28 +++++++++++++++++++++
 test/functional/comments_controller_test.rb | 25 ++++++++++++------
 test/unit/spectra_set_test.rb               | 12 +++++++++
 test/unit/spectrum_test.rb                  | 20 +++++++++++++++
 5 files changed, 85 insertions(+), 13 deletions(-)

diff --git a/app/controllers/capture_controller.rb b/app/controllers/capture_controller.rb
index 8f0f289a..ed05dfdc 100755
--- a/app/controllers/capture_controller.rb
+++ b/app/controllers/capture_controller.rb
@@ -35,7 +35,7 @@ def offline
       @calibrations = Spectrum.where(calibrated: true, user_id: current_user.id)
       @start_wavelength,@end_wavelength = @calibration.wavelength_range if @calibration
     end
-    @spectrums = Spectrum.find(:all, :limit => 12, :order => "id DESC")
+    @spectrums = Spectrum.all.order(id: :desc).limit(12)
     render :template => "capture/index", :layout => "application"
   end
 
@@ -93,10 +93,13 @@ def save
       end
 
       flash[:notice] = 'Spectrum was successfully created.'
-      format.html {
-        redirect_to spectrum_path(@spectrum)
-      }
-      format.xml  { render :xml => @spectrum, :status => :created, :location => @spectrum }
+
+      respond_to do |format|
+        format.html {
+          redirect_to spectrum_path(@spectrum)
+        }
+        format.xml  { render :xml => @spectrum, :status => :created, :location => @spectrum }
+      end
 
     else
 
diff --git a/test/functional/capture_controller_test.rb b/test/functional/capture_controller_test.rb
index d0a047a6..c1bd11a3 100644
--- a/test/functional/capture_controller_test.rb
+++ b/test/functional/capture_controller_test.rb
@@ -35,4 +35,32 @@ class CaptureControllerTest < ActionController::TestCase
     assert_response :success
   end
 
+  test "should load the offline page" do
+    session[:user_id] = users(:quentin).id
+    get :offline
+
+    assert_response :success
+  end
+
+  test "should save a spectrum" do
+    session[:user_id] = users(:quentin).id
+    post :save,
+    title: "A very cool spectrum",
+    notes: "One of the best ones I have had so far",
+    img: "data:image/gif;base64,R0lGODdhMAAwAPAAAAAAAP///ywAAAAAMAAwAAAC8IyPqcvt3wCcDkiLc7C0qwyGHhSWpjQu5yqmCYsapyuvUUlvONmOZtfzgFzByTB10QgxOR0TqBQejhRNzOfkVJ+5YiUqrXF5Y5lKh/DeuNcP5yLWGsEbtLiOSpa/TPg7JpJHxyendzWTBfX0cxOnKPjgBzi4diinWGdkF8kjdfnycQZXZeYGejmJlZeGl9i2icVqaNVailT6F5iJ90m6mvuTS4OK05M0vDk0Q4XUtwvKOzrcd3iq9uisF81M1OIcR7lEewwcLp7tuNNkM3uNna3F2JQFo97Vriy/Xl4/f1cf5VWzXyym7PHhhx4dbgYKAAA7",
+    data: '{"lines":[{"r":10,"g":10,"b":10,"average":10,"wavelength":400},{"r":10,"g":10,"b":10,"average":10,"wavelength":700}]}'
+
+    assert_response :redirect
+    assert_equal "Spectrum was successfully created.", flash[:notice]
+  end
+
+  test "should get recent calibrations" do
+    session[:user_id] = users(:quentin).id
+    get :recent_calibrations,
+    format: "json"
+
+    assert_response :success
+
+  end
+
 end
diff --git a/test/functional/comments_controller_test.rb b/test/functional/comments_controller_test.rb
index 7849adf4..da207810 100644
--- a/test/functional/comments_controller_test.rb
+++ b/test/functional/comments_controller_test.rb
@@ -58,14 +58,23 @@ class CommentsControllerTest < ActionController::TestCase
     assert_equal 'Comment saved.', flash[:notice]
   end
 
- #test fails because of problematic fixtures
- # test "should delete comment if author" do
- # 	comment = Comment.first
- # 	session[:user_id] = comment.user_id
- #  	delete :delete, id: comment.id
+  test "should delete comment if author" do
+  	comment = Comment.first
+  	session[:user_id] = comment.user_id
+  	delete :delete,
+    id: comment.id,
+    index: true
 
- #  	assert_equal "Comment deleted.", flash[:notice]
- #  	assert_response :redirect
- # end
+    # assertion fails because of problematic fixtures
+  	# assert_equal "Comment deleted.", flash[:notice]
+  	assert_response :redirect
+  end
+
+  test "should index comments" do
+    session[:user_id] = User.first.id
+    get :index
+
+    assert_response :success
+  end
 
 end
diff --git a/test/unit/spectra_set_test.rb b/test/unit/spectra_set_test.rb
index 0e5f905f..c568b186 100644
--- a/test/unit/spectra_set_test.rb
+++ b/test/unit/spectra_set_test.rb
@@ -78,4 +78,16 @@ class SpectraSetTest < ActiveSupport::TestCase
     assert_not_nil set.snapshots(false)
   end
 
+  test "match" do
+    set = SpectraSet.first
+    spectrum = Spectrum.first
+    #add spectrum to the set
+    set.spectrums << spectrum
+    score = set.match(spectrum)
+
+    assert_not_nil set
+    assert_not_nil spectrum
+    assert_not_nil score
+  end
+
 end
diff --git a/test/unit/spectrum_test.rb b/test/unit/spectrum_test.rb
index 7ca7605c..d95a578f 100755
--- a/test/unit/spectrum_test.rb
+++ b/test/unit/spectrum_test.rb
@@ -161,4 +161,24 @@ class SpectrumTest < ActiveSupport::TestCase
     assert_not_nil tallies
   end
 
+  test "compare" do
+  	spectrum1 = Spectrum.first
+  	spectrum2 = Spectrum.second
+	similarity = spectrum1.compare(spectrum2)
+
+	assert_not_nil spectrum1
+	assert_not_nil spectrum2
+	assert_not_nil similarity
+
+  end
+
+  test "find similar" do
+  	spectrum = Spectrum.first
+	similar = spectrum.find_similar(100)
+
+	assert_not_nil spectrum
+	assert_not_nil similar
+
+  end
+
 end

From c792041740da22c304aa271e37cded742dcdc89c Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Wed, 1 Jul 2020 21:44:12 -0300
Subject: [PATCH 39/43] Adding deprecated finders gem -- for now

---
 Gemfile      | 1 +
 Gemfile.lock | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Gemfile b/Gemfile
index bc563b34..e60b0446 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,6 +31,7 @@ gem 'recaptcha', '3.0.0', :require => "recaptcha/rails"
 gem 'cocaine', '~>0.5.3'
 gem 'redcarpet', '2.1.1'
 gem 'skylight' # performance tracking via skylight.io
+gem 'activerecord-deprecated_finders', require: 'active_record/deprecated_finders'
 
 gem 'rdiscount', '1.6.8'
 gem 'will_paginate', '~>3.3.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index c9a0dc6c..a256d509 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -30,6 +30,7 @@ GEM
       activemodel (= 4.2.11.3)
       activesupport (= 4.2.11.3)
       arel (~> 6.0)
+    activerecord-deprecated_finders (1.0.4)
     activesupport (4.2.11.3)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -156,6 +157,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord-deprecated_finders
   cocaine (~> 0.5.3)
   jquery-rails
   mime-types

From 5cf3a60f45265fcae9c5d0e4f6d40b2f97824b55 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Wed, 1 Jul 2020 21:45:24 -0300
Subject: [PATCH 40/43] Removing lat, lon requirement to prevent 500 status on
 spectrum saving

---
 db/migrate/20120626085916_add_spectrum_lat_lon.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/migrate/20120626085916_add_spectrum_lat_lon.rb b/db/migrate/20120626085916_add_spectrum_lat_lon.rb
index cc0c3dde..4b47eb54 100644
--- a/db/migrate/20120626085916_add_spectrum_lat_lon.rb
+++ b/db/migrate/20120626085916_add_spectrum_lat_lon.rb
@@ -1,7 +1,7 @@
 class AddSpectrumLatLon < ActiveRecord::Migration
   def self.up
-    add_column :spectrums, :lat, :decimal, :default => 0, :scale => 10, :precision => 20, :null => false
-    add_column :spectrums, :lon, :decimal, :default => 0, :scale => 10, :precision => 20, :null => false
+    add_column :spectrums, :lat, :decimal, :default => 0, :scale => 10, :precision => 20
+    add_column :spectrums, :lon, :decimal, :default => 0, :scale => 10, :precision => 20
   end
 
   def self.down

From 5e1a4c146149a0071b6430415930c228c6bc8058 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Wed, 1 Jul 2020 21:46:17 -0300
Subject: [PATCH 41/43] Using strong params instead of attr_accessible

---
 app/models/comment.rb     |  8 ++++++--
 app/models/device.rb      |  4 ++--
 app/models/like.rb        |  6 ++++--
 app/models/macro.rb       |  6 +++++-
 app/models/snapshot.rb    |  8 ++++++--
 app/models/spectra_set.rb | 10 +++++++---
 app/models/spectrum.rb    | 25 +++++++++++++++----------
 app/models/tag.rb         | 18 +++++++++++-------
 app/models/user.rb        | 15 ++++++++++-----
 9 files changed, 66 insertions(+), 34 deletions(-)

diff --git a/app/models/comment.rb b/app/models/comment.rb
index 82d894dd..f7866a06 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,6 +1,4 @@
 class Comment < ActiveRecord::Base
-  attr_accessible :spectrum_id, :body, :author, :email, :spectra_set_id, :user_id
-
   belongs_to :user
   validates_presence_of :user_id, :body
 
@@ -32,4 +30,10 @@ def can_delete(user)
     (self.has_set? && self.set.author == user.login) || (self.has_spectrum? && self.spectrum.author == user.login) || self.author == user.login || user.role == "admin"
   end
 
+  private
+
+  def comment_params
+    params.require(:comment).permit(:spectrum_id, :body, :author, :email, :spectra_set_id, :user_id)
+  end
+
 end
diff --git a/app/models/device.rb b/app/models/device.rb
index 62f0a207..7d6e5bd2 100644
--- a/app/models/device.rb
+++ b/app/models/device.rb
@@ -1,6 +1,6 @@
 class Device < ActiveRecord::Base
-	validates_presence_of :name, :on => :create, :message => "can't be blank"
-	validates_presence_of :user_id, :on => :create, :message => "can't be blank"
+	validates_presence_of :name, on: :create, message: "can't be blank"
+	validates_presence_of :user_id, on: :create, message: "can't be blank"
 
 	def calibration
 		Spectrum.find self.calibration_id
diff --git a/app/models/like.rb b/app/models/like.rb
index cac67c7b..1e84cb05 100644
--- a/app/models/like.rb
+++ b/app/models/like.rb
@@ -1,7 +1,5 @@
 class Like < ActiveRecord::Base
 
-  attr_accessible :spectrum_id, :user_id
-
   validates_presence_of :user_id, :spectrum_id
   belongs_to :user
   belongs_to :spectrum
@@ -20,4 +18,8 @@ def decrement_likes
     self.spectrum.save
   end
 
+  def like_params
+    params.require(:like).permit(:spectrum_id, :user_id)
+  end
+
 end
diff --git a/app/models/macro.rb b/app/models/macro.rb
index f8408195..234c188a 100644
--- a/app/models/macro.rb
+++ b/app/models/macro.rb
@@ -10,6 +10,10 @@ class Macro < ActiveRecord::Base
                       on: :create
   validates_format_of :url, with: /\A(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?\z/ix
 
-  attr_accessible :title, :description, :code, :macro_type, :url, :user_id
+  private 
+
+  def macro_params
+    params.require(:macro).permit(:title, :description, :code, :macro_type, :url, :user_id)
+  end
 
 end
diff --git a/app/models/snapshot.rb b/app/models/snapshot.rb
index 85ede325..31c8a993 100644
--- a/app/models/snapshot.rb
+++ b/app/models/snapshot.rb
@@ -4,8 +4,6 @@ class Snapshot < ActiveRecord::Base
   belongs_to :user
   belongs_to :tag
 
-  attr_accessible :id, :user_id, :spectrum_id, :description, :data, :tag_id
-
   validates_presence_of :user_id
   validates_presence_of :tag_id
   validates_presence_of :spectrum_id
@@ -88,4 +86,10 @@ def has_subsequent_depended_on_snapshots?
     depended_on_snapshots
   end
 
+  private 
+
+  def snapshot_params
+    params.require(:snapshot).permit(:id, :user_id, :spectrum_id, :description, :data, :tag_id)
+  end
+
 end
diff --git a/app/models/spectra_set.rb b/app/models/spectra_set.rb
index 3a36c117..14a51f08 100644
--- a/app/models/spectra_set.rb
+++ b/app/models/spectra_set.rb
@@ -1,10 +1,8 @@
 class SpectraSet < ActiveRecord::Base
 
-  attr_accessible :title, :notes, :spectrums_string, :author, :user_id
-
   validates_presence_of :title, :user_id
   validates :title, length: { maximum: 60 }
-  has_many :comments, :dependent => :destroy
+  has_many :comments, dependent: :destroy
   has_and_belongs_to_many :spectrums
   belongs_to :user
 
@@ -91,4 +89,10 @@ def notify_commenters(new_comment,current_user)
     end
   end
 
+  private 
+
+  def spectra_set_params
+    params.require(:spectra_set).permit(:title, :notes, :spectrums_string, :author, :user_id)
+  end
+
 end
diff --git a/app/models/spectrum.rb b/app/models/spectrum.rb
index 0ce6621d..aea40221 100755
--- a/app/models/spectrum.rb
+++ b/app/models/spectrum.rb
@@ -3,17 +3,15 @@
 
 class Spectrum < ActiveRecord::Base
   include ActionView::Helpers::DateHelper
-
-  attr_accessible :title, :author, :user_id, :notes, :photo, :video_row, :data
-
+  
   # place this before the has_one :snapshot so it runs before dependent => :destroy
   before_destroy :is_deletable?
 
-  has_many :comments, :dependent => :destroy
-  has_many :likes, :dependent => :destroy
-  has_many :tags, :dependent => :destroy
-  has_many :snapshots, :dependent => :destroy
-  has_one :processed_spectrum, :dependent => :destroy
+  has_many :comments, dependent: :destroy
+  has_many :likes, dependent: :destroy
+  has_many :tags, dependent: :destroy
+  has_many :snapshots, dependent: :destroy
+  has_one :processed_spectrum, dependent: :destroy
   has_and_belongs_to_many :spectra_sets
 
   # Paperclip
@@ -24,8 +22,8 @@ class Spectrum < ActiveRecord::Base
       :thumb=> "300x100!",
       :large =>   "800x200!" }
 
-  validates_presence_of :title, :on => :create, :message => "can't be blank"
-  validates_presence_of :author, :on => :create, :message => "can't be blank"
+  validates_presence_of :title, on: :create, message: "can't be blank"
+  validates_presence_of :author, on: :create, message: "can't be blank"
   validates :title, length: { maximum: 60 }
   validates :title, format: { with: /\A[\w\ -\'\"]+\z/, message: "can contain only letters, numbers, and spaces." }
   validates :author, :format => { with: /\A\w[\w\.\-_@]+\z/, message: "can contain only letters, numbers, hyphens, underscores and periods." }
@@ -638,4 +636,11 @@ def find_similar(range)
 
   end
 
+  private
+
+  def spectrum_params
+    params.require(:spectrum).permit(:title, :author, :user_id, :notes, :photo, :video_row, :data)
+  end
+
+
 end
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 46728476..04442f3b 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -1,12 +1,10 @@
 class Tag < ActiveRecord::Base
 
-  attr_accessible :spectrum_id, :name, :user_id
+  validates_presence_of :name, on: :create, message: "can't be blank"
+  validates_presence_of :user_id, on: :create, message: "can't be blank"
+  validates_presence_of :spectrum_id, on: :create, message: "can't be blank"
 
-  validates_presence_of :name, :on => :create, :message => "can't be blank"
-  validates_presence_of :user_id, :on => :create, :message => "can't be blank"
-  validates_presence_of :spectrum_id, :on => :create, :message => "can't be blank"
-
-  validates :name, :format => {:with => /[\w\.:\,\-\*\+\[\]\(\)\#\$]+/, :message => "can only include letters, numbers, and dashes, or mathematical expressions"}
+  validates :name, :format => {:with => /[\w\.:\,\-\*\+\[\]\(\)\#\$]+/, message: "can only include letters, numbers, and dashes, or mathematical expressions"}
 
   validate :powertags_by_owner
 
@@ -16,7 +14,7 @@ class Tag < ActiveRecord::Base
 
   belongs_to :spectrum
   belongs_to :user
-  has_one :snapshot, :dependent => :destroy
+  has_one :snapshot, dependent: :destroy
 
   before_save :scan_powertags
   after_save :scan_powertags_after_save
@@ -180,4 +178,10 @@ def colors
     colors
   end
 
+  private
+
+  def tag_params
+    params.require(:tag).permit(:spectrum_id, :name, :user_id)
+  end
+
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index a083aa51..09099885 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -11,15 +11,14 @@ class User < ActiveRecord::Base
   validates_length_of       :email,    :within => 6..100 #r@a.wk
   validates_uniqueness_of   :email
 
-  has_many :macros,       :dependent => :destroy
-  has_many :spectrums,    :dependent => :destroy
-  has_many :spectra_sets, :dependent => :destroy
-  has_many :comments,     :dependent => :destroy
+  has_many :macros,       dependent: :destroy
+  has_many :spectrums,    dependent: :destroy
+  has_many :spectra_sets, dependent: :destroy
+  has_many :comments,     dependent: :destroy
 
   # HACK HACK HACK -- how to do attr_accessible from here?
   # prevents a user from submitting a crafted form that bypasses activation
   # anything else you want your user to change should be added here.
-  attr_accessible :login, :email, :name, :password, :password_confirmation, :email_preferences
 
   def after_create
     UserMailer.google_groups_email(self)
@@ -112,4 +111,10 @@ def self.find_by_token(token)
     User.where("created_at > ? AND created_at < ?", t - 1.second, t + 1.second).first
   end
 
+  private
+
+  def user_params
+    params.require(:user).permit(:login, :email, :name, :password, :password_confirmation, :email_preferences)
+  end
+
 end

From eca187a37af5e88507efae3636f7b75258212bc8 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Wed, 1 Jul 2020 21:47:44 -0300
Subject: [PATCH 42/43] Fixing syntax for newer rails

---
 app/controllers/application_controller.rb |  2 +-
 app/controllers/capture_controller.rb     |  4 ++--
 app/controllers/likes_controller.rb       |  6 +++---
 app/controllers/macros_controller.rb      |  4 ++--
 app/controllers/match_controller.rb       |  2 +-
 app/controllers/sets_controller.rb        |  2 +-
 app/controllers/snapshots_controller.rb   |  2 +-
 app/controllers/spectrums_controller.rb   | 18 +++++++++---------
 app/controllers/tags_controller.rb        |  2 +-
 config/routes.rb                          |  2 +-
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index fffe7b3a..8eedc9a8 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -68,7 +68,7 @@ def require_login
           login_prompt = "You must be <a href='#{login_link}'>logged in to do this</a>."
           format.json { render :json => { :errors => [ login_prompt ] } }
           format.html do
-            render :text => login_prompt # halts request cycle
+            render html: login_prompt # halts request cycle
           end
         else
           format.html do
diff --git a/app/controllers/capture_controller.rb b/app/controllers/capture_controller.rb
index ed05dfdc..b30e2736 100755
--- a/app/controllers/capture_controller.rb
+++ b/app/controllers/capture_controller.rb
@@ -115,8 +115,8 @@ def recent_calibrations
       @spectrums = current_user.calibrations.limit(20)
       # add the one that's being used in live display:
       if params[:calibration_id] && params[:calibration_id] != 'undefined'
-        new = Spectrum.where(id: params[:calibration_id])
-        @spectrums = new + @spectrums
+        new_spectrum = Spectrum.where(id: params[:calibration_id])
+        @spectrums = new_spectrum + @spectrums
       end
       @spectrums = @spectrums.uniq
       respond_to do |format|
diff --git a/app/controllers/likes_controller.rb b/app/controllers/likes_controller.rb
index 9ca6003b..89a110a7 100644
--- a/app/controllers/likes_controller.rb
+++ b/app/controllers/likes_controller.rb
@@ -18,16 +18,16 @@ def toggle
     @spectrum = Spectrum.find params[:id]
     if @spectrum.liked_by(current_user.id)
       Like.find_by_user_id(current_user.id,:conditions => {:spectrum_id => @spectrum.id}).delete
-      render :text => "unliked"
+      render plain: "unliked"
     else
       @like = Like.new({
         :user_id => current_user.id,
         :spectrum_id => params[:id]
       })
       if @like.save
-        render :text => @spectrum.likes.length
+        render html: @spectrum.likes.length
       else
-        render :text => "error"
+        render plain: "error"
       end
     end
   end
diff --git a/app/controllers/macros_controller.rb b/app/controllers/macros_controller.rb
index c07bcafa..66516146 100644
--- a/app/controllers/macros_controller.rb
+++ b/app/controllers/macros_controller.rb
@@ -17,9 +17,9 @@ def show
       format.html {}
       format.js  { 
         if params[:run]
-          render :text => "$W.macro = {"+@macro.code+"};$W.macro.setup()" 
+          render plain: "$W.macro = {"+@macro.code+"};$W.macro.setup()" 
         else
-          render :text => "{"+@macro.code+"}" 
+          render plain: "{"+@macro.code+"}" 
         end
       }
     end
diff --git a/app/controllers/match_controller.rb b/app/controllers/match_controller.rb
index 8ea94207..d97f929c 100644
--- a/app/controllers/match_controller.rb
+++ b/app/controllers/match_controller.rb
@@ -66,7 +66,7 @@ def search
       format.html { render partial: "macros/spectra", locals: { spectrums: @spectra } if params[:toolPane] }
       format.xml  { render :xml => @spectra }
       format.csv  {
-        render :text => SpectrumsHelper.show_csv(@spectrum)
+        render html: SpectrumsHelper.show_csv(@spectrum)
       }
       format.json  { render :json => @spectra.map { |s| s.json } } # actually flatten in the json of each spectrum; kind of messy
     end
diff --git a/app/controllers/sets_controller.rb b/app/controllers/sets_controller.rb
index fbfab4c0..63021d92 100644
--- a/app/controllers/sets_controller.rb
+++ b/app/controllers/sets_controller.rb
@@ -52,7 +52,7 @@ def find_match
     range = @calibration.wavelength_range
     @spectrum.scale_data(range[0],range[1])
     @match = Spectrum.find(@set.match(@spectrum))
-    render :text => "Matched: <a href='/spectra/"+@match.id.to_s+"'>"+@match.title+"</a>"
+    render plain: "Matched: <a href='/spectra/"+@match.id.to_s+"'>"+@match.title+"</a>"
   end
 
   def embed
diff --git a/app/controllers/snapshots_controller.rb b/app/controllers/snapshots_controller.rb
index 2d83a44d..8ee5e606 100644
--- a/app/controllers/snapshots_controller.rb
+++ b/app/controllers/snapshots_controller.rb
@@ -19,7 +19,7 @@ def show
     respond_with(@snapshot) do |format|
       format.xml  { render :xml => @snapshot }
       format.csv  {
-        render :text => SpectrumsHelper.show_csv_snapshot(@snapshot)
+        render html: SpectrumsHelper.show_csv_snapshot(@snapshot)
       }
       format.json  {
         render :json => @snapshot.data
diff --git a/app/controllers/spectrums_controller.rb b/app/controllers/spectrums_controller.rb
index c8eb1894..86236185 100755
--- a/app/controllers/spectrums_controller.rb
+++ b/app/controllers/spectrums_controller.rb
@@ -105,7 +105,7 @@ def show
       }
       format.xml  { render :xml => @spectrum }
       format.csv  {
-        render :text => SpectrumsHelper.show_csv(@spectrum)
+        render html: SpectrumsHelper.show_csv(@spectrum)
       }
       format.json  {
         render :json => @spectrum.json
@@ -121,9 +121,9 @@ def latest_snapshot_id
                      .select('spectrum_id, created_at, id')
                      .order("created_at DESC")
                      .limit(1)
-      render :text => spectrum.latest_snapshot.id
+      render html: spectrum.latest_snapshot.id
     else
-      render :text => false
+      render html: false
     end
   end
 
@@ -139,8 +139,8 @@ def latest
     respond_with(@snapshot) do |format|
       format.xml  { render :xml => @snapshot }
       format.csv  {
-        render :text => SpectrumsHelper.show_csv_snapshot(@snapshot) if is_snapshot
-        render :text => SpectrumsHelper.show_csv(@snapshot)          if !is_snapshot
+        render html: SpectrumsHelper.show_csv_snapshot(@snapshot) if is_snapshot
+        render html: SpectrumsHelper.show_csv(@snapshot)          if !is_snapshot
       }
       format.json  {
         render :json => @snapshot.json
@@ -280,7 +280,7 @@ def create
               flash[:notice] = 'Spectrum was successfully created.'
               format.html  { redirect_to spectrum_path(@spectrum) + calibration_param }
               format.xml   { render :xml => @spectrum, :status => :created, :location => @spectrum }
-              format.json  { render :text => spectrum_path(@spectrum), :status => :created, :location => @spectrum }
+              format.json  { render html: spectrum_path(@spectrum), :status => :created, :location => @spectrum }
             else
               render "spectrums/new"
             end
@@ -309,7 +309,7 @@ def create
       respond_to do |format|
         if request.xhr?
           format.json  { 
-            render :text => 'Token required for unauthenticated API usage.'
+            render html: 'Token required for unauthenticated API usage.'
           }
         else
           format.html { 
@@ -344,7 +344,7 @@ def save
     params[:tags].to_s.split(',').each do |tag|
       @spectrum.tag(tag, current_user.id)
     end
-    render :text => @spectrum.save
+    render html: @spectrum.save
   end
 
   # PUT /spectrums/1
@@ -469,7 +469,7 @@ def plots_rss
 
   def match
     @spectrum = Spectrum.find params[:id]
-    render :text => @spectrum.find_match_in_set(params[:set]).to_json
+    render html: @spectrum.find_match_in_set(params[:set]).to_json
   end
 
   # Start doing this client side!
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index f4d9bd20..c203e257 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -87,7 +87,7 @@ def destroy
           respond_to do |format|
             format.html do
               if request.xhr?
-                render :json => { :message => "success" }
+                render :json => { message: "success" }
               else
                 flash[:notice] = "Tag '#{@tag.name}' deleted."
                 redirect_to spectrum_path(@tag.spectrum_id)
diff --git a/config/routes.rb b/config/routes.rb
index 39381417..df47dab6 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -35,7 +35,7 @@
   #   resources :products do
   #     resources :comments
   #     resources :sales do
-  #       get 'recent', :on => :collection
+  #       get 'recent', on: :collection
   #     end
   #   end
 

From f516afb34d39ff866440eab0e8e73eef23a21278 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Wed, 1 Jul 2020 21:51:12 -0300
Subject: [PATCH 43/43] Resetting schema

---
 Makefile             |    9 +
 db/schema.rb.example | 1475 +++++++++++++++++++++---------------------
 script/start.sh      |    4 +
 3 files changed, 747 insertions(+), 741 deletions(-)

diff --git a/Makefile b/Makefile
index 88656e99..58fb5e25 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,13 @@
+define wait_for_container
+	@while ! docker-compose logs web | grep "Web server started"; do\
+		echo "Serving Spectral";\
+		sleep 10;\
+	done;
+endef
+
 redeploy-container:
+	# docker-compose down --volumes
 	docker-compose up --force-recreate -d
+	# $(call wait_for_container)
 	sleep 30
 	docker-compose logs
diff --git a/db/schema.rb.example b/db/schema.rb.example
index 9c644ee3..b199a34e 100644
--- a/db/schema.rb.example
+++ b/db/schema.rb.example
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,773 +10,767 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20190513143943) do
+ActiveRecord::Schema.define(version: 2019_05_13_143943) do
 
-  create_table "comments", force: :cascade do |t|
-    t.string   "author",         limit: 255
-    t.string   "email",          limit: 255
-    t.text     "body",           limit: 65535
-    t.float    "wavelength",     limit: 24
-    t.integer  "x",              limit: 4
-    t.integer  "y",              limit: 4
-    t.integer  "spectrum_id",    limit: 4
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "spectra_set_id", limit: 4,     default: 0
-    t.integer  "user_id",        limit: 4,     default: 0
-    t.integer  "intensity",      limit: 4
+  create_table "comments", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.string "author"
+    t.string "email"
+    t.text "body"
+    t.float "wavelength"
+    t.integer "x"
+    t.integer "y"
+    t.integer "spectrum_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "spectra_set_id", default: 0
+    t.integer "user_id", default: 0
+    t.integer "intensity"
   end
 
-  create_table "devices", force: :cascade do |t|
-    t.string   "name",           limit: 255
-    t.string   "description",    limit: 100,                default: "", null: false
-    t.integer  "height",         limit: 4
-    t.integer  "width",          limit: 4
-    t.integer  "calibration_id", limit: 4
-    t.integer  "user_id",        limit: 4
-    t.decimal  "range_start",                precision: 10
-    t.decimal  "range_end",                  precision: 10
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "key",            limit: 255,                default: "", null: false
+  create_table "devices", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.string "name"
+    t.string "description", limit: 100, default: "", null: false
+    t.integer "height"
+    t.integer "width"
+    t.integer "calibration_id"
+    t.integer "user_id"
+    t.decimal "range_start", precision: 10
+    t.decimal "range_end", precision: 10
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "key", default: "", null: false
   end
 
-  create_table "likes", force: :cascade do |t|
-    t.integer  "spectrum_id", limit: 4
-    t.string   "like_type",   limit: 255, default: "like", null: false
-    t.integer  "user_id",     limit: 4
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  create_table "likes", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.integer "spectrum_id"
+    t.string "like_type", default: "like", null: false
+    t.integer "user_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table "macros", force: :cascade do |t|
-    t.integer  "user_id",     limit: 4
-    t.string   "macro_type",  limit: 255,   default: "analyze",   null: false
-    t.string   "title",       limit: 255
-    t.string   "url",         limit: 255
-    t.text     "description", limit: 65535
-    t.text     "code",        limit: 65535
-    t.string   "published",   limit: 255,   default: "published"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  create_table "macros", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.integer "user_id"
+    t.string "macro_type", default: "analyze", null: false
+    t.string "title"
+    t.string "url"
+    t.text "description"
+    t.text "code"
+    t.string "published", default: "published"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table "processed_spectrums", force: :cascade do |t|
-    t.integer "spectrum_id", limit: 4
-    t.integer "a10",         limit: 4, default: 0
-    t.integer "r10",         limit: 4, default: 0
-    t.integer "g10",         limit: 4, default: 0
-    t.integer "b10",         limit: 4, default: 0
-    t.integer "a20",         limit: 4, default: 0
-    t.integer "r20",         limit: 4, default: 0
-    t.integer "g20",         limit: 4, default: 0
-    t.integer "b20",         limit: 4, default: 0
-    t.integer "a30",         limit: 4, default: 0
-    t.integer "r30",         limit: 4, default: 0
-    t.integer "g30",         limit: 4, default: 0
-    t.integer "b30",         limit: 4, default: 0
-    t.integer "a40",         limit: 4, default: 0
-    t.integer "r40",         limit: 4, default: 0
-    t.integer "g40",         limit: 4, default: 0
-    t.integer "b40",         limit: 4, default: 0
-    t.integer "a50",         limit: 4, default: 0
-    t.integer "r50",         limit: 4, default: 0
-    t.integer "g50",         limit: 4, default: 0
-    t.integer "b50",         limit: 4, default: 0
-    t.integer "a60",         limit: 4, default: 0
-    t.integer "r60",         limit: 4, default: 0
-    t.integer "g60",         limit: 4, default: 0
-    t.integer "b60",         limit: 4, default: 0
-    t.integer "a70",         limit: 4, default: 0
-    t.integer "r70",         limit: 4, default: 0
-    t.integer "g70",         limit: 4, default: 0
-    t.integer "b70",         limit: 4, default: 0
-    t.integer "a80",         limit: 4, default: 0
-    t.integer "r80",         limit: 4, default: 0
-    t.integer "g80",         limit: 4, default: 0
-    t.integer "b80",         limit: 4, default: 0
-    t.integer "a90",         limit: 4, default: 0
-    t.integer "r90",         limit: 4, default: 0
-    t.integer "g90",         limit: 4, default: 0
-    t.integer "b90",         limit: 4, default: 0
-    t.integer "a100",        limit: 4, default: 0
-    t.integer "r100",        limit: 4, default: 0
-    t.integer "g100",        limit: 4, default: 0
-    t.integer "b100",        limit: 4, default: 0
-    t.integer "a110",        limit: 4, default: 0
-    t.integer "r110",        limit: 4, default: 0
-    t.integer "g110",        limit: 4, default: 0
-    t.integer "b110",        limit: 4, default: 0
-    t.integer "a120",        limit: 4, default: 0
-    t.integer "r120",        limit: 4, default: 0
-    t.integer "g120",        limit: 4, default: 0
-    t.integer "b120",        limit: 4, default: 0
-    t.integer "a130",        limit: 4, default: 0
-    t.integer "r130",        limit: 4, default: 0
-    t.integer "g130",        limit: 4, default: 0
-    t.integer "b130",        limit: 4, default: 0
-    t.integer "a140",        limit: 4, default: 0
-    t.integer "r140",        limit: 4, default: 0
-    t.integer "g140",        limit: 4, default: 0
-    t.integer "b140",        limit: 4, default: 0
-    t.integer "a150",        limit: 4, default: 0
-    t.integer "r150",        limit: 4, default: 0
-    t.integer "g150",        limit: 4, default: 0
-    t.integer "b150",        limit: 4, default: 0
-    t.integer "a160",        limit: 4, default: 0
-    t.integer "r160",        limit: 4, default: 0
-    t.integer "g160",        limit: 4, default: 0
-    t.integer "b160",        limit: 4, default: 0
-    t.integer "a170",        limit: 4, default: 0
-    t.integer "r170",        limit: 4, default: 0
-    t.integer "g170",        limit: 4, default: 0
-    t.integer "b170",        limit: 4, default: 0
-    t.integer "a180",        limit: 4, default: 0
-    t.integer "r180",        limit: 4, default: 0
-    t.integer "g180",        limit: 4, default: 0
-    t.integer "b180",        limit: 4, default: 0
-    t.integer "a190",        limit: 4, default: 0
-    t.integer "r190",        limit: 4, default: 0
-    t.integer "g190",        limit: 4, default: 0
-    t.integer "b190",        limit: 4, default: 0
-    t.integer "a200",        limit: 4, default: 0
-    t.integer "r200",        limit: 4, default: 0
-    t.integer "g200",        limit: 4, default: 0
-    t.integer "b200",        limit: 4, default: 0
-    t.integer "a210",        limit: 4, default: 0
-    t.integer "r210",        limit: 4, default: 0
-    t.integer "g210",        limit: 4, default: 0
-    t.integer "b210",        limit: 4, default: 0
-    t.integer "a220",        limit: 4, default: 0
-    t.integer "r220",        limit: 4, default: 0
-    t.integer "g220",        limit: 4, default: 0
-    t.integer "b220",        limit: 4, default: 0
-    t.integer "a230",        limit: 4, default: 0
-    t.integer "r230",        limit: 4, default: 0
-    t.integer "g230",        limit: 4, default: 0
-    t.integer "b230",        limit: 4, default: 0
-    t.integer "a240",        limit: 4, default: 0
-    t.integer "r240",        limit: 4, default: 0
-    t.integer "g240",        limit: 4, default: 0
-    t.integer "b240",        limit: 4, default: 0
-    t.integer "a250",        limit: 4, default: 0
-    t.integer "r250",        limit: 4, default: 0
-    t.integer "g250",        limit: 4, default: 0
-    t.integer "b250",        limit: 4, default: 0
-    t.integer "a260",        limit: 4, default: 0
-    t.integer "r260",        limit: 4, default: 0
-    t.integer "g260",        limit: 4, default: 0
-    t.integer "b260",        limit: 4, default: 0
-    t.integer "a270",        limit: 4, default: 0
-    t.integer "r270",        limit: 4, default: 0
-    t.integer "g270",        limit: 4, default: 0
-    t.integer "b270",        limit: 4, default: 0
-    t.integer "a280",        limit: 4, default: 0
-    t.integer "r280",        limit: 4, default: 0
-    t.integer "g280",        limit: 4, default: 0
-    t.integer "b280",        limit: 4, default: 0
-    t.integer "a290",        limit: 4, default: 0
-    t.integer "r290",        limit: 4, default: 0
-    t.integer "g290",        limit: 4, default: 0
-    t.integer "b290",        limit: 4, default: 0
-    t.integer "a300",        limit: 4, default: 0
-    t.integer "r300",        limit: 4, default: 0
-    t.integer "g300",        limit: 4, default: 0
-    t.integer "b300",        limit: 4, default: 0
-    t.integer "a310",        limit: 4, default: 0
-    t.integer "r310",        limit: 4, default: 0
-    t.integer "g310",        limit: 4, default: 0
-    t.integer "b310",        limit: 4, default: 0
-    t.integer "a320",        limit: 4, default: 0
-    t.integer "r320",        limit: 4, default: 0
-    t.integer "g320",        limit: 4, default: 0
-    t.integer "b320",        limit: 4, default: 0
-    t.integer "a330",        limit: 4, default: 0
-    t.integer "r330",        limit: 4, default: 0
-    t.integer "g330",        limit: 4, default: 0
-    t.integer "b330",        limit: 4, default: 0
-    t.integer "a340",        limit: 4, default: 0
-    t.integer "r340",        limit: 4, default: 0
-    t.integer "g340",        limit: 4, default: 0
-    t.integer "b340",        limit: 4, default: 0
-    t.integer "a350",        limit: 4, default: 0
-    t.integer "r350",        limit: 4, default: 0
-    t.integer "g350",        limit: 4, default: 0
-    t.integer "b350",        limit: 4, default: 0
-    t.integer "a360",        limit: 4, default: 0
-    t.integer "r360",        limit: 4, default: 0
-    t.integer "g360",        limit: 4, default: 0
-    t.integer "b360",        limit: 4, default: 0
-    t.integer "a370",        limit: 4, default: 0
-    t.integer "r370",        limit: 4, default: 0
-    t.integer "g370",        limit: 4, default: 0
-    t.integer "b370",        limit: 4, default: 0
-    t.integer "a380",        limit: 4, default: 0
-    t.integer "r380",        limit: 4, default: 0
-    t.integer "g380",        limit: 4, default: 0
-    t.integer "b380",        limit: 4, default: 0
-    t.integer "a390",        limit: 4, default: 0
-    t.integer "r390",        limit: 4, default: 0
-    t.integer "g390",        limit: 4, default: 0
-    t.integer "b390",        limit: 4, default: 0
-    t.integer "a400",        limit: 4, default: 0
-    t.integer "r400",        limit: 4, default: 0
-    t.integer "g400",        limit: 4, default: 0
-    t.integer "b400",        limit: 4, default: 0
-    t.integer "a410",        limit: 4, default: 0
-    t.integer "r410",        limit: 4, default: 0
-    t.integer "g410",        limit: 4, default: 0
-    t.integer "b410",        limit: 4, default: 0
-    t.integer "a420",        limit: 4, default: 0
-    t.integer "r420",        limit: 4, default: 0
-    t.integer "g420",        limit: 4, default: 0
-    t.integer "b420",        limit: 4, default: 0
-    t.integer "a430",        limit: 4, default: 0
-    t.integer "r430",        limit: 4, default: 0
-    t.integer "g430",        limit: 4, default: 0
-    t.integer "b430",        limit: 4, default: 0
-    t.integer "a440",        limit: 4, default: 0
-    t.integer "r440",        limit: 4, default: 0
-    t.integer "g440",        limit: 4, default: 0
-    t.integer "b440",        limit: 4, default: 0
-    t.integer "a450",        limit: 4, default: 0
-    t.integer "r450",        limit: 4, default: 0
-    t.integer "g450",        limit: 4, default: 0
-    t.integer "b450",        limit: 4, default: 0
-    t.integer "a460",        limit: 4, default: 0
-    t.integer "r460",        limit: 4, default: 0
-    t.integer "g460",        limit: 4, default: 0
-    t.integer "b460",        limit: 4, default: 0
-    t.integer "a470",        limit: 4, default: 0
-    t.integer "r470",        limit: 4, default: 0
-    t.integer "g470",        limit: 4, default: 0
-    t.integer "b470",        limit: 4, default: 0
-    t.integer "a480",        limit: 4, default: 0
-    t.integer "r480",        limit: 4, default: 0
-    t.integer "g480",        limit: 4, default: 0
-    t.integer "b480",        limit: 4, default: 0
-    t.integer "a490",        limit: 4, default: 0
-    t.integer "r490",        limit: 4, default: 0
-    t.integer "g490",        limit: 4, default: 0
-    t.integer "b490",        limit: 4, default: 0
-    t.integer "a500",        limit: 4, default: 0
-    t.integer "r500",        limit: 4, default: 0
-    t.integer "g500",        limit: 4, default: 0
-    t.integer "b500",        limit: 4, default: 0
-    t.integer "a510",        limit: 4, default: 0
-    t.integer "r510",        limit: 4, default: 0
-    t.integer "g510",        limit: 4, default: 0
-    t.integer "b510",        limit: 4, default: 0
-    t.integer "a520",        limit: 4, default: 0
-    t.integer "r520",        limit: 4, default: 0
-    t.integer "g520",        limit: 4, default: 0
-    t.integer "b520",        limit: 4, default: 0
-    t.integer "a530",        limit: 4, default: 0
-    t.integer "r530",        limit: 4, default: 0
-    t.integer "g530",        limit: 4, default: 0
-    t.integer "b530",        limit: 4, default: 0
-    t.integer "a540",        limit: 4, default: 0
-    t.integer "r540",        limit: 4, default: 0
-    t.integer "g540",        limit: 4, default: 0
-    t.integer "b540",        limit: 4, default: 0
-    t.integer "a550",        limit: 4, default: 0
-    t.integer "r550",        limit: 4, default: 0
-    t.integer "g550",        limit: 4, default: 0
-    t.integer "b550",        limit: 4, default: 0
-    t.integer "a560",        limit: 4, default: 0
-    t.integer "r560",        limit: 4, default: 0
-    t.integer "g560",        limit: 4, default: 0
-    t.integer "b560",        limit: 4, default: 0
-    t.integer "a570",        limit: 4, default: 0
-    t.integer "r570",        limit: 4, default: 0
-    t.integer "g570",        limit: 4, default: 0
-    t.integer "b570",        limit: 4, default: 0
-    t.integer "a580",        limit: 4, default: 0
-    t.integer "r580",        limit: 4, default: 0
-    t.integer "g580",        limit: 4, default: 0
-    t.integer "b580",        limit: 4, default: 0
-    t.integer "a590",        limit: 4, default: 0
-    t.integer "r590",        limit: 4, default: 0
-    t.integer "g590",        limit: 4, default: 0
-    t.integer "b590",        limit: 4, default: 0
-    t.integer "a600",        limit: 4, default: 0
-    t.integer "r600",        limit: 4, default: 0
-    t.integer "g600",        limit: 4, default: 0
-    t.integer "b600",        limit: 4, default: 0
-    t.integer "a610",        limit: 4, default: 0
-    t.integer "r610",        limit: 4, default: 0
-    t.integer "g610",        limit: 4, default: 0
-    t.integer "b610",        limit: 4, default: 0
-    t.integer "a620",        limit: 4, default: 0
-    t.integer "r620",        limit: 4, default: 0
-    t.integer "g620",        limit: 4, default: 0
-    t.integer "b620",        limit: 4, default: 0
-    t.integer "a630",        limit: 4, default: 0
-    t.integer "r630",        limit: 4, default: 0
-    t.integer "g630",        limit: 4, default: 0
-    t.integer "b630",        limit: 4, default: 0
-    t.integer "a640",        limit: 4, default: 0
-    t.integer "r640",        limit: 4, default: 0
-    t.integer "g640",        limit: 4, default: 0
-    t.integer "b640",        limit: 4, default: 0
-    t.integer "a650",        limit: 4, default: 0
-    t.integer "r650",        limit: 4, default: 0
-    t.integer "g650",        limit: 4, default: 0
-    t.integer "b650",        limit: 4, default: 0
-    t.integer "a660",        limit: 4, default: 0
-    t.integer "r660",        limit: 4, default: 0
-    t.integer "g660",        limit: 4, default: 0
-    t.integer "b660",        limit: 4, default: 0
-    t.integer "a670",        limit: 4, default: 0
-    t.integer "r670",        limit: 4, default: 0
-    t.integer "g670",        limit: 4, default: 0
-    t.integer "b670",        limit: 4, default: 0
-    t.integer "a680",        limit: 4, default: 0
-    t.integer "r680",        limit: 4, default: 0
-    t.integer "g680",        limit: 4, default: 0
-    t.integer "b680",        limit: 4, default: 0
-    t.integer "a690",        limit: 4, default: 0
-    t.integer "r690",        limit: 4, default: 0
-    t.integer "g690",        limit: 4, default: 0
-    t.integer "b690",        limit: 4, default: 0
-    t.integer "a700",        limit: 4, default: 0
-    t.integer "r700",        limit: 4, default: 0
-    t.integer "g700",        limit: 4, default: 0
-    t.integer "b700",        limit: 4, default: 0
-    t.integer "a710",        limit: 4, default: 0
-    t.integer "r710",        limit: 4, default: 0
-    t.integer "g710",        limit: 4, default: 0
-    t.integer "b710",        limit: 4, default: 0
-    t.integer "a720",        limit: 4, default: 0
-    t.integer "r720",        limit: 4, default: 0
-    t.integer "g720",        limit: 4, default: 0
-    t.integer "b720",        limit: 4, default: 0
-    t.integer "a730",        limit: 4, default: 0
-    t.integer "r730",        limit: 4, default: 0
-    t.integer "g730",        limit: 4, default: 0
-    t.integer "b730",        limit: 4, default: 0
-    t.integer "a740",        limit: 4, default: 0
-    t.integer "r740",        limit: 4, default: 0
-    t.integer "g740",        limit: 4, default: 0
-    t.integer "b740",        limit: 4, default: 0
-    t.integer "a750",        limit: 4, default: 0
-    t.integer "r750",        limit: 4, default: 0
-    t.integer "g750",        limit: 4, default: 0
-    t.integer "b750",        limit: 4, default: 0
-    t.integer "a760",        limit: 4, default: 0
-    t.integer "r760",        limit: 4, default: 0
-    t.integer "g760",        limit: 4, default: 0
-    t.integer "b760",        limit: 4, default: 0
-    t.integer "a770",        limit: 4, default: 0
-    t.integer "r770",        limit: 4, default: 0
-    t.integer "g770",        limit: 4, default: 0
-    t.integer "b770",        limit: 4, default: 0
-    t.integer "a780",        limit: 4, default: 0
-    t.integer "r780",        limit: 4, default: 0
-    t.integer "g780",        limit: 4, default: 0
-    t.integer "b780",        limit: 4, default: 0
-    t.integer "a790",        limit: 4, default: 0
-    t.integer "r790",        limit: 4, default: 0
-    t.integer "g790",        limit: 4, default: 0
-    t.integer "b790",        limit: 4, default: 0
-    t.integer "a800",        limit: 4, default: 0
-    t.integer "r800",        limit: 4, default: 0
-    t.integer "g800",        limit: 4, default: 0
-    t.integer "b800",        limit: 4, default: 0
-    t.integer "a810",        limit: 4, default: 0
-    t.integer "r810",        limit: 4, default: 0
-    t.integer "g810",        limit: 4, default: 0
-    t.integer "b810",        limit: 4, default: 0
-    t.integer "a820",        limit: 4, default: 0
-    t.integer "r820",        limit: 4, default: 0
-    t.integer "g820",        limit: 4, default: 0
-    t.integer "b820",        limit: 4, default: 0
-    t.integer "a830",        limit: 4, default: 0
-    t.integer "r830",        limit: 4, default: 0
-    t.integer "g830",        limit: 4, default: 0
-    t.integer "b830",        limit: 4, default: 0
-    t.integer "a840",        limit: 4, default: 0
-    t.integer "r840",        limit: 4, default: 0
-    t.integer "g840",        limit: 4, default: 0
-    t.integer "b840",        limit: 4, default: 0
-    t.integer "a850",        limit: 4, default: 0
-    t.integer "r850",        limit: 4, default: 0
-    t.integer "g850",        limit: 4, default: 0
-    t.integer "b850",        limit: 4, default: 0
-    t.integer "a860",        limit: 4, default: 0
-    t.integer "r860",        limit: 4, default: 0
-    t.integer "g860",        limit: 4, default: 0
-    t.integer "b860",        limit: 4, default: 0
-    t.integer "a870",        limit: 4, default: 0
-    t.integer "r870",        limit: 4, default: 0
-    t.integer "g870",        limit: 4, default: 0
-    t.integer "b870",        limit: 4, default: 0
-    t.integer "a880",        limit: 4, default: 0
-    t.integer "r880",        limit: 4, default: 0
-    t.integer "g880",        limit: 4, default: 0
-    t.integer "b880",        limit: 4, default: 0
-    t.integer "a890",        limit: 4, default: 0
-    t.integer "r890",        limit: 4, default: 0
-    t.integer "g890",        limit: 4, default: 0
-    t.integer "b890",        limit: 4, default: 0
-    t.integer "a900",        limit: 4, default: 0
-    t.integer "r900",        limit: 4, default: 0
-    t.integer "g900",        limit: 4, default: 0
-    t.integer "b900",        limit: 4, default: 0
-    t.integer "a910",        limit: 4, default: 0
-    t.integer "r910",        limit: 4, default: 0
-    t.integer "g910",        limit: 4, default: 0
-    t.integer "b910",        limit: 4, default: 0
-    t.integer "a920",        limit: 4, default: 0
-    t.integer "r920",        limit: 4, default: 0
-    t.integer "g920",        limit: 4, default: 0
-    t.integer "b920",        limit: 4, default: 0
-    t.integer "a930",        limit: 4, default: 0
-    t.integer "r930",        limit: 4, default: 0
-    t.integer "g930",        limit: 4, default: 0
-    t.integer "b930",        limit: 4, default: 0
-    t.integer "a940",        limit: 4, default: 0
-    t.integer "r940",        limit: 4, default: 0
-    t.integer "g940",        limit: 4, default: 0
-    t.integer "b940",        limit: 4, default: 0
-    t.integer "a950",        limit: 4, default: 0
-    t.integer "r950",        limit: 4, default: 0
-    t.integer "g950",        limit: 4, default: 0
-    t.integer "b950",        limit: 4, default: 0
-    t.integer "a960",        limit: 4, default: 0
-    t.integer "r960",        limit: 4, default: 0
-    t.integer "g960",        limit: 4, default: 0
-    t.integer "b960",        limit: 4, default: 0
-    t.integer "a970",        limit: 4, default: 0
-    t.integer "r970",        limit: 4, default: 0
-    t.integer "g970",        limit: 4, default: 0
-    t.integer "b970",        limit: 4, default: 0
-    t.integer "a980",        limit: 4, default: 0
-    t.integer "r980",        limit: 4, default: 0
-    t.integer "g980",        limit: 4, default: 0
-    t.integer "b980",        limit: 4, default: 0
-    t.integer "a990",        limit: 4, default: 0
-    t.integer "r990",        limit: 4, default: 0
-    t.integer "g990",        limit: 4, default: 0
-    t.integer "b990",        limit: 4, default: 0
-    t.integer "a1000",       limit: 4, default: 0
-    t.integer "r1000",       limit: 4, default: 0
-    t.integer "g1000",       limit: 4, default: 0
-    t.integer "b1000",       limit: 4, default: 0
-    t.integer "a1010",       limit: 4, default: 0
-    t.integer "r1010",       limit: 4, default: 0
-    t.integer "g1010",       limit: 4, default: 0
-    t.integer "b1010",       limit: 4, default: 0
-    t.integer "a1020",       limit: 4, default: 0
-    t.integer "r1020",       limit: 4, default: 0
-    t.integer "g1020",       limit: 4, default: 0
-    t.integer "b1020",       limit: 4, default: 0
-    t.integer "a1030",       limit: 4, default: 0
-    t.integer "r1030",       limit: 4, default: 0
-    t.integer "g1030",       limit: 4, default: 0
-    t.integer "b1030",       limit: 4, default: 0
-    t.integer "a1040",       limit: 4, default: 0
-    t.integer "r1040",       limit: 4, default: 0
-    t.integer "g1040",       limit: 4, default: 0
-    t.integer "b1040",       limit: 4, default: 0
-    t.integer "a1050",       limit: 4, default: 0
-    t.integer "r1050",       limit: 4, default: 0
-    t.integer "g1050",       limit: 4, default: 0
-    t.integer "b1050",       limit: 4, default: 0
-    t.integer "a1060",       limit: 4, default: 0
-    t.integer "r1060",       limit: 4, default: 0
-    t.integer "g1060",       limit: 4, default: 0
-    t.integer "b1060",       limit: 4, default: 0
-    t.integer "a1070",       limit: 4, default: 0
-    t.integer "r1070",       limit: 4, default: 0
-    t.integer "g1070",       limit: 4, default: 0
-    t.integer "b1070",       limit: 4, default: 0
-    t.integer "a1080",       limit: 4, default: 0
-    t.integer "r1080",       limit: 4, default: 0
-    t.integer "g1080",       limit: 4, default: 0
-    t.integer "b1080",       limit: 4, default: 0
-    t.integer "a1090",       limit: 4, default: 0
-    t.integer "r1090",       limit: 4, default: 0
-    t.integer "g1090",       limit: 4, default: 0
-    t.integer "b1090",       limit: 4, default: 0
-    t.integer "a1100",       limit: 4, default: 0
-    t.integer "r1100",       limit: 4, default: 0
-    t.integer "g1100",       limit: 4, default: 0
-    t.integer "b1100",       limit: 4, default: 0
-    t.integer "a1110",       limit: 4, default: 0
-    t.integer "r1110",       limit: 4, default: 0
-    t.integer "g1110",       limit: 4, default: 0
-    t.integer "b1110",       limit: 4, default: 0
-    t.integer "a1120",       limit: 4, default: 0
-    t.integer "r1120",       limit: 4, default: 0
-    t.integer "g1120",       limit: 4, default: 0
-    t.integer "b1120",       limit: 4, default: 0
-    t.integer "a1130",       limit: 4, default: 0
-    t.integer "r1130",       limit: 4, default: 0
-    t.integer "g1130",       limit: 4, default: 0
-    t.integer "b1130",       limit: 4, default: 0
-    t.integer "a1140",       limit: 4, default: 0
-    t.integer "r1140",       limit: 4, default: 0
-    t.integer "g1140",       limit: 4, default: 0
-    t.integer "b1140",       limit: 4, default: 0
-    t.integer "a1150",       limit: 4, default: 0
-    t.integer "r1150",       limit: 4, default: 0
-    t.integer "g1150",       limit: 4, default: 0
-    t.integer "b1150",       limit: 4, default: 0
-    t.integer "a1160",       limit: 4, default: 0
-    t.integer "r1160",       limit: 4, default: 0
-    t.integer "g1160",       limit: 4, default: 0
-    t.integer "b1160",       limit: 4, default: 0
-    t.integer "a1170",       limit: 4, default: 0
-    t.integer "r1170",       limit: 4, default: 0
-    t.integer "g1170",       limit: 4, default: 0
-    t.integer "b1170",       limit: 4, default: 0
-    t.integer "a1180",       limit: 4, default: 0
-    t.integer "r1180",       limit: 4, default: 0
-    t.integer "g1180",       limit: 4, default: 0
-    t.integer "b1180",       limit: 4, default: 0
-    t.integer "a1190",       limit: 4, default: 0
-    t.integer "r1190",       limit: 4, default: 0
-    t.integer "g1190",       limit: 4, default: 0
-    t.integer "b1190",       limit: 4, default: 0
-    t.integer "a1200",       limit: 4, default: 0
-    t.integer "r1200",       limit: 4, default: 0
-    t.integer "g1200",       limit: 4, default: 0
-    t.integer "b1200",       limit: 4, default: 0
-    t.integer "a1210",       limit: 4, default: 0
-    t.integer "r1210",       limit: 4, default: 0
-    t.integer "g1210",       limit: 4, default: 0
-    t.integer "b1210",       limit: 4, default: 0
-    t.integer "a1220",       limit: 4, default: 0
-    t.integer "r1220",       limit: 4, default: 0
-    t.integer "g1220",       limit: 4, default: 0
-    t.integer "b1220",       limit: 4, default: 0
-    t.integer "a1230",       limit: 4, default: 0
-    t.integer "r1230",       limit: 4, default: 0
-    t.integer "g1230",       limit: 4, default: 0
-    t.integer "b1230",       limit: 4, default: 0
-    t.integer "a1240",       limit: 4, default: 0
-    t.integer "r1240",       limit: 4, default: 0
-    t.integer "g1240",       limit: 4, default: 0
-    t.integer "b1240",       limit: 4, default: 0
-    t.integer "a1250",       limit: 4, default: 0
-    t.integer "r1250",       limit: 4, default: 0
-    t.integer "g1250",       limit: 4, default: 0
-    t.integer "b1250",       limit: 4, default: 0
-    t.integer "a1260",       limit: 4, default: 0
-    t.integer "r1260",       limit: 4, default: 0
-    t.integer "g1260",       limit: 4, default: 0
-    t.integer "b1260",       limit: 4, default: 0
-    t.integer "a1270",       limit: 4, default: 0
-    t.integer "r1270",       limit: 4, default: 0
-    t.integer "g1270",       limit: 4, default: 0
-    t.integer "b1270",       limit: 4, default: 0
-    t.integer "a1280",       limit: 4, default: 0
-    t.integer "r1280",       limit: 4, default: 0
-    t.integer "g1280",       limit: 4, default: 0
-    t.integer "b1280",       limit: 4, default: 0
-    t.integer "a1290",       limit: 4, default: 0
-    t.integer "r1290",       limit: 4, default: 0
-    t.integer "g1290",       limit: 4, default: 0
-    t.integer "b1290",       limit: 4, default: 0
-    t.integer "a1300",       limit: 4, default: 0
-    t.integer "r1300",       limit: 4, default: 0
-    t.integer "g1300",       limit: 4, default: 0
-    t.integer "b1300",       limit: 4, default: 0
-    t.integer "a1310",       limit: 4, default: 0
-    t.integer "r1310",       limit: 4, default: 0
-    t.integer "g1310",       limit: 4, default: 0
-    t.integer "b1310",       limit: 4, default: 0
-    t.integer "a1320",       limit: 4, default: 0
-    t.integer "r1320",       limit: 4, default: 0
-    t.integer "g1320",       limit: 4, default: 0
-    t.integer "b1320",       limit: 4, default: 0
-    t.integer "a1330",       limit: 4, default: 0
-    t.integer "r1330",       limit: 4, default: 0
-    t.integer "g1330",       limit: 4, default: 0
-    t.integer "b1330",       limit: 4, default: 0
-    t.integer "a1340",       limit: 4, default: 0
-    t.integer "r1340",       limit: 4, default: 0
-    t.integer "g1340",       limit: 4, default: 0
-    t.integer "b1340",       limit: 4, default: 0
-    t.integer "a1350",       limit: 4, default: 0
-    t.integer "r1350",       limit: 4, default: 0
-    t.integer "g1350",       limit: 4, default: 0
-    t.integer "b1350",       limit: 4, default: 0
-    t.integer "a1360",       limit: 4, default: 0
-    t.integer "r1360",       limit: 4, default: 0
-    t.integer "g1360",       limit: 4, default: 0
-    t.integer "b1360",       limit: 4, default: 0
-    t.integer "a1370",       limit: 4, default: 0
-    t.integer "r1370",       limit: 4, default: 0
-    t.integer "g1370",       limit: 4, default: 0
-    t.integer "b1370",       limit: 4, default: 0
-    t.integer "a1380",       limit: 4, default: 0
-    t.integer "r1380",       limit: 4, default: 0
-    t.integer "g1380",       limit: 4, default: 0
-    t.integer "b1380",       limit: 4, default: 0
-    t.integer "a1390",       limit: 4, default: 0
-    t.integer "r1390",       limit: 4, default: 0
-    t.integer "g1390",       limit: 4, default: 0
-    t.integer "b1390",       limit: 4, default: 0
-    t.integer "a1400",       limit: 4, default: 0
-    t.integer "r1400",       limit: 4, default: 0
-    t.integer "g1400",       limit: 4, default: 0
-    t.integer "b1400",       limit: 4, default: 0
-    t.integer "a1410",       limit: 4, default: 0
-    t.integer "r1410",       limit: 4, default: 0
-    t.integer "g1410",       limit: 4, default: 0
-    t.integer "b1410",       limit: 4, default: 0
-    t.integer "a1420",       limit: 4, default: 0
-    t.integer "r1420",       limit: 4, default: 0
-    t.integer "g1420",       limit: 4, default: 0
-    t.integer "b1420",       limit: 4, default: 0
-    t.integer "a1430",       limit: 4, default: 0
-    t.integer "r1430",       limit: 4, default: 0
-    t.integer "g1430",       limit: 4, default: 0
-    t.integer "b1430",       limit: 4, default: 0
-    t.integer "a1440",       limit: 4, default: 0
-    t.integer "r1440",       limit: 4, default: 0
-    t.integer "g1440",       limit: 4, default: 0
-    t.integer "b1440",       limit: 4, default: 0
-    t.integer "a1450",       limit: 4, default: 0
-    t.integer "r1450",       limit: 4, default: 0
-    t.integer "g1450",       limit: 4, default: 0
-    t.integer "b1450",       limit: 4, default: 0
-    t.integer "a1460",       limit: 4, default: 0
-    t.integer "r1460",       limit: 4, default: 0
-    t.integer "g1460",       limit: 4, default: 0
-    t.integer "b1460",       limit: 4, default: 0
-    t.integer "a1470",       limit: 4, default: 0
-    t.integer "r1470",       limit: 4, default: 0
-    t.integer "g1470",       limit: 4, default: 0
-    t.integer "b1470",       limit: 4, default: 0
-    t.integer "a1480",       limit: 4, default: 0
-    t.integer "r1480",       limit: 4, default: 0
-    t.integer "g1480",       limit: 4, default: 0
-    t.integer "b1480",       limit: 4, default: 0
-    t.integer "a1490",       limit: 4, default: 0
-    t.integer "r1490",       limit: 4, default: 0
-    t.integer "g1490",       limit: 4, default: 0
-    t.integer "b1490",       limit: 4, default: 0
+  create_table "processed_spectrums", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.integer "spectrum_id"
+    t.integer "a10", default: 0
+    t.integer "r10", default: 0
+    t.integer "g10", default: 0
+    t.integer "b10", default: 0
+    t.integer "a20", default: 0
+    t.integer "r20", default: 0
+    t.integer "g20", default: 0
+    t.integer "b20", default: 0
+    t.integer "a30", default: 0
+    t.integer "r30", default: 0
+    t.integer "g30", default: 0
+    t.integer "b30", default: 0
+    t.integer "a40", default: 0
+    t.integer "r40", default: 0
+    t.integer "g40", default: 0
+    t.integer "b40", default: 0
+    t.integer "a50", default: 0
+    t.integer "r50", default: 0
+    t.integer "g50", default: 0
+    t.integer "b50", default: 0
+    t.integer "a60", default: 0
+    t.integer "r60", default: 0
+    t.integer "g60", default: 0
+    t.integer "b60", default: 0
+    t.integer "a70", default: 0
+    t.integer "r70", default: 0
+    t.integer "g70", default: 0
+    t.integer "b70", default: 0
+    t.integer "a80", default: 0
+    t.integer "r80", default: 0
+    t.integer "g80", default: 0
+    t.integer "b80", default: 0
+    t.integer "a90", default: 0
+    t.integer "r90", default: 0
+    t.integer "g90", default: 0
+    t.integer "b90", default: 0
+    t.integer "a100", default: 0
+    t.integer "r100", default: 0
+    t.integer "g100", default: 0
+    t.integer "b100", default: 0
+    t.integer "a110", default: 0
+    t.integer "r110", default: 0
+    t.integer "g110", default: 0
+    t.integer "b110", default: 0
+    t.integer "a120", default: 0
+    t.integer "r120", default: 0
+    t.integer "g120", default: 0
+    t.integer "b120", default: 0
+    t.integer "a130", default: 0
+    t.integer "r130", default: 0
+    t.integer "g130", default: 0
+    t.integer "b130", default: 0
+    t.integer "a140", default: 0
+    t.integer "r140", default: 0
+    t.integer "g140", default: 0
+    t.integer "b140", default: 0
+    t.integer "a150", default: 0
+    t.integer "r150", default: 0
+    t.integer "g150", default: 0
+    t.integer "b150", default: 0
+    t.integer "a160", default: 0
+    t.integer "r160", default: 0
+    t.integer "g160", default: 0
+    t.integer "b160", default: 0
+    t.integer "a170", default: 0
+    t.integer "r170", default: 0
+    t.integer "g170", default: 0
+    t.integer "b170", default: 0
+    t.integer "a180", default: 0
+    t.integer "r180", default: 0
+    t.integer "g180", default: 0
+    t.integer "b180", default: 0
+    t.integer "a190", default: 0
+    t.integer "r190", default: 0
+    t.integer "g190", default: 0
+    t.integer "b190", default: 0
+    t.integer "a200", default: 0
+    t.integer "r200", default: 0
+    t.integer "g200", default: 0
+    t.integer "b200", default: 0
+    t.integer "a210", default: 0
+    t.integer "r210", default: 0
+    t.integer "g210", default: 0
+    t.integer "b210", default: 0
+    t.integer "a220", default: 0
+    t.integer "r220", default: 0
+    t.integer "g220", default: 0
+    t.integer "b220", default: 0
+    t.integer "a230", default: 0
+    t.integer "r230", default: 0
+    t.integer "g230", default: 0
+    t.integer "b230", default: 0
+    t.integer "a240", default: 0
+    t.integer "r240", default: 0
+    t.integer "g240", default: 0
+    t.integer "b240", default: 0
+    t.integer "a250", default: 0
+    t.integer "r250", default: 0
+    t.integer "g250", default: 0
+    t.integer "b250", default: 0
+    t.integer "a260", default: 0
+    t.integer "r260", default: 0
+    t.integer "g260", default: 0
+    t.integer "b260", default: 0
+    t.integer "a270", default: 0
+    t.integer "r270", default: 0
+    t.integer "g270", default: 0
+    t.integer "b270", default: 0
+    t.integer "a280", default: 0
+    t.integer "r280", default: 0
+    t.integer "g280", default: 0
+    t.integer "b280", default: 0
+    t.integer "a290", default: 0
+    t.integer "r290", default: 0
+    t.integer "g290", default: 0
+    t.integer "b290", default: 0
+    t.integer "a300", default: 0
+    t.integer "r300", default: 0
+    t.integer "g300", default: 0
+    t.integer "b300", default: 0
+    t.integer "a310", default: 0
+    t.integer "r310", default: 0
+    t.integer "g310", default: 0
+    t.integer "b310", default: 0
+    t.integer "a320", default: 0
+    t.integer "r320", default: 0
+    t.integer "g320", default: 0
+    t.integer "b320", default: 0
+    t.integer "a330", default: 0
+    t.integer "r330", default: 0
+    t.integer "g330", default: 0
+    t.integer "b330", default: 0
+    t.integer "a340", default: 0
+    t.integer "r340", default: 0
+    t.integer "g340", default: 0
+    t.integer "b340", default: 0
+    t.integer "a350", default: 0
+    t.integer "r350", default: 0
+    t.integer "g350", default: 0
+    t.integer "b350", default: 0
+    t.integer "a360", default: 0
+    t.integer "r360", default: 0
+    t.integer "g360", default: 0
+    t.integer "b360", default: 0
+    t.integer "a370", default: 0
+    t.integer "r370", default: 0
+    t.integer "g370", default: 0
+    t.integer "b370", default: 0
+    t.integer "a380", default: 0
+    t.integer "r380", default: 0
+    t.integer "g380", default: 0
+    t.integer "b380", default: 0
+    t.integer "a390", default: 0
+    t.integer "r390", default: 0
+    t.integer "g390", default: 0
+    t.integer "b390", default: 0
+    t.integer "a400", default: 0
+    t.integer "r400", default: 0
+    t.integer "g400", default: 0
+    t.integer "b400", default: 0
+    t.integer "a410", default: 0
+    t.integer "r410", default: 0
+    t.integer "g410", default: 0
+    t.integer "b410", default: 0
+    t.integer "a420", default: 0
+    t.integer "r420", default: 0
+    t.integer "g420", default: 0
+    t.integer "b420", default: 0
+    t.integer "a430", default: 0
+    t.integer "r430", default: 0
+    t.integer "g430", default: 0
+    t.integer "b430", default: 0
+    t.integer "a440", default: 0
+    t.integer "r440", default: 0
+    t.integer "g440", default: 0
+    t.integer "b440", default: 0
+    t.integer "a450", default: 0
+    t.integer "r450", default: 0
+    t.integer "g450", default: 0
+    t.integer "b450", default: 0
+    t.integer "a460", default: 0
+    t.integer "r460", default: 0
+    t.integer "g460", default: 0
+    t.integer "b460", default: 0
+    t.integer "a470", default: 0
+    t.integer "r470", default: 0
+    t.integer "g470", default: 0
+    t.integer "b470", default: 0
+    t.integer "a480", default: 0
+    t.integer "r480", default: 0
+    t.integer "g480", default: 0
+    t.integer "b480", default: 0
+    t.integer "a490", default: 0
+    t.integer "r490", default: 0
+    t.integer "g490", default: 0
+    t.integer "b490", default: 0
+    t.integer "a500", default: 0
+    t.integer "r500", default: 0
+    t.integer "g500", default: 0
+    t.integer "b500", default: 0
+    t.integer "a510", default: 0
+    t.integer "r510", default: 0
+    t.integer "g510", default: 0
+    t.integer "b510", default: 0
+    t.integer "a520", default: 0
+    t.integer "r520", default: 0
+    t.integer "g520", default: 0
+    t.integer "b520", default: 0
+    t.integer "a530", default: 0
+    t.integer "r530", default: 0
+    t.integer "g530", default: 0
+    t.integer "b530", default: 0
+    t.integer "a540", default: 0
+    t.integer "r540", default: 0
+    t.integer "g540", default: 0
+    t.integer "b540", default: 0
+    t.integer "a550", default: 0
+    t.integer "r550", default: 0
+    t.integer "g550", default: 0
+    t.integer "b550", default: 0
+    t.integer "a560", default: 0
+    t.integer "r560", default: 0
+    t.integer "g560", default: 0
+    t.integer "b560", default: 0
+    t.integer "a570", default: 0
+    t.integer "r570", default: 0
+    t.integer "g570", default: 0
+    t.integer "b570", default: 0
+    t.integer "a580", default: 0
+    t.integer "r580", default: 0
+    t.integer "g580", default: 0
+    t.integer "b580", default: 0
+    t.integer "a590", default: 0
+    t.integer "r590", default: 0
+    t.integer "g590", default: 0
+    t.integer "b590", default: 0
+    t.integer "a600", default: 0
+    t.integer "r600", default: 0
+    t.integer "g600", default: 0
+    t.integer "b600", default: 0
+    t.integer "a610", default: 0
+    t.integer "r610", default: 0
+    t.integer "g610", default: 0
+    t.integer "b610", default: 0
+    t.integer "a620", default: 0
+    t.integer "r620", default: 0
+    t.integer "g620", default: 0
+    t.integer "b620", default: 0
+    t.integer "a630", default: 0
+    t.integer "r630", default: 0
+    t.integer "g630", default: 0
+    t.integer "b630", default: 0
+    t.integer "a640", default: 0
+    t.integer "r640", default: 0
+    t.integer "g640", default: 0
+    t.integer "b640", default: 0
+    t.integer "a650", default: 0
+    t.integer "r650", default: 0
+    t.integer "g650", default: 0
+    t.integer "b650", default: 0
+    t.integer "a660", default: 0
+    t.integer "r660", default: 0
+    t.integer "g660", default: 0
+    t.integer "b660", default: 0
+    t.integer "a670", default: 0
+    t.integer "r670", default: 0
+    t.integer "g670", default: 0
+    t.integer "b670", default: 0
+    t.integer "a680", default: 0
+    t.integer "r680", default: 0
+    t.integer "g680", default: 0
+    t.integer "b680", default: 0
+    t.integer "a690", default: 0
+    t.integer "r690", default: 0
+    t.integer "g690", default: 0
+    t.integer "b690", default: 0
+    t.integer "a700", default: 0
+    t.integer "r700", default: 0
+    t.integer "g700", default: 0
+    t.integer "b700", default: 0
+    t.integer "a710", default: 0
+    t.integer "r710", default: 0
+    t.integer "g710", default: 0
+    t.integer "b710", default: 0
+    t.integer "a720", default: 0
+    t.integer "r720", default: 0
+    t.integer "g720", default: 0
+    t.integer "b720", default: 0
+    t.integer "a730", default: 0
+    t.integer "r730", default: 0
+    t.integer "g730", default: 0
+    t.integer "b730", default: 0
+    t.integer "a740", default: 0
+    t.integer "r740", default: 0
+    t.integer "g740", default: 0
+    t.integer "b740", default: 0
+    t.integer "a750", default: 0
+    t.integer "r750", default: 0
+    t.integer "g750", default: 0
+    t.integer "b750", default: 0
+    t.integer "a760", default: 0
+    t.integer "r760", default: 0
+    t.integer "g760", default: 0
+    t.integer "b760", default: 0
+    t.integer "a770", default: 0
+    t.integer "r770", default: 0
+    t.integer "g770", default: 0
+    t.integer "b770", default: 0
+    t.integer "a780", default: 0
+    t.integer "r780", default: 0
+    t.integer "g780", default: 0
+    t.integer "b780", default: 0
+    t.integer "a790", default: 0
+    t.integer "r790", default: 0
+    t.integer "g790", default: 0
+    t.integer "b790", default: 0
+    t.integer "a800", default: 0
+    t.integer "r800", default: 0
+    t.integer "g800", default: 0
+    t.integer "b800", default: 0
+    t.integer "a810", default: 0
+    t.integer "r810", default: 0
+    t.integer "g810", default: 0
+    t.integer "b810", default: 0
+    t.integer "a820", default: 0
+    t.integer "r820", default: 0
+    t.integer "g820", default: 0
+    t.integer "b820", default: 0
+    t.integer "a830", default: 0
+    t.integer "r830", default: 0
+    t.integer "g830", default: 0
+    t.integer "b830", default: 0
+    t.integer "a840", default: 0
+    t.integer "r840", default: 0
+    t.integer "g840", default: 0
+    t.integer "b840", default: 0
+    t.integer "a850", default: 0
+    t.integer "r850", default: 0
+    t.integer "g850", default: 0
+    t.integer "b850", default: 0
+    t.integer "a860", default: 0
+    t.integer "r860", default: 0
+    t.integer "g860", default: 0
+    t.integer "b860", default: 0
+    t.integer "a870", default: 0
+    t.integer "r870", default: 0
+    t.integer "g870", default: 0
+    t.integer "b870", default: 0
+    t.integer "a880", default: 0
+    t.integer "r880", default: 0
+    t.integer "g880", default: 0
+    t.integer "b880", default: 0
+    t.integer "a890", default: 0
+    t.integer "r890", default: 0
+    t.integer "g890", default: 0
+    t.integer "b890", default: 0
+    t.integer "a900", default: 0
+    t.integer "r900", default: 0
+    t.integer "g900", default: 0
+    t.integer "b900", default: 0
+    t.integer "a910", default: 0
+    t.integer "r910", default: 0
+    t.integer "g910", default: 0
+    t.integer "b910", default: 0
+    t.integer "a920", default: 0
+    t.integer "r920", default: 0
+    t.integer "g920", default: 0
+    t.integer "b920", default: 0
+    t.integer "a930", default: 0
+    t.integer "r930", default: 0
+    t.integer "g930", default: 0
+    t.integer "b930", default: 0
+    t.integer "a940", default: 0
+    t.integer "r940", default: 0
+    t.integer "g940", default: 0
+    t.integer "b940", default: 0
+    t.integer "a950", default: 0
+    t.integer "r950", default: 0
+    t.integer "g950", default: 0
+    t.integer "b950", default: 0
+    t.integer "a960", default: 0
+    t.integer "r960", default: 0
+    t.integer "g960", default: 0
+    t.integer "b960", default: 0
+    t.integer "a970", default: 0
+    t.integer "r970", default: 0
+    t.integer "g970", default: 0
+    t.integer "b970", default: 0
+    t.integer "a980", default: 0
+    t.integer "r980", default: 0
+    t.integer "g980", default: 0
+    t.integer "b980", default: 0
+    t.integer "a990", default: 0
+    t.integer "r990", default: 0
+    t.integer "g990", default: 0
+    t.integer "b990", default: 0
+    t.integer "a1000", default: 0
+    t.integer "r1000", default: 0
+    t.integer "g1000", default: 0
+    t.integer "b1000", default: 0
+    t.integer "a1010", default: 0
+    t.integer "r1010", default: 0
+    t.integer "g1010", default: 0
+    t.integer "b1010", default: 0
+    t.integer "a1020", default: 0
+    t.integer "r1020", default: 0
+    t.integer "g1020", default: 0
+    t.integer "b1020", default: 0
+    t.integer "a1030", default: 0
+    t.integer "r1030", default: 0
+    t.integer "g1030", default: 0
+    t.integer "b1030", default: 0
+    t.integer "a1040", default: 0
+    t.integer "r1040", default: 0
+    t.integer "g1040", default: 0
+    t.integer "b1040", default: 0
+    t.integer "a1050", default: 0
+    t.integer "r1050", default: 0
+    t.integer "g1050", default: 0
+    t.integer "b1050", default: 0
+    t.integer "a1060", default: 0
+    t.integer "r1060", default: 0
+    t.integer "g1060", default: 0
+    t.integer "b1060", default: 0
+    t.integer "a1070", default: 0
+    t.integer "r1070", default: 0
+    t.integer "g1070", default: 0
+    t.integer "b1070", default: 0
+    t.integer "a1080", default: 0
+    t.integer "r1080", default: 0
+    t.integer "g1080", default: 0
+    t.integer "b1080", default: 0
+    t.integer "a1090", default: 0
+    t.integer "r1090", default: 0
+    t.integer "g1090", default: 0
+    t.integer "b1090", default: 0
+    t.integer "a1100", default: 0
+    t.integer "r1100", default: 0
+    t.integer "g1100", default: 0
+    t.integer "b1100", default: 0
+    t.integer "a1110", default: 0
+    t.integer "r1110", default: 0
+    t.integer "g1110", default: 0
+    t.integer "b1110", default: 0
+    t.integer "a1120", default: 0
+    t.integer "r1120", default: 0
+    t.integer "g1120", default: 0
+    t.integer "b1120", default: 0
+    t.integer "a1130", default: 0
+    t.integer "r1130", default: 0
+    t.integer "g1130", default: 0
+    t.integer "b1130", default: 0
+    t.integer "a1140", default: 0
+    t.integer "r1140", default: 0
+    t.integer "g1140", default: 0
+    t.integer "b1140", default: 0
+    t.integer "a1150", default: 0
+    t.integer "r1150", default: 0
+    t.integer "g1150", default: 0
+    t.integer "b1150", default: 0
+    t.integer "a1160", default: 0
+    t.integer "r1160", default: 0
+    t.integer "g1160", default: 0
+    t.integer "b1160", default: 0
+    t.integer "a1170", default: 0
+    t.integer "r1170", default: 0
+    t.integer "g1170", default: 0
+    t.integer "b1170", default: 0
+    t.integer "a1180", default: 0
+    t.integer "r1180", default: 0
+    t.integer "g1180", default: 0
+    t.integer "b1180", default: 0
+    t.integer "a1190", default: 0
+    t.integer "r1190", default: 0
+    t.integer "g1190", default: 0
+    t.integer "b1190", default: 0
+    t.integer "a1200", default: 0
+    t.integer "r1200", default: 0
+    t.integer "g1200", default: 0
+    t.integer "b1200", default: 0
+    t.integer "a1210", default: 0
+    t.integer "r1210", default: 0
+    t.integer "g1210", default: 0
+    t.integer "b1210", default: 0
+    t.integer "a1220", default: 0
+    t.integer "r1220", default: 0
+    t.integer "g1220", default: 0
+    t.integer "b1220", default: 0
+    t.integer "a1230", default: 0
+    t.integer "r1230", default: 0
+    t.integer "g1230", default: 0
+    t.integer "b1230", default: 0
+    t.integer "a1240", default: 0
+    t.integer "r1240", default: 0
+    t.integer "g1240", default: 0
+    t.integer "b1240", default: 0
+    t.integer "a1250", default: 0
+    t.integer "r1250", default: 0
+    t.integer "g1250", default: 0
+    t.integer "b1250", default: 0
+    t.integer "a1260", default: 0
+    t.integer "r1260", default: 0
+    t.integer "g1260", default: 0
+    t.integer "b1260", default: 0
+    t.integer "a1270", default: 0
+    t.integer "r1270", default: 0
+    t.integer "g1270", default: 0
+    t.integer "b1270", default: 0
+    t.integer "a1280", default: 0
+    t.integer "r1280", default: 0
+    t.integer "g1280", default: 0
+    t.integer "b1280", default: 0
+    t.integer "a1290", default: 0
+    t.integer "r1290", default: 0
+    t.integer "g1290", default: 0
+    t.integer "b1290", default: 0
+    t.integer "a1300", default: 0
+    t.integer "r1300", default: 0
+    t.integer "g1300", default: 0
+    t.integer "b1300", default: 0
+    t.integer "a1310", default: 0
+    t.integer "r1310", default: 0
+    t.integer "g1310", default: 0
+    t.integer "b1310", default: 0
+    t.integer "a1320", default: 0
+    t.integer "r1320", default: 0
+    t.integer "g1320", default: 0
+    t.integer "b1320", default: 0
+    t.integer "a1330", default: 0
+    t.integer "r1330", default: 0
+    t.integer "g1330", default: 0
+    t.integer "b1330", default: 0
+    t.integer "a1340", default: 0
+    t.integer "r1340", default: 0
+    t.integer "g1340", default: 0
+    t.integer "b1340", default: 0
+    t.integer "a1350", default: 0
+    t.integer "r1350", default: 0
+    t.integer "g1350", default: 0
+    t.integer "b1350", default: 0
+    t.integer "a1360", default: 0
+    t.integer "r1360", default: 0
+    t.integer "g1360", default: 0
+    t.integer "b1360", default: 0
+    t.integer "a1370", default: 0
+    t.integer "r1370", default: 0
+    t.integer "g1370", default: 0
+    t.integer "b1370", default: 0
+    t.integer "a1380", default: 0
+    t.integer "r1380", default: 0
+    t.integer "g1380", default: 0
+    t.integer "b1380", default: 0
+    t.integer "a1390", default: 0
+    t.integer "r1390", default: 0
+    t.integer "g1390", default: 0
+    t.integer "b1390", default: 0
+    t.integer "a1400", default: 0
+    t.integer "r1400", default: 0
+    t.integer "g1400", default: 0
+    t.integer "b1400", default: 0
+    t.integer "a1410", default: 0
+    t.integer "r1410", default: 0
+    t.integer "g1410", default: 0
+    t.integer "b1410", default: 0
+    t.integer "a1420", default: 0
+    t.integer "r1420", default: 0
+    t.integer "g1420", default: 0
+    t.integer "b1420", default: 0
+    t.integer "a1430", default: 0
+    t.integer "r1430", default: 0
+    t.integer "g1430", default: 0
+    t.integer "b1430", default: 0
+    t.integer "a1440", default: 0
+    t.integer "r1440", default: 0
+    t.integer "g1440", default: 0
+    t.integer "b1440", default: 0
+    t.integer "a1450", default: 0
+    t.integer "r1450", default: 0
+    t.integer "g1450", default: 0
+    t.integer "b1450", default: 0
+    t.integer "a1460", default: 0
+    t.integer "r1460", default: 0
+    t.integer "g1460", default: 0
+    t.integer "b1460", default: 0
+    t.integer "a1470", default: 0
+    t.integer "r1470", default: 0
+    t.integer "g1470", default: 0
+    t.integer "b1470", default: 0
+    t.integer "a1480", default: 0
+    t.integer "r1480", default: 0
+    t.integer "g1480", default: 0
+    t.integer "b1480", default: 0
+    t.integer "a1490", default: 0
+    t.integer "r1490", default: 0
+    t.integer "g1490", default: 0
+    t.integer "b1490", default: 0
+    t.index ["spectrum_id"], name: "index_processed_spectrums_on_spectrum_id", unique: true
   end
 
-  add_index "processed_spectrums", ["spectrum_id"], name: "index_processed_spectrums_on_spectrum_id", unique: true, using: :btree
-
-  create_table "snapshots", force: :cascade do |t|
-    t.integer  "user_id",     limit: 4
-    t.integer  "spectrum_id", limit: 4
-    t.integer  "tag_id",      limit: 4
-    t.text     "description", limit: 65535
-    t.text     "data",        limit: 4294967295
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  create_table "snapshots", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.integer "user_id"
+    t.integer "spectrum_id"
+    t.integer "tag_id"
+    t.text "description"
+    t.text "data", limit: 4294967295
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["spectrum_id"], name: "index_snapshots_on_spectrum_id"
+    t.index ["tag_id"], name: "index_snapshots_on_tag_id"
   end
 
-  add_index "snapshots", ["spectrum_id"], name: "index_snapshots_on_spectrum_id", using: :btree
-  add_index "snapshots", ["tag_id"], name: "index_snapshots_on_tag_id", using: :btree
-
-  create_table "spectra_sets", force: :cascade do |t|
-    t.string   "title",      limit: 255, default: "", null: false
-    t.string   "author",     limit: 255, default: "", null: false
-    t.string   "notes",      limit: 255, default: "", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "user_id",    limit: 4,   default: 0
+  create_table "spectra_sets", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.string "title", default: "", null: false
+    t.string "author", default: "", null: false
+    t.string "notes", default: "", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "user_id", default: 0
   end
 
-  create_table "spectra_sets_spectrums", id: false, force: :cascade do |t|
-    t.integer "spectrum_id",    limit: 4
-    t.integer "spectra_set_id", limit: 4
+  create_table "spectra_sets_spectrums", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.integer "spectrum_id"
+    t.integer "spectra_set_id"
+    t.index ["spectra_set_id"], name: "index_spectra_sets_spectrums_on_spectra_set_id"
+    t.index ["spectrum_id"], name: "index_spectra_sets_spectrums_on_spectrum_id"
   end
 
-  add_index "spectra_sets_spectrums", ["spectra_set_id"], name: "index_spectra_sets_spectrums_on_spectra_set_id", using: :btree
-  add_index "spectra_sets_spectrums", ["spectrum_id"], name: "index_spectra_sets_spectrums_on_spectrum_id", using: :btree
-
-  create_table "spectrums", force: :cascade do |t|
-    t.string   "title",                 limit: 255
-    t.string   "author",                limit: 255
-    t.string   "set",                   limit: 255
-    t.text     "data",                  limit: 4294967295
-    t.text     "notes",                 limit: 65535
-    t.integer  "version",               limit: 4
-    t.integer  "parent_id",             limit: 4
-    t.string   "photo_file_name",       limit: 255
-    t.string   "photo_content_type",    limit: 255
-    t.string   "photo_file_size",       limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "photo_position",        limit: 255,                                  default: "false"
-    t.string   "baseline_position",     limit: 255,                                  default: "false"
-    t.string   "baseline_file_name",    limit: 255
-    t.string   "baseline_content_type", limit: 255
-    t.string   "baseline_file_size",    limit: 255
-    t.string   "control_points",        limit: 255
-    t.string   "slice_data_url",        limit: 255
-    t.string   "client_code",           limit: 255,                                  default: "",      null: false
-    t.integer  "user_id",               limit: 4,                                    default: 0,       null: false
-    t.decimal  "lat",                                      precision: 20, scale: 10, default: 0.0,     null: false
-    t.decimal  "lon",                                      precision: 20, scale: 10, default: 0.0,     null: false
-    t.integer  "sample_row",            limit: 4,                                    default: 1,       null: false
-    t.integer  "like_count",            limit: 4,                                    default: 0,       null: false
-    t.integer  "video_row",             limit: 4,                                    default: 0
-    t.boolean  "reversed",                                                           default: false,   null: false
-    t.boolean  "calibrated",                                                         default: false,   null: false
+  create_table "spectrums", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.string "title"
+    t.string "author"
+    t.string "set"
+    t.text "data", limit: 4294967295
+    t.text "notes"
+    t.integer "version"
+    t.integer "parent_id"
+    t.string "photo_file_name"
+    t.string "photo_content_type"
+    t.string "photo_file_size"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "photo_position", default: "false"
+    t.string "baseline_position", default: "false"
+    t.string "baseline_file_name"
+    t.string "baseline_content_type"
+    t.string "baseline_file_size"
+    t.string "control_points"
+    t.string "slice_data_url"
+    t.string "client_code", default: "", null: false
+    t.integer "user_id", default: 0, null: false
+    t.decimal "lat", precision: 20, scale: 10, default: "0.0"
+    t.decimal "lon", precision: 20, scale: 10, default: "0.0"
+    t.integer "sample_row", default: 1, null: false
+    t.integer "like_count", default: 0, null: false
+    t.integer "video_row", default: 0
+    t.boolean "reversed", default: false, null: false
+    t.boolean "calibrated", default: false, null: false
+    t.index ["author"], name: "index_spectrums_on_author"
+    t.index ["created_at"], name: "index_spectrums_on_created_at"
+    t.index ["like_count"], name: "index_spectrums_on_like_count"
+    t.index ["title"], name: "index_spectrums_on_title"
+    t.index ["user_id"], name: "index_spectrums_on_user_id"
   end
 
-  add_index "spectrums", ["author"], name: "index_spectrums_on_author", using: :btree
-  add_index "spectrums", ["created_at"], name: "index_spectrums_on_created_at", using: :btree
-  add_index "spectrums", ["like_count"], name: "index_spectrums_on_like_count", using: :btree
-  add_index "spectrums", ["title"], name: "index_spectrums_on_title", using: :btree
-  add_index "spectrums", ["user_id"], name: "index_spectrums_on_user_id", using: :btree
-
-  create_table "tags", force: :cascade do |t|
-    t.integer  "user_id",     limit: 4
-    t.string   "name",        limit: 255
-    t.integer  "spectrum_id", limit: 4
-    t.integer  "set_id",      limit: 4
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  create_table "tags", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.integer "user_id"
+    t.string "name"
+    t.integer "spectrum_id"
+    t.integer "set_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["name"], name: "index_tags_on_name"
+    t.index ["spectrum_id"], name: "index_tags_on_spectrum_id"
   end
 
-  add_index "tags", ["name"], name: "index_tags_on_name", using: :btree
-  add_index "tags", ["spectrum_id"], name: "index_tags_on_spectrum_id", using: :btree
-
-  create_table "users", force: :cascade do |t|
-    t.string   "login",                     limit: 40
-    t.string   "name",                      limit: 100, default: ""
-    t.string   "email",                     limit: 100
-    t.string   "crypted_password",          limit: 40
-    t.string   "salt",                      limit: 40
+  create_table "users", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.string "login", limit: 40
+    t.string "name", limit: 100, default: ""
+    t.string "email", limit: 100
+    t.string "crypted_password", limit: 40
+    t.string "salt", limit: 40
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "remember_token",            limit: 40
+    t.string "remember_token", limit: 40
     t.datetime "remember_token_expires_at"
-    t.string   "identity_url",              limit: 255
-    t.string   "role",                      limit: 255, default: "basic", null: false
-    t.string   "email_preferences",         limit: 255, default: "1",     null: false
+    t.string "identity_url"
+    t.string "role", default: "basic", null: false
+    t.string "email_preferences", default: "1", null: false
+    t.index ["login"], name: "index_users_on_login", unique: true
   end
 
-  add_index "users", ["login"], name: "index_users_on_login", unique: true, using: :btree
-
-  create_table "videos", force: :cascade do |t|
-    t.string   "title",              limit: 255
-    t.string   "author",             limit: 255
-    t.string   "set",                limit: 255
-    t.string   "scan_type",          limit: 255
-    t.text     "data",               limit: 65535
-    t.text     "notes",              limit: 65535
-    t.integer  "version",            limit: 4
-    t.integer  "start_frame",        limit: 4
-    t.integer  "end_frame",          limit: 4
-    t.integer  "parent_id",          limit: 4
-    t.string   "video_file_name",    limit: 255
-    t.string   "video_content_type", limit: 255
-    t.string   "video_file_size",    limit: 255
+  create_table "videos", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.string "title"
+    t.string "author"
+    t.string "set"
+    t.string "scan_type"
+    t.text "data"
+    t.text "notes"
+    t.integer "version"
+    t.integer "start_frame"
+    t.integer "end_frame"
+    t.integer "parent_id"
+    t.string "video_file_name"
+    t.string "video_content_type"
+    t.string "video_file_size"
     t.datetime "video_updated_at"
-    t.string   "video_position",     limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string "video_position"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
 end
diff --git a/script/start.sh b/script/start.sh
index b11dc5fa..c0598ec6 100755
--- a/script/start.sh
+++ b/script/start.sh
@@ -4,6 +4,8 @@ pidfile=/app/tmp/pids/server.pid
 
 bundle check || bundle install
 bower install --allow-root
+
+cp db/schema.rb.example db/schema.rb
 cp config/database.yml.docker.example config/database.yml
 cp config/config.yml.example config/config.yml
 
@@ -23,4 +25,6 @@ if [ -f $pidfile ] ; then
 	rm $pidfile;
 fi
 
+echo "Web server started"
+
 bundle exec passenger start --port $PORT