introduced institute model

includes:
 - institute model
 - world universitites json (public json file)
 - select2 (v4)

app/assets/javascripts/application.coffee

@@ -10,4 +10,6 @@
 
 #= require cocoon
 
+#= require select2.min
+
 #= require_tree .

app/assets/javascripts/scholars.coffee

@@ -1,3 +1,12 @@
+formatItem = (item) ->
+  if item.loading
+    "Searching..."
+  else
+    '<span class=\'select2-result-repository__title\'>' + item.name + ' ' + '<small class=\'text-muted\'>' + item.country + '</small>' +'</span>'
+
+formatItemSelection = (item) ->
+  '<span class=\'select2-result-repository__title\'>' + item.name + ' ' + '<small class=\'text-muted\'>' + item.country + '</small>' +'</span>'
+
 $(document).on "ready page:load remote:load turbolinks:load", ->
 
   $(".web_urls").each ->
@@ -6,3 +15,25 @@ $(document).on "ready page:load remote:load turbolinks:load", ->
     $(@).on
       "cocoon:before-insert": (e, task_to_be_added) ->
         task_to_be_added.fadeIn 300
+
+  $("select[name*='scholar[discipline_id]']").select2
+    placeholder: ""
+
+  # $("select[name*='scholar[institute_token]']").select2
+  $("select.world_universities").select2
+    minimumInputLength: 3
+    dataType: 'json'
+    ajax:
+      url: "/world_universities"
+      data: (params) ->
+        query = {name: params.term}
+      processResults: (data, params) ->
+        results: data
+    escapeMarkup: (markup) -> markup
+    templateResult: formatItem
+    templateSelection: formatItemSelection
+
+  $("form#scholar-form").submit (ev) ->
+    uni = $(@).find("select.world_universities").select2("data")[0]
+    if uni
+      $(@).find("input[name$='[institute_token]']").val "#{uni.name},#{uni.country}"

app/assets/stylesheets/_base.scss

@@ -2,6 +2,10 @@ p, .alert {
   font-size: 14px;
 }
 
