Merge branch 'features/can-keep-seeing-day-before'

Author: dimroc

.python-version

@@ -13,9 +13,11 @@ Detailed explanation [here](http://blog.dimroc.com/2017/11/19/counting-crowds-an
 ## Setup:
 
 ```
-# Install docker
-pyenv install conda # or wtever u do to get conda going
-conda-env create -f environment.yml # or something like this
+# Install docker, pyenv and pyenv-virtualenv
+pyenv install miniconda3-4.3.11
+conda-env create -f environment.yml
+pip install -e .
+git lfs pull # ensure you have large binaries downloaded
 
 ./manage.py --help
 ```

ml/README.md

@@ -62,7 +62,7 @@ dependencies:
 - pexpect=4.2.1=py35_0
 - pickleshare=0.7.4=py35_0
 - pillow=3.4.2=py35_0
-- pip=10.0.1=py35_1
+- pip=10.0.1
 - prompt_toolkit=1.0.15=py35_0
 - ptyprocess=0.5.2=py35_0
 - pycodestyle=2.3.1=py35_0

ml/environment.yml

@@ -1,8 +1,12 @@
 FROM dimroc/docker-ruby-node:latest
 RUN (wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key add -) && \
-  echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" >> /etc/apt/sources.list.d/pgdg.list
-RUN apt-get update -qq && apt-get install -y build-essential libpq-dev \
-      nodejs imagemagick postgresql-client-9.6
+  echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main\n" >> /etc/apt/sources.list.d/pgdg.list && \
+  echo "deb http://security.debian.org/debian-security jessie/updates main" >> /etc/apt/sources.list.d/pgdg.list
+
+RUN apt-get remove libpq5 -y && \
+      apt-get update -qq && \
+      apt-get install -y build-essential libpq-dev libpq5 nodejs libssl1.0.0 \
+      imagemagick postgresql-client-9.6
 
 WORKDIR /app
 COPY Gemfile Gemfile.lock package.json yarn.lock ./

rails/Dockerfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby '~> 2.4.1'
+ruby '2.5.1'
 #ruby-gemset=counting_company
 
 git_source(:github) do |repo_name|
@@ -22,7 +22,7 @@ gem 'env_guard', github: 'dimroc/env_guard'
 gem 'external_id', github: 'dimroc/external_id'
 gem 'font-awesome-rails'
 gem 'friendly_id'
-gem 'google-cloud-storage', github: 'dimroc/google-cloud-ruby'
+gem 'google-cloud-storage'
 gem 'grpc'
 gem 'image_processing'
 gem 'imgix-rails'
@@ -42,7 +42,7 @@ gem 'shrine-google_cloud_storage', github: 'dimroc/shrine-google_cloud_storage'
 gem 'sprockets', '4.0.0beta5'
 gem 'turbolinks', '~> 5'
 gem 'uglifier', '>= 1.3.0'
-gem 'webpacker', github: 'rails/webpacker'
+gem 'webpacker'
 
 group :development, :test do
   gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]

rails/Gemfile

@@ -9,7 +9,7 @@ GIT
 
 GIT
   remote: https://github.com/dimroc/env_guard.git
-  revision: 10d5fab025d19a92b6ae94252f1c12a578653ab8
+  revision: 68f9f5e098a3dd37ec9e3cf67f9f08771cf43e8a
   specs:
     env_guard (0.1.0)
       actionpack (>= 5.0)
@@ -23,20 +23,6 @@ GIT
       activerecord
       activesupport
 
-GIT
-  remote: https://github.com/dimroc/google-cloud-ruby.git
-  revision: 0537fbe1f781586a2f55c605faa37172896821f5
-  specs:
-    google-cloud-core (1.0.0)
-      google-cloud-env (~> 1.0)
-      googleauth (~> 0.5.1)
-    google-cloud-env (1.0.1)
-      faraday (~> 0.11)
-    google-cloud-storage (1.4.0)
-      digest-crc (~> 0.4)
-      google-api-client (~> 0.13.0)
-      google-cloud-core (~> 1.0)
-
 GIT
   remote: https://github.com/dimroc/jshint.git
   revision: bc779ab57827be571455e45359958c87fbf1dd1f
