Merge branch 'develop'

Author: ElliottAYoung

.env.example

@@ -15,6 +15,12 @@ S3_BUCKET_NAME=
 S3_PROTOCOL=
 S3_REGION=
 
+#
+# Monitoring
+#
+NEW_RELIC_LICENSE_KEY=
+SENTRY_RAVEN_DSN=
+
 #
 # Email Configuration
 #

Gemfile

@@ -5,10 +5,10 @@ ruby '2.4.0'
 gem 'bower-rails', '~> 0.11.0'
 
 # Server
-gem 'puma', '< 3.7' # Puma 3.7.0 breaks options passed in via `rails s` - will be fixed in 3.7.1
+gem 'puma', '~> 3.8.2'
 
 # Rails
-gem 'rails', '~> 5.0.1'
+gem 'rails', '~> 5.0.2'
 
 # Cortex-specific
 gem 'cortex-exceptions', '= 0.0.4'
@@ -17,12 +17,12 @@ gem 'cortex-plugins-core', '= 0.12.3'
 # API
 gem 'grape', '~> 0.17'
 gem 'grape-entity', '~> 0.6.0'
-gem 'grape-swagger', '~> 0.25.3'
+gem 'grape-swagger', '~> 0.27.1'
 
 # Authorization
 gem 'six', '~> 0.2.0'
-gem 'devise', '~> 4.2.0'
-gem 'rack-oauth2', '~> 1.5.1'
+gem 'devise', '~> 4.2.1'
+gem 'rack-oauth2', '~> 1.6.1'
 gem 'doorkeeper', '~> 4.2'
 gem 'rolify', '~> 5.1'
 gem 'pundit', '~> 1.1'
@@ -32,54 +32,54 @@ gem 'rails-observers', git: 'https://github.com/triloch/rails-observers.git'
 gem 'awesome_nested_set', git: 'https://github.com/cortex-cms/awesome_nested_set.git'
 gem 'paperclip', '~> 5.1.0'
 gem 'paperclip-optimizer', '~> 2.0'
-gem 'image_optim_pack', '~> 0.3.1'
+gem 'image_optim_pack', '~> 0.4.0'
 gem 'acts-as-taggable-on', '~> 4.0'
 gem 'bcrypt', '~> 3.1.11'
 gem 'kaminari', '~> 0.17.0'
 gem 'grape-kaminari', git: 'https://github.com/toastercup/grape-kaminari.git', branch: 'set-paginate-headers-extraction'
 gem 'elasticsearch-model', '~> 0.1'
 gem 'elasticsearch-rails', '~> 0.1'
-gem 'paranoia', '~> 2.2'
-gem 'pg', '~> 0.19.0'
+gem 'paranoia', '~> 2.3'
+gem 'pg', '~> 0.20.0'
 gem 'hashie-forbidden_attributes', '~> 0.1.1'
 gem 'redis-rails', '~> 5.0'
 gem 'pomona', '~> 0.7'
-gem 'transitions', '~> 1.2', :require => ['transitions', 'active_model/transitions']
+gem 'transitions', '~> 1.2', require: %w(transitions active_model/transitions)
 gem 'deep_cloneable', '~> 2.2.2'
 
 # Middleware
 gem 'rack-cors', '~> 0.4.1', require: 'rack/cors'
 
 # Utility
 gem 'excon', '~> 0.55.0'
-gem 'hashie', '~> 3.5.3'
-gem 'hashr', '~> 2.0.0'
+gem 'hashie', '~> 3.5.5'
+gem 'hashr', '~> 2.0.1'
 gem 'mime-types', '~> 3.1.0'
 gem 'interactor-rails', '~> 2.0'
 gem 'virtus', '~> 1.0.5'
 gem 'rubyzip', '~> 1.2.1'
-gem 'addressable', '~> 2.5.0'
+gem 'addressable', '~> 2.5.1'
 gem 'json'
 
 # External Services
