Merge pull request #335 from SumOfUs/development

release

.ebextensions/02_container_commands.config

@@ -7,6 +7,8 @@ files:
       #!/bin/bash
       docker run -e RDS_DB_NAME=$RDS_DB_NAME -e RDS_USERNAME=$RDS_USERNAME -e RDS_PASSWORD=$RDS_PASSWORD \
       -e RDS_HOSTNAME=$RDS_HOSTNAME -e RDS_PORT=5432 -e RAILS_ENV=production -e DEVISE_SECRET_KEY=$DEVISE_SECRET_KEY \
+      -e REDIS_PORT_6379_TCP_ADDR=$REDIS_PORT_6379_TCP_ADDR \
+      -e REDIS_PORT_6379_TCP_PORT=$REDIS_PORT_6379_TCP_PORT \
       aws_beanstalk/staging-app:latest rake db:migrate champaign:seed_liquid
   "/home/ec2-user/docker-housekeeping.sh":
     mode: "000755"

.ebextensions/03_papertrail.config

@@ -20,10 +20,10 @@ files:
         - /var/log/eb-docker/containers/eb-current-app/production.log
         - /var/log/eb-version-deployment.log
         - /var/log/eb-commandprocessor.log
-      hostname: champaign
+      hostname: $PAPERTRAIL_SYSTEM
       destination:
-        host: logs3.papertrailapp.com
-        port: 34848
+        host: $PAPERTRAIL_HOST
+        port: $PAPERTRAIL_PORT
         protocol: tls
 
   "/etc/init.d/remote_syslog":

Gemfile

@@ -2,6 +2,10 @@ source 'https://rubygems.org'
 ruby '2.3.0'
 
 gem 'rails', '4.2.5'
+gem 'rails-observers'
+gem 'readthis'
+gem 'hiredis'
+gem "redis", ">= 3.2.0", :require => ["redis", "redis/connection/hiredis"]
 gem 'pg'
 gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
@@ -54,10 +58,6 @@ gem 'rmagick' # rmagick for image processing
 gem 'paperclip'
 gem 'action_parameter'
 
-# We need to use render inside a model in order to compile HTML for display
-# in champaign-flute.
-gem 'render_anywhere', require: false
-
 # AWS SDK for Ruby
 gem 'aws-sdk', '~> 2'
 gem 'aws-sdk-v1'
@@ -78,10 +78,17 @@ gem 'newrelic_rpm'
 gem 'puma', '~> 2.15.3'
 gem 'typhoeus'
 
+# Gem for vanity urls
+gem 'friendly_id'
+
 # The Config gem is used as a way to easily access configuration variables without calling directly
 # to the ENV.
 gem 'config'
 
+# Metamagic is used to insert meta tags onto pages in a developer-friendly way. These tags can be used for
+# SEO and to improve page targeting for A/B testing using Optimizely.
+gem 'metamagic'
+
 group :development, :test do
   gem 'byebug'
   gem 'web-console', '~> 2.0'
@@ -140,5 +147,14 @@ source 'https://rails-assets.org' do
 
   # for js testing
   gem 'rails-assets-chai-jquery'
+
+  # A JavaScript visualization library for HTML and SVG.
+  gem 'rails-assets-d3'
+
+  # Transition numbers with ease
+  gem 'rails-assets-odometer'
+
+  # Parse, validate, manipulate, and display dates in javascript.
+  gem 'rails-assets-moment'
 end
 

Gemfile.lock

@@ -145,6 +145,7 @@ GEM
     config (1.0.0)
       activesupport (>= 3.0)
       deep_merge (~> 1.0.0)
+    connection_pool (2.2.0)
     countries (1.0.0)
       currencies (~> 0.4.2)
       i18n_data (~> 0.7.0)
@@ -186,6 +187,8 @@ GEM
     formtastic (3.1.3)
       actionpack (>= 3.2.13)
     formtastic_i18n (0.4.1)
+    friendly_id (5.1.0)
+      activerecord (>= 4.0.0)
     geocoder (1.2.11)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
@@ -209,6 +212,7 @@ GEM
       actionpack (>= 3.2, < 5)
       activesupport (>= 3.2, < 5)
     hashie (3.4.2)
+    hiredis (0.6.1)
     httparty (0.13.7)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
@@ -251,6 +255,8 @@ GEM
       rake
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
+    metamagic (3.1.7)
+      rails (>= 3.0.0)
     method_source (0.8.2)
     mime-types (2.99)
     mimemagic (0.3.0)
@@ -321,8 +327,11 @@ GEM
       rails-assets-underscore (>= 1.5.0)
     rails-assets-braintree-web (2.15.4)
     rails-assets-chai-jquery (2.0.1)
+    rails-assets-d3 (3.5.12)
     rails-assets-dropzone (4.0.1)
     rails-assets-mailcheck (1.1.1)
+    rails-assets-moment (2.11.1)
+    rails-assets-odometer (0.4.7)
     rails-assets-quill (0.20.0)
     rails-assets-speakingurl (6.0.0)
     rails-assets-underscore (1.8.3)
@@ -334,6 +343,8 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
+    rails-observers (0.1.2)
+      activemodel (~> 4.0)
     railties (4.2.5)
       actionpack (= 4.2.5)
       activesupport (= 4.2.5)
@@ -350,9 +361,11 @@ GEM
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rdoc (4.2.0)
+    readthis (1.2.0)
+      connection_pool (~> 2.1)
+      redis (~> 3.0)
+    redis (3.2.2)
     remotipart (1.2.1)
-    render_anywhere (0.0.11)
-      rails (>= 3.0.7)
     request_store (1.2.0)
     responders (2.1.0)
       railties (>= 4.2.0, < 5)
@@ -471,15 +484,18 @@ DEPENDENCIES
   factory_girl_rails
   faker
   font-awesome-sass
+  friendly_id
   geocoder
   google_currency
   guard-rspec
+  hiredis
   i18n-js (>= 3.0.0.rc12)
   jbuilder (~> 2.0)
   jquery-rails
   liquid
   logger
   magic_lamp
+  metamagic
   money
   newrelic_rpm
   omniauth-google-oauth2
@@ -492,13 +508,18 @@ DEPENDENCIES
   rails-assets-backbone!
   rails-assets-braintree-web!
   rails-assets-chai-jquery!
+  rails-assets-d3!
   rails-assets-dropzone!
   rails-assets-mailcheck!
+  rails-assets-moment!
+  rails-assets-odometer!
   rails-assets-quill!
   rails-assets-speakingurl!
   rails-assets-underscore!
+  rails-observers
+  readthis
+  redis (>= 3.2.0)
   remotipart (~> 1.2)
-  render_anywhere
   rmagick
   rspec-rails
   sass-rails (~> 5.0)

README.md

@@ -39,4 +39,6 @@ Champaign is a digital campaigning platform built by SumOfUs. It is under develo
 8. Run the tests
   * `docker-compose run web rspec spec`
 
+## QA
 
+Cross browser QA of member-facing pages has been done with the whiz-bang tech from [Browserstack](https://www.browserstack.com).