@@ -53,15 +39,6 @@ GIT
       google-api-client (~> 0.13.0)
       shrine (~> 2.0)
 
-GIT
-  remote: https://github.com/rails/webpacker.git
-  revision: 3c8adb79201bf4928276936dcbb183c8c029e8f1
-  specs:
-    webpacker (3.0.2)
-      activesupport (>= 4.2)
-      rack-proxy (>= 0.6.1)
-      railties (>= 4.2)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -119,7 +96,7 @@ GEM
       activerecord (>= 3.0)
     autoprefixer-rails (7.1.4)
       execjs
-    bcrypt (3.1.11)
+    bcrypt (3.1.12)
     bindex (0.5.0)
     bootstrap (4.0.0.beta)
       autoprefixer-rails (>= 6.0.3)
@@ -147,13 +124,13 @@ GEM
     concurrent-ruby (1.0.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.2)
+    crass (1.0.4)
     declarative (0.0.10)
     declarative-option (0.1.0)
-    devise (4.3.0)
+    devise (4.4.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.2)
+      railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
     diff-lcs (1.3)
@@ -166,7 +143,7 @@ GEM
       activemodel-serializers-xml (~> 1.0)
       activesupport (~> 5.0)
       request_store (~> 1.0)
-    erubi (1.7.0)
+    erubi (1.7.1)
     execjs (2.7.0)
     factory_girl (4.8.0)
       activesupport (>= 3.0.0)
@@ -175,7 +152,7 @@ GEM
       railties (>= 3.0.0)
     faker (1.8.4)
       i18n (~> 0.5)
-    faraday (0.13.1)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.18)
     font-awesome-rails (4.7.0.2)
@@ -197,8 +174,16 @@ GEM
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    google-protobuf (3.4.1.1)
-    googleapis-common-protos-types (1.0.0)
+    google-cloud-core (1.2.2)
+      google-cloud-env (~> 1.0)
+    google-cloud-env (1.0.2)
+      faraday (~> 0.11)
+    google-cloud-storage (1.5.0)
+      digest-crc (~> 0.4)
+      google-api-client (~> 0.13.0)
+      google-cloud-core (~> 1.0)
+    google-protobuf (3.6.1)
+    googleapis-common-protos-types (1.0.2)
       google-protobuf (~> 3.0)
     googleauth (0.5.3)
       faraday (~> 0.12)
@@ -208,14 +193,14 @@ GEM
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
-    grpc (1.6.2)
+    grpc (1.14.1)
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
-      googleauth (~> 0.5.1)
     grpc-tools (1.6.2)
     hashdiff (0.3.6)
     httpclient (2.8.3)
-    i18n (0.8.6)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     image_processing (0.4.5)
     imgix (1.1.0)
       addressable
@@ -247,7 +232,7 @@ GEM
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    loofah (2.1.1)
+    loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.6)
@@ -259,11 +244,11 @@ GEM
     mime-types-data (3.2016.0521)
     mini_magick (4.8.0)
     mini_portile2 (2.3.0)
-    minitest (5.10.3)
-    multi_json (1.12.2)
+    minitest (5.11.3)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
     nio4r (2.1.0)
-    nokogiri (1.8.1)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     orm_adapter (0.5.0)
     os (0.9.6)
@@ -275,15 +260,15 @@ GEM
     pry-byebug (3.5.0)
       byebug (~> 9.1)
       pry (~> 0.10)
-    public_suffix (3.0.0)
+    public_suffix (3.0.2)
     puma (3.10.0)
     pundit (1.1.0)
       activesupport (>= 3.0.0)
     pycall (1.0.3)
-    rack (2.0.3)
-    rack-proxy (0.6.2)
+    rack (2.0.5)
+    rack-proxy (0.6.4)
       rack
-    rack-test (0.7.0)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.1.4)
       actioncable (= 5.1.4)
@@ -300,15 +285,15 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     railties (5.1.4)
       actionpack (= 5.1.4)
       activesupport (= 5.1.4)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.1.0)
+    rake (12.3.1)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
@@ -357,7 +342,7 @@ GEM
       down (~> 4.1)
     shrine-memory (0.3.0)
       shrine (~> 2.2)