-gem 'yt', '~> 0.28.5'
-gem 'aws-sdk', '~> 2.7' # Used by Paperclip
+gem 'yt', '~> 0.30.1'
+gem 'aws-sdk', '~> 2.9'
 
 # Jobs
-gem 'sidekiq', '~> 4.2.9'
-gem 'sidekiq-failures', '~> 0.4.5'
-gem 'sinatra', '~> 2.0.0.beta', require: false
+gem 'sidekiq', '~> 5.0.0'
+#gem 'sidekiq-failures', '~> 0.4.5' # Disabled until it supports sidekiq 5.x
+gem 'sinatra', '~> 2.0.0.rc', require: false
 
 # Pipeline
 gem 'sprockets-rails', '3.2.0', require: 'sprockets/railtie'
 gem 'sprockets', '3.7.1'
-gem 'uglifier', '~> 3.0.4'
+gem 'uglifier', '~> 3.2.0'
 gem 'non-stupid-digest-assets', '~> 1.0.9'
 gem 'angular-rails-templates', '~> 1.0.2'
 gem 'ngannotate-rails', '~> 1.2.2'
 
 # View
-gem 'haml', '~> 4.1.0.beta'
+gem 'haml', '~> 5.0'
 gem 'cells', '~> 4.1.6'
 gem 'cells-rails', '~> 0.0.7'
 gem 'cells-haml', '~> 0.0.10'
@@ -96,7 +96,7 @@ gem 'react_on_rails', '< 6.6'
 gem 'mini_racer', platforms: :ruby
 gem 'gon', '~> 6.1.0'
 gem 'turbolinks', '~> 5.0.1'
-gem 'jquery-rails', '~> 4.2.2'
+gem 'jquery-rails', '~> 4.3.1'
 gem 'jquery-turbolinks', '~> 2.1'
 gem 'jquery-ui-rails', '~> 6.0.1'
 gem 'ng-rails-csrf', '~> 0.1.0'
@@ -138,11 +138,11 @@ group :test do
   # Rspec
   gem 'rspec-rails', '~> 3.5'
   gem 'json_spec', '~> 1.1'
-  gem 'rspec-sidekiq', '~> 2.2'
+  gem 'rspec-sidekiq', '~> 3.0'
   gem 'shoulda-matchers', '~> 3.1'
 
   # Coverage
-  gem 'simplecov', '~> 0.13', require: false
+  gem 'simplecov', '~> 0.14', require: false
   gem 'codeclimate-test-reporter', '~> 0.6', require: false
 
   # Capybara for feature testing, Poltergeist for PhantomJS
@@ -169,14 +169,15 @@ end
 group :test, :development do
   gem 'factory_girl_rails', '~> 4.8'
   gem 'faker', '~> 1.7'
-  gem 'fog', '~> 1.38.0'
+  gem 'fog-local', '~> 0.3.1'
   gem 'phantomjs', '~> 2.1.1'
   gem 'jasmine-rails', '~> 0.14'
 end
 
 group :staging, :production do
   # Monitoring
-  gem 'newrelic_rpm', '~> 3.18'
+  gem 'newrelic_rpm'
+  gem 'sentry-raven'
 
   # Performance
   gem 'bootscale', require: false

Gemfile.lock

@@ -29,6 +29,6 @@ form.new_user .mdl-button {
 }
 
 .authentication__header-text {
-  @extend %display-text;
+  @include display-text;
   color: $color-white;
 }

app/assets/stylesheets/authentication.scss

@@ -4,11 +4,11 @@ $sidebar-link-width: $sidebar-width-expanded - 60px; // link padding = 60px
 $sidebar-collapse-transition: width 0.2s cubic-bezier(0.4, 0, 0.2, 1), transform 0.2s cubic-bezier(0.4, 0, 0.2, 1);
 $sidebar-toggle-button-transition: transform 500ms linear;
 
