Merge branch 'master' into exporting

Author: drusepth

Gemfile

@@ -44,6 +44,7 @@ gem 'slack-notifier'
 group :production do
   gem 'rails_12factor'
   gem 'uglifier', '>= 1.3.0'
+  gem 'scout_apm'
 end
 
 group :test, :production do

Gemfile.lock

@@ -286,6 +286,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
+    scout_apm (2.1.12)
     selenium-webdriver (2.53.4)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
@@ -370,6 +371,7 @@ DEPENDENCIES
   rubocop
   ruby-prof (= 0.15.9)
   sass-rails
+  scout_apm
   selenium-webdriver
   serendipitous!
   shoulda-matchers (~> 3.1)

app/controllers/characters_controller.rb

@@ -11,7 +11,7 @@ def content_params
   def content_param_list
     [
       :universe_id, :user_id,
-      :name, :age, :role, :gender, :age, :height, :weight, :haircolor,
+      :name, :age, :role, :gender, :age, :archetype, :height, :weight, :haircolor,
       :facialhair, :eyecolor, :race, :skintone, :bodytype, :identmarks,
       :religion, :politics, :prejudices, :occupation, :pets,
       :mannerisms, :birthday, :education, :background,

app/models/character.rb

@@ -51,7 +51,7 @@ def self.attribute_categories
     {
       overview: {
         icon: 'info',
-        attributes: %w(name role gender age universe_id)
+        attributes: %w(name role gender age archetype universe_id)
       },
       looks: {
         icon: 'face',

app/views/content/_form.html.erb

@@ -67,6 +67,12 @@
                   <% through_class = content.class.reflect_on_association(attribute).options[:through].to_s %>
                   <%= render 'content/form/relation_input', f: f, attribute: attribute, relation: through_class %>
 
+                <% elsif attribute == 'archetype' %>
+                  <div class="input-field">
+                    <%= f.label attribute %><br />
+                    <%= f.select attribute, options_for_select(t('archetypes'), selected: f.object.archetype), include_blank: true %>
+                  </div>
+
                 <% elsif attribute == 'universe_id' %>
                   <div class="input-field">
                     <%= f.label attribute %><br />

app/views/main/index.html.erb

@@ -71,7 +71,7 @@
         <div class="col s12 m4">
           <div class="icon-block center">
             <h2 class="brown-text"><i class="material-icons">assignment_turned_in</i></h2>
-            <h5>Continuuity checks</h5>
+            <h5>Continuity checks</h5>
             <p class="light">
               When every little fact is stored in one place, you can rest easy knowing you won't accidentally contradict yourself.
             </p>

config/locales/en.yml

@@ -81,7 +81,7 @@ en:
         race: What is %{name}’s race?
         religion: What religion does %{name} practice?
         role: What is %{name}’s role in your story?
-        skintone: What skin tone does %{name} name?
+        skintone: What skin tone does %{name} have?
         weight: How much does %{name} weigh?
 
       item:
@@ -94,14 +94,15 @@ en:
         name: What is %{name}’s full name?
         notes: Do you have any miscellaneous public notes for %{name}?
         #original_owner: Who originally owned %{name}?
+        #past_owners
         private_notes: Do you have any private notes for %{name}?
         weight: How much does %{name} weigh?
         year_made: When was %{name} made?
 
       location:
         area: What kind of area is %{name} in?
         #capital: What is %{name}’s capital?
-        crops: What cropes does %{name} produce?
+        crops: What crops does %{name} produce?
         currency: What currencies are used in %{name}?
         established_year: When was %{name} established?
         language: What languages are spoken in %{name}?
@@ -539,6 +540,92 @@ en:
    - Jet black
    - Raven black
 
+  archetypes:
+   - Anthropomorphic Personification
+   - Anti-Hero
+   - Archmage
+   - Barefoot Sage
+   - Big Fun
+   - Blind Seer
+   - Blue-Collar Warlock
+   - Bruiser with a Soft Center
+   - The Champion
+   - The Chosen One
+   - The Chooser of The One
+   - Classic Villain
+   - The Cynic
+   - The Dragonslayer
+   - The Drunken Sailor
+   - Dumb Muscle
+   - Eccentric Mentor
+   - Enigmatic Empowering Entity
+   - Evil Overlord
+   - The Fair Folk
+   - Father Neptune
+   - Ferryman
+   - The Fool
+   - Fool for Love
+   - Gentle Giant
+   - The Good King
+   - Granny Classic
+   - The Grotesque
+   - Herald
+   - Heroic Archetype
+   - Heroic Wannabe
+   - The High Queen
+   - Higher Self
+   - The Hunter
+   - Ideal Hero
+   - The Idealist
+   - Ineffectual Loner
+   - The Kirk
+   - The Klutz
+   - Knight in Shining Armor
+   - Lady and Knight
+   - Loser Archetype
+   - Lovable Rogue
+   - Magical Barefooter
+   - Mary Sue
+   - The McCoy
+   - Mentor
+   - Messianic
+   - Mixed
+   - Mock Millionaire
+   - Modern Major General
+   - My Girl Back Home
+   - Obstructive Bureaucrat
+   - Oedipus Complex
+   - Old Soldier
+   - The Paladin
+   - The Patriarch
+   - Person of Mass Destruction
+   - The Pollyanna
+   - Powers That Be
+   - Prince Charming
+   - Princess Classic
+   - A Protagonist Shall Lead Them
+   - Rebel Leader
+   - Rebellious Spirit
+   - Reluctant Monster
+   - Satanic Archetype
+   - Seeker Archetype
+   - Shadow Archetype
+   - Shapeshifter
+   - The Spock
+   - Star-Crossed Lovers
+   - The Storyteller
+   - Threshold Guardians
+   - Turn Coat
+   - The Trickster
+   - Visitor
+   - Wicked Stepmother
+   - Wicked Witch
+   - Wizard Classic
+   - Wolf Man
+   - World's Best Warrior
+   - World's Most Beautiful Woman
+   - World's Strongest Man
+
   location_name_prefixes:
    - New
    - Los

db/migrate/20161003000856_add_archetype_to_character.rb

@@ -0,0 +1,5 @@
+class AddArchetypeToCharacter < ActiveRecord::Migration
+  def change
+    add_column :characters, :archetype, :string
+  end
+end

db/schema.rb

@@ -11,8 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20161001232324) do
-
+ActiveRecord::Schema.define(version: 20161003000856) do
   create_table "archenemyships", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "character_id"
@@ -80,6 +79,7 @@
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "privacy"
+    t.string   "archetype"
   end
 
   create_table "childrenships", force: :cascade do |t|