+.card .card-body {
+  padding: 0.75em;
+}
+
 .site-footer {
   font-size: 12px;
   margin-top: 40px;

app/assets/stylesheets/application.scss

@@ -14,6 +14,7 @@
  *= require bootstrap
  *= require bootstrap-grid
  *= require bootstrap-reboot
+ *= require select2.min
  */
 
 @import "font-awesome";

app/controllers/pages_controller.rb

@@ -1,3 +1,20 @@
 class PagesController < ApplicationController
 
+  def world_universities
+    # JSON file downloaded from:
+    # https://github.com/Hipo/university-domains-list
+    # Opting with this approach as issues with CORS on ajax request
+    # For updated university list, this file would need to be re-downloaded.
+    # FYI: last updated datestamp included in the filename
+    file = File.read("#{Rails.root}/public/assets/25012018_world_universities.json")
+    unis = JSON.parse(file).each_with_index.map do |uni, i|
+      uni["id"] = i + 1 # view logic: required for select purposes
+      uni
+    end
+    if name_q = params[:name]
+      unis = unis.select { |u| u["name"].downcase.include?(name_q) }
+    end
+    render json: unis
+  end
+
 end

app/controllers/scholars_controller.rb

@@ -1,7 +1,10 @@
 class ScholarsController < ApplicationController
 
   def index
-    @scholars = Scholar.preload(discipline: :self_and_ancestors)
+    @scholars = Scholar.preload(:institute,
+                                :web_urls,
+                                discipline: :self_and_ancestors)
+                       .order(updated_at: :desc)
   end
 
   def new
@@ -25,6 +28,7 @@ def scholar_params
                                     :last_name,
                                     :description,
                                     :discipline_id,
+                                    :institute_token,
                                     web_urls_attributes: [:id,
                                                           :title,
                                                           :url,

app/models/institute.rb

@@ -0,0 +1,7 @@
+class Institute < ApplicationRecord
+
+  def to_s
+    "#{name}, #{country}"
+  end
+
+end

app/models/scholar.rb

@@ -1,14 +1,23 @@
 class Scholar < ApplicationRecord
 
   belongs_to :discipline
+  belongs_to :institute, optional: true
   has_many :web_urls, as: :linkable
 
   accepts_nested_attributes_for :web_urls, reject_if: :all_blank, allow_destroy: true
 
   validates :first_name, :last_name, :discipline, presence: true
 
+  attr_reader :institute_token
+
   def name
     [first_name, middle_name, last_name].compact.join(" ")
   end
 
+  def institute_token=(token)
+    val = token.split(",")
+    return if val.blank?
+    self.institute = Institute.find_or_create_by name: val[0], country: val[1]
+  end
+
 end

app/views/scholars/_form.html.erb

@@ -14,7 +14,21 @@
         <%= f.input :last_name %>
       </div>
     </div>
-    <%= f.association :discipline, collection: Discipline.leaves %>
+    <div class="row">
+      <div class="col-md-6">
+        <%= f.association :discipline, collection: Discipline.roots,
+                                       as: :grouped_select,
+                                       group_method: :descendants,
+                                       group_label_method: :title %>
+      </div>
+      <div class="col-md-6">
+        <div class="form-group select">
+          <label class="col-form-label select">Institute</label>
+          <select class="world_universities form-control"></select>
+          <%= f.hidden_field :institute_token %>
+        </div>
+      </div>
+    </div>
     <%= f.input :description %>
   </div>
 </div>
@@ -37,7 +51,7 @@
 
 <div class="clearfix mt-3">
   <div class="float-right">
-    <%= f.button :submit, "Save", class: "btn btn-outline-success btn-sm" %>
-    <%= link_to "Cancel", scholars_path, class: "btn btn-outline-danger btn-sm" %>
+    <%= f.button :submit, "Save", class: "btn btn-outline-success" %>
+    <%= link_to "Cancel", scholars_path, class: "btn btn-outline-danger" %>
   </div>
 </div>

app/views/scholars/_scholar.html.erb

@@ -0,0 +1,16 @@
+<div class="card flex-md-row mb-4 box-shadow h-md-250">
+  <div class="card-body d-flex flex-column align-items-start">
+    <strong class="d-inline-block mb-2 <%= scholar.discipline.root.code %>"><%= scholar.discipline.root %></strong>
+    <h5 class="mb-0">
+      <%= scholar.name %>
+    </h5>
+    <div class="mb-1 text-muted small"><%= scholar.discipline %></div>
+    <div class="mb-1 text-muted small"><%= scholar.institute %></div>
+    <p class="card-text mb-auto"><%= scholar.description %></p>
+    <div class="small">
+      <% scholar.web_urls.each do |web_url| %>
+        <%= link_to web_url.title, web_url.url, target: "_blank" %>
+      <% end %>
+    </div>
+  </div>
+</div>

app/views/scholars/index.html.erb

@@ -1,4 +1,4 @@
-<div>
+<div class="mb-2">
   <h4>
     <%= Scholar.name.pluralize  %>
     <%= link_to fa_icon("user-plus"), new_scholar_path, class: "btn btn-outline-primary float-right", title: "Add Scholar" %>
@@ -12,21 +12,7 @@
   <div class="row">
     <% grouped_scholars.compact.each do |scholar| %>
       <div class="col-md-4">
-        <div class="card flex-md-row mb-4 box-shadow h-md-250">
-          <div class="card-body d-flex flex-column align-items-start">
-            <strong class="d-inline-block mb-2 <%= scholar.discipline.root.code %>"><%= scholar.discipline.root %></strong>
-            <h5 class="mb-0">
-              <%= scholar.name %>
-            </h5>
-            <div class="mb-1 text-muted small"><%= scholar.discipline %></div>
-            <p class="card-text mb-auto"><%= scholar.description %></p>
-            <div class="small">
-              <% scholar.web_urls.each do |web_url| %>
-                <%= link_to web_url.title, web_url.url, target: "_blank" %>
-              <% end %>
-            </div>
-          </div>
-        </div>
+        <%= render "scholar", scholar: scholar %>
       </div>
     <% end %>
   </div>

app/views/scholars/new.html.erb

@@ -5,6 +5,6 @@
 
 <hr />
 
-<%= simple_form_for setup_scholar(@scholar), html: {class: "small"} do |f| %>
+<%= simple_form_for setup_scholar(@scholar), html: {id: "scholar-form", class: "small"} do |f| %>
   <%= render "form", f: f %>
 <% end %>

config/routes.rb

@@ -7,5 +7,6 @@
   # pages
   get "about" => "pages#about"
   get "privacy" => "pages#privacy"
+  get "world_universities" => "pages#world_universities"
 
 end

db/migrate/20180311180909_create_scholars.rb

@@ -5,6 +5,8 @@ def change
       t.string :middle_name
       t.string :last_name, null: false
       t.text :description
+
+      t.timestamps
     end
     add_reference :scholars, :discipline, foreign_key: {references: :disciplines}
   end

db/migrate/20180324150404_create_institutes.rb

@@ -0,0 +1,10 @@
+class CreateInstitutes < ActiveRecord::Migration[5.1]
+  def change
+    create_table :institutes do |t|
+      t.string :name, null: false
+      t.string :country, null: false
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20180324221617_add_institute_id_to_scholar.rb

@@ -0,0 +1,5 @@
+class AddInstituteIdToScholar < ActiveRecord::Migration[5.1]
+  def change
+    add_reference :scholars, :institute, foreign_key: {references: :institutes}
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180318190338) do
+ActiveRecord::Schema.define(version: 20180324221617) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -29,13 +29,24 @@
     t.integer "parent_id"
   end
 
+  create_table "institutes", force: :cascade do |t|
+    t.string "name", null: false
+    t.string "country", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "scholars", force: :cascade do |t|
     t.string "first_name", null: false
     t.string "middle_name"
     t.string "last_name", null: false
     t.text "description"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.bigint "discipline_id"
+    t.bigint "institute_id"
     t.index ["discipline_id"], name: "index_scholars_on_discipline_id"
+    t.index ["institute_id"], name: "index_scholars_on_institute_id"
   end
 
   create_table "web_urls", force: :cascade do |t|
@@ -47,4 +58,5 @@
   end
 
   add_foreign_key "scholars", "disciplines"
+  add_foreign_key "scholars", "institutes"
 end