-.tenant__item {
+.nav__item {
   position: relative;
 }
 
-.tenant__item .material-icons {
+.nav__item .material-icons {
   position: absolute;
   right: 10px;
 }
@@ -21,7 +21,7 @@ $sidebar-toggle-button-transition: transform 500ms linear;
   flex-grow: 0;
   flex-shrink: 0;
   flex-basis: auto;
-  box-shadow: 1px 0px 5px 1px rgba(0,0,0,.5);
+  box-shadow: 1px 0px 5px 1px rgba(0, 0, 0, .5);
   overflow-y: hidden;
 }
 
@@ -42,7 +42,7 @@ $sidebar-toggle-button-transition: transform 500ms linear;
 }
 
 .sidebar__brand-name {
-  @extend %display-text;
+  @include display-text;
   color: $color-white;
   margin: 0 15px;
   text-decoration: none;
@@ -80,7 +80,7 @@ $sidebar-toggle-button-transition: transform 500ms linear;
   color: $color-grey-dark;
 }
 
-.mdl-layout__drawer .mdl-navigation .mdl-navigation__link.tenant__item {
+.mdl-layout__drawer .mdl-navigation .mdl-navigation__link.nav__item {
   background-color: $employer-color;
   color: $color-white;
 }
@@ -103,35 +103,50 @@ $sidebar-toggle-button-transition: transform 500ms linear;
   }
 }
 