-    signet (0.8.0)
+    signet (0.8.1)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
@@ -388,7 +373,7 @@ GEM
     turbolinks (5.0.1)
       turbolinks-source (~> 5)
     turbolinks-source (5.0.3)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uber (0.1.0)
     uglifier (3.2.0)
@@ -405,6 +390,10 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
+    webpacker (3.5.5)
+      activesupport (>= 4.2)
+      rack-proxy (>= 0.6.1)
+      railties (>= 4.2)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
@@ -434,7 +423,7 @@ DEPENDENCIES
   foreman
   friendly_id
   fuubar
-  google-cloud-storage!
+  google-cloud-storage
   grpc
   grpc-tools
   image_processing
@@ -465,10 +454,10 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
   web-console (>= 3.3.0)
   webmock
-  webpacker!
+  webpacker
 
 RUBY VERSION
-   ruby 2.4.1p111
+   ruby 2.5.1p57
 
 BUNDLED WITH
-   1.16.0.pre.2
+   1.16.2

rails/Gemfile.lock

@@ -10,8 +10,10 @@ in Madison Square Park, and plots the number of people in line.
 Usual rails setup:
 
 ```bash
+brew install graphicsmagick postgresql redis
 yarn install
 bundle
+export RAILS_ENV=development
 rake db:create db:migrate
 rails s
 ```
@@ -25,6 +27,15 @@ export GOOGLE_APPLICATION_CREDENTIALS=../secrets/gcloudstorage.development.json
 gcloud config set project counting-company-production
 ```
 
+### testing
+
+Run the [setup for the /ml portion](../ml/README.md) of crowd count for integration tests against
+python machine learning.
+
+```bash
+rake # Runs all tests including integration tests w ml
+```
+
 ### Available Tasks
 
 ```

rails/README.md

@@ -1,6 +1,7 @@
 <template>
   <section>
-    <a v-if="today" :href="yesterdays_path">Yesterday</a>
+    <a v-if="today" :href="day_before_path">Yesterday</a>
+    <a v-if="!today" :href="day_before_path">Day Before</a>
     <small>{{time}}</small>
     <a v-if="!today" :href="todays_path">Now</a>
   </section>
@@ -19,8 +20,8 @@ export default {
     time: function() {
       return moment(this.current.created_at).format(MOMENT_FORMAT)
     },
-    yesterdays_path: function() {
-      return `/dates/${moment().add(-1, 'days').format(this.dateFormat)}`
+    day_before_path: function() {
+      return `/dates/${moment(this.date).add(-1, 'days').format(this.dateFormat)}`
     },
     todays_path: function() {
       return `/`

rails/app/javascript/src/clock.vue

@@ -21,14 +21,12 @@ html
       .row.justify-content-center
         .col-8.my-5
           p
-            ' Get in touch with us:  
-            a href="https://twitter.com/CountCompany" @CountCompany
-            '  or 
-            a href="mailto:[email protected]" [email protected]
+            ' Get in touch:
+            a href="https://twitter.com/dimroc" @dimroc
             '.
-          p 
+          p
             ' Count is a partnership between 
-            a href="http://experiments.dimroc.com/"Evolution of Books LLC
-            '  and 
+            a href="https://experiments.dimroc.com/"Evolution of Books LLC
+            '  and
             a href="http://thoughtmerchants.com/"Thought Merchants
             '.

rails/app/views/layouts/application.html.slim

@@ -11,14 +11,4 @@
         | .
 
     .col-sm-8
-      video src="https://dimroc-public.s3.amazonaws.com/mallcount.mp4" controls="true" type="video/mp4" style="max-width:600px;width:100%"
-
-  .row.justify-content-center.mt-3
-    .col-md-8.img-iterate
-      - @frames.each do |frame|
-        .linedbox
-          p.pc
-            = frame.predictions[1].decorate.crowd_count 
-            span  Predicted Crowd
-          = frame.predictions[1].decorate.density_map_tag
-          = frame.image_tag
+      video src="https://dimroc-public.s3.amazonaws.com/mallcount.mp4" controls="true" type="video/mp4" style="max-width:600px;width:100%"