-// Collapsing
-
-@media only screen and (min-width: 1024px) {
-.sidebar--collapsed {
-
-  .nav__item-name,
-  .sidebar__brand-name {
-    display: none;
-  }
-
-  .mdl-layout__drawer .mdl-navigation .mdl-navigation__link {
-    padding-left: 30px;
-  }
+.environment {
+  background-color: $flash-error-background !important;
+}
 
-  .tenant__item .material-icons {
-    position: static;
-  }
+.environment__abbreviated {
+  display: none;
+}
 
-  .sidebar__toggle-button:after {
-    transform: rotate(-540deg);
-    transition: $sidebar-toggle-button-transition;
-  }
+// Collapsing
 
-  .layout__sidebar {
-    width: $sidebar-width-collapsed;
-    transition: $sidebar-collapse-transition;
+@media only screen and (min-width: 1024px) {
+  .sidebar--collapsed {
+    .environment__full {
+      display: none;
+    }
+
+    .environment__abbreviated {
+      display: block;
+    }
+
+    .nav__item-name,
+    .sidebar__brand-name {
+      display: none;
+    }
+
+    .mdl-layout__drawer .mdl-navigation .mdl-navigation__link {
+      padding-left: 30px;
+    }
+
+    .nav__item .material-icons {
+      position: static;
+    }
+
+    .sidebar__toggle-button:after {
+      transform: rotate(-540deg);
+      transition: $sidebar-toggle-button-transition;
+    }
+
+    .layout__sidebar {
+      width: $sidebar-width-collapsed;
+      transition: $sidebar-collapse-transition;
+    }
   }
 }
-}
 
 @media only screen and (max-width: 1024px) {
   .layout__sidebar,

app/assets/stylesheets/components/sidebar.scss

@@ -29,7 +29,7 @@
 $cortex-font-stack: Montserrat, sans-serif;
 $base-font-size: 1rem;
 
-%display-text { // Cortex Logo
+@mixin display-text { // Cortex Logo
   color: $color-grey-dark;
   font-family: $cortex-font-stack;
   font-weight: normal;

app/assets/stylesheets/variables/_typography.scss

@@ -10,10 +10,27 @@ def extra_config
   end
 
   def qualtrics_domain
-  	extra_config.qualtrics_id.delete('_').downcase
+    extra_config.qualtrics_id.delete('_').downcase
   end
 
   def flag_enabled?(flag_name)
     Cortex.flipper[flag_name].enabled?(current_user, request)
   end
+
+  def environment
+    request.local? ? :local : Rails.env
+  end
+
+  def environment_abbreviated
+    case environment
+      when 'production'
+        :prd
+      when 'staging'
+        :stg
+      when 'development'
+        :dev
+      else
+        :loc
+    end
+  end
 end

app/helpers/application_helper.rb

@@ -33,7 +33,7 @@ def update
     @content_item = ContentItem.find(id)
 
     transact_and_refresh do
-      @content_item.update(content_item_attributes)
+      @content_item.assign_attributes(content_item_attributes)
     end
   end
 

app/services/content_item_service.rb

@@ -18,7 +18,7 @@
         %main.mdl-layout__content.layout__main-content
           = yield
     = render 'partials/flash'
-    
+
     %script{src: '//cdn.ckeditor.com/4.6.2/standard-all/ckeditor.js', type: 'text/javascript'}
     = javascript_include_tag :application, {'data-turbolinks-eval': false}
     = render 'layouts/google_analytics' if extra_config.google_analytics_id?

app/views/layouts/application.html.haml

@@ -0,0 +1,5 @@
+.mdl-navigation__link.nav__item.environment{class: "environment--#{environment}"}
+  .environment__full
+    = environment
+  .environment__abbreviated
+    = environment_abbreviated

app/views/partials/_environment_display.html.haml

@@ -4,5 +4,9 @@
       = image_tag 'logo.svg', class: 'sidebar__brand-logo'
       %h1.sidebar__brand-name Cortex
   = render 'partials/navigation'
-  = render 'partials/tenant_display'
+  %footer
+    %nav.demo-navigation.mdl-navigation
+      - unless environment == :production
+        = render 'partials/environment_display'
+      = render 'partials/tenant_display'
   .sidebar__toggle-button#sidebar__toggle-button

app/views/partials/_sidebar.html.haml

@@ -1,4 +1,2 @@
-%footer
-  %nav.demo-navigation.mdl-navigation
-    %div{class: 'mdl-navigation__link tenant__item'}
-      = cell(:tenant, Tenant.find_by_name('Corporate') || current_user.tenant).(:current)
+.mdl-navigation__link.nav__item
+  = cell(:tenant, Tenant.find_by_name('Corporate') || current_user.tenant).(:current)

app/views/partials/_tenant_display.html.haml

@@ -2,7 +2,7 @@ if Rails.cache.fetch("rss-v2-#{content_type.name}")
   xml << Rails.cache.fetch("rss-v2-#{content_type.name}")
 end
 
-Rails.cache.fetch("rss-v2-#{content_type.name}", expires_in: 30.minutes, race_condition_ttl: 10) do
+Rails.cache.fetch("rss-v2-#{content_type.name}", expires_in: 1.minute, race_condition_ttl: 10) do
   xml.instruct! :xml, version: '1.0', encoding: 'UTF-8'
   xml.rss version: '2.0',
           'xmlns:content': 'http://purl.org/rss/1.0/modules/content/',

app/views/rss/v2/rss/index.rss.builder

@@ -0,0 +1,6 @@
+if defined? Raven
+  Raven.configure do |config|
+    config.dsn = ENV['SENTRY_RAVEN_DSN']
+    config.sanitize_fields = Rails.application.config.filter_parameters.map(&:to_s)
+  end
+end

config/initializers/sentry.rb

@@ -1,3 +1,5 @@
+require 'sidekiq/web'
+
 Cortex::Application.routes.draw do
   get 'hello_world', to: 'hello_world#index'
   mount JasmineRails::Engine => '/specs' if defined?(JasmineRails)

config/routes.rb

@@ -379,12 +379,12 @@ namespace :employer do
             "args": [blog.fields.find_by_name('Categories').id]
             }, "multiple": ","
           },
-          "content": { "field": blog.fields.find_by_name('Body').id, "encode": true },
           "media:content": { "media":
             { "field": blog.fields.find_by_name('Featured Image').id,
               "medium": "image"
             }
-          }
+          },
+          "content": { "field": blog.fields.find_by_name('Body').id, "encode": true }
         }
       }