From 85113ca0954d076ad0e2e8514be2968d34eb3e7b Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Wed, 23 Mar 2016 21:26:29 +0100
Subject: upgrade: use recent gems - broken

We can move to rails 4.2 with client_side_validations 4.2,
simple_form 3.2 and bootstrap 3

Now we only need to migrate to these new dependencies. ;)
---
 Gemfile      |  35 ++----
 Gemfile.lock | 359 +++++++++++++++++++++++++++++++++--------------------------
 Gemfile.orig | 119 ++++++++++++++++++++
 3 files changed, 330 insertions(+), 183 deletions(-)
 create mode 100644 Gemfile.orig

diff --git a/Gemfile b/Gemfile
index a38d1e9..5b5a33b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,12 +4,12 @@ require File.expand_path('../lib/gemfile_tools.rb', __FILE__)
 
 ## CORE
 # rake 11.x throws lots of warnings about rails 3.2 code
-gem "rake", "~> 10.4"
-gem "rails", "~> 3.2.21"
+gem "rake"
+gem "rails", "~> 4.2.6"
 gem "couchrest", "~> 1.1.3"
 gem "couchrest_model", "~> 2.0.0"
 if ARGV.grep(/assets:precompile/).empty?
-  gem "couchrest_session_store", "= 0.3.1"
+  gem "couchrest_session_store", "~> 0.4.1"
 end
 
 ## AUTHENTICATION
@@ -30,8 +30,7 @@ gem 'rails-i18n'  # locale files for built-in validation messages and times
 gem 'common_languages', :path => 'vendor/gems/common_languages'
 
 ## VIEWS
-gem 'kaminari', "0.13.0" # for pagination. trying 0.13.0 as there seem to be
-                         # issues with 0.14.0 when using couchrest
+gem 'kaminari'
 gem 'rdiscount'   # for rendering .md templates
 
 ## ASSETS
@@ -39,19 +38,13 @@ gem "jquery-rails"
 gem "simple_form"
 gem 'client_side_validations'
 gem 'client_side_validations-simple_form'
-gem "haml-rails", "= 0.4.0"   # The last version of haml-rails to support Rails 3.
-gem "bootstrap-sass", "= 2.3.2.2" # The last 2.x version. Bootstrap-sass versions
-                                  # tracks the version of Bootstrap. We currently require
-                                  # Bootstrap v2 because client side validations is incompatible
-                                  # with Bootstrap v3. When upgrading to Rails 4, see
-                                  # https://github.com/twbs/bootstrap-sass
-gem "sass-rails", "~> 3.2.5"  # Only version supported by bootstrap-sass 2.3.2.2
+gem "haml-rails"
+gem "bootstrap-sass"
+gem "sass-rails"
 gem 'quiet_assets'            # stops logging all the asset requests
 group :production do
-  gem "uglifier", "~> 1.2.7"    # javascript compression https://github.com/lautis/uglifier
-                                # this must not be included in development mode, or js
-                                # will get included twice.
-  gem 'therubyracer', "~> 0.12.2", :platforms => :ruby
+  gem "uglifier"
+  gem 'therubyracer', :platforms => :ruby
   #    ^^ See https://github.com/sstephenson/execjs#readme
   #      for list of supported runtimes.
 end
@@ -68,7 +61,7 @@ group :test do
   gem 'phantomjs-binaries'  # binaries specific to the os
 
   # moching and stubbing
-  gem 'mocha', '~> 0.13.0', :require => false
+  gem 'mocha', :require => false
   gem 'minitest-stub-const' # why?
 
   # generating test data
@@ -93,17 +86,13 @@ group :production do
 end
 
 group :development do
-  gem "better_errors", '1.1.0'
+  gem "better_errors"
   gem "binding_of_caller"
 end
 
 group :test, :debug do
   # bundler on jessie doesn't support `:platforms => :ruby_21`
-  if RUBY_VERSION < "2.0"
-    gem 'debugger'
-  else
-    gem 'byebug'
-  end
+  gem 'byebug'
 end
 
 ##
diff --git a/Gemfile.lock b/Gemfile.lock
index af414c1..3344b5c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,13 +1,13 @@
 PATH
   remote: engines/billing
   specs:
-    leap_web_billing (0.6.0)
+    leap_web_billing (0.8.0)
       braintree
 
 PATH
   remote: engines/support
   specs:
-    leap_web_help (0.6.0)
+    leap_web_help (0.8.0)
 
 PATH
   remote: vendor/gems/certificate_authority
@@ -26,58 +26,75 @@ GEM
   remote: https://rubygems.org/
   specs:
     SyslogLogger (2.0)
-    actionmailer (3.2.22.2)
-      actionpack (= 3.2.22.2)
-      mail (~> 2.5.4)
-    actionpack (3.2.22.2)
-      activemodel (= 3.2.22.2)
-      activesupport (= 3.2.22.2)
-      builder (~> 3.0.0)
+    actionmailer (4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.6)
+      actionview (= 4.2.6)
+      activesupport (= 4.2.6)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.6)
+      activesupport (= 4.2.6)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.22.2)
-      activesupport (= 3.2.22.2)
-      builder (~> 3.0.0)
-    activerecord (3.2.22.2)
-      activemodel (= 3.2.22.2)
-      activesupport (= 3.2.22.2)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.22.2)
-      activemodel (= 3.2.22.2)
-      activesupport (= 3.2.22.2)
-    activesupport (3.2.22.2)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    addressable (2.3.6)
-    arel (3.0.3)
-    better_errors (1.1.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.6)
+      activesupport (= 4.2.6)
+      globalid (>= 0.3.0)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
+      builder (~> 3.1)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
+      activesupport (= 4.2.6)
+      arel (~> 6.0)
+    activesupport (4.2.6)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.4.0)
+    arel (6.0.3)
+    autoprefixer-rails (6.3.6)
+      execjs
+    better_errors (2.1.1)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
+      rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (2.3.2.2)
-      sass (~> 3.2)
-    braintree (2.48.1)
+    bootstrap-sass (3.3.6)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
+    braintree (2.60.0)
       builder (>= 2.0.0)
-    builder (3.0.4)
-    byebug (8.2.1)
-    capybara (2.4.4)
+    builder (3.2.2)
+    byebug (8.2.5)
+    capybara (2.7.1)
+      addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    client_side_validations (3.2.6)
-    client_side_validations-simple_form (2.1.0)
-      client_side_validations (~> 3.2.5)
-      simple_form (~> 2.1.0)
+    client_side_validations (4.2.3)
+      jquery-rails (>= 3.1.2, < 5.0.0)
+      js_regex (~> 1.0, >= 1.0.9)
+      rails (>= 4.0.0, < 4.3.0)
+    client_side_validations-simple_form (3.2.3)
+      client_side_validations (~> 4.2.3)
+      simple_form (~> 3.2)
     cliver (0.3.2)
-    coderay (1.1.0)
+    coderay (1.1.1)
+    concurrent-ruby (1.0.1)
     couchrest (1.1.3)
       mime-types (~> 1.15)
       multi_json (~> 1.0)
@@ -87,175 +104,197 @@ GEM
       couchrest (~> 1.1.3)
       mime-types (>= 1.15)
       tzinfo (>= 0.3.22)
-    couchrest_session_store (0.3.1)
-      actionpack (~> 3.0)
+    couchrest_session_store (0.4.1)
+      actionpack (~> 4.0)
       couchrest
       couchrest_model
-    cucumber (1.3.17)
+    cucumber (2.3.3)
       builder (>= 2.1.2)
+      cucumber-core (~> 1.4.0)
+      cucumber-wire (~> 0.0.1)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
+      gherkin (~> 3.2.0)
       multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.1)
-    cucumber-rails (1.4.2)
+      multi_test (>= 0.1.2)
+    cucumber-core (1.4.0)
+      gherkin (~> 3.2.0)
+    cucumber-rails (1.4.3)
       capybara (>= 1.1.2, < 3)
-      cucumber (>= 1.3.8, < 2)
-      mime-types (>= 1.16, < 3)
+      cucumber (>= 1.3.8, < 3)
+      mime-types (>= 1.16, < 4)
       nokogiri (~> 1.5)
-      rails (>= 3, < 5)
-    daemons (1.1.9)
+      railties (>= 3, < 5)
+    cucumber-wire (0.0.1)
+    daemons (1.2.3)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    eventmachine (1.0.3)
-    execjs (2.2.2)
-    factory_girl (4.5.0)
+    eventmachine (1.2.0.1)
+    execjs (2.6.0)
+    factory_girl (4.7.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.5.0)
-      factory_girl (~> 4.5.0)
+    factory_girl_rails (4.7.0)
+      factory_girl (~> 4.7.0)
       railties (>= 3.0.0)
-    fake_braintree (0.7.0)
+    fake_braintree (0.8.0)
       activesupport
       braintree (~> 2.32)
-      capybara (>= 2.0.3)
+      capybara (>= 2.2.0)
       sinatra
-    faker (1.4.3)
+    faker (1.6.3)
       i18n (~> 0.5)
-    ffi (1.9.6)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    haml (4.0.6)
+    ffi (1.9.10)
+    gherkin (3.2.0)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    haml (4.0.7)
       tilt
-    haml-rails (0.4)
-      actionpack (>= 3.1, < 4.1)
-      activesupport (>= 3.1, < 4.1)
-      haml (>= 3.1, < 4.1)
-      railties (>= 3.1, < 4.1)
-    hike (1.2.3)
-    http_accept_language (2.0.2)
+    haml-rails (0.9.0)
+      actionpack (>= 4.0.1)
+      activesupport (>= 4.0.1)
+      haml (>= 4.0.6, < 5.0)
+      html2haml (>= 1.0.1)
+      railties (>= 4.0.1)
+    html2haml (2.0.0)
+      erubis (~> 2.7.0)
+      haml (~> 4.0.0)
+      nokogiri (~> 1.6.0)
+      ruby_parser (~> 3.5)
+    http_accept_language (2.0.5)
     i18n (0.7.0)
     i18n-missing_translations (0.0.1)
-    journey (1.0.4)
-    jquery-rails (3.1.2)
-      railties (>= 3.0, < 5.0)
+    jquery-rails (4.1.1)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    js_regex (1.0.14)
+      regexp_parser (= 0.3.3)
     json (1.8.3)
-    kaminari (0.13.0)
+    kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-      railties (>= 3.0.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    libv8 (3.16.14.11)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    libv8 (3.16.14.15)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     metaclass (0.0.4)
     method_source (0.8.2)
     mime-types (1.25.1)
-    mini_portile (0.6.1)
-    minitest-stub-const (0.2)
-    mocha (0.13.3)
+    mini_portile2 (2.0.0)
+    minitest (5.8.4)
+    minitest-stub-const (0.5)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.11.2)
-    multi_test (0.1.1)
-    nokogiri (1.6.5)
-      mini_portile (~> 0.6.0)
-    phantomjs-binaries (1.9.2.4)
+    multi_json (1.11.3)
+    multi_test (0.1.2)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    phantomjs-binaries (2.1.1.0)
       sys-uname (= 0.9.0)
-    poltergeist (1.5.1)
+    poltergeist (1.9.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    polyglot (0.3.5)
-    pry (0.10.1)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    quiet_assets (1.0.3)
+    quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rack (1.4.7)
-    rack-cache (1.6.1)
-      rack (>= 0.4)
+    rack (1.6.4)
     rack-protection (1.5.3)
       rack
-    rack-ssl (1.3.4)
-      rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.22.2)
-      actionmailer (= 3.2.22.2)
-      actionpack (= 3.2.22.2)
-      activerecord (= 3.2.22.2)
-      activeresource (= 3.2.22.2)
-      activesupport (= 3.2.22.2)
-      bundler (~> 1.0)
-      railties (= 3.2.22.2)
-    rails-i18n (3.0.1)
-      i18n (~> 0.5)
-      rails (>= 3.0.0, < 4.0.0)
+    rails (4.2.6)
+      actionmailer (= 4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
+      activemodel (= 4.2.6)
+      activerecord (= 4.2.6)
+      activesupport (= 4.2.6)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.6)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    rails-i18n (4.0.8)
+      i18n (~> 0.7)
+      railties (~> 4.0)
     rails_warden (0.5.8)
       warden (>= 1.0.0)
-    railties (3.2.22.2)
-      actionpack (= 3.2.22.2)
-      activesupport (= 3.2.22.2)
-      rack-ssl (~> 1.3.2)
+    railties (4.2.6)
+      actionpack (= 4.2.6)
+      activesupport (= 4.2.6)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.5.0)
-    rdiscount (2.1.7.1)
-    rdoc (3.12.2)
-      json (~> 1.4)
+      thor (>= 0.18.1, < 2.0)
+    rake (11.1.2)
+    rdiscount (2.1.8)
     ref (2.0.0)
+    regexp_parser (0.3.3)
     rest-client (1.6.9)
       mime-types (~> 1.16)
     ruby-srp (0.2.1)
-    sass (3.4.9)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
-    simple_form (2.1.2)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
-    sinatra (1.4.5)
-      rack (~> 1.4)
+    ruby_parser (3.8.1)
+      sexp_processor (~> 4.1)
+    sass (3.4.22)
+    sass-rails (5.0.4)
+      railties (>= 4.0.0, < 5.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
+    sexp_processor (4.7.0)
+    simple_form (3.2.1)
+      actionpack (> 4, < 5.1)
+      activemodel (> 4, < 5.1)
+    sinatra (1.4.7)
+      rack (~> 1.5)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
+      tilt (>= 1.3, < 3)
     slop (3.6.0)
-    sprockets (2.2.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
+    sprockets (3.6.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.0.4)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     sys-uname (0.9.0)
       ffi (>= 1.0.0)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
-    thin (1.6.3)
+    thin (1.6.4)
       daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0)
+      eventmachine (~> 1.0, >= 1.0.4)
       rack (~> 1.0)
     thor (0.19.1)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.47)
-    uglifier (1.2.7)
-      execjs (>= 0.3.0)
-      multi_json (~> 1.3)
-    valid_email (0.0.7)
+    thread_safe (0.3.5)
+    tilt (2.0.2)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uglifier (3.0.0)
+      execjs (>= 0.3.0, < 3)
+    valid_email (0.0.13)
       activemodel
-      mail
-    warden (1.2.3)
+      mail (~> 2.6.1)
+    warden (1.2.6)
       rack (>= 1.0)
-    websocket-driver (0.5.1)
+    websocket-driver (0.6.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.1)
+    websocket-extensions (0.1.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -264,9 +303,9 @@ PLATFORMS
 
 DEPENDENCIES
   SyslogLogger (~> 2.0)
-  better_errors (= 1.1.0)
+  better_errors
   binding_of_caller
-  bootstrap-sass (= 2.3.2.2)
+  bootstrap-sass
   byebug
   capybara
   certificate_authority!
@@ -275,36 +314,36 @@ DEPENDENCIES
   common_languages!
   couchrest (~> 1.1.3)
   couchrest_model (~> 2.0.0)
-  couchrest_session_store (= 0.3.1)
+  couchrest_session_store (~> 0.4.1)
   cucumber-rails
   factory_girl_rails
   fake_braintree
   faker
-  haml-rails (= 0.4.0)
+  haml-rails
   http_accept_language
   i18n-missing_translations
   jquery-rails
-  kaminari (= 0.13.0)
+  kaminari
   launchy
   leap_web_billing!
   leap_web_help!
   minitest-stub-const
-  mocha (~> 0.13.0)
+  mocha
   phantomjs-binaries
   poltergeist
   pry
   quiet_assets
-  rails (~> 3.2.21)
+  rails (~> 4.2.6)
   rails-i18n
   rails_warden
-  rake (~> 10.4)
+  rake
   rdiscount
   ruby-srp (~> 0.2.1)
-  sass-rails (~> 3.2.5)
+  sass-rails
   simple_form
-  therubyracer (~> 0.12.2)
+  therubyracer
   thin
-  uglifier (~> 1.2.7)
+  uglifier
   valid_email
 
 BUNDLED WITH
diff --git a/Gemfile.orig b/Gemfile.orig
new file mode 100644
index 0000000..b7e83aa
--- /dev/null
+++ b/Gemfile.orig
@@ -0,0 +1,119 @@
+source 'https://rubygems.org'
+
+require File.expand_path('../lib/gemfile_tools.rb', __FILE__)
+
+## CORE
+# rake 11.x throws lots of warnings about rails 3.2 code
+gem "rake"
+gem "rails", "~> 4.2.6"
+gem "couchrest", "~> 1.1.3"
+gem "couchrest_model", "~> 2.0.0"
+if ARGV.grep(/assets:precompile/).empty?
+<<<<<<< HEAD
+  gem "couchrest_session_store", "= 0.3.1"
+=======
+  gem "couchrest_session_store", "= 0.4.0",
+    path: '../couchrest_session_store'
+>>>>>>> upgrade: use recent gems - broken
+end
+
+## AUTHENTICATION
+gem "ruby-srp", "~> 0.2.1"
+gem "rails_warden"
+
+## CRYPTO
+# we need certificate_authority v2.0, but was never released to rubygems,
+# and travis does not work well with github sources, so vendored here:
+gem 'certificate_authority', :path => 'vendor/gems/certificate_authority'
+
+## LOCALIZATION
+gem 'http_accept_language'
+gem 'rails-i18n'  # locale files for built-in validation messages and times
+                  # https://github.com/svenfuchs/rails-i18n
+                  # for a list of keys:
+                  # https://github.com/svenfuchs/rails-i18n/blob/master/rails/locale/en.yml
+gem 'common_languages', :path => 'vendor/gems/common_languages'
+
+## VIEWS
+gem 'kaminari'
+gem 'rdiscount'   # for rendering .md templates
+
+## ASSETS
+gem "jquery-rails"
+gem "simple_form"
+gem 'client_side_validations'
+gem 'client_side_validations-simple_form'
+gem "haml-rails"
+gem "bootstrap-sass"
+gem "sass-rails"
+gem 'quiet_assets'            # stops logging all the asset requests
+group :production do
+  gem "uglifier"
+  gem 'therubyracer', :platforms => :ruby
+  #    ^^ See https://github.com/sstephenson/execjs#readme
+  #      for list of supported runtimes.
+end
+
+##
+## ENVIRONMENT SPECIFIC GEMS
+##
+
+group :test do
+  # integration testing
+  gem 'capybara', require: false
+  gem 'poltergeist'         # headless js
+  gem 'launchy'             # save_and_open_page
+  gem 'phantomjs-binaries'  # binaries specific to the os
+
+  # moching and stubbing
+  gem 'mocha', :require => false
+  gem 'minitest-stub-const' # why?
+
+  # generating test data
+  gem 'factory_girl_rails'  # test data factories
+  gem 'faker'               # names and numbers for test data
+
+  # billing tests
+  gem 'fake_braintree', require: false
+
+  # we use cucumber to document and test the api
+  gem 'cucumber-rails', require: false
+end
+
+group :test, :development do
+  gem 'thin'
+  gem 'i18n-missing_translations'
+  gem 'pry'
+end
+
+group :production do
+  gem 'SyslogLogger', '~> 2.0'
+end
+
+group :development do
+  gem "better_errors"
+  gem "binding_of_caller"
+end
+
+group :test, :debug do
+  # bundler on jessie doesn't support `:platforms => :ruby_21`
+  gem 'byebug'
+end
+
+##
+## OPTIONAL GEMS AND ENGINES
+##
+
+enabled_engines.each do |name, gem_info|
+  gem gem_info[:name], :path => gem_info[:path], :groups => gem_info[:env]
+end
+
+custom_gems.each do |name, gem_info|
+  gem gem_info[:name], :path => gem_info[:path]
+end
+
+##
+## DEPENDENCIES FOR OPTIONAL ENGINES
+##
+
+gem 'valid_email' # used by leap_web_help
-- 
cgit v1.2.3


From 5407ef5b377a205f6012b2d6725b810eff93d9e6 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Wed, 23 Mar 2016 21:31:33 +0100
Subject: upgrade: drop active_resource in config/application

---
 config/application.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/application.rb b/config/application.rb
index b13c7d9..4771f89 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -4,7 +4,6 @@ require File.expand_path('../boot', __FILE__)
 # require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
-require "active_resource/railtie"
 require "sprockets/railtie"
 require "rails/test_unit/railtie"
 
-- 
cgit v1.2.3


From abf600089a4bc4b5c7271e17b1fd95a95deb293f Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Wed, 23 Mar 2016 21:35:08 +0100
Subject: upgrade: couchrest 2.0.0.rc3 couchrest model 2.1.0.beta2

The latter supports Active Model >= 4.1
---
 Gemfile      |  4 ++--
 Gemfile.lock | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5b5a33b..071dd3c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,8 +6,8 @@ require File.expand_path('../lib/gemfile_tools.rb', __FILE__)
 # rake 11.x throws lots of warnings about rails 3.2 code
 gem "rake"
 gem "rails", "~> 4.2.6"
-gem "couchrest", "~> 1.1.3"
-gem "couchrest_model", "~> 2.0.0"
+gem "couchrest", "~> 2.0.0.rc3"
+gem "couchrest_model", "~> 2.1.0.beta2"
 if ARGV.grep(/assets:precompile/).empty?
   gem "couchrest_session_store", "~> 0.4.1"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 3344b5c..0d18875 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -95,14 +95,13 @@ GEM
     cliver (0.3.2)
     coderay (1.1.1)
     concurrent-ruby (1.0.1)
-    couchrest (1.1.3)
-      mime-types (~> 1.15)
-      multi_json (~> 1.0)
-      rest-client (~> 1.6.1)
-    couchrest_model (2.0.1)
-      activemodel (>= 3.0)
-      couchrest (~> 1.1.3)
+    couchrest (2.0.0.rc3)
+      httpclient (~> 2.7)
       mime-types (>= 1.15)
+      multi_json (~> 1.7)
+    couchrest_model (2.1.0.beta2)
+      activemodel (~> 4.0)
+      couchrest (= 2.0.0.rc3)
       tzinfo (>= 0.3.22)
     couchrest_session_store (0.4.1)
       actionpack (~> 4.0)
@@ -161,6 +160,7 @@ GEM
       nokogiri (~> 1.6.0)
       ruby_parser (~> 3.5)
     http_accept_language (2.0.5)
+    httpclient (2.8.0)
     i18n (0.7.0)
     i18n-missing_translations (0.0.1)
     jquery-rails (4.1.1)
@@ -182,7 +182,9 @@ GEM
       mime-types (>= 1.16, < 4)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (1.25.1)
+    mime-types (3.0)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0221)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
     minitest-stub-const (0.5)
@@ -243,8 +245,6 @@ GEM
     rdiscount (2.1.8)
     ref (2.0.0)
     regexp_parser (0.3.3)
-    rest-client (1.6.9)
-      mime-types (~> 1.16)
     ruby-srp (0.2.1)
     ruby_parser (3.8.1)
       sexp_processor (~> 4.1)
@@ -312,8 +312,8 @@ DEPENDENCIES
   client_side_validations
   client_side_validations-simple_form
   common_languages!
-  couchrest (~> 1.1.3)
-  couchrest_model (~> 2.0.0)
+  couchrest (~> 2.0.0.rc3)
+  couchrest_model (~> 2.1.0.beta2)
   couchrest_session_store (~> 0.4.1)
   cucumber-rails
   factory_girl_rails
-- 
cgit v1.2.3


From 065859b90cc5ef403b8f47bd5394b343e556cc4d Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Wed, 23 Mar 2016 21:48:52 +0100
Subject: upgrade: remove references to RestClient

CouchRest > 1.2 does not use RestClient anymore. So we should not try to
catch its errors.
---
 app/controllers/application_controller.rb          |   2 +-
 app/models/token.rb                                |   4 +-
 config/initializers/error_constants.rb             |   5 +
 config/initializers/validations.rb                 |   4 -
 engines/support/app/models/ticket.rb               |   2 +-
 engines/support/test/unit/ticket_test.rb           |   2 +-
 lib/extensions/couchrest.rb                        |   2 +-
 .../lib/couchrest/model/database_method.rb         | 131 ++++++++++
 .../lib/couchrest/model/rotation.rb                | 263 +++++++++++++++++++++
 .../lib/couchrest/session/document.rb              | 119 ++++++++++
 .../lib/couchrest/session/store.rb                 |  94 ++++++++
 .../test/database_method_test.rb                   | 116 +++++++++
 .../test/session_store_test.rb                     | 168 +++++++++++++
 13 files changed, 902 insertions(+), 10 deletions(-)
 delete mode 100644 config/initializers/validations.rb
 create mode 100644 vendor/gems/couchrest_session_store/lib/couchrest/model/database_method.rb
 create mode 100644 vendor/gems/couchrest_session_store/lib/couchrest/model/rotation.rb
 create mode 100644 vendor/gems/couchrest_session_store/lib/couchrest/session/document.rb
 create mode 100644 vendor/gems/couchrest_session_store/lib/couchrest/session/store.rb
 create mode 100644 vendor/gems/couchrest_session_store/test/database_method_test.rb
 create mode 100644 vendor/gems/couchrest_session_store/test/session_store_test.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 079dc18..2af2f29 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -5,7 +5,7 @@ class ApplicationController < ActionController::Base
   before_filter :no_frame_header
   before_filter :language_header
   rescue_from StandardError, :with => :default_error_handler
-  rescue_from RestClient::Exception, :with => :default_error_handler
+  rescue_from CouchRest::Exception, :with => :default_error_handler
 
   ActiveSupport.run_load_hooks(:application_controller, self)
 
diff --git a/app/models/token.rb b/app/models/token.rb
index b398fcb..8ac32b8 100644
--- a/app/models/token.rb
+++ b/app/models/token.rb
@@ -59,8 +59,8 @@ class Token < CouchRest::Model::Base
   # So let's make sure we don't crash if they disappeared
   def destroy_with_rescue
     destroy_without_rescue
-  rescue RestClient::ResourceNotFound # do nothing it's gone already
-  rescue RestClient::Conflict # do nothing - it's been updated - #7670
+  rescue CouchRest::NotFound
+  rescue CouchRest::Conflict # do nothing - it's been updated - #7670
   end
   alias_method_chain :destroy, :rescue
 
diff --git a/config/initializers/error_constants.rb b/config/initializers/error_constants.rb
index fdd3624..bf2dad4 100644
--- a/config/initializers/error_constants.rb
+++ b/config/initializers/error_constants.rb
@@ -1,3 +1,8 @@
 require 'ruby-srp'
 
 WRONG_PASSWORD = SRP::WrongPassword
+
+# In case we use a different ORM at some point
+VALIDATION_FAILED = CouchRest::Model::Errors::Validations
+RECORD_NOT_FOUND  = CouchRest::Model::DocumentNotFound
+RESOURCE_NOT_FOUDN = CouchRest::NotFound
diff --git a/config/initializers/validations.rb b/config/initializers/validations.rb
deleted file mode 100644
index e8acfbe..0000000
--- a/config/initializers/validations.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# In case we use a different ORM at some point
-VALIDATION_FAILED = CouchRest::Model::Errors::Validations
-RECORD_NOT_FOUND  = CouchRest::Model::DocumentNotFound
-RESOURCE_NOT_FOUND  = RestClient::ResourceNotFound
diff --git a/engines/support/app/models/ticket.rb b/engines/support/app/models/ticket.rb
index b1bdf8d..4615a10 100644
--- a/engines/support/app/models/ticket.rb
+++ b/engines/support/app/models/ticket.rb
@@ -50,7 +50,7 @@ class Ticket < CouchRest::Model::Base
     self.by_created_by.key(user.id).each do |ticket|
       ticket.destroy
     end
-  rescue RestClient::ResourceNotFound
+  rescue RESOURCE_NOT_FOUND
     # silently ignore if design docs are not yet created
   end
 
diff --git a/engines/support/test/unit/ticket_test.rb b/engines/support/test/unit/ticket_test.rb
index 7b5281f..c2c5e11 100644
--- a/engines/support/test/unit/ticket_test.rb
+++ b/engines/support/test/unit/ticket_test.rb
@@ -63,7 +63,7 @@ class TicketTest < ActiveSupport::TestCase
   test "find tickets user commented on" do
 
     # clear old tickets just in case
-    # this will cause RestClient::ResourceNotFound errors if there are multiple copies of the same ticket returned
+    # this will cause RESOURCE_NOT_FOUND errors if there are multiple copies of the same ticket returned
     Ticket.by_includes_post_by.key('123').each {|t| t.destroy}
     # TODO: the by_includes_post_by view is only used for tests. Maybe we should get rid of it and change the test to including ordering?
 
diff --git a/lib/extensions/couchrest.rb b/lib/extensions/couchrest.rb
index cc041e0..6967980 100644
--- a/lib/extensions/couchrest.rb
+++ b/lib/extensions/couchrest.rb
@@ -81,7 +81,7 @@ module CouchRest
   class ModelRailtie
     config.action_dispatch.rescue_responses.merge!(
       'CouchRest::Model::DocumentNotFound' => :not_found,
-      'RestClient::ResourceNotFound' => :not_found
+      'CouchRest::NotFound' => :not_found
     )
   end
 end
diff --git a/vendor/gems/couchrest_session_store/lib/couchrest/model/database_method.rb b/vendor/gems/couchrest_session_store/lib/couchrest/model/database_method.rb
new file mode 100644
index 0000000..6ecc8f3
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/lib/couchrest/model/database_method.rb
@@ -0,0 +1,131 @@
+#
+# Allow setting the database to happen dynamically.
+#
+# Unlike normal CouchRest::Model, the database is not automatically created
+# unless you call database!()
+#
+# The method specified by `database_method` must exist as a class method but
+# may optionally also exist as an instance method.
+#
+
+module CouchRest
+  module Model
+    module DatabaseMethod
+      extend ActiveSupport::Concern
+
+      def database
+        if self.class.database_method
+          self.class.server.database(call_database_method)
+        else
+          self.class.database
+        end
+      end
+
+      def database!
+        if self.class.database_method
+          self.class.server.database!(call_database_method)
+        else
+          self.class.database!
+        end
+      end
+
+      def database_exists?(db_name)
+        self.class.database_exists?(db_name)
+      end
+
+      #
+      # The normal CouchRest::Model::Base comparison checks if the model's
+      # database objects are the same. That is not good for use here, since
+      # the objects will always be different. Instead, we compare the string
+      # that each database evaluates to.
+      #
+      def ==(other)
+        return false unless other.is_a?(Base)
+        if id.nil? && other.id.nil?
+          to_hash == other.to_hash
+        else
+          id == other.id && database.to_s == other.database.to_s
+        end
+      end
+      alias :eql? :==
+
+      protected
+
+      def call_database_method
+        if self.respond_to?(self.class.database_method)
+          name = self.send(self.class.database_method)
+          self.class.db_name_with_prefix(name)
+        else
+          self.class.send(:call_database_method)
+        end
+      end
+
+      module ClassMethods
+
+        def database_method(method = nil)
+          if method
+            @database_method = method
+          end
+          @database_method
+        end
+        alias :use_database_method :database_method
+
+        def database
+          if database_method
+            if !self.respond_to?(database_method)
+              raise ArgumentError.new("Incorrect argument to database_method(): no such method '#{method}' found in class #{self}.")
+            end
+            self.server.database(call_database_method)
+          else
+            @database ||= prepare_database(super)
+          end
+        end
+
+        def database!
+          if database_method
+            self.server.database!(call_database_method)
+          else
+            @database ||= prepare_database(super)
+          end
+        end
+
+        #
+        # same as database(), but allows for an argument that gets passed through to
+        # database method.
+        #
+        def choose_database(*args)
+          self.server.database(call_database_method(*args))
+        end
+
+        def db_name_with_prefix(name)
+          conf = self.send(:connection_configuration)
+          [conf[:prefix], name, conf[:suffix]].reject{|i|i.to_s.empty?}.join(conf[:join])
+        end
+
+        def database_exists?(name)
+          name = db_name_with_prefix(name)
+          begin
+            CouchRest.head "#{self.server.uri}/#{name}"
+            return true
+          rescue CouchRest::NotFound
+            return false
+          end
+        end
+
+        protected
+
+        def call_database_method(*args)
+          name = nil
+          method = self.method(database_method)
+          if method.arity == 0
+            name = method.call
+          else
+            name = method.call(*args)
+          end
+          db_name_with_prefix(name)
+        end
+
+      end
+    end
+  end
+end
diff --git a/vendor/gems/couchrest_session_store/lib/couchrest/model/rotation.rb b/vendor/gems/couchrest_session_store/lib/couchrest/model/rotation.rb
new file mode 100644
index 0000000..9e1a5c3
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/lib/couchrest/model/rotation.rb
@@ -0,0 +1,263 @@
+module CouchRest
+  module Model
+    module Rotation
+      extend ActiveSupport::Concern
+      include CouchRest::Model::DatabaseMethod
+
+      included do
+        use_database_method :rotated_database_name
+      end
+
+      def create(*args)
+        super(*args)
+      rescue CouchRest::NotFound => exc
+        raise storage_missing(exc)
+      end
+
+      def update(*args)
+        super(*args)
+      rescue CouchRest::NotFound => exc
+        raise storage_missing(exc)
+      end
+
+      def destroy(*args)
+        super(*args)
+      rescue CouchRest::NotFound => exc
+        raise storage_missing(exc)
+      end
+
+      private
+
+      # returns a special 'storage missing' exception when the db has
+      # not been created. very useful, since this happens a lot and a
+      # generic 404 is not that helpful.
+      def storage_missing(exc)
+        if exc.http_body =~ /no_db_file/
+          CouchRest::StorageMissing.new(exc.response, database)
+        else
+          exc
+        end
+      end
+
+      public
+
+      module ClassMethods
+        #
+        # Set up database rotation.
+        #
+        # base_name -- the name of the db before the rotation number is
+        # appended.
+        #
+        # options -- one of:
+        #
+        # * :every -- frequency of rotation
+        # * :expiration_field - what field to use to determine if a
+        #                       document is expired.
+        # * :timestamp_field - alternately, what field to use for the
+        #                      document timestamp.
+        # * :timeout -- used to expire documents with only a timestamp
+        #               field (in minutes)
+        #
+        def rotate_database(base_name, options={})
+          @rotation_base_name = base_name
+          @rotation_every = (options.delete(:every) || 30.days).to_i
+          @expiration_field = options.delete(:expiration_field)
+          @timestamp_field = options.delete(:timestamp_field)
+          @timeout = options.delete(:timeout)
+          if options.any?
+            raise ArgumentError.new('Could not understand options %s' % options.keys)
+          end
+        end
+
+        #
+        # Check to see if dbs should be rotated. The :window
+        # argument specifies how far in advance we should
+        # create the new database (default 1.day).
+        #
+        # This method relies on the assumption that it is called
+        # at least once within each @rotation_every period.
+        #
+        def rotate_database_now(options={})
+          window = options[:window] || 1.day
+
+          now = Time.now.utc
+          current_name = rotated_database_name(now)
+          current_count = now.to_i/@rotation_every
+
+          next_time = window.from_now.utc
+          next_name = rotated_database_name(next_time)
+          next_count = current_count+1
+
+          prev_name = current_name.sub(/(\d+)$/) {|i| i.to_i-1}
+          replication_started = false
+          old_name = prev_name.sub(/(\d+)$/) {|i| i.to_i-1} # even older than prev_name
+          trailing_edge_time = window.ago.utc
+
+          if !database_exists?(current_name)
+            # we should have created the current db earlier, but if somehow
+            # it is missing we must make sure it exists.
+            create_new_rotated_database(:from => prev_name, :to => current_name)
+            replication_started = true
+          end
+
+          if next_time.to_i/@rotation_every >= next_count && !database_exists?(next_name)
+            # time to create the next db in advance of actually needing it.
+            create_new_rotated_database(:from => current_name, :to => next_name)
+          end
+
+          if trailing_edge_time.to_i/@rotation_every == current_count
+            # delete old dbs, but only after window time has past since the last rotation
+            if !replication_started && database_exists?(prev_name)
+              # delete previous, but only if we didn't just start replicating from it
+              self.server.database(db_name_with_prefix(prev_name)).delete!
+            end
+            if database_exists?(old_name)
+              # there are some edge cases, when rotate_database_now is run
+              # infrequently, that an older db might be left around.
+              self.server.database(db_name_with_prefix(old_name)).delete!
+            end
+          end
+        end
+
+        def rotated_database_name(time=nil)
+          unless @rotation_base_name && @rotation_every
+            raise ArgumentError.new('missing @rotation_base_name or @rotation_every')
+          end
+          time ||= Time.now.utc
+          units = time.to_i / @rotation_every.to_i
+          "#{@rotation_base_name}_#{units}"
+        end
+
+        #
+        # create a new empty database.
+        #
+        def create_database!(name=nil)
+          db = if name
+            self.server.database!(db_name_with_prefix(name))
+          else
+            self.database!
+          end
+          create_rotation_filter(db)
+          if self.respond_to?(:design_doc)
+            design_doc.sync!(db)
+            # or maybe this?:
+            #self.design_docs.each do |design|
+            #  design.migrate(to_db)
+            #end
+          end
+          return db
+        end
+
+        protected
+
+        #
+        # Creates database named by options[:to]. Optionally, set up
+        # continuous replication from the options[:from] db, if it exists. The
+        # assumption is that the from db will be destroyed later, cleaning up
+        # the replication once it is no longer needed.
+        #
+        # This method will also copy design documents if present in the from
+        # db, in the CouchRest::Model, or in a database named after
+        # @rotation_base_name.
+        #
+        def create_new_rotated_database(options={})
+          from = options[:from]
+          to = options[:to]
+          to_db = self.create_database!(to)
+          if database_exists?(@rotation_base_name)
+            base_db = self.server.database(db_name_with_prefix(@rotation_base_name))
+            copy_design_docs(base_db, to_db)
+          end
+          if from && from != to && database_exists?(from)
+            from_db = self.server.database(db_name_with_prefix(from))
+            replicate_old_to_new(from_db, to_db)
+          end
+        end
+
+        def copy_design_docs(from, to)
+          params = {:startkey => '_design/', :endkey => '_design0', :include_docs => true}
+          from.documents(params) do |doc_hash|
+            design = doc_hash['doc']
+            begin
+              to.get(design['_id'])
+            rescue CouchRest::NotFound
+              design.delete('_rev')
+              to.save_doc(design)
+            end
+          end
+        end
+
+        def create_rotation_filter(db)
+          name = 'rotation_filter'
+          filter_string = if @expiration_field
+            NOT_EXPIRED_FILTER % {:expires => @expiration_field}
+          elsif @timestamp_field && @timeout
+            NOT_TIMED_OUT_FILTER % {:timestamp => @timestamp_field, :timeout => (60 * @timeout)}
+          else
+            NOT_DELETED_FILTER
+          end
+          filters = {"not_expired" => filter_string}
+          db.save_doc("_id" => "_design/#{name}", "filters" => filters)
+        rescue CouchRest::Conflict
+        end
+
+        #
+        # Replicates documents from_db to to_db, skipping documents that have
+        # expired or been deleted.
+        #
+        # NOTE: It would be better if we could do this:
+        #
+        #   from_db.replicate_to(to_db, true, false,
+        #     :filter => 'rotation_filter/not_expired')
+        #
+        # But replicate_to() does not support a filter argument, so we call
+        # the private method replication() directly.
+        #
+        def replicate_old_to_new(from_db, to_db)
+          create_rotation_filter(from_db)
+          from_db.send(:replicate, to_db, true, :source => from_db.name, :filter => 'rotation_filter/not_expired')
+        end
+
+        #
+        # Three different filters, depending on how the model is set up.
+        #
+        # NOT_EXPIRED_FILTER is used when there is a single field that
+        # contains an absolute time for when the document has expired. The
+        #
+        # NOT_TIMED_OUT_FILTER is used when there is a field that records the
+        # timestamp of the last time the document was used. The expiration in
+        # this case is calculated from the timestamp plus @timeout.
+        #
+        # NOT_DELETED_FILTER is used when the other two cannot be.
+        #
+        NOT_EXPIRED_FILTER = "" +
+%[function(doc, req) {
+  if (doc._deleted) {
+    return false;
+  } else if (typeof(doc.%{expires}) != "undefined") {
+    return Date.now() < (new Date(doc.%{expires})).getTime();
+  } else {
+    return true;
+  }
+}]
+
+        NOT_TIMED_OUT_FILTER = "" +
+%[function(doc, req) {
+  if (doc._deleted) {
+    return false;
+  } else if (typeof(doc.%{timestamp}) != "undefined") {
+    return Date.now() < (new Date(doc.%{timestamp})).getTime() + %{timeout};
+  } else {
+    return true;
+  }
+}]
+
+        NOT_DELETED_FILTER = "" +
+%[function(doc, req) {
+  return !doc._deleted;
+}]
+
+      end
+    end
+  end
+end
diff --git a/vendor/gems/couchrest_session_store/lib/couchrest/session/document.rb b/vendor/gems/couchrest_session_store/lib/couchrest/session/document.rb
new file mode 100644
index 0000000..b1e73cc
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/lib/couchrest/session/document.rb
@@ -0,0 +1,119 @@
+require 'couchrest/session/utility'
+require 'time'
+
+class CouchRest::Session::Document < CouchRest::Document
+  include CouchRest::Model::Configuration
+  include CouchRest::Model::Connection
+  include CouchRest::Session::Utility
+  include CouchRest::Model::Rotation
+
+  rotate_database 'sessions',
+    :every => 1.month, :expiration_field => :expires
+
+  def self.fetch(sid)
+    self.allocate.tap do |session_doc|
+      session_doc.fetch(sid)
+    end
+  end
+
+  def self.build(sid, session, options = {})
+    self.new(CouchRest::Document.new({"_id" => sid})).tap do |session_doc|
+      session_doc.update session, options
+    end
+  end
+
+  def self.build_or_update(sid, session, options = {})
+    options[:marshal_data] = true if options[:marshal_data].nil?
+    doc = self.fetch(sid)
+    doc.update(session, options)
+    return doc
+  rescue CouchRest::NotFound
+    self.build(sid, session, options)
+  end
+
+  def self.find_by_expires(options = {})
+    options[:reduce] ||= false
+    design = database.get '_design/Session'
+    response = design.view :by_expires, options
+    response['rows']
+  end
+
+  def self.create_database!(name=nil)
+    db = super(name)
+    begin
+      db.get('_design/Session')
+    rescue CouchRest::NotFound
+      design = File.read(File.expand_path('../../../../design/Session.json', __FILE__))
+      design = JSON.parse(design)
+      db.save_doc(design.merge({"_id" => "_design/Session"}))
+    end
+    db
+  end
+
+  def initialize(doc)
+    @doc = doc
+  end
+
+  def fetch(sid = nil)
+    @doc = database.get(sid || doc['_id'])
+  end
+
+  def to_session
+    if doc["marshalled"]
+      session = unmarshal(doc["data"])
+    else
+      session = doc["data"]
+    end
+    return session
+  end
+
+  def delete
+    database.delete_doc(doc)
+  end
+
+  def update(session, options)
+    # clean up old data but leave id and revision intact
+    doc.reject! do |k,v|
+      k[0] != '_'
+    end
+    doc.merge! data_for_doc(session, options)
+  end
+
+  def save
+    database.save_doc(doc)
+  rescue CouchRest::Conflict
+    fetch
+    retry
+  rescue CouchRest::NotFound => exc
+    if exc.http_body =~ /no_db_file/
+      exc = CouchRest::StorageMissing.new(exc.response, database)
+    end
+    raise exc
+  end
+
+  def expired?
+    expires && expires < Time.now
+  end
+
+  protected
+
+  def data_for_doc(session, options)
+    { "data" => options[:marshal_data] ? marshal(session) : session,
+      "marshalled" => options[:marshal_data],
+      "expires" => expiry_from_options(options) }
+  end
+
+  def expiry_from_options(options)
+    expire_after = options[:expire_after]
+    expire_after && (Time.now + expire_after).utc
+  end
+
+  def expires
+    doc["expires"] && Time.iso8601(doc["expires"])
+  end
+
+  def doc
+    @doc
+  end
+
+end
diff --git a/vendor/gems/couchrest_session_store/lib/couchrest/session/store.rb b/vendor/gems/couchrest_session_store/lib/couchrest/session/store.rb
new file mode 100644
index 0000000..f209f54
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/lib/couchrest/session/store.rb
@@ -0,0 +1,94 @@
+class CouchRest::Session::Store < ActionDispatch::Session::AbstractStore
+
+  # delegate configure to document
+  def self.configure(*args, &block)
+    CouchRest::Session::Document.configure *args, &block
+  end
+
+  def self.set_options(options)
+    @options = options
+    if @options[:database]
+      CouchRest::Session::Document.use_database @options[:database]
+    end
+  end
+
+  def initialize(app, options = {})
+    super
+    self.class.set_options(options)
+  end
+
+  def cleanup(rows)
+    rows.each do |row|
+      doc = CouchRest::Session::Document.fetch(row['id'])
+      doc.delete
+    end
+  end
+
+  def expired
+    CouchRest::Session::Document.find_by_expires startkey: 1,
+      endkey: Time.now.utc.iso8601
+  end
+
+  def never_expiring
+    CouchRest::Session::Document.find_by_expires endkey: 1
+  end
+
+  private
+
+  def get_session(env, sid)
+    if session = fetch_session(sid)
+      [sid, session]
+    else
+      [generate_sid, {}]
+    end
+  rescue CouchRest::NotFound
+    # session data does not exist anymore
+    return [sid, {}]
+  rescue CouchRest::Unauthorized,
+    Errno::EHOSTUNREACH,
+    Errno::ECONNREFUSED => e
+    # can't connect to couch. We add some status to the session
+    # so the app can react. (Display error for example)
+    return [sid, {"_status" => {"couch" => "unreachable"}}]
+  end
+
+  def set_session(env, sid, session, options)
+    raise CouchRest::NotFound if /^_design\/(.*)/ =~ sid
+    doc = build_or_update_doc(sid, session, options)
+    doc.save
+    return sid
+  # if we can't store the session we just return false.
+  rescue CouchRest::Unauthorized,
+    Errno::EHOSTUNREACH,
+    Errno::ECONNREFUSED => e
+    return false
+  end
+
+  def destroy_session(env, sid, options)
+    doc = secure_get(sid)
+    doc.delete
+    generate_sid unless options[:drop]
+  rescue CouchRest::NotFound
+    # already destroyed - we're done.
+    generate_sid unless options[:drop]
+  end
+
+  def fetch_session(sid)
+    return nil unless sid
+    doc = secure_get(sid)
+    doc.to_session unless doc.expired?
+  end
+
+  def build_or_update_doc(sid, session, options)
+    CouchRest::Session::Document.build_or_update(sid, session, options)
+  end
+
+  # prevent access to design docs
+  # this should be prevented on a couch permission level as well.
+  # but better be save than sorry.
+  def secure_get(sid)
+    raise CouchRest::NotFound if /^_design\/(.*)/ =~ sid
+    CouchRest::Session::Document.fetch(sid)
+  end
+
+end
diff --git a/vendor/gems/couchrest_session_store/test/database_method_test.rb b/vendor/gems/couchrest_session_store/test/database_method_test.rb
new file mode 100644
index 0000000..18985c3
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/test/database_method_test.rb
@@ -0,0 +1,116 @@
+require_relative 'test_helper'
+
+class DatabaseMethodTest < MiniTest::Test
+
+  class TestModel < CouchRest::Model::Base
+    include CouchRest::Model::DatabaseMethod
+
+    use_database_method :db_name
+    property :dbname, String
+    property :confirm, String
+
+    def db_name
+      "test_db_#{self[:dbname]}"
+    end
+  end
+
+  def test_instance_method
+    doc1 = TestModel.new({:dbname => 'one'})
+    doc1.database.create!
+    assert doc1.database.root.ends_with?('test_db_one')
+    assert doc1.save
+    doc1.update_attributes(:confirm => 'yep')
+
+    doc2 = TestModel.new({:dbname => 'two'})
+    doc2.database.create!
+    assert doc2.database.root.ends_with?('test_db_two')
+    assert doc2.save
+    doc2.confirm = 'sure'
+    doc2.save!
+
+    doc1_copy = CouchRest.get([doc1.database.root, doc1.id].join('/'))
+    assert_equal "yep", doc1_copy["confirm"]
+
+    doc2_copy = CouchRest.get([doc2.database.root, doc2.id].join('/'))
+    assert_equal "sure", doc2_copy["confirm"]
+
+    doc1.database.delete!
+    doc2.database.delete!
+  end
+
+  def test_switch_db
+    doc_red = TestModel.new({:dbname => 'red', :confirm => 'rose'})
+    doc_red.database.create!
+    root = doc_red.database.root
+
+    doc_blue = doc_red.clone
+    doc_blue.dbname = 'blue'
+    doc_blue.database!
+    doc_blue.save!
+
+    doc_blue_copy = CouchRest.get([root.sub('red','blue'), doc_blue.id].join('/'))
+    assert_equal "rose", doc_blue_copy["confirm"]
+
+    doc_red.database.delete!
+    doc_blue.database.delete!
+  end
+
+  #
+  # A test scenario for database_method in which some user accounts
+  # are stored in a seperate temporary database (so that the test
+  # accounts don't bloat the normal database).
+  #
+
+  class User < CouchRest::Model::Base
+    include CouchRest::Model::DatabaseMethod
+
+    use_database_method :db_name
+    property :login, String
+    before_save :create_db
+
+    class << self
+      def get(id, db = database)
+        result = super(id, db)
+        if result.nil?
+          return super(id, choose_database('test-user'))
+        else
+          return result
+        end
+      end
+      alias :find :get
+    end
+
+    protected
+
+    def self.db_name(login = nil)
+      if !login.nil? && login =~ /test-user/
+        'tmp_users'
+      else
+        'users'
+      end
+    end
+
+    def db_name
+      self.class.db_name(self.login)
+    end
+
+    def create_db
+      unless database_exists?(db_name)
+        self.database!
+      end
+    end
+
+  end
+
+  def test_tmp_user_db
+    user1 = User.new({:login => 'test-user-1'})
+    assert user1.save
+    assert User.find(user1.id), 'should find user in tmp_users'
+    assert_equal user1.login, User.find(user1.id).login
+    assert_equal 'test-user-1', User.server.database('couchrest_tmp_users').get(user1.id)['login']
+    assert_raises CouchRest::NotFound do
+      User.server.database('couchrest_users').get(user1.id)
+    end
+  end
+
+end
diff --git a/vendor/gems/couchrest_session_store/test/session_store_test.rb b/vendor/gems/couchrest_session_store/test/session_store_test.rb
new file mode 100644
index 0000000..4fbf30b
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/test/session_store_test.rb
@@ -0,0 +1,168 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+
+class SessionStoreTest < MiniTest::Test
+
+  def test_session_initialization
+    sid, session = store.send :get_session, env, nil
+    assert sid
+    assert_equal Hash.new, session
+  end
+
+  def test_normal_session_flow
+    sid, session = never_expiring_session
+    assert_equal [sid, session], store.send(:get_session, env, sid)
+    store.send :destroy_session, env, sid, {}
+  end
+
+  def test_updating_session
+    sid, session = never_expiring_session
+    session[:bla] = "blub"
+    store.send :set_session, env, sid, session, {}
+    assert_equal [sid, session], store.send(:get_session, env, sid)
+    store.send :destroy_session, env, sid, {}
+  end
+
+  def test_prevent_access_to_design_docs
+    sid = '_design/bla'
+    session = {views: 'my hacked view'}
+    assert_raises CouchRest::NotFound do
+      store_session(sid, session)
+    end
+  end
+
+  def test_unmarshalled_session_flow
+    sid, session = init_session
+    store_session sid, session, :marshal_data => false
+    new_sid, new_session = store.send(:get_session, env, sid)
+    assert_equal sid, new_sid
+    assert_equal session[:key], new_session["key"]
+    store.send :destroy_session, env, sid, {}
+  end
+
+  def test_unmarshalled_data
+    sid, session = init_session
+    store_session sid, session, :marshal_data => false
+    couch = CouchTester.new
+    data = couch.get(sid)["data"]
+    assert_equal session[:key], data["key"]
+  end
+
+  def test_logout_in_between
+    sid, session = never_expiring_session
+    store.send :destroy_session, env, sid, {}
+    other_sid, other_session = store.send(:get_session, env, sid)
+    assert_equal Hash.new, other_session
+  end
+
+  def test_can_logout_twice
+    sid, session = never_expiring_session
+    store.send :destroy_session, env, sid, {}
+    store.send :destroy_session, env, sid, {}
+    other_sid, other_session = store.send(:get_session, env, sid)
+    assert_equal Hash.new, other_session
+  end
+
+  def test_stored_and_not_expired_yet
+    sid, session = expiring_session
+    doc = CouchRest::Session::Document.fetch(sid)
+    expires = doc.send :expires
+    assert expires
+    assert !doc.expired?
+    assert (expires - Time.now) > 0, "Exiry should be in the future"
+    assert (expires - Time.now) <= 300, "Should expire after 300 seconds - not more"
+    assert_equal [sid, session], store.send(:get_session, env, sid)
+  end
+
+  def test_stored_but_expired
+    sid, session = expired_session
+    other_sid, other_session = store.send(:get_session, env, sid)
+    assert_equal Hash.new, other_session, "session should have expired"
+    assert other_sid != sid
+  end
+
+  def test_find_expired_sessions
+    expired, expiring, never_expiring = seed_sessions
+    expired_session_ids = store.expired.map {|row| row['id']}
+    assert expired_session_ids.include?(expired)
+    assert !expired_session_ids.include?(expiring)
+    assert !expired_session_ids.include?(never_expiring)
+  end
+
+  def test_find_never_expiring_sessions
+    expired, expiring, never_expiring = seed_sessions
+    never_expiring_session_ids = store.never_expiring.map {|row| row['id']}
+    assert never_expiring_session_ids.include?(never_expiring)
+    assert !never_expiring_session_ids.include?(expiring)
+    assert !never_expiring_session_ids.include?(expired)
+  end
+
+  def test_cleanup_expired_sessions
+    sid, session = expired_session
+    store.cleanup(store.expired)
+    assert_raises CouchRest::NotFound do
+      CouchTester.new.get(sid)
+    end
+  end
+
+  def test_keep_fresh_during_cleanup
+    sid, session = expiring_session
+    store.cleanup(store.expired)
+    assert_equal [sid, session], store.send(:get_session, env, sid)
+  end
+
+  def test_store_without_expiry
+    sid, session = never_expiring_session
+    couch = CouchTester.new
+    assert_nil couch.get(sid)["expires"]
+    assert_equal [sid, session], store.send(:get_session, env, sid)
+  end
+
+  def app
+    nil
+  end
+
+  def store(options = {})
+    @store ||= CouchRest::Session::Store.new(app, options)
+  end
+
+  def env(settings = {})
+    env ||= settings
+  end
+
+  # returns the session ids of an expired, and expiring and a never
+  # expiring session
+  def seed_sessions
+    [expired_session, expiring_session, never_expiring_session].map(&:first)
+  end
+
+  def never_expiring_session
+    store_session *init_session
+  end
+
+  def expiring_session
+    sid, session = init_session
+    store_session(sid, session, expire_after: 300)
+  end
+
+  def expired_session
+    expire_session *expiring_session
+  end
+
+  def init_session
+    sid, session = store.send :get_session, env, nil
+    session[:key] = "stub"
+    return sid, session
+  end
+
+  def store_session(sid, session, options = {})
+    store.send :set_session, env, sid, session, options
+    return sid, session
+  end
+
+  def expire_session(sid, session)
+    CouchTester.new.update sid,
+      "expires" => (Time.now - 10.minutes).utc.iso8601
+    return sid, session
+  end
+
+end
-- 
cgit v1.2.3


From 16da29309cdb117e2ac40eb93286fc265c3135d5 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Wed, 23 Mar 2016 21:53:29 +0100
Subject: vendoring couchrest session store for development

0.4.0 has not been released yet. But travis needs it to run.

So i vendor it for now. Will remove it again when the build is getting stable.
---
 Gemfile.lock                                       |   8 ++
 Gemfile.orig                                       | 119 ------------------
 vendor/gems/couchrest_session_store/.ruby-version  |   1 +
 vendor/gems/couchrest_session_store/.travis.yml    |   6 +
 vendor/gems/couchrest_session_store/Gemfile        |   7 ++
 vendor/gems/couchrest_session_store/README.md      | 133 +++++++++++++++++++++
 vendor/gems/couchrest_session_store/Rakefile       |   9 ++
 .../couchrest_session_store.gemspec                |  25 ++++
 .../couchrest_session_store/design/Session.json    |   8 ++
 .../lib/couchrest/session.rb                       |  15 +++
 .../lib/couchrest/session/utility.rb               |  12 ++
 .../lib/couchrest_session_store.rb                 |  11 ++
 .../couchrest_session_store/test/couch_tester.rb   |  27 +++++
 .../test/database_rotation_test.rb                 |  88 ++++++++++++++
 .../test/session_document_test.rb                  |  27 +++++
 .../couchrest_session_store/test/setup_couch.sh    |   7 ++
 .../couchrest_session_store/test/stress_test.rb    |  51 ++++++++
 .../couchrest_session_store/test/test_clock.rb     |  12 ++
 .../couchrest_session_store/test/test_helper.rb    |   9 ++
 19 files changed, 456 insertions(+), 119 deletions(-)
 delete mode 100644 Gemfile.orig
 create mode 100644 vendor/gems/couchrest_session_store/.ruby-version
 create mode 100644 vendor/gems/couchrest_session_store/.travis.yml
 create mode 100644 vendor/gems/couchrest_session_store/Gemfile
 create mode 100644 vendor/gems/couchrest_session_store/README.md
 create mode 100644 vendor/gems/couchrest_session_store/Rakefile
 create mode 100644 vendor/gems/couchrest_session_store/couchrest_session_store.gemspec
 create mode 100644 vendor/gems/couchrest_session_store/design/Session.json
 create mode 100644 vendor/gems/couchrest_session_store/lib/couchrest/session.rb
 create mode 100644 vendor/gems/couchrest_session_store/lib/couchrest/session/utility.rb
 create mode 100644 vendor/gems/couchrest_session_store/lib/couchrest_session_store.rb
 create mode 100644 vendor/gems/couchrest_session_store/test/couch_tester.rb
 create mode 100644 vendor/gems/couchrest_session_store/test/database_rotation_test.rb
 create mode 100644 vendor/gems/couchrest_session_store/test/session_document_test.rb
 create mode 100755 vendor/gems/couchrest_session_store/test/setup_couch.sh
 create mode 100644 vendor/gems/couchrest_session_store/test/stress_test.rb
 create mode 100644 vendor/gems/couchrest_session_store/test/test_clock.rb
 create mode 100644 vendor/gems/couchrest_session_store/test/test_helper.rb

diff --git a/Gemfile.lock b/Gemfile.lock
index 0d18875..78f3ea2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -22,6 +22,14 @@ PATH
     common_languages (0.0.1)
       i18n
 
+PATH
+  remote: vendor/gems/couchrest_session_store
+  specs:
+    couchrest_session_store (0.4.0)
+      actionpack (~> 4.0)
+      couchrest
+      couchrest_model
+
 GEM
   remote: https://rubygems.org/
   specs:
diff --git a/Gemfile.orig b/Gemfile.orig
deleted file mode 100644
index b7e83aa..0000000
--- a/Gemfile.orig
+++ /dev/null
@@ -1,119 +0,0 @@
-source 'https://rubygems.org'
-
-require File.expand_path('../lib/gemfile_tools.rb', __FILE__)
-
-## CORE
-# rake 11.x throws lots of warnings about rails 3.2 code
-gem "rake"
-gem "rails", "~> 4.2.6"
-gem "couchrest", "~> 1.1.3"
-gem "couchrest_model", "~> 2.0.0"
-if ARGV.grep(/assets:precompile/).empty?
-<<<<<<< HEAD
-  gem "couchrest_session_store", "= 0.3.1"
-=======
-  gem "couchrest_session_store", "= 0.4.0",
-    path: '../couchrest_session_store'
->>>>>>> upgrade: use recent gems - broken
-end
-
-## AUTHENTICATION
-gem "ruby-srp", "~> 0.2.1"
-gem "rails_warden"
-
-## CRYPTO
-# we need certificate_authority v2.0, but was never released to rubygems,
-# and travis does not work well with github sources, so vendored here:
-gem 'certificate_authority', :path => 'vendor/gems/certificate_authority'
-
-## LOCALIZATION
-gem 'http_accept_language'
-gem 'rails-i18n'  # locale files for built-in validation messages and times
-                  # https://github.com/svenfuchs/rails-i18n
-                  # for a list of keys:
-                  # https://github.com/svenfuchs/rails-i18n/blob/master/rails/locale/en.yml
-gem 'common_languages', :path => 'vendor/gems/common_languages'
-
-## VIEWS
-gem 'kaminari'
-gem 'rdiscount'   # for rendering .md templates
-
-## ASSETS
-gem "jquery-rails"
-gem "simple_form"
-gem 'client_side_validations'
-gem 'client_side_validations-simple_form'
-gem "haml-rails"
-gem "bootstrap-sass"
-gem "sass-rails"
-gem 'quiet_assets'            # stops logging all the asset requests
-group :production do
-  gem "uglifier"
-  gem 'therubyracer', :platforms => :ruby
-  #    ^^ See https://github.com/sstephenson/execjs#readme
-  #      for list of supported runtimes.
-end
-
-##
-## ENVIRONMENT SPECIFIC GEMS
-##
-
-group :test do
-  # integration testing
-  gem 'capybara', require: false
-  gem 'poltergeist'         # headless js
-  gem 'launchy'             # save_and_open_page
-  gem 'phantomjs-binaries'  # binaries specific to the os
-
-  # moching and stubbing
-  gem 'mocha', :require => false
-  gem 'minitest-stub-const' # why?
-
-  # generating test data
-  gem 'factory_girl_rails'  # test data factories
-  gem 'faker'               # names and numbers for test data
-
-  # billing tests
-  gem 'fake_braintree', require: false
-
-  # we use cucumber to document and test the api
-  gem 'cucumber-rails', require: false
-end
-
-group :test, :development do
-  gem 'thin'
-  gem 'i18n-missing_translations'
-  gem 'pry'
-end
-
-group :production do
-  gem 'SyslogLogger', '~> 2.0'
-end
-
-group :development do
-  gem "better_errors"
-  gem "binding_of_caller"
-end
-
-group :test, :debug do
-  # bundler on jessie doesn't support `:platforms => :ruby_21`
-  gem 'byebug'
-end
-
-##
-## OPTIONAL GEMS AND ENGINES
-##
-
-enabled_engines.each do |name, gem_info|
-  gem gem_info[:name], :path => gem_info[:path], :groups => gem_info[:env]
-end
-
-custom_gems.each do |name, gem_info|
-  gem gem_info[:name], :path => gem_info[:path]
-end
-
-##
-## DEPENDENCIES FOR OPTIONAL ENGINES
-##
-
-gem 'valid_email' # used by leap_web_help
diff --git a/vendor/gems/couchrest_session_store/.ruby-version b/vendor/gems/couchrest_session_store/.ruby-version
new file mode 100644
index 0000000..f3a9c9a
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/.ruby-version
@@ -0,0 +1 @@
+1.9.3-p194
diff --git a/vendor/gems/couchrest_session_store/.travis.yml b/vendor/gems/couchrest_session_store/.travis.yml
new file mode 100644
index 0000000..073d421
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/.travis.yml
@@ -0,0 +1,6 @@
+services:
+  - couchdb
+notifications:
+  email: false
+before_script:
+  - "test/setup_couch.sh"
diff --git a/vendor/gems/couchrest_session_store/Gemfile b/vendor/gems/couchrest_session_store/Gemfile
new file mode 100644
index 0000000..88b81a0
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/Gemfile
@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in couchrest-session-store.gemspec
+gemspec
+
+gem 'debugger'
+
diff --git a/vendor/gems/couchrest_session_store/README.md b/vendor/gems/couchrest_session_store/README.md
new file mode 100644
index 0000000..60e692e
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/README.md
@@ -0,0 +1,133 @@
+# CouchRest::Session::Store #
+
+A simple session store based on CouchRest Model.
+
+## Setup ##
+
+`CouchRest::Session::Store` will automatically pick up the config/couch.yml
+file used by CouchRest Model.
+
+Cleaning up sessions requires a design document in the sessions database that
+enables querying by expiry. See `design/Session.json` for an example. This
+design document is loaded for tests, but you will need to load it on your own
+in a production environment. For example:
+
+    curl -X PUT username:password@localhost:5984/couchrest_sessions/_design/Session --data @design/Session.json
+
+## Options ##
+
+* marshal_data: (_defaults true_) - if set to false session data will be stored
+  directly in the couch document. Otherwise it's marshalled and base64 encoded
+  to enable restoring ruby data structures.
+* database: database to use combined with config prefix and suffix
+* expire_after: lifetime of a session in seconds.
+
+## Dynamic Databases ##
+
+This gem also includes the module `CouchRest::Model::DatabaseMethod`, which
+allow a Model to dynamically choose what database to use.
+
+An example of specifying database dynamically:
+
+    class Token < CouchRest::Model::Base
+      include CouchRest::Model::DatabaseMethod
+
+      use_database_method :database_name
+
+      def self.database_name
+        time = Time.now.utc
+        "tokens_#{time.year}_#{time.month}"
+      end
+    end
+
+A couple notes:
+
+Once you include `CouchRest::Model::DatabaseMethod`, the database is no longer
+automatically created. In this example, you would need to run
+`Token.database.create!` or `Token.database!` in order to create the database.
+
+The symbol passed to `database_method` must match the name of a class method,
+but if there is also an instance method with the same name then this instance
+method will be called when appropriate. To state the obvious, tread lightly:
+there be dragons when generating database names that depend on properties of
+the instance.
+
+## Database Rotation ##
+
+The module `CouchRest::Model::Rotation` can be included in a Model in
+order to use dynamic databases to perform database rotation.
+
+CouchDB is not good for ephemeral data because old documents are never really
+deleted: when you deleted a document, it just appends a new revision. The bulk
+of the old data is not stored, but it does store a record for each doc id and
+revision id for the document. In the case of ephemeral data, like tokens,
+sessions, or statistics, this will quickly bloat the database with a ton of
+useless deleted documents. The proper solution is to rotate the databases:
+create a new one regularly and delete the old one entirely. This will allow
+you to recover the storage space.
+
+A better solution might be to just use a different database for all
+ephemeral data, like MariaDB or Redis. But, if you really want to use CouchDB, this
+is how you can do it.
+
+An example of specifying database rotation:
+
+    class Token < CouchRest::Model::Base
+      include CouchRest::Model::Rotation
+
+      rotate_database 'tokens', :every => 30.days
+    end
+
+Then, in a task triggered by a cron job:
+
+    CouchRest::Model::Base.configure do |conf|
+      conf.environment = Rails.env
+      conf.connection_config_file = File.join(Rails.root, 'config', 'couchdb.admin.yml')
+    end
+    Token.rotate_database_now(:window => 1.day)
+
+Or perhaps:
+
+    Rails.application.eager_load!
+    CouchRest::Model::Rotation.descendants.each do |model|
+      model.rotate_database_now
+    end
+
+The `:window` argument to `rotate_database_now` specifies how far in advance we
+should create the new database (default 1.day). For ideal behavior, this value
+should be GREATER than or equal to the frequency with which the cron job is
+run. For example, if the cron job is run every hour, the argument can be
+`1.hour`, `2.hours`, `1.day`, but not `20.minutes`.
+
+The method `rotate_database_now` will do nothing if the database has already
+been rotated. Otherwise, as needed, it will create the new database, create
+the design documents, set up replication between the old and new databases,
+and delete the old database (once it is not used anymore).
+
+These actions will require admin access, so if your application normally runs
+without admin rights you will need specify a different configuration for
+CouchRest::Model before `rotate_database_now` is called.
+
+Known issues:
+
+* If you change the rotation period, there will be a break in the rotation
+  (old documents will not get replicated to the new rotated db) and the old db
+  will not get automatically deleted.
+
+* Calling `Model.database.delete!` will not necessarily remove all the
+  relevant databases because of the way prior and future databases are kept
+  for the 'window' period.
+
+## Changes ##
+
+0.3.0
+
+* Added support for dynamic and rotating databases.
+
+0.2.4
+
+* Do not crash if can't connect to CouchDB
+
+0.2.3
+
+* Better retry and conflict catching.d
\ No newline at end of file
diff --git a/vendor/gems/couchrest_session_store/Rakefile b/vendor/gems/couchrest_session_store/Rakefile
new file mode 100644
index 0000000..8e1dc9c
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/Rakefile
@@ -0,0 +1,9 @@
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
+require 'rake/testtask'
+
+task default: [:test]
+
+Rake::TestTask.new do |t|
+  t.pattern = "test/*_test.rb"
+end
diff --git a/vendor/gems/couchrest_session_store/couchrest_session_store.gemspec b/vendor/gems/couchrest_session_store/couchrest_session_store.gemspec
new file mode 100644
index 0000000..bf3b2b2
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/couchrest_session_store.gemspec
@@ -0,0 +1,25 @@
+# _*_ encoding: utf-8 -*-
+
+Gem::Specification.new do |gem|
+
+  gem.authors = ["Azul"]
+  gem.email = ["azul@leap.se"]
+  gem.summary = "A Rails Session Store based on CouchRest Model"
+  gem.description = gem.summary
+  gem.homepage = "http://github.com/azul/couchrest_session_store"
+
+  gem.has_rdoc = true
+#  gem.extra_rdoc_files = ["LICENSE"]
+
+  gem.files = `git ls-files`.split("\n")
+  gem.name = "couchrest_session_store"
+  gem.require_paths = ["lib"]
+  gem.version = '0.4.0'
+
+  gem.add_dependency "couchrest"
+  gem.add_dependency "couchrest_model"
+  gem.add_dependency "actionpack", '~> 4.0'
+
+  gem.add_development_dependency "minitest"
+  gem.add_development_dependency "rake"
+end
diff --git a/vendor/gems/couchrest_session_store/design/Session.json b/vendor/gems/couchrest_session_store/design/Session.json
new file mode 100644
index 0000000..7020278
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/design/Session.json
@@ -0,0 +1,8 @@
+{
+   "views": {
+       "by_expires": {
+           "reduce": "_sum",
+           "map": "function(doc) {\n  if(typeof doc.expires !== \"undefined\") {\n    emit(doc.expires, 1);\n  }\n}\n"
+       }
+   }
+}
diff --git a/vendor/gems/couchrest_session_store/lib/couchrest/session.rb b/vendor/gems/couchrest_session_store/lib/couchrest/session.rb
new file mode 100644
index 0000000..430732c
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/lib/couchrest/session.rb
@@ -0,0 +1,15 @@
+module CouchRest
+
+  class StorageMissing < Exception
+    attr_reader :db
+    def initialize(request, db)
+      super(request)
+      @db = db.name
+      @message = "The database '#{db}' does not exist."
+    end
+  end
+
+  module Session
+  end
+end
+
diff --git a/vendor/gems/couchrest_session_store/lib/couchrest/session/utility.rb b/vendor/gems/couchrest_session_store/lib/couchrest/session/utility.rb
new file mode 100644
index 0000000..3982c28
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/lib/couchrest/session/utility.rb
@@ -0,0 +1,12 @@
+module CouchRest::Session::Utility
+  module_function
+
+  def marshal(data)
+    ::Base64.encode64(Marshal.dump(data)) if data
+  end
+
+  def unmarshal(data)
+    Marshal.load(::Base64.decode64(data)) if data
+  end
+
+end
diff --git a/vendor/gems/couchrest_session_store/lib/couchrest_session_store.rb b/vendor/gems/couchrest_session_store/lib/couchrest_session_store.rb
new file mode 100644
index 0000000..78c6a25
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/lib/couchrest_session_store.rb
@@ -0,0 +1,11 @@
+require 'couchrest'
+require 'couchrest_model'
+# ensure compatibility with couchrest_model
+gem 'actionpack', '~> 4.0'
+require 'action_dispatch'
+
+require 'couchrest/model/database_method'
+require 'couchrest/model/rotation'
+require 'couchrest/session'
+require 'couchrest/session/store'
+require 'couchrest/session/document'
diff --git a/vendor/gems/couchrest_session_store/test/couch_tester.rb b/vendor/gems/couchrest_session_store/test/couch_tester.rb
new file mode 100644
index 0000000..b623044
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/test/couch_tester.rb
@@ -0,0 +1,27 @@
+#
+# Access the couch directly so we can test its state without relying
+# on the SessionStore
+#
+
+class CouchTester < CouchRest::Document
+  include CouchRest::Model::Configuration
+  include CouchRest::Model::Connection
+  include CouchRest::Model::Rotation
+
+  rotate_database 'sessions',
+    :every => 1.month, :expiration_field => :expires
+
+  def initialize(options = {})
+  end
+
+  def get(sid)
+    database.get(sid)
+  end
+
+  def update(sid, diff)
+    doc = database.get(sid)
+    doc.merge! diff
+    database.save_doc(doc)
+  end
+
+end
diff --git a/vendor/gems/couchrest_session_store/test/database_rotation_test.rb b/vendor/gems/couchrest_session_store/test/database_rotation_test.rb
new file mode 100644
index 0000000..856db11
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/test/database_rotation_test.rb
@@ -0,0 +1,88 @@
+require_relative 'test_helper'
+
+class RotationTest < MiniTest::Test
+
+  class Token < CouchRest::Model::Base
+    include CouchRest::Model::Rotation
+    property :token, String
+    rotate_database 'test_rotate', :every => 1.day
+  end
+
+  TEST_DB_RE = /test_rotate_\d+/
+
+  def test_rotate
+    delete_all_dbs
+    doc = nil
+    original_name = nil
+    next_db_name = nil
+
+    Time.stub :now, Time.gm(2015,3,7,0) do
+      Token.create_database!
+      doc = Token.create!(:token => 'aaaa')
+      original_name = Token.rotated_database_name
+      assert database_exists?(original_name)
+      assert_equal 1, count_dbs
+    end
+
+    # do nothing yet
+    Time.stub :now, Time.gm(2015,3,7,22) do
+      Token.rotate_database_now(:window => 1.hour)
+      assert_equal original_name, Token.rotated_database_name
+      assert_equal 1, count_dbs
+    end
+
+    # create next db, but don't switch yet.
+    Time.stub :now, Time.gm(2015,3,7,23) do
+      Token.rotate_database_now(:window => 1.hour)
+      assert_equal 2, count_dbs
+      next_db_name = Token.rotated_database_name(Time.gm(2015,3,8))
+      assert original_name != next_db_name
+      assert database_exists?(next_db_name)
+      sleep 0.2 # allow time for documents to replicate
+      assert_equal(
+        Token.get(doc.id).token,
+        Token.get(doc.id, database(next_db_name)).token
+      )
+    end
+
+    # use next db
+    Time.stub :now, Time.gm(2015,3,8) do
+      Token.rotate_database_now(:window => 1.hour)
+      assert_equal 2, count_dbs
+      assert_equal next_db_name, Token.rotated_database_name
+      token = Token.get(doc.id)
+      token.update_attributes(:token => 'bbbb')
+      assert_equal 'bbbb', Token.get(doc.id).token
+      assert_equal 'aaaa', Token.get(doc.id, database(original_name)).token
+    end
+
+    # delete prior db
+    Time.stub :now, Time.gm(2015,3,8,1) do
+      Token.rotate_database_now(:window => 1.hour)
+      assert_equal 1, count_dbs
+    end
+  end
+
+  private
+
+  def database(db_name)
+    Token.server.database(Token.db_name_with_prefix(db_name))
+  end
+
+  def database_exists?(dbname)
+    Token.database_exists?(dbname)
+  end
+
+  def delete_all_dbs(regexp=TEST_DB_RE)
+    Token.server.databases.each do |db|
+      if regexp.match(db)
+        Token.server.database(db).delete!
+      end
+    end
+  end
+
+  def count_dbs(regexp=TEST_DB_RE)
+    Token.server.databases.grep(regexp).count
+  end
+
+end
diff --git a/vendor/gems/couchrest_session_store/test/session_document_test.rb b/vendor/gems/couchrest_session_store/test/session_document_test.rb
new file mode 100644
index 0000000..2125d10
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/test/session_document_test.rb
@@ -0,0 +1,27 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+
+class SessionDocumentTest < MiniTest::Test
+
+  def test_storing_session
+    sid = '1234'
+    session = {'a' => 'b'}
+    options = {}
+    doc = CouchRest::Session::Document.build_or_update(sid, session, options)
+    doc.save
+    doc.fetch(sid)
+    assert_equal session, doc.to_session
+  end
+
+  def test_storing_session_with_conflict
+    sid = '1234'
+    session = {'a' => 'b'}
+    options = {}
+    doc = CouchRest::Session::Document.build_or_update(sid, session, options)
+    doc2 = CouchRest::Session::Document.build_or_update(sid, session, options)
+    doc.save
+    doc2.save
+    doc2.fetch(sid)
+    assert_equal session, doc2.to_session
+  end
+
+end
diff --git a/vendor/gems/couchrest_session_store/test/setup_couch.sh b/vendor/gems/couchrest_session_store/test/setup_couch.sh
new file mode 100755
index 0000000..731534b
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/test/setup_couch.sh
@@ -0,0 +1,7 @@
+HOST="http://localhost:5984"
+echo "couch version :"
+curl -X GET $HOST
+
+curl -X PUT $HOST/couchrest_sessions
+curl -X PUT $HOST/couchrest_sessions/_design/Session --data @design/Session.json
+
diff --git a/vendor/gems/couchrest_session_store/test/stress_test.rb b/vendor/gems/couchrest_session_store/test/stress_test.rb
new file mode 100644
index 0000000..b74b132
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/test/stress_test.rb
@@ -0,0 +1,51 @@
+require_relative 'test_helper'
+
+#
+# This doesn't really test much, but is useful if you want to see what happens
+# when you have a lot of documents.
+#
+
+class StressTest < MiniTest::Test
+
+  COUNT = 200 # change to 200,000 if you dare
+
+  class Stress < CouchRest::Model::Base
+    include CouchRest::Model::Rotation
+    property :token, String
+    property :expires_at, Time
+    rotate_database 'stress_test', :every => 1.day, :expiration_field => :expires_at
+  end
+
+  def test_stress
+    delete_all_dbs /^couchrest_stress_test_\d+$/
+
+    Stress.database!
+    COUNT.times do |i|
+      doc = Stress.create!(:token => SecureRandom.hex(32), :expires_at => expires(i))
+    end
+
+    Time.stub :now, 1.day.from_now do
+      Stress.rotate_database_now(:window => 1.hour)
+      sleep 0.5
+      assert_equal (COUNT/100)+1, Stress.database.info["doc_count"]
+    end
+  end
+
+  private
+
+  def delete_all_dbs(regexp=TEST_DB_RE)
+    Stress.server.databases.each do |db|
+      if regexp.match(db)
+        Stress.server.database(db).delete!
+      end
+    end
+  end
+
+  def expires(i)
+    if i % 100 == 0
+      1.hour.from_now.utc
+    else
+      1.hour.ago.utc
+    end
+  end
+end
diff --git a/vendor/gems/couchrest_session_store/test/test_clock.rb b/vendor/gems/couchrest_session_store/test/test_clock.rb
new file mode 100644
index 0000000..4170763
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/test/test_clock.rb
@@ -0,0 +1,12 @@
+class TestClock
+  attr_accessor :now
+
+  def initialize(tick = 60)
+    @tick = tick
+    @now = Time.now
+  end
+
+  def tick(seconds = nil)
+    @now += seconds || @tick
+  end
+end
diff --git a/vendor/gems/couchrest_session_store/test/test_helper.rb b/vendor/gems/couchrest_session_store/test/test_helper.rb
new file mode 100644
index 0000000..32f147d
--- /dev/null
+++ b/vendor/gems/couchrest_session_store/test/test_helper.rb
@@ -0,0 +1,9 @@
+require "rubygems"
+gem 'minitest'
+require 'minitest/autorun'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/couchrest_session_store.rb')
+require File.expand_path(File.dirname(__FILE__) + '/couch_tester.rb')
+require File.expand_path(File.dirname(__FILE__) + '/test_clock.rb')
+
+# Create the session db if it does not already exist.
+CouchRest::Session::Document.create_database!
-- 
cgit v1.2.3


From 9a8f1da14f6a0ab83206c57059fbc8cf5bc77b60 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Wed, 23 Mar 2016 22:19:27 +0100
Subject: upgrade: no more underspecified match routes

---
 config/routes.rb                 |  4 ++--
 engines/billing/config/routes.rb | 33 +++++++++++++++------------------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index e370aa4..be3b3be 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -10,8 +10,8 @@ LeapWeb::Application.routes.draw do
   # HTTP Error Handling
   # instead of the default error pages use the errors controller and views
   #
-  match '/404' => 'errors#not_found'
-  match '/500' => 'errors#server_error'
+  match '/404' => 'errors#not_found', via: [:get, :post]
+  match '/500' => 'errors#server_error', via: [:get, :post]
 
   scope "(:locale)", :locale => CommonLanguages.match_available, :controller => 'pages', :action => 'show' do
     get 'privacy-policy', :as => 'privacy_policy'
diff --git a/engines/billing/config/routes.rb b/engines/billing/config/routes.rb
index 357c55b..12a6778 100644
--- a/engines/billing/config/routes.rb
+++ b/engines/billing/config/routes.rb
@@ -2,26 +2,23 @@ Rails.application.routes.draw do
 
   scope "(:locale)", :locale => CommonLanguages.match_available do
 
-  get 'payments/new' => 'payments#new', :as => :new_payment
-  post 'payments/confirm' => 'payments#confirm', :as => :confirm_payment
-  #  match 'payments/new' => 'payments#new', :as => :new_payment
-  #  match 'payments/confirm' => 'payments#confirm', :as => :confirm_payment
-  #resources :users do
-  # resources :payments, :only => [:new, :confirm]
-  #  resources :subscriptions, :only => [:index, :destroy]
-  #end
-  resources :subscriptions, :only => [:index, :show] do
-    member do
-      post 'subscribe'
-      delete 'unsubscribe'
+    get 'payments/new' => 'payments#new', :as => :new_payment
+    post 'payments/confirm' => 'payments#confirm', :as => :confirm_payment
+    #  match 'payments/new' => 'payments#new', :as => :new_payment
+    #  match 'payments/confirm' => 'payments#confirm', :as => :confirm_payment
+    #resources :users do
+    # resources :payments, :only => [:new, :confirm]
+    #  resources :subscriptions, :only => [:index, :destroy]
+    #end
+    resources :subscriptions, :only => [:index, :show] do
+      member do
+        post 'subscribe'
+        delete 'unsubscribe'
+      end
     end
-  end
-
-  resources :customer, :only => [:new, :edit]
 
-  match 'customer/confirm/' => 'customer#confirm', :as => :confirm_customer
-  match 'customer/show/:id' => 'customer#show', :as => :show_customer
+    resources :customer, :only => [:new, :edit]
 
-  match 'billing_admin' => 'billing_admin#show', :as => :billing_admin
+    get 'billing_admin' => 'billing_admin#show'
   end
 end
-- 
cgit v1.2.3


From c7ef6adcd20e9ac9ca729a3ee2a718d31fbb6b51 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Wed, 23 Mar 2016 22:46:06 +0100
Subject: upgrade: add responders gem as a stopgap meassure

respond_with is discouraged.
---
 Gemfile      | 2 ++
 Gemfile.lock | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/Gemfile b/Gemfile
index 071dd3c..bf05642 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,6 +6,8 @@ require File.expand_path('../lib/gemfile_tools.rb', __FILE__)
 # rake 11.x throws lots of warnings about rails 3.2 code
 gem "rake"
 gem "rails", "~> 4.2.6"
+# TODO: drop this and the respond_with usage
+gem 'responders', '~> 2.0'
 gem "couchrest", "~> 2.0.0.rc3"
 gem "couchrest_model", "~> 2.1.0.beta2"
 if ARGV.grep(/assets:precompile/).empty?
diff --git a/Gemfile.lock b/Gemfile.lock
index 78f3ea2..cf005f3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -253,6 +253,8 @@ GEM
     rdiscount (2.1.8)
     ref (2.0.0)
     regexp_parser (0.3.3)
+    responders (2.1.2)
+      railties (>= 4.2.0, < 5.1)
     ruby-srp (0.2.1)
     ruby_parser (3.8.1)
       sexp_processor (~> 4.1)
@@ -346,6 +348,7 @@ DEPENDENCIES
   rails_warden
   rake
   rdiscount
+  responders (~> 2.0)
   ruby-srp (~> 0.2.1)
   sass-rails
   simple_form
-- 
cgit v1.2.3


From 52a6dc82305f0268684ceb10557773b862bc611c Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 24 Mar 2016 08:54:38 +0100
Subject: fix browser_integration_test

we need to require  'capybara/rails' so that Capybara::DSL is available.

ActionController::RecordIdentifier was moved to ActionView
---
 test/performance/browsing_test.rb        | 12 ------------
 test/support/browser_integration_test.rb |  3 ++-
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 test/performance/browsing_test.rb

diff --git a/test/performance/browsing_test.rb b/test/performance/browsing_test.rb
deleted file mode 100644
index 3fea27b..0000000
--- a/test/performance/browsing_test.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'test_helper'
-require 'rails/performance_test_help'
-
-class BrowsingTest < ActionDispatch::PerformanceTest
-  # Refer to the documentation for all available options
-  # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
-  #                          :output => 'tmp/performance', :formats => [:flat] }
-
-  def test_homepage
-    get '/'
-  end
-end
diff --git a/test/support/browser_integration_test.rb b/test/support/browser_integration_test.rb
index 1deb8fa..5455fba 100644
--- a/test/support/browser_integration_test.rb
+++ b/test/support/browser_integration_test.rb
@@ -3,10 +3,11 @@
 #
 # Use this class for capybara based integration tests for the ui.
 #
+require 'capybara/rails'
 
 class BrowserIntegrationTest < ActionDispatch::IntegrationTest
   # let's use dom_id inorder to identify sections
-  include ActionController::RecordIdentifier
+  include ActionView::RecordIdentifier
 
   CONFIG_RU = (Rails.root + 'config.ru').to_s
   OUTER_APP = Rack::Builder.parse_file(CONFIG_RU).first
-- 
cgit v1.2.3


From 0ac511a31a6652ab00bbc765079b1c56128b191f Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 24 Mar 2016 09:03:30 +0100
Subject: split up integration account test

AccountLivecycleTest -> CRUD accounts
SecurityTest -> security specific tests
AdminTest -> admin specific tests
---
 test/integration/browser/account_livecycle_test.rb | 114 +++++++++++++
 test/integration/browser/account_test.rb           | 176 ---------------------
 test/integration/browser/admin_test.rb             |  18 +++
 test/integration/browser/security_test.rb          |  52 ++++++
 4 files changed, 184 insertions(+), 176 deletions(-)
 create mode 100644 test/integration/browser/account_livecycle_test.rb
 delete mode 100644 test/integration/browser/account_test.rb
 create mode 100644 test/integration/browser/security_test.rb

diff --git a/test/integration/browser/account_livecycle_test.rb b/test/integration/browser/account_livecycle_test.rb
new file mode 100644
index 0000000..604f456
--- /dev/null
+++ b/test/integration/browser/account_livecycle_test.rb
@@ -0,0 +1,114 @@
+require 'test_helper'
+
+class AccountLivecycleTest < BrowserIntegrationTest
+
+  teardown do
+    Identity.destroy_all_orphaned
+  end
+
+  test "signup successfully when invited" do
+    username, password = submit_signup
+    assert page.has_content?("Welcome #{username}")
+    click_on 'Log Out'
+    assert page.has_content?("Log In")
+    assert_equal '/', current_path
+    assert user = User.find_by_login(username)
+    user.account.destroy
+  end
+
+  test "signup successfully without invitation" do
+    with_config invite_required: false do
+
+      username ||= "test_#{SecureRandom.urlsafe_base64}".downcase
+      password ||= SecureRandom.base64
+
+      visit '/users/new'
+      fill_in 'Username', with: username
+      fill_in 'Password', with: password
+      fill_in 'Password confirmation', with: password
+      click_on 'Sign Up'
+
+      assert page.has_content?("Welcome #{username}")
+    end
+  end
+
+  test "signup with username ending in dot json" do
+    username = Faker::Internet.user_name + '.json'
+    submit_signup username
+    assert page.has_content?("Welcome #{username}")
+  end
+
+  test "signup with reserved username" do
+    username = 'certmaster'
+    submit_signup username
+    assert page.has_content?("is reserved.")
+  end
+
+  test "successful login" do
+    username, password = submit_signup
+    click_on 'Log Out'
+    attempt_login(username, password)
+    assert page.has_content?("Welcome #{username}")
+    within('.sidenav li.active') do
+      assert page.has_content?("Overview")
+    end
+    User.find_by_login(username).account.destroy
+  end
+
+  test "failed login" do
+    visit '/'
+    attempt_login("username", "wrong password")
+    assert_invalid_login(page)
+  end
+
+  test "account destruction" do
+    username, password = submit_signup
+
+    click_on I18n.t('account_settings')
+    click_on I18n.t('destroy_my_account')
+    assert page.has_content?(I18n.t('account_destroyed'))
+    assert_equal 1, Identity.by_address.key("#{username}@test.me").count
+    attempt_login(username, password)
+    assert_invalid_login(page)
+  end
+
+  test "handle blocked after account destruction" do
+    username, password = submit_signup
+    click_on I18n.t('account_settings')
+    click_on I18n.t('destroy_my_account')
+    submit_signup(username)
+    assert page.has_content?('has already been taken')
+  end
+
+  test "change pgp key" do
+    with_config user_actions: ['change_pgp_key'] do
+      pgp_key = FactoryGirl.build :pgp_key
+      login
+      click_on "Account Settings"
+      within('#update_pgp_key') do
+        fill_in 'Public key', with: pgp_key
+        click_on 'Save'
+      end
+      page.assert_selector 'input[value="Saving..."]'
+      # at some point we're done:
+      page.assert_no_selector 'input[value="Saving..."]'
+      assert page.has_field? 'Public key', with: pgp_key.to_s
+      @user.reload
+      assert_equal pgp_key, @user.public_key
+    end
+  end
+
+  def attempt_login(username, password)
+    click_on 'Log In'
+    fill_in 'Username', with: username
+    fill_in 'Password', with: password
+    click_on 'Log In'
+  end
+
+  def assert_invalid_login(page)
+    assert page.has_selector? '.btn-primary.disabled'
+    assert page.has_content? I18n.t(:invalid_user_pass)
+    assert page.has_no_selector? '.btn-primary.disabled'
+  end
+
+end
diff --git a/test/integration/browser/account_test.rb b/test/integration/browser/account_test.rb
deleted file mode 100644
index 50adb23..0000000
--- a/test/integration/browser/account_test.rb
+++ /dev/null
@@ -1,176 +0,0 @@
-require 'test_helper'
-
-class AccountTest < BrowserIntegrationTest
-
-  teardown do
-    Identity.destroy_all_orphaned
-  end
-
-  test "signup successfully when invited" do
-    username, password = submit_signup
-    assert page.has_content?("Welcome #{username}")
-    click_on 'Log Out'
-    assert page.has_content?("Log In")
-    assert_equal '/', current_path
-    assert user = User.find_by_login(username)
-    user.account.destroy
-  end
-
-  test "signup successfully without invitation" do
-    with_config invite_required: false do
-
-      username ||= "test_#{SecureRandom.urlsafe_base64}".downcase
-      password ||= SecureRandom.base64
-
-      visit '/users/new'
-      fill_in 'Username', with: username
-      fill_in 'Password', with: password
-      fill_in 'Password confirmation', with: password
-      click_on 'Sign Up'
-
-      assert page.has_content?("Welcome #{username}")
-    end
-  end
-
-  test "signup with username ending in dot json" do
-    username = Faker::Internet.user_name + '.json'
-    submit_signup username
-    assert page.has_content?("Welcome #{username}")
-  end
-
-  test "signup with reserved username" do
-    username = 'certmaster'
-    submit_signup username
-    assert page.has_content?("is reserved.")
-  end
-
-  test "successful login" do
-    username, password = submit_signup
-    click_on 'Log Out'
-    attempt_login(username, password)
-    assert page.has_content?("Welcome #{username}")
-    within('.sidenav li.active') do
-      assert page.has_content?("Overview")
-    end
-    User.find_by_login(username).account.destroy
-  end
-
-  test "failed login" do
-    visit '/'
-    attempt_login("username", "wrong password")
-    assert_invalid_login(page)
-  end
-
-  test "account destruction" do
-    username, password = submit_signup
-
-    click_on I18n.t('account_settings')
-    click_on I18n.t('destroy_my_account')
-    assert page.has_content?(I18n.t('account_destroyed'))
-    assert_equal 1, Identity.by_address.key("#{username}@test.me").count
-    attempt_login(username, password)
-    assert_invalid_login(page)
-  end
-
-  test "handle blocked after account destruction" do
-    username, password = submit_signup
-    click_on I18n.t('account_settings')
-    click_on I18n.t('destroy_my_account')
-    submit_signup(username)
-    assert page.has_content?('has already been taken')
-  end
-
-  test "default user actions" do
-    login
-    click_on "Account Settings"
-    assert page.has_content? I18n.t('destroy_my_account')
-    assert page.has_no_css? '#update_login_and_password'
-    assert page.has_no_css? '#update_pgp_key'
-  end
-
-  test "default admin actions" do
-    login
-    with_config admins: [@user.login] do
-      click_on "Account Settings"
-      assert page.has_content? I18n.t('destroy_my_account')
-      assert page.has_no_css? '#update_login_and_password'
-      assert page.has_css? '#update_pgp_key'
-    end
-  end
-
-  test "change pgp key" do
-    with_config user_actions: ['change_pgp_key'] do
-      pgp_key = FactoryGirl.build :pgp_key
-      login
-      click_on "Account Settings"
-      within('#update_pgp_key') do
-        fill_in 'Public key', with: pgp_key
-        click_on 'Save'
-      end
-      page.assert_selector 'input[value="Saving..."]'
-      # at some point we're done:
-      page.assert_no_selector 'input[value="Saving..."]'
-      assert page.has_field? 'Public key', with: pgp_key.to_s
-      @user.reload
-      assert_equal pgp_key, @user.public_key
-    end
-  end
-
-
-  # trying to seed an invalid A for srp login
-  test "detects attempt to circumvent SRP" do
-    InviteCodeValidator.any_instance.stubs(:validate)
-
-    user = FactoryGirl.create :user
-    visit '/login'
-    fill_in 'Username', with: user.login
-    fill_in 'Password', with: "password"
-    inject_malicious_js
-    click_on 'Log In'
-    assert page.has_content?("Invalid random key")
-    assert page.has_no_content?("Welcome")
-    user.destroy
-  end
-
-  test "reports internal server errors" do
-    V1::UsersController.any_instance.stubs(:create).raises
-    submit_signup
-    assert page.has_content?("server failed")
-  end
-
-  test "does not render signup form without js" do
-    Capybara.current_driver = :rack_test # no js
-    visit '/signup'
-    assert page.has_no_content?("Username")
-    assert page.has_no_content?("Password")
-  end
-
-  test "does not render login form without js" do
-    Capybara.current_driver = :rack_test # no js
-    visit '/login'
-    assert page.has_no_content?("Username")
-    assert page.has_no_content?("Password")
-  end
-
-  def attempt_login(username, password)
-    click_on 'Log In'
-    fill_in 'Username', with: username
-    fill_in 'Password', with: password
-    click_on 'Log In'
-  end
-
-  def assert_invalid_login(page)
-    assert page.has_selector? '.btn-primary.disabled'
-    assert page.has_content? I18n.t(:invalid_user_pass)
-    assert page.has_no_selector? '.btn-primary.disabled'
-  end
-
-  def inject_malicious_js
-    page.execute_script <<-EOJS
-      var calc = new srp.Calculate();
-      calc.A = function(_a) {return "00";};
-      calc.S = calc.A;
-      srp.session = new srp.Session(null, calc);
-    EOJS
-  end
-end
diff --git a/test/integration/browser/admin_test.rb b/test/integration/browser/admin_test.rb
index 902c981..0b43c29 100644
--- a/test/integration/browser/admin_test.rb
+++ b/test/integration/browser/admin_test.rb
@@ -2,6 +2,24 @@ require 'test_helper'
 
 class AdminTest < BrowserIntegrationTest
 
+  test "default user actions" do
+    login
+    click_on "Account Settings"
+    assert page.has_content? I18n.t('destroy_my_account')
+    assert page.has_no_css? '#update_login_and_password'
+    assert page.has_no_css? '#update_pgp_key'
+  end
+
+  test "default admin actions" do
+    login
+    with_config admins: [@user.login] do
+      click_on "Account Settings"
+      assert page.has_content? I18n.t('destroy_my_account')
+      assert page.has_no_css? '#update_login_and_password'
+      assert page.has_css? '#update_pgp_key'
+    end
+  end
+
   test "clear blocked handle" do
     id = FactoryGirl.create :identity
     submit_signup(id.login)
diff --git a/test/integration/browser/security_test.rb b/test/integration/browser/security_test.rb
new file mode 100644
index 0000000..c13acd8
--- /dev/null
+++ b/test/integration/browser/security_test.rb
@@ -0,0 +1,52 @@
+require 'test_helper'
+
+class SecurityTest < BrowserIntegrationTest
+
+  teardown do
+    Identity.destroy_all_orphaned
+  end
+
+  # trying to seed an invalid A for srp login
+  test "detects attempt to circumvent SRP" do
+    InviteCodeValidator.any_instance.stubs(:validate)
+
+    user = FactoryGirl.create :user
+    visit '/login'
+    fill_in 'Username', with: user.login
+    fill_in 'Password', with: "password"
+    inject_malicious_js
+    click_on 'Log In'
+    assert page.has_content?("Invalid random key")
+    assert page.has_no_content?("Welcome")
+    user.destroy
+  end
+
+  test "reports internal server errors" do
+    V1::UsersController.any_instance.stubs(:create).raises
+    submit_signup
+    assert page.has_content?("server failed")
+  end
+
+  test "does not render signup form without js" do
+    Capybara.current_driver = :rack_test # no js
+    visit '/signup'
+    assert page.has_no_content?("Username")
+    assert page.has_no_content?("Password")
+  end
+
+  test "does not render login form without js" do
+    Capybara.current_driver = :rack_test # no js
+    visit '/login'
+    assert page.has_no_content?("Username")
+    assert page.has_no_content?("Password")
+  end
+
+  def inject_malicious_js
+    page.execute_script <<-EOJS
+      var calc = new srp.Calculate();
+      calc.A = function(_a) {return "00";};
+      calc.S = calc.A;
+      srp.session = new srp.Session(null, calc);
+    EOJS
+  end
+end
-- 
cgit v1.2.3


From 6d9bd6b966ec2370b7f8659b0810b03c5d1568aa Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 24 Mar 2016 09:08:46 +0100
Subject: upgrade: unique test names

Rails 4.2 runs all tests mixed together. So unit tests and integration tests
may not have conflicting names.
---
 test/integration/api/token_auth_test.rb | 16 ++++++++++++++++
 test/integration/api/token_test.rb      | 16 ----------------
 test/unit/temporary_user_test.rb        | 33 +++++++++++++++++++++++++++++++++
 test/unit/tmp_user_test.rb              | 33 ---------------------------------
 4 files changed, 49 insertions(+), 49 deletions(-)
 create mode 100644 test/integration/api/token_auth_test.rb
 delete mode 100644 test/integration/api/token_test.rb
 create mode 100644 test/unit/temporary_user_test.rb
 delete mode 100644 test/unit/tmp_user_test.rb

diff --git a/test/integration/api/token_auth_test.rb b/test/integration/api/token_auth_test.rb
new file mode 100644
index 0000000..3b83f23
--- /dev/null
+++ b/test/integration/api/token_auth_test.rb
@@ -0,0 +1,16 @@
+require_relative '../../test_helper'
+require_relative 'srp_test'
+
+class TokenAuthTest < SrpTest
+
+  setup do
+    register_user
+  end
+
+  test "stores token SHA512 encoded" do
+    authenticate
+    token = server_auth['token']
+    assert Token.find(Digest::SHA512.hexdigest(token))
+  end
+
+end
diff --git a/test/integration/api/token_test.rb b/test/integration/api/token_test.rb
deleted file mode 100644
index dafbfb7..0000000
--- a/test/integration/api/token_test.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require_relative '../../test_helper'
-require_relative 'srp_test'
-
-class TokenTest < SrpTest
-
-  setup do
-    register_user
-  end
-
-  test "stores token SHA512 encoded" do
-    authenticate
-    token = server_auth['token']
-    assert Token.find(Digest::SHA512.hexdigest(token))
-  end
-
-end
diff --git a/test/unit/temporary_user_test.rb b/test/unit/temporary_user_test.rb
new file mode 100644
index 0000000..38ccd67
--- /dev/null
+++ b/test/unit/temporary_user_test.rb
@@ -0,0 +1,33 @@
+require 'test_helper'
+
+class TemporaryUserTest < ActiveSupport::TestCase
+
+  setup do
+    InviteCodeValidator.any_instance.stubs(:validate)
+  end
+
+  test "tmp_user saved to tmp_users" do
+    begin
+      assert User.ancestors.include?(TemporaryUser)
+
+      assert_difference('User.database.info["doc_count"]') do
+        normal_user = User.create!(:login => 'a'+SecureRandom.hex(5).downcase,
+          :password_verifier => 'ABCDEF0010101', :password_salt => 'ABCDEF')
+        refute normal_user.database.to_s.include?('tmp')
+      end
+
+      assert_difference('User.tmp_database.info["doc_count"]') do
+        tmp_user = User.create!(:login => 'tmp_user_'+SecureRandom.hex(5).downcase,
+          :password_verifier => 'ABCDEF0010101', :password_salt => 'ABCDEF')
+        assert tmp_user.database.to_s.include?('tmp')
+      end
+    ensure
+      begin
+        normal_user.destroy
+        tmp_user.destroy
+      rescue
+      end
+    end
+  end
+
+end
diff --git a/test/unit/tmp_user_test.rb b/test/unit/tmp_user_test.rb
deleted file mode 100644
index 1dea5f9..0000000
--- a/test/unit/tmp_user_test.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'test_helper'
-
-class TmpUserTest < ActiveSupport::TestCase
-
-  setup do
-    InviteCodeValidator.any_instance.stubs(:validate)
-  end
-
-  test "tmp_user saved to tmp_users" do
-    begin
-      assert User.ancestors.include?(TemporaryUser)
-
-      assert_difference('User.database.info["doc_count"]') do
-        normal_user = User.create!(:login => 'a'+SecureRandom.hex(5).downcase,
-          :password_verifier => 'ABCDEF0010101', :password_salt => 'ABCDEF')
-        refute normal_user.database.to_s.include?('tmp')
-      end
-
-      assert_difference('User.tmp_database.info["doc_count"]') do
-        tmp_user = User.create!(:login => 'tmp_user_'+SecureRandom.hex(5).downcase,
-          :password_verifier => 'ABCDEF0010101', :password_salt => 'ABCDEF')
-        assert tmp_user.database.to_s.include?('tmp')
-      end
-    ensure
-      begin
-        normal_user.destroy
-        tmp_user.destroy
-      rescue
-      end
-    end
-  end
-
-end
-- 
cgit v1.2.3


From 96912fcda221b1403654c0770b227bbf13c9ba51 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 24 Mar 2016 09:34:27 +0100
Subject: upgrade: add binstubs to git

http://www.scimedsolutions.com/articles/43-the-new-way-binstubs-work

The new wisdom is to also use binstubs in production.

Also updated .gitignore according to
  http://railsdiff.org/3.2.22.2/4.2.6

Removed .swp ignore as that is editor specific and should be set per
dev system rather than per project.
---
 .gitignore |  7 +++++--
 bin/bundle |  3 +++
 bin/rails  |  4 ++++
 bin/rake   |  4 ++++
 bin/setup  | 29 +++++++++++++++++++++++++++++
 5 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100755 bin/bundle
 create mode 100755 bin/rails
 create mode 100755 bin/rake
 create mode 100755 bin/setup

diff --git a/.gitignore b/.gitignore
index 3aa8fc7..8d49deb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,13 @@
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+# git config --global core.excludesfile '~/.gitignore_global'
+
 # Ignore bundler config
 /.bundle
-bin
 
 # Ignore the default SQLite database.
 /db/*.sqlite3
+/db/*.sqlite3-journal
 
 # Ignore all logfiles and tempfiles.
 /log/*.log
@@ -12,7 +16,6 @@ bin
 /pkg
 /*/pkg
 /log
-.*.swp
 */Gemfile.lock
 test/dummy/log/*
 test/dummy/tmp/*
diff --git a/bin/bundle b/bin/bundle
new file mode 100755
index 0000000..66e9889
--- /dev/null
+++ b/bin/bundle
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/rails b/bin/rails
new file mode 100755
index 0000000..5191e69
--- /dev/null
+++ b/bin/rails
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'
diff --git a/bin/rake b/bin/rake
new file mode 100755
index 0000000..1724048
--- /dev/null
+++ b/bin/rake
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run
diff --git a/bin/setup b/bin/setup
new file mode 100755
index 0000000..acdb2c1
--- /dev/null
+++ b/bin/setup
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end
-- 
cgit v1.2.3


From cb58e83c3525917da381bd43773fc2c3c40811ea Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 24 Mar 2016 09:41:53 +0100
Subject: upgrade: environments/test.rb

Changed according to http://railsdiff.org/3.2.22.2/4.2.6

Should also get rid of some warnings.
---
 config/environments/test.rb | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/config/environments/test.rb b/config/environments/test.rb
index 1a38df7..8ed23ed 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,5 +1,5 @@
-LeapWeb::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
@@ -7,29 +7,36 @@ LeapWeb::Application.configure do
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
-  # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
+  # Configure static asset server for tests with Cache-Control for performance
+  config.serve_static_files = true
+  config.static_cache_control = 'public, max-age=3600'
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Raise exceptions instead of rendering exception templates
+  # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
 
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
+  # Randomize the order test cases are executed.
+  config.active_support.test_order = :random
 
-  # Print deprecation notices to the stderr
+  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 end
-- 
cgit v1.2.3


From 4b16c4ff2220a42a27a19230785461c6dcb74652 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 24 Mar 2016 09:50:53 +0100
Subject: upgrade: environments:development

Changed according to http://railsdiff.org/3.2.22.2/4.2.6

Also separated settings we added from those that rails has by default.
---
 config/environments/development.rb | 48 +++++++++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 3c0ff0f..4112c6d 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,38 +1,58 @@
-LeapWeb::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  ##
+  # DEFAULT:
+  #
+  # rails default settings in their natural order
+  ##
 
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Don't care if the mailer can't send
+  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  # Print deprecation notices to the Rails logger
+  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
 
-  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
-  config.i18n.fallbacks = true
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
 
-  # Do not compress assets
-  config.assets.compress = false
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
 
   # If set to true, each asset file is loaded separately. If you are not
   # debugging js or css, it is much faster to set this to false.
   config.assets.debug = false
 
+  ##
+  # CUSTOM:
+  #
+  # our own settings
+  ##
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found)
+  config.i18n.fallbacks = true
+
   # super hacky, but otherwise getting certificate error, and doesn't seem dangerous in development mode:
   OpenSSL::SSL.send(:remove_const, "VERIFY_PEER")
   OpenSSL::SSL.const_set("VERIFY_PEER", OpenSSL::SSL::VERIFY_NONE)
-- 
cgit v1.2.3


From 464c2b463522cdb5e4577b1b9ab7ffb890788d94 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 24 Mar 2016 11:00:06 +0100
Subject: upgrade: environments:production

Changed according to http://railsdiff.org/3.2.22.2/4.2.6

Includes setting logging to debug. Not sure if we want this.
I agree that it's good to have all info available in case something breaks.
---
 config/environments/production.rb | 70 ++++++++++++++++++++++++---------------
 1 file changed, 43 insertions(+), 27 deletions(-)

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 7acca75..acdfc1d 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,37 +1,56 @@
-LeapWeb::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
-  # Code is not reloaded between requests
+  # Code is not reloaded between requests.
   config.cache_classes = true
 
-  # Full error reports are disabled and caching is turned on
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
 
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
+  # Dble Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like
+  # NGINX, varnish or squid.
+  # config.action_dispatch.rack_cache = true
+
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
+
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
 
-  # Don't fallback to assets pipeline if a precompiled asset is missed
+  #Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Generate digests for assets URLs
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
   config.assets.digest = true
 
-  # Defaults to nil and saved in location specified by config.assets.prefix
-  # config.assets.manifest = YOUR_PATH
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
-  # Specifies the header that your server uses for sending files
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   config.force_ssl = APP_CONFIG[:force_ssl]
 
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
+  config.log_level = :debug
+
+  # Prepend all log lines with the following tags.
+  # config.log_tags = [ :subdomain, :uuid ]
 
   # Use syslog if no file has been specified
   if APP_CONFIG[:logfile].blank?
@@ -39,26 +58,23 @@ LeapWeb::Application.configure do
     config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new('webapp'))
   end
 
-  # Use a different cache store in production
+  # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = "http://assets.example.com"
 
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  # config.assets.precompile += %w( search.js )
-
-  # Disable delivery errors, bad email addresses will be ignored
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
-  # Enable threaded mode
-  # config.threadsafe!
-
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
+  # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
 
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
 end
-- 
cgit v1.2.3


From 54661746ffa9f113c6b489a4d5ba170a27874ad1 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 24 Mar 2016 11:10:48 +0100
Subject: upgrade: migrate config

environment.rb
boot.rb
application.rb

-> adopted according to http://railsdiff.org/3.2.22.2/4.2.6

Also dropped quite_assets - not sure if this is still needed with
rails 4.2. If it is we can bring it back.
---
 Gemfile               |  1 -
 Gemfile.lock          |  3 ---
 config/application.rb | 57 +++++++--------------------------------------------
 config/boot.rb        |  5 +----
 config/environment.rb |  6 +++---
 5 files changed, 11 insertions(+), 61 deletions(-)

diff --git a/Gemfile b/Gemfile
index bf05642..0df9357 100644
--- a/Gemfile
+++ b/Gemfile
@@ -43,7 +43,6 @@ gem 'client_side_validations-simple_form'
 gem "haml-rails"
 gem "bootstrap-sass"
 gem "sass-rails"
-gem 'quiet_assets'            # stops logging all the asset requests
 group :production do
   gem "uglifier"
   gem 'therubyracer', :platforms => :ruby
diff --git a/Gemfile.lock b/Gemfile.lock
index cf005f3..bd41a09 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -213,8 +213,6 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    quiet_assets (1.1.0)
-      railties (>= 3.1, < 5.0)
     rack (1.6.4)
     rack-protection (1.5.3)
       rack
@@ -342,7 +340,6 @@ DEPENDENCIES
   phantomjs-binaries
   poltergeist
   pry
-  quiet_assets
   rails (~> 4.2.6)
   rails-i18n
   rails_warden
diff --git a/config/application.rb b/config/application.rb
index 4771f89..4a70b04 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -7,12 +7,9 @@ require "action_mailer/railtie"
 require "sprockets/railtie"
 require "rails/test_unit/railtie"
 
-if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
-end
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
 
 APP_CONFIG = ["defaults.yml", "config.yml"].inject({}) {|config, file|
   filepath = File.expand_path(file, File.dirname(__FILE__))
@@ -29,16 +26,6 @@ module LeapWeb
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
@@ -47,48 +34,18 @@ module LeapWeb
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
     if APP_CONFIG[:logfile].present?
       config.logger = Logger.new(APP_CONFIG[:logfile])
     end
 
-    # Enable escaping HTML in JSON.
-    config.active_support.escape_html_entities_in_json = true
-
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    # config.active_record.whitelist_attributes = true
-
-    ##
-    ## ASSETS
-    ##
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-    config.assets.initialize_on_precompile = true # don't change this (see customization.rb)
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
-
-    # Set to false in order to see asset requests in the log
-    config.quiet_assets = true
-
     ##
     ## CUSTOMIZATION
     ## see initializers/customization.rb
     ##
+
+    # don't change this (see customization.rb)
+    config.assets.initialize_on_precompile = true
+
     if APP_CONFIG["customization_directory"]
       custom_view_path = (Pathname.new(APP_CONFIG["customization_directory"]).relative_path_from(Rails.root) + 'views').to_s
     else
diff --git a/config/boot.rb b/config/boot.rb
index 4489e58..6b750f0 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,6 +1,3 @@
-require 'rubygems'
-
-# Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' # Set up gems listed in the Gemfile.
diff --git a/config/environment.rb b/config/environment.rb
index fe16a54..00a613f 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,5 +1,5 @@
-# Load the rails application
+# Load the rails application.
 require File.expand_path('../application', __FILE__)
 
-# Initialize the rails application
-LeapWeb::Application.initialize!
+# Initialize the rails application.
+Rails.application.initialize!
-- 
cgit v1.2.3


From 9b9daf95357f4fa5fd1eb95b16e2cf043937bdc0 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 24 Mar 2016 11:12:55 +0100
Subject: upgrade: default_wait_time -> default_max_wait_time

---
 test/support/browser_integration_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/support/browser_integration_test.rb b/test/support/browser_integration_test.rb
index 5455fba..8201854 100644
--- a/test/support/browser_integration_test.rb
+++ b/test/support/browser_integration_test.rb
@@ -29,7 +29,7 @@ class BrowserIntegrationTest < ActionDispatch::IntegrationTest
   Capybara.app_host = 'http://lvh.me:3003'
   Capybara.server_port = 3003
   Capybara.javascript_driver = :poltergeist
-  Capybara.default_wait_time = 5
+  Capybara.default_max_wait_time = 5
 
   # Make the Capybara DSL available
   include Capybara::DSL
-- 
cgit v1.2.3


From afc1daac6745cd6b4543d2b542c6f03cfc32e1eb Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 24 Mar 2016 11:24:19 +0100
Subject: upgrade: client_side_validations initializer

---
 config/initializers/client_side_validations.rb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/config/initializers/client_side_validations.rb b/config/initializers/client_side_validations.rb
index 252aded..f7a658a 100644
--- a/config/initializers/client_side_validations.rb
+++ b/config/initializers/client_side_validations.rb
@@ -1,9 +1,16 @@
 # ClientSideValidations Initializer
 
-# Uncomment to disable uniqueness validator, possible security issue
-ClientSideValidations::Config.disabled_validators = [:uniqueness]
+# Disabled validators. The uniqueness validator is disabled by default for security issues. Enable it on your own responsibility!
+# ClientSideValidations::Config.disabled_validators = [:uniqueness]
+
+# Uncomment to validate number format with current I18n locale
+# ClientSideValidations::Config.number_format_with_locale = true
 
 # Uncomment the following block if you want each input field to have the validation messages attached.
+#
+# Note: client_side_validation requires the error to be encapsulated within
+# <label for="#{instance.send(:tag_id)}" class="message"></label>
+
 ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
   unless html_tag =~ /^<label/
     %{<div class="field_with_errors">#{html_tag}<label for="#{instance.send(:tag_id)}" class="message">#{instance.error_message.first}</label></div>}.html_safe
@@ -11,4 +18,3 @@ ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
     %{<div class="field_with_errors">#{html_tag}</div>}.html_safe
   end
 end
-
-- 
cgit v1.2.3


From 431ceda256c91980a7c3ac807548eb7c776a09f0 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 24 Mar 2016 11:28:56 +0100
Subject: upgrade: bootstrap 3 does not have -responsive

We can also remove the backports now. :)
---
 app/assets/stylesheets/application.scss |  3 ---
 app/assets/stylesheets/backport.scss    | 24 ------------------------
 2 files changed, 27 deletions(-)
 delete mode 100644 app/assets/stylesheets/backport.scss

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 9cd3a55..e6eeda2 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -10,9 +10,6 @@
 // import bootstrap.
 //
 @import "bootstrap";
-@import "bootstrap-responsive";
-// backport bootstrap 3.2 features
-@import "backport";
 
 //
 // LEAP web app specific overrides
diff --git a/app/assets/stylesheets/backport.scss b/app/assets/stylesheets/backport.scss
deleted file mode 100644
index cadb035..0000000
--- a/app/assets/stylesheets/backport.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Backporting styles from bootstrap 3.2
-//
-
-
-// List options
-
-// Unstyled keeps list items block level, just removes default browser padding and list-style
-.list-unstyled {
-  padding-left: 0;
-  list-style: none;
-}
-
-// Inline turns list items into inline-block
-.list-inline {
-  @extend .list-unstyled;
-  margin-left: -5px;
-
-  > li {
-    display: inline-block;
-    padding-left: 5px;
-    padding-right: 5px;
-  }
-}
-- 
cgit v1.2.3


From b11f61b922748949ff0b762ec2aed0558de3c28b Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 24 Mar 2016 11:36:04 +0100
Subject: test: response is blank - not = ' '

---
 test/functional/v1/users_controller_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/v1/users_controller_test.rb b/test/functional/v1/users_controller_test.rb
index df59c4d..3f7bad3 100644
--- a/test/functional/v1/users_controller_test.rb
+++ b/test/functional/v1/users_controller_test.rb
@@ -14,7 +14,7 @@ class V1::UsersControllerTest < ActionController::TestCase
 
     assert_equal user, assigns[:user]
     assert_response 204
-    assert_equal " ", @response.body
+    assert @response.body.blank?, "Response should be blank"
   end
 
   test "admin can update user" do
-- 
cgit v1.2.3


From 5d18e8c396181ee8fab3f8579bc19abaee106d52 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 24 Mar 2016 11:39:22 +0100
Subject: test: flash now has string keys

---
 test/support/assert_responses.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/support/assert_responses.rb b/test/support/assert_responses.rb
index 7724fb4..98c9ad2 100644
--- a/test/support/assert_responses.rb
+++ b/test/support/assert_responses.rb
@@ -85,7 +85,7 @@ module AssertResponses
       assert_json_response('error' => key.to_s, 'message' => message)
       assert_response status
     else
-      assert_equal({:alert => message}, flash.to_hash)
+      assert_equal({'alert' => message}, flash.to_hash)
     end
   end
 
-- 
cgit v1.2.3


From 4bfbeedd9cf5f0f2a4b364764afd9c6acdc7399f Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 24 Mar 2016 14:14:18 +0100
Subject: upgrade: separate CouchRest::Session from Document

CouchRest::Session now offers the high leven API while
CouchRest::Session::Document only extends the CouchRest::Document
to have the properties (rotation, naming, etc...) that we want.

A Session has a Session::Document instead of inheriting from it.
---
 vendor/gems/couchrest_session_store/.ruby-version  |  1 -
 .../lib/couchrest/session.rb                       | 94 +++++++++++++++++++++-
 .../lib/couchrest/session/document.rb              | 89 +-------------------
 .../lib/couchrest/session/store.rb                 | 12 +--
 .../test/session_document_test.rb                  | 22 ++---
 .../test/session_store_test.rb                     |  6 +-
 6 files changed, 114 insertions(+), 110 deletions(-)
 delete mode 100644 vendor/gems/couchrest_session_store/.ruby-version

diff --git a/vendor/gems/couchrest_session_store/.ruby-version b/vendor/gems/couchrest_session_store/.ruby-version
deleted file mode 100644
index f3a9c9a..0000000
--- a/vendor/gems/couchrest_session_store/.ruby-version
+++ /dev/null
@@ -1 +0,0 @@
-1.9.3-p194
diff --git a/vendor/gems/couchrest_session_store/lib/couchrest/session.rb b/vendor/gems/couchrest_session_store/lib/couchrest/session.rb
index 430732c..416a88d 100644
--- a/vendor/gems/couchrest_session_store/lib/couchrest/session.rb
+++ b/vendor/gems/couchrest_session_store/lib/couchrest/session.rb
@@ -1,3 +1,9 @@
+class CouchRest::Session
+end
+
+require 'couchrest/session/utility'
+require 'couchrest/session/document'
+
 module CouchRest
 
   class StorageMissing < Exception
@@ -9,7 +15,91 @@ module CouchRest
     end
   end
 
-  module Session
+  class Session
+    include CouchRest::Session::Utility
+
+    def self.fetch(sid)
+      self.allocate.tap do |session_doc|
+        session_doc.fetch(sid) || raise(CouchRest::NotFound)
+      end
+    end
+
+    def self.build(sid, session, options = {})
+      session_doc = CouchRest::Session::Document.new "_id" => sid
+      self.new(session_doc).
+        update session, options
+    end
+
+    def self.build_or_update(sid, session, options = {})
+      options[:marshal_data] = true if options[:marshal_data].nil?
+      self.fetch(sid).
+        update session, options
+    rescue CouchRest::NotFound
+      self.build sid, session, options
+    end
+
+    def initialize(doc)
+      @doc = doc
+    end
+
+    def fetch(sid = nil)
+      @doc = CouchRest::Session::Document.fetch(sid || doc['_id'])
+    end
+
+    def to_session
+      if doc["marshalled"]
+        session = unmarshal(doc["data"])
+      else
+        session = doc["data"]
+      end
+      return session
+    end
+
+    def delete
+      doc.destroy
+    end
+
+    def update(session, options)
+      # clean up old data but leave id and revision intact
+      doc.reject! { |k,_v| k[0] != '_' }
+      doc.merge! data_for_doc(session, options)
+      self
+    end
+
+    def save
+      doc.save
+    rescue CouchRest::Conflict
+      fetch
+      retry
+    rescue CouchRest::NotFound => exc
+      if exc.http_body =~ /no_db_file/
+        exc = CouchRest::StorageMissing.new(exc.response, doc.database)
+      end
+      raise exc
+    end
+
+    def expired?
+      expires && expires < Time.now
+    end
+
+    protected
+
+    attr_reader :doc
+
+    def data_for_doc(session, options)
+      { "data" => options[:marshal_data] ? marshal(session) : session,
+        "marshalled" => options[:marshal_data],
+        "expires" => expiry_from_options(options) }
+    end
+
+    def expiry_from_options(options)
+      expire_after = options[:expire_after]
+      expire_after && (Time.now + expire_after).utc
+    end
+
+    def expires
+      doc["expires"] && Time.iso8601(doc["expires"])
+    end
+
   end
 end
-
diff --git a/vendor/gems/couchrest_session_store/lib/couchrest/session/document.rb b/vendor/gems/couchrest_session_store/lib/couchrest/session/document.rb
index b1e73cc..dc938cf 100644
--- a/vendor/gems/couchrest_session_store/lib/couchrest/session/document.rb
+++ b/vendor/gems/couchrest_session_store/lib/couchrest/session/document.rb
@@ -1,34 +1,15 @@
-require 'couchrest/session/utility'
 require 'time'
 
 class CouchRest::Session::Document < CouchRest::Document
   include CouchRest::Model::Configuration
   include CouchRest::Model::Connection
-  include CouchRest::Session::Utility
   include CouchRest::Model::Rotation
 
   rotate_database 'sessions',
     :every => 1.month, :expiration_field => :expires
 
-  def self.fetch(sid)
-    self.allocate.tap do |session_doc|
-      session_doc.fetch(sid)
-    end
-  end
-
-  def self.build(sid, session, options = {})
-    self.new(CouchRest::Document.new({"_id" => sid})).tap do |session_doc|
-      session_doc.update session, options
-    end
-  end
-
-  def self.build_or_update(sid, session, options = {})
-    options[:marshal_data] = true if options[:marshal_data].nil?
-    doc = self.fetch(sid)
-    doc.update(session, options)
-    return doc
-  rescue CouchRest::NotFound
-    self.build(sid, session, options)
+  def self.fetch(id)
+    database.get(id)
   end
 
   def self.find_by_expires(options = {})
@@ -50,70 +31,4 @@ class CouchRest::Session::Document < CouchRest::Document
     db
   end
 
-  def initialize(doc)
-    @doc = doc
-  end
-
-  def fetch(sid = nil)
-    @doc = database.get(sid || doc['_id'])
-  end
-
-  def to_session
-    if doc["marshalled"]
-      session = unmarshal(doc["data"])
-    else
-      session = doc["data"]
-    end
-    return session
-  end
-
-  def delete
-    database.delete_doc(doc)
-  end
-
-  def update(session, options)
-    # clean up old data but leave id and revision intact
-    doc.reject! do |k,v|
-      k[0] != '_'
-    end
-    doc.merge! data_for_doc(session, options)
-  end
-
-  def save
-    database.save_doc(doc)
-  rescue CouchRest::Conflict
-    fetch
-    retry
-  rescue CouchRest::NotFound => exc
-    if exc.http_body =~ /no_db_file/
-      exc = CouchRest::StorageMissing.new(exc.response, database)
-    end
-    raise exc
-  end
-
-  def expired?
-    expires && expires < Time.now
-  end
-
-  protected
-
-  def data_for_doc(session, options)
-    { "data" => options[:marshal_data] ? marshal(session) : session,
-      "marshalled" => options[:marshal_data],
-      "expires" => expiry_from_options(options) }
-  end
-
-  def expiry_from_options(options)
-    expire_after = options[:expire_after]
-    expire_after && (Time.now + expire_after).utc
-  end
-
-  def expires
-    doc["expires"] && Time.iso8601(doc["expires"])
-  end
-
-  def doc
-    @doc
-  end
-
 end
diff --git a/vendor/gems/couchrest_session_store/lib/couchrest/session/store.rb b/vendor/gems/couchrest_session_store/lib/couchrest/session/store.rb
index f209f54..516d5dd 100644
--- a/vendor/gems/couchrest_session_store/lib/couchrest/session/store.rb
+++ b/vendor/gems/couchrest_session_store/lib/couchrest/session/store.rb
@@ -54,8 +54,8 @@ class CouchRest::Session::Store < ActionDispatch::Session::AbstractStore
 
   def set_session(env, sid, session, options)
     raise CouchRest::NotFound if /^_design\/(.*)/ =~ sid
-    doc = build_or_update_doc(sid, session, options)
-    doc.save
+    couchrest_session = build_or_update_doc(sid, session, options)
+    couchrest_session.save
     return sid
   # if we can't store the session we just return false.
   rescue CouchRest::Unauthorized,
@@ -75,12 +75,12 @@ class CouchRest::Session::Store < ActionDispatch::Session::AbstractStore
 
   def fetch_session(sid)
     return nil unless sid
-    doc = secure_get(sid)
-    doc.to_session unless doc.expired?
+    couchrest_session = secure_get(sid)
+    couchrest_session.to_session unless couchrest_session.expired?
   end
 
   def build_or_update_doc(sid, session, options)
-    CouchRest::Session::Document.build_or_update(sid, session, options)
+    CouchRest::Session.build_or_update(sid, session, options)
   end
 
   # prevent access to design docs
@@ -88,7 +88,7 @@ class CouchRest::Session::Store < ActionDispatch::Session::AbstractStore
   # but better be save than sorry.
   def secure_get(sid)
     raise CouchRest::NotFound if /^_design\/(.*)/ =~ sid
-    CouchRest::Session::Document.fetch(sid)
+    CouchRest::Session.fetch(sid)
   end
 
 end
diff --git a/vendor/gems/couchrest_session_store/test/session_document_test.rb b/vendor/gems/couchrest_session_store/test/session_document_test.rb
index 2125d10..43fbbca 100644
--- a/vendor/gems/couchrest_session_store/test/session_document_test.rb
+++ b/vendor/gems/couchrest_session_store/test/session_document_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require_relative 'test_helper'
 
 class SessionDocumentTest < MiniTest::Test
 
@@ -6,22 +6,22 @@ class SessionDocumentTest < MiniTest::Test
     sid = '1234'
     session = {'a' => 'b'}
     options = {}
-    doc = CouchRest::Session::Document.build_or_update(sid, session, options)
-    doc.save
-    doc.fetch(sid)
-    assert_equal session, doc.to_session
+    couchrest_session = CouchRest::Session.build_or_update(sid, session, options)
+    couchrest_session.save
+    couchrest_session.fetch(sid)
+    assert_equal session, couchrest_session.to_session
   end
 
   def test_storing_session_with_conflict
     sid = '1234'
     session = {'a' => 'b'}
     options = {}
-    doc = CouchRest::Session::Document.build_or_update(sid, session, options)
-    doc2 = CouchRest::Session::Document.build_or_update(sid, session, options)
-    doc.save
-    doc2.save
-    doc2.fetch(sid)
-    assert_equal session, doc2.to_session
+    cr_session = CouchRest::Session.build_or_update(sid, session, options)
+    cr_session2 = CouchRest::Session.build_or_update(sid, session, options)
+    cr_session.save
+    cr_session2.save
+    cr_session2.fetch(sid)
+    assert_equal session, cr_session2.to_session
   end
 
 end
diff --git a/vendor/gems/couchrest_session_store/test/session_store_test.rb b/vendor/gems/couchrest_session_store/test/session_store_test.rb
index 4fbf30b..5949ae6 100644
--- a/vendor/gems/couchrest_session_store/test/session_store_test.rb
+++ b/vendor/gems/couchrest_session_store/test/session_store_test.rb
@@ -64,10 +64,10 @@ class SessionStoreTest < MiniTest::Test
 
   def test_stored_and_not_expired_yet
     sid, session = expiring_session
-    doc = CouchRest::Session::Document.fetch(sid)
-    expires = doc.send :expires
+    couchrest_session = CouchRest::Session.fetch(sid)
+    expires = couchrest_session.send :expires
     assert expires
-    assert !doc.expired?
+    assert !couchrest_session.expired?
     assert (expires - Time.now) > 0, "Exiry should be in the future"
     assert (expires - Time.now) <= 300, "Should expire after 300 seconds - not more"
     assert_equal [sid, session], store.send(:get_session, env, sid)
-- 
cgit v1.2.3


From dbd36d90a25ac075b98d95804306f57a4e43d063 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 24 Mar 2016 14:21:21 +0100
Subject: update: stop refering to bootstrap2 ie7 hack

---
 app/assets/stylesheets/leap.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss
index abbfc88..19491c8 100644
--- a/app/assets/stylesheets/leap.scss
+++ b/app/assets/stylesheets/leap.scss
@@ -57,7 +57,6 @@
 
 [class*="-icon-"] {
   display: inline-block;
-  @include ie7-restore-right-whitespace();
   vertical-align: middle;
   background-repeat: no-repeat;
   margin-top: 1px;
-- 
cgit v1.2.3


From 931748ab96aea54e123b0fffd3f12c87bd647fed Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 24 Mar 2016 14:30:41 +0100
Subject: upgrade: test cases now have #name

---
 test/support/browser_integration_test.rb | 2 +-
 test/test_helper.rb                      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/support/browser_integration_test.rb b/test/support/browser_integration_test.rb
index 8201854..84440a1 100644
--- a/test/support/browser_integration_test.rb
+++ b/test/support/browser_integration_test.rb
@@ -102,7 +102,7 @@ class BrowserIntegrationTest < ActionDispatch::IntegrationTest
     File.open(logfile_path, 'w') do |test_log|
       test_log.puts self.class.name
       test_log.puts "========================="
-      test_log.puts __name__
+      test_log.puts name
       test_log.puts Time.now
       test_log.puts current_path
       test_log.puts page.status_code
diff --git a/test/test_helper.rb b/test/test_helper.rb
index dfc6627..a06f710 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,5 +1,5 @@
 ENV["RAILS_ENV"] = "test"
-require File.expand_path('../../config/environment', __FILE__)
+require_relative '../config/environment'
 require 'rails/test_help'
 
 require 'mocha/setup'
@@ -16,11 +16,11 @@ class ActiveSupport::TestCase
   protected
 
   def logfile_path
-    Rails.root + 'tmp' + "#{self.class.name.underscore}.#{__name__}.log"
+    Rails.root + 'tmp' + "#{self.class.name.underscore}.#{name}.log"
   end
 
   def screenshot_path
-    Rails.root + 'tmp' + "#{self.class.name.underscore}.#{__name__}.png"
+    Rails.root + 'tmp' + "#{self.class.name.underscore}.#{name}.png"
   end
 
   def file_path(name)
-- 
cgit v1.2.3


From 7689ff40b24786c808a36e60801ab60ede89a106 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 24 Mar 2016 14:52:16 +0100
Subject: upgrade: use bootstrap3 variable names in leap.scss

---
 app/assets/stylesheets/leap.scss | 20 ++++++++++----------
 test/leap_web_users_test.rb      |  7 -------
 2 files changed, 10 insertions(+), 17 deletions(-)
 delete mode 100644 test/leap_web_users_test.rb

diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss
index 19491c8..329fc09 100644
--- a/app/assets/stylesheets/leap.scss
+++ b/app/assets/stylesheets/leap.scss
@@ -91,8 +91,8 @@
 //
 
 input.large {
-  font-size: $baseFontSize * 1.25;
-  line-height: $baseLineHeight * 1.5;
+  font-size: $font-size-base * 1.25;
+  line-height: $line-height-base * 1.5;
 }
 
 .p {
@@ -119,9 +119,9 @@ input, textarea {
 
 // like a label, but with no background
 .label-clear {
-  background-color: $white;
+  background-color: $body-bg;
   text-shadow: none;
-  color: $black;
+  color: $gray-base;
 }
 
 // force a black icon, even if bootstrap thinks differently
@@ -187,7 +187,7 @@ input, textarea {
     font-weight: bold;
   }
   a {
-    color: $textColor;
+    color: $text-color;
   }
 }
 
@@ -227,9 +227,9 @@ input, textarea {
   box-shadow: 0 2px 4px rgba(0,0,0,.1);
   li.active {
     a, a:hover {
-      background-color: $linkColor;
-      color: $white;
-      border-color: darken($linkColor, 0%);
+      background-color: $link-color;
+      color: $body-bg;
+      border-color: darken($link-color, 0%);
       cursor: pointer;
     }
   }
@@ -264,7 +264,7 @@ $footer-height: 100px;
 $footer-border-width: 1px;
 $footer-gutter: 20px; // vertical gap above footer
 $footer-combined: $footer-height + $footer-border-width + $footer-gutter;
-$footer-color: $grayLighter !default;
+$footer-color: $gray-lighter !default;
 
 html, body {
   height: 100%;
@@ -312,7 +312,7 @@ html, body {
     // border-top: $footer-border-width solid darken($footer-color, 10%);
     background-color: $footer-color;
     a {
-      color: $black;
+      color: $gray-base;
       margin: 0 5px;
     }
   }
diff --git a/test/leap_web_users_test.rb b/test/leap_web_users_test.rb
deleted file mode 100644
index f142e54..0000000
--- a/test/leap_web_users_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class LeapWebUsersTest < ActiveSupport::TestCase
-  test "module exists" do
-    assert_kind_of Module, LeapWebUsers
-  end
-end
-- 
cgit v1.2.3


From bef4c747e8a6adbf485dc0f466dbee1d03eab9c0 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 24 Mar 2016 21:44:25 +0100
Subject: test: use assert_error_response in functional test

This way the changed flash hash still is recognized.

Also changed the generic 'no_such_thing' i18n key to more specific 'no_such_user'.
The former is very hard to translate as the gender of thing may affect the translation of the 'no such' part.
---
 config/locales/en/generic.en.yml         |  2 +-
 test/functional/users_controller_test.rb |  2 +-
 test/support/assert_responses.rb         | 11 +++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/config/locales/en/generic.en.yml b/config/locales/en/generic.en.yml
index be62a40..617116f 100644
--- a/config/locales/en/generic.en.yml
+++ b/config/locales/en/generic.en.yml
@@ -21,7 +21,7 @@ en:
 
   example_email: 'user@domain.org'
 
-  no_such_thing: "No such %{thing}."
+  no_such_user: "No such user."
   create_thing: "Create %{thing}"
 
   overview: "Overview"
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index 7b24098..6029c83 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -67,8 +67,8 @@ class UsersControllerTest < ActionController::TestCase
     nonid = 'thisisnotanexistinguserid'
     login :is_admin? => true
     get :show, :id => nonid
+    assert_error_response :no_such_user
     assert_response :redirect
-    assert_equal({:alert => "No such user."}, flash.to_hash)
     assert_redirected_to users_path
   end
 
diff --git a/test/support/assert_responses.rb b/test/support/assert_responses.rb
index 98c9ad2..6a22642 100644
--- a/test/support/assert_responses.rb
+++ b/test/support/assert_responses.rb
@@ -71,15 +71,18 @@ module AssertResponses
   end
 
   def assert_login_required
-    assert_error_response :not_authorized_login, :unauthorized
+    assert_error_response :not_authorized_login,
+      status: :unauthorized
   end
 
   def assert_access_denied
-    assert_error_response :not_authorized, :forbidden
+    assert_error_response :not_authorized,
+      status: :forbidden
   end
 
-  def assert_error_response(key, status=nil)
-    message = I18n.t(key)
+  def assert_error_response(key, options = {})
+    status=options.delete :status
+    message = I18n.t(key, options)
     if content_type == 'application/json'
       status ||= :unprocessable_entity
       assert_json_response('error' => key.to_s, 'message' => message)
-- 
cgit v1.2.3


From b718bea325793430d06d94570dd848fc71a57387 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 24 Mar 2016 21:45:14 +0100
Subject: upgrade: typeahead is not in bootstrap3 anymore

using twitter/typeahead instead which seems to have similar properties
---
 app/assets/javascripts/application.js      |    1 +
 app/assets/javascripts/typeahead.bundle.js | 2451 ++++++++++++++++++++++++++++
 config/environments/test.rb                |    2 +
 3 files changed, 2454 insertions(+)
 create mode 100644 app/assets/javascripts/typeahead.bundle.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 9af373d..7888161 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -16,6 +16,7 @@
 //= require bootstrap
 //= require rails.validations
 //= require rails.validations.simple_form
+//= require typeahead.bundle
 //= require leap
 //= require platform
 //= require tickets
diff --git a/app/assets/javascripts/typeahead.bundle.js b/app/assets/javascripts/typeahead.bundle.js
new file mode 100644
index 0000000..bb0c8ae
--- /dev/null
+++ b/app/assets/javascripts/typeahead.bundle.js
@@ -0,0 +1,2451 @@
+/*!
+ * typeahead.js 0.11.1
+ * https://github.com/twitter/typeahead.js
+ * Copyright 2013-2015 Twitter, Inc. and other contributors; Licensed MIT
+ */
+
+(function(root, factory) {
+    if (typeof define === "function" && define.amd) {
+        define("bloodhound", [ "jquery" ], function(a0) {
+            return root["Bloodhound"] = factory(a0);
+        });
+    } else if (typeof exports === "object") {
+        module.exports = factory(require("jquery"));
+    } else {
+        root["Bloodhound"] = factory(jQuery);
+    }
+})(this, function($) {
+    var _ = function() {
+        "use strict";
+        return {
+            isMsie: function() {
+                return /(msie|trident)/i.test(navigator.userAgent) ? navigator.userAgent.match(/(msie |rv:)(\d+(.\d+)?)/i)[2] : false;
+            },
+            isBlankString: function(str) {
+                return !str || /^\s*$/.test(str);
+            },
+            escapeRegExChars: function(str) {
+                return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
+            },
+            isString: function(obj) {
+                return typeof obj === "string";
+            },
+            isNumber: function(obj) {
+                return typeof obj === "number";
+            },
+            isArray: $.isArray,
+            isFunction: $.isFunction,
+            isObject: $.isPlainObject,
+            isUndefined: function(obj) {
+                return typeof obj === "undefined";
+            },
+            isElement: function(obj) {
+                return !!(obj && obj.nodeType === 1);
+            },
+            isJQuery: function(obj) {
+                return obj instanceof $;
+            },
+            toStr: function toStr(s) {
+                return _.isUndefined(s) || s === null ? "" : s + "";
+            },
+            bind: $.proxy,
+            each: function(collection, cb) {
+                $.each(collection, reverseArgs);
+                function reverseArgs(index, value) {
+                    return cb(value, index);
+                }
+            },
+            map: $.map,
+            filter: $.grep,
+            every: function(obj, test) {
+                var result = true;
+                if (!obj) {
+                    return result;
+                }
+                $.each(obj, function(key, val) {
+                    if (!(result = test.call(null, val, key, obj))) {
+                        return false;
+                    }
+                });
+                return !!result;
+            },
+            some: function(obj, test) {
+                var result = false;
+                if (!obj) {
+                    return result;
+                }
+                $.each(obj, function(key, val) {
+                    if (result = test.call(null, val, key, obj)) {
+                        return false;
+                    }
+                });
+                return !!result;
+            },
+            mixin: $.extend,
+            identity: function(x) {
+                return x;
+            },
+            clone: function(obj) {
+                return $.extend(true, {}, obj);
+            },
+            getIdGenerator: function() {
+                var counter = 0;
+                return function() {
+                    return counter++;
+                };
+            },
+            templatify: function templatify(obj) {
+                return $.isFunction(obj) ? obj : template;
+                function template() {
+                    return String(obj);
+                }
+            },
+            defer: function(fn) {
+                setTimeout(fn, 0);
+            },
+            debounce: function(func, wait, immediate) {
+                var timeout, result;
+                return function() {
+                    var context = this, args = arguments, later, callNow;
+                    later = function() {
+                        timeout = null;
+                        if (!immediate) {
+                            result = func.apply(context, args);
+                        }
+                    };
+                    callNow = immediate && !timeout;
+                    clearTimeout(timeout);
+                    timeout = setTimeout(later, wait);
+                    if (callNow) {
+                        result = func.apply(context, args);
+                    }
+                    return result;
+                };
+            },
+            throttle: function(func, wait) {
+                var context, args, timeout, result, previous, later;
+                previous = 0;
+                later = function() {
+                    previous = new Date();
+                    timeout = null;
+                    result = func.apply(context, args);
+                };
+                return function() {
+                    var now = new Date(), remaining = wait - (now - previous);
+                    context = this;
+                    args = arguments;
+                    if (remaining <= 0) {
+                        clearTimeout(timeout);
+                        timeout = null;
+                        previous = now;
+                        result = func.apply(context, args);
+                    } else if (!timeout) {
+                        timeout = setTimeout(later, remaining);
+                    }
+                    return result;
+                };
+            },
+            stringify: function(val) {
+                return _.isString(val) ? val : JSON.stringify(val);
+            },
+            noop: function() {}
+        };
+    }();
+    var VERSION = "0.11.1";
+    var tokenizers = function() {
+        "use strict";
+        return {
+            nonword: nonword,
+            whitespace: whitespace,
+            obj: {
+                nonword: getObjTokenizer(nonword),
+                whitespace: getObjTokenizer(whitespace)
+            }
+        };
+        function whitespace(str) {
+            str = _.toStr(str);
+            return str ? str.split(/\s+/) : [];
+        }
+        function nonword(str) {
+            str = _.toStr(str);
+            return str ? str.split(/\W+/) : [];
+        }
+        function getObjTokenizer(tokenizer) {
+            return function setKey(keys) {
+                keys = _.isArray(keys) ? keys : [].slice.call(arguments, 0);
+                return function tokenize(o) {
+                    var tokens = [];
+                    _.each(keys, function(k) {
+                        tokens = tokens.concat(tokenizer(_.toStr(o[k])));
+                    });
+                    return tokens;
+                };
+            };
+        }
+    }();
+    var LruCache = function() {
+        "use strict";
+        function LruCache(maxSize) {
+            this.maxSize = _.isNumber(maxSize) ? maxSize : 100;
+            this.reset();
+            if (this.maxSize <= 0) {
+                this.set = this.get = $.noop;
+            }
+        }
+        _.mixin(LruCache.prototype, {
+            set: function set(key, val) {
+                var tailItem = this.list.tail, node;
+                if (this.size >= this.maxSize) {
+                    this.list.remove(tailItem);
+                    delete this.hash[tailItem.key];
+                    this.size--;
+                }
+                if (node = this.hash[key]) {
+                    node.val = val;
+                    this.list.moveToFront(node);
+                } else {
+                    node = new Node(key, val);
+                    this.list.add(node);
+                    this.hash[key] = node;
+                    this.size++;
+                }
+            },
+            get: function get(key) {
+                var node = this.hash[key];
+                if (node) {
+                    this.list.moveToFront(node);
+                    return node.val;
+                }
+            },
+            reset: function reset() {
+                this.size = 0;
+                this.hash = {};
+                this.list = new List();
+            }
+        });
+        function List() {
+            this.head = this.tail = null;
+        }
+        _.mixin(List.prototype, {
+            add: function add(node) {
+                if (this.head) {
+                    node.next = this.head;
+                    this.head.prev = node;
+                }
+                this.head = node;
+                this.tail = this.tail || node;
+            },
+            remove: function remove(node) {
+                node.prev ? node.prev.next = node.next : this.head = node.next;
+                node.next ? node.next.prev = node.prev : this.tail = node.prev;
+            },
+            moveToFront: function(node) {
+                this.remove(node);
+                this.add(node);
+            }
+        });
+        function Node(key, val) {
+            this.key = key;
+            this.val = val;
+            this.prev = this.next = null;
+        }
+        return LruCache;
+    }();
+    var PersistentStorage = function() {
+        "use strict";
+        var LOCAL_STORAGE;
+        try {
+            LOCAL_STORAGE = window.localStorage;
+            LOCAL_STORAGE.setItem("~~~", "!");
+            LOCAL_STORAGE.removeItem("~~~");
+        } catch (err) {
+            LOCAL_STORAGE = null;
+        }
+        function PersistentStorage(namespace, override) {
+            this.prefix = [ "__", namespace, "__" ].join("");
+            this.ttlKey = "__ttl__";
+            this.keyMatcher = new RegExp("^" + _.escapeRegExChars(this.prefix));
+            this.ls = override || LOCAL_STORAGE;
+            !this.ls && this._noop();
+        }
+        _.mixin(PersistentStorage.prototype, {
+            _prefix: function(key) {
+                return this.prefix + key;
+            },
+            _ttlKey: function(key) {
+                return this._prefix(key) + this.ttlKey;
+            },
+            _noop: function() {
+                this.get = this.set = this.remove = this.clear = this.isExpired = _.noop;
+            },
+            _safeSet: function(key, val) {
+                try {
+                    this.ls.setItem(key, val);
+                } catch (err) {
+                    if (err.name === "QuotaExceededError") {
+                        this.clear();
+                        this._noop();
+                    }
+                }
+            },
+            get: function(key) {
+                if (this.isExpired(key)) {
+                    this.remove(key);
+                }
+                return decode(this.ls.getItem(this._prefix(key)));
+            },
+            set: function(key, val, ttl) {
+                if (_.isNumber(ttl)) {
+                    this._safeSet(this._ttlKey(key), encode(now() + ttl));
+                } else {
+                    this.ls.removeItem(this._ttlKey(key));
+                }
+                return this._safeSet(this._prefix(key), encode(val));
+            },
+            remove: function(key) {
+                this.ls.removeItem(this._ttlKey(key));
+                this.ls.removeItem(this._prefix(key));
+                return this;
+            },
+            clear: function() {
+                var i, keys = gatherMatchingKeys(this.keyMatcher);
+                for (i = keys.length; i--; ) {
+                    this.remove(keys[i]);
+                }
+                return this;
+            },
+            isExpired: function(key) {
+                var ttl = decode(this.ls.getItem(this._ttlKey(key)));
+                return _.isNumber(ttl) && now() > ttl ? true : false;
+            }
+        });
+        return PersistentStorage;
+        function now() {
+            return new Date().getTime();
+        }
+        function encode(val) {
+            return JSON.stringify(_.isUndefined(val) ? null : val);
+        }
+        function decode(val) {
+            return $.parseJSON(val);
+        }
+        function gatherMatchingKeys(keyMatcher) {
+            var i, key, keys = [], len = LOCAL_STORAGE.length;
+            for (i = 0; i < len; i++) {
+                if ((key = LOCAL_STORAGE.key(i)).match(keyMatcher)) {
+                    keys.push(key.replace(keyMatcher, ""));
+                }
+            }
+            return keys;
+        }
+    }();
+    var Transport = function() {
+        "use strict";
+        var pendingRequestsCount = 0, pendingRequests = {}, maxPendingRequests = 6, sharedCache = new LruCache(10);
+        function Transport(o) {
+            o = o || {};
+            this.cancelled = false;
+            this.lastReq = null;
+            this._send = o.transport;
+            this._get = o.limiter ? o.limiter(this._get) : this._get;
+            this._cache = o.cache === false ? new LruCache(0) : sharedCache;
+        }
+        Transport.setMaxPendingRequests = function setMaxPendingRequests(num) {
+            maxPendingRequests = num;
+        };
+        Transport.resetCache = function resetCache() {
+            sharedCache.reset();
+        };
+        _.mixin(Transport.prototype, {
+            _fingerprint: function fingerprint(o) {
+                o = o || {};
+                return o.url + o.type + $.param(o.data || {});
+            },
+            _get: function(o, cb) {
+                var that = this, fingerprint, jqXhr;
+                fingerprint = this._fingerprint(o);
+                if (this.cancelled || fingerprint !== this.lastReq) {
+                    return;
+                }
+                if (jqXhr = pendingRequests[fingerprint]) {
+                    jqXhr.done(done).fail(fail);
+                } else if (pendingRequestsCount < maxPendingRequests) {
+                    pendingRequestsCount++;
+                    pendingRequests[fingerprint] = this._send(o).done(done).fail(fail).always(always);
+                } else {
+                    this.onDeckRequestArgs = [].slice.call(arguments, 0);
+                }
+                function done(resp) {
+                    cb(null, resp);
+                    that._cache.set(fingerprint, resp);
+                }
+                function fail() {
+                    cb(true);
+                }
+                function always() {
+                    pendingRequestsCount--;
+                    delete pendingRequests[fingerprint];
+                    if (that.onDeckRequestArgs) {
+                        that._get.apply(that, that.onDeckRequestArgs);
+                        that.onDeckRequestArgs = null;
+                    }
+                }
+            },
+            get: function(o, cb) {
+                var resp, fingerprint;
+                cb = cb || $.noop;
+                o = _.isString(o) ? {
+                    url: o
+                } : o || {};
+                fingerprint = this._fingerprint(o);
+                this.cancelled = false;
+                this.lastReq = fingerprint;
+                if (resp = this._cache.get(fingerprint)) {
+                    cb(null, resp);
+                } else {
+                    this._get(o, cb);
+                }
+            },
+            cancel: function() {
+                this.cancelled = true;
+            }
+        });
+        return Transport;
+    }();
+    var SearchIndex = window.SearchIndex = function() {
+        "use strict";
+        var CHILDREN = "c", IDS = "i";
+        function SearchIndex(o) {
+            o = o || {};
+            if (!o.datumTokenizer || !o.queryTokenizer) {
+                $.error("datumTokenizer and queryTokenizer are both required");
+            }
+            this.identify = o.identify || _.stringify;
+            this.datumTokenizer = o.datumTokenizer;
+            this.queryTokenizer = o.queryTokenizer;
+            this.reset();
+        }
+        _.mixin(SearchIndex.prototype, {
+            bootstrap: function bootstrap(o) {
+                this.datums = o.datums;
+                this.trie = o.trie;
+            },
+            add: function(data) {
+                var that = this;
+                data = _.isArray(data) ? data : [ data ];
+                _.each(data, function(datum) {
+                    var id, tokens;
+                    that.datums[id = that.identify(datum)] = datum;
+                    tokens = normalizeTokens(that.datumTokenizer(datum));
+                    _.each(tokens, function(token) {
+                        var node, chars, ch;
+                        node = that.trie;
+                        chars = token.split("");
+                        while (ch = chars.shift()) {
+                            node = node[CHILDREN][ch] || (node[CHILDREN][ch] = newNode());
+                            node[IDS].push(id);
+                        }
+                    });
+                });
+            },
+            get: function get(ids) {
+                var that = this;
+                return _.map(ids, function(id) {
+                    return that.datums[id];
+                });
+            },
+            search: function search(query) {
+                var that = this, tokens, matches;
+                tokens = normalizeTokens(this.queryTokenizer(query));
+                _.each(tokens, function(token) {
+                    var node, chars, ch, ids;
+                    if (matches && matches.length === 0) {
+                        return false;
+                    }
+                    node = that.trie;
+                    chars = token.split("");
+                    while (node && (ch = chars.shift())) {
+                        node = node[CHILDREN][ch];
+                    }
+                    if (node && chars.length === 0) {
+                        ids = node[IDS].slice(0);
+                        matches = matches ? getIntersection(matches, ids) : ids;
+                    } else {
+                        matches = [];
+                        return false;
+                    }
+                });
+                return matches ? _.map(unique(matches), function(id) {
+                    return that.datums[id];
+                }) : [];
+            },
+            all: function all() {
+                var values = [];
+                for (var key in this.datums) {
+                    values.push(this.datums[key]);
+                }
+                return values;
+            },
+            reset: function reset() {
+                this.datums = {};
+                this.trie = newNode();
+            },
+            serialize: function serialize() {
+                return {
+                    datums: this.datums,
+                    trie: this.trie
+                };
+            }
+        });
+        return SearchIndex;
+        function normalizeTokens(tokens) {
+            tokens = _.filter(tokens, function(token) {
+                return !!token;
+            });
+            tokens = _.map(tokens, function(token) {
+                return token.toLowerCase();
+            });
+            return tokens;
+        }
+        function newNode() {
+            var node = {};
+            node[IDS] = [];
+            node[CHILDREN] = {};
+            return node;
+        }
+        function unique(array) {
+            var seen = {}, uniques = [];
+            for (var i = 0, len = array.length; i < len; i++) {
+                if (!seen[array[i]]) {
+                    seen[array[i]] = true;
+                    uniques.push(array[i]);
+                }
+            }
+            return uniques;
+        }
+        function getIntersection(arrayA, arrayB) {
+            var ai = 0, bi = 0, intersection = [];
+            arrayA = arrayA.sort();
+            arrayB = arrayB.sort();
+            var lenArrayA = arrayA.length, lenArrayB = arrayB.length;
+            while (ai < lenArrayA && bi < lenArrayB) {
+                if (arrayA[ai] < arrayB[bi]) {
+                    ai++;
+                } else if (arrayA[ai] > arrayB[bi]) {
+                    bi++;
+                } else {
+                    intersection.push(arrayA[ai]);
+                    ai++;
+                    bi++;
+                }
+            }
+            return intersection;
+        }
+    }();
+    var Prefetch = function() {
+        "use strict";
+        var keys;
+        keys = {
+            data: "data",
+            protocol: "protocol",
+            thumbprint: "thumbprint"
+        };
+        function Prefetch(o) {
+            this.url = o.url;
+            this.ttl = o.ttl;
+            this.cache = o.cache;
+            this.prepare = o.prepare;
+            this.transform = o.transform;
+            this.transport = o.transport;
+            this.thumbprint = o.thumbprint;
+            this.storage = new PersistentStorage(o.cacheKey);
+        }
+        _.mixin(Prefetch.prototype, {
+            _settings: function settings() {
+                return {
+                    url: this.url,
+                    type: "GET",
+                    dataType: "json"
+                };
+            },
+            store: function store(data) {
+                if (!this.cache) {
+                    return;
+                }
+                this.storage.set(keys.data, data, this.ttl);
+                this.storage.set(keys.protocol, location.protocol, this.ttl);
+                this.storage.set(keys.thumbprint, this.thumbprint, this.ttl);
+            },
+            fromCache: function fromCache() {
+                var stored = {}, isExpired;
+                if (!this.cache) {
+                    return null;
+                }
+                stored.data = this.storage.get(keys.data);
+                stored.protocol = this.storage.get(keys.protocol);
+                stored.thumbprint = this.storage.get(keys.thumbprint);
+                isExpired = stored.thumbprint !== this.thumbprint || stored.protocol !== location.protocol;
+                return stored.data && !isExpired ? stored.data : null;
+            },
+            fromNetwork: function(cb) {
+                var that = this, settings;
+                if (!cb) {
+                    return;
+                }
+                settings = this.prepare(this._settings());
+                this.transport(settings).fail(onError).done(onResponse);
+                function onError() {
+                    cb(true);
+                }
+                function onResponse(resp) {
+                    cb(null, that.transform(resp));
+                }
+            },
+            clear: function clear() {
+                this.storage.clear();
+                return this;
+            }
+        });
+        return Prefetch;
+    }();
+    var Remote = function() {
+        "use strict";
+        function Remote(o) {
+            this.url = o.url;
+            this.prepare = o.prepare;
+            this.transform = o.transform;
+            this.transport = new Transport({
+                cache: o.cache,
+                limiter: o.limiter,
+                transport: o.transport
+            });
+        }
+        _.mixin(Remote.prototype, {
+            _settings: function settings() {
+                return {
+                    url: this.url,
+                    type: "GET",
+                    dataType: "json"
+                };
+            },
+            get: function get(query, cb) {
+                var that = this, settings;
+                if (!cb) {
+                    return;
+                }
+                query = query || "";
+                settings = this.prepare(query, this._settings());
+                return this.transport.get(settings, onResponse);
+                function onResponse(err, resp) {
+                    err ? cb([]) : cb(that.transform(resp));
+                }
+            },
+            cancelLastRequest: function cancelLastRequest() {
+                this.transport.cancel();
+            }
+        });
+        return Remote;
+    }();
+    var oParser = function() {
+        "use strict";
+        return function parse(o) {
+            var defaults, sorter;
+            defaults = {
+                initialize: true,
+                identify: _.stringify,
+                datumTokenizer: null,
+                queryTokenizer: null,
+                sufficient: 5,
+                sorter: null,
+                local: [],
+                prefetch: null,
+                remote: null
+            };
+            o = _.mixin(defaults, o || {});
+            !o.datumTokenizer && $.error("datumTokenizer is required");
+            !o.queryTokenizer && $.error("queryTokenizer is required");
+            sorter = o.sorter;
+            o.sorter = sorter ? function(x) {
+                return x.sort(sorter);
+            } : _.identity;
+            o.local = _.isFunction(o.local) ? o.local() : o.local;
+            o.prefetch = parsePrefetch(o.prefetch);
+            o.remote = parseRemote(o.remote);
+            return o;
+        };
+        function parsePrefetch(o) {
+            var defaults;
+            if (!o) {
+                return null;
+            }
+            defaults = {
+                url: null,
+                ttl: 24 * 60 * 60 * 1e3,
+                cache: true,
+                cacheKey: null,
+                thumbprint: "",
+                prepare: _.identity,
+                transform: _.identity,
+                transport: null
+            };
+            o = _.isString(o) ? {
+                url: o
+            } : o;
+            o = _.mixin(defaults, o);
+            !o.url && $.error("prefetch requires url to be set");
+            o.transform = o.filter || o.transform;
+            o.cacheKey = o.cacheKey || o.url;
+            o.thumbprint = VERSION + o.thumbprint;
+            o.transport = o.transport ? callbackToDeferred(o.transport) : $.ajax;
+            return o;
+        }
+        function parseRemote(o) {
+            var defaults;
+            if (!o) {
+                return;
+            }
+            defaults = {
+                url: null,
+                cache: true,
+                prepare: null,
+                replace: null,
+                wildcard: null,
+                limiter: null,
+                rateLimitBy: "debounce",
+                rateLimitWait: 300,
+                transform: _.identity,
+                transport: null
+            };
+            o = _.isString(o) ? {
+                url: o
+            } : o;
+            o = _.mixin(defaults, o);
+            !o.url && $.error("remote requires url to be set");
+            o.transform = o.filter || o.transform;
+            o.prepare = toRemotePrepare(o);
+            o.limiter = toLimiter(o);
+            o.transport = o.transport ? callbackToDeferred(o.transport) : $.ajax;
+            delete o.replace;
+            delete o.wildcard;
+            delete o.rateLimitBy;
+            delete o.rateLimitWait;
+            return o;
+        }
+        function toRemotePrepare(o) {
+            var prepare, replace, wildcard;
+            prepare = o.prepare;
+            replace = o.replace;
+            wildcard = o.wildcard;
+            if (prepare) {
+                return prepare;
+            }
+            if (replace) {
+                prepare = prepareByReplace;
+            } else if (o.wildcard) {
+                prepare = prepareByWildcard;
+            } else {
+                prepare = idenityPrepare;
+            }
+            return prepare;
+            function prepareByReplace(query, settings) {
+                settings.url = replace(settings.url, query);
+                return settings;
+            }
+            function prepareByWildcard(query, settings) {
+                settings.url = settings.url.replace(wildcard, encodeURIComponent(query));
+                return settings;
+            }
+            function idenityPrepare(query, settings) {
+                return settings;
+            }
+        }
+        function toLimiter(o) {
+            var limiter, method, wait;
+            limiter = o.limiter;
+            method = o.rateLimitBy;
+            wait = o.rateLimitWait;
+            if (!limiter) {
+                limiter = /^throttle$/i.test(method) ? throttle(wait) : debounce(wait);
+            }
+            return limiter;
+            function debounce(wait) {
+                return function debounce(fn) {
+                    return _.debounce(fn, wait);
+                };
+            }
+            function throttle(wait) {
+                return function throttle(fn) {
+                    return _.throttle(fn, wait);
+                };
+            }
+        }
+        function callbackToDeferred(fn) {
+            return function wrapper(o) {
+                var deferred = $.Deferred();
+                fn(o, onSuccess, onError);
+                return deferred;
+                function onSuccess(resp) {
+                    _.defer(function() {
+                        deferred.resolve(resp);
+                    });
+                }
+                function onError(err) {
+                    _.defer(function() {
+                        deferred.reject(err);
+                    });
+                }
+            };
+        }
+    }();
+    var Bloodhound = function() {
+        "use strict";
+        var old;
+        old = window && window.Bloodhound;
+        function Bloodhound(o) {
+            o = oParser(o);
+            this.sorter = o.sorter;
+            this.identify = o.identify;
+            this.sufficient = o.sufficient;
+            this.local = o.local;
+            this.remote = o.remote ? new Remote(o.remote) : null;
+            this.prefetch = o.prefetch ? new Prefetch(o.prefetch) : null;
+            this.index = new SearchIndex({
+                identify: this.identify,
+                datumTokenizer: o.datumTokenizer,
+                queryTokenizer: o.queryTokenizer
+            });
+            o.initialize !== false && this.initialize();
+        }
+        Bloodhound.noConflict = function noConflict() {
+            window && (window.Bloodhound = old);
+            return Bloodhound;
+        };
+        Bloodhound.tokenizers = tokenizers;
+        _.mixin(Bloodhound.prototype, {
+            __ttAdapter: function ttAdapter() {
+                var that = this;
+                return this.remote ? withAsync : withoutAsync;
+                function withAsync(query, sync, async) {
+                    return that.search(query, sync, async);
+                }
+                function withoutAsync(query, sync) {
+                    return that.search(query, sync);
+                }
+            },
+            _loadPrefetch: function loadPrefetch() {
+                var that = this, deferred, serialized;
+                deferred = $.Deferred();
+                if (!this.prefetch) {
+                    deferred.resolve();
+                } else if (serialized = this.prefetch.fromCache()) {
+                    this.index.bootstrap(serialized);
+                    deferred.resolve();
+                } else {
+                    this.prefetch.fromNetwork(done);
+                }
+                return deferred.promise();
+                function done(err, data) {
+                    if (err) {
+                        return deferred.reject();
+                    }
+                    that.add(data);
+                    that.prefetch.store(that.index.serialize());
+                    deferred.resolve();
+                }
+            },
+            _initialize: function initialize() {
+                var that = this, deferred;
+                this.clear();
+                (this.initPromise = this._loadPrefetch()).done(addLocalToIndex);
+                return this.initPromise;
+                function addLocalToIndex() {
+                    that.add(that.local);
+                }
+            },
+            initialize: function initialize(force) {
+                return !this.initPromise || force ? this._initialize() : this.initPromise;
+            },
+            add: function add(data) {
+                this.index.add(data);
+                return this;
+            },
+            get: function get(ids) {
+                ids = _.isArray(ids) ? ids : [].slice.call(arguments);
+                return this.index.get(ids);
+            },
+            search: function search(query, sync, async) {
+                var that = this, local;
+                local = this.sorter(this.index.search(query));
+                sync(this.remote ? local.slice() : local);
+                if (this.remote && local.length < this.sufficient) {
+                    this.remote.get(query, processRemote);
+                } else if (this.remote) {
+                    this.remote.cancelLastRequest();
+                }
+                return this;
+                function processRemote(remote) {
+                    var nonDuplicates = [];
+                    _.each(remote, function(r) {
+                        !_.some(local, function(l) {
+                            return that.identify(r) === that.identify(l);
+                        }) && nonDuplicates.push(r);
+                    });
+                    async && async(nonDuplicates);
+                }
+            },
+            all: function all() {
+                return this.index.all();
+            },
+            clear: function clear() {
+                this.index.reset();
+                return this;
+            },
+            clearPrefetchCache: function clearPrefetchCache() {
+                this.prefetch && this.prefetch.clear();
+                return this;
+            },
+            clearRemoteCache: function clearRemoteCache() {
+                Transport.resetCache();
+                return this;
+            },
+            ttAdapter: function ttAdapter() {
+                return this.__ttAdapter();
+            }
+        });
+        return Bloodhound;
+    }();
+    return Bloodhound;
+});
+
+(function(root, factory) {
+    if (typeof define === "function" && define.amd) {
+        define("typeahead.js", [ "jquery" ], function(a0) {
+            return factory(a0);
+        });
+    } else if (typeof exports === "object") {
+        module.exports = factory(require("jquery"));
+    } else {
+        factory(jQuery);
+    }
+})(this, function($) {
+    var _ = function() {
+        "use strict";
+        return {
+            isMsie: function() {
+                return /(msie|trident)/i.test(navigator.userAgent) ? navigator.userAgent.match(/(msie |rv:)(\d+(.\d+)?)/i)[2] : false;
+            },
+            isBlankString: function(str) {
+                return !str || /^\s*$/.test(str);
+            },
+            escapeRegExChars: function(str) {
+                return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
+            },
+            isString: function(obj) {
+                return typeof obj === "string";
+            },
+            isNumber: function(obj) {
+                return typeof obj === "number";
+            },
+            isArray: $.isArray,
+            isFunction: $.isFunction,
+            isObject: $.isPlainObject,
+            isUndefined: function(obj) {
+                return typeof obj === "undefined";
+            },
+            isElement: function(obj) {
+                return !!(obj && obj.nodeType === 1);
+            },
+            isJQuery: function(obj) {
+                return obj instanceof $;
+            },
+            toStr: function toStr(s) {
+                return _.isUndefined(s) || s === null ? "" : s + "";
+            },
+            bind: $.proxy,
+            each: function(collection, cb) {
+                $.each(collection, reverseArgs);
+                function reverseArgs(index, value) {
+                    return cb(value, index);
+                }
+            },
+            map: $.map,
+            filter: $.grep,
+            every: function(obj, test) {
+                var result = true;
+                if (!obj) {
+                    return result;
+                }
+                $.each(obj, function(key, val) {
+                    if (!(result = test.call(null, val, key, obj))) {
+                        return false;
+                    }
+                });
+                return !!result;
+            },
+            some: function(obj, test) {
+                var result = false;
+                if (!obj) {
+                    return result;
+                }
+                $.each(obj, function(key, val) {
+                    if (result = test.call(null, val, key, obj)) {
+                        return false;
+                    }
+                });
+                return !!result;
+            },
+            mixin: $.extend,
+            identity: function(x) {
+                return x;
+            },
+            clone: function(obj) {
+                return $.extend(true, {}, obj);
+            },
+            getIdGenerator: function() {
+                var counter = 0;
+                return function() {
+                    return counter++;
+                };
+            },
+            templatify: function templatify(obj) {
+                return $.isFunction(obj) ? obj : template;
+                function template() {
+                    return String(obj);
+                }
+            },
+            defer: function(fn) {
+                setTimeout(fn, 0);
+            },
+            debounce: function(func, wait, immediate) {
+                var timeout, result;
+                return function() {
+                    var context = this, args = arguments, later, callNow;
+                    later = function() {
+                        timeout = null;
+                        if (!immediate) {
+                            result = func.apply(context, args);
+                        }
+                    };
+                    callNow = immediate && !timeout;
+                    clearTimeout(timeout);
+                    timeout = setTimeout(later, wait);
+                    if (callNow) {
+                        result = func.apply(context, args);
+                    }
+                    return result;
+                };
+            },
+            throttle: function(func, wait) {
+                var context, args, timeout, result, previous, later;
+                previous = 0;
+                later = function() {
+                    previous = new Date();
+                    timeout = null;
+                    result = func.apply(context, args);
+                };
+                return function() {
+                    var now = new Date(), remaining = wait - (now - previous);
+                    context = this;
+                    args = arguments;
+                    if (remaining <= 0) {
+                        clearTimeout(timeout);
+                        timeout = null;
+                        previous = now;
+                        result = func.apply(context, args);
+                    } else if (!timeout) {
+                        timeout = setTimeout(later, remaining);
+                    }
+                    return result;
+                };
+            },
+            stringify: function(val) {
+                return _.isString(val) ? val : JSON.stringify(val);
+            },
+            noop: function() {}
+        };
+    }();
+    var WWW = function() {
+        "use strict";
+        var defaultClassNames = {
+            wrapper: "twitter-typeahead",
+            input: "tt-input",
+            hint: "tt-hint",
+            menu: "tt-menu",
+            dataset: "tt-dataset",
+            suggestion: "tt-suggestion",
+            selectable: "tt-selectable",
+            empty: "tt-empty",
+            open: "tt-open",
+            cursor: "tt-cursor",
+            highlight: "tt-highlight"
+        };
+        return build;
+        function build(o) {
+            var www, classes;
+            classes = _.mixin({}, defaultClassNames, o);
+            www = {
+                css: buildCss(),
+                classes: classes,
+                html: buildHtml(classes),
+                selectors: buildSelectors(classes)
+            };
+            return {
+                css: www.css,
+                html: www.html,
+                classes: www.classes,
+                selectors: www.selectors,
+                mixin: function(o) {
+                    _.mixin(o, www);
+                }
+            };
+        }
+        function buildHtml(c) {
+            return {
+                wrapper: '<span class="' + c.wrapper + '"></span>',
+                menu: '<div class="' + c.menu + '"></div>'
+            };
+        }
+        function buildSelectors(classes) {
+            var selectors = {};
+            _.each(classes, function(v, k) {
+                selectors[k] = "." + v;
+            });
+            return selectors;
+        }
+        function buildCss() {
+            var css = {
+                wrapper: {
+                    position: "relative",
+                    display: "inline-block"
+                },
+                hint: {
+                    position: "absolute",
+                    top: "0",
+                    left: "0",
+                    borderColor: "transparent",
+                    boxShadow: "none",
+                    opacity: "1"
+                },
+                input: {
+                    position: "relative",
+                    verticalAlign: "top",
+                    backgroundColor: "transparent"
+                },
+                inputWithNoHint: {
+                    position: "relative",
+                    verticalAlign: "top"
+                },
+                menu: {
+                    position: "absolute",
+                    top: "100%",
+                    left: "0",
+                    zIndex: "100",
+                    display: "none"
+                },
+                ltr: {
+                    left: "0",
+                    right: "auto"
+                },
+                rtl: {
+                    left: "auto",
+                    right: " 0"
+                }
+            };
+            if (_.isMsie()) {
+                _.mixin(css.input, {
+                    backgroundImage: "url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)"
+                });
+            }
+            return css;
+        }
+    }();
+    var EventBus = function() {
+        "use strict";
+        var namespace, deprecationMap;
+        namespace = "typeahead:";
+        deprecationMap = {
+            render: "rendered",
+            cursorchange: "cursorchanged",
+            select: "selected",
+            autocomplete: "autocompleted"
+        };
+        function EventBus(o) {
+            if (!o || !o.el) {
+                $.error("EventBus initialized without el");
+            }
+            this.$el = $(o.el);
+        }
+        _.mixin(EventBus.prototype, {
+            _trigger: function(type, args) {
+                var $e;
+                $e = $.Event(namespace + type);
+                (args = args || []).unshift($e);
+                this.$el.trigger.apply(this.$el, args);
+                return $e;
+            },
+            before: function(type) {
+                var args, $e;
+                args = [].slice.call(arguments, 1);
+                $e = this._trigger("before" + type, args);
+                return $e.isDefaultPrevented();
+            },
+            trigger: function(type) {
+                var deprecatedType;
+                this._trigger(type, [].slice.call(arguments, 1));
+                if (deprecatedType = deprecationMap[type]) {
+                    this._trigger(deprecatedType, [].slice.call(arguments, 1));
+                }
+            }
+        });
+        return EventBus;
+    }();
+    var EventEmitter = function() {
+        "use strict";
+        var splitter = /\s+/, nextTick = getNextTick();
+        return {
+            onSync: onSync,
+            onAsync: onAsync,
+            off: off,
+            trigger: trigger
+        };
+        function on(method, types, cb, context) {
+            var type;
+            if (!cb) {
+                return this;
+            }
+            types = types.split(splitter);
+            cb = context ? bindContext(cb, context) : cb;
+            this._callbacks = this._callbacks || {};
+            while (type = types.shift()) {
+                this._callbacks[type] = this._callbacks[type] || {
+                    sync: [],
+                    async: []
+                };
+                this._callbacks[type][method].push(cb);
+            }
+            return this;
+        }
+        function onAsync(types, cb, context) {
+            return on.call(this, "async", types, cb, context);
+        }
+        function onSync(types, cb, context) {
+            return on.call(this, "sync", types, cb, context);
+        }
+        function off(types) {
+            var type;
+            if (!this._callbacks) {
+                return this;
+            }
+            types = types.split(splitter);
+            while (type = types.shift()) {
+                delete this._callbacks[type];
+            }
+            return this;
+        }
+        function trigger(types) {
+            var type, callbacks, args, syncFlush, asyncFlush;
+            if (!this._callbacks) {
+                return this;
+            }
+            types = types.split(splitter);
+            args = [].slice.call(arguments, 1);
+            while ((type = types.shift()) && (callbacks = this._callbacks[type])) {
+                syncFlush = getFlush(callbacks.sync, this, [ type ].concat(args));
+                asyncFlush = getFlush(callbacks.async, this, [ type ].concat(args));
+                syncFlush() && nextTick(asyncFlush);
+            }
+            return this;
+        }
+        function getFlush(callbacks, context, args) {
+            return flush;
+            function flush() {
+                var cancelled;
+                for (var i = 0, len = callbacks.length; !cancelled && i < len; i += 1) {
+                    cancelled = callbacks[i].apply(context, args) === false;
+                }
+                return !cancelled;
+            }
+        }
+        function getNextTick() {
+            var nextTickFn;
+            if (window.setImmediate) {
+                nextTickFn = function nextTickSetImmediate(fn) {
+                    setImmediate(function() {
+                        fn();
+                    });
+                };
+            } else {
+                nextTickFn = function nextTickSetTimeout(fn) {
+                    setTimeout(function() {
+                        fn();
+                    }, 0);
+                };
+            }
+            return nextTickFn;
+        }
+        function bindContext(fn, context) {
+            return fn.bind ? fn.bind(context) : function() {
+                fn.apply(context, [].slice.call(arguments, 0));
+            };
+        }
+    }();
+    var highlight = function(doc) {
+        "use strict";
+        var defaults = {
+            node: null,
+            pattern: null,
+            tagName: "strong",
+            className: null,
+            wordsOnly: false,
+            caseSensitive: false
+        };
+        return function hightlight(o) {
+            var regex;
+            o = _.mixin({}, defaults, o);
+            if (!o.node || !o.pattern) {
+                return;
+            }
+            o.pattern = _.isArray(o.pattern) ? o.pattern : [ o.pattern ];
+            regex = getRegex(o.pattern, o.caseSensitive, o.wordsOnly);
+            traverse(o.node, hightlightTextNode);
+            function hightlightTextNode(textNode) {
+                var match, patternNode, wrapperNode;
+                if (match = regex.exec(textNode.data)) {
+                    wrapperNode = doc.createElement(o.tagName);
+                    o.className && (wrapperNode.className = o.className);
+                    patternNode = textNode.splitText(match.index);
+                    patternNode.splitText(match[0].length);
+                    wrapperNode.appendChild(patternNode.cloneNode(true));
+                    textNode.parentNode.replaceChild(wrapperNode, patternNode);
+                }
+                return !!match;
+            }
+            function traverse(el, hightlightTextNode) {
+                var childNode, TEXT_NODE_TYPE = 3;
+                for (var i = 0; i < el.childNodes.length; i++) {
+                    childNode = el.childNodes[i];
+                    if (childNode.nodeType === TEXT_NODE_TYPE) {
+                        i += hightlightTextNode(childNode) ? 1 : 0;
+                    } else {
+                        traverse(childNode, hightlightTextNode);
+                    }
+                }
+            }
+        };
+        function getRegex(patterns, caseSensitive, wordsOnly) {
+            var escapedPatterns = [], regexStr;
+            for (var i = 0, len = patterns.length; i < len; i++) {
+                escapedPatterns.push(_.escapeRegExChars(patterns[i]));
+            }
+            regexStr = wordsOnly ? "\\b(" + escapedPatterns.join("|") + ")\\b" : "(" + escapedPatterns.join("|") + ")";
+            return caseSensitive ? new RegExp(regexStr) : new RegExp(regexStr, "i");
+        }
+    }(window.document);
+    var Input = function() {
+        "use strict";
+        var specialKeyCodeMap;
+        specialKeyCodeMap = {
+            9: "tab",
+            27: "esc",
+            37: "left",
+            39: "right",
+            13: "enter",
+            38: "up",
+            40: "down"
+        };
+        function Input(o, www) {
+            o = o || {};
+            if (!o.input) {
+                $.error("input is missing");
+            }
+            www.mixin(this);
+            this.$hint = $(o.hint);
+            this.$input = $(o.input);
+            this.query = this.$input.val();
+            this.queryWhenFocused = this.hasFocus() ? this.query : null;
+            this.$overflowHelper = buildOverflowHelper(this.$input);
+            this._checkLanguageDirection();
+            if (this.$hint.length === 0) {
+                this.setHint = this.getHint = this.clearHint = this.clearHintIfInvalid = _.noop;
+            }
+        }
+        Input.normalizeQuery = function(str) {
+            return _.toStr(str).replace(/^\s*/g, "").replace(/\s{2,}/g, " ");
+        };
+        _.mixin(Input.prototype, EventEmitter, {
+            _onBlur: function onBlur() {
+                this.resetInputValue();
+                this.trigger("blurred");
+            },
+            _onFocus: function onFocus() {
+                this.queryWhenFocused = this.query;
+                this.trigger("focused");
+            },
+            _onKeydown: function onKeydown($e) {
+                var keyName = specialKeyCodeMap[$e.which || $e.keyCode];
+                this._managePreventDefault(keyName, $e);
+                if (keyName && this._shouldTrigger(keyName, $e)) {
+                    this.trigger(keyName + "Keyed", $e);
+                }
+            },
+            _onInput: function onInput() {
+                this._setQuery(this.getInputValue());
+                this.clearHintIfInvalid();
+                this._checkLanguageDirection();
+            },
+            _managePreventDefault: function managePreventDefault(keyName, $e) {
+                var preventDefault;
+                switch (keyName) {
+                  case "up":
+                  case "down":
+                    preventDefault = !withModifier($e);
+                    break;
+
+                  default:
+                    preventDefault = false;
+                }
+                preventDefault && $e.preventDefault();
+            },
+            _shouldTrigger: function shouldTrigger(keyName, $e) {
+                var trigger;
+                switch (keyName) {
+                  case "tab":
+                    trigger = !withModifier($e);
+                    break;
+
+                  default:
+                    trigger = true;
+                }
+                return trigger;
+            },
+            _checkLanguageDirection: function checkLanguageDirection() {
+                var dir = (this.$input.css("direction") || "ltr").toLowerCase();
+                if (this.dir !== dir) {
+                    this.dir = dir;
+                    this.$hint.attr("dir", dir);
+                    this.trigger("langDirChanged", dir);
+                }
+            },
+            _setQuery: function setQuery(val, silent) {
+                var areEquivalent, hasDifferentWhitespace;
+                areEquivalent = areQueriesEquivalent(val, this.query);
+                hasDifferentWhitespace = areEquivalent ? this.query.length !== val.length : false;
+                this.query = val;
+                if (!silent && !areEquivalent) {
+                    this.trigger("queryChanged", this.query);
+                } else if (!silent && hasDifferentWhitespace) {
+                    this.trigger("whitespaceChanged", this.query);
+                }
+            },
+            bind: function() {
+                var that = this, onBlur, onFocus, onKeydown, onInput;
+                onBlur = _.bind(this._onBlur, this);
+                onFocus = _.bind(this._onFocus, this);
+                onKeydown = _.bind(this._onKeydown, this);
+                onInput = _.bind(this._onInput, this);
+                this.$input.on("blur.tt", onBlur).on("focus.tt", onFocus).on("keydown.tt", onKeydown);
+                if (!_.isMsie() || _.isMsie() > 9) {
+                    this.$input.on("input.tt", onInput);
+                } else {
+                    this.$input.on("keydown.tt keypress.tt cut.tt paste.tt", function($e) {
+                        if (specialKeyCodeMap[$e.which || $e.keyCode]) {
+                            return;
+                        }
+                        _.defer(_.bind(that._onInput, that, $e));
+                    });
+                }
+                return this;
+            },
+            focus: function focus() {
+                this.$input.focus();
+            },
+            blur: function blur() {
+                this.$input.blur();
+            },
+            getLangDir: function getLangDir() {
+                return this.dir;
+            },
+            getQuery: function getQuery() {
+                return this.query || "";
+            },
+            setQuery: function setQuery(val, silent) {
+                this.setInputValue(val);
+                this._setQuery(val, silent);
+            },
+            hasQueryChangedSinceLastFocus: function hasQueryChangedSinceLastFocus() {
+                return this.query !== this.queryWhenFocused;
+            },
+            getInputValue: function getInputValue() {
+                return this.$input.val();
+            },
+            setInputValue: function setInputValue(value) {
+                this.$input.val(value);
+                this.clearHintIfInvalid();
+                this._checkLanguageDirection();
+            },
+            resetInputValue: function resetInputValue() {
+                this.setInputValue(this.query);
+            },
+            getHint: function getHint() {
+                return this.$hint.val();
+            },
+            setHint: function setHint(value) {
+                this.$hint.val(value);
+            },
+            clearHint: function clearHint() {
+                this.setHint("");
+            },
+            clearHintIfInvalid: function clearHintIfInvalid() {
+                var val, hint, valIsPrefixOfHint, isValid;
+                val = this.getInputValue();
+                hint = this.getHint();
+                valIsPrefixOfHint = val !== hint && hint.indexOf(val) === 0;
+                isValid = val !== "" && valIsPrefixOfHint && !this.hasOverflow();
+                !isValid && this.clearHint();
+            },
+            hasFocus: function hasFocus() {
+                return this.$input.is(":focus");
+            },
+            hasOverflow: function hasOverflow() {
+                var constraint = this.$input.width() - 2;
+                this.$overflowHelper.text(this.getInputValue());
+                return this.$overflowHelper.width() >= constraint;
+            },
+            isCursorAtEnd: function() {
+                var valueLength, selectionStart, range;
+                valueLength = this.$input.val().length;
+                selectionStart = this.$input[0].selectionStart;
+                if (_.isNumber(selectionStart)) {
+                    return selectionStart === valueLength;
+                } else if (document.selection) {
+                    range = document.selection.createRange();
+                    range.moveStart("character", -valueLength);
+                    return valueLength === range.text.length;
+                }
+                return true;
+            },
+            destroy: function destroy() {
+                this.$hint.off(".tt");
+                this.$input.off(".tt");
+                this.$overflowHelper.remove();
+                this.$hint = this.$input = this.$overflowHelper = $("<div>");
+            }
+        });
+        return Input;
+        function buildOverflowHelper($input) {
+            return $('<pre aria-hidden="true"></pre>').css({
+                position: "absolute",
+                visibility: "hidden",
+                whiteSpace: "pre",
+                fontFamily: $input.css("font-family"),
+                fontSize: $input.css("font-size"),
+                fontStyle: $input.css("font-style"),
+                fontVariant: $input.css("font-variant"),
+                fontWeight: $input.css("font-weight"),
+                wordSpacing: $input.css("word-spacing"),
+                letterSpacing: $input.css("letter-spacing"),
+                textIndent: $input.css("text-indent"),
+                textRendering: $input.css("text-rendering"),
+                textTransform: $input.css("text-transform")
+            }).insertAfter($input);
+        }
+        function areQueriesEquivalent(a, b) {
+            return Input.normalizeQuery(a) === Input.normalizeQuery(b);
+        }
+        function withModifier($e) {
+            return $e.altKey || $e.ctrlKey || $e.metaKey || $e.shiftKey;
+        }
+    }();
+    var Dataset = function() {
+        "use strict";
+        var keys, nameGenerator;
+        keys = {
+            val: "tt-selectable-display",
+            obj: "tt-selectable-object"
+        };
+        nameGenerator = _.getIdGenerator();
+        function Dataset(o, www) {
+            o = o || {};
+            o.templates = o.templates || {};
+            o.templates.notFound = o.templates.notFound || o.templates.empty;
+            if (!o.source) {
+                $.error("missing source");
+            }
+            if (!o.node) {
+                $.error("missing node");
+            }
+            if (o.name && !isValidName(o.name)) {
+                $.error("invalid dataset name: " + o.name);
+            }
+            www.mixin(this);
+            this.highlight = !!o.highlight;
+            this.name = o.name || nameGenerator();
+            this.limit = o.limit || 5;
+            this.displayFn = getDisplayFn(o.display || o.displayKey);
+            this.templates = getTemplates(o.templates, this.displayFn);
+            this.source = o.source.__ttAdapter ? o.source.__ttAdapter() : o.source;
+            this.async = _.isUndefined(o.async) ? this.source.length > 2 : !!o.async;
+            this._resetLastSuggestion();
+            this.$el = $(o.node).addClass(this.classes.dataset).addClass(this.classes.dataset + "-" + this.name);
+        }
+        Dataset.extractData = function extractData(el) {
+            var $el = $(el);
+            if ($el.data(keys.obj)) {
+                return {
+                    val: $el.data(keys.val) || "",
+                    obj: $el.data(keys.obj) || null
+                };
+            }
+            return null;
+        };
+        _.mixin(Dataset.prototype, EventEmitter, {
+            _overwrite: function overwrite(query, suggestions) {
+                suggestions = suggestions || [];
+                if (suggestions.length) {
+                    this._renderSuggestions(query, suggestions);
+                } else if (this.async && this.templates.pending) {
+                    this._renderPending(query);
+                } else if (!this.async && this.templates.notFound) {
+                    this._renderNotFound(query);
+                } else {
+                    this._empty();
+                }
+                this.trigger("rendered", this.name, suggestions, false);
+            },
+            _append: function append(query, suggestions) {
+                suggestions = suggestions || [];
+                if (suggestions.length && this.$lastSuggestion.length) {
+                    this._appendSuggestions(query, suggestions);
+                } else if (suggestions.length) {
+                    this._renderSuggestions(query, suggestions);
+                } else if (!this.$lastSuggestion.length && this.templates.notFound) {
+                    this._renderNotFound(query);
+                }
+                this.trigger("rendered", this.name, suggestions, true);
+            },
+            _renderSuggestions: function renderSuggestions(query, suggestions) {
+                var $fragment;
+                $fragment = this._getSuggestionsFragment(query, suggestions);
+                this.$lastSuggestion = $fragment.children().last();
+                this.$el.html($fragment).prepend(this._getHeader(query, suggestions)).append(this._getFooter(query, suggestions));
+            },
+            _appendSuggestions: function appendSuggestions(query, suggestions) {
+                var $fragment, $lastSuggestion;
+                $fragment = this._getSuggestionsFragment(query, suggestions);
+                $lastSuggestion = $fragment.children().last();
+                this.$lastSuggestion.after($fragment);
+                this.$lastSuggestion = $lastSuggestion;
+            },
+            _renderPending: function renderPending(query) {
+                var template = this.templates.pending;
+                this._resetLastSuggestion();
+                template && this.$el.html(template({
+                    query: query,
+                    dataset: this.name
+                }));
+            },
+            _renderNotFound: function renderNotFound(query) {
+                var template = this.templates.notFound;
+                this._resetLastSuggestion();
+                template && this.$el.html(template({
+                    query: query,
+                    dataset: this.name
+                }));
+            },
+            _empty: function empty() {
+                this.$el.empty();
+                this._resetLastSuggestion();
+            },
+            _getSuggestionsFragment: function getSuggestionsFragment(query, suggestions) {
+                var that = this, fragment;
+                fragment = document.createDocumentFragment();
+                _.each(suggestions, function getSuggestionNode(suggestion) {
+                    var $el, context;
+                    context = that._injectQuery(query, suggestion);
+                    $el = $(that.templates.suggestion(context)).data(keys.obj, suggestion).data(keys.val, that.displayFn(suggestion)).addClass(that.classes.suggestion + " " + that.classes.selectable);
+                    fragment.appendChild($el[0]);
+                });
+                this.highlight && highlight({
+                    className: this.classes.highlight,
+                    node: fragment,
+                    pattern: query
+                });
+                return $(fragment);
+            },
+            _getFooter: function getFooter(query, suggestions) {
+                return this.templates.footer ? this.templates.footer({
+                    query: query,
+                    suggestions: suggestions,
+                    dataset: this.name
+                }) : null;
+            },
+            _getHeader: function getHeader(query, suggestions) {
+                return this.templates.header ? this.templates.header({
+                    query: query,
+                    suggestions: suggestions,
+                    dataset: this.name
+                }) : null;
+            },
+            _resetLastSuggestion: function resetLastSuggestion() {
+                this.$lastSuggestion = $();
+            },
+            _injectQuery: function injectQuery(query, obj) {
+                return _.isObject(obj) ? _.mixin({
+                    _query: query
+                }, obj) : obj;
+            },
+            update: function update(query) {
+                var that = this, canceled = false, syncCalled = false, rendered = 0;
+                this.cancel();
+                this.cancel = function cancel() {
+                    canceled = true;
+                    that.cancel = $.noop;
+                    that.async && that.trigger("asyncCanceled", query);
+                };
+                this.source(query, sync, async);
+                !syncCalled && sync([]);
+                function sync(suggestions) {
+                    if (syncCalled) {
+                        return;
+                    }
+                    syncCalled = true;
+                    suggestions = (suggestions || []).slice(0, that.limit);
+                    rendered = suggestions.length;
+                    that._overwrite(query, suggestions);
+                    if (rendered < that.limit && that.async) {
+                        that.trigger("asyncRequested", query);
+                    }
+                }
+                function async(suggestions) {
+                    suggestions = suggestions || [];
+                    if (!canceled && rendered < that.limit) {
+                        that.cancel = $.noop;
+                        rendered += suggestions.length;
+                        that._append(query, suggestions.slice(0, that.limit - rendered));
+                        that.async && that.trigger("asyncReceived", query);
+                    }
+                }
+            },
+            cancel: $.noop,
+            clear: function clear() {
+                this._empty();
+                this.cancel();
+                this.trigger("cleared");
+            },
+            isEmpty: function isEmpty() {
+                return this.$el.is(":empty");
+            },
+            destroy: function destroy() {
+                this.$el = $("<div>");
+            }
+        });
+        return Dataset;
+        function getDisplayFn(display) {
+            display = display || _.stringify;
+            return _.isFunction(display) ? display : displayFn;
+            function displayFn(obj) {
+                return obj[display];
+            }
+        }
+        function getTemplates(templates, displayFn) {
+            return {
+                notFound: templates.notFound && _.templatify(templates.notFound),
+                pending: templates.pending && _.templatify(templates.pending),
+                header: templates.header && _.templatify(templates.header),
+                footer: templates.footer && _.templatify(templates.footer),
+                suggestion: templates.suggestion || suggestionTemplate
+            };
+            function suggestionTemplate(context) {
+                return $("<div>").text(displayFn(context));
+            }
+        }
+        function isValidName(str) {
+            return /^[_a-zA-Z0-9-]+$/.test(str);
+        }
+    }();
+    var Menu = function() {
+        "use strict";
+        function Menu(o, www) {
+            var that = this;
+            o = o || {};
+            if (!o.node) {
+                $.error("node is required");
+            }
+            www.mixin(this);
+            this.$node = $(o.node);
+            this.query = null;
+            this.datasets = _.map(o.datasets, initializeDataset);
+            function initializeDataset(oDataset) {
+                var node = that.$node.find(oDataset.node).first();
+                oDataset.node = node.length ? node : $("<div>").appendTo(that.$node);
+                return new Dataset(oDataset, www);
+            }
+        }
+        _.mixin(Menu.prototype, EventEmitter, {
+            _onSelectableClick: function onSelectableClick($e) {
+                this.trigger("selectableClicked", $($e.currentTarget));
+            },
+            _onRendered: function onRendered(type, dataset, suggestions, async) {
+                this.$node.toggleClass(this.classes.empty, this._allDatasetsEmpty());
+                this.trigger("datasetRendered", dataset, suggestions, async);
+            },
+            _onCleared: function onCleared() {
+                this.$node.toggleClass(this.classes.empty, this._allDatasetsEmpty());
+                this.trigger("datasetCleared");
+            },
+            _propagate: function propagate() {
+                this.trigger.apply(this, arguments);
+            },
+            _allDatasetsEmpty: function allDatasetsEmpty() {
+                return _.every(this.datasets, isDatasetEmpty);
+                function isDatasetEmpty(dataset) {
+                    return dataset.isEmpty();
+                }
+            },
+            _getSelectables: function getSelectables() {
+                return this.$node.find(this.selectors.selectable);
+            },
+            _removeCursor: function _removeCursor() {
+                var $selectable = this.getActiveSelectable();
+                $selectable && $selectable.removeClass(this.classes.cursor);
+            },
+            _ensureVisible: function ensureVisible($el) {
+                var elTop, elBottom, nodeScrollTop, nodeHeight;
+                elTop = $el.position().top;
+                elBottom = elTop + $el.outerHeight(true);
+                nodeScrollTop = this.$node.scrollTop();
+                nodeHeight = this.$node.height() + parseInt(this.$node.css("paddingTop"), 10) + parseInt(this.$node.css("paddingBottom"), 10);
+                if (elTop < 0) {
+                    this.$node.scrollTop(nodeScrollTop + elTop);
+                } else if (nodeHeight < elBottom) {
+                    this.$node.scrollTop(nodeScrollTop + (elBottom - nodeHeight));
+                }
+            },
+            bind: function() {
+                var that = this, onSelectableClick;
+                onSelectableClick = _.bind(this._onSelectableClick, this);
+                this.$node.on("click.tt", this.selectors.selectable, onSelectableClick);
+                _.each(this.datasets, function(dataset) {
+                    dataset.onSync("asyncRequested", that._propagate, that).onSync("asyncCanceled", that._propagate, that).onSync("asyncReceived", that._propagate, that).onSync("rendered", that._onRendered, that).onSync("cleared", that._onCleared, that);
+                });
+                return this;
+            },
+            isOpen: function isOpen() {
+                return this.$node.hasClass(this.classes.open);
+            },
+            open: function open() {
+                this.$node.addClass(this.classes.open);
+            },
+            close: function close() {
+                this.$node.removeClass(this.classes.open);
+                this._removeCursor();
+            },
+            setLanguageDirection: function setLanguageDirection(dir) {
+                this.$node.attr("dir", dir);
+            },
+            selectableRelativeToCursor: function selectableRelativeToCursor(delta) {
+                var $selectables, $oldCursor, oldIndex, newIndex;
+                $oldCursor = this.getActiveSelectable();
+                $selectables = this._getSelectables();
+                oldIndex = $oldCursor ? $selectables.index($oldCursor) : -1;
+                newIndex = oldIndex + delta;
+                newIndex = (newIndex + 1) % ($selectables.length + 1) - 1;
+                newIndex = newIndex < -1 ? $selectables.length - 1 : newIndex;
+                return newIndex === -1 ? null : $selectables.eq(newIndex);
+            },
+            setCursor: function setCursor($selectable) {
+                this._removeCursor();
+                if ($selectable = $selectable && $selectable.first()) {
+                    $selectable.addClass(this.classes.cursor);
+                    this._ensureVisible($selectable);
+                }
+            },
+            getSelectableData: function getSelectableData($el) {
+                return $el && $el.length ? Dataset.extractData($el) : null;
+            },
+            getActiveSelectable: function getActiveSelectable() {
+                var $selectable = this._getSelectables().filter(this.selectors.cursor).first();
+                return $selectable.length ? $selectable : null;
+            },
+            getTopSelectable: function getTopSelectable() {
+                var $selectable = this._getSelectables().first();
+                return $selectable.length ? $selectable : null;
+            },
+            update: function update(query) {
+                var isValidUpdate = query !== this.query;
+                if (isValidUpdate) {
+                    this.query = query;
+                    _.each(this.datasets, updateDataset);
+                }
+                return isValidUpdate;
+                function updateDataset(dataset) {
+                    dataset.update(query);
+                }
+            },
+            empty: function empty() {
+                _.each(this.datasets, clearDataset);
+                this.query = null;
+                this.$node.addClass(this.classes.empty);
+                function clearDataset(dataset) {
+                    dataset.clear();
+                }
+            },
+            destroy: function destroy() {
+                this.$node.off(".tt");
+                this.$node = $("<div>");
+                _.each(this.datasets, destroyDataset);
+                function destroyDataset(dataset) {
+                    dataset.destroy();
+                }
+            }
+        });
+        return Menu;
+    }();
+    var DefaultMenu = function() {
+        "use strict";
+        var s = Menu.prototype;
+        function DefaultMenu() {
+            Menu.apply(this, [].slice.call(arguments, 0));
+        }
+        _.mixin(DefaultMenu.prototype, Menu.prototype, {
+            open: function open() {
+                !this._allDatasetsEmpty() && this._show();
+                return s.open.apply(this, [].slice.call(arguments, 0));
+            },
+            close: function close() {
+                this._hide();
+                return s.close.apply(this, [].slice.call(arguments, 0));
+            },
+            _onRendered: function onRendered() {
+                if (this._allDatasetsEmpty()) {
+                    this._hide();
+                } else {
+                    this.isOpen() && this._show();
+                }
+                return s._onRendered.apply(this, [].slice.call(arguments, 0));
+            },
+            _onCleared: function onCleared() {
+                if (this._allDatasetsEmpty()) {
+                    this._hide();
+                } else {
+                    this.isOpen() && this._show();
+                }
+                return s._onCleared.apply(this, [].slice.call(arguments, 0));
+            },
+            setLanguageDirection: function setLanguageDirection(dir) {
+                this.$node.css(dir === "ltr" ? this.css.ltr : this.css.rtl);
+                return s.setLanguageDirection.apply(this, [].slice.call(arguments, 0));
+            },
+            _hide: function hide() {
+                this.$node.hide();
+            },
+            _show: function show() {
+                this.$node.css("display", "block");
+            }
+        });
+        return DefaultMenu;
+    }();
+    var Typeahead = function() {
+        "use strict";
+        function Typeahead(o, www) {
+            var onFocused, onBlurred, onEnterKeyed, onTabKeyed, onEscKeyed, onUpKeyed, onDownKeyed, onLeftKeyed, onRightKeyed, onQueryChanged, onWhitespaceChanged;
+            o = o || {};
+            if (!o.input) {
+                $.error("missing input");
+            }
+            if (!o.menu) {
+                $.error("missing menu");
+            }
+            if (!o.eventBus) {
+                $.error("missing event bus");
+            }
+            www.mixin(this);
+            this.eventBus = o.eventBus;
+            this.minLength = _.isNumber(o.minLength) ? o.minLength : 1;
+            this.input = o.input;
+            this.menu = o.menu;
+            this.enabled = true;
+            this.active = false;
+            this.input.hasFocus() && this.activate();
+            this.dir = this.input.getLangDir();
+            this._hacks();
+            this.menu.bind().onSync("selectableClicked", this._onSelectableClicked, this).onSync("asyncRequested", this._onAsyncRequested, this).onSync("asyncCanceled", this._onAsyncCanceled, this).onSync("asyncReceived", this._onAsyncReceived, this).onSync("datasetRendered", this._onDatasetRendered, this).onSync("datasetCleared", this._onDatasetCleared, this);
+            onFocused = c(this, "activate", "open", "_onFocused");
+            onBlurred = c(this, "deactivate", "_onBlurred");
+            onEnterKeyed = c(this, "isActive", "isOpen", "_onEnterKeyed");
+            onTabKeyed = c(this, "isActive", "isOpen", "_onTabKeyed");
+            onEscKeyed = c(this, "isActive", "_onEscKeyed");
+            onUpKeyed = c(this, "isActive", "open", "_onUpKeyed");
+            onDownKeyed = c(this, "isActive", "open", "_onDownKeyed");
+            onLeftKeyed = c(this, "isActive", "isOpen", "_onLeftKeyed");
+            onRightKeyed = c(this, "isActive", "isOpen", "_onRightKeyed");
+            onQueryChanged = c(this, "_openIfActive", "_onQueryChanged");
+            onWhitespaceChanged = c(this, "_openIfActive", "_onWhitespaceChanged");
+            this.input.bind().onSync("focused", onFocused, this).onSync("blurred", onBlurred, this).onSync("enterKeyed", onEnterKeyed, this).onSync("tabKeyed", onTabKeyed, this).onSync("escKeyed", onEscKeyed, this).onSync("upKeyed", onUpKeyed, this).onSync("downKeyed", onDownKeyed, this).onSync("leftKeyed", onLeftKeyed, this).onSync("rightKeyed", onRightKeyed, this).onSync("queryChanged", onQueryChanged, this).onSync("whitespaceChanged", onWhitespaceChanged, this).onSync("langDirChanged", this._onLangDirChanged, this);
+        }
+        _.mixin(Typeahead.prototype, {
+            _hacks: function hacks() {
+                var $input, $menu;
+                $input = this.input.$input || $("<div>");
+                $menu = this.menu.$node || $("<div>");
+                $input.on("blur.tt", function($e) {
+                    var active, isActive, hasActive;
+                    active = document.activeElement;
+                    isActive = $menu.is(active);
+                    hasActive = $menu.has(active).length > 0;
+                    if (_.isMsie() && (isActive || hasActive)) {
+                        $e.preventDefault();
+                        $e.stopImmediatePropagation();
+                        _.defer(function() {
+                            $input.focus();
+                        });
+                    }
+                });
+                $menu.on("mousedown.tt", function($e) {
+                    $e.preventDefault();
+                });
+            },
+            _onSelectableClicked: function onSelectableClicked(type, $el) {
+                this.select($el);
+            },
+            _onDatasetCleared: function onDatasetCleared() {
+                this._updateHint();
+            },
+            _onDatasetRendered: function onDatasetRendered(type, dataset, suggestions, async) {
+                this._updateHint();
+                this.eventBus.trigger("render", suggestions, async, dataset);
+            },
+            _onAsyncRequested: function onAsyncRequested(type, dataset, query) {
+                this.eventBus.trigger("asyncrequest", query, dataset);
+            },
+            _onAsyncCanceled: function onAsyncCanceled(type, dataset, query) {
+                this.eventBus.trigger("asynccancel", query, dataset);
+            },
+            _onAsyncReceived: function onAsyncReceived(type, dataset, query) {
+                this.eventBus.trigger("asyncreceive", query, dataset);
+            },
+            _onFocused: function onFocused() {
+                this._minLengthMet() && this.menu.update(this.input.getQuery());
+            },
+            _onBlurred: function onBlurred() {
+                if (this.input.hasQueryChangedSinceLastFocus()) {
+                    this.eventBus.trigger("change", this.input.getQuery());
+                }
+            },
+            _onEnterKeyed: function onEnterKeyed(type, $e) {
+                var $selectable;
+                if ($selectable = this.menu.getActiveSelectable()) {
+                    this.select($selectable) && $e.preventDefault();
+                }
+            },
+            _onTabKeyed: function onTabKeyed(type, $e) {
+                var $selectable;
+                if ($selectable = this.menu.getActiveSelectable()) {
+                    this.select($selectable) && $e.preventDefault();
+                } else if ($selectable = this.menu.getTopSelectable()) {
+                    this.autocomplete($selectable) && $e.preventDefault();
+                }
+            },
+            _onEscKeyed: function onEscKeyed() {
+                this.close();
+            },
+            _onUpKeyed: function onUpKeyed() {
+                this.moveCursor(-1);
+            },
+            _onDownKeyed: function onDownKeyed() {
+                this.moveCursor(+1);
+            },
+            _onLeftKeyed: function onLeftKeyed() {
+                if (this.dir === "rtl" && this.input.isCursorAtEnd()) {
+                    this.autocomplete(this.menu.getTopSelectable());
+                }
+            },
+            _onRightKeyed: function onRightKeyed() {
+                if (this.dir === "ltr" && this.input.isCursorAtEnd()) {
+                    this.autocomplete(this.menu.getTopSelectable());
+                }
+            },
+            _onQueryChanged: function onQueryChanged(e, query) {
+                this._minLengthMet(query) ? this.menu.update(query) : this.menu.empty();
+            },
+            _onWhitespaceChanged: function onWhitespaceChanged() {
+                this._updateHint();
+            },
+            _onLangDirChanged: function onLangDirChanged(e, dir) {
+                if (this.dir !== dir) {
+                    this.dir = dir;
+                    this.menu.setLanguageDirection(dir);
+                }
+            },
+            _openIfActive: function openIfActive() {
+                this.isActive() && this.open();
+            },
+            _minLengthMet: function minLengthMet(query) {
+                query = _.isString(query) ? query : this.input.getQuery() || "";
+                return query.length >= this.minLength;
+            },
+            _updateHint: function updateHint() {
+                var $selectable, data, val, query, escapedQuery, frontMatchRegEx, match;
+                $selectable = this.menu.getTopSelectable();
+                data = this.menu.getSelectableData($selectable);
+                val = this.input.getInputValue();
+                if (data && !_.isBlankString(val) && !this.input.hasOverflow()) {
+                    query = Input.normalizeQuery(val);
+                    escapedQuery = _.escapeRegExChars(query);
+                    frontMatchRegEx = new RegExp("^(?:" + escapedQuery + ")(.+$)", "i");
+                    match = frontMatchRegEx.exec(data.val);
+                    match && this.input.setHint(val + match[1]);
+                } else {
+                    this.input.clearHint();
+                }
+            },
+            isEnabled: function isEnabled() {
+                return this.enabled;
+            },
+            enable: function enable() {
+                this.enabled = true;
+            },
+            disable: function disable() {
+                this.enabled = false;
+            },
+            isActive: function isActive() {
+                return this.active;
+            },
+            activate: function activate() {
+                if (this.isActive()) {
+                    return true;
+                } else if (!this.isEnabled() || this.eventBus.before("active")) {
+                    return false;
+                } else {
+                    this.active = true;
+                    this.eventBus.trigger("active");
+                    return true;
+                }
+            },
+            deactivate: function deactivate() {
+                if (!this.isActive()) {
+                    return true;
+                } else if (this.eventBus.before("idle")) {
+                    return false;
+                } else {
+                    this.active = false;
+                    this.close();
+                    this.eventBus.trigger("idle");
+                    return true;
+                }
+            },
+            isOpen: function isOpen() {
+                return this.menu.isOpen();
+            },
+            open: function open() {
+                if (!this.isOpen() && !this.eventBus.before("open")) {
+                    this.menu.open();
+                    this._updateHint();
+                    this.eventBus.trigger("open");
+                }
+                return this.isOpen();
+            },
+            close: function close() {
+                if (this.isOpen() && !this.eventBus.before("close")) {
+                    this.menu.close();
+                    this.input.clearHint();
+                    this.input.resetInputValue();
+                    this.eventBus.trigger("close");
+                }
+                return !this.isOpen();
+            },
+            setVal: function setVal(val) {
+                this.input.setQuery(_.toStr(val));
+            },
+            getVal: function getVal() {
+                return this.input.getQuery();
+            },
+            select: function select($selectable) {
+                var data = this.menu.getSelectableData($selectable);
+                if (data && !this.eventBus.before("select", data.obj)) {
+                    this.input.setQuery(data.val, true);
+                    this.eventBus.trigger("select", data.obj);
+                    this.close();
+                    return true;
+                }
+                return false;
+            },
+            autocomplete: function autocomplete($selectable) {
+                var query, data, isValid;
+                query = this.input.getQuery();
+                data = this.menu.getSelectableData($selectable);
+                isValid = data && query !== data.val;
+                if (isValid && !this.eventBus.before("autocomplete", data.obj)) {
+                    this.input.setQuery(data.val);
+                    this.eventBus.trigger("autocomplete", data.obj);
+                    return true;
+                }
+                return false;
+            },
+            moveCursor: function moveCursor(delta) {
+                var query, $candidate, data, payload, cancelMove;
+                query = this.input.getQuery();
+                $candidate = this.menu.selectableRelativeToCursor(delta);
+                data = this.menu.getSelectableData($candidate);
+                payload = data ? data.obj : null;
+                cancelMove = this._minLengthMet() && this.menu.update(query);
+                if (!cancelMove && !this.eventBus.before("cursorchange", payload)) {
+                    this.menu.setCursor($candidate);
+                    if (data) {
+                        this.input.setInputValue(data.val);
+                    } else {
+                        this.input.resetInputValue();
+                        this._updateHint();
+                    }
+                    this.eventBus.trigger("cursorchange", payload);
+                    return true;
+                }
+                return false;
+            },
+            destroy: function destroy() {
+                this.input.destroy();
+                this.menu.destroy();
+            }
+        });
+        return Typeahead;
+        function c(ctx) {
+            var methods = [].slice.call(arguments, 1);
+            return function() {
+                var args = [].slice.call(arguments);
+                _.each(methods, function(method) {
+                    return ctx[method].apply(ctx, args);
+                });
+            };
+        }
+    }();
+    (function() {
+        "use strict";
+        var old, keys, methods;
+        old = $.fn.typeahead;
+        keys = {
+            www: "tt-www",
+            attrs: "tt-attrs",
+            typeahead: "tt-typeahead"
+        };
+        methods = {
+            initialize: function initialize(o, datasets) {
+                var www;
+                datasets = _.isArray(datasets) ? datasets : [].slice.call(arguments, 1);
+                o = o || {};
+                www = WWW(o.classNames);
+                return this.each(attach);
+                function attach() {
+                    var $input, $wrapper, $hint, $menu, defaultHint, defaultMenu, eventBus, input, menu, typeahead, MenuConstructor;
+                    _.each(datasets, function(d) {
+                        d.highlight = !!o.highlight;
+                    });
+                    $input = $(this);
+                    $wrapper = $(www.html.wrapper);
+                    $hint = $elOrNull(o.hint);
+                    $menu = $elOrNull(o.menu);
+                    defaultHint = o.hint !== false && !$hint;
+                    defaultMenu = o.menu !== false && !$menu;
+                    defaultHint && ($hint = buildHintFromInput($input, www));
+                    defaultMenu && ($menu = $(www.html.menu).css(www.css.menu));
+                    $hint && $hint.val("");
+                    $input = prepInput($input, www);
+                    if (defaultHint || defaultMenu) {
+                        $wrapper.css(www.css.wrapper);
+                        $input.css(defaultHint ? www.css.input : www.css.inputWithNoHint);
+                        $input.wrap($wrapper).parent().prepend(defaultHint ? $hint : null).append(defaultMenu ? $menu : null);
+                    }
+                    MenuConstructor = defaultMenu ? DefaultMenu : Menu;
+                    eventBus = new EventBus({
+                        el: $input
+                    });
+                    input = new Input({
+                        hint: $hint,
+                        input: $input
+                    }, www);
+                    menu = new MenuConstructor({
+                        node: $menu,
+                        datasets: datasets
+                    }, www);
+                    typeahead = new Typeahead({
+                        input: input,
+                        menu: menu,
+                        eventBus: eventBus,
+                        minLength: o.minLength
+                    }, www);
+                    $input.data(keys.www, www);
+                    $input.data(keys.typeahead, typeahead);
+                }
+            },
+            isEnabled: function isEnabled() {
+                var enabled;
+                ttEach(this.first(), function(t) {
+                    enabled = t.isEnabled();
+                });
+                return enabled;
+            },
+            enable: function enable() {
+                ttEach(this, function(t) {
+                    t.enable();
+                });
+                return this;
+            },
+            disable: function disable() {
+                ttEach(this, function(t) {
+                    t.disable();
+                });
+                return this;
+            },
+            isActive: function isActive() {
+                var active;
+                ttEach(this.first(), function(t) {
+                    active = t.isActive();
+                });
+                return active;
+            },
+            activate: function activate() {
+                ttEach(this, function(t) {
+                    t.activate();
+                });
+                return this;
+            },
+            deactivate: function deactivate() {
+                ttEach(this, function(t) {
+                    t.deactivate();
+                });
+                return this;
+            },
+            isOpen: function isOpen() {
+                var open;
+                ttEach(this.first(), function(t) {
+                    open = t.isOpen();
+                });
+                return open;
+            },
+            open: function open() {
+                ttEach(this, function(t) {
+                    t.open();
+                });
+                return this;
+            },
+            close: function close() {
+                ttEach(this, function(t) {
+                    t.close();
+                });
+                return this;
+            },
+            select: function select(el) {
+                var success = false, $el = $(el);
+                ttEach(this.first(), function(t) {
+                    success = t.select($el);
+                });
+                return success;
+            },
+            autocomplete: function autocomplete(el) {
+                var success = false, $el = $(el);
+                ttEach(this.first(), function(t) {
+                    success = t.autocomplete($el);
+                });
+                return success;
+            },
+            moveCursor: function moveCursoe(delta) {
+                var success = false;
+                ttEach(this.first(), function(t) {
+                    success = t.moveCursor(delta);
+                });
+                return success;
+            },
+            val: function val(newVal) {
+                var query;
+                if (!arguments.length) {
+                    ttEach(this.first(), function(t) {
+                        query = t.getVal();
+                    });
+                    return query;
+                } else {
+                    ttEach(this, function(t) {
+                        t.setVal(newVal);
+                    });
+                    return this;
+                }
+            },
+            destroy: function destroy() {
+                ttEach(this, function(typeahead, $input) {
+                    revert($input);
+                    typeahead.destroy();
+                });
+                return this;
+            }
+        };
+        $.fn.typeahead = function(method) {
+            if (methods[method]) {
+                return methods[method].apply(this, [].slice.call(arguments, 1));
+            } else {
+                return methods.initialize.apply(this, arguments);
+            }
+        };
+        $.fn.typeahead.noConflict = function noConflict() {
+            $.fn.typeahead = old;
+            return this;
+        };
+        function ttEach($els, fn) {
+            $els.each(function() {
+                var $input = $(this), typeahead;
+                (typeahead = $input.data(keys.typeahead)) && fn(typeahead, $input);
+            });
+        }
+        function buildHintFromInput($input, www) {
+            return $input.clone().addClass(www.classes.hint).removeData().css(www.css.hint).css(getBackgroundStyles($input)).prop("readonly", true).removeAttr("id name placeholder required").attr({
+                autocomplete: "off",
+                spellcheck: "false",
+                tabindex: -1
+            });
+        }
+        function prepInput($input, www) {
+            $input.data(keys.attrs, {
+                dir: $input.attr("dir"),
+                autocomplete: $input.attr("autocomplete"),
+                spellcheck: $input.attr("spellcheck"),
+                style: $input.attr("style")
+            });
+            $input.addClass(www.classes.input).attr({
+                autocomplete: "off",
+                spellcheck: false
+            });
+            try {
+                !$input.attr("dir") && $input.attr("dir", "auto");
+            } catch (e) {}
+            return $input;
+        }
+        function getBackgroundStyles($el) {
+            return {
+                backgroundAttachment: $el.css("background-attachment"),
+                backgroundClip: $el.css("background-clip"),
+                backgroundColor: $el.css("background-color"),
+                backgroundImage: $el.css("background-image"),
+                backgroundOrigin: $el.css("background-origin"),
+                backgroundPosition: $el.css("background-position"),
+                backgroundRepeat: $el.css("background-repeat"),
+                backgroundSize: $el.css("background-size")
+            };
+        }
+        function revert($input) {
+            var www, $wrapper;
+            www = $input.data(keys.www);
+            $wrapper = $input.parent().filter(www.selectors.wrapper);
+            _.each($input.data(keys.attrs), function(val, key) {
+                _.isUndefined(val) ? $input.removeAttr(key) : $input.attr(key, val);
+            });
+            $input.removeData(keys.typeahead).removeData(keys.www).removeData(keys.attr).removeClass(www.classes.input);
+            if ($wrapper.length) {
+                $input.detach().insertAfter($wrapper);
+                $wrapper.remove();
+            }
+        }
+        function $elOrNull(obj) {
+            var isValid, $el;
+            isValid = _.isJQuery(obj) || _.isElement(obj);
+            $el = isValid ? $(obj).first() : [];
+            return $el.length ? $el : null;
+        }
+    })();
+});
\ No newline at end of file
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 8ed23ed..0ba4fbd 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,6 +1,8 @@
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
+  config.assets.debug = true
+
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
-- 
cgit v1.2.3


From 636421bf386e813cb6a87a7499fdedc975b75900 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 24 Mar 2016 22:13:41 +0100
Subject: upgrade: add formbuilder wrapper for bootstrap

Not sure if this does what we need. But for now it fixes the tests
---
 app/assets/javascripts/leap.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/javascripts/leap.js b/app/assets/javascripts/leap.js
index 94e602d..c8fbcf5 100644
--- a/app/assets/javascripts/leap.js
+++ b/app/assets/javascripts/leap.js
@@ -5,3 +5,5 @@
 function alert_message(msg) {
   $('#messages').append('<div class="alert alert-error"><a class="close" data-dismiss="alert">×</a><span>'+msg+'</span></div>');
 }
+
+ClientSideValidations.formBuilders['SimpleForm::FormBuilder'].wrappers.bootstrap = ClientSideValidations.formBuilders['SimpleForm::FormBuilder'].wrappers["default"];
-- 
cgit v1.2.3


From 00fba5114ae2c6176c88ff0ea152576c5bff657d Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 25 Mar 2016 11:06:55 +0100
Subject: upgrade: {File,Dir}.exists? -> exist?

exists? is deprecated in ruby 2.1
---
 app/controllers/controller_extension/json_file.rb | 2 +-
 config/application.rb                             | 2 +-
 config/initializers/customization.rb              | 2 +-
 lib/extensions/couchrest.rb                       | 2 +-
 lib/gemfile_tools.rb                              | 4 ++--
 lib/tasks/i18n.rake                               | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/controller_extension/json_file.rb b/app/controllers/controller_extension/json_file.rb
index 6be919a..5b5e55e 100644
--- a/app/controllers/controller_extension/json_file.rb
+++ b/app/controllers/controller_extension/json_file.rb
@@ -12,7 +12,7 @@ module ControllerExtension::JsonFile
   end
 
   def fetch_file
-    if File.exists?(@filename)
+    if File.exist?(@filename)
       @file = File.new(@filename)
     else
       not_found
diff --git a/config/application.rb b/config/application.rb
index 4a70b04..0e00356 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -13,7 +13,7 @@ Bundler.require(*Rails.groups)
 
 APP_CONFIG = ["defaults.yml", "config.yml"].inject({}) {|config, file|
   filepath = File.expand_path(file, File.dirname(__FILE__))
-  if File.exists?(filepath) && settings = YAML.load_file(filepath)[Rails.env]
+  if File.exist?(filepath) && settings = YAML.load_file(filepath)[Rails.env]
     config.merge(settings)
   else
     config
diff --git a/config/initializers/customization.rb b/config/initializers/customization.rb
index aaa2939..9f537e9 100644
--- a/config/initializers/customization.rb
+++ b/config/initializers/customization.rb
@@ -26,7 +26,7 @@ Rails.application.config.assets.paths.unshift "#{customization_directory}/styles
 #
 # Copy files to public
 #
-if !defined?(RAKE) && Dir.exists?("#{customization_directory}/public")
+if !defined?(RAKE) && Dir.exist?("#{customization_directory}/public")
   require 'fileutils'
   FileUtils.cp_r("#{customization_directory}/public/.", "#{Rails.root}/public", :preserve => true)
 end
diff --git a/lib/extensions/couchrest.rb b/lib/extensions/couchrest.rb
index 6967980..4578926 100644
--- a/lib/extensions/couchrest.rb
+++ b/lib/extensions/couchrest.rb
@@ -69,7 +69,7 @@ module CouchRest
 
         def prepare_directory(dir = '')
           dir = Rails.root + 'tmp' + 'designs' + dir
-          Dir.mkdir(dir) unless Dir.exists?(dir)
+          Dir.mkdir(dir) unless Dir.exist?(dir)
           return dir
         end
 
diff --git a/lib/gemfile_tools.rb b/lib/gemfile_tools.rb
index dce2448..d1c00dc 100644
--- a/lib/gemfile_tools.rb
+++ b/lib/gemfile_tools.rb
@@ -68,7 +68,7 @@ def local_config
     empty_hash.default_proc = proc{|h, k| h.key?(k.to_s) ? h[k.to_s] : nil}
     ["defaults.yml", "config.yml"].inject(empty_hash.dup) {|config, file|
       filepath = File.join(File.expand_path("../../config", __FILE__), file)
-      if File.exists?(filepath)
+      if File.exist?(filepath)
         new_config = YAML.load_file(filepath)
         ['development', 'test','production'].each do |env|
           config[env] ||= empty_hash.dup
@@ -87,7 +87,7 @@ end
 # or nil if not actually a gem directory
 #
 def gem_info(gem_dir)
-  if Dir.exists?(gem_dir)
+  if Dir.exist?(gem_dir)
     gemspec = Dir["#{gem_dir}/*.gemspec"]
     if gemspec.any?
       gem_name = File.basename(gemspec.first).sub(/\.gemspec$/,'')
diff --git a/lib/tasks/i18n.rake b/lib/tasks/i18n.rake
index 6ffbb23..1034211 100644
--- a/lib/tasks/i18n.rake
+++ b/lib/tasks/i18n.rake
@@ -63,7 +63,7 @@ namespace :i18n do
   desc "pull translations from transifex"
   task :download do
     Dir.chdir('config/') do
-      if !File.exists?('transifex.netrc')
+      if !File.exist?('transifex.netrc')
         puts "In order to download translations, you need a config/transifex.netrc file."
         puts "For example:"
         puts "machine www.transifex.com login yourusername password yourpassword"
-- 
cgit v1.2.3


From 2d75afb15e005e97a57b68abae0a34f1a2c4a30b Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 25 Mar 2016 11:21:37 +0100
Subject: tests: Validator.new has optional options hash

but you may not hand it a nil
---
 test/unit/invite_code_validator_test.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/unit/invite_code_validator_test.rb b/test/unit/invite_code_validator_test.rb
index 62eeae6..934ba2e 100644
--- a/test/unit/invite_code_validator_test.rb
+++ b/test/unit/invite_code_validator_test.rb
@@ -3,9 +3,9 @@ require 'test_helper'
 class InviteCodeValidatorTest < ActiveSupport::TestCase
   test "user should not be created with invalid invite code" do
     with_config invite_required: true do
-    invalid_user = FactoryGirl.build(:user)
+      invalid_user = FactoryGirl.build(:user)
 
-    assert !invalid_user.valid?
+      assert !invalid_user.valid?
     end
   end
 
@@ -30,7 +30,7 @@ class InviteCodeValidatorTest < ActiveSupport::TestCase
 
 
   test "Invite count >= invite max uses is not accepted for new account signup" do
-    validator = InviteCodeValidator.new nil
+    validator = InviteCodeValidator.new
 
     user_code = InviteCode.new
     user_code.invite_count = 1
@@ -46,7 +46,7 @@ class InviteCodeValidatorTest < ActiveSupport::TestCase
   end
 
   test "Invite count < invite max uses is accepted for new account signup" do
-    validator = InviteCodeValidator.new nil
+    validator = InviteCodeValidator.new
 
     user_code = InviteCode.create
     user_code.save
@@ -60,7 +60,7 @@ class InviteCodeValidatorTest < ActiveSupport::TestCase
   end
 
   test "Invite count 0 is accepted for new account signup" do
-    validator = InviteCodeValidator.new nil
+    validator = InviteCodeValidator.new
 
     user_code = InviteCode.create
 
@@ -73,7 +73,7 @@ class InviteCodeValidatorTest < ActiveSupport::TestCase
   end
 
   test "There is an error message if the invite code does not exist" do
-    validator = InviteCodeValidator.new nil
+    validator = InviteCodeValidator.new
 
     user = FactoryGirl.build :user
     user.invite_code = "wrongcode"
@@ -83,4 +83,4 @@ class InviteCodeValidatorTest < ActiveSupport::TestCase
     assert_equal ["This is not a valid code"], user.errors[:invite_code]
   end
 
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From de8f3e532d857ec64a9ba17bf9e5a4de272a6cbd Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sat, 26 Mar 2016 17:36:37 +0100
Subject: upgrade: use bootstrap3 row and col-md-*

---
 app/views/common/_action_buttons.html.haml             | 10 +++++-----
 app/views/common/_download_button.html.haml            |  8 ++++----
 app/views/common/_home_page_buttons.html.haml          |  4 ++--
 app/views/home/_content.html.haml                      |  6 +++---
 app/views/layouts/_content.html.haml                   |  6 +++---
 app/views/layouts/application.html.haml                |  8 ++++----
 app/views/sessions/new.html.haml                       |  4 ++--
 app/views/users/new.html.haml                          |  4 ++--
 app/views/users/show.html.haml                         |  2 +-
 engines/support/app/views/tickets/_edit_form.html.haml |  8 ++++----
 10 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/views/common/_action_buttons.html.haml b/app/views/common/_action_buttons.html.haml
index 81ebf67..eb663c0 100644
--- a/app/views/common/_action_buttons.html.haml
+++ b/app/views/common/_action_buttons.html.haml
@@ -1,14 +1,14 @@
 .home-buttons
-  .row-fluid.second
-    .login.span4
+  .row.second
+    .login.col-md-4
       %span.link= btn icon('ok-sign') + t(:login), login_path
       %span.info= t(:login_info, default: "")
     - if APP_CONFIG[:allow_registration]
-      .signup.span4
+      .signup.col-md-4
         %span.link= btn icon('user') + t(:signup), signup_path
         %span.info= t(:signup_info, default: "")
     - else
-      .signup.span4
-    .help.span4
+      .signup.col-md-4
+    .help.col-md-4
       %span.link= btn icon('question-sign') + t(:get_help), new_ticket_path
       %span.info= t(:support_info, default: "")
diff --git a/app/views/common/_download_button.html.haml b/app/views/common/_download_button.html.haml
index 9c26860..1278230 100644
--- a/app/views/common/_download_button.html.haml
+++ b/app/views/common/_download_button.html.haml
@@ -1,8 +1,8 @@
 .home-buttons
-  .row-fluid.first
-    .span2
-    .download.span8
+  .row.first
+    .col-md-2
+    .download.col-md-8
       = btn client_download_url, type: [:large, :primary] do
         = big_icon('download')
         = t(:download_bitmask)
-    .span2
+    .col-md-2
diff --git a/app/views/common/_home_page_buttons.html.haml b/app/views/common/_home_page_buttons.html.haml
index fc6348e..cfe3734 100644
--- a/app/views/common/_home_page_buttons.html.haml
+++ b/app/views/common/_home_page_buttons.html.haml
@@ -1,6 +1,6 @@
 = render 'common/download_button'
 - if local_assigns[:divider]
-  .row-fluid
-    .span12
+  .row
+    .col-md-12
       = render local_assigns[:divider]
 = render 'common/action_buttons'
diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml
index d96a1e0..67e4533 100644
--- a/app/views/home/_content.html.haml
+++ b/app/views/home/_content.html.haml
@@ -1,12 +1,12 @@
-.row-fluid
+.row
   %h1= t(:welcome, :provider => APP_CONFIG[:domain])
   .p=t(:welcome_message_html)
 
-.row-fluid
+.row
   = home_page_buttons
 
   - if Rails.env == 'development'
-    .row-fluid
+    .row
       %hr
       %p
         = link_to "make donation", new_payment_path if APP_CONFIG[:payment].present?
diff --git a/app/views/layouts/_content.html.haml b/app/views/layouts/_content.html.haml
index d5c2fa3..21d2e12 100644
--- a/app/views/layouts/_content.html.haml
+++ b/app/views/layouts/_content.html.haml
@@ -8,12 +8,12 @@
   - content = yield
 
 - if @show_navigation
-  .span2
+  .col-md-2
     = render 'layouts/navigation'
-  .span10
+  .col-md-10
     = render 'layouts/messages'
     = content
 - else
-  .span12
+  .col-md-12
     = render 'layouts/messages'
     = content
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 0aeda8b..e242a5f 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -15,13 +15,13 @@
       #main
         .container-fluid
           - if @show_navigation && !admin?
-            .row-fluid
+            .row
               %h1= t(:user_control_panel)
           - if logged_in?
-            .row-fluid
-              .span12
+            .row
+              .col-md-12
                 = render 'layouts/header'
-          .row-fluid
+          .row
             = render 'layouts/content'
       #push
         -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3
diff --git a/app/views/sessions/new.html.haml b/app/views/sessions/new.html.haml
index bb7e4bd..942c485 100644
--- a/app/views/sessions/new.html.haml
+++ b/app/views/sessions/new.html.haml
@@ -1,5 +1,5 @@
-.span1
-.span9
+.col-md-1
+.col-md-9
   %h2=t :login
   .lead=t :login_info
   = render :partial => 'users/warnings'
diff --git a/app/views/users/new.html.haml b/app/views/users/new.html.haml
index bc0b1af..1b257d9 100644
--- a/app/views/users/new.html.haml
+++ b/app/views/users/new.html.haml
@@ -8,8 +8,8 @@
 
 - form_options = {url: '/not-used', html: {id: 'new_user', class: user_form_class('form-horizontal'), style: 'display:none'}, validate: true}
 
-.span1
-.span9
+.col-md-1
+.col-md-9
   %h2=t :signup
   .lead=t :signup_info
   = render :partial => 'warnings'
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index da8e467..3bdf952 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -1,6 +1,6 @@
 = render 'overview'
 .container-fluid
-  .row-fluid
+  .row
     %h4 To use bitmask services:
     = btn client_download_url, type: "primary" do
       %i.icon-arrow-down.icon-white
diff --git a/engines/support/app/views/tickets/_edit_form.html.haml b/engines/support/app/views/tickets/_edit_form.html.haml
index cd1dbe4..8d64256 100644
--- a/engines/support/app/views/tickets/_edit_form.html.haml
+++ b/engines/support/app/views/tickets/_edit_form.html.haml
@@ -34,12 +34,12 @@
 = simple_form_for @ticket do |f|
   = hidden_ticket_fields
   = f.input :subject, input_html: {:class => 'large full-width'}
-  .row-fluid
-    .span4
+  .row
+    .col-md-4
       = f.input :is_open, as: :select, collection: [:true, :false], include_blank: false
-    .span4
+    .col-md-4
       = f.input :email
-    .span4
+    .col-md-4
       = f.input :regarding_user, label: (Ticket.human_attribute_name(:regarding_user) + " " + regarding_user_link).html_safe
   = f.button :loading
   - if admin?
-- 
cgit v1.2.3


From a0d9fbc4bcbd2f37e8d86d99c2e01753eecb14d7 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sat, 26 Mar 2016 18:02:20 +0100
Subject: upgrade bootstrap3 icons work now

import bootstrap-sprockets;
before importing bootstrap in the scss.

bootstrap now uses glyphicons which are based on fonts. So we always should use
a span.

Not sure what to do with big and huge icons yet.
---
 app/assets/stylesheets/application.scss | 1 +
 app/helpers/application_helper.rb       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index e6eeda2..856a559 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -9,6 +9,7 @@
 //
 // import bootstrap.
 //
+@import "bootstrap-sprockets";
 @import "bootstrap";
 
 //
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6de5e1b..23b2752 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -19,7 +19,7 @@ module ApplicationHelper
   # http://twitter.github.io/bootstrap/base-css.html#icons
   #
   def icon(name, color=nil)
-    "<i class=\"icon-#{name} #{color_class(color)}\"></i> ".html_safe
+    "<span class=\"glyphicon glyphicon-#{name} #{color_class(color)}\"></span> ".html_safe
   end
 
   def big_icon(name, color=nil)
-- 
cgit v1.2.3


From 65f67e1829666a65a3b354d4d95f9d38aa15a81e Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sat, 26 Mar 2016 18:17:55 +0100
Subject: upgrade: fix buttons for bootstrap3

bootstrap3 now requires btn-default if no other btn option is present.
download button on home page was too small in german translation
---
 app/assets/stylesheets/leap.scss | 2 +-
 app/helpers/link_helper.rb       | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss
index 329fc09..8c4d702 100644
--- a/app/assets/stylesheets/leap.scss
+++ b/app/assets/stylesheets/leap.scss
@@ -198,7 +198,7 @@ input, textarea {
   }
   .download {
     a.btn {
-      width: 15em;
+      width: 18em;
       font-weight: bold;
       small {
         font-weight: normal;
diff --git a/app/helpers/link_helper.rb b/app/helpers/link_helper.rb
index ddb063e..b74e1d7 100644
--- a/app/helpers/link_helper.rb
+++ b/app/helpers/link_helper.rb
@@ -39,6 +39,10 @@ module LinkHelper
   def btn(*args, &block)
     html_options = extract_html_options!(args, &block)
     type = Array(html_options.delete(:type))
+    btn_opts = [:default, :primary, :success, :info, :warning, :danger, :link]
+    if (type & btn_opts).blank?
+      type << :default
+    end
     type.map! {|t| "btn-#{t}"}
     html_options[:class] = concat_classes(html_options[:class], 'btn', type)
     args[0] = t(args[0]) if args[0].is_a?(Symbol)
-- 
cgit v1.2.3


From 70d8ffc40ef57efaf75cd51e0c1ca654dc37dd4c Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sat, 26 Mar 2016 18:22:22 +0100
Subject: upgrade: bootstrap control-group -> form-group

---
 app/assets/javascripts/users.js                 | 2 +-
 app/views/users/_change_password.html.haml      | 2 +-
 app/views/users/_change_pgp_key.html.haml       | 2 +-
 app/views/users/_change_service_level.html.haml | 2 +-
 app/views/users/_contact_email.html.haml        | 2 +-
 config/initializers/simple_form_bootstrap.rb    | 8 ++++----
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js
index 70d78fd..3dae526 100644
--- a/app/assets/javascripts/users.js
+++ b/app/assets/javascripts/users.js
@@ -6,7 +6,7 @@
     "error_tag":"span",
     "wrapper_error_class":"error",
     "wrapper_tag":"div",
-    "wrapper_class":"control-group"
+    "wrapper_class":"form-group"
   }
 
   //
diff --git a/app/views/users/_change_password.html.haml b/app/views/users/_change_password.html.haml
index 425e3ee..64a4d0a 100644
--- a/app/views/users/_change_password.html.haml
+++ b/app/views/users/_change_password.html.haml
@@ -15,7 +15,7 @@
     = f.input :login, :label => t(:username), :required => false, :input_html => {:id => :srp_username}
   = f.input :password, :required => false, :validate => true, :input_html => { :id => :srp_password }
   = f.input :password_confirmation, :required => false, :input_html => { :id => :srp_password_confirmation }
-  .control-group
+  .form-group
     .controls
       = f.submit t(:save), :class => 'btn btn-primary'
 
diff --git a/app/views/users/_change_pgp_key.html.haml b/app/views/users/_change_pgp_key.html.haml
index e465125..af3eb5e 100644
--- a/app/views/users/_change_pgp_key.html.haml
+++ b/app/views/users/_change_pgp_key.html.haml
@@ -8,6 +8,6 @@
 = simple_form_for [:api, @user], form_options do |f|
   %legend= t(:advanced_options)
   = f.input :public_key, :as => :text, :hint => t(:use_ascii_key), :input_html => {:class => "full-width", :rows => 4}
-  .control-group
+  .form-group
     .controls
       = f.submit t(:save), :class => 'btn', :data => {"loading-text" => "Saving..."}
diff --git a/app/views/users/_change_service_level.html.haml b/app/views/users/_change_service_level.html.haml
index 42315a2..a2e9956 100644
--- a/app/views/users/_change_service_level.html.haml
+++ b/app/views/users/_change_service_level.html.haml
@@ -13,6 +13,6 @@
       %p
       = t(:effective_service_level)
       = f.select :effective_service_level_code, ServiceLevel.select_options, :selected => @user.effective_service_level.id
-    .control-group
+    .form-group
       .controls
         = f.submit t(:save), :class => 'btn', :data => {"loading-text" => "Saving..."}
diff --git a/app/views/users/_contact_email.html.haml b/app/views/users/_contact_email.html.haml
index ad768b7..1627ff6 100644
--- a/app/views/users/_contact_email.html.haml
+++ b/app/views/users/_contact_email.html.haml
@@ -4,6 +4,6 @@
   = f.input :contact_email, :label => false
   -# %p= t(:public_key)
   -# = f.text_area :contact_email_key, {:class => "full-width", :rows => 4}
-  .control-group
+  .form-group
     .controls
       = f.submit t(:save), :class => 'btn', :data => {"loading-text" => "Saving..."}
\ No newline at end of file
diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb
index c949f5e..f693a4f 100644
--- a/config/initializers/simple_form_bootstrap.rb
+++ b/config/initializers/simple_form_bootstrap.rb
@@ -1,6 +1,6 @@
 # Use this setup block to configure all options available in SimpleForm.
 SimpleForm.setup do |config|
-  config.wrappers :bootstrap, :tag => 'div', :class => 'control-group', :error_class => 'error' do |b|
+  config.wrappers :bootstrap, :tag => 'div', :class => 'form-group', :error_class => 'error' do |b|
     b.use :html5
     b.use :placeholder
     b.use :label
@@ -11,7 +11,7 @@ SimpleForm.setup do |config|
     end
   end
 
-  config.wrappers :prepend, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
+  config.wrappers :prepend, :tag => 'div', :class => "form-group", :error_class => 'error' do |b|
     b.use :html5
     b.use :placeholder
     b.use :label
@@ -24,7 +24,7 @@ SimpleForm.setup do |config|
     end
   end
 
-  config.wrappers :append, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
+  config.wrappers :append, :tag => 'div', :class => "form-group", :error_class => 'error' do |b|
     b.use :html5
     b.use :placeholder
     b.use :label
@@ -38,7 +38,7 @@ SimpleForm.setup do |config|
   end
 
   #
-  # when you don't want any bootstrap "control-group" or "controls" wrappers.
+  # when you don't want any bootstrap "form-group" or "controls" wrappers.
   #
   config.wrappers :none, :tag => 'div', :error_class => 'error' do |b|
     b.use :html5
-- 
cgit v1.2.3


From 7574862cdb8f43e9e4334924dc360f3d20b2c5fd Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sat, 26 Mar 2016 18:33:30 +0100
Subject: upgrade: horizontal forms now need column styles

---
 config/initializers/simple_form_bootstrap.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb
index f693a4f..720174f 100644
--- a/config/initializers/simple_form_bootstrap.rb
+++ b/config/initializers/simple_form_bootstrap.rb
@@ -3,8 +3,8 @@ SimpleForm.setup do |config|
   config.wrappers :bootstrap, :tag => 'div', :class => 'form-group', :error_class => 'error' do |b|
     b.use :html5
     b.use :placeholder
-    b.use :label
-    b.wrapper :tag => 'div', :class => 'controls' do |ba|
+    b.use :label, :class => 'col-sm-2'
+    b.wrapper :tag => 'div', :class => 'col-sm-10' do |ba|
       ba.use :input
       ba.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
       ba.use :hint,  :wrap_with => { :tag => 'p', :class => 'help-block' }
-- 
cgit v1.2.3


From 500fa2db1d593131d7cebd127c941a44bf174223 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sat, 26 Mar 2016 18:42:36 +0100
Subject: use icon helper from navigation helper

and use content_tag inside the icon helper... html_safe is evil.
---
 app/helpers/application_helper.rb | 3 ++-
 app/helpers/navigation_helper.rb  | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 23b2752..920186d 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -19,7 +19,8 @@ module ApplicationHelper
   # http://twitter.github.io/bootstrap/base-css.html#icons
   #
   def icon(name, color=nil)
-    "<span class=\"glyphicon glyphicon-#{name} #{color_class(color)}\"></span> ".html_safe
+    content_tag :span, '',
+      class: "glyphicon glyphicon-#{name} #{color_class(color)}"
   end
 
   def big_icon(name, color=nil)
diff --git a/app/helpers/navigation_helper.rb b/app/helpers/navigation_helper.rb
index 2639246..1df840c 100644
--- a/app/helpers/navigation_helper.rb
+++ b/app/helpers/navigation_helper.rb
@@ -66,9 +66,9 @@ module NavigationHelper
   end
 
   def extract_icon!(options)
-    icon = options.delete(:icon)
-    if icon.present?
-      content_tag(:i, '', class: "icon-#{icon}")
+    name = options.delete(:icon)
+    if name.present?
+      icon name
     else
       ""
     end
-- 
cgit v1.2.3


From 6117518350847e83e5b0e79cb206b03ff99d6ee2 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sat, 26 Mar 2016 19:59:12 +0100
Subject: bugfix: test user properly in auto_new_ticket_path

---
 engines/support/app/helpers/auto_tickets_path_helper.rb | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/engines/support/app/helpers/auto_tickets_path_helper.rb b/engines/support/app/helpers/auto_tickets_path_helper.rb
index bc98a0a..17fc003 100644
--- a/engines/support/app/helpers/auto_tickets_path_helper.rb
+++ b/engines/support/app/helpers/auto_tickets_path_helper.rb
@@ -4,7 +4,8 @@
 # (1) include the user in the path if appropriate.
 # (2) retain the sort params, if appropriate.
 #
-# Tickets views with a user_id are limited to that user. For admins, they don't need a user_id for any ticket action.
+# Tickets views with a user_id are limited to that user.
+# Admins don't need a user_id for any ticket action.
 #
 # This is available both to the views and the tickets_controller.
 #
@@ -13,7 +14,6 @@ module AutoTicketsPathHelper
   protected
 
   def auto_tickets_path(options={})
-    return unless options.class == Hash
     options = ticket_view_options.merge options
     if @user.is_a? User
       user_tickets_path(@user, options)
@@ -22,9 +22,9 @@ module AutoTicketsPathHelper
     end
   end
 
-  def auto_ticket_path(ticket, options={})
+  def auto_ticket_path(ticket)
     return unless ticket.persisted?
-    options = ticket_view_options.merge options
+    options = ticket_view_options
     if @user.is_a? User
       user_ticket_path(@user, ticket, options)
     else
@@ -32,10 +32,9 @@ module AutoTicketsPathHelper
     end
   end
 
-  def auto_new_ticket_path(options={})
-    return unless options.class == Hash
-    options = ticket_view_options.merge options
-    if @user
+  def auto_new_ticket_path
+    options = ticket_view_options
+    if @user.is_a? User
       new_user_ticket_path(@user, options)
     else
       new_ticket_path(options)
-- 
cgit v1.2.3


From c9f24739664e9d4f7bcdafa87c7d53a5f339cbae Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 2 May 2016 21:16:36 -0300
Subject: upgrade: couchrest_session_store 0.4.2

Uses the latest couchrest and couchrest_model.
Also fixes issues with ruby 2.1
---
 Gemfile      |  2 +-
 Gemfile.lock | 16 ++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0df9357..f327281 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ gem 'responders', '~> 2.0'
 gem "couchrest", "~> 2.0.0.rc3"
 gem "couchrest_model", "~> 2.1.0.beta2"
 if ARGV.grep(/assets:precompile/).empty?
-  gem "couchrest_session_store", "~> 0.4.1"
+  gem "couchrest_session_store", "~> 0.4.2"
 end
 
 ## AUTHENTICATION
diff --git a/Gemfile.lock b/Gemfile.lock
index bd41a09..e0dc859 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -22,14 +22,6 @@ PATH
     common_languages (0.0.1)
       i18n
 
-PATH
-  remote: vendor/gems/couchrest_session_store
-  specs:
-    couchrest_session_store (0.4.0)
-      actionpack (~> 4.0)
-      couchrest
-      couchrest_model
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -111,10 +103,10 @@ GEM
       activemodel (~> 4.0)
       couchrest (= 2.0.0.rc3)
       tzinfo (>= 0.3.22)
-    couchrest_session_store (0.4.1)
+    couchrest_session_store (0.4.2)
       actionpack (~> 4.0)
-      couchrest
-      couchrest_model
+      couchrest (~> 2.0.0.rc3)
+      couchrest_model (~> 2.1.0.beta2)
     cucumber (2.3.3)
       builder (>= 2.1.2)
       cucumber-core (~> 1.4.0)
@@ -322,7 +314,7 @@ DEPENDENCIES
   common_languages!
   couchrest (~> 2.0.0.rc3)
   couchrest_model (~> 2.1.0.beta2)
-  couchrest_session_store (~> 0.4.1)
+  couchrest_session_store (~> 0.4.2)
   cucumber-rails
   factory_girl_rails
   fake_braintree
-- 
cgit v1.2.3


From a7718c19ab96648e37063c05bffe21bc2c315325 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Tue, 3 May 2016 09:01:18 -0300
Subject: fix type mismatch TokenAuthTest

rails 4 mixes model, controller and integration tests. So lets
give this one a better name
---
 .../configs_controller_with_static_tokens_test.rb  | 40 ++++++++++++++++++++++
 test/functional/token_auth_test.rb                 | 40 ----------------------
 2 files changed, 40 insertions(+), 40 deletions(-)
 create mode 100644 test/functional/configs_controller_with_static_tokens_test.rb
 delete mode 100644 test/functional/token_auth_test.rb

diff --git a/test/functional/configs_controller_with_static_tokens_test.rb b/test/functional/configs_controller_with_static_tokens_test.rb
new file mode 100644
index 0000000..79739fe
--- /dev/null
+++ b/test/functional/configs_controller_with_static_tokens_test.rb
@@ -0,0 +1,40 @@
+#
+# tests for authenticating an admin or monitor user
+# via static configured tokens.
+#
+
+require 'test_helper'
+
+class ConfigsControllerWithStaticTokensTest < ActionController::TestCase
+  tests V1::ConfigsController
+
+  def test_login_via_api_token
+    with_config(:allow_anonymous_certs => false) do
+      monitor_auth do
+        get :index
+        assert assigns(:token), 'should have authenticated via api token'
+        assert assigns(:token).is_a? ApiToken
+        assert @controller.send(:current_user).is_a? ApiMonitorUser
+      end
+    end
+  end
+
+  def test_fail_api_auth_when_ip_not_allowed
+    with_config(:allow_anonymous_certs => false) do
+      allowed = "99.99.99.99"
+      new_config = {api_tokens: APP_CONFIG["api_tokens"].merge(allowed_ips: [allowed])}
+      with_config(new_config) do
+        monitor_auth do
+          request.env['REMOTE_ADDR'] = "1.1.1.1"
+          get :index
+          assert_nil assigns(:token), "should not be able to auth with api token when ip restriction doesn't allow it"
+          request.env['REMOTE_ADDR'] = allowed
+          get :index
+          assert assigns(:token), "should have authenticated via api token"
+        end
+      end
+    end
+  end
+
+end
+
diff --git a/test/functional/token_auth_test.rb b/test/functional/token_auth_test.rb
deleted file mode 100644
index 53d5fb3..0000000
--- a/test/functional/token_auth_test.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# tests for authenticating an admin or monitor user
-# via static configured tokens.
-#
-
-require_relative '../test_helper'
-
-class TokenAuthTest < ActionController::TestCase
-  tests V1::ConfigsController
-
-  def test_login_via_api_token
-    with_config(:allow_anonymous_certs => false) do
-      monitor_auth do
-        get :index
-        assert assigns(:token), 'should have authenticated via api token'
-        assert assigns(:token).is_a? ApiToken
-        assert @controller.send(:current_user).is_a? ApiMonitorUser
-      end
-    end
-  end
-
-  def test_fail_api_auth_when_ip_not_allowed
-    with_config(:allow_anonymous_certs => false) do
-      allowed = "99.99.99.99"
-      new_config = {api_tokens: APP_CONFIG["api_tokens"].merge(allowed_ips: [allowed])}
-      with_config(new_config) do
-        monitor_auth do
-          request.env['REMOTE_ADDR'] = "1.1.1.1"
-          get :index
-          assert_nil assigns(:token), "should not be able to auth with api token when ip restriction doesn't allow it"
-          request.env['REMOTE_ADDR'] = allowed
-          get :index
-          assert assigns(:token), "should have authenticated via api token"
-        end
-      end
-    end
-  end
-
-end
-
-- 
cgit v1.2.3


From fc066a42ec5a3271b0d476ff2c5ab771f1ab726d Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Tue, 3 May 2016 10:24:11 -0300
Subject: fix failing unit and functional tests

---
 app/controllers/controller_extension/fetch_user.rb |  2 +-
 app/models/api_monitor_user.rb                     | 11 +++++++++++
 app/models/api_user.rb                             | 13 +------------
 3 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 app/models/api_monitor_user.rb

diff --git a/app/controllers/controller_extension/fetch_user.rb b/app/controllers/controller_extension/fetch_user.rb
index 97f92fa..632291d 100644
--- a/app/controllers/controller_extension/fetch_user.rb
+++ b/app/controllers/controller_extension/fetch_user.rb
@@ -22,7 +22,7 @@ module ControllerExtension::FetchUser
     @user = User.find(params[:user_id] || params[:id])
     if current_user.is_admin? || current_user.is_monitor?
       if @user.nil?
-        not_found(t(:no_such_thing, :thing => 'user'), users_url)
+        not_found(t(:no_such_user), users_url)
       elsif current_user.is_monitor?
         access_denied unless @user.is_test?
       end
diff --git a/app/models/api_monitor_user.rb b/app/models/api_monitor_user.rb
new file mode 100644
index 0000000..d0fe411
--- /dev/null
+++ b/app/models/api_monitor_user.rb
@@ -0,0 +1,11 @@
+#
+# A user that has limited admin access, to be used
+# for running monitor tests against a live production
+# installation.
+#
+class ApiMonitorUser < ApiUser
+  def is_monitor?
+    true
+  end
+end
+
diff --git a/app/models/api_user.rb b/app/models/api_user.rb
index 2efe1cb..c70cccb 100644
--- a/app/models/api_user.rb
+++ b/app/models/api_user.rb
@@ -2,17 +2,6 @@
 class ApiUser < AnonymousUser
 end
 
-#
-# A user that has limited admin access, to be used
-# for running monitor tests against a live production
-# installation.
-#
-class ApiMonitorUser < ApiUser
-  def is_monitor?
-    true
-  end
-end
-
 #
 # Not yet supported:
 #
@@ -20,4 +9,4 @@ end
 #  def is_admin?
 #    true
 #  end
-#end
\ No newline at end of file
+#end
-- 
cgit v1.2.3


From 33e2a52f683697ca8489d856df90b39bfbbe7373 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Tue, 3 May 2016 11:29:45 -0300
Subject: use APP_CONFIG[config_file_paths] for provider.json

This avoids overwriting the PROVIDER_JSON constant in the
StaticConfigController and thus fixes test warnings.

Also moved away from using instance variables in the
ControllerExtension::JsonFile - instead querying the corresponding
functions now - less sideeffects and easier stubbing.
---
 app/controllers/controller_extension/json_file.rb | 23 ++++++++++++++---------
 app/controllers/static_config_controller.rb       | 11 ++++-------
 app/controllers/v1/configs_controller.rb          |  6 ++----
 config/defaults.yml                               |  1 +
 features/step_definitions/config_steps.rb         |  9 +++------
 test/functional/static_config_controller_test.rb  |  6 +++---
 6 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/app/controllers/controller_extension/json_file.rb b/app/controllers/controller_extension/json_file.rb
index 5b5e55e..df9cf55 100644
--- a/app/controllers/controller_extension/json_file.rb
+++ b/app/controllers/controller_extension/json_file.rb
@@ -4,20 +4,25 @@ module ControllerExtension::JsonFile
 
   protected
 
-  def send_file
-    if stale?(:last_modified => @file.mtime)
-      response.content_type = 'application/json'
-      render :text => @file.read
+  def send_file(filename)
+    file = fetch_file(filename)
+    if file.present?
+      send_file_or_cache_hit(file)
+    else
+      not_found
     end
   end
 
-  def fetch_file
-    if File.exist?(@filename)
-      @file = File.new(@filename)
-    else
-      not_found
+  def send_file_or_cache_hit(file)
+    if stale?(:last_modified => file.mtime)
+      response.content_type = 'application/json'
+      render :text => file.read
     end
   end
 
+  def fetch_file(filename)
+    File.new(filename) if File.exist?(filename)
+  end
+
 end
 
diff --git a/app/controllers/static_config_controller.rb b/app/controllers/static_config_controller.rb
index c78e006..46e7cd2 100644
--- a/app/controllers/static_config_controller.rb
+++ b/app/controllers/static_config_controller.rb
@@ -5,13 +5,9 @@ class StaticConfigController < ActionController::Base
   include ControllerExtension::JsonFile
 
   before_filter :set_minimum_client_version
-  before_filter :set_filename
-  before_filter :fetch_file
-
-  PROVIDER_JSON = Rails.root.join('config', 'provider', 'provider.json')
 
   def provider
-    send_file
+    send_file provider_json
   end
 
   protected
@@ -23,7 +19,8 @@ class StaticConfigController < ActionController::Base
       APP_CONFIG[:minimum_client_version].to_s
   end
 
-  def set_filename
-    @filename = PROVIDER_JSON
+  def provider_json
+    Rails.root.join APP_CONFIG[:config_file_paths]['provider']
   end
+
 end
diff --git a/app/controllers/v1/configs_controller.rb b/app/controllers/v1/configs_controller.rb
index 4a6f455..f0b284e 100644
--- a/app/controllers/v1/configs_controller.rb
+++ b/app/controllers/v1/configs_controller.rb
@@ -3,15 +3,13 @@ class V1::ConfigsController < ApiController
 
   before_filter :require_login, :unless => :anonymous_access_allowed?
   before_filter :sanitize_id, only: :show
-  before_filter :lookup_file, only: :show
-  before_filter :fetch_file, only: :show
 
   def index
     render json: {services: service_paths}
   end
 
   def show
-    send_file
+    send_file lookup_file
   end
 
   protected
@@ -34,6 +32,6 @@ class V1::ConfigsController < ApiController
   def lookup_file
     path = APP_CONFIG[:config_file_paths][@id]
     not_found if path.blank?
-    @filename = Rails.root.join path
+    Rails.root.join path
   end
 end
diff --git a/config/defaults.yml b/config/defaults.yml
index 844adaa..7e2ea58 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -87,6 +87,7 @@ common: &common
     soledad-service: 'public/1/config/soledad-service.json'
     eip-service: 'public/1/config/eip-service.json'
     smtp-service: 'public/1/config/smtp-service.json'
+    provider: 'config/provider/provider.json'
   mailer:
     from_address: 'noreply'
 
diff --git a/features/step_definitions/config_steps.rb b/features/step_definitions/config_steps.rb
index 1fc67f5..a635d06 100644
--- a/features/step_definitions/config_steps.rb
+++ b/features/step_definitions/config_steps.rb
@@ -4,12 +4,9 @@ Given /there is a config for the (.*)$/ do |config|
   @tempfile = Tempfile.new("#{config}.json")
   @tempfile.write @dummy_config
   @tempfile.close
-  if config == 'provider'
-    StaticConfigController::PROVIDER_JSON = @tempfile.path
-  else
-    @orig_config ||= APP_CONFIG.dup
-    APP_CONFIG[:config_file_paths].merge! "#{config}-service" => @tempfile.path
-  end
+  @orig_config ||= APP_CONFIG.dup
+  config = "#{config}-service" unless config == 'provider'
+  APP_CONFIG[:config_file_paths].merge! config => @tempfile.path
 end
 
 # use with @config
diff --git a/test/functional/static_config_controller_test.rb b/test/functional/static_config_controller_test.rb
index 9c2cfef..7027bf8 100644
--- a/test/functional/static_config_controller_test.rb
+++ b/test/functional/static_config_controller_test.rb
@@ -1,7 +1,7 @@
 require 'test_helper'
 
 # use minitest for stubbing, rather than bloated mocha
-require 'minitest/stub_const'
+require 'minitest/mock'
 
 class StaticConfigControllerTest < ActionController::TestCase
 
@@ -9,7 +9,7 @@ class StaticConfigControllerTest < ActionController::TestCase
   end
 
   def test_provider_success
-    StaticConfigController.stub_const(:PROVIDER_JSON, file_path('provider.json')) do
+    @controller.stub(:provider_json, file_path('provider.json')) do
       get :provider, format: :json
       assert_equal 'application/json', @response.content_type
       assert_response :success
@@ -17,7 +17,7 @@ class StaticConfigControllerTest < ActionController::TestCase
   end
 
   def test_provider_not_modified
-    StaticConfigController.stub_const(:PROVIDER_JSON, file_path('provider.json')) do
+    @controller.stub(:provider_json, file_path('provider.json')) do
       request.env["HTTP_IF_MODIFIED_SINCE"] = File.mtime(file_path('provider.json')).rfc2822()
       get :provider, format: :json
       assert_response 304
-- 
cgit v1.2.3


From 0ab4b26752c7949840f9168a7e8dc94226debd51 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 9 May 2016 08:34:50 +0200
Subject: minor: cleanup debug message in test

---
 test/functional/v1/messages_controller_test.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/functional/v1/messages_controller_test.rb b/test/functional/v1/messages_controller_test.rb
index 67f34a1..f37cca0 100644
--- a/test/functional/v1/messages_controller_test.rb
+++ b/test/functional/v1/messages_controller_test.rb
@@ -15,7 +15,6 @@ class V1::MessagesControllerTest < ActionController::TestCase
       login @user
       get :index, :locale => 'es'
       body = JSON.parse(response.body)
-      p body
       message1 = "<p>\"This\" is a <strong>very</strong> fine message. <a href=\"https://bitmask.net\">https://bitmask.net</a></p>\n"
       assert_equal 2, body.size, 'there should be two messages'
       assert_equal message1, body.first["text"], 'first message text should match files/motd/1.en.md'
-- 
cgit v1.2.3


From 90e2145e33913ff59b99b81a660cb730e3c7efd8 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 9 May 2016 08:54:57 +0200
Subject: test: make identity test locale independent

It somehow managed to fail for a certain test order. Seems rather
rare though - have not been able to reproduce it in 5 runs.

Failed with --seed 60219.
---
 test/support/record_assertions.rb | 10 ++++++++++
 test/unit/identity_test.rb        |  9 +++++----
 2 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 test/support/record_assertions.rb

diff --git a/test/support/record_assertions.rb b/test/support/record_assertions.rb
new file mode 100644
index 0000000..30b947f
--- /dev/null
+++ b/test/support/record_assertions.rb
@@ -0,0 +1,10 @@
+module RecordAssertions
+
+  def assert_error(record, options)
+    options.each do |k, v|
+      errors = record.errors[k]
+      assert_equal I18n.t("errors.messages.#{v}"), errors.first
+    end
+  end
+
+end
diff --git a/test/unit/identity_test.rb b/test/unit/identity_test.rb
index 9d4bc90..e9173af 100644
--- a/test/unit/identity_test.rb
+++ b/test/unit/identity_test.rb
@@ -2,6 +2,7 @@ require_relative '../test_helper'
 
 class IdentityTest < ActiveSupport::TestCase
   include StubRecordHelper
+  include RecordAssertions
 
   setup do
     @user = find_record :user
@@ -22,7 +23,7 @@ class IdentityTest < ActiveSupport::TestCase
   test "enabled identity requires destination" do
     @id = Identity.new user: @user, address: @user.email_address
     assert !@id.valid?
-    assert_equal ["can't be blank"], @id.errors[:destination]
+    assert_error @id, destination: :blank
   end
 
   test "disabled identity requires no destination" do
@@ -62,7 +63,7 @@ class IdentityTest < ActiveSupport::TestCase
     @id = Identity.create_for @user, address: alias_name, destination: forward_address
     dup = Identity.build_for @user, address: alias_name, destination: forward_address
     assert !dup.valid?
-    assert_equal ["has already been taken"], dup.errors[:destination]
+    assert_error dup, destination: :taken
   end
 
   test "validates availability" do
@@ -70,7 +71,7 @@ class IdentityTest < ActiveSupport::TestCase
     @id = Identity.create_for @user, address: alias_name, destination: forward_address
     taken = Identity.build_for other_user, address: alias_name
     assert !taken.valid?
-    assert_equal ["has already been taken"], taken.errors[:address]
+    assert_error taken, address: :taken
   end
 
   test "setting and getting pgp key" do
@@ -133,7 +134,7 @@ class IdentityTest < ActiveSupport::TestCase
     other_user = find_record :user
     taken = Identity.build_for other_user, address: @id.address
     assert !taken.valid?
-    assert_equal ["has already been taken"], taken.errors[:address]
+    assert_error taken, address: :taken
   end
 
   test "destroy all orphaned identities" do
-- 
cgit v1.2.3


From aeb0f39362b2195d4aec418349538b5f8443f693 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 12 May 2016 14:30:23 +0200
Subject: minor: no need to vendor couchrest_session_store

---
 vendor/gems/couchrest_session_store/.travis.yml    |   6 -
 vendor/gems/couchrest_session_store/Gemfile        |   7 -
 vendor/gems/couchrest_session_store/README.md      | 133 -----------
 vendor/gems/couchrest_session_store/Rakefile       |   9 -
 .../couchrest_session_store.gemspec                |  25 --
 .../couchrest_session_store/design/Session.json    |   8 -
 .../lib/couchrest/model/database_method.rb         | 131 ----------
 .../lib/couchrest/model/rotation.rb                | 263 ---------------------
 .../lib/couchrest/session.rb                       | 105 --------
 .../lib/couchrest/session/document.rb              |  34 ---
 .../lib/couchrest/session/store.rb                 |  94 --------
 .../lib/couchrest/session/utility.rb               |  12 -
 .../lib/couchrest_session_store.rb                 |  11 -
 .../couchrest_session_store/test/couch_tester.rb   |  27 ---
 .../test/database_method_test.rb                   | 116 ---------
 .../test/database_rotation_test.rb                 |  88 -------
 .../test/session_document_test.rb                  |  27 ---
 .../test/session_store_test.rb                     | 168 -------------
 .../couchrest_session_store/test/setup_couch.sh    |   7 -
 .../couchrest_session_store/test/stress_test.rb    |  51 ----
 .../couchrest_session_store/test/test_clock.rb     |  12 -
 .../couchrest_session_store/test/test_helper.rb    |   9 -
 22 files changed, 1343 deletions(-)
 delete mode 100644 vendor/gems/couchrest_session_store/.travis.yml
 delete mode 100644 vendor/gems/couchrest_session_store/Gemfile
 delete mode 100644 vendor/gems/couchrest_session_store/README.md
 delete mode 100644 vendor/gems/couchrest_session_store/Rakefile
 delete mode 100644 vendor/gems/couchrest_session_store/couchrest_session_store.gemspec
 delete mode 100644 vendor/gems/couchrest_session_store/design/Session.json
 delete mode 100644 vendor/gems/couchrest_session_store/lib/couchrest/model/database_method.rb
 delete mode 100644 vendor/gems/couchrest_session_store/lib/couchrest/model/rotation.rb
 delete mode 100644 vendor/gems/couchrest_session_store/lib/couchrest/session.rb
 delete mode 100644 vendor/gems/couchrest_session_store/lib/couchrest/session/document.rb
 delete mode 100644 vendor/gems/couchrest_session_store/lib/couchrest/session/store.rb
 delete mode 100644 vendor/gems/couchrest_session_store/lib/couchrest/session/utility.rb
 delete mode 100644 vendor/gems/couchrest_session_store/lib/couchrest_session_store.rb
 delete mode 100644 vendor/gems/couchrest_session_store/test/couch_tester.rb
 delete mode 100644 vendor/gems/couchrest_session_store/test/database_method_test.rb
 delete mode 100644 vendor/gems/couchrest_session_store/test/database_rotation_test.rb
 delete mode 100644 vendor/gems/couchrest_session_store/test/session_document_test.rb
 delete mode 100644 vendor/gems/couchrest_session_store/test/session_store_test.rb
 delete mode 100755 vendor/gems/couchrest_session_store/test/setup_couch.sh
 delete mode 100644 vendor/gems/couchrest_session_store/test/stress_test.rb
 delete mode 100644 vendor/gems/couchrest_session_store/test/test_clock.rb
 delete mode 100644 vendor/gems/couchrest_session_store/test/test_helper.rb

diff --git a/vendor/gems/couchrest_session_store/.travis.yml b/vendor/gems/couchrest_session_store/.travis.yml
deleted file mode 100644
index 073d421..0000000
--- a/vendor/gems/couchrest_session_store/.travis.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-services:
-  - couchdb
-notifications:
-  email: false
-before_script:
-  - "test/setup_couch.sh"
diff --git a/vendor/gems/couchrest_session_store/Gemfile b/vendor/gems/couchrest_session_store/Gemfile
deleted file mode 100644
index 88b81a0..0000000
--- a/vendor/gems/couchrest_session_store/Gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in couchrest-session-store.gemspec
-gemspec
-
-gem 'debugger'
-
diff --git a/vendor/gems/couchrest_session_store/README.md b/vendor/gems/couchrest_session_store/README.md
deleted file mode 100644
index 60e692e..0000000
--- a/vendor/gems/couchrest_session_store/README.md
+++ /dev/null
@@ -1,133 +0,0 @@
-# CouchRest::Session::Store #
-
-A simple session store based on CouchRest Model.
-
-## Setup ##
-
-`CouchRest::Session::Store` will automatically pick up the config/couch.yml
-file used by CouchRest Model.
-
-Cleaning up sessions requires a design document in the sessions database that
-enables querying by expiry. See `design/Session.json` for an example. This
-design document is loaded for tests, but you will need to load it on your own
-in a production environment. For example:
-
-    curl -X PUT username:password@localhost:5984/couchrest_sessions/_design/Session --data @design/Session.json
-
-## Options ##
-
-* marshal_data: (_defaults true_) - if set to false session data will be stored
-  directly in the couch document. Otherwise it's marshalled and base64 encoded
-  to enable restoring ruby data structures.
-* database: database to use combined with config prefix and suffix
-* expire_after: lifetime of a session in seconds.
-
-## Dynamic Databases ##
-
-This gem also includes the module `CouchRest::Model::DatabaseMethod`, which
-allow a Model to dynamically choose what database to use.
-
-An example of specifying database dynamically:
-
-    class Token < CouchRest::Model::Base
-      include CouchRest::Model::DatabaseMethod
-
-      use_database_method :database_name
-
-      def self.database_name
-        time = Time.now.utc
-        "tokens_#{time.year}_#{time.month}"
-      end
-    end
-
-A couple notes:
-
-Once you include `CouchRest::Model::DatabaseMethod`, the database is no longer
-automatically created. In this example, you would need to run
-`Token.database.create!` or `Token.database!` in order to create the database.
-
-The symbol passed to `database_method` must match the name of a class method,
-but if there is also an instance method with the same name then this instance
-method will be called when appropriate. To state the obvious, tread lightly:
-there be dragons when generating database names that depend on properties of
-the instance.
-
-## Database Rotation ##
-
-The module `CouchRest::Model::Rotation` can be included in a Model in
-order to use dynamic databases to perform database rotation.
-
-CouchDB is not good for ephemeral data because old documents are never really
-deleted: when you deleted a document, it just appends a new revision. The bulk
-of the old data is not stored, but it does store a record for each doc id and
-revision id for the document. In the case of ephemeral data, like tokens,
-sessions, or statistics, this will quickly bloat the database with a ton of
-useless deleted documents. The proper solution is to rotate the databases:
-create a new one regularly and delete the old one entirely. This will allow
-you to recover the storage space.
-
-A better solution might be to just use a different database for all
-ephemeral data, like MariaDB or Redis. But, if you really want to use CouchDB, this
-is how you can do it.
-
-An example of specifying database rotation:
-
-    class Token < CouchRest::Model::Base
-      include CouchRest::Model::Rotation
-
-      rotate_database 'tokens', :every => 30.days
-    end
-
-Then, in a task triggered by a cron job:
-
-    CouchRest::Model::Base.configure do |conf|
-      conf.environment = Rails.env
-      conf.connection_config_file = File.join(Rails.root, 'config', 'couchdb.admin.yml')
-    end
-    Token.rotate_database_now(:window => 1.day)
-
-Or perhaps:
-
-    Rails.application.eager_load!
-    CouchRest::Model::Rotation.descendants.each do |model|
-      model.rotate_database_now
-    end
-
-The `:window` argument to `rotate_database_now` specifies how far in advance we
-should create the new database (default 1.day). For ideal behavior, this value
-should be GREATER than or equal to the frequency with which the cron job is
-run. For example, if the cron job is run every hour, the argument can be
-`1.hour`, `2.hours`, `1.day`, but not `20.minutes`.
-
-The method `rotate_database_now` will do nothing if the database has already
-been rotated. Otherwise, as needed, it will create the new database, create
-the design documents, set up replication between the old and new databases,
-and delete the old database (once it is not used anymore).
-
-These actions will require admin access, so if your application normally runs
-without admin rights you will need specify a different configuration for
-CouchRest::Model before `rotate_database_now` is called.
-
-Known issues:
-
-* If you change the rotation period, there will be a break in the rotation
-  (old documents will not get replicated to the new rotated db) and the old db
-  will not get automatically deleted.
-
-* Calling `Model.database.delete!` will not necessarily remove all the
-  relevant databases because of the way prior and future databases are kept
-  for the 'window' period.
-
-## Changes ##
-
-0.3.0
-
-* Added support for dynamic and rotating databases.
-
-0.2.4
-
-* Do not crash if can't connect to CouchDB
-
-0.2.3
-
-* Better retry and conflict catching.d
\ No newline at end of file
diff --git a/vendor/gems/couchrest_session_store/Rakefile b/vendor/gems/couchrest_session_store/Rakefile
deleted file mode 100644
index 8e1dc9c..0000000
--- a/vendor/gems/couchrest_session_store/Rakefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env rake
-require "bundler/gem_tasks"
-require 'rake/testtask'
-
-task default: [:test]
-
-Rake::TestTask.new do |t|
-  t.pattern = "test/*_test.rb"
-end
diff --git a/vendor/gems/couchrest_session_store/couchrest_session_store.gemspec b/vendor/gems/couchrest_session_store/couchrest_session_store.gemspec
deleted file mode 100644
index bf3b2b2..0000000
--- a/vendor/gems/couchrest_session_store/couchrest_session_store.gemspec
+++ /dev/null
@@ -1,25 +0,0 @@
-# _*_ encoding: utf-8 -*-
-
-Gem::Specification.new do |gem|
-
-  gem.authors = ["Azul"]
-  gem.email = ["azul@leap.se"]
-  gem.summary = "A Rails Session Store based on CouchRest Model"
-  gem.description = gem.summary
-  gem.homepage = "http://github.com/azul/couchrest_session_store"
-
-  gem.has_rdoc = true
-#  gem.extra_rdoc_files = ["LICENSE"]
-
-  gem.files = `git ls-files`.split("\n")
-  gem.name = "couchrest_session_store"
-  gem.require_paths = ["lib"]
-  gem.version = '0.4.0'
-
-  gem.add_dependency "couchrest"
-  gem.add_dependency "couchrest_model"
-  gem.add_dependency "actionpack", '~> 4.0'
-
-  gem.add_development_dependency "minitest"
-  gem.add_development_dependency "rake"
-end
diff --git a/vendor/gems/couchrest_session_store/design/Session.json b/vendor/gems/couchrest_session_store/design/Session.json
deleted file mode 100644
index 7020278..0000000
--- a/vendor/gems/couchrest_session_store/design/Session.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-   "views": {
-       "by_expires": {
-           "reduce": "_sum",
-           "map": "function(doc) {\n  if(typeof doc.expires !== \"undefined\") {\n    emit(doc.expires, 1);\n  }\n}\n"
-       }
-   }
-}
diff --git a/vendor/gems/couchrest_session_store/lib/couchrest/model/database_method.rb b/vendor/gems/couchrest_session_store/lib/couchrest/model/database_method.rb
deleted file mode 100644
index 6ecc8f3..0000000
--- a/vendor/gems/couchrest_session_store/lib/couchrest/model/database_method.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-#
-# Allow setting the database to happen dynamically.
-#
-# Unlike normal CouchRest::Model, the database is not automatically created
-# unless you call database!()
-#
-# The method specified by `database_method` must exist as a class method but
-# may optionally also exist as an instance method.
-#
-
-module CouchRest
-  module Model
-    module DatabaseMethod
-      extend ActiveSupport::Concern
-
-      def database
-        if self.class.database_method
-          self.class.server.database(call_database_method)
-        else
-          self.class.database
-        end
-      end
-
-      def database!
-        if self.class.database_method
-          self.class.server.database!(call_database_method)
-        else
-          self.class.database!
-        end
-      end
-
-      def database_exists?(db_name)
-        self.class.database_exists?(db_name)
-      end
-
-      #
-      # The normal CouchRest::Model::Base comparison checks if the model's
-      # database objects are the same. That is not good for use here, since
-      # the objects will always be different. Instead, we compare the string
-      # that each database evaluates to.
-      #
-      def ==(other)
-        return false unless other.is_a?(Base)
-        if id.nil? && other.id.nil?
-          to_hash == other.to_hash
-        else
-          id == other.id && database.to_s == other.database.to_s
-        end
-      end
-      alias :eql? :==
-
-      protected
-
-      def call_database_method
-        if self.respond_to?(self.class.database_method)
-          name = self.send(self.class.database_method)
-          self.class.db_name_with_prefix(name)
-        else
-          self.class.send(:call_database_method)
-        end
-      end
-
-      module ClassMethods
-
-        def database_method(method = nil)
-          if method
-            @database_method = method
-          end
-          @database_method
-        end
-        alias :use_database_method :database_method
-
-        def database
-          if database_method
-            if !self.respond_to?(database_method)
-              raise ArgumentError.new("Incorrect argument to database_method(): no such method '#{method}' found in class #{self}.")
-            end
-            self.server.database(call_database_method)
-          else
-            @database ||= prepare_database(super)
-          end
-        end
-
-        def database!
-          if database_method
-            self.server.database!(call_database_method)
-          else
-            @database ||= prepare_database(super)
-          end
-        end
-
-        #
-        # same as database(), but allows for an argument that gets passed through to
-        # database method.
-        #
-        def choose_database(*args)
-          self.server.database(call_database_method(*args))
-        end
-
-        def db_name_with_prefix(name)
-          conf = self.send(:connection_configuration)
-          [conf[:prefix], name, conf[:suffix]].reject{|i|i.to_s.empty?}.join(conf[:join])
-        end
-
-        def database_exists?(name)
-          name = db_name_with_prefix(name)
-          begin
-            CouchRest.head "#{self.server.uri}/#{name}"
-            return true
-          rescue CouchRest::NotFound
-            return false
-          end
-        end
-
-        protected
-
-        def call_database_method(*args)
-          name = nil
-          method = self.method(database_method)
-          if method.arity == 0
-            name = method.call
-          else
-            name = method.call(*args)
-          end
-          db_name_with_prefix(name)
-        end
-
-      end
-    end
-  end
-end
diff --git a/vendor/gems/couchrest_session_store/lib/couchrest/model/rotation.rb b/vendor/gems/couchrest_session_store/lib/couchrest/model/rotation.rb
deleted file mode 100644
index 9e1a5c3..0000000
--- a/vendor/gems/couchrest_session_store/lib/couchrest/model/rotation.rb
+++ /dev/null
@@ -1,263 +0,0 @@
-module CouchRest
-  module Model
-    module Rotation
-      extend ActiveSupport::Concern
-      include CouchRest::Model::DatabaseMethod
-
-      included do
-        use_database_method :rotated_database_name
-      end
-
-      def create(*args)
-        super(*args)
-      rescue CouchRest::NotFound => exc
-        raise storage_missing(exc)
-      end
-
-      def update(*args)
-        super(*args)
-      rescue CouchRest::NotFound => exc
-        raise storage_missing(exc)
-      end
-
-      def destroy(*args)
-        super(*args)
-      rescue CouchRest::NotFound => exc
-        raise storage_missing(exc)
-      end
-
-      private
-
-      # returns a special 'storage missing' exception when the db has
-      # not been created. very useful, since this happens a lot and a
-      # generic 404 is not that helpful.
-      def storage_missing(exc)
-        if exc.http_body =~ /no_db_file/
-          CouchRest::StorageMissing.new(exc.response, database)
-        else
-          exc
-        end
-      end
-
-      public
-
-      module ClassMethods
-        #
-        # Set up database rotation.
-        #
-        # base_name -- the name of the db before the rotation number is
-        # appended.
-        #
-        # options -- one of:
-        #
-        # * :every -- frequency of rotation
-        # * :expiration_field - what field to use to determine if a
-        #                       document is expired.
-        # * :timestamp_field - alternately, what field to use for the
-        #                      document timestamp.
-        # * :timeout -- used to expire documents with only a timestamp
-        #               field (in minutes)
-        #
-        def rotate_database(base_name, options={})
-          @rotation_base_name = base_name
-          @rotation_every = (options.delete(:every) || 30.days).to_i
-          @expiration_field = options.delete(:expiration_field)
-          @timestamp_field = options.delete(:timestamp_field)
-          @timeout = options.delete(:timeout)
-          if options.any?
-            raise ArgumentError.new('Could not understand options %s' % options.keys)
-          end
-        end
-
-        #
-        # Check to see if dbs should be rotated. The :window
-        # argument specifies how far in advance we should
-        # create the new database (default 1.day).
-        #
-        # This method relies on the assumption that it is called
-        # at least once within each @rotation_every period.
-        #
-        def rotate_database_now(options={})
-          window = options[:window] || 1.day
-
-          now = Time.now.utc
-          current_name = rotated_database_name(now)
-          current_count = now.to_i/@rotation_every
-
-          next_time = window.from_now.utc
-          next_name = rotated_database_name(next_time)
-          next_count = current_count+1
-
-          prev_name = current_name.sub(/(\d+)$/) {|i| i.to_i-1}
-          replication_started = false
-          old_name = prev_name.sub(/(\d+)$/) {|i| i.to_i-1} # even older than prev_name
-          trailing_edge_time = window.ago.utc
-
-          if !database_exists?(current_name)
-            # we should have created the current db earlier, but if somehow
-            # it is missing we must make sure it exists.
-            create_new_rotated_database(:from => prev_name, :to => current_name)
-            replication_started = true
-          end
-
-          if next_time.to_i/@rotation_every >= next_count && !database_exists?(next_name)
-            # time to create the next db in advance of actually needing it.
-            create_new_rotated_database(:from => current_name, :to => next_name)
-          end
-
-          if trailing_edge_time.to_i/@rotation_every == current_count
-            # delete old dbs, but only after window time has past since the last rotation
-            if !replication_started && database_exists?(prev_name)
-              # delete previous, but only if we didn't just start replicating from it
-              self.server.database(db_name_with_prefix(prev_name)).delete!
-            end
-            if database_exists?(old_name)
-              # there are some edge cases, when rotate_database_now is run
-              # infrequently, that an older db might be left around.
-              self.server.database(db_name_with_prefix(old_name)).delete!
-            end
-          end
-        end
-
-        def rotated_database_name(time=nil)
-          unless @rotation_base_name && @rotation_every
-            raise ArgumentError.new('missing @rotation_base_name or @rotation_every')
-          end
-          time ||= Time.now.utc
-          units = time.to_i / @rotation_every.to_i
-          "#{@rotation_base_name}_#{units}"
-        end
-
-        #
-        # create a new empty database.
-        #
-        def create_database!(name=nil)
-          db = if name
-            self.server.database!(db_name_with_prefix(name))
-          else
-            self.database!
-          end
-          create_rotation_filter(db)
-          if self.respond_to?(:design_doc)
-            design_doc.sync!(db)
-            # or maybe this?:
-            #self.design_docs.each do |design|
-            #  design.migrate(to_db)
-            #end
-          end
-          return db
-        end
-
-        protected
-
-        #
-        # Creates database named by options[:to]. Optionally, set up
-        # continuous replication from the options[:from] db, if it exists. The
-        # assumption is that the from db will be destroyed later, cleaning up
-        # the replication once it is no longer needed.
-        #
-        # This method will also copy design documents if present in the from
-        # db, in the CouchRest::Model, or in a database named after
-        # @rotation_base_name.
-        #
-        def create_new_rotated_database(options={})
-          from = options[:from]
-          to = options[:to]
-          to_db = self.create_database!(to)
-          if database_exists?(@rotation_base_name)
-            base_db = self.server.database(db_name_with_prefix(@rotation_base_name))
-            copy_design_docs(base_db, to_db)
-          end
-          if from && from != to && database_exists?(from)
-            from_db = self.server.database(db_name_with_prefix(from))
-            replicate_old_to_new(from_db, to_db)
-          end
-        end
-
-        def copy_design_docs(from, to)
-          params = {:startkey => '_design/', :endkey => '_design0', :include_docs => true}
-          from.documents(params) do |doc_hash|
-            design = doc_hash['doc']
-            begin
-              to.get(design['_id'])
-            rescue CouchRest::NotFound
-              design.delete('_rev')
-              to.save_doc(design)
-            end
-          end
-        end
-
-        def create_rotation_filter(db)
-          name = 'rotation_filter'
-          filter_string = if @expiration_field
-            NOT_EXPIRED_FILTER % {:expires => @expiration_field}
-          elsif @timestamp_field && @timeout
-            NOT_TIMED_OUT_FILTER % {:timestamp => @timestamp_field, :timeout => (60 * @timeout)}
-          else
-            NOT_DELETED_FILTER
-          end
-          filters = {"not_expired" => filter_string}
-          db.save_doc("_id" => "_design/#{name}", "filters" => filters)
-        rescue CouchRest::Conflict
-        end
-
-        #
-        # Replicates documents from_db to to_db, skipping documents that have
-        # expired or been deleted.
-        #
-        # NOTE: It would be better if we could do this:
-        #
-        #   from_db.replicate_to(to_db, true, false,
-        #     :filter => 'rotation_filter/not_expired')
-        #
-        # But replicate_to() does not support a filter argument, so we call
-        # the private method replication() directly.
-        #
-        def replicate_old_to_new(from_db, to_db)
-          create_rotation_filter(from_db)
-          from_db.send(:replicate, to_db, true, :source => from_db.name, :filter => 'rotation_filter/not_expired')
-        end
-
-        #
-        # Three different filters, depending on how the model is set up.
-        #
-        # NOT_EXPIRED_FILTER is used when there is a single field that
-        # contains an absolute time for when the document has expired. The
-        #
-        # NOT_TIMED_OUT_FILTER is used when there is a field that records the
-        # timestamp of the last time the document was used. The expiration in
-        # this case is calculated from the timestamp plus @timeout.
-        #
-        # NOT_DELETED_FILTER is used when the other two cannot be.
-        #
-        NOT_EXPIRED_FILTER = "" +
-%[function(doc, req) {
-  if (doc._deleted) {
-    return false;
-  } else if (typeof(doc.%{expires}) != "undefined") {
-    return Date.now() < (new Date(doc.%{expires})).getTime();
-  } else {
-    return true;
-  }
-}]
-
-        NOT_TIMED_OUT_FILTER = "" +
-%[function(doc, req) {
-  if (doc._deleted) {
-    return false;
-  } else if (typeof(doc.%{timestamp}) != "undefined") {
-    return Date.now() < (new Date(doc.%{timestamp})).getTime() + %{timeout};
-  } else {
-    return true;
-  }
-}]
-
-        NOT_DELETED_FILTER = "" +
-%[function(doc, req) {
-  return !doc._deleted;
-}]
-
-      end
-    end
-  end
-end
diff --git a/vendor/gems/couchrest_session_store/lib/couchrest/session.rb b/vendor/gems/couchrest_session_store/lib/couchrest/session.rb
deleted file mode 100644
index 416a88d..0000000
--- a/vendor/gems/couchrest_session_store/lib/couchrest/session.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-class CouchRest::Session
-end
-
-require 'couchrest/session/utility'
-require 'couchrest/session/document'
-
-module CouchRest
-
-  class StorageMissing < Exception
-    attr_reader :db
-    def initialize(request, db)
-      super(request)
-      @db = db.name
-      @message = "The database '#{db}' does not exist."
-    end
-  end
-
-  class Session
-    include CouchRest::Session::Utility
-
-    def self.fetch(sid)
-      self.allocate.tap do |session_doc|
-        session_doc.fetch(sid) || raise(CouchRest::NotFound)
-      end
-    end
-
-    def self.build(sid, session, options = {})
-      session_doc = CouchRest::Session::Document.new "_id" => sid
-      self.new(session_doc).
-        update session, options
-    end
-
-    def self.build_or_update(sid, session, options = {})
-      options[:marshal_data] = true if options[:marshal_data].nil?
-      self.fetch(sid).
-        update session, options
-    rescue CouchRest::NotFound
-      self.build sid, session, options
-    end
-
-    def initialize(doc)
-      @doc = doc
-    end
-
-    def fetch(sid = nil)
-      @doc = CouchRest::Session::Document.fetch(sid || doc['_id'])
-    end
-
-    def to_session
-      if doc["marshalled"]
-        session = unmarshal(doc["data"])
-      else
-        session = doc["data"]
-      end
-      return session
-    end
-
-    def delete
-      doc.destroy
-    end
-
-    def update(session, options)
-      # clean up old data but leave id and revision intact
-      doc.reject! { |k,_v| k[0] != '_' }
-      doc.merge! data_for_doc(session, options)
-      self
-    end
-
-    def save
-      doc.save
-    rescue CouchRest::Conflict
-      fetch
-      retry
-    rescue CouchRest::NotFound => exc
-      if exc.http_body =~ /no_db_file/
-        exc = CouchRest::StorageMissing.new(exc.response, doc.database)
-      end
-      raise exc
-    end
-
-    def expired?
-      expires && expires < Time.now
-    end
-
-    protected
-
-    attr_reader :doc
-
-    def data_for_doc(session, options)
-      { "data" => options[:marshal_data] ? marshal(session) : session,
-        "marshalled" => options[:marshal_data],
-        "expires" => expiry_from_options(options) }
-    end
-
-    def expiry_from_options(options)
-      expire_after = options[:expire_after]
-      expire_after && (Time.now + expire_after).utc
-    end
-
-    def expires
-      doc["expires"] && Time.iso8601(doc["expires"])
-    end
-
-  end
-end
diff --git a/vendor/gems/couchrest_session_store/lib/couchrest/session/document.rb b/vendor/gems/couchrest_session_store/lib/couchrest/session/document.rb
deleted file mode 100644
index dc938cf..0000000
--- a/vendor/gems/couchrest_session_store/lib/couchrest/session/document.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'time'
-
-class CouchRest::Session::Document < CouchRest::Document
-  include CouchRest::Model::Configuration
-  include CouchRest::Model::Connection
-  include CouchRest::Model::Rotation
-
-  rotate_database 'sessions',
-    :every => 1.month, :expiration_field => :expires
-
-  def self.fetch(id)
-    database.get(id)
-  end
-
-  def self.find_by_expires(options = {})
-    options[:reduce] ||= false
-    design = database.get '_design/Session'
-    response = design.view :by_expires, options
-    response['rows']
-  end
-
-  def self.create_database!(name=nil)
-    db = super(name)
-    begin
-      db.get('_design/Session')
-    rescue CouchRest::NotFound
-      design = File.read(File.expand_path('../../../../design/Session.json', __FILE__))
-      design = JSON.parse(design)
-      db.save_doc(design.merge({"_id" => "_design/Session"}))
-    end
-    db
-  end
-
-end
diff --git a/vendor/gems/couchrest_session_store/lib/couchrest/session/store.rb b/vendor/gems/couchrest_session_store/lib/couchrest/session/store.rb
deleted file mode 100644
index 516d5dd..0000000
--- a/vendor/gems/couchrest_session_store/lib/couchrest/session/store.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-class CouchRest::Session::Store < ActionDispatch::Session::AbstractStore
-
-  # delegate configure to document
-  def self.configure(*args, &block)
-    CouchRest::Session::Document.configure *args, &block
-  end
-
-  def self.set_options(options)
-    @options = options
-    if @options[:database]
-      CouchRest::Session::Document.use_database @options[:database]
-    end
-  end
-
-  def initialize(app, options = {})
-    super
-    self.class.set_options(options)
-  end
-
-  def cleanup(rows)
-    rows.each do |row|
-      doc = CouchRest::Session::Document.fetch(row['id'])
-      doc.delete
-    end
-  end
-
-  def expired
-    CouchRest::Session::Document.find_by_expires startkey: 1,
-      endkey: Time.now.utc.iso8601
-  end
-
-  def never_expiring
-    CouchRest::Session::Document.find_by_expires endkey: 1
-  end
-
-  private
-
-  def get_session(env, sid)
-    if session = fetch_session(sid)
-      [sid, session]
-    else
-      [generate_sid, {}]
-    end
-  rescue CouchRest::NotFound
-    # session data does not exist anymore
-    return [sid, {}]
-  rescue CouchRest::Unauthorized,
-    Errno::EHOSTUNREACH,
-    Errno::ECONNREFUSED => e
-    # can't connect to couch. We add some status to the session
-    # so the app can react. (Display error for example)
-    return [sid, {"_status" => {"couch" => "unreachable"}}]
-  end
-
-  def set_session(env, sid, session, options)
-    raise CouchRest::NotFound if /^_design\/(.*)/ =~ sid
-    couchrest_session = build_or_update_doc(sid, session, options)
-    couchrest_session.save
-    return sid
-  # if we can't store the session we just return false.
-  rescue CouchRest::Unauthorized,
-    Errno::EHOSTUNREACH,
-    Errno::ECONNREFUSED => e
-    return false
-  end
-
-  def destroy_session(env, sid, options)
-    doc = secure_get(sid)
-    doc.delete
-    generate_sid unless options[:drop]
-  rescue CouchRest::NotFound
-    # already destroyed - we're done.
-    generate_sid unless options[:drop]
-  end
-
-  def fetch_session(sid)
-    return nil unless sid
-    couchrest_session = secure_get(sid)
-    couchrest_session.to_session unless couchrest_session.expired?
-  end
-
-  def build_or_update_doc(sid, session, options)
-    CouchRest::Session.build_or_update(sid, session, options)
-  end
-
-  # prevent access to design docs
-  # this should be prevented on a couch permission level as well.
-  # but better be save than sorry.
-  def secure_get(sid)
-    raise CouchRest::NotFound if /^_design\/(.*)/ =~ sid
-    CouchRest::Session.fetch(sid)
-  end
-
-end
diff --git a/vendor/gems/couchrest_session_store/lib/couchrest/session/utility.rb b/vendor/gems/couchrest_session_store/lib/couchrest/session/utility.rb
deleted file mode 100644
index 3982c28..0000000
--- a/vendor/gems/couchrest_session_store/lib/couchrest/session/utility.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module CouchRest::Session::Utility
-  module_function
-
-  def marshal(data)
-    ::Base64.encode64(Marshal.dump(data)) if data
-  end
-
-  def unmarshal(data)
-    Marshal.load(::Base64.decode64(data)) if data
-  end
-
-end
diff --git a/vendor/gems/couchrest_session_store/lib/couchrest_session_store.rb b/vendor/gems/couchrest_session_store/lib/couchrest_session_store.rb
deleted file mode 100644
index 78c6a25..0000000
--- a/vendor/gems/couchrest_session_store/lib/couchrest_session_store.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require 'couchrest'
-require 'couchrest_model'
-# ensure compatibility with couchrest_model
-gem 'actionpack', '~> 4.0'
-require 'action_dispatch'
-
-require 'couchrest/model/database_method'
-require 'couchrest/model/rotation'
-require 'couchrest/session'
-require 'couchrest/session/store'
-require 'couchrest/session/document'
diff --git a/vendor/gems/couchrest_session_store/test/couch_tester.rb b/vendor/gems/couchrest_session_store/test/couch_tester.rb
deleted file mode 100644
index b623044..0000000
--- a/vendor/gems/couchrest_session_store/test/couch_tester.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Access the couch directly so we can test its state without relying
-# on the SessionStore
-#
-
-class CouchTester < CouchRest::Document
-  include CouchRest::Model::Configuration
-  include CouchRest::Model::Connection
-  include CouchRest::Model::Rotation
-
-  rotate_database 'sessions',
-    :every => 1.month, :expiration_field => :expires
-
-  def initialize(options = {})
-  end
-
-  def get(sid)
-    database.get(sid)
-  end
-
-  def update(sid, diff)
-    doc = database.get(sid)
-    doc.merge! diff
-    database.save_doc(doc)
-  end
-
-end
diff --git a/vendor/gems/couchrest_session_store/test/database_method_test.rb b/vendor/gems/couchrest_session_store/test/database_method_test.rb
deleted file mode 100644
index 18985c3..0000000
--- a/vendor/gems/couchrest_session_store/test/database_method_test.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-require_relative 'test_helper'
-
-class DatabaseMethodTest < MiniTest::Test
-
-  class TestModel < CouchRest::Model::Base
-    include CouchRest::Model::DatabaseMethod
-
-    use_database_method :db_name
-    property :dbname, String
-    property :confirm, String
-
-    def db_name
-      "test_db_#{self[:dbname]}"
-    end
-  end
-
-  def test_instance_method
-    doc1 = TestModel.new({:dbname => 'one'})
-    doc1.database.create!
-    assert doc1.database.root.ends_with?('test_db_one')
-    assert doc1.save
-    doc1.update_attributes(:confirm => 'yep')
-
-    doc2 = TestModel.new({:dbname => 'two'})
-    doc2.database.create!
-    assert doc2.database.root.ends_with?('test_db_two')
-    assert doc2.save
-    doc2.confirm = 'sure'
-    doc2.save!
-
-    doc1_copy = CouchRest.get([doc1.database.root, doc1.id].join('/'))
-    assert_equal "yep", doc1_copy["confirm"]
-
-    doc2_copy = CouchRest.get([doc2.database.root, doc2.id].join('/'))
-    assert_equal "sure", doc2_copy["confirm"]
-
-    doc1.database.delete!
-    doc2.database.delete!
-  end
-
-  def test_switch_db
-    doc_red = TestModel.new({:dbname => 'red', :confirm => 'rose'})
-    doc_red.database.create!
-    root = doc_red.database.root
-
-    doc_blue = doc_red.clone
-    doc_blue.dbname = 'blue'
-    doc_blue.database!
-    doc_blue.save!
-
-    doc_blue_copy = CouchRest.get([root.sub('red','blue'), doc_blue.id].join('/'))
-    assert_equal "rose", doc_blue_copy["confirm"]
-
-    doc_red.database.delete!
-    doc_blue.database.delete!
-  end
-
-  #
-  # A test scenario for database_method in which some user accounts
-  # are stored in a seperate temporary database (so that the test
-  # accounts don't bloat the normal database).
-  #
-
-  class User < CouchRest::Model::Base
-    include CouchRest::Model::DatabaseMethod
-
-    use_database_method :db_name
-    property :login, String
-    before_save :create_db
-
-    class << self
-      def get(id, db = database)
-        result = super(id, db)
-        if result.nil?
-          return super(id, choose_database('test-user'))
-        else
-          return result
-        end
-      end
-      alias :find :get
-    end
-
-    protected
-
-    def self.db_name(login = nil)
-      if !login.nil? && login =~ /test-user/
-        'tmp_users'
-      else
-        'users'
-      end
-    end
-
-    def db_name
-      self.class.db_name(self.login)
-    end
-
-    def create_db
-      unless database_exists?(db_name)
-        self.database!
-      end
-    end
-
-  end
-
-  def test_tmp_user_db
-    user1 = User.new({:login => 'test-user-1'})
-    assert user1.save
-    assert User.find(user1.id), 'should find user in tmp_users'
-    assert_equal user1.login, User.find(user1.id).login
-    assert_equal 'test-user-1', User.server.database('couchrest_tmp_users').get(user1.id)['login']
-    assert_raises CouchRest::NotFound do
-      User.server.database('couchrest_users').get(user1.id)
-    end
-  end
-
-end
diff --git a/vendor/gems/couchrest_session_store/test/database_rotation_test.rb b/vendor/gems/couchrest_session_store/test/database_rotation_test.rb
deleted file mode 100644
index 856db11..0000000
--- a/vendor/gems/couchrest_session_store/test/database_rotation_test.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-require_relative 'test_helper'
-
-class RotationTest < MiniTest::Test
-
-  class Token < CouchRest::Model::Base
-    include CouchRest::Model::Rotation
-    property :token, String
-    rotate_database 'test_rotate', :every => 1.day
-  end
-
-  TEST_DB_RE = /test_rotate_\d+/
-
-  def test_rotate
-    delete_all_dbs
-    doc = nil
-    original_name = nil
-    next_db_name = nil
-
-    Time.stub :now, Time.gm(2015,3,7,0) do
-      Token.create_database!
-      doc = Token.create!(:token => 'aaaa')
-      original_name = Token.rotated_database_name
-      assert database_exists?(original_name)
-      assert_equal 1, count_dbs
-    end
-
-    # do nothing yet
-    Time.stub :now, Time.gm(2015,3,7,22) do
-      Token.rotate_database_now(:window => 1.hour)
-      assert_equal original_name, Token.rotated_database_name
-      assert_equal 1, count_dbs
-    end
-
-    # create next db, but don't switch yet.
-    Time.stub :now, Time.gm(2015,3,7,23) do
-      Token.rotate_database_now(:window => 1.hour)
-      assert_equal 2, count_dbs
-      next_db_name = Token.rotated_database_name(Time.gm(2015,3,8))
-      assert original_name != next_db_name
-      assert database_exists?(next_db_name)
-      sleep 0.2 # allow time for documents to replicate
-      assert_equal(
-        Token.get(doc.id).token,
-        Token.get(doc.id, database(next_db_name)).token
-      )
-    end
-
-    # use next db
-    Time.stub :now, Time.gm(2015,3,8) do
-      Token.rotate_database_now(:window => 1.hour)
-      assert_equal 2, count_dbs
-      assert_equal next_db_name, Token.rotated_database_name
-      token = Token.get(doc.id)
-      token.update_attributes(:token => 'bbbb')
-      assert_equal 'bbbb', Token.get(doc.id).token
-      assert_equal 'aaaa', Token.get(doc.id, database(original_name)).token
-    end
-
-    # delete prior db
-    Time.stub :now, Time.gm(2015,3,8,1) do
-      Token.rotate_database_now(:window => 1.hour)
-      assert_equal 1, count_dbs
-    end
-  end
-
-  private
-
-  def database(db_name)
-    Token.server.database(Token.db_name_with_prefix(db_name))
-  end
-
-  def database_exists?(dbname)
-    Token.database_exists?(dbname)
-  end
-
-  def delete_all_dbs(regexp=TEST_DB_RE)
-    Token.server.databases.each do |db|
-      if regexp.match(db)
-        Token.server.database(db).delete!
-      end
-    end
-  end
-
-  def count_dbs(regexp=TEST_DB_RE)
-    Token.server.databases.grep(regexp).count
-  end
-
-end
diff --git a/vendor/gems/couchrest_session_store/test/session_document_test.rb b/vendor/gems/couchrest_session_store/test/session_document_test.rb
deleted file mode 100644
index 43fbbca..0000000
--- a/vendor/gems/couchrest_session_store/test/session_document_test.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require_relative 'test_helper'
-
-class SessionDocumentTest < MiniTest::Test
-
-  def test_storing_session
-    sid = '1234'
-    session = {'a' => 'b'}
-    options = {}
-    couchrest_session = CouchRest::Session.build_or_update(sid, session, options)
-    couchrest_session.save
-    couchrest_session.fetch(sid)
-    assert_equal session, couchrest_session.to_session
-  end
-
-  def test_storing_session_with_conflict
-    sid = '1234'
-    session = {'a' => 'b'}
-    options = {}
-    cr_session = CouchRest::Session.build_or_update(sid, session, options)
-    cr_session2 = CouchRest::Session.build_or_update(sid, session, options)
-    cr_session.save
-    cr_session2.save
-    cr_session2.fetch(sid)
-    assert_equal session, cr_session2.to_session
-  end
-
-end
diff --git a/vendor/gems/couchrest_session_store/test/session_store_test.rb b/vendor/gems/couchrest_session_store/test/session_store_test.rb
deleted file mode 100644
index 5949ae6..0000000
--- a/vendor/gems/couchrest_session_store/test/session_store_test.rb
+++ /dev/null
@@ -1,168 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
-
-class SessionStoreTest < MiniTest::Test
-
-  def test_session_initialization
-    sid, session = store.send :get_session, env, nil
-    assert sid
-    assert_equal Hash.new, session
-  end
-
-  def test_normal_session_flow
-    sid, session = never_expiring_session
-    assert_equal [sid, session], store.send(:get_session, env, sid)
-    store.send :destroy_session, env, sid, {}
-  end
-
-  def test_updating_session
-    sid, session = never_expiring_session
-    session[:bla] = "blub"
-    store.send :set_session, env, sid, session, {}
-    assert_equal [sid, session], store.send(:get_session, env, sid)
-    store.send :destroy_session, env, sid, {}
-  end
-
-  def test_prevent_access_to_design_docs
-    sid = '_design/bla'
-    session = {views: 'my hacked view'}
-    assert_raises CouchRest::NotFound do
-      store_session(sid, session)
-    end
-  end
-
-  def test_unmarshalled_session_flow
-    sid, session = init_session
-    store_session sid, session, :marshal_data => false
-    new_sid, new_session = store.send(:get_session, env, sid)
-    assert_equal sid, new_sid
-    assert_equal session[:key], new_session["key"]
-    store.send :destroy_session, env, sid, {}
-  end
-
-  def test_unmarshalled_data
-    sid, session = init_session
-    store_session sid, session, :marshal_data => false
-    couch = CouchTester.new
-    data = couch.get(sid)["data"]
-    assert_equal session[:key], data["key"]
-  end
-
-  def test_logout_in_between
-    sid, session = never_expiring_session
-    store.send :destroy_session, env, sid, {}
-    other_sid, other_session = store.send(:get_session, env, sid)
-    assert_equal Hash.new, other_session
-  end
-
-  def test_can_logout_twice
-    sid, session = never_expiring_session
-    store.send :destroy_session, env, sid, {}
-    store.send :destroy_session, env, sid, {}
-    other_sid, other_session = store.send(:get_session, env, sid)
-    assert_equal Hash.new, other_session
-  end
-
-  def test_stored_and_not_expired_yet
-    sid, session = expiring_session
-    couchrest_session = CouchRest::Session.fetch(sid)
-    expires = couchrest_session.send :expires
-    assert expires
-    assert !couchrest_session.expired?
-    assert (expires - Time.now) > 0, "Exiry should be in the future"
-    assert (expires - Time.now) <= 300, "Should expire after 300 seconds - not more"
-    assert_equal [sid, session], store.send(:get_session, env, sid)
-  end
-
-  def test_stored_but_expired
-    sid, session = expired_session
-    other_sid, other_session = store.send(:get_session, env, sid)
-    assert_equal Hash.new, other_session, "session should have expired"
-    assert other_sid != sid
-  end
-
-  def test_find_expired_sessions
-    expired, expiring, never_expiring = seed_sessions
-    expired_session_ids = store.expired.map {|row| row['id']}
-    assert expired_session_ids.include?(expired)
-    assert !expired_session_ids.include?(expiring)
-    assert !expired_session_ids.include?(never_expiring)
-  end
-
-  def test_find_never_expiring_sessions
-    expired, expiring, never_expiring = seed_sessions
-    never_expiring_session_ids = store.never_expiring.map {|row| row['id']}
-    assert never_expiring_session_ids.include?(never_expiring)
-    assert !never_expiring_session_ids.include?(expiring)
-    assert !never_expiring_session_ids.include?(expired)
-  end
-
-  def test_cleanup_expired_sessions
-    sid, session = expired_session
-    store.cleanup(store.expired)
-    assert_raises CouchRest::NotFound do
-      CouchTester.new.get(sid)
-    end
-  end
-
-  def test_keep_fresh_during_cleanup
-    sid, session = expiring_session
-    store.cleanup(store.expired)
-    assert_equal [sid, session], store.send(:get_session, env, sid)
-  end
-
-  def test_store_without_expiry
-    sid, session = never_expiring_session
-    couch = CouchTester.new
-    assert_nil couch.get(sid)["expires"]
-    assert_equal [sid, session], store.send(:get_session, env, sid)
-  end
-
-  def app
-    nil
-  end
-
-  def store(options = {})
-    @store ||= CouchRest::Session::Store.new(app, options)
-  end
-
-  def env(settings = {})
-    env ||= settings
-  end
-
-  # returns the session ids of an expired, and expiring and a never
-  # expiring session
-  def seed_sessions
-    [expired_session, expiring_session, never_expiring_session].map(&:first)
-  end
-
-  def never_expiring_session
-    store_session *init_session
-  end
-
-  def expiring_session
-    sid, session = init_session
-    store_session(sid, session, expire_after: 300)
-  end
-
-  def expired_session
-    expire_session *expiring_session
-  end
-
-  def init_session
-    sid, session = store.send :get_session, env, nil
-    session[:key] = "stub"
-    return sid, session
-  end
-
-  def store_session(sid, session, options = {})
-    store.send :set_session, env, sid, session, options
-    return sid, session
-  end
-
-  def expire_session(sid, session)
-    CouchTester.new.update sid,
-      "expires" => (Time.now - 10.minutes).utc.iso8601
-    return sid, session
-  end
-
-end
diff --git a/vendor/gems/couchrest_session_store/test/setup_couch.sh b/vendor/gems/couchrest_session_store/test/setup_couch.sh
deleted file mode 100755
index 731534b..0000000
--- a/vendor/gems/couchrest_session_store/test/setup_couch.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-HOST="http://localhost:5984"
-echo "couch version :"
-curl -X GET $HOST
-
-curl -X PUT $HOST/couchrest_sessions
-curl -X PUT $HOST/couchrest_sessions/_design/Session --data @design/Session.json
-
diff --git a/vendor/gems/couchrest_session_store/test/stress_test.rb b/vendor/gems/couchrest_session_store/test/stress_test.rb
deleted file mode 100644
index b74b132..0000000
--- a/vendor/gems/couchrest_session_store/test/stress_test.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-require_relative 'test_helper'
-
-#
-# This doesn't really test much, but is useful if you want to see what happens
-# when you have a lot of documents.
-#
-
-class StressTest < MiniTest::Test
-
-  COUNT = 200 # change to 200,000 if you dare
-
-  class Stress < CouchRest::Model::Base
-    include CouchRest::Model::Rotation
-    property :token, String
-    property :expires_at, Time
-    rotate_database 'stress_test', :every => 1.day, :expiration_field => :expires_at
-  end
-
-  def test_stress
-    delete_all_dbs /^couchrest_stress_test_\d+$/
-
-    Stress.database!
-    COUNT.times do |i|
-      doc = Stress.create!(:token => SecureRandom.hex(32), :expires_at => expires(i))
-    end
-
-    Time.stub :now, 1.day.from_now do
-      Stress.rotate_database_now(:window => 1.hour)
-      sleep 0.5
-      assert_equal (COUNT/100)+1, Stress.database.info["doc_count"]
-    end
-  end
-
-  private
-
-  def delete_all_dbs(regexp=TEST_DB_RE)
-    Stress.server.databases.each do |db|
-      if regexp.match(db)
-        Stress.server.database(db).delete!
-      end
-    end
-  end
-
-  def expires(i)
-    if i % 100 == 0
-      1.hour.from_now.utc
-    else
-      1.hour.ago.utc
-    end
-  end
-end
diff --git a/vendor/gems/couchrest_session_store/test/test_clock.rb b/vendor/gems/couchrest_session_store/test/test_clock.rb
deleted file mode 100644
index 4170763..0000000
--- a/vendor/gems/couchrest_session_store/test/test_clock.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class TestClock
-  attr_accessor :now
-
-  def initialize(tick = 60)
-    @tick = tick
-    @now = Time.now
-  end
-
-  def tick(seconds = nil)
-    @now += seconds || @tick
-  end
-end
diff --git a/vendor/gems/couchrest_session_store/test/test_helper.rb b/vendor/gems/couchrest_session_store/test/test_helper.rb
deleted file mode 100644
index 32f147d..0000000
--- a/vendor/gems/couchrest_session_store/test/test_helper.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require "rubygems"
-gem 'minitest'
-require 'minitest/autorun'
-require File.expand_path(File.dirname(__FILE__) + '/../lib/couchrest_session_store.rb')
-require File.expand_path(File.dirname(__FILE__) + '/couch_tester.rb')
-require File.expand_path(File.dirname(__FILE__) + '/test_clock.rb')
-
-# Create the session db if it does not already exist.
-CouchRest::Session::Document.create_database!
-- 
cgit v1.2.3


From a1b494e334406660a1f49fb7de9b043493809640 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 13 May 2016 16:23:10 +0200
Subject: ensure invalid user ids still render the ticket form

We still have strange urls requested like
 /pt/users/AnonymousUser.../tickets/new

Not sure where they are coming from - but this should make sure we
respond with sth. meaningful instead of erroring out.

Conflicts:
	app/views/layouts/_content.html.haml
---
 app/views/layouts/_content.html.haml                       | 2 +-
 engines/support/app/views/tickets/edit.html.haml           | 1 -
 engines/support/app/views/tickets/index.html.haml          | 2 --
 engines/support/app/views/tickets/new.html.haml            | 5 -----
 engines/support/app/views/tickets/show.html.haml           | 2 --
 engines/support/test/functional/tickets_controller_test.rb | 6 ++++++
 6 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/views/layouts/_content.html.haml b/app/views/layouts/_content.html.haml
index 21d2e12..8e0bfbc 100644
--- a/app/views/layouts/_content.html.haml
+++ b/app/views/layouts/_content.html.haml
@@ -7,7 +7,7 @@
 - else
   - content = yield
 
-- if @show_navigation
+- if @show_navigation && @user
   .col-md-2
     = render 'layouts/navigation'
   .col-md-10
diff --git a/engines/support/app/views/tickets/edit.html.haml b/engines/support/app/views/tickets/edit.html.haml
index 03bda7d..cdc5e16 100644
--- a/engines/support/app/views/tickets/edit.html.haml
+++ b/engines/support/app/views/tickets/edit.html.haml
@@ -1,4 +1,3 @@
-- @show_navigation = params[:user_id].present?
 - @comment = TicketComment.new
 
 .ticket
diff --git a/engines/support/app/views/tickets/index.html.haml b/engines/support/app/views/tickets/index.html.haml
index d107ce2..56c7012 100644
--- a/engines/support/app/views/tickets/index.html.haml
+++ b/engines/support/app/views/tickets/index.html.haml
@@ -1,5 +1,3 @@
-- @show_navigation = params[:user_id].present?
-
 = render 'tickets/tabs'
 = table @tickets, %w(subject created updated voices)
 = paginate @tickets
diff --git a/engines/support/app/views/tickets/new.html.haml b/engines/support/app/views/tickets/new.html.haml
index d3580f9..d0b0f89 100644
--- a/engines/support/app/views/tickets/new.html.haml
+++ b/engines/support/app/views/tickets/new.html.haml
@@ -1,10 +1,5 @@
-- @show_navigation = params[:user_id].present?
-
 = render 'tickets/tabs'
 
-- user = @user if admin?
-- user ||= current_user
-
 = simple_form_for @ticket, :validate => true, :html => {:class => 'form-horizontal'} do |f|
   = hidden_ticket_fields
   = f.input :subject
diff --git a/engines/support/app/views/tickets/show.html.haml b/engines/support/app/views/tickets/show.html.haml
index 99afa2a..a625870 100644
--- a/engines/support/app/views/tickets/show.html.haml
+++ b/engines/support/app/views/tickets/show.html.haml
@@ -1,5 +1,3 @@
-- @show_navigation = params[:user_id].present?
-
 .ticket
   = render 'tickets/edit_form'
   = render 'tickets/comments'
diff --git a/engines/support/test/functional/tickets_controller_test.rb b/engines/support/test/functional/tickets_controller_test.rb
index a7a2011..5c2b346 100644
--- a/engines/support/test/functional/tickets_controller_test.rb
+++ b/engines/support/test/functional/tickets_controller_test.rb
@@ -35,6 +35,12 @@ class TicketsControllerTest < ActionController::TestCase
     assert_response :success
   end
 
+  test "should get new despite invalid user_id" do
+    get :new, user_id: :bla
+    assert_equal Ticket, assigns(:ticket).class
+    assert_response :success
+  end
+
   test "unauthenticated tickets are visible" do
     ticket = find_record :ticket, :created_by => nil
     get :show, :id => ticket.id
-- 
cgit v1.2.3


From e05a1b0f5ae40a2aa17976b3009cd563b8e4660a Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sun, 1 May 2016 10:55:33 -0300
Subject: api: allow version bumping - bump to 2

---
 app/controllers/api/certs_controller.rb            |  31 +++++
 app/controllers/api/configs_controller.rb          |  37 +++++
 app/controllers/api/identities_controller.rb       |  16 +++
 app/controllers/api/messages_controller.rb         | 119 ++++++++++++++++
 app/controllers/api/services_controller.rb         |   8 ++
 app/controllers/api/sessions_controller.rb         |  44 ++++++
 app/controllers/api/smtp_certs_controller.rb       |  42 ++++++
 app/controllers/api/users_controller.rb            |  83 +++++++++++
 app/controllers/v1/certs_controller.rb             |  31 -----
 app/controllers/v1/configs_controller.rb           |  37 -----
 app/controllers/v1/identities_controller.rb        |  16 ---
 app/controllers/v1/messages_controller.rb          | 119 ----------------
 app/controllers/v1/services_controller.rb          |   8 --
 app/controllers/v1/sessions_controller.rb          |  44 ------
 app/controllers/v1/smtp_certs_controller.rb        |  42 ------
 app/controllers/v1/users_controller.rb             |  83 -----------
 app/views/api/sessions/new.json.erb                |   3 +
 app/views/v1/sessions/new.json.erb                 |   3 -
 config/routes.rb                                   |   6 +-
 test/functional/api/certs_controller_test.rb       |  60 ++++++++
 test/functional/api/identities_controller_test.rb  |  24 ++++
 test/functional/api/messages_controller_test.rb    |  99 +++++++++++++
 test/functional/api/services_controller_test.rb    |  28 ++++
 test/functional/api/sessions_controller_test.rb    |  62 +++++++++
 test/functional/api/smtp_certs_controller_test.rb  |  43 ++++++
 test/functional/api/token_auth_test.rb             |  40 ++++++
 test/functional/api/users_controller_test.rb       | 135 ++++++++++++++++++
 .../configs_controller_with_static_tokens_test.rb  |  40 ------
 test/functional/v1/certs_controller_test.rb        |  60 --------
 test/functional/v1/identities_controller_test.rb   |  24 ----
 test/functional/v1/messages_controller_test.rb     |  99 -------------
 test/functional/v1/services_controller_test.rb     |  28 ----
 test/functional/v1/sessions_controller_test.rb     |  62 ---------
 test/functional/v1/smtp_certs_controller_test.rb   |  43 ------
 test/functional/v1/users_controller_test.rb        | 135 ------------------
 test/integration/api/cert_test.rb                  |  11 +-
 test/integration/api/signup_test.rb                |   2 +-
 test/integration/api/smtp_cert_test.rb             |  14 +-
 test/integration/api/srp_test.rb                   |  18 ++-
 test/integration/api/token_auth_test.rb            |   2 +-
 test/integration/api/update_account_test.rb        |   2 +-
 .../browser/account_livecycle_test.rb.orig         | 153 +++++++++++++++++++++
 test/integration/browser/security_test.rb          |   2 +-
 test/support/api_integration_test.rb               |   4 +
 44 files changed, 1068 insertions(+), 894 deletions(-)
 create mode 100644 app/controllers/api/certs_controller.rb
 create mode 100644 app/controllers/api/configs_controller.rb
 create mode 100644 app/controllers/api/identities_controller.rb
 create mode 100644 app/controllers/api/messages_controller.rb
 create mode 100644 app/controllers/api/services_controller.rb
 create mode 100644 app/controllers/api/sessions_controller.rb
 create mode 100644 app/controllers/api/smtp_certs_controller.rb
 create mode 100644 app/controllers/api/users_controller.rb
 delete mode 100644 app/controllers/v1/certs_controller.rb
 delete mode 100644 app/controllers/v1/configs_controller.rb
 delete mode 100644 app/controllers/v1/identities_controller.rb
 delete mode 100644 app/controllers/v1/messages_controller.rb
 delete mode 100644 app/controllers/v1/services_controller.rb
 delete mode 100644 app/controllers/v1/sessions_controller.rb
 delete mode 100644 app/controllers/v1/smtp_certs_controller.rb
 delete mode 100644 app/controllers/v1/users_controller.rb
 create mode 100644 app/views/api/sessions/new.json.erb
 delete mode 100644 app/views/v1/sessions/new.json.erb
 create mode 100644 test/functional/api/certs_controller_test.rb
 create mode 100644 test/functional/api/identities_controller_test.rb
 create mode 100644 test/functional/api/messages_controller_test.rb
 create mode 100644 test/functional/api/services_controller_test.rb
 create mode 100644 test/functional/api/sessions_controller_test.rb
 create mode 100644 test/functional/api/smtp_certs_controller_test.rb
 create mode 100644 test/functional/api/token_auth_test.rb
 create mode 100644 test/functional/api/users_controller_test.rb
 delete mode 100644 test/functional/configs_controller_with_static_tokens_test.rb
 delete mode 100644 test/functional/v1/certs_controller_test.rb
 delete mode 100644 test/functional/v1/identities_controller_test.rb
 delete mode 100644 test/functional/v1/messages_controller_test.rb
 delete mode 100644 test/functional/v1/services_controller_test.rb
 delete mode 100644 test/functional/v1/sessions_controller_test.rb
 delete mode 100644 test/functional/v1/smtp_certs_controller_test.rb
 delete mode 100644 test/functional/v1/users_controller_test.rb
 create mode 100644 test/integration/browser/account_livecycle_test.rb.orig

diff --git a/app/controllers/api/certs_controller.rb b/app/controllers/api/certs_controller.rb
new file mode 100644
index 0000000..46a84d3
--- /dev/null
+++ b/app/controllers/api/certs_controller.rb
@@ -0,0 +1,31 @@
+class Api::CertsController < ApiController
+
+  before_filter :require_login, :unless => :anonymous_access_allowed?
+  before_filter :require_enabled
+
+  # GET /cert
+  # deprecated - we actually create a new cert and that can
+  # be reflected in the action. GET /cert will eventually go
+  # away and be replaced by POST /cert
+  def show
+    create
+  end
+
+  # POST /cert
+  def create
+    @cert = ClientCertificate.new(:prefix => service_level.cert_prefix)
+    render text: @cert.to_s, content_type: 'text/plain'
+  end
+
+  protected
+
+  def require_enabled
+    if !current_user.is_anonymous? && !current_user.enabled?
+      access_denied
+    end
+  end
+
+  def service_level
+    current_user.effective_service_level
+  end
+end
diff --git a/app/controllers/api/configs_controller.rb b/app/controllers/api/configs_controller.rb
new file mode 100644
index 0000000..55ceb4f
--- /dev/null
+++ b/app/controllers/api/configs_controller.rb
@@ -0,0 +1,37 @@
+class Api::ConfigsController < ApiController
+  include ControllerExtension::JsonFile
+
+  before_filter :require_login, :unless => :anonymous_access_allowed?
+  before_filter :sanitize_id, only: :show
+
+  def index
+    render json: {services: service_paths}
+  end
+
+  def show
+    send_file lookup_file
+  end
+
+  protected
+
+  SERVICE_IDS = {
+    soledad: "soledad-service",
+    eip: "eip-service",
+    smtp: "smtp-service"
+  }
+
+  def service_paths
+    Hash[SERVICE_IDS.map{|k,v| [k,"/1/configs/#{v}.json"] } ]
+  end
+
+  def sanitize_id
+    @id = params[:id].downcase
+    access_denied unless SERVICE_IDS.values.include? @id
+  end
+
+  def lookup_file
+    path = APP_CONFIG[:config_file_paths][@id]
+    not_found if path.blank?
+    Rails.root.join path
+  end
+end
diff --git a/app/controllers/api/identities_controller.rb b/app/controllers/api/identities_controller.rb
new file mode 100644
index 0000000..ab2ac00
--- /dev/null
+++ b/app/controllers/api/identities_controller.rb
@@ -0,0 +1,16 @@
+module Api
+  class IdentitiesController < ApiController
+    before_filter :token_authenticate
+    before_filter :require_monitor
+
+    def show
+      @identity = Identity.find_by_address(params[:id])
+      if @identity
+        respond_with @identity
+      else
+        render_not_found
+      end
+    end
+
+  end
+end
diff --git a/app/controllers/api/messages_controller.rb b/app/controllers/api/messages_controller.rb
new file mode 100644
index 0000000..a69a40a
--- /dev/null
+++ b/app/controllers/api/messages_controller.rb
@@ -0,0 +1,119 @@
+module Api
+  class MessagesController < ApiController
+
+    before_filter :require_login
+
+    def index
+      if Dir.exist?(motd_dir)
+        if !CommonLanguages::available_code?(params[:locale])
+          locale = 'en'
+        else
+          locale = params[:locale]
+        end
+        render json: motd_files_for_locale(locale)
+      else
+        render json: []
+      end
+    end
+
+    # disable per-user messages for now, not supported in the client
+    #def update
+    #  if message = Message.find(params[:id])
+    #    message.mark_as_read_by(current_user)
+    #    message.save
+    #    render json: success(:marked_as_read)
+    #  else
+    #    render json: error(:not_found), status: :not_found
+    #  end
+    #end
+
+    private
+
+    #
+    # returns list of messages, for example:
+    #
+    # [
+    #   {"id": 1, "locale": "en", "text": "<message text>"},
+    #   {"id": 2, "locale": "en", "text": "<message text>"}
+    # ]
+    #
+    # Each message is present only once, using the best choice
+    # for the locale. The order is determined by the id.
+    #
+    def motd_files_for_locale(locale)
+      files = []
+      motd_files.keys.each do |id|
+        if motd_files[id].key?(locale)
+          msg_locale = locale
+        elsif motd_files[id].key?('en')
+          msg_locale = 'en'
+        else
+          msg_locale = motd_files[id].keys.first
+        end
+        files << {
+          "id" => id,
+          "locale" => msg_locale,
+          "text" => motd_files[id][msg_locale]
+        }
+      end
+      files.sort! {|a,b| a["id"].to_i <=> b["id"].to_i }
+      return files
+    end
+
+    #
+    # returns messages of the day as a hash:
+    # { "1": {"en": "message"}, "2": {"en": "message"} }
+    #
+    def motd_files
+      if motd_changed? || @motd_files.nil?
+        @motd_files = load_motd_files
+      else
+        @motd_files
+      end
+    end
+
+    def motd_changed?
+      newest = Dir.glob(File.join(motd_dir, '*.{html,md}')).collect{|file| File.mtime(file)}.max
+      if @timestamp.nil?
+        @timestamp = newest
+        return true
+      elsif @timestamp < newest
+        @timestamp = newest
+        return true
+      else
+        return false
+      end
+    end
+
+    def load_motd_files
+      files = {}
+      Dir.glob(File.join(motd_dir, '*.{html,md}')).each do |file|
+        id, locale, msg = parse_motd_file(file)
+        next unless id
+        files[id] ||= {}
+        files[id][locale] = msg
+      end
+      files
+    end
+
+    def parse_motd_file(file)
+      id, locale, ext = File.basename(file).split('.')
+      if id.nil? || locale.nil? || ext.nil? || id.to_i.to_s != id || !['md', 'html'].include?(ext)
+        Rails.logger.error "ERROR: Could not parse MOTD file #{file}"
+        return nil
+      end
+      contents = File.read(file)
+      if ext == "md"
+        msg = RDiscount.new(contents, :autolink).to_html
+      elsif ext == "html"
+        msg = File.read(file)
+      end
+      return id, locale, msg
+    end
+
+    def motd_dir
+      File.join(APP_CONFIG['customization_directory'], 'motd')
+    end
+
+  end
+end
diff --git a/app/controllers/api/services_controller.rb b/app/controllers/api/services_controller.rb
new file mode 100644
index 0000000..da2774b
--- /dev/null
+++ b/app/controllers/api/services_controller.rb
@@ -0,0 +1,8 @@
+class Api::ServicesController < ApiController
+
+  before_filter :require_login, :unless => :anonymous_access_allowed?
+
+  def show
+    respond_with current_user.effective_service_level
+  end
+end
diff --git a/app/controllers/api/sessions_controller.rb b/app/controllers/api/sessions_controller.rb
new file mode 100644
index 0000000..c8deb7a
--- /dev/null
+++ b/app/controllers/api/sessions_controller.rb
@@ -0,0 +1,44 @@
+module Api
+  class SessionsController < ApiController
+
+    before_filter :require_login, only: :destroy
+
+    def new
+      @session = Session.new
+      if authentication_errors
+        @errors = authentication_errors
+        render :status => 422
+      end
+    end
+
+    def create
+      logout if logged_in?
+      if params['A']
+        authenticate!
+      else
+        @user = User.find_by_login(params['login'])
+        render :json => {salt: @user.salt}
+      end
+    end
+
+    def update
+      authenticate!
+      @token = Token.create(:user_id => current_user.id)
+      session[:token] = @token.id
+      render :json => login_response
+    end
+
+    def destroy
+      logout
+      head :no_content
+    end
+
+    protected
+
+    def login_response
+      handshake = session.delete(:handshake) || {}
+      handshake.to_hash.merge(:id => current_user.id, :token => @token.to_s)
+    end
+
+  end
+end
diff --git a/app/controllers/api/smtp_certs_controller.rb b/app/controllers/api/smtp_certs_controller.rb
new file mode 100644
index 0000000..d9eab7d
--- /dev/null
+++ b/app/controllers/api/smtp_certs_controller.rb
@@ -0,0 +1,42 @@
+class Api::SmtpCertsController < ApiController
+
+  before_filter :require_login
+  before_filter :require_email_account
+  before_filter :fetch_identity
+  before_filter :require_enabled
+
+  # POST /1/smtp_cert
+  def create
+    @cert = ClientCertificate.new common_name: current_user.email_address
+    @identity.register_cert(@cert)
+    @identity.save
+    render text: @cert.to_s, content_type: 'text/plain'
+  end
+
+  protected
+
+  #
+  # Filters
+  #
+
+  def require_email_account
+    access_denied unless service_level.provides? 'email'
+  end
+
+  def require_enabled
+    access_denied unless current_user.enabled?
+  end
+
+  def fetch_identity
+    @identity = current_user.identity
+  end
+
+  #
+  # Helper methods
+  #
+
+  def service_level
+    current_user.effective_service_level
+  end
+
+end
diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb
new file mode 100644
index 0000000..e64d21f
--- /dev/null
+++ b/app/controllers/api/users_controller.rb
@@ -0,0 +1,83 @@
+module Api
+  class UsersController < ApiController
+    include ControllerExtension::FetchUser
+
+    # allow optional access to this controller using API auth tokens:
+    before_filter :token_authenticate
+
+    before_filter :fetch_user, :only => [:update, :destroy]
+    before_filter :require_monitor, :only => [:index, :show]
+    before_filter :require_login, :only => [:index, :update, :destroy]
+
+    respond_to :json
+
+    # used for autocomplete for admins in the web ui
+    def index
+      if params[:query]
+        @users = User.login_starts_with(params[:query])
+        respond_with @users.map(&:login).sort
+      else
+        render :json => {'error' => 'query required', 'status' => :unprocessable_entity}
+      end
+    end
+
+    def show
+      if params[:login]
+        @user = User.find_by_login(params[:login])
+      elsif params[:id]
+        @user = User.find(params[:id])
+      end
+      if @user
+        respond_with @user
+      else
+        not_found
+      end
+    end
+
+    def create
+      if current_user.is_monitor?
+        create_test_account
+      elsif APP_CONFIG[:allow_registration]
+        create_account
+      else
+        head :forbidden
+      end
+    end
+
+    def update
+      @user.account.update params[:user]
+      respond_with @user
+    end
+
+    def destroy
+      destroy_identity = current_user.is_monitor? || params[:identities] == "destroy"
+      @user.account.destroy(destroy_identity)
+      if @user == current_user
+        logout
+      end
+      render :json => {'success' => 'user deleted'}
+    end
+
+    private
+
+    # tester auth can only create test users.
+    def create_test_account
+      if User::is_test?(params[:user][:login])
+        @user = Account.create(params[:user], :invite_required => false)
+        respond_with @user
+      else
+        head :forbidden
+      end
+    end
+
+    def create_account
+      if APP_CONFIG[:allow_registration]
+        @user = Account.create(params[:user])
+        respond_with @user # return ID instead?
+      else
+        head :forbidden
+      end
+    end
+
+  end
+end
diff --git a/app/controllers/v1/certs_controller.rb b/app/controllers/v1/certs_controller.rb
deleted file mode 100644
index ffa6e35..0000000
--- a/app/controllers/v1/certs_controller.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-class V1::CertsController < ApiController
-
-  before_filter :require_login, :unless => :anonymous_access_allowed?
-  before_filter :require_enabled
-
-  # GET /cert
-  # deprecated - we actually create a new cert and that can
-  # be reflected in the action. GET /cert will eventually go
-  # away and be replaced by POST /cert
-  def show
-    create
-  end
-
-  # POST /cert
-  def create
-    @cert = ClientCertificate.new(:prefix => service_level.cert_prefix)
-    render text: @cert.to_s, content_type: 'text/plain'
-  end
-
-  protected
-
-  def require_enabled
-    if !current_user.is_anonymous? && !current_user.enabled?
-      access_denied
-    end
-  end
-
-  def service_level
-    current_user.effective_service_level
-  end
-end
diff --git a/app/controllers/v1/configs_controller.rb b/app/controllers/v1/configs_controller.rb
deleted file mode 100644
index f0b284e..0000000
--- a/app/controllers/v1/configs_controller.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-class V1::ConfigsController < ApiController
-  include ControllerExtension::JsonFile
-
-  before_filter :require_login, :unless => :anonymous_access_allowed?
-  before_filter :sanitize_id, only: :show
-
-  def index
-    render json: {services: service_paths}
-  end
-
-  def show
-    send_file lookup_file
-  end
-
-  protected
-
-  SERVICE_IDS = {
-    soledad: "soledad-service",
-    eip: "eip-service",
-    smtp: "smtp-service"
-  }
-
-  def service_paths
-    Hash[SERVICE_IDS.map{|k,v| [k,"/1/configs/#{v}.json"] } ]
-  end
-
-  def sanitize_id
-    @id = params[:id].downcase
-    access_denied unless SERVICE_IDS.values.include? @id
-  end
-
-  def lookup_file
-    path = APP_CONFIG[:config_file_paths][@id]
-    not_found if path.blank?
-    Rails.root.join path
-  end
-end
diff --git a/app/controllers/v1/identities_controller.rb b/app/controllers/v1/identities_controller.rb
deleted file mode 100644
index 4efd1f5..0000000
--- a/app/controllers/v1/identities_controller.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-module V1
-  class IdentitiesController < ApiController
-    before_filter :token_authenticate
-    before_filter :require_monitor
-
-    def show
-      @identity = Identity.find_by_address(params[:id])
-      if @identity
-        respond_with @identity
-      else
-        render_not_found
-      end
-    end
-
-  end
-end
diff --git a/app/controllers/v1/messages_controller.rb b/app/controllers/v1/messages_controller.rb
deleted file mode 100644
index c0ca0c7..0000000
--- a/app/controllers/v1/messages_controller.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-module V1
-  class MessagesController < ApiController
-
-    before_filter :require_login
-
-    def index
-      if Dir.exist?(motd_dir)
-        if !CommonLanguages::available_code?(params[:locale])
-          locale = 'en'
-        else
-          locale = params[:locale]
-        end
-        render json: motd_files_for_locale(locale)
-      else
-        render json: []
-      end
-    end
-
-    # disable per-user messages for now, not supported in the client
-    #def update
-    #  if message = Message.find(params[:id])
-    #    message.mark_as_read_by(current_user)
-    #    message.save
-    #    render json: success(:marked_as_read)
-    #  else
-    #    render json: error(:not_found), status: :not_found
-    #  end
-    #end
-
-    private
-
-    #
-    # returns list of messages, for example:
-    #
-    # [
-    #   {"id": 1, "locale": "en", "text": "<message text>"},
-    #   {"id": 2, "locale": "en", "text": "<message text>"}
-    # ]
-    #
-    # Each message is present only once, using the best choice
-    # for the locale. The order is determined by the id.
-    #
-    def motd_files_for_locale(locale)
-      files = []
-      motd_files.keys.each do |id|
-        if motd_files[id].key?(locale)
-          msg_locale = locale
-        elsif motd_files[id].key?('en')
-          msg_locale = 'en'
-        else
-          msg_locale = motd_files[id].keys.first
-        end
-        files << {
-          "id" => id,
-          "locale" => msg_locale,
-          "text" => motd_files[id][msg_locale]
-        }
-      end
-      files.sort! {|a,b| a["id"].to_i <=> b["id"].to_i }
-      return files
-    end
-
-    #
-    # returns messages of the day as a hash:
-    # { "1": {"en": "message"}, "2": {"en": "message"} }
-    #
-    def motd_files
-      if motd_changed? || @motd_files.nil?
-        @motd_files = load_motd_files
-      else
-        @motd_files
-      end
-    end
-
-    def motd_changed?
-      newest = Dir.glob(File.join(motd_dir, '*.{html,md}')).collect{|file| File.mtime(file)}.max
-      if @timestamp.nil?
-        @timestamp = newest
-        return true
-      elsif @timestamp < newest
-        @timestamp = newest
-        return true
-      else
-        return false
-      end
-    end
-
-    def load_motd_files
-      files = {}
-      Dir.glob(File.join(motd_dir, '*.{html,md}')).each do |file|
-        id, locale, msg = parse_motd_file(file)
-        next unless id
-        files[id] ||= {}
-        files[id][locale] = msg
-      end
-      files
-    end
-
-    def parse_motd_file(file)
-      id, locale, ext = File.basename(file).split('.')
-      if id.nil? || locale.nil? || ext.nil? || id.to_i.to_s != id || !['md', 'html'].include?(ext)
-        Rails.logger.error "ERROR: Could not parse MOTD file #{file}"
-        return nil
-      end
-      contents = File.read(file)
-      if ext == "md"
-        msg = RDiscount.new(contents, :autolink).to_html
-      elsif ext == "html"
-        msg = File.read(file)
-      end
-      return id, locale, msg
-    end
-
-    def motd_dir
-      File.join(APP_CONFIG['customization_directory'], 'motd')
-    end
-
-  end
-end
diff --git a/app/controllers/v1/services_controller.rb b/app/controllers/v1/services_controller.rb
deleted file mode 100644
index 523eb44..0000000
--- a/app/controllers/v1/services_controller.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class V1::ServicesController < ApiController
-
-  before_filter :require_login, :unless => :anonymous_access_allowed?
-
-  def show
-    respond_with current_user.effective_service_level
-  end
-end
diff --git a/app/controllers/v1/sessions_controller.rb b/app/controllers/v1/sessions_controller.rb
deleted file mode 100644
index a343d9b..0000000
--- a/app/controllers/v1/sessions_controller.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-module V1
-  class SessionsController < ApiController
-
-    before_filter :require_login, only: :destroy
-
-    def new
-      @session = Session.new
-      if authentication_errors
-        @errors = authentication_errors
-        render :status => 422
-      end
-    end
-
-    def create
-      logout if logged_in?
-      if params['A']
-        authenticate!
-      else
-        @user = User.find_by_login(params['login'])
-        render :json => {salt: @user.salt}
-      end
-    end
-
-    def update
-      authenticate!
-      @token = Token.create(:user_id => current_user.id)
-      session[:token] = @token.id
-      render :json => login_response
-    end
-
-    def destroy
-      logout
-      head :no_content
-    end
-
-    protected
-
-    def login_response
-      handshake = session.delete(:handshake) || {}
-      handshake.to_hash.merge(:id => current_user.id, :token => @token.to_s)
-    end
-
-  end
-end
diff --git a/app/controllers/v1/smtp_certs_controller.rb b/app/controllers/v1/smtp_certs_controller.rb
deleted file mode 100644
index 5760645..0000000
--- a/app/controllers/v1/smtp_certs_controller.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-class V1::SmtpCertsController < ApiController
-
-  before_filter :require_login
-  before_filter :require_email_account
-  before_filter :fetch_identity
-  before_filter :require_enabled
-
-  # POST /1/smtp_cert
-  def create
-    @cert = ClientCertificate.new common_name: current_user.email_address
-    @identity.register_cert(@cert)
-    @identity.save
-    render text: @cert.to_s, content_type: 'text/plain'
-  end
-
-  protected
-
-  #
-  # Filters
-  #
-
-  def require_email_account
-    access_denied unless service_level.provides? 'email'
-  end
-
-  def require_enabled
-    access_denied unless current_user.enabled?
-  end
-
-  def fetch_identity
-    @identity = current_user.identity
-  end
-
-  #
-  # Helper methods
-  #
-
-  def service_level
-    current_user.effective_service_level
-  end
-
-end
diff --git a/app/controllers/v1/users_controller.rb b/app/controllers/v1/users_controller.rb
deleted file mode 100644
index 6640d10..0000000
--- a/app/controllers/v1/users_controller.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-module V1
-  class UsersController < ApiController
-    include ControllerExtension::FetchUser
-
-    # allow optional access to this controller using API auth tokens:
-    before_filter :token_authenticate
-
-    before_filter :fetch_user, :only => [:update, :destroy]
-    before_filter :require_monitor, :only => [:index, :show]
-    before_filter :require_login, :only => [:index, :update, :destroy]
-
-    respond_to :json
-
-    # used for autocomplete for admins in the web ui
-    def index
-      if params[:query]
-        @users = User.login_starts_with(params[:query])
-        respond_with @users.map(&:login).sort
-      else
-        render :json => {'error' => 'query required', 'status' => :unprocessable_entity}
-      end
-    end
-
-    def show
-      if params[:login]
-        @user = User.find_by_login(params[:login])
-      elsif params[:id]
-        @user = User.find(params[:id])
-      end
-      if @user
-        respond_with @user
-      else
-        not_found
-      end
-    end
-
-    def create
-      if current_user.is_monitor?
-        create_test_account
-      elsif APP_CONFIG[:allow_registration]
-        create_account
-      else
-        head :forbidden
-      end
-    end
-
-    def update
-      @user.account.update params[:user]
-      respond_with @user
-    end
-
-    def destroy
-      destroy_identity = current_user.is_monitor? || params[:identities] == "destroy"
-      @user.account.destroy(destroy_identity)
-      if @user == current_user
-        logout
-      end
-      render :json => {'success' => 'user deleted'}
-    end
-
-    private
-
-    # tester auth can only create test users.
-    def create_test_account
-      if User::is_test?(params[:user][:login])
-        @user = Account.create(params[:user], :invite_required => false)
-        respond_with @user
-      else
-        head :forbidden
-      end
-    end
-
-    def create_account
-      if APP_CONFIG[:allow_registration]
-        @user = Account.create(params[:user])
-        respond_with @user # return ID instead?
-      else
-        head :forbidden
-      end
-    end
-
-  end
-end
diff --git a/app/views/api/sessions/new.json.erb b/app/views/api/sessions/new.json.erb
new file mode 100644
index 0000000..36154b8
--- /dev/null
+++ b/app/views/api/sessions/new.json.erb
@@ -0,0 +1,3 @@
+{
+"errors": <%= raw @errors.to_json %>
+}
diff --git a/app/views/v1/sessions/new.json.erb b/app/views/v1/sessions/new.json.erb
deleted file mode 100644
index 36154b8..0000000
--- a/app/views/v1/sessions/new.json.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-"errors": <%= raw @errors.to_json %>
-}
diff --git a/config/routes.rb b/config/routes.rb
index be3b3be..a1a5b3c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -24,10 +24,10 @@ LeapWeb::Application.routes.draw do
 
   get '/provider.json' => 'static_config#provider'
 
-  namespace "api", { module: "v1",
-      path: "/1/",
+  namespace "api", { module: "api",
+      path: "/:version/",
       defaults: {format: 'json'},
-      :constraints => { :id => /[^\/]+(?=\.json\z)|[^\/]+/ }
+      :constraints => { :id => /[^\/]+(?=\.json\z)|[^\/]+/, :version => /[12]/ }
       } do
     resources :sessions, :only => [:new, :create, :update]
     delete "logout" => "sessions#destroy", :as => "logout"
diff --git a/test/functional/api/certs_controller_test.rb b/test/functional/api/certs_controller_test.rb
new file mode 100644
index 0000000..137ed92
--- /dev/null
+++ b/test/functional/api/certs_controller_test.rb
@@ -0,0 +1,60 @@
+require_relative '../../test_helper'
+
+class Api::CertsControllerTest < ActionController::TestCase
+
+  test "create unlimited cert without login" do
+    with_config allow_anonymous_certs: true do
+      cert = expect_cert('UNLIMITED')
+      post :create
+      assert_response :success
+      assert_equal cert.to_s, @response.body
+    end
+  end
+
+  test "create limited cert" do
+    with_config allow_limited_certs: true do
+      login
+      cert = expect_cert('LIMITED')
+      post :create
+      assert_response :success
+      assert_equal cert.to_s, @response.body
+    end
+  end
+
+  test "fail to create cert when disabled" do
+    login :enabled? => false
+    post :create
+    assert_access_denied
+  end
+
+  test "create unlimited cert" do
+    login effective_service_level: ServiceLevel.new(id: 2)
+    cert = expect_cert('UNLIMITED')
+    post :create
+    assert_response :success
+    assert_equal cert.to_s, @response.body
+  end
+
+  test "GET still works as an alias" do
+    login effective_service_level: ServiceLevel.new(id: 2)
+    cert = expect_cert('UNLIMITED')
+    get :show
+    assert_response :success
+    assert_equal cert.to_s, @response.body
+  end
+
+  test "redirect if no eip service offered" do
+    post :create
+    assert_response :redirect
+  end
+
+  protected
+
+  def expect_cert(prefix)
+    cert = stub :to_s => "#{prefix.downcase} cert"
+    ClientCertificate.expects(:new).
+      with(:prefix => prefix).
+      returns(cert)
+    return cert
+  end
+end
diff --git a/test/functional/api/identities_controller_test.rb b/test/functional/api/identities_controller_test.rb
new file mode 100644
index 0000000..e803ee7
--- /dev/null
+++ b/test/functional/api/identities_controller_test.rb
@@ -0,0 +1,24 @@
+require_relative '../../test_helper'
+
+class Api::IdentitiesControllerTest < ActionController::TestCase
+
+  test "api monitor can fetch identity" do
+    monitor_auth do
+      identity = FactoryGirl.create :identity
+      get :show, :id => identity.address, :format => 'json'
+      assert_response :success
+      assert_equal identity, assigns(:identity)
+
+      get :show, :id => "blahblahblah", :format => 'json'
+      assert_response :not_found
+    end
+  end
+
+
+  test "anonymous cannot fetch identity" do
+    identity = FactoryGirl.create :identity
+    get :show, :id => identity.address, :format => 'json'
+    assert_response :forbidden
+  end
+
+end
diff --git a/test/functional/api/messages_controller_test.rb b/test/functional/api/messages_controller_test.rb
new file mode 100644
index 0000000..01641d4
--- /dev/null
+++ b/test/functional/api/messages_controller_test.rb
@@ -0,0 +1,99 @@
+require 'test_helper'
+
+class Api::MessagesControllerTest < ActionController::TestCase
+
+  setup do
+    @user = FactoryGirl.build(:user)
+    @user.save
+  end
+
+  # NOTE: the available languages for test are :en and :de
+  # so :es will result in english response.
+
+  test "get the motd" do
+    with_config("customization_directory" => Rails.root+'test/files') do
+      login @user
+      get :index, :locale => 'es'
+      body = JSON.parse(response.body)
+      message1 = "<p>\"This\" is a <strong>very</strong> fine message. <a href=\"https://bitmask.net\">https://bitmask.net</a></p>\n"
+      assert_equal 2, body.size, 'there should be two messages'
+      assert_equal message1, body.first["text"], 'first message text should match files/motd/1.en.md'
+    end
+  end
+
+  test "get localized motd" do
+    with_config("customization_directory" => Rails.root+'test/files') do
+      login @user
+      get :index, :locale => 'de'
+      body = JSON.parse(response.body)
+      message1 = "<p>Dies ist eine sehr feine Nachricht. <a href=\"https://bitmask.net\">https://bitmask.net</a></p>\n"
+      assert_equal message1, body.first["text"], 'first message text should match files/motd/1.de.md'
+    end
+  end
+
+  test "get empty motd" do
+    login @user
+    get :index
+    assert_equal "[]", response.body, "motd response should be empty if no motd directory exists"
+  end
+
+  ##
+  ## For now, only the static file MOTD is supported, not messages in the db.
+  ## so, this is disabled:
+  ##
+=begin
+  setup do
+    InviteCodeValidator.any_instance.stubs(:validate)
+    @user = FactoryGirl.build(:user)
+    @user.save
+    @message = Message.new(:text => 'a test message')
+    @message.user_ids_to_show << @user.id
+    @message.save
+  end
+
+  teardown do
+    @message.destroy
+    @user.destroy
+  end
+
+  test "get messages for user" do
+    login @user
+    get :index
+    assert response.body.include? @message.text
+    assert response.body.include? @message.id
+  end
+
+  test "mark message read for user" do
+    login @user
+    assert @message.user_ids_to_show.include?(@user.id)
+    assert !@message.user_ids_have_shown.include?(@user.id)
+    put :update, :id => @message.id
+    @message.reload
+    assert !@message.user_ids_to_show.include?(@user.id)
+    assert @message.user_ids_have_shown.include?(@user.id)
+    assert_success :marked_as_read
+  end
+
+  test "do not get seen messages" do
+    login @user
+    put :update, :id => @message.id
+    @message.reload
+    get :index
+    assert !(response.body.include? @message.text)
+    assert !(response.body.include? @message.id)
+  end
+
+
+  test "mark read responds even with bad inputs" do
+    login @user
+    put :update, :id => 'more nonsense'
+    assert_not_found
+ end
+
+  test "fails if not authenticated" do
+    get :index, :format => :json
+    assert_login_required
+  end
+=end
+
+end
diff --git a/test/functional/api/services_controller_test.rb b/test/functional/api/services_controller_test.rb
new file mode 100644
index 0000000..b1dc9f3
--- /dev/null
+++ b/test/functional/api/services_controller_test.rb
@@ -0,0 +1,28 @@
+require 'test_helper'
+
+class Api::ServicesControllerTest < ActionController::TestCase
+
+  test "anonymous user gets login required service info" do
+    get :show, format: :json
+    assert_json_response error: 'not_authorized_login',
+      message: 'Please log in to perform that action.'
+  end
+
+  test "anonymous user gets vpn service info" do
+    with_config allow_anonymous_certs: true do
+      get :show, format: :json
+      assert_json_response name: 'anonymous',
+        eip_rate_limit: false,
+        description: 'anonymous access to the VPN'
+    end
+  end
+
+  test "user can see their service info" do
+    login
+    get :show, format: :json
+    default_level = APP_CONFIG[:default_service_level]
+    assert_json_response APP_CONFIG[:service_levels][default_level]
+  end
+
+end
+
diff --git a/test/functional/api/sessions_controller_test.rb b/test/functional/api/sessions_controller_test.rb
new file mode 100644
index 0000000..0633578
--- /dev/null
+++ b/test/functional/api/sessions_controller_test.rb
@@ -0,0 +1,62 @@
+require 'test_helper'
+
+# This is a simple controller unit test.
+# We're stubbing out both warden and srp.
+# There's an integration test testing the full rack stack and srp
+class Api::SessionsControllerTest < ActionController::TestCase
+
+  setup do
+    @request.env['HTTP_HOST'] = 'api.lvh.me'
+    @user = stub_record :user, {}, true
+    @client_hex = 'a123'
+  end
+
+  test "renders json" do
+    get :new, :format => :json
+    assert_response :success
+    assert_json_error nil
+  end
+
+  test "renders warden errors" do
+    request.env['warden.options'] = {attempted_path: 'path/to/controller'}
+    strategy = stub :message => {:field => :translate_me}
+    request.env['warden'].stubs(:winning_strategy).returns(strategy)
+    I18n.expects(:t).with(:translate_me).at_least_once.returns("translation stub")
+    get :new, :format => :json
+    assert_response 422
+    assert_json_error :field => "translation stub"
+  end
+
+  # Warden takes care of parsing the params and
+  # rendering the response. So not much to test here.
+  test "should perform handshake" do
+    request.env['warden'].expects(:authenticate!)
+    # make sure we don't get a template missing error:
+    @controller.stubs(:render)
+    post :create, :login => @user.login, 'A' => @client_hex
+  end
+
+  test "should authenticate" do
+    request.env['warden'].expects(:authenticate!)
+    @controller.stubs(:current_user).returns(@user)
+    handshake = stub(:to_hash => {h: "ash"})
+    session[:handshake] = handshake
+
+    post :update, :id => @user.login, :client_auth => @client_hex
+
+    assert_nil session[:handshake]
+    assert_response :success
+    assert json_response.keys.include?("id")
+    assert json_response.keys.include?("token")
+    assert token = Token.find_by_token(json_response['token'])
+    assert_equal @user.id, token.user_id
+  end
+
+  test "destroy should logout" do
+    login
+    expect_logout
+    delete :destroy
+    assert_response 204
+  end
+
+end
diff --git a/test/functional/api/smtp_certs_controller_test.rb b/test/functional/api/smtp_certs_controller_test.rb
new file mode 100644
index 0000000..2142675
--- /dev/null
+++ b/test/functional/api/smtp_certs_controller_test.rb
@@ -0,0 +1,43 @@
+require 'test_helper'
+
+class Api::SmtpCertsControllerTest < ActionController::TestCase
+
+  test "no smtp cert without login" do
+    with_config allow_anonymous_certs: true do
+      post :create
+      assert_login_required
+    end
+  end
+
+  test "require service level with email" do
+    login
+    post :create
+    assert_access_denied
+  end
+
+  test "send cert with username" do
+    login effective_service_level: ServiceLevel.new(id: 2)
+    cert = expect_cert(@current_user.email_address)
+    cert.expects(:fingerprint).returns('fingerprint')
+    post :create
+    assert_response :success
+    assert_equal cert.to_s, @response.body
+  end
+
+  test "fail to create cert when disabled" do
+    login :enabled? => false
+    post :create
+    assert_access_denied
+  end
+
+  protected
+
+  def expect_cert(email)
+    cert = stub to_s: "#{email.downcase} cert",
+      expiry: 1.month.from_now.utc.at_midnight
+    ClientCertificate.expects(:new).
+      with(:common_name => email).
+      returns(cert)
+    return cert
+  end
+end
diff --git a/test/functional/api/token_auth_test.rb b/test/functional/api/token_auth_test.rb
new file mode 100644
index 0000000..17a4775
--- /dev/null
+++ b/test/functional/api/token_auth_test.rb
@@ -0,0 +1,40 @@
+#
+# tests for authenticating an admin or monitor user
+# via static configured tokens.
+#
+
+require 'test_helper'
+
+class Api::TokenAuthTest < ActionController::TestCase
+  tests Api::ConfigsController
+
+  def test_login_via_api_token
+    with_config(:allow_anonymous_certs => false) do
+      monitor_auth do
+        get :index
+        assert assigns(:token), 'should have authenticated via api token'
+        assert assigns(:token).is_a? ApiToken
+        assert @controller.send(:current_user).is_a? ApiMonitorUser
+      end
+    end
+  end
+
+  def test_fail_api_auth_when_ip_not_allowed
+    with_config(:allow_anonymous_certs => false) do
+      allowed = "99.99.99.99"
+      new_config = {api_tokens: APP_CONFIG["api_tokens"].merge(allowed_ips: [allowed])}
+      with_config(new_config) do
+        monitor_auth do
+          request.env['REMOTE_ADDR'] = "1.1.1.1"
+          get :index
+          assert_nil assigns(:token), "should not be able to auth with api token when ip restriction doesn't allow it"
+          request.env['REMOTE_ADDR'] = allowed
+          get :index
+          assert assigns(:token), "should have authenticated via api token"
+        end
+      end
+    end
+  end
+
+end
+
diff --git a/test/functional/api/users_controller_test.rb b/test/functional/api/users_controller_test.rb
new file mode 100644
index 0000000..bc2e312
--- /dev/null
+++ b/test/functional/api/users_controller_test.rb
@@ -0,0 +1,135 @@
+require_relative '../../test_helper'
+
+class Api::UsersControllerTest < ActionController::TestCase
+
+  test "user can change settings" do
+    user = find_record :user
+    changed_attribs = record_attributes_for :user_with_settings
+    account_settings = stub
+    account_settings.expects(:update).with(changed_attribs)
+    Account.expects(:new).with(user).returns(account_settings)
+
+    login user
+    put :update, :user => changed_attribs, :id => user.id, :format => :json
+
+    assert_equal user, assigns[:user]
+    assert_response 204
+    assert @response.body.blank?, "Response should be blank"
+  end
+
+  test "admin can update user" do
+    user = find_record :user
+    changed_attribs = record_attributes_for :user_with_settings
+    account_settings = stub
+    account_settings.expects(:update).with(changed_attribs)
+    Account.expects(:new).with(user).returns(account_settings)
+
+    login :is_admin? => true
+    put :update, :user => changed_attribs, :id => user.id, :format => :json
+
+    assert_equal user, assigns[:user]
+    assert_response 204
+  end
+
+  test "user cannot update other user" do
+    user = find_record :user
+    login
+    put :update, id: user.id,
+      user: record_attributes_for(:user_with_settings),
+      :format => :json
+    assert_access_denied
+  end
+
+  test "should create new user" do
+    user_attribs = record_attributes_for :user
+    user = User.new(user_attribs)
+    Account.expects(:create).with(user_attribs).returns(user)
+
+    post :create, :user => user_attribs, :format => :json
+
+    assert_nil session[:user_id]
+    assert_json_response user
+    assert_response :success
+  end
+
+  test "should redirect to signup form on failed attempt" do
+    user_attribs = record_attributes_for :user
+    user_attribs.slice!('login')
+    user = User.new(user_attribs)
+    assert !user.valid?
+    Account.expects(:create).with(user_attribs).returns(user)
+
+    post :create, :user => user_attribs, :format => :json
+
+    assert_json_error user.errors.messages
+    assert_response 422
+  end
+
+  test "admin can autocomplete users" do
+    login :is_admin? => true
+    get :index, :query => 'a', :format => :json
+
+    assert_response :success
+    assert assigns(:users)
+  end
+
+  test "create returns forbidden if registration is closed" do
+    user_attribs = record_attributes_for :user
+    with_config(allow_registration: false) do
+      post :create, :user => user_attribs, :format => :json
+      assert_response :forbidden
+    end
+  end
+
+  test "admin can show user" do
+    user = FactoryGirl.create :user
+    login :is_admin? => true
+    get :show, :id => 0, :login => user.login, :format => :json
+    assert_response :success
+    assert_json_response user
+    get :show, :id => user.id, :format => :json
+    assert_response :success
+    assert_json_response user
+    get :show, :id => "0", :format => :json
+    assert_response :not_found
+  end
+
+  test "normal users cannot show user" do
+    user = find_record :user
+    login
+    get :show, :id => 0, :login => user.login, :format => :json
+    assert_access_denied
+  end
+
+  test "api monitor auth can create and destroy test users" do
+    # should work even with registration off and/or invites required
+    with_config(allow_registration: false, invite_required: true) do
+      monitor_auth do
+        user_attribs = record_attributes_for :test_user
+        post :create, :user => user_attribs, :format => :json
+        assert_response :success
+        delete :destroy, :id => assigns(:user).id, :format => :json
+        assert_response :success
+      end
+    end
+  end
+
+  test "api monitor auth cannot create normal users" do
+    monitor_auth do
+      user_attribs = record_attributes_for :user
+      post :create, :user => user_attribs, :format => :json
+      assert_response :forbidden
+    end
+  end
+
+  test "api monitor auth cannot delete normal users" do
+    post :create, :user => record_attributes_for(:user), :format => :json
+    assert_response :success
+    normal_user_id = assigns(:user).id
+    monitor_auth do
+      delete :destroy, :id => normal_user_id, :format => :json
+      assert_response :forbidden
+    end
+  end
+
+end
diff --git a/test/functional/configs_controller_with_static_tokens_test.rb b/test/functional/configs_controller_with_static_tokens_test.rb
deleted file mode 100644
index 79739fe..0000000
--- a/test/functional/configs_controller_with_static_tokens_test.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# tests for authenticating an admin or monitor user
-# via static configured tokens.
-#
-
-require 'test_helper'
-
-class ConfigsControllerWithStaticTokensTest < ActionController::TestCase
-  tests V1::ConfigsController
-
-  def test_login_via_api_token
-    with_config(:allow_anonymous_certs => false) do
-      monitor_auth do
-        get :index
-        assert assigns(:token), 'should have authenticated via api token'
-        assert assigns(:token).is_a? ApiToken
-        assert @controller.send(:current_user).is_a? ApiMonitorUser
-      end
-    end
-  end
-
-  def test_fail_api_auth_when_ip_not_allowed
-    with_config(:allow_anonymous_certs => false) do
-      allowed = "99.99.99.99"
-      new_config = {api_tokens: APP_CONFIG["api_tokens"].merge(allowed_ips: [allowed])}
-      with_config(new_config) do
-        monitor_auth do
-          request.env['REMOTE_ADDR'] = "1.1.1.1"
-          get :index
-          assert_nil assigns(:token), "should not be able to auth with api token when ip restriction doesn't allow it"
-          request.env['REMOTE_ADDR'] = allowed
-          get :index
-          assert assigns(:token), "should have authenticated via api token"
-        end
-      end
-    end
-  end
-
-end
-
diff --git a/test/functional/v1/certs_controller_test.rb b/test/functional/v1/certs_controller_test.rb
deleted file mode 100644
index 04c1c86..0000000
--- a/test/functional/v1/certs_controller_test.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-require_relative '../../test_helper'
-
-class V1::CertsControllerTest < ActionController::TestCase
-
-  test "create unlimited cert without login" do
-    with_config allow_anonymous_certs: true do
-      cert = expect_cert('UNLIMITED')
-      post :create
-      assert_response :success
-      assert_equal cert.to_s, @response.body
-    end
-  end
-
-  test "create limited cert" do
-    with_config allow_limited_certs: true do
-      login
-      cert = expect_cert('LIMITED')
-      post :create
-      assert_response :success
-      assert_equal cert.to_s, @response.body
-    end
-  end
-
-  test "fail to create cert when disabled" do
-    login :enabled? => false
-    post :create
-    assert_access_denied
-  end
-
-  test "create unlimited cert" do
-    login effective_service_level: ServiceLevel.new(id: 2)
-    cert = expect_cert('UNLIMITED')
-    post :create
-    assert_response :success
-    assert_equal cert.to_s, @response.body
-  end
-
-  test "GET still works as an alias" do
-    login effective_service_level: ServiceLevel.new(id: 2)
-    cert = expect_cert('UNLIMITED')
-    get :show
-    assert_response :success
-    assert_equal cert.to_s, @response.body
-  end
-
-  test "redirect if no eip service offered" do
-    post :create
-    assert_response :redirect
-  end
-
-  protected
-
-  def expect_cert(prefix)
-    cert = stub :to_s => "#{prefix.downcase} cert"
-    ClientCertificate.expects(:new).
-      with(:prefix => prefix).
-      returns(cert)
-    return cert
-  end
-end
diff --git a/test/functional/v1/identities_controller_test.rb b/test/functional/v1/identities_controller_test.rb
deleted file mode 100644
index 6410c44..0000000
--- a/test/functional/v1/identities_controller_test.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require_relative '../../test_helper'
-
-class V1::IdentitiesControllerTest < ActionController::TestCase
-
-  test "api monitor can fetch identity" do
-    monitor_auth do
-      identity = FactoryGirl.create :identity
-      get :show, :id => identity.address, :format => 'json'
-      assert_response :success
-      assert_equal identity, assigns(:identity)
-
-      get :show, :id => "blahblahblah", :format => 'json'
-      assert_response :not_found
-    end
-  end
-
-
-  test "anonymous cannot fetch identity" do
-    identity = FactoryGirl.create :identity
-    get :show, :id => identity.address, :format => 'json'
-    assert_response :forbidden
-  end
-
-end
diff --git a/test/functional/v1/messages_controller_test.rb b/test/functional/v1/messages_controller_test.rb
deleted file mode 100644
index f37cca0..0000000
--- a/test/functional/v1/messages_controller_test.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-require 'test_helper'
-
-class V1::MessagesControllerTest < ActionController::TestCase
-
-  setup do
-    @user = FactoryGirl.build(:user)
-    @user.save
-  end
-
-  # NOTE: the available languages for test are :en and :de
-  # so :es will result in english response.
-
-  test "get the motd" do
-    with_config("customization_directory" => Rails.root+'test/files') do
-      login @user
-      get :index, :locale => 'es'
-      body = JSON.parse(response.body)
-      message1 = "<p>\"This\" is a <strong>very</strong> fine message. <a href=\"https://bitmask.net\">https://bitmask.net</a></p>\n"
-      assert_equal 2, body.size, 'there should be two messages'
-      assert_equal message1, body.first["text"], 'first message text should match files/motd/1.en.md'
-    end
-  end
-
-  test "get localized motd" do
-    with_config("customization_directory" => Rails.root+'test/files') do
-      login @user
-      get :index, :locale => 'de'
-      body = JSON.parse(response.body)
-      message1 = "<p>Dies ist eine sehr feine Nachricht. <a href=\"https://bitmask.net\">https://bitmask.net</a></p>\n"
-      assert_equal message1, body.first["text"], 'first message text should match files/motd/1.de.md'
-    end
-  end
-
-  test "get empty motd" do
-    login @user
-    get :index
-    assert_equal "[]", response.body, "motd response should be empty if no motd directory exists"
-  end
-
-  ##
-  ## For now, only the static file MOTD is supported, not messages in the db.
-  ## so, this is disabled:
-  ##
-=begin
-  setup do
-    InviteCodeValidator.any_instance.stubs(:validate)
-    @user = FactoryGirl.build(:user)
-    @user.save
-    @message = Message.new(:text => 'a test message')
-    @message.user_ids_to_show << @user.id
-    @message.save
-  end
-
-  teardown do
-    @message.destroy
-    @user.destroy
-  end
-
-  test "get messages for user" do
-    login @user
-    get :index
-    assert response.body.include? @message.text
-    assert response.body.include? @message.id
-  end
-
-  test "mark message read for user" do
-    login @user
-    assert @message.user_ids_to_show.include?(@user.id)
-    assert !@message.user_ids_have_shown.include?(@user.id)
-    put :update, :id => @message.id
-    @message.reload
-    assert !@message.user_ids_to_show.include?(@user.id)
-    assert @message.user_ids_have_shown.include?(@user.id)
-    assert_success :marked_as_read
-  end
-
-  test "do not get seen messages" do
-    login @user
-    put :update, :id => @message.id
-    @message.reload
-    get :index
-    assert !(response.body.include? @message.text)
-    assert !(response.body.include? @message.id)
-  end
-
-
-  test "mark read responds even with bad inputs" do
-    login @user
-    put :update, :id => 'more nonsense'
-    assert_not_found
- end
-
-  test "fails if not authenticated" do
-    get :index, :format => :json
-    assert_login_required
-  end
-=end
-
-end
diff --git a/test/functional/v1/services_controller_test.rb b/test/functional/v1/services_controller_test.rb
deleted file mode 100644
index 039eb27..0000000
--- a/test/functional/v1/services_controller_test.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require 'test_helper'
-
-class V1::ServicesControllerTest < ActionController::TestCase
-
-  test "anonymous user gets login required service info" do
-    get :show, format: :json
-    assert_json_response error: 'not_authorized_login',
-      message: 'Please log in to perform that action.'
-  end
-
-  test "anonymous user gets vpn service info" do
-    with_config allow_anonymous_certs: true do
-      get :show, format: :json
-      assert_json_response name: 'anonymous',
-        eip_rate_limit: false,
-        description: 'anonymous access to the VPN'
-    end
-  end
-
-  test "user can see their service info" do
-    login
-    get :show, format: :json
-    default_level = APP_CONFIG[:default_service_level]
-    assert_json_response APP_CONFIG[:service_levels][default_level]
-  end
-
-end
-
diff --git a/test/functional/v1/sessions_controller_test.rb b/test/functional/v1/sessions_controller_test.rb
deleted file mode 100644
index 8bb6acd..0000000
--- a/test/functional/v1/sessions_controller_test.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require 'test_helper'
-
-# This is a simple controller unit test.
-# We're stubbing out both warden and srp.
-# There's an integration test testing the full rack stack and srp
-class V1::SessionsControllerTest < ActionController::TestCase
-
-  setup do
-    @request.env['HTTP_HOST'] = 'api.lvh.me'
-    @user = stub_record :user, {}, true
-    @client_hex = 'a123'
-  end
-
-  test "renders json" do
-    get :new, :format => :json
-    assert_response :success
-    assert_json_error nil
-  end
-
-  test "renders warden errors" do
-    request.env['warden.options'] = {attempted_path: 'path/to/controller'}
-    strategy = stub :message => {:field => :translate_me}
-    request.env['warden'].stubs(:winning_strategy).returns(strategy)
-    I18n.expects(:t).with(:translate_me).at_least_once.returns("translation stub")
-    get :new, :format => :json
-    assert_response 422
-    assert_json_error :field => "translation stub"
-  end
-
-  # Warden takes care of parsing the params and
-  # rendering the response. So not much to test here.
-  test "should perform handshake" do
-    request.env['warden'].expects(:authenticate!)
-    # make sure we don't get a template missing error:
-    @controller.stubs(:render)
-    post :create, :login => @user.login, 'A' => @client_hex
-  end
-
-  test "should authenticate" do
-    request.env['warden'].expects(:authenticate!)
-    @controller.stubs(:current_user).returns(@user)
-    handshake = stub(:to_hash => {h: "ash"})
-    session[:handshake] = handshake
-
-    post :update, :id => @user.login, :client_auth => @client_hex
-
-    assert_nil session[:handshake]
-    assert_response :success
-    assert json_response.keys.include?("id")
-    assert json_response.keys.include?("token")
-    assert token = Token.find_by_token(json_response['token'])
-    assert_equal @user.id, token.user_id
-  end
-
-  test "destroy should logout" do
-    login
-    expect_logout
-    delete :destroy
-    assert_response 204
-  end
-
-end
diff --git a/test/functional/v1/smtp_certs_controller_test.rb b/test/functional/v1/smtp_certs_controller_test.rb
deleted file mode 100644
index 1b03995..0000000
--- a/test/functional/v1/smtp_certs_controller_test.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'test_helper'
-
-class V1::SmtpCertsControllerTest < ActionController::TestCase
-
-  test "no smtp cert without login" do
-    with_config allow_anonymous_certs: true do
-      post :create
-      assert_login_required
-    end
-  end
-
-  test "require service level with email" do
-    login
-    post :create
-    assert_access_denied
-  end
-
-  test "send cert with username" do
-    login effective_service_level: ServiceLevel.new(id: 2)
-    cert = expect_cert(@current_user.email_address)
-    cert.expects(:fingerprint).returns('fingerprint')
-    post :create
-    assert_response :success
-    assert_equal cert.to_s, @response.body
-  end
-
-  test "fail to create cert when disabled" do
-    login :enabled? => false
-    post :create
-    assert_access_denied
-  end
-
-  protected
-
-  def expect_cert(email)
-    cert = stub to_s: "#{email.downcase} cert",
-      expiry: 1.month.from_now.utc.at_midnight
-    ClientCertificate.expects(:new).
-      with(:common_name => email).
-      returns(cert)
-    return cert
-  end
-end
diff --git a/test/functional/v1/users_controller_test.rb b/test/functional/v1/users_controller_test.rb
deleted file mode 100644
index 3f7bad3..0000000
--- a/test/functional/v1/users_controller_test.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-require_relative '../../test_helper'
-
-class V1::UsersControllerTest < ActionController::TestCase
-
-  test "user can change settings" do
-    user = find_record :user
-    changed_attribs = record_attributes_for :user_with_settings
-    account_settings = stub
-    account_settings.expects(:update).with(changed_attribs)
-    Account.expects(:new).with(user).returns(account_settings)
-
-    login user
-    put :update, :user => changed_attribs, :id => user.id, :format => :json
-
-    assert_equal user, assigns[:user]
-    assert_response 204
-    assert @response.body.blank?, "Response should be blank"
-  end
-
-  test "admin can update user" do
-    user = find_record :user
-    changed_attribs = record_attributes_for :user_with_settings
-    account_settings = stub
-    account_settings.expects(:update).with(changed_attribs)
-    Account.expects(:new).with(user).returns(account_settings)
-
-    login :is_admin? => true
-    put :update, :user => changed_attribs, :id => user.id, :format => :json
-
-    assert_equal user, assigns[:user]
-    assert_response 204
-  end
-
-  test "user cannot update other user" do
-    user = find_record :user
-    login
-    put :update, id: user.id,
-      user: record_attributes_for(:user_with_settings),
-      :format => :json
-    assert_access_denied
-  end
-
-  test "should create new user" do
-    user_attribs = record_attributes_for :user
-    user = User.new(user_attribs)
-    Account.expects(:create).with(user_attribs).returns(user)
-
-    post :create, :user => user_attribs, :format => :json
-
-    assert_nil session[:user_id]
-    assert_json_response user
-    assert_response :success
-  end
-
-  test "should redirect to signup form on failed attempt" do
-    user_attribs = record_attributes_for :user
-    user_attribs.slice!('login')
-    user = User.new(user_attribs)
-    assert !user.valid?
-    Account.expects(:create).with(user_attribs).returns(user)
-
-    post :create, :user => user_attribs, :format => :json
-
-    assert_json_error user.errors.messages
-    assert_response 422
-  end
-
-  test "admin can autocomplete users" do
-    login :is_admin? => true
-    get :index, :query => 'a', :format => :json
-
-    assert_response :success
-    assert assigns(:users)
-  end
-
-  test "create returns forbidden if registration is closed" do
-    user_attribs = record_attributes_for :user
-    with_config(allow_registration: false) do
-      post :create, :user => user_attribs, :format => :json
-      assert_response :forbidden
-    end
-  end
-
-  test "admin can show user" do
-    user = FactoryGirl.create :user
-    login :is_admin? => true
-    get :show, :id => 0, :login => user.login, :format => :json
-    assert_response :success
-    assert_json_response user
-    get :show, :id => user.id, :format => :json
-    assert_response :success
-    assert_json_response user
-    get :show, :id => "0", :format => :json
-    assert_response :not_found
-  end
-
-  test "normal users cannot show user" do
-    user = find_record :user
-    login
-    get :show, :id => 0, :login => user.login, :format => :json
-    assert_access_denied
-  end
-
-  test "api monitor auth can create and destroy test users" do
-    # should work even with registration off and/or invites required
-    with_config(allow_registration: false, invite_required: true) do
-      monitor_auth do
-        user_attribs = record_attributes_for :test_user
-        post :create, :user => user_attribs, :format => :json
-        assert_response :success
-        delete :destroy, :id => assigns(:user).id, :format => :json
-        assert_response :success
-      end
-    end
-  end
-
-  test "api monitor auth cannot create normal users" do
-    monitor_auth do
-      user_attribs = record_attributes_for :user
-      post :create, :user => user_attribs, :format => :json
-      assert_response :forbidden
-    end
-  end
-
-  test "api monitor auth cannot delete normal users" do
-    post :create, :user => record_attributes_for(:user), :format => :json
-    assert_response :success
-    normal_user_id = assigns(:user).id
-    monitor_auth do
-      delete :destroy, :id => normal_user_id, :format => :json
-      assert_response :forbidden
-    end
-  end
-
-end
diff --git a/test/integration/api/cert_test.rb b/test/integration/api/cert_test.rb
index 772901d..289d3c6 100644
--- a/test/integration/api/cert_test.rb
+++ b/test/integration/api/cert_test.rb
@@ -5,7 +5,7 @@ class CertTest < ApiIntegrationTest
 
   test "retrieve eip cert" do
     login
-    get '/1/cert', {}, RACK_ENV
+    get cert_url, {}, RACK_ENV
     assert_text_response
     assert_response_includes "BEGIN RSA PRIVATE KEY"
     assert_response_includes "END RSA PRIVATE KEY"
@@ -14,13 +14,13 @@ class CertTest < ApiIntegrationTest
   end
 
   test "fetching certs requires login by default" do
-    get '/1/cert', {}, RACK_ENV
+    get cert_url, {}, RACK_ENV
     assert_login_required
   end
 
   test "retrieve anonymous eip cert" do
     with_config allow_anonymous_certs: true do
-      get '/1/cert', {}, RACK_ENV
+      get cert_url, {}, RACK_ENV
       assert_text_response
       assert_response_includes "BEGIN RSA PRIVATE KEY"
       assert_response_includes "END RSA PRIVATE KEY"
@@ -28,4 +28,9 @@ class CertTest < ApiIntegrationTest
       assert_response_includes "END CERTIFICATE"
     end
   end
+
+  def cert_url
+    "/#{api_version}/cert"
+  end
+
 end
diff --git a/test/integration/api/signup_test.rb b/test/integration/api/signup_test.rb
index 7216496..dc24420 100644
--- a/test/integration/api/signup_test.rb
+++ b/test/integration/api/signup_test.rb
@@ -1,4 +1,4 @@
-require_relative '../../test_helper'
+require 'test_helper'
 require_relative 'srp_test'
 
 class SignupTest < SrpTest
diff --git a/test/integration/api/smtp_cert_test.rb b/test/integration/api/smtp_cert_test.rb
index 681d509..53382c1 100644
--- a/test/integration/api/smtp_cert_test.rb
+++ b/test/integration/api/smtp_cert_test.rb
@@ -11,7 +11,7 @@ class SmtpCertTest < ApiIntegrationTest
   test "retrieve smtp cert" do
     @user = FactoryGirl.create :user, effective_service_level_code: 2, :invite_code => @testcode.invite_code
     login
-    post '/1/smtp_cert', {}, RACK_ENV
+    post smtp_cert_url, {}, RACK_ENV
     assert_text_response
     assert_response_includes "BEGIN RSA PRIVATE KEY"
     assert_response_includes "END RSA PRIVATE KEY"
@@ -22,7 +22,7 @@ class SmtpCertTest < ApiIntegrationTest
   test "cert and key" do
     @user = FactoryGirl.create :user, effective_service_level_code: 2, :invite_code => @testcode.invite_code
     login
-    post '/1/smtp_cert', {}, RACK_ENV
+    post smtp_cert_url, {}, RACK_ENV
     assert_text_response
     cert = OpenSSL::X509::Certificate.new(get_response.body)
     key = OpenSSL::PKey::RSA.new(get_response.body)
@@ -34,7 +34,7 @@ class SmtpCertTest < ApiIntegrationTest
   test "fingerprint is stored with identity" do
     @user = FactoryGirl.create :user, effective_service_level_code: 2, :invite_code => @testcode.invite_code
     login
-    post '/1/smtp_cert', {}, RACK_ENV
+    post smtp_cert_url, {}, RACK_ENV
     assert_text_response
     cert = OpenSSL::X509::Certificate.new(get_response.body)
     fingerprint = OpenSSL::Digest::SHA1.hexdigest(cert.to_der).scan(/../).join(':')
@@ -48,14 +48,18 @@ class SmtpCertTest < ApiIntegrationTest
   test "fetching smtp certs requires email account" do
 
     login
-    post '/1/smtp_cert', {}, RACK_ENV
+    post smtp_cert_url, {}, RACK_ENV
     assert_access_denied
   end
 
   test "no anonymous smtp certs" do
     with_config allow_anonymous_certs: true do
-      post '/1/smtp_cert', {}, RACK_ENV
+      post smtp_cert_url, {}, RACK_ENV
       assert_login_required
     end
   end
+
+  def smtp_cert_url
+    "/#{api_version}/smtp_cert"
+  end
 end
diff --git a/test/integration/api/srp_test.rb b/test/integration/api/srp_test.rb
index 463abcd..b9605f9 100644
--- a/test/integration/api/srp_test.rb
+++ b/test/integration/api/srp_test.rb
@@ -14,7 +14,7 @@ class SrpTest < RackTest
 
   # this test wraps the api and implements the interface the ruby-srp client.
   def handshake(login, aa)
-    post "http://api.lvh.me:3000/1/sessions.json",
+    post api_url("sessions.json"),
       :login => login,
       'A' => aa,
       :format => :json
@@ -27,7 +27,7 @@ class SrpTest < RackTest
   end
 
   def validate(m)
-    put "http://api.lvh.me:3000/1/sessions/" + @login + '.json',
+    put api_url("sessions/#{@login}.json"),
       :client_auth => m,
       :format => :json
     return JSON.parse(last_response.body)
@@ -39,7 +39,7 @@ class SrpTest < RackTest
 
   def register_user(login = "integration_test", password = 'srp, verify me!', invite_code = @testcode.invite_code)
     cleanup_user(login)
-    post 'http://api.lvh.me:3000/1/users.json',
+    post api_url('users.json'),
       user_params(login: login, password: password, invite_code: invite_code)
     assert(@user = User.find_by_login(login), 'user should have been created: %s' % last_response_errors)
     @login = login
@@ -47,7 +47,7 @@ class SrpTest < RackTest
   end
 
   def update_user(params)
-    put "http://api.lvh.me:3000/1/users/" + @user.id + '.json',
+    put api_url("users/#{@user.id}.json"),
       user_params(params),
       auth_headers
   end
@@ -68,7 +68,7 @@ class SrpTest < RackTest
   end
 
   def logout(params=nil, headers=nil)
-    delete "http://api.lvh.me:3000/1/logout.json",
+    delete api_url("logout.json"),
       params || {format: :json},
       headers || auth_headers
   end
@@ -112,4 +112,12 @@ class SrpTest < RackTest
   rescue
     ""
   end
+
+  def api_url(path)
+    "http://api.lvh.me:3000/#{api_version}/#{path}"
+  end
+
+  def api_version
+    2
+  end
 end
diff --git a/test/integration/api/token_auth_test.rb b/test/integration/api/token_auth_test.rb
index 3b83f23..7b20b00 100644
--- a/test/integration/api/token_auth_test.rb
+++ b/test/integration/api/token_auth_test.rb
@@ -1,4 +1,4 @@
-require_relative '../../test_helper'
+require 'test_helper'
 require_relative 'srp_test'
 
 class TokenAuthTest < SrpTest
diff --git a/test/integration/api/update_account_test.rb b/test/integration/api/update_account_test.rb
index 16bbb8c..1492006 100644
--- a/test/integration/api/update_account_test.rb
+++ b/test/integration/api/update_account_test.rb
@@ -14,7 +14,7 @@ class UpdateAccountTest < SrpTest
 
   test "require token" do
     authenticate
-    put "http://api.lvh.me:3000/1/users/" + @user.id + '.json',
+    put "http://api.lvh.me:3000/2/users/" + @user.id + '.json',
       user_params(password: "No! Verify me instead.")
     assert_login_required
   end
diff --git a/test/integration/browser/account_livecycle_test.rb.orig b/test/integration/browser/account_livecycle_test.rb.orig
new file mode 100644
index 0000000..d1f800b
--- /dev/null
+++ b/test/integration/browser/account_livecycle_test.rb.orig
@@ -0,0 +1,153 @@
+require 'test_helper'
+
+class AccountLivecycleTest < BrowserIntegrationTest
+
+  teardown do
+    Identity.destroy_all_orphaned
+  end
+
+  test "signup successfully when invited" do
+    username, password = submit_signup
+    assert page.has_content?("Welcome #{username}")
+    click_on 'Log Out'
+    assert page.has_content?("Log In")
+    assert_equal '/', current_path
+    assert user = User.find_by_login(username)
+    user.account.destroy
+  end
+
+  test "signup successfully without invitation" do
+    with_config invite_required: false do
+
+      username ||= "test_#{SecureRandom.urlsafe_base64}".downcase
+      password ||= SecureRandom.base64
+
+      visit '/users/new'
+      fill_in 'Username', with: username
+      fill_in 'Password', with: password
+      fill_in 'Password confirmation', with: password
+      click_on 'Sign Up'
+
+      assert page.has_content?("Welcome #{username}")
+    end
+  end
+
+  test "signup with username ending in dot json" do
+    username = Faker::Internet.user_name + '.json'
+    submit_signup username
+    assert page.has_content?("Welcome #{username}")
+  end
+
+  test "signup with reserved username" do
+    username = 'certmaster'
+    submit_signup username
+    assert page.has_content?("is reserved.")
+  end
+
+  test "successful login" do
+    username, password = submit_signup
+    click_on 'Log Out'
+    attempt_login(username, password)
+    assert page.has_content?("Welcome #{username}")
+    within('.sidenav li.active') do
+      assert page.has_content?("Overview")
+    end
+    User.find_by_login(username).account.destroy
+  end
+
+  test "failed login" do
+    visit '/'
+    attempt_login("username", "wrong password")
+    assert_invalid_login(page)
+  end
+
+  test "account destruction" do
+    username, password = submit_signup
+
+    click_on I18n.t('account_settings')
+    click_on I18n.t('destroy_my_account')
+    assert page.has_content?(I18n.t('account_destroyed'))
+    assert_equal 1, Identity.by_address.key("#{username}@test.me").count
+    attempt_login(username, password)
+    assert_invalid_login(page)
+  end
+
+  test "handle blocked after account destruction" do
+    username, password = submit_signup
+    click_on I18n.t('account_settings')
+    click_on I18n.t('destroy_my_account')
+    submit_signup(username)
+    assert page.has_content?('has already been taken')
+  end
+
+  test "change pgp key" do
+    with_config user_actions: ['change_pgp_key'] do
+      pgp_key = FactoryGirl.build :pgp_key
+      login
+      click_on "Account Settings"
+      within('#update_pgp_key') do
+        fill_in 'Public key', with: pgp_key
+        click_on 'Save'
+      end
+      page.assert_selector 'input[value="Saving..."]'
+      # at some point we're done:
+      page.assert_no_selector 'input[value="Saving..."]'
+      assert page.has_field? 'Public key', with: pgp_key.to_s
+      @user.reload
+      assert_equal pgp_key, @user.public_key
+    end
+  end
+
+<<<<<<< HEAD:test/integration/browser/account_livecycle_test.rb
+=======
+
+  # trying to seed an invalid A for srp login
+  test "detects attempt to circumvent SRP" do
+    InviteCodeValidator.any_instance.stubs(:validate)
+
+    user = FactoryGirl.create :user
+    visit '/login'
+    fill_in 'Username', with: user.login
+    fill_in 'Password', with: "password"
+    inject_malicious_js
+    click_on 'Log In'
+    assert page.has_content?("Invalid random key")
+    assert page.has_no_content?("Welcome")
+    user.destroy
+  end
+
+  test "reports internal server errors" do
+    Api::UsersController.any_instance.stubs(:create).raises
+    submit_signup
+    assert page.has_content?("server failed")
+  end
+
+  test "does not render signup form without js" do
+    Capybara.current_driver = :rack_test # no js
+    visit '/signup'
+    assert page.has_no_content?("Username")
+    assert page.has_no_content?("Password")
+  end
+
+  test "does not render login form without js" do
+    Capybara.current_driver = :rack_test # no js
+    visit '/login'
+    assert page.has_no_content?("Username")
+    assert page.has_no_content?("Password")
+  end
+
+>>>>>>> api: allow version bumping - bump to 2:test/integration/browser/account_test.rb
+  def attempt_login(username, password)
+    click_on 'Log In'
+    fill_in 'Username', with: username
+    fill_in 'Password', with: password
+    click_on 'Log In'
+  end
+
+  def assert_invalid_login(page)
+    assert page.has_selector? '.btn-primary.disabled'
+    assert page.has_content? I18n.t(:invalid_user_pass)
+    assert page.has_no_selector? '.btn-primary.disabled'
+  end
+
+end
diff --git a/test/integration/browser/security_test.rb b/test/integration/browser/security_test.rb
index c13acd8..825d50b 100644
--- a/test/integration/browser/security_test.rb
+++ b/test/integration/browser/security_test.rb
@@ -22,7 +22,7 @@ class SecurityTest < BrowserIntegrationTest
   end
 
   test "reports internal server errors" do
-    V1::UsersController.any_instance.stubs(:create).raises
+    Api::UsersController.any_instance.stubs(:create).raises
     submit_signup
     assert page.has_content?("server failed")
   end
diff --git a/test/support/api_integration_test.rb b/test/support/api_integration_test.rb
index 3b3481b..cea480c 100644
--- a/test/support/api_integration_test.rb
+++ b/test/support/api_integration_test.rb
@@ -3,6 +3,10 @@ class ApiIntegrationTest < ActionDispatch::IntegrationTest
   DUMMY_TOKEN = Token.new
   RACK_ENV = {'HTTP_AUTHORIZATION' => %Q(Token token="#{DUMMY_TOKEN.to_s}")}
 
+  def api_version
+    2
+  end
+
   setup do
     @testcode = InviteCode.new
     @testcode.save!
-- 
cgit v1.2.3


From 83f59164fc069f2593cf6babbc18638d9a68c9a3 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Wed, 18 May 2016 20:21:04 +0200
Subject: features for API version 2 - keep old ones

Now we test both api versions. We want this for backwards compatibility.
---
 app/controllers/api/configs_controller.rb |  6 +++-
 features/1/anonymous.feature              | 34 ++++++++++++++++++
 features/1/authentication.feature         | 24 +++++++++++++
 features/1/config.feature                 | 58 +++++++++++++++++++++++++++++++
 features/1/service.feature                | 33 ++++++++++++++++++
 features/1/unauthenticated.feature        | 31 +++++++++++++++++
 features/anonymous.feature                |  8 ++---
 features/authentication.feature           |  4 +--
 features/config.feature                   | 16 ++++-----
 features/service.feature                  |  4 +--
 features/support/hooks.rb                 |  4 +--
 features/unauthenticated.feature          | 10 +++---
 12 files changed, 208 insertions(+), 24 deletions(-)
 create mode 100644 features/1/anonymous.feature
 create mode 100644 features/1/authentication.feature
 create mode 100644 features/1/config.feature
 create mode 100644 features/1/service.feature
 create mode 100644 features/1/unauthenticated.feature

diff --git a/app/controllers/api/configs_controller.rb b/app/controllers/api/configs_controller.rb
index 55ceb4f..0f9b8a6 100644
--- a/app/controllers/api/configs_controller.rb
+++ b/app/controllers/api/configs_controller.rb
@@ -21,7 +21,11 @@ class Api::ConfigsController < ApiController
   }
 
   def service_paths
-    Hash[SERVICE_IDS.map{|k,v| [k,"/1/configs/#{v}.json"] } ]
+    Hash[SERVICE_IDS.map{|k,v| [k,"/#{api_version}/configs/#{v}.json"] } ]
+  end
+
+  def api_version
+    ["1", "2"].include?(params[:version]) ? params[:version] : "2"
   end
 
   def sanitize_id
diff --git a/features/1/anonymous.feature b/features/1/anonymous.feature
new file mode 100644
index 0000000..73a6d3f
--- /dev/null
+++ b/features/1/anonymous.feature
@@ -0,0 +1,34 @@
+@config
+Feature: Anonymous access to EIP
+
+  A provider may choose to allow anonymous access to EIP.
+  In this case some endpoints that would normally require authentication
+  will be available without authentication.
+
+  Background: 
+    Given "allow_anonymous_certs" is enabled in the config
+    And I set headers:
+      | Accept       | application/json |
+      | Content-Type | application/json |
+
+  Scenario: Fetch configs when anonymous certs are allowed
+    When I send a GET request to "/1/configs.json"
+    Then the response status should be "200"
+
+  Scenario: Fetch EIP config when anonymous certs are allowed
+    Given there is a config for the eip
+    When I send a GET request to "/1/configs/eip-service.json"
+    Then the response status should be "200"
+
+  Scenario: Fetch service description
+    When I send a GET request to "/1/service.json"
+    Then the response status should be "200"
+    And the response should be:
+    """
+      {
+        "name": "anonymous",
+        "description": "anonymous access to the VPN",
+        "eip_rate_limit": false
+      }
+    """
+
diff --git a/features/1/authentication.feature b/features/1/authentication.feature
new file mode 100644
index 0000000..52b562f
--- /dev/null
+++ b/features/1/authentication.feature
@@ -0,0 +1,24 @@
+Feature: Authentication
+
+  Authentication is handled with SRP. Once the SRP handshake has been successful a token will be transmitted. This token is used to authenticate further requests.
+
+  In the scenarios MY_AUTH_TOKEN will serve as a placeholder for the actual token received.
+
+  Background:
+    Given I set headers:
+      | Accept        | application/json |
+      | Content-Type  | application/json |
+
+  Scenario: Submitting a valid token
+    Given I authenticated
+    And I set headers:
+      | Authorization | Token token="MY_AUTH_TOKEN" |
+    When I send a GET request to "/1/configs.json"
+    Then the response status should be "200"
+
+  Scenario: Submitting an invalid token
+    Given I authenticated
+    And I set headers:
+      | Authorization | Token token="InvalidToken" |
+    When I send a GET request to "/1/configs.json"
+    Then the response status should be "401"
diff --git a/features/1/config.feature b/features/1/config.feature
new file mode 100644
index 0000000..ff04e9d
--- /dev/null
+++ b/features/1/config.feature
@@ -0,0 +1,58 @@
+Feature: Download Provider Configuration
+
+  The LEAP Provider exposes parts of its configuration through the API.
+
+  This can be used to find out about services offered. The big picture can be retrieved from `/provider.json`. Which is available without authentication (see unauthenticated.feature).
+
+  More detailed settings of the services are available after authentication. You can get a list of the available settings from `/1/configs.json`.
+
+  Background:
+    Given I authenticated
+    Given I set headers:
+      | Accept       | application/json |
+      | Content-Type | application/json |
+      | Authorization | Token token="MY_AUTH_TOKEN" |
+
+  @tempfile
+  Scenario: Fetch provider config
+    Given there is a config for the provider
+    When I send a GET request to "/provider.json"
+    Then the response status should be "200"
+    And the response should be that config
+
+  Scenario: Missing provider config
+    When I send a GET request to "/provider.json"
+    Then the response status should be "404"
+    And the response should have "error" with "not_found"
+
+  Scenario: Fetch list of available configs
+    When I send a GET request to "/1/configs.json"
+    Then the response status should be "200"
+    And the response should be:
+      """
+      {
+        "services": {
+          "soledad": "/1/configs/soledad-service.json",
+          "eip": "/1/configs/eip-service.json",
+          "smtp": "/1/configs/smtp-service.json"
+        }
+      }
+      """
+
+  Scenario: Attempt to fetch an invalid config
+    When I send a GET request to "/1/configs/non-existing.json"
+    Then the response status should be "403"
+
+  # I am not sure what this test is about, that config is not
+  # actually missing.
+  #Scenario: Attempt to fetch a config that is missing on the server
+  #  When I send a GET request to "/1/configs/eip-service.json"
+  #  Then the response status should be "404"
+
+  @tempfile, @config
+  Scenario: Attempt to fetch the EIP config
+    Given there is a config for the eip
+    When I send a GET request to "/1/configs/eip-service.json"
+    Then the response status should be "200"
+    And the response should be that config
+
diff --git a/features/1/service.feature b/features/1/service.feature
new file mode 100644
index 0000000..ea49c74
--- /dev/null
+++ b/features/1/service.feature
@@ -0,0 +1,33 @@
+Feature: Get service description for current user
+
+  The LEAP provider can offer different services and their availability may
+  depend upon a users service level - so wether they are paying or not.
+
+  The /1/service endpoint allows the client to find out about the services
+  available to the authenticated user.
+
+  Background:
+    Given I authenticated
+    Given I set headers:
+      | Accept       | application/json |
+      | Content-Type | application/json |
+      | Authorization | Token token="MY_AUTH_TOKEN" |
+
+  Scenario: Get service settings
+    When I send a GET request to "/1/service"
+    Then the response status should be "200"
+    And the response should be:
+    """
+      {
+        "name": "free",
+        "description": "free account, with rate limited VPN",
+        "eip_rate_limit": true,
+        "storage": 100,
+        "services": [
+          "eip"
+        ]
+      }
+   """
+
+
+
diff --git a/features/1/unauthenticated.feature b/features/1/unauthenticated.feature
new file mode 100644
index 0000000..aea7117
--- /dev/null
+++ b/features/1/unauthenticated.feature
@@ -0,0 +1,31 @@
+Feature: Unauthenticated API endpoints
+
+  Most of the LEAP Provider API requires authentication.
+  However there are a few exceptions - mostly prerequisits of authenticating. This feature and the authentication feature document these.
+
+  Background:
+    Given I set headers:
+      | Accept       | application/json |
+      | Content-Type | application/json |
+
+  @tempfile
+  Scenario: Fetch provider config
+    Given there is a config for the provider
+    When I send a GET request to "/provider.json"
+    Then the response status should be "200"
+    And the response should be that config
+
+  Scenario: Authentication required response
+    When I send a GET request to "/1/configs"
+    Then the response status should be "401"
+    And the response should have "error" with "not_authorized_login"
+    And the response should have "message"
+
+  Scenario: Authentication required for all other API endpoints (incomplete)
+    Given I am not logged in
+    When I send requests to these endpoints:
+      |  GET   | /1/configs                |
+      |  GET   | /1/configs/config_id.json |
+      |  GET   | /1/service                |
+      | DELETE | /1/logout                 |
+    Then they should require authentication
diff --git a/features/anonymous.feature b/features/anonymous.feature
index 73a6d3f..d6b3ce2 100644
--- a/features/anonymous.feature
+++ b/features/anonymous.feature
@@ -5,23 +5,23 @@ Feature: Anonymous access to EIP
   In this case some endpoints that would normally require authentication
   will be available without authentication.
 
-  Background: 
+  Background:
     Given "allow_anonymous_certs" is enabled in the config
     And I set headers:
       | Accept       | application/json |
       | Content-Type | application/json |
 
   Scenario: Fetch configs when anonymous certs are allowed
-    When I send a GET request to "/1/configs.json"
+    When I send a GET request to "/2/configs.json"
     Then the response status should be "200"
 
   Scenario: Fetch EIP config when anonymous certs are allowed
     Given there is a config for the eip
-    When I send a GET request to "/1/configs/eip-service.json"
+    When I send a GET request to "/2/configs/eip-service.json"
     Then the response status should be "200"
 
   Scenario: Fetch service description
-    When I send a GET request to "/1/service.json"
+    When I send a GET request to "/2/service.json"
     Then the response status should be "200"
     And the response should be:
     """
diff --git a/features/authentication.feature b/features/authentication.feature
index 52b562f..806e2b7 100644
--- a/features/authentication.feature
+++ b/features/authentication.feature
@@ -13,12 +13,12 @@ Feature: Authentication
     Given I authenticated
     And I set headers:
       | Authorization | Token token="MY_AUTH_TOKEN" |
-    When I send a GET request to "/1/configs.json"
+    When I send a GET request to "/2/configs.json"
     Then the response status should be "200"
 
   Scenario: Submitting an invalid token
     Given I authenticated
     And I set headers:
       | Authorization | Token token="InvalidToken" |
-    When I send a GET request to "/1/configs.json"
+    When I send a GET request to "/2/configs.json"
     Then the response status should be "401"
diff --git a/features/config.feature b/features/config.feature
index ff04e9d..bd627de 100644
--- a/features/config.feature
+++ b/features/config.feature
@@ -4,7 +4,7 @@ Feature: Download Provider Configuration
 
   This can be used to find out about services offered. The big picture can be retrieved from `/provider.json`. Which is available without authentication (see unauthenticated.feature).
 
-  More detailed settings of the services are available after authentication. You can get a list of the available settings from `/1/configs.json`.
+  More detailed settings of the services are available after authentication. You can get a list of the available settings from `/2/configs.json`.
 
   Background:
     Given I authenticated
@@ -26,33 +26,33 @@ Feature: Download Provider Configuration
     And the response should have "error" with "not_found"
 
   Scenario: Fetch list of available configs
-    When I send a GET request to "/1/configs.json"
+    When I send a GET request to "/2/configs.json"
     Then the response status should be "200"
     And the response should be:
       """
       {
         "services": {
-          "soledad": "/1/configs/soledad-service.json",
-          "eip": "/1/configs/eip-service.json",
-          "smtp": "/1/configs/smtp-service.json"
+          "soledad": "/2/configs/soledad-service.json",
+          "eip": "/2/configs/eip-service.json",
+          "smtp": "/2/configs/smtp-service.json"
         }
       }
       """
 
   Scenario: Attempt to fetch an invalid config
-    When I send a GET request to "/1/configs/non-existing.json"
+    When I send a GET request to "/2/configs/non-existing.json"
     Then the response status should be "403"
 
   # I am not sure what this test is about, that config is not
   # actually missing.
   #Scenario: Attempt to fetch a config that is missing on the server
-  #  When I send a GET request to "/1/configs/eip-service.json"
+  #  When I send a GET request to "/2/configs/eip-service.json"
   #  Then the response status should be "404"
 
   @tempfile, @config
   Scenario: Attempt to fetch the EIP config
     Given there is a config for the eip
-    When I send a GET request to "/1/configs/eip-service.json"
+    When I send a GET request to "/2/configs/eip-service.json"
     Then the response status should be "200"
     And the response should be that config
 
diff --git a/features/service.feature b/features/service.feature
index ea49c74..6244f6c 100644
--- a/features/service.feature
+++ b/features/service.feature
@@ -3,7 +3,7 @@ Feature: Get service description for current user
   The LEAP provider can offer different services and their availability may
   depend upon a users service level - so wether they are paying or not.
 
-  The /1/service endpoint allows the client to find out about the services
+  The /2/service endpoint allows the client to find out about the services
   available to the authenticated user.
 
   Background:
@@ -14,7 +14,7 @@ Feature: Get service description for current user
       | Authorization | Token token="MY_AUTH_TOKEN" |
 
   Scenario: Get service settings
-    When I send a GET request to "/1/service"
+    When I send a GET request to "/2/service"
     Then the response status should be "200"
     And the response should be:
     """
diff --git a/features/support/hooks.rb b/features/support/hooks.rb
index 256e5d8..4ddc77e 100644
--- a/features/support/hooks.rb
+++ b/features/support/hooks.rb
@@ -13,9 +13,9 @@ end
 After do |scenario|
   if scenario.failed?
     logfile_path = Rails.root + 'tmp'
-    logfile_path += "#{scenario.title.gsub(/\s/, '_')}.log"
+    logfile_path += "#{scenario.name.gsub(/\s/, '_')}.log"
     File.open(logfile_path, 'w') do |test_log|
-      test_log.puts scenario.title
+      test_log.puts scenario.name
       test_log.puts "========================="
       test_log.puts `tail log/test.log -n 200`
     end
diff --git a/features/unauthenticated.feature b/features/unauthenticated.feature
index aea7117..b4b0f55 100644
--- a/features/unauthenticated.feature
+++ b/features/unauthenticated.feature
@@ -16,7 +16,7 @@ Feature: Unauthenticated API endpoints
     And the response should be that config
 
   Scenario: Authentication required response
-    When I send a GET request to "/1/configs"
+    When I send a GET request to "/2/configs"
     Then the response status should be "401"
     And the response should have "error" with "not_authorized_login"
     And the response should have "message"
@@ -24,8 +24,8 @@ Feature: Unauthenticated API endpoints
   Scenario: Authentication required for all other API endpoints (incomplete)
     Given I am not logged in
     When I send requests to these endpoints:
-      |  GET   | /1/configs                |
-      |  GET   | /1/configs/config_id.json |
-      |  GET   | /1/service                |
-      | DELETE | /1/logout                 |
+      |  GET   | /2/configs                |
+      |  GET   | /2/configs/config_id.json |
+      |  GET   | /2/service                |
+      | DELETE | /2/logout                 |
     Then they should require authentication
-- 
cgit v1.2.3


From e542a3056c27fd662ef767b6720861035f6dbb1c Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Wed, 18 May 2016 21:00:42 +0200
Subject: api: set defaults for version in routes

This way we do not need to specify it all the times.

In the functional tests defaults do not get added automatically.
Introduced api_{get,put,post,delete} to add format and version default.

One to two functional tests failing, everything else passes.
---
 config/routes.rb                                  |  2 +-
 test/functional/api/certs_controller_test.rb      | 16 +++++-----
 test/functional/api/identities_controller_test.rb |  8 ++---
 test/functional/api/messages_controller_test.rb   | 14 ++++-----
 test/functional/api/services_controller_test.rb   |  8 ++---
 test/functional/api/sessions_controller_test.rb   | 12 +++----
 test/functional/api/smtp_certs_controller_test.rb | 10 +++---
 test/functional/api/token_auth_test.rb            |  8 ++---
 test/functional/api/users_controller_test.rb      | 38 +++++++++++------------
 test/support/api_controller_test.rb               | 29 +++++++++++++++++
 10 files changed, 87 insertions(+), 58 deletions(-)
 create mode 100644 test/support/api_controller_test.rb

diff --git a/config/routes.rb b/config/routes.rb
index a1a5b3c..7fbedf2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -26,7 +26,7 @@ LeapWeb::Application.routes.draw do
 
   namespace "api", { module: "api",
       path: "/:version/",
-      defaults: {format: 'json'},
+      defaults: {version: '2', format: 'json'},
       :constraints => { :id => /[^\/]+(?=\.json\z)|[^\/]+/, :version => /[12]/ }
       } do
     resources :sessions, :only => [:new, :create, :update]
diff --git a/test/functional/api/certs_controller_test.rb b/test/functional/api/certs_controller_test.rb
index 137ed92..f23b4c8 100644
--- a/test/functional/api/certs_controller_test.rb
+++ b/test/functional/api/certs_controller_test.rb
@@ -1,11 +1,11 @@
-require_relative '../../test_helper'
+require 'test_helper'
 
-class Api::CertsControllerTest < ActionController::TestCase
+class Api::CertsControllerTest < ApiControllerTest
 
   test "create unlimited cert without login" do
     with_config allow_anonymous_certs: true do
       cert = expect_cert('UNLIMITED')
-      post :create
+      api_post :create
       assert_response :success
       assert_equal cert.to_s, @response.body
     end
@@ -15,7 +15,7 @@ class Api::CertsControllerTest < ActionController::TestCase
     with_config allow_limited_certs: true do
       login
       cert = expect_cert('LIMITED')
-      post :create
+      api_post :create
       assert_response :success
       assert_equal cert.to_s, @response.body
     end
@@ -23,14 +23,14 @@ class Api::CertsControllerTest < ActionController::TestCase
 
   test "fail to create cert when disabled" do
     login :enabled? => false
-    post :create
+    api_post :create
     assert_access_denied
   end
 
   test "create unlimited cert" do
     login effective_service_level: ServiceLevel.new(id: 2)
     cert = expect_cert('UNLIMITED')
-    post :create
+    api_post :create
     assert_response :success
     assert_equal cert.to_s, @response.body
   end
@@ -38,13 +38,13 @@ class Api::CertsControllerTest < ActionController::TestCase
   test "GET still works as an alias" do
     login effective_service_level: ServiceLevel.new(id: 2)
     cert = expect_cert('UNLIMITED')
-    get :show
+    api_get :show
     assert_response :success
     assert_equal cert.to_s, @response.body
   end
 
   test "redirect if no eip service offered" do
-    post :create
+    api_post :create
     assert_response :redirect
   end
 
diff --git a/test/functional/api/identities_controller_test.rb b/test/functional/api/identities_controller_test.rb
index e803ee7..57345c8 100644
--- a/test/functional/api/identities_controller_test.rb
+++ b/test/functional/api/identities_controller_test.rb
@@ -1,15 +1,15 @@
 require_relative '../../test_helper'
 
-class Api::IdentitiesControllerTest < ActionController::TestCase
+class Api::IdentitiesControllerTest < ApiControllerTest
 
   test "api monitor can fetch identity" do
     monitor_auth do
       identity = FactoryGirl.create :identity
-      get :show, :id => identity.address, :format => 'json'
+      api_get :show, :id => identity.address, :format => 'json'
       assert_response :success
       assert_equal identity, assigns(:identity)
 
-      get :show, :id => "blahblahblah", :format => 'json'
+      api_get :show, :id => "blahblahblah", :format => 'json'
       assert_response :not_found
     end
   end
@@ -17,7 +17,7 @@ class Api::IdentitiesControllerTest < ActionController::TestCase
 
   test "anonymous cannot fetch identity" do
     identity = FactoryGirl.create :identity
-    get :show, :id => identity.address, :format => 'json'
+    api_get :show, :id => identity.address, :format => 'json'
     assert_response :forbidden
   end
 
diff --git a/test/functional/api/messages_controller_test.rb b/test/functional/api/messages_controller_test.rb
index 01641d4..e586980 100644
--- a/test/functional/api/messages_controller_test.rb
+++ b/test/functional/api/messages_controller_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class Api::MessagesControllerTest < ActionController::TestCase
+class Api::MessagesControllerTest < ApiControllerTest
 
   setup do
     @user = FactoryGirl.build(:user)
@@ -13,7 +13,7 @@ class Api::MessagesControllerTest < ActionController::TestCase
   test "get the motd" do
     with_config("customization_directory" => Rails.root+'test/files') do
       login @user
-      get :index, :locale => 'es'
+      api_get :index, :locale => 'es'
       body = JSON.parse(response.body)
       message1 = "<p>\"This\" is a <strong>very</strong> fine message. <a href=\"https://bitmask.net\">https://bitmask.net</a></p>\n"
       assert_equal 2, body.size, 'there should be two messages'
@@ -24,7 +24,7 @@ class Api::MessagesControllerTest < ActionController::TestCase
   test "get localized motd" do
     with_config("customization_directory" => Rails.root+'test/files') do
       login @user
-      get :index, :locale => 'de'
+      api_get :index, :locale => 'de'
       body = JSON.parse(response.body)
       message1 = "<p>Dies ist eine sehr feine Nachricht. <a href=\"https://bitmask.net\">https://bitmask.net</a></p>\n"
       assert_equal message1, body.first["text"], 'first message text should match files/motd/1.de.md'
@@ -33,7 +33,7 @@ class Api::MessagesControllerTest < ActionController::TestCase
 
   test "get empty motd" do
     login @user
-    get :index
+    api_get :index
     assert_equal "[]", response.body, "motd response should be empty if no motd directory exists"
   end
 
@@ -58,7 +58,7 @@ class Api::MessagesControllerTest < ActionController::TestCase
 
   test "get messages for user" do
     login @user
-    get :index
+    api_get :index
     assert response.body.include? @message.text
     assert response.body.include? @message.id
   end
@@ -78,7 +78,7 @@ class Api::MessagesControllerTest < ActionController::TestCase
     login @user
     put :update, :id => @message.id
     @message.reload
-    get :index
+    api_get :index
     assert !(response.body.include? @message.text)
     assert !(response.body.include? @message.id)
   end
@@ -91,7 +91,7 @@ class Api::MessagesControllerTest < ActionController::TestCase
  end
 
   test "fails if not authenticated" do
-    get :index, :format => :json
+    api_get :index, :format => :json
     assert_login_required
   end
 =end
diff --git a/test/functional/api/services_controller_test.rb b/test/functional/api/services_controller_test.rb
index b1dc9f3..cb85edf 100644
--- a/test/functional/api/services_controller_test.rb
+++ b/test/functional/api/services_controller_test.rb
@@ -1,16 +1,16 @@
 require 'test_helper'
 
-class Api::ServicesControllerTest < ActionController::TestCase
+class Api::ServicesControllerTest < ApiControllerTest
 
   test "anonymous user gets login required service info" do
-    get :show, format: :json
+    api_get :show, format: :json
     assert_json_response error: 'not_authorized_login',
       message: 'Please log in to perform that action.'
   end
 
   test "anonymous user gets vpn service info" do
     with_config allow_anonymous_certs: true do
-      get :show, format: :json
+      api_get :show, format: :json
       assert_json_response name: 'anonymous',
         eip_rate_limit: false,
         description: 'anonymous access to the VPN'
@@ -19,7 +19,7 @@ class Api::ServicesControllerTest < ActionController::TestCase
 
   test "user can see their service info" do
     login
-    get :show, format: :json
+    api_get :show, format: :json
     default_level = APP_CONFIG[:default_service_level]
     assert_json_response APP_CONFIG[:service_levels][default_level]
   end
diff --git a/test/functional/api/sessions_controller_test.rb b/test/functional/api/sessions_controller_test.rb
index 0633578..03a1ef9 100644
--- a/test/functional/api/sessions_controller_test.rb
+++ b/test/functional/api/sessions_controller_test.rb
@@ -3,7 +3,7 @@ require 'test_helper'
 # This is a simple controller unit test.
 # We're stubbing out both warden and srp.
 # There's an integration test testing the full rack stack and srp
-class Api::SessionsControllerTest < ActionController::TestCase
+class Api::SessionsControllerTest < ApiControllerTest
 
   setup do
     @request.env['HTTP_HOST'] = 'api.lvh.me'
@@ -12,7 +12,7 @@ class Api::SessionsControllerTest < ActionController::TestCase
   end
 
   test "renders json" do
-    get :new, :format => :json
+    api_get :new, :format => :json
     assert_response :success
     assert_json_error nil
   end
@@ -22,7 +22,7 @@ class Api::SessionsControllerTest < ActionController::TestCase
     strategy = stub :message => {:field => :translate_me}
     request.env['warden'].stubs(:winning_strategy).returns(strategy)
     I18n.expects(:t).with(:translate_me).at_least_once.returns("translation stub")
-    get :new, :format => :json
+    api_get :new, :format => :json
     assert_response 422
     assert_json_error :field => "translation stub"
   end
@@ -33,7 +33,7 @@ class Api::SessionsControllerTest < ActionController::TestCase
     request.env['warden'].expects(:authenticate!)
     # make sure we don't get a template missing error:
     @controller.stubs(:render)
-    post :create, :login => @user.login, 'A' => @client_hex
+    api_post :create, :login => @user.login, 'A' => @client_hex
   end
 
   test "should authenticate" do
@@ -42,7 +42,7 @@ class Api::SessionsControllerTest < ActionController::TestCase
     handshake = stub(:to_hash => {h: "ash"})
     session[:handshake] = handshake
 
-    post :update, :id => @user.login, :client_auth => @client_hex
+    api_post :update, :id => @user.login, :client_auth => @client_hex
 
     assert_nil session[:handshake]
     assert_response :success
@@ -55,7 +55,7 @@ class Api::SessionsControllerTest < ActionController::TestCase
   test "destroy should logout" do
     login
     expect_logout
-    delete :destroy
+    api_delete :destroy
     assert_response 204
   end
 
diff --git a/test/functional/api/smtp_certs_controller_test.rb b/test/functional/api/smtp_certs_controller_test.rb
index 2142675..393f090 100644
--- a/test/functional/api/smtp_certs_controller_test.rb
+++ b/test/functional/api/smtp_certs_controller_test.rb
@@ -1,17 +1,17 @@
 require 'test_helper'
 
-class Api::SmtpCertsControllerTest < ActionController::TestCase
+class Api::SmtpCertsControllerTest < ApiControllerTest
 
   test "no smtp cert without login" do
     with_config allow_anonymous_certs: true do
-      post :create
+      api_post :create
       assert_login_required
     end
   end
 
   test "require service level with email" do
     login
-    post :create
+    api_post :create
     assert_access_denied
   end
 
@@ -19,14 +19,14 @@ class Api::SmtpCertsControllerTest < ActionController::TestCase
     login effective_service_level: ServiceLevel.new(id: 2)
     cert = expect_cert(@current_user.email_address)
     cert.expects(:fingerprint).returns('fingerprint')
-    post :create
+    api_post :create
     assert_response :success
     assert_equal cert.to_s, @response.body
   end
 
   test "fail to create cert when disabled" do
     login :enabled? => false
-    post :create
+    api_post :create
     assert_access_denied
   end
 
diff --git a/test/functional/api/token_auth_test.rb b/test/functional/api/token_auth_test.rb
index 17a4775..c7f91c7 100644
--- a/test/functional/api/token_auth_test.rb
+++ b/test/functional/api/token_auth_test.rb
@@ -5,13 +5,13 @@
 
 require 'test_helper'
 
-class Api::TokenAuthTest < ActionController::TestCase
+class Api::TokenAuthTest < ApiControllerTest
   tests Api::ConfigsController
 
   def test_login_via_api_token
     with_config(:allow_anonymous_certs => false) do
       monitor_auth do
-        get :index
+        api_get :index
         assert assigns(:token), 'should have authenticated via api token'
         assert assigns(:token).is_a? ApiToken
         assert @controller.send(:current_user).is_a? ApiMonitorUser
@@ -26,10 +26,10 @@ class Api::TokenAuthTest < ActionController::TestCase
       with_config(new_config) do
         monitor_auth do
           request.env['REMOTE_ADDR'] = "1.1.1.1"
-          get :index
+          api_get :index
           assert_nil assigns(:token), "should not be able to auth with api token when ip restriction doesn't allow it"
           request.env['REMOTE_ADDR'] = allowed
-          get :index
+          api_get :index
           assert assigns(:token), "should have authenticated via api token"
         end
       end
diff --git a/test/functional/api/users_controller_test.rb b/test/functional/api/users_controller_test.rb
index bc2e312..32afd0a 100644
--- a/test/functional/api/users_controller_test.rb
+++ b/test/functional/api/users_controller_test.rb
@@ -1,6 +1,6 @@
-require_relative '../../test_helper'
+require 'test_helper'
 
-class Api::UsersControllerTest < ActionController::TestCase
+class Api::UsersControllerTest < ApiControllerTest
 
   test "user can change settings" do
     user = find_record :user
@@ -10,7 +10,7 @@ class Api::UsersControllerTest < ActionController::TestCase
     Account.expects(:new).with(user).returns(account_settings)
 
     login user
-    put :update, :user => changed_attribs, :id => user.id, :format => :json
+    api_put :update, :user => changed_attribs, :id => user.id, :format => :json
 
     assert_equal user, assigns[:user]
     assert_response 204
@@ -25,7 +25,7 @@ class Api::UsersControllerTest < ActionController::TestCase
     Account.expects(:new).with(user).returns(account_settings)
 
     login :is_admin? => true
-    put :update, :user => changed_attribs, :id => user.id, :format => :json
+    api_put :update, :user => changed_attribs, :id => user.id, :format => :json
 
     assert_equal user, assigns[:user]
     assert_response 204
@@ -34,7 +34,7 @@ class Api::UsersControllerTest < ActionController::TestCase
   test "user cannot update other user" do
     user = find_record :user
     login
-    put :update, id: user.id,
+    api_put :update, id: user.id,
       user: record_attributes_for(:user_with_settings),
       :format => :json
     assert_access_denied
@@ -45,7 +45,7 @@ class Api::UsersControllerTest < ActionController::TestCase
     user = User.new(user_attribs)
     Account.expects(:create).with(user_attribs).returns(user)
 
-    post :create, :user => user_attribs, :format => :json
+    api_post :create, :user => user_attribs, :format => :json
 
     assert_nil session[:user_id]
     assert_json_response user
@@ -59,7 +59,7 @@ class Api::UsersControllerTest < ActionController::TestCase
     assert !user.valid?
     Account.expects(:create).with(user_attribs).returns(user)
 
-    post :create, :user => user_attribs, :format => :json
+    api_post :create, :user => user_attribs, :format => :json
 
     assert_json_error user.errors.messages
     assert_response 422
@@ -67,7 +67,7 @@ class Api::UsersControllerTest < ActionController::TestCase
 
   test "admin can autocomplete users" do
     login :is_admin? => true
-    get :index, :query => 'a', :format => :json
+    api_get :index, :query => 'a', :format => :json
 
     assert_response :success
     assert assigns(:users)
@@ -76,7 +76,7 @@ class Api::UsersControllerTest < ActionController::TestCase
   test "create returns forbidden if registration is closed" do
     user_attribs = record_attributes_for :user
     with_config(allow_registration: false) do
-      post :create, :user => user_attribs, :format => :json
+      api_post :create, :user => user_attribs, :format => :json
       assert_response :forbidden
     end
   end
@@ -84,20 +84,20 @@ class Api::UsersControllerTest < ActionController::TestCase
   test "admin can show user" do
     user = FactoryGirl.create :user
     login :is_admin? => true
-    get :show, :id => 0, :login => user.login, :format => :json
+    api_get :show, :id => 0, :login => user.login, :format => :json
     assert_response :success
     assert_json_response user
-    get :show, :id => user.id, :format => :json
+    api_get :show, :id => user.id, :format => :json
     assert_response :success
     assert_json_response user
-    get :show, :id => "0", :format => :json
+    api_get :show, :id => "0", :format => :json
     assert_response :not_found
   end
 
   test "normal users cannot show user" do
     user = find_record :user
     login
-    get :show, :id => 0, :login => user.login, :format => :json
+    api_get :show, :id => 0, :login => user.login, :format => :json
     assert_access_denied
   end
 
@@ -106,9 +106,9 @@ class Api::UsersControllerTest < ActionController::TestCase
     with_config(allow_registration: false, invite_required: true) do
       monitor_auth do
         user_attribs = record_attributes_for :test_user
-        post :create, :user => user_attribs, :format => :json
+        api_post :create, :user => user_attribs, :format => :json
         assert_response :success
-        delete :destroy, :id => assigns(:user).id, :format => :json
+        api_delete :destroy, :id => assigns(:user).id, :format => :json
         assert_response :success
       end
     end
@@ -117,17 +117,17 @@ class Api::UsersControllerTest < ActionController::TestCase
   test "api monitor auth cannot create normal users" do
     monitor_auth do
       user_attribs = record_attributes_for :user
-      post :create, :user => user_attribs, :format => :json
+      api_post :create, :user => user_attribs, :format => :json
       assert_response :forbidden
     end
   end
 
-  test "api monitor auth cannot delete normal users" do
-    post :create, :user => record_attributes_for(:user), :format => :json
+  test "api monitor auth cannot api_delete normal users" do
+    api_post :create, :user => record_attributes_for(:user), :format => :json
     assert_response :success
     normal_user_id = assigns(:user).id
     monitor_auth do
-      delete :destroy, :id => normal_user_id, :format => :json
+      api_delete :destroy, :id => normal_user_id, :format => :json
       assert_response :forbidden
     end
   end
diff --git a/test/support/api_controller_test.rb b/test/support/api_controller_test.rb
new file mode 100644
index 0000000..06cb46a
--- /dev/null
+++ b/test/support/api_controller_test.rb
@@ -0,0 +1,29 @@
+class ApiControllerTest < ActionController::TestCase
+
+  def api_get(*args)
+    get *add_api_defaults(args)
+  end
+
+  def api_post(*args)
+    post *add_api_defaults(args)
+  end
+
+  def api_delete(*args)
+    delete *add_api_defaults(args)
+  end
+
+  def api_put(*args)
+    put *add_api_defaults(args)
+  end
+
+  def add_api_defaults(args)
+    add_defaults args, version: '2'
+  end
+
+  def add_defaults(args, defaults)
+    opts = args.extract_options!
+    opts.reverse_merge! defaults
+    args << opts
+    args
+  end
+end
-- 
cgit v1.2.3


From f20ecdfb249128ba79da069407dce32f6f7e2fca Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 20 May 2016 11:47:38 +0200
Subject: include engine tests in default test

---
 engines/support/test/integration/create_ticket_test.rb |  2 +-
 lib/tasks/test.rake                                    | 15 ++++++++++-----
 test/integration/navigation_test.rb                    |  9 ---------
 3 files changed, 11 insertions(+), 15 deletions(-)
 delete mode 100644 test/integration/navigation_test.rb

diff --git a/engines/support/test/integration/create_ticket_test.rb b/engines/support/test/integration/create_ticket_test.rb
index 00f9a6b..6abb3d3 100644
--- a/engines/support/test/integration/create_ticket_test.rb
+++ b/engines/support/test/integration/create_ticket_test.rb
@@ -29,7 +29,7 @@ class CreateTicketTest < BrowserIntegrationTest
     fill_in 'Description', with: 'description of the problem goes here'
     click_on 'Submit Ticket'
     assert page.has_content?("is invalid")
-    assert_equal 'invalid data', find_field('Email').value
+    assert_equal 'invaliddata', find_field('Email').value
     assert_equal 'some user', find_field('Regarding User').value
   end
 
diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake
index d96b625..9859729 100644
--- a/lib/tasks/test.rake
+++ b/lib/tasks/test.rake
@@ -1,10 +1,15 @@
 namespace :test do
 
-  [:units, :functionals, :integration].each do |type|
-    Rails::SubTestTask.new(type => "test:prepare") do |t|
-      t.libs << "test"
-      subdir = type.to_s.singularize
-      t.pattern = "engines/*/test/#{subdir}/**/*_test.rb"
+  namespace :engines do
+    [:units, :functionals, :integration].each do |type|
+      desc "Test engine #{type}"
+      Rails::TestTask.new(type => "test:prepare") do |t|
+        t.libs << "test"
+        subdir = type.to_s.singularize
+        t.pattern = "engines/*/test/#{subdir}/**/*_test.rb"
+      end
+      Rake::Task["test:#{type}"].enhance ["test:engines:#{type}"]
+      Rake::Task["test"].enhance ["test:engines:#{type}"]
     end
   end
 
diff --git a/test/integration/navigation_test.rb b/test/integration/navigation_test.rb
deleted file mode 100644
index eec8c0e..0000000
--- a/test/integration/navigation_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'test_helper'
-
-class NavigationTest < ActionDispatch::IntegrationTest
-
-  # test "the truth" do
-  #   assert true
-  # end
-end
-
-- 
cgit v1.2.3


From da00a2068ae8b6129384f06baafdc039bdaab003 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sat, 21 May 2016 06:48:31 +0200
Subject: tests: reset I18n.locale after locale_path_test

Otherwise this will mess up other tests.
---
 test/integration/locale_path_test.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/integration/locale_path_test.rb b/test/integration/locale_path_test.rb
index 738e7f5..22293dc 100644
--- a/test/integration/locale_path_test.rb
+++ b/test/integration/locale_path_test.rb
@@ -21,6 +21,11 @@ require 'test_helper'
 #
 
 class LocalePathTest < ActionDispatch::IntegrationTest
+
+  teardown do
+    I18n.locale = 'en'
+  end
+
   test "redirect if accept-language is not default locale" do
     get_via_redirect '/', {}, 'HTTP_ACCEPT_LANGUAGE' => 'de'
     assert_equal '/de', path
@@ -55,4 +60,4 @@ class LocalePathTest < ActionDispatch::IntegrationTest
     @controller.send(:default_url_options)
   end
 
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From b851fe2fd6e0029df81976b647ede7190a1fd547 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sun, 22 May 2016 21:11:48 +0200
Subject: make ticket tests pass without network connection

MX validations relied on network connection. Only using them
in production environment now. I want to be able to develop and
test when disconnected.
---
 engines/support/app/models/ticket.rb     | 4 +++-
 engines/support/test/unit/ticket_test.rb | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/engines/support/app/models/ticket.rb b/engines/support/app/models/ticket.rb
index 4615a10..025e2ab 100644
--- a/engines/support/app/models/ticket.rb
+++ b/engines/support/app/models/ticket.rb
@@ -37,9 +37,11 @@ class Ticket < CouchRest::Model::Base
 
   # email can be nil, "", or valid address.
   # validation provided by 'valid_email' gem.
+  # mx validation depends on network availability and is disabled in test
+  # and development environment
   validates :email, :allow_blank => true,
     :email => true,
-    :mx_with_fallback => true
+    :mx_with_fallback => Rails.env.production?
 
   def self.search(options = {})
     @selection = TicketSelection.new(options)
diff --git a/engines/support/test/unit/ticket_test.rb b/engines/support/test/unit/ticket_test.rb
index c2c5e11..373f06c 100644
--- a/engines/support/test/unit/ticket_test.rb
+++ b/engines/support/test/unit/ticket_test.rb
@@ -8,12 +8,12 @@ class TicketTest < ActiveSupport::TestCase
 
   test "ticket with default attribs is valid" do
     t = FactoryGirl.build :ticket
-    assert t.valid?
+    assert t.valid?, t.errors.full_messages.to_sentence
   end
 
   test "ticket without email is valid" do
     t = FactoryGirl.build :ticket, email: ""
-    assert t.valid?
+    assert t.valid?, t.errors.full_messages.to_sentence
   end
 
   test "ticket validates email format" do
-- 
cgit v1.2.3


From 0ba0eb633e8c24086405c53f3d8a8e747f3382e4 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sun, 22 May 2016 21:12:42 +0200
Subject: restrict user_params in user_controller

Actually this should live in a service_level_controller.
For now fix the security issue.
---
 app/controllers/users_controller.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1404b0e..225584f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -39,7 +39,7 @@ class UsersController < ApplicationController
 
   ## added so updating service level works, but not sure we will actually want this. also not sure that this is place to prevent user from updating own effective service level, but here as placeholder:
   def update
-    @user.update_attributes(params[:user]) unless (!admin? and params[:user][:effective_service_level])
+    @user.update_attributes(user_params)
     if @user.valid?
       flash[:notice] = I18n.t(:changes_saved)
     end
@@ -79,4 +79,11 @@ class UsersController < ApplicationController
     end
   end
 
+  def user_params
+    if admin?
+      params.require(:user).permit(:effective_service_level)
+    else
+      params.require(:user).permit(:password, :password_confirmation)
+    end
+  end
 end
-- 
cgit v1.2.3


From 7f0c42a5fa6d6c1952e53b9b73bad0202f746f3e Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 23 May 2016 11:59:41 +0200
Subject: cleanup: remove service level code from users_controller

There's no route to this right now and it also seems to be tested
nowhere. Since i am about to split up the users_controller let's
get rid of this and put it in the place we want it once we actually finish
the implementation
---
 app/controllers/users_controller.rb             | 11 +----------
 app/views/users/_change_service_level.html.haml | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 225584f..2816a64 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -8,7 +8,7 @@ class UsersController < ApplicationController
   before_filter :require_login, :except => [:new]
   before_filter :redirect_if_logged_in, :only => [:new]
   before_filter :require_admin, :only => [:index, :deactivate, :enable]
-  before_filter :fetch_user, :only => [:show, :edit, :update, :destroy, :deactivate, :enable]
+  before_filter :fetch_user, :only => [:show, :edit, :destroy, :deactivate, :enable]
   before_filter :require_registration_allowed, only: :new
 
   respond_to :html
@@ -37,15 +37,6 @@ class UsersController < ApplicationController
   def edit
   end
 
-  ## added so updating service level works, but not sure we will actually want this. also not sure that this is place to prevent user from updating own effective service level, but here as placeholder:
-  def update
-    @user.update_attributes(user_params)
-    if @user.valid?
-      flash[:notice] = I18n.t(:changes_saved)
-    end
-    respond_with @user, :location => edit_user_path(@user)
-  end
-
   def deactivate
     @user.account.disable
     flash[:notice] = I18n.t("actions.user_disabled_message", username: @user.username)
diff --git a/app/views/users/_change_service_level.html.haml b/app/views/users/_change_service_level.html.haml
index a2e9956..32ea8c0 100644
--- a/app/views/users/_change_service_level.html.haml
+++ b/app/views/users/_change_service_level.html.haml
@@ -1,8 +1,13 @@
--# TODO: probably won't want here, but here for now. Also, we will need way to ensure payment if they pick a non-free plan.
--#
--# SERVICE LEVEL
--#
-- if APP_CONFIG[:service_levels]
+:ruby
+  # DISABLED! this form points to a route that does not exist.
+  #   It's a draft for implementing service levels.
+  # TODO: probably won't want here, but here for now.
+  #       We will need way to ensure payment for a non-free plan.
+  #
+  # SERVICE LEVEL
+  #
+  #
+- if APP_CONFIG[:service_levels] && false
   - form_options = {:html => {:class => user_form_class('form-horizontal'), :id => 'update_service_level', :data => {token: session[:token]}}, :validate => true}
   = simple_form_for @user, form_options do |f|
     %legend= t(:service_level)
-- 
cgit v1.2.3


From f47fc9d6522886cf81cfea26ec1f396219c539ba Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 23 May 2016 12:17:31 +0200
Subject: move signup from users to account_controller

There was a lot of special case handling going on in the users_controller
for this. Lot simpler this way.
---
 app/controllers/account_controller.rb              | 17 ++++++++++++++
 app/controllers/users_controller.rb                | 14 +----------
 app/views/account/new.html.haml                    | 27 ++++++++++++++++++++++
 app/views/sessions/_warnings.html.haml             | 12 ++++++++++
 app/views/sessions/new.html.haml                   |  2 +-
 app/views/users/_warnings.html.haml                | 12 ----------
 app/views/users/new.html.haml                      | 27 ----------------------
 config/routes.rb                                   |  4 ++--
 test/functional/account_controller_test.rb         | 26 +++++++++++++++++++++
 test/functional/users_controller_test.rb           | 22 +-----------------
 test/integration/browser/account_livecycle_test.rb |  2 +-
 .../browser/password_validation_test.rb            |  8 +++----
 test/support/browser_integration_test.rb           |  4 ++--
 13 files changed, 94 insertions(+), 83 deletions(-)
 create mode 100644 app/controllers/account_controller.rb
 create mode 100644 app/views/account/new.html.haml
 create mode 100644 app/views/sessions/_warnings.html.haml
 delete mode 100644 app/views/users/_warnings.html.haml
 delete mode 100644 app/views/users/new.html.haml
 create mode 100644 test/functional/account_controller_test.rb

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
new file mode 100644
index 0000000..ee7cca4
--- /dev/null
+++ b/app/controllers/account_controller.rb
@@ -0,0 +1,17 @@
+class AccountController < ApplicationController
+
+  before_filter :require_registration_allowed
+  before_filter :redirect_if_logged_in
+
+  def new
+    @user = User.new
+  end
+
+  protected
+
+  def require_registration_allowed
+    unless APP_CONFIG[:allow_registration]
+      redirect_to home_path
+    end
+  end
+end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 2816a64..4d198b9 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -5,11 +5,9 @@
 class UsersController < ApplicationController
   include ControllerExtension::FetchUser
 
-  before_filter :require_login, :except => [:new]
-  before_filter :redirect_if_logged_in, :only => [:new]
+  before_filter :require_login
   before_filter :require_admin, :only => [:index, :deactivate, :enable]
   before_filter :fetch_user, :only => [:show, :edit, :destroy, :deactivate, :enable]
-  before_filter :require_registration_allowed, only: :new
 
   respond_to :html
 
@@ -27,10 +25,6 @@ class UsersController < ApplicationController
     @users = @users.limit(100)
   end
 
-  def new
-    @user = User.new
-  end
-
   def show
   end
 
@@ -64,12 +58,6 @@ class UsersController < ApplicationController
 
   protected
 
-  def require_registration_allowed
-    unless APP_CONFIG[:allow_registration]
-      redirect_to home_path
-    end
-  end
-
   def user_params
     if admin?
       params.require(:user).permit(:effective_service_level)
diff --git a/app/views/account/new.html.haml b/app/views/account/new.html.haml
new file mode 100644
index 0000000..d40259e
--- /dev/null
+++ b/app/views/account/new.html.haml
@@ -0,0 +1,27 @@
+-#
+-# This form is handled entirely by javascript
+-# Please take care when changing element ids.
+-#
+-# The form is hidden when no js is available
+-# to prevent submission in the clear.
+-#
+
+- form_options = {url: '/not-used', html: {id: 'new_user', class: user_form_class('form-horizontal'), style: 'display:none'}, validate: true}
+
+.col-md-1
+.col-md-9
+  %h2=t :signup
+  .lead=t :signup_info
+  = render "sessions/warnings"
+  = simple_form_for(@user, form_options) do |f|
+    = f.input :login, :label => t(:username), :required => false, :input_html => { :id => :srp_username }
+    = f.input :password, :label => t(:password), :required => false, :validate => true, :input_html => { :id => :srp_password }
+    = f.input :password_confirmation, :label => t(:password_confirmation), :required => false, :validate => true, :input_html => { :id => :srp_password_confirmation }
+
+    - if APP_CONFIG[:invite_required]
+      = f.input :invite_code, :label => t(:invite_code), :input_html => { :id => :srp_invite_code }
+    - else
+      = f.input :invite_code, :as => "hidden", :input_html => { :value => " ", :id => :srp_invite_code }
+
+    = f.button :wrapped, cancel: home_path
+-#
diff --git a/app/views/sessions/_warnings.html.haml b/app/views/sessions/_warnings.html.haml
new file mode 100644
index 0000000..baf80a4
--- /dev/null
+++ b/app/views/sessions/_warnings.html.haml
@@ -0,0 +1,12 @@
+%noscript
+  %div.alert.alert-error=t :js_required_html
+#cookie_warning.alert.alert-error{:style => "display:none"}
+  =t :cookie_disabled_warning
+:javascript
+  document.cookie = "testing=cookies_enabled; path=/";
+  if(document.cookie.indexOf("testing=cookies_enabled") < 0)
+  {
+    document.getElementById('cookie_warning').style.display = 'block';
+  } else {
+    document.getElementById('cookie_warning').style.display = 'none';
+  }
diff --git a/app/views/sessions/new.html.haml b/app/views/sessions/new.html.haml
index 942c485..6695123 100644
--- a/app/views/sessions/new.html.haml
+++ b/app/views/sessions/new.html.haml
@@ -2,7 +2,7 @@
 .col-md-9
   %h2=t :login
   .lead=t :login_info
-  = render :partial => 'users/warnings'
+  = render 'warnings'
   = simple_form_for [:api, @session], validate: true, html: { id: :new_session, class: 'form-horizontal hidden js-show', style: "display:none;" } do |f|
     = f.input :login, :required => false, :label => t(:username), :input_html => { :id => :srp_username }
     = f.input :password, :required => false, :input_html => { :id => :srp_password }
diff --git a/app/views/users/_warnings.html.haml b/app/views/users/_warnings.html.haml
deleted file mode 100644
index baf80a4..0000000
--- a/app/views/users/_warnings.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-%noscript
-  %div.alert.alert-error=t :js_required_html
-#cookie_warning.alert.alert-error{:style => "display:none"}
-  =t :cookie_disabled_warning
-:javascript
-  document.cookie = "testing=cookies_enabled; path=/";
-  if(document.cookie.indexOf("testing=cookies_enabled") < 0)
-  {
-    document.getElementById('cookie_warning').style.display = 'block';
-  } else {
-    document.getElementById('cookie_warning').style.display = 'none';
-  }
diff --git a/app/views/users/new.html.haml b/app/views/users/new.html.haml
deleted file mode 100644
index 1b257d9..0000000
--- a/app/views/users/new.html.haml
+++ /dev/null
@@ -1,27 +0,0 @@
--#
--# This form is handled entirely by javascript
--# Please take care when changing element ids.
--# 
--# The form is hidden when no js is available 
--# to prevent submission in the clear.
--#
-
-- form_options = {url: '/not-used', html: {id: 'new_user', class: user_form_class('form-horizontal'), style: 'display:none'}, validate: true}
-
-.col-md-1
-.col-md-9
-  %h2=t :signup
-  .lead=t :signup_info
-  = render :partial => 'warnings'
-  = simple_form_for(@user, form_options) do |f|
-    = f.input :login, :label => t(:username), :required => false, :input_html => { :id => :srp_username }
-    = f.input :password, :label => t(:password), :required => false, :validate => true, :input_html => { :id => :srp_password }
-    = f.input :password_confirmation, :label => t(:password_confirmation), :required => false, :validate => true, :input_html => { :id => :srp_password_confirmation }
-
-    - if APP_CONFIG[:invite_required]
-      = f.input :invite_code, :label => t(:invite_code), :input_html => { :id => :srp_invite_code }
-    - else
-      = f.input :invite_code, :as => "hidden", :input_html => { :value => " ", :id => :srp_invite_code }
-
-    = f.button :wrapped, cancel: home_path
--#
diff --git a/config/routes.rb b/config/routes.rb
index 7fbedf2..b152c9c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -44,8 +44,8 @@ LeapWeb::Application.routes.draw do
     get "login" => "sessions#new", :as => "login"
     delete "logout" => "sessions#destroy", :as => "logout"
 
-    get "signup" => "users#new", :as => "signup"
-    resources :users, :except => [:create, :update] do
+    get "signup" => "account#new", :as => "signup"
+    resources :users, :except => [:new, :create, :update] do
       # resource :email_settings, :only => [:edit, :update]
       # resources :email_aliases, :only => [:destroy], :id => /.*/
       post 'deactivate', on: :member
diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
new file mode 100644
index 0000000..f5f1446
--- /dev/null
+++ b/test/functional/account_controller_test.rb
@@ -0,0 +1,26 @@
+require 'test_helper'
+
+class AccountControllerTest < ActionController::TestCase
+
+  test "should get new" do
+    get :new
+    assert_equal User, assigns(:user).class
+    assert_response :success
+  end
+
+  test "new should redirect logged in users" do
+    login
+    get :new
+    assert_response :redirect
+    assert_redirected_to home_path
+  end
+
+  test "new redirects if registration is closed" do
+    with_config(allow_registration: false) do
+      get :new
+      assert_response :redirect
+      assert_redirected_to home_path
+    end
+  end
+end
+
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index 6029c83..2794422 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -1,20 +1,7 @@
-require_relative '../test_helper'
+require 'test_helper'
 
 class UsersControllerTest < ActionController::TestCase
 
-  test "should get new" do
-    get :new
-    assert_equal User, assigns(:user).class
-    assert_response :success
-  end
-
-  test "new should redirect logged in users" do
-    login
-    get :new
-    assert_response :redirect
-    assert_redirected_to home_path
-  end
-
   test "failed show without login" do
     user = find_record :user
     get :show, :id => user.id
@@ -163,11 +150,4 @@ class UsersControllerTest < ActionController::TestCase
     assert !assigns(:user).enabled?
   end
 
-  test "new redirects if registration is closed" do
-    with_config(allow_registration: false) do
-      get :new
-      assert_response :redirect
-      assert_redirected_to home_path
-    end
-  end
 end
diff --git a/test/integration/browser/account_livecycle_test.rb b/test/integration/browser/account_livecycle_test.rb
index 604f456..85dbf13 100644
--- a/test/integration/browser/account_livecycle_test.rb
+++ b/test/integration/browser/account_livecycle_test.rb
@@ -22,7 +22,7 @@ class AccountLivecycleTest < BrowserIntegrationTest
       username ||= "test_#{SecureRandom.urlsafe_base64}".downcase
       password ||= SecureRandom.base64
 
-      visit '/users/new'
+      visit '/signup'
       fill_in 'Username', with: username
       fill_in 'Password', with: password
       fill_in 'Password confirmation', with: password
diff --git a/test/integration/browser/password_validation_test.rb b/test/integration/browser/password_validation_test.rb
index 45eb0bf..51fcc5d 100644
--- a/test/integration/browser/password_validation_test.rb
+++ b/test/integration/browser/password_validation_test.rb
@@ -5,26 +5,26 @@ class PasswordValidationTest < BrowserIntegrationTest
   test "password confirmation is validated" do
     username ||= "test_#{SecureRandom.urlsafe_base64}".downcase
     password ||= SecureRandom.base64
-    visit '/users/new'
+    visit '/signup'
     fill_in 'Username', with: username
     fill_in 'Password', with: password
     fill_in 'Password confirmation', with: password + "-typo"
     click_on 'Sign Up'
     assert page.has_content? "does not match."
-    assert_equal '/users/new', current_path
+    assert_equal '/signup', current_path
     assert page.has_selector? ".error #srp_password_confirmation"
   end
 
   test "password needs to be at least 8 chars long" do
     username ||= "test_#{SecureRandom.urlsafe_base64}".downcase
     password ||= SecureRandom.base64[0,7]
-    visit '/users/new'
+    visit '/signup'
     fill_in 'Username', with: username
     fill_in 'Password', with: password
     fill_in 'Password confirmation', with: password
     click_on 'Sign Up'
     assert page.has_content? "needs to be at least 8 characters long"
-    assert_equal '/users/new', current_path
+    assert_equal '/signup', current_path
     assert page.has_selector? ".error #srp_password"
   end
 end
diff --git a/test/support/browser_integration_test.rb b/test/support/browser_integration_test.rb
index 84440a1..70161f9 100644
--- a/test/support/browser_integration_test.rb
+++ b/test/support/browser_integration_test.rb
@@ -52,7 +52,7 @@ class BrowserIntegrationTest < ActionDispatch::IntegrationTest
 
       username ||= "test_#{SecureRandom.urlsafe_base64}".downcase
       password ||= SecureRandom.base64
-      visit '/users/new'
+      visit '/signup'
       fill_in 'Username', with: username
       fill_in 'Password', with: password
       fill_in 'Invite code', with: @testcode.invite_code
@@ -65,7 +65,7 @@ class BrowserIntegrationTest < ActionDispatch::IntegrationTest
 
       username ||= "test_#{SecureRandom.urlsafe_base64}".downcase
       password ||= SecureRandom.base64
-      visit '/users/new'
+      visit '/signup'
       fill_in 'Username', with: username
       fill_in 'Password', with: password
       fill_in 'Password confirmation', with: password
-- 
cgit v1.2.3


From ad208ae3625e67c2551744df7906ebdda94d215e Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 23 May 2016 12:27:14 +0200
Subject: rename destroy_identity to release_handles

This expresses the intent rather than the implementation.
Also replace temp with query refactoring.
---
 app/controllers/api/users_controller.rb |  7 +++++--
 app/models/account.rb                   | 10 ++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb
index e64d21f..c79a729 100644
--- a/app/controllers/api/users_controller.rb
+++ b/app/controllers/api/users_controller.rb
@@ -50,8 +50,7 @@ module Api
     end
 
     def destroy
-      destroy_identity = current_user.is_monitor? || params[:identities] == "destroy"
-      @user.account.destroy(destroy_identity)
+      @user.account.destroy(release_handles)
       if @user == current_user
         logout
       end
@@ -60,6 +59,10 @@ module Api
 
     private
 
+    def release_handles
+      current_user.is_monitor? || params[:identities] == "destroy"
+    end
+
     # tester auth can only create test users.
     def create_test_account
       if User::is_test?(params[:user][:login])
diff --git a/app/models/account.rb b/app/models/account.rb
index 7310250..d722caa 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -69,15 +69,13 @@ class Account
     @user.refresh_identity
   end
 
-  def destroy(destroy_identity=false)
+  def destroy(release_handles=false)
     return unless @user
     if !@user.is_tmp?
-      if destroy_identity == false
-        @user.identities.each do |id|
+      @user.identities.each do |id|
+        if release_handles == false
           id.orphan!
-        end
-      else
-        @user.identities.each do |id|
+        else
           id.destroy
         end
       end
-- 
cgit v1.2.3


From 30da8e6ffa1eefafb9762645efb85e0beed236c6 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 23 May 2016 12:53:23 +0200
Subject: fix config check in submit_signup

with_config is not mean to test the current config. It will
set the config. So instead we need to look into APP_CONFIG.
---
 test/support/browser_integration_test.rb | 33 +++++++++-----------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/test/support/browser_integration_test.rb b/test/support/browser_integration_test.rb
index 70161f9..1f5e3d2 100644
--- a/test/support/browser_integration_test.rb
+++ b/test/support/browser_integration_test.rb
@@ -47,32 +47,17 @@ class BrowserIntegrationTest < ActionDispatch::IntegrationTest
   end
 
   def submit_signup(username = nil, password = nil)
-
-    with_config invite_required: true do
-
-      username ||= "test_#{SecureRandom.urlsafe_base64}".downcase
-      password ||= SecureRandom.base64
-      visit '/signup'
-      fill_in 'Username', with: username
-      fill_in 'Password', with: password
+    username ||= "test_#{SecureRandom.urlsafe_base64}".downcase
+    password ||= SecureRandom.base64
+    visit '/signup'
+    fill_in 'Username', with: username
+    fill_in 'Password', with: password
+    if APP_CONFIG[:invite_required]
       fill_in 'Invite code', with: @testcode.invite_code
-      fill_in 'Password confirmation', with: password
-      click_on 'Sign Up'
-      return username, password
-    end
-
-    with_config invite_required: false do
-
-      username ||= "test_#{SecureRandom.urlsafe_base64}".downcase
-      password ||= SecureRandom.base64
-      visit '/signup'
-      fill_in 'Username', with: username
-      fill_in 'Password', with: password
-      fill_in 'Password confirmation', with: password
-      click_on 'Sign Up'
-      return username, password
     end
-
+    fill_in 'Password confirmation', with: password
+    click_on 'Sign Up'
+    return username, password
   end
 
   # currently this only works for tests with poltergeist.
-- 
cgit v1.2.3


From e2f19bcfb6dbce77746c2d61715340525b29a592 Mon Sep 17 00:00:00 2001
From: NavaL <ayoyo@thoughtworks.com>
Date: Wed, 22 Jun 2016 19:17:15 +0200
Subject: [feature] expose is_admin in the user api

So that whoever consumes the API can use this attribute to
determine if admin functionalities should be made available to
the current user.
---
 app/models/user.rb                  | 3 ++-
 test/integration/api/signup_test.rb | 2 +-
 test/unit/user_test.rb              | 8 ++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index cb093cf..e3246ad 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -75,7 +75,8 @@ class User < CouchRest::Model::Base
       :login => self.login,
       :ok => self.valid?,
       :id => self.id,
-      :enabled => self.enabled?
+      :enabled => self.enabled?,
+      :is_admin => self.is_admin?
     }.to_json(options)
   end
 
diff --git a/test/integration/api/signup_test.rb b/test/integration/api/signup_test.rb
index 7216496..05a0abe 100644
--- a/test/integration/api/signup_test.rb
+++ b/test/integration/api/signup_test.rb
@@ -8,7 +8,7 @@ class SignupTest < SrpTest
   end
 
   test "signup response" do
-    assert_json_response :login => @login, :ok => true, :id => @user.id, :enabled => true
+    assert_json_response :login => @login, :ok => true, :is_admin => false, :id => @user.id, :enabled => true
     assert last_response.successful?
   end
 
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 9501d34..55d0648 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -71,6 +71,14 @@ class UserTest < ActiveSupport::TestCase
     assert_equal key, @user.public_key
   end
 
+  test "user to json includes id, login, valid, is_admin and enabled" do
+    json_content = JSON.parse @user.to_json
+    assert_equal @user.id, json_content["id"]
+    assert_equal @user.valid?, json_content["ok"]
+    assert_equal @user.login, json_content["login"]
+    assert_equal @user.enabled?, json_content["enabled"]
+    assert_equal @user.is_admin?, json_content["is_admin"]
+  end
 
 
   #
-- 
cgit v1.2.3


From 77a75ef44e98ea3756161dbe8e52ad994e4e098d Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 4 Jul 2016 14:25:29 +0200
Subject: install: remove thin and thus eventmachine as a dependency

They led to some install issues. No need to pick a server for dev env.
---
 Gemfile      | 1 -
 Gemfile.lock | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index f327281..9689a94 100644
--- a/Gemfile
+++ b/Gemfile
@@ -77,7 +77,6 @@ group :test do
 end
 
 group :test, :development do
-  gem 'thin'
   gem 'i18n-missing_translations'
   gem 'pry'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index e0dc859..ff69a08 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -124,11 +124,9 @@ GEM
       nokogiri (~> 1.5)
       railties (>= 3, < 5)
     cucumber-wire (0.0.1)
-    daemons (1.2.3)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    eventmachine (1.2.0.1)
     execjs (2.6.0)
     factory_girl (4.7.0)
       activesupport (>= 3.0.0)
@@ -276,10 +274,6 @@ GEM
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
-    thin (1.6.4)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0, >= 1.0.4)
-      rack (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.2)
@@ -342,7 +336,6 @@ DEPENDENCIES
   sass-rails
   simple_form
   therubyracer
-  thin
   uglifier
   valid_email
 
-- 
cgit v1.2.3


From 638acc59a241e141cf0fc9ccbf4e3c5578b98f0c Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 4 Jul 2016 20:19:21 +0200
Subject: Fix db:migrate and similar tasks

We saw errors from duplicate loading of LocalEmail and
LoginFormatValidation. The latter resulted in a crash.

In an attempt to ensure all subclasses of Couchrest::Model::Base are
loaded Couchrest::Model::Utils::Migrate requires all files in app/models.
We have an extension that does the same for the engines.

During this process LoginFormatValidation and LocalEmail were autoloaded
when 'identity' was required. Afterwards they were required again.
It looks like rails' autoload mechanism does not play nicely with require.

So to make sure they are not autoloaded first move the concerns and
helper classes into the lib directory and require them explicitly.
---
 app/models/email.rb                                | 31 ----------
 app/models/identity.rb                             |  2 +
 app/models/local_email.rb                          | 66 ---------------------
 app/models/login_format_validation.rb              | 21 -------
 app/models/user.rb                                 |  2 +
 .../app/models/account_extension/tickets.rb        | 13 -----
 .../config/initializers/account_lifecycle.rb       |  2 +
 engines/support/lib/account_extension/tickets.rb   | 15 +++++
 lib/email.rb                                       | 31 ++++++++++
 lib/local_email.rb                                 | 67 ++++++++++++++++++++++
 lib/login_format_validation.rb                     | 21 +++++++
 11 files changed, 140 insertions(+), 131 deletions(-)
 delete mode 100644 app/models/email.rb
 delete mode 100644 app/models/local_email.rb
 delete mode 100644 app/models/login_format_validation.rb
 delete mode 100644 engines/support/app/models/account_extension/tickets.rb
 create mode 100644 engines/support/lib/account_extension/tickets.rb
 create mode 100644 lib/email.rb
 create mode 100644 lib/local_email.rb
 create mode 100644 lib/login_format_validation.rb

diff --git a/app/models/email.rb b/app/models/email.rb
deleted file mode 100644
index 4090275..0000000
--- a/app/models/email.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-class Email < String
-  include ActiveModel::Validations
-
-  validates :email,
-    :format => {
-      :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/, #local part of email is case-sensitive, so allow uppercase letter.
-      :message => "needs to be a valid email address"
-    }
-
-  # Make sure we can call Email.new(nil) and get an invalid email address
-  def initialize(s)
-    super(s.to_s)
-  end
-
-  def to_partial_path
-    "emails/email"
-  end
-
-  def to_param
-    to_s
-  end
-
-  def email
-    self
-  end
-
-  def handle
-    self.split('@').first
-  end
-
-end
diff --git a/app/models/identity.rb b/app/models/identity.rb
index f987e4e..92f8f7a 100644
--- a/app/models/identity.rb
+++ b/app/models/identity.rb
@@ -1,3 +1,5 @@
+require 'login_format_validation'
+require 'local_email'
 #
 # Identity states:
 #
diff --git a/app/models/local_email.rb b/app/models/local_email.rb
deleted file mode 100644
index ded7baf..0000000
--- a/app/models/local_email.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-class LocalEmail < Email
-
-  BLACKLIST_FROM_RFC2142 = [
-    'postmaster', 'hostmaster', 'domainadmin', 'webmaster', 'www',
-    'abuse', 'noc', 'security', 'usenet', 'news', 'uucp',
-    'ftp', 'sales', 'marketing', 'support', 'info'
-  ]
-
-  def self.domain
-    APP_CONFIG[:domain]
-  end
-
-  validates :email,
-    :format => {
-      :with => /@#{domain}\Z/i,
-      :message => "needs to end in @#{domain}"
-    }
-
-  validate :handle_allowed
-
-  def initialize(s)
-    super
-    append_domain_if_needed
-  end
-
-  def to_key
-    [handle]
-  end
-
-  def domain
-    LocalEmail.domain
-  end
-
-  protected
-
-  def append_domain_if_needed
-    unless self.index('@')
-      self << '@' + domain
-    end
-  end
-
-  def handle_allowed
-    errors.add(:handle, "is reserved.") if handle_reserved?
-  end
-
-  def handle_reserved?
-    # *ARRAY in a case statement tests if ARRAY includes the handle.
-    case handle
-    when *APP_CONFIG[:handle_blacklist]
-      true
-    when *APP_CONFIG[:handle_whitelist]
-      false
-    when *BLACKLIST_FROM_RFC2142
-      true
-    else
-      handle_in_passwd?
-    end
-  end
-
-  def handle_in_passwd?
-    Etc.getpwnam(handle).present?
-  rescue ArgumentError
-    # handle was not found
-    return false
-  end
-end
diff --git a/app/models/login_format_validation.rb b/app/models/login_format_validation.rb
deleted file mode 100644
index c1fcf70..0000000
--- a/app/models/login_format_validation.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module LoginFormatValidation
-  extend ActiveSupport::Concern
-
-  #TODO: Probably will replace this. Playing with using it for aliases too, but won't want it connected to login field.
-
-  included do
-    # Have multiple regular expression validations so we can get specific error messages:
-    validates :login,
-      :format => { :with => /\A.{2,}\z/,
-        :message => "Must have at least two characters"}
-    validates :login,
-      :format => { :with => /\A[a-z\d_\.-]+\z/,
-        :message => "Only lowercase letters, digits, . - and _ allowed."}
-    validates :login,
-      :format => { :with => /\A[a-z].*\z/,
-        :message => "Must begin with a lowercase letter"}
-    validates :login,
-      :format => { :with => /\A.*[a-z\d]\z/,
-        :message => "Must end with a letter or digit"}
-  end
-end
diff --git a/app/models/user.rb b/app/models/user.rb
index cb093cf..206c0df 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,3 +1,5 @@
+require 'login_format_validation'
+
 class User < CouchRest::Model::Base
   include LoginFormatValidation
 
diff --git a/engines/support/app/models/account_extension/tickets.rb b/engines/support/app/models/account_extension/tickets.rb
deleted file mode 100644
index f38d5fd..0000000
--- a/engines/support/app/models/account_extension/tickets.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module AccountExtension::Tickets
-  extend ActiveSupport::Concern
-
-  def destroy_with_tickets(destroy_identities=false)
-    Ticket.destroy_all_from(self.user)
-    destroy_without_tickets(destroy_identities)
-  end
-
-  included do
-    alias_method_chain :destroy, :tickets
-  end
-
-end
diff --git a/engines/support/config/initializers/account_lifecycle.rb b/engines/support/config/initializers/account_lifecycle.rb
index d9f04c1..9060757 100644
--- a/engines/support/config/initializers/account_lifecycle.rb
+++ b/engines/support/config/initializers/account_lifecycle.rb
@@ -1,3 +1,5 @@
+require 'account_extension/tickets'
+
 ActiveSupport.on_load(:account) do
   include AccountExtension::Tickets
 end
diff --git a/engines/support/lib/account_extension/tickets.rb b/engines/support/lib/account_extension/tickets.rb
new file mode 100644
index 0000000..63f4873
--- /dev/null
+++ b/engines/support/lib/account_extension/tickets.rb
@@ -0,0 +1,15 @@
+module AccountExtension
+  module Tickets
+    extend ActiveSupport::Concern
+
+    def destroy_with_tickets(destroy_identities=false)
+      Ticket.destroy_all_from(self.user)
+      destroy_without_tickets(destroy_identities)
+    end
+
+    included do
+      alias_method_chain :destroy, :tickets
+    end
+
+  end
+end
diff --git a/lib/email.rb b/lib/email.rb
new file mode 100644
index 0000000..4090275
--- /dev/null
+++ b/lib/email.rb
@@ -0,0 +1,31 @@
+class Email < String
+  include ActiveModel::Validations
+
+  validates :email,
+    :format => {
+      :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/, #local part of email is case-sensitive, so allow uppercase letter.
+      :message => "needs to be a valid email address"
+    }
+
+  # Make sure we can call Email.new(nil) and get an invalid email address
+  def initialize(s)
+    super(s.to_s)
+  end
+
+  def to_partial_path
+    "emails/email"
+  end
+
+  def to_param
+    to_s
+  end
+
+  def email
+    self
+  end
+
+  def handle
+    self.split('@').first
+  end
+
+end
diff --git a/lib/local_email.rb b/lib/local_email.rb
new file mode 100644
index 0000000..7c592e1
--- /dev/null
+++ b/lib/local_email.rb
@@ -0,0 +1,67 @@
+require 'email'
+class LocalEmail < Email
+
+  BLACKLIST_FROM_RFC2142 = [
+    'postmaster', 'hostmaster', 'domainadmin', 'webmaster', 'www',
+    'abuse', 'noc', 'security', 'usenet', 'news', 'uucp',
+    'ftp', 'sales', 'marketing', 'support', 'info'
+  ]
+
+  def self.domain
+    APP_CONFIG[:domain]
+  end
+
+  validates :email,
+    :format => {
+      :with => /@#{domain}\Z/i,
+      :message => "needs to end in @#{domain}"
+    }
+
+  validate :handle_allowed
+
+  def initialize(s)
+    super
+    append_domain_if_needed
+  end
+
+  def to_key
+    [handle]
+  end
+
+  def domain
+    LocalEmail.domain
+  end
+
+  protected
+
+  def append_domain_if_needed
+    unless self.index('@')
+      self << '@' + domain
+    end
+  end
+
+  def handle_allowed
+    errors.add(:handle, "is reserved.") if handle_reserved?
+  end
+
+  def handle_reserved?
+    # *ARRAY in a case statement tests if ARRAY includes the handle.
+    case handle
+    when *APP_CONFIG[:handle_blacklist]
+      true
+    when *APP_CONFIG[:handle_whitelist]
+      false
+    when *BLACKLIST_FROM_RFC2142
+      true
+    else
+      handle_in_passwd?
+    end
+  end
+
+  def handle_in_passwd?
+    Etc.getpwnam(handle).present?
+  rescue ArgumentError
+    # handle was not found
+    return false
+  end
+end
diff --git a/lib/login_format_validation.rb b/lib/login_format_validation.rb
new file mode 100644
index 0000000..c1fcf70
--- /dev/null
+++ b/lib/login_format_validation.rb
@@ -0,0 +1,21 @@
+module LoginFormatValidation
+  extend ActiveSupport::Concern
+
+  #TODO: Probably will replace this. Playing with using it for aliases too, but won't want it connected to login field.
+
+  included do
+    # Have multiple regular expression validations so we can get specific error messages:
+    validates :login,
+      :format => { :with => /\A.{2,}\z/,
+        :message => "Must have at least two characters"}
+    validates :login,
+      :format => { :with => /\A[a-z\d_\.-]+\z/,
+        :message => "Only lowercase letters, digits, . - and _ allowed."}
+    validates :login,
+      :format => { :with => /\A[a-z].*\z/,
+        :message => "Must begin with a lowercase letter"}
+    validates :login,
+      :format => { :with => /\A.*[a-z\d]\z/,
+        :message => "Must end with a letter or digit"}
+  end
+end
-- 
cgit v1.2.3


From 6b08e8c89d26225786736ad69ba335b275a1a048 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 4 Jul 2016 21:26:46 +0200
Subject: [doc] update install documentation

---
 README.md           | 46 ++++++++++++++++++++++++++++------------------
 doc/DEPLOY.md       |  9 +++++++--
 doc/DEVELOP.md      | 27 +++++++++++++++++----------
 doc/TROUBLESHOOT.md | 14 ++++++++++----
 4 files changed, 62 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index b6f3d1b..6d8a504 100644
--- a/README.md
+++ b/README.md
@@ -46,20 +46,6 @@ External docs:
   * Overview of the main code repositories
   * Ideas for discrete, unclaimed development projects that would greatly benefit the LEAP ecosystem.
 
-Known problems
----------------------------
-
-* Client certificates are generated without a CSR. The problem is that
-  this makes the web application extremely vulnerable to denial of
-  service attacks. This is not an issue unless the provider enables the
-  possibility of anonymously fetching a client certificate without
-  authenticating first.
-
-* By its very nature, the user database is vulnerable to enumeration
-  attacks. These are very hard to prevent, because our protocol is
-  designed to allow query of a user database via proxy in order to
-  provide network perspective.
-
 Installation
 ---------------------------
 
@@ -69,14 +55,24 @@ these instructions:
 
 ### Install system requirements
 
+You'll need git, ruby (2.1.5), couchdb and bundler installed.
+On a recent debian based distribution run
+
     sudo apt install git ruby couchdb bundler
 
-Your actual requirements might differ if you are running an older OS that defaults to ruby 1.9.
+For other operation systems please lookup the install instructions of these
+tools.
 
 ### Download source
 
+We host our own git repository. In order to create a local clone run
+
     git clone --recursive git://leap.se/leap_web
 
+The repo is mirrored on github and we accept pull requests there:
+
+    https://github.com/leapcode/leap_web
+
 ### Install required ruby libraries
 
     cd leap_web
@@ -88,13 +84,13 @@ have sudo, run ``bundle`` as root.
 
 ### Installation for development purposes
 
-Please see `doc/DEVELOP.md` for further required steps when installing
+Please see `doc/DEVELOP.md` for details about installing
 leap_web for development purposes.
 
-Configuration
+Configuration for Production
 ----------------------------
 
-The configuration file `config/defaults.yml` providers good defaults for
+The configuration file `config/defaults.yml` provides good defaults for
 most values. You can override these defaults by creating a file
 `config/config.yml`.
 
@@ -167,3 +163,17 @@ To run an individual test:
     or
     ruby -Itest certs/test/unit/client_certificate_test.rb
 
+Known problems
+---------------------------
+
+* Client certificates are generated without a CSR. The problem is that
+  this makes the web application extremely vulnerable to denial of
+  service attacks. This is not an issue unless the provider enables the
+  possibility of anonymously fetching a client certificate without
+  authenticating first.
+
+* By its very nature, the user database is vulnerable to enumeration
+  attacks. These are very hard to prevent, because our protocol is
+  designed to allow query of a user database via proxy in order to
+  provide network perspective.
+
diff --git a/doc/DEPLOY.md b/doc/DEPLOY.md
index 33d5598..4d59701 100644
--- a/doc/DEPLOY.md
+++ b/doc/DEPLOY.md
@@ -1,5 +1,10 @@
 # Deployment #
 
+LEAP Web is provisioned and run as part of the overall [LEAP platform](https://leap.se/en/docs/platform).
+We strongly recomment using the whole Platform and following its instructions.
+If you want to directly deploy the webapp never the less these instructions are
+for you.
+
 These instructions are targeting a Debian GNU/Linux system. You might need to
 change the commands to match your own needs.
 
@@ -10,9 +15,9 @@ change the commands to match your own needs.
 The following packages need to be installed:
 
 * git
-* ruby1.9
-* rubygems1.9
+* ruby (2.1.5)
 * couchdb (if you want to use a local couch)
+* bundler
 
 ### Setup Capistrano ###
 
diff --git a/doc/DEVELOP.md b/doc/DEVELOP.md
index cdd0867..e0c07d6 100644
--- a/doc/DEVELOP.md
+++ b/doc/DEVELOP.md
@@ -7,17 +7,24 @@ control checks. This is handy for local development. However, there is
 the risk that running tests with Couch in Admin Party yields false
 results.
 
-You have two options:
+We recommend keeping the default CouchDB configuration locally and testing
+the more complex setup with access control in Continuous Integration.
 
-1) Use Admin Party and accept the risk
-2) Stop Admin Party by creating user accounts & security docs by running the
-following script:
+Please see .travis.yml for the configuration of our CI runs.
 
-    test/travis/setup_couch.sh
+In order to prepare you local couch for development run
+```
+bin/rake db:rotate
+bin/rake db:migrate
+```
 
-### Database configuration
+### Customized database configuration (advanced)
+
+If you want to stop Admin Party mode you need to create user accounts &
+security docs. You can use the following script as a guideline:
+    test/travis/setup_couch.sh
 
-Copy & adapt the default database configuration:
+Afterwards copy & adapt the default database configuration:
 
 ```
 mv config/couchdb.example.yml config/couchdb.yml
@@ -37,14 +44,14 @@ Some tips on modifying the views:
 
 ## Engines ##
 
-Leap Web contains some. They live in their own subdirectory and are included through bundler via their path. This way changes to the engines immediately affect the server as if they were in the main `app` directory.
+We use engines to separate optional functionality from the core. They live in their own subdirectory and are included through bundler via their path. This way changes to the engines immediately affect the server as if they were in the main `app` directory.
 
 Currently Leap Web includes 2 Engines:
 
 * [support](https://github.com/leapcode/leap_web/blob/master/engines/support) - Help ticket management
 * [billing](https://github.com/leapcode/leap_web/blob/master/engines/billing) - Billing System
 
-## Creating a new engine ##
+## Creating a new engine (advanced) ##
 
 If you want to add functionality to the webapp but keep it easy to remove you might consider adding an engine. This only makes sense if your engine really is a plugin - so no other pieces of code depend on it.
 
@@ -99,7 +106,7 @@ For example:
       visit robot_path(@robot, :locale => nil)
     end
 
-## Debugging
+## Debugging Production (advanced)
 
 Sometimes bugs only show up when deployed to the live production server. Debugging can be tricky,
 because the open source mod_passenger does not support debugger. You can't just run
diff --git a/doc/TROUBLESHOOT.md b/doc/TROUBLESHOOT.md
index f3db006..0e2957d 100644
--- a/doc/TROUBLESHOOT.md
+++ b/doc/TROUBLESHOOT.md
@@ -13,15 +13,19 @@ Here are some less common issues you might run into when installing Leap Web.
 Make sure bundler is installed. `gem list bundler` should list `bundler`.
 You also need to be able to access the `bundler` executable in your PATH.
 
-## Outdated version of rubygems ##
+## Incompatible ruby version ##
 
-### Error Messages ###
+### Detecting the problem ###
+The rubyversion we use for development and testing is noted in the file
+
+    .ruby-version
 
-`bundler requires rubygems >= 1.3.6`
+It should match what `ruby --version` prints.
 
 ### Solution ###
 
-`gem update --system` will install the latest rubygems
+Install the matching ruby version. For some operation systems this may require
+the use of rbenv or rvm.
 
 ## Missing development tools ##
 
@@ -42,5 +46,7 @@ Some gem dependencies might not compile because they lack the needed c libraries
 ### Solution ###
 
 Install the libraries in question including their development files.
+Usually the missing library is mentioned in the error message. Searching the
+internet for similar errors is a good starting point aswell.
 
 
-- 
cgit v1.2.3


From 78d1b0daae8b7d667c8cb5a8da0b1efba029801f Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 4 Jul 2016 22:02:05 +0200
Subject: [doc] make sure to mention develop branch in dev docs

---
 README.md      | 12 +++++++++++-
 doc/DEVELOP.md | 14 ++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6d8a504..e68c117 100644
--- a/README.md
+++ b/README.md
@@ -68,14 +68,24 @@ tools.
 We host our own git repository. In order to create a local clone run
 
     git clone --recursive git://leap.se/leap_web
+    cd leap_web
 
 The repo is mirrored on github and we accept pull requests there:
 
     https://github.com/leapcode/leap_web
 
+### Pick branch (development only)
+
+We use the master branch for the stable version deployed to production.
+Development usually happens on the develop branch. So for development you
+want to run
+
+    git checkout origin/develop -b develop
+
+This will create a local branch called develop based on our develop branch.
+
 ### Install required ruby libraries
 
-    cd leap_web
     bundle --binstubs
 
 Typically, you run ``bundle`` as a normal user and it will ask you for a
diff --git a/doc/DEVELOP.md b/doc/DEVELOP.md
index e0c07d6..97ecd25 100644
--- a/doc/DEVELOP.md
+++ b/doc/DEVELOP.md
@@ -1,5 +1,19 @@
 # Development #
 
+## Branches
+
+We use the 'master' branch to hold the version currently deployed to the
+production servers. Only hotfixes are applied here.
+
+Most of development happens based upon the 'develop' branch. So unless
+you are investigating a specific issue that occured in production you
+probably want to base your changes on 'develop':
+```
+git checkout origin/develop -b my-new-feature
+```
+This will create a new branch called 'my-new-feature' based on the develop
+branch from the origin remote.
+
 ## Setting up the local CouchDB
 
 CouchDB operates in Admin Party by default, meaning there are no access
-- 
cgit v1.2.3


From bf77b0b1f53753ba239ef8c2668bc76603cd96e5 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Tue, 5 Jul 2016 09:18:43 +0200
Subject: fix email unit test - need to require now

---
 test/unit/email_test.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/unit/email_test.rb b/test/unit/email_test.rb
index e858bd5..739b43e 100644
--- a/test/unit/email_test.rb
+++ b/test/unit/email_test.rb
@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'email'
 
 class EmailTest < ActiveSupport::TestCase
 
-- 
cgit v1.2.3


From 1c648da3e16848f2a146c5713e3ff0801468cfc8 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Thu, 7 Jul 2016 16:01:58 +0200
Subject: Added missing word

---
 engines/support/config/locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/support/config/locales/en.yml b/engines/support/config/locales/en.yml
index 83af2c4..3b509d5 100644
--- a/engines/support/config/locales/en.yml
+++ b/engines/support/config/locales/en.yml
@@ -92,7 +92,7 @@ en:
     # mouse over hints for the given fields
     hints:
       ticket:
-        email: "Provide an email address in order to notified when this ticket is updated."
+        email: "Provide an email address in order to be notified when this ticket is updated."
         # these will fallback to translations in "simple_form.hints.defaults"
     # placeholders inside the fields before anything was typed
     #placeholders:
-- 
cgit v1.2.3


From c904acbc17c4198bfb1e67b7c6b04004e7a24b3d Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Tue, 12 Jul 2016 16:32:24 +0200
Subject: bugfix #226:patch instead of put

---
 engines/support/config/routes.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/support/config/routes.rb b/engines/support/config/routes.rb
index 81bdf9a..5647477 100644
--- a/engines/support/config/routes.rb
+++ b/engines/support/config/routes.rb
@@ -3,8 +3,8 @@ Rails.application.routes.draw do
 
     resources :tickets, except: :edit do
       member do
-        put 'open'
-        put 'close'
+        patch 'open'
+        patch 'close'
       end
     end
 
-- 
cgit v1.2.3


From 87e467530b686c41ae0b9a8fbf3ed571680bcb74 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Tue, 12 Jul 2016 17:30:02 +0200
Subject: bugfix: require local email in user model

---
 app/models/user.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/user.rb b/app/models/user.rb
index 206c0df..704700b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,4 +1,5 @@
 require 'login_format_validation'
+require 'local_email'
 
 class User < CouchRest::Model::Base
   include LoginFormatValidation
-- 
cgit v1.2.3


From ab1917c5fe0f03e7719863a5598ad575d9fef302 Mon Sep 17 00:00:00 2001
From: NavaL <ayoyo@thoughtworks.com>
Date: Thu, 14 Jul 2016 15:06:20 +0200
Subject: [feature] restrict is_admin in the user api, to only allow querying
 for him/herself

So that it we do not expose the is_admin property to anyone else
including other admins.
---
 app/controllers/api/users_controller.rb      | 10 +++++++++-
 app/models/user.rb                           |  7 +++++--
 test/functional/api/users_controller_test.rb | 12 ++++++++++--
 test/integration/api/signup_test.rb          |  2 +-
 test/unit/user_test.rb                       | 13 ++++++-------
 5 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb
index c79a729..709e076 100644
--- a/app/controllers/api/users_controller.rb
+++ b/app/controllers/api/users_controller.rb
@@ -28,12 +28,20 @@ module Api
         @user = User.find(params[:id])
       end
       if @user
-        respond_with @user
+        respond_with user_response
       else
         not_found
       end
     end
 
+    def user_response
+      @user.to_hash.tap do |user_hash|
+        if @user == current_user
+          user_hash['is_admin'] = @user.is_admin?
+        end
+      end
+    end
+
     def create
       if current_user.is_monitor?
         create_test_account
diff --git a/app/models/user.rb b/app/models/user.rb
index 6541305..93830cc 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -74,13 +74,16 @@ class User < CouchRest::Model::Base
   end
 
   def to_json(options={})
+    to_hash.to_json(options)
+  end
+
+  def to_hash()
     {
       :login => self.login,
       :ok => self.valid?,
       :id => self.id,
       :enabled => self.enabled?,
-      :is_admin => self.is_admin?
-    }.to_json(options)
+    }
   end
 
   def salt
diff --git a/test/functional/api/users_controller_test.rb b/test/functional/api/users_controller_test.rb
index 32afd0a..b69770d 100644
--- a/test/functional/api/users_controller_test.rb
+++ b/test/functional/api/users_controller_test.rb
@@ -86,14 +86,22 @@ class Api::UsersControllerTest < ApiControllerTest
     login :is_admin? => true
     api_get :show, :id => 0, :login => user.login, :format => :json
     assert_response :success
-    assert_json_response user
+    assert_json_response user.to_hash
     api_get :show, :id => user.id, :format => :json
     assert_response :success
-    assert_json_response user
+    assert_json_response user.to_hash
     api_get :show, :id => "0", :format => :json
     assert_response :not_found
   end
 
+  test "admin can show is_admin property" do
+    user = FactoryGirl.create :user, login: "admin2"
+    login user
+    api_get :show, :id => user.id, :format => :json
+    assert_response :success
+    assert_json_response user.to_hash.merge(:is_admin => true)
+  end
+
   test "normal users cannot show user" do
     user = find_record :user
     login
diff --git a/test/integration/api/signup_test.rb b/test/integration/api/signup_test.rb
index 2e515c1..dc24420 100644
--- a/test/integration/api/signup_test.rb
+++ b/test/integration/api/signup_test.rb
@@ -8,7 +8,7 @@ class SignupTest < SrpTest
   end
 
   test "signup response" do
-    assert_json_response :login => @login, :ok => true, :is_admin => false, :id => @user.id, :enabled => true
+    assert_json_response :login => @login, :ok => true, :id => @user.id, :enabled => true
     assert last_response.successful?
   end
 
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 55d0648..02e94df 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -71,13 +71,12 @@ class UserTest < ActiveSupport::TestCase
     assert_equal key, @user.public_key
   end
 
-  test "user to json includes id, login, valid, is_admin and enabled" do
-    json_content = JSON.parse @user.to_json
-    assert_equal @user.id, json_content["id"]
-    assert_equal @user.valid?, json_content["ok"]
-    assert_equal @user.login, json_content["login"]
-    assert_equal @user.enabled?, json_content["enabled"]
-    assert_equal @user.is_admin?, json_content["is_admin"]
+  test "user to hash includes id, login, valid and enabled" do
+    hash = @user.to_hash
+    assert_equal @user.id, hash[:id]
+    assert_equal @user.valid?, hash[:ok]
+    assert_equal @user.login, hash[:login]
+    assert_equal @user.enabled?, hash[:enabled]
   end
 
 
-- 
cgit v1.2.3


From a1d62a3a1492ca21e1e1d2344fac88bb4d93f324 Mon Sep 17 00:00:00 2001
From: azul <azul@riseup.net>
Date: Mon, 1 Aug 2016 14:40:56 +0000
Subject: Add .gitlab-ci.yml

---
 .gitlab-ci.yml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..df920d0
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,29 @@
+# This file is a template, and might need editing before it works on your project.
+# Official language image. Look for the different tagged releases at:
+# https://hub.docker.com/r/library/ruby/tags/
+image: "ruby:2.1"
+
+# Pick zero or more services to be used on all builds.
+# Only needed when using a docker container to run your tests in.
+# Check out: http://docs.gitlab.com/ce/ci/docker/using_docker_images.html#what-is-service
+services:
+  - couchdb:1.6.1
+  
+# Cache gems in between builds
+cache:
+  paths:
+    - vendor/ruby
+
+# This is a basic example for a gem or script which doesn't use
+# services such as redis or postgres
+before_script:
+  - ruby -v                                   # Print out ruby version for debugging
+  - gem install bundler  --no-ri --no-rdoc    # Bundler is not installed with the image
+  - bundle install -j $(nproc) --path vendor  # Install dependencies into ./vendor/ruby
+  - export RAILS_ENV=test
+
+rails:
+  script:
+  - bundle exec rake db:rotate
+  - bundle exec rake db:migrate
+  - bundle exec rake test
-- 
cgit v1.2.3


From bef746ae7b215db78be088657bbfaf47c774f943 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 8 Aug 2016 10:25:54 +0200
Subject: [ci] setup couch for gitlab

Couch docker image will be available on the host called couchdb.
So we use curl to check for it and display the version string.
And then we move a couchdb.yml config file into place so the right host
will be used.
---
 .gitlab-ci.yml                       | 16 +++++++++-------
 .travis.yml                          |  8 ++++----
 test/config/couchdb.admin.yml        |  6 ------
 test/config/couchdb.yml              |  5 -----
 test/config/gitlab/couchdb.yml       |  4 ++++
 test/config/travis/couchdb.admin.yml |  6 ++++++
 test/config/travis/couchdb.yml       |  5 +++++
 test/config/travis/ruby-version      |  1 +
 test/config/travis/setup_couch.sh    | 17 +++++++++++++++++
 test/travis/ruby-version             |  1 -
 test/travis/setup_couch.sh           | 17 -----------------
 11 files changed, 46 insertions(+), 40 deletions(-)
 delete mode 100644 test/config/couchdb.admin.yml
 delete mode 100644 test/config/couchdb.yml
 create mode 100644 test/config/gitlab/couchdb.yml
 create mode 100644 test/config/travis/couchdb.admin.yml
 create mode 100644 test/config/travis/couchdb.yml
 create mode 100644 test/config/travis/ruby-version
 create mode 100755 test/config/travis/setup_couch.sh
 delete mode 100644 test/travis/ruby-version
 delete mode 100755 test/travis/setup_couch.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index df920d0..01d8d52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ image: "ruby:2.1"
 # Check out: http://docs.gitlab.com/ce/ci/docker/using_docker_images.html#what-is-service
 services:
   - couchdb:1.6.1
-  
+
 # Cache gems in between builds
 cache:
   paths:
@@ -17,13 +17,15 @@ cache:
 # This is a basic example for a gem or script which doesn't use
 # services such as redis or postgres
 before_script:
-  - ruby -v                                   # Print out ruby version for debugging
-  - gem install bundler  --no-ri --no-rdoc    # Bundler is not installed with the image
-  - bundle install -j $(nproc) --path vendor  # Install dependencies into ./vendor/ruby
-  - export RAILS_ENV=test
+  - ruby -v
+  - curl -s couchdb:5984
+  - cp test/config/gitlab/couchdb.yml config/couchdb.admin.yml
+  - cp test/config/gitlab/couchdb.yml config
+  - gem install bundler  --no-ri --no-rdoc
+  - bundle install -j $(nproc) --path vendor --without development debug
+  - bundle exec rake RAILS_ENV=test db:rotate
+  - bundle exec rake RAILS_ENV=test db:migrate
 
 rails:
   script:
-  - bundle exec rake db:rotate
-  - bundle exec rake db:migrate
   - bundle exec rake test
diff --git a/.travis.yml b/.travis.yml
index 4e7aad0..2681951 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,10 @@ before_install:
   - "gem install bundler --version 1.11.2"
 before_script:
   - "rm .ruby-version"
-  - "mv test/travis/ruby-version .ruby-version"
-  - "test/travis/setup_couch.sh"
-  - "mv test/config/couchdb.admin.yml config/couchdb.admin.yml"
-  - "mv test/config/couchdb.yml config/couchdb.yml"
+  - "mv test/config/travis/ruby-version .ruby-version"
+  - "test/config/travis/setup_couch.sh"
+  - "mv test/config/travis/couchdb.admin.yml config/couchdb.admin.yml"
+  - "mv test/config/travis/couchdb.yml config/couchdb.yml"
   - "bundle exec rake RAILS_ENV=test db:rotate"
   - "bundle exec rake RAILS_ENV=test db:migrate"
 after_script:
diff --git a/test/config/couchdb.admin.yml b/test/config/couchdb.admin.yml
deleted file mode 100644
index 0988bc1..0000000
--- a/test/config/couchdb.admin.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-test:
-  auto_update_design_doc: false
-  username: "anna"
-  password: "secret"
-  prefix: ""
-  
diff --git a/test/config/couchdb.yml b/test/config/couchdb.yml
deleted file mode 100644
index 9c8b67b..0000000
--- a/test/config/couchdb.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-test:
-  auto_update_design_doc: false
-  username: "me"
-  password: "pwd"
-  prefix: ""
diff --git a/test/config/gitlab/couchdb.yml b/test/config/gitlab/couchdb.yml
new file mode 100644
index 0000000..5d4f71f
--- /dev/null
+++ b/test/config/gitlab/couchdb.yml
@@ -0,0 +1,4 @@
+test:
+  auto_update_design_doc: false
+  host: "couchdb"
+  prefix: ""
diff --git a/test/config/travis/couchdb.admin.yml b/test/config/travis/couchdb.admin.yml
new file mode 100644
index 0000000..7c9584c
--- /dev/null
+++ b/test/config/travis/couchdb.admin.yml
@@ -0,0 +1,6 @@
+test:
+  auto_update_design_doc: false
+  username: "anna"
+  password: "secret"
+  prefix: ""
+
diff --git a/test/config/travis/couchdb.yml b/test/config/travis/couchdb.yml
new file mode 100644
index 0000000..9c8b67b
--- /dev/null
+++ b/test/config/travis/couchdb.yml
@@ -0,0 +1,5 @@
+test:
+  auto_update_design_doc: false
+  username: "me"
+  password: "pwd"
+  prefix: ""
diff --git a/test/config/travis/ruby-version b/test/config/travis/ruby-version
new file mode 100644
index 0000000..68b3a4c
--- /dev/null
+++ b/test/config/travis/ruby-version
@@ -0,0 +1 @@
+1.9.3-p551
diff --git a/test/config/travis/setup_couch.sh b/test/config/travis/setup_couch.sh
new file mode 100755
index 0000000..0502c12
--- /dev/null
+++ b/test/config/travis/setup_couch.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+HOST="http://localhost:5984"
+echo "couch version :"
+curl -X GET $HOST
+echo "creating user :"
+curl -HContent-Type:application/json -XPUT $HOST/_users/org.couchdb.user:me --data-binary '{"_id": "org.couchdb.user:me","name": "me","roles": [],"type": "user","password": "pwd"}'
+echo "creating databases :"
+curl -X PUT $HOST/sessions
+curl -X PUT $HOST/users
+curl -X PUT $HOST/tickets
+echo "restricting database access :"
+curl -X PUT $HOST/sessions/_security -Hcontent-type:application/json --data-binary '{"admins":{"names":[],"roles":[]},"members":{"names":["me"],"roles":[]}}'
+curl -X PUT $HOST/users/_security -Hcontent-type:application/json --data-binary '{"admins":{"names":[],"roles":[]},"members":{"names":["me"],"roles":[]}}'
+curl -X PUT $HOST/tickets/_security -Hcontent-type:application/json --data-binary '{"admins":{"names":[],"roles":[]},"members":{"names":["me"],"roles":[]}}'
+echo "adding admin :"
+curl -X PUT $HOST/_config/admins/anna -d '"secret"'
diff --git a/test/travis/ruby-version b/test/travis/ruby-version
deleted file mode 100644
index 68b3a4c..0000000
--- a/test/travis/ruby-version
+++ /dev/null
@@ -1 +0,0 @@
-1.9.3-p551
diff --git a/test/travis/setup_couch.sh b/test/travis/setup_couch.sh
deleted file mode 100755
index 0502c12..0000000
--- a/test/travis/setup_couch.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-HOST="http://localhost:5984"
-echo "couch version :"
-curl -X GET $HOST
-echo "creating user :"
-curl -HContent-Type:application/json -XPUT $HOST/_users/org.couchdb.user:me --data-binary '{"_id": "org.couchdb.user:me","name": "me","roles": [],"type": "user","password": "pwd"}'
-echo "creating databases :"
-curl -X PUT $HOST/sessions
-curl -X PUT $HOST/users
-curl -X PUT $HOST/tickets
-echo "restricting database access :"
-curl -X PUT $HOST/sessions/_security -Hcontent-type:application/json --data-binary '{"admins":{"names":[],"roles":[]},"members":{"names":["me"],"roles":[]}}'
-curl -X PUT $HOST/users/_security -Hcontent-type:application/json --data-binary '{"admins":{"names":[],"roles":[]},"members":{"names":["me"],"roles":[]}}'
-curl -X PUT $HOST/tickets/_security -Hcontent-type:application/json --data-binary '{"admins":{"names":[],"roles":[]},"members":{"names":["me"],"roles":[]}}'
-echo "adding admin :"
-curl -X PUT $HOST/_config/admins/anna -d '"secret"'
-- 
cgit v1.2.3


From b4ff3b959d4dd6a7561ac3be063a43619c0bd89c Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 12 Aug 2016 11:34:01 +0200
Subject: move temporary_user into lib - fix load issue

We already did the same for other concerns. The way we load models
for couchrest migrations does not work well with concerns in the
model directory as they will be loaded twice.
---
 app/models/temporary_user.rb | 93 --------------------------------------------
 app/models/user.rb           |  1 +
 lib/temporary_user.rb        | 93 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 94 insertions(+), 93 deletions(-)
 delete mode 100644 app/models/temporary_user.rb
 create mode 100644 lib/temporary_user.rb

diff --git a/app/models/temporary_user.rb b/app/models/temporary_user.rb
deleted file mode 100644
index 2afae15..0000000
--- a/app/models/temporary_user.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# For users with login '*test_user*', we don't want to store these documents in
-# the main users db. This is because we create and destroy a lot of test
-# users. This weirdness of using a different db for some users breaks a lot of
-# things, such as associations. However, this is OK for now since we don't need
-# those for running the frequent nagios tests.
-#
-# This module is included in user.rb. This will only work if it is included
-# after designs are defined, otherwise, the design definition will overwrite
-# find_by_login().
-#
-
-module TemporaryUser
-  extend ActiveSupport::Concern
-  include CouchRest::Model::DatabaseMethod
-
-  USER_DB     = 'users'
-  TMP_USER_DB = 'tmp_users'
-  TMP_LOGIN   = 'tmp_user'  # created and deleted frequently
-  TEST_LOGIN  = 'test_user' # created, rarely deleted
-
-  included do
-    use_database_method :db_name
-
-    # since the original find_by_login is dynamically created with
-    # instance_eval, it appears that we also need to use instance eval to
-    # override it.
-    instance_eval <<-EOS, __FILE__, __LINE__ + 1
-      def find_by_login(*args)
-        if args.grep(/^#{TMP_LOGIN}/).any?
-          by_login.database(tmp_database).key(*args).first()
-        else
-          by_login.key(*args).first()
-        end
-      end
-    EOS
-  end
-
-  module ClassMethods
-    def get(id, db = database)
-      super(id, db) || super(id, tmp_database)
-    end
-    alias :find :get
-
-    # calls db_name(TMP_LOGIN), then creates a CouchRest::Database
-    # from the name
-    def tmp_database
-      choose_database(TMP_LOGIN)
-    end
-
-    def db_name(login=nil)
-      if !login.nil? && login.include?(TMP_LOGIN)
-        TMP_USER_DB
-      else
-        USER_DB
-      end
-    end
-
-    # create the tmp db if it doesn't exist.
-    # requires admin access.
-    def create_tmp_database!
-      design_doc.sync!(tmp_database.tap{|db|db.create!})
-    end
-
-    def is_tmp?(login)
-      !login.nil? && login =~ /^#{TMP_LOGIN}/
-    end
-
-    def is_test?(login)
-      !login.nil? && (login =~ /^#{TMP_LOGIN}/ || login =~ /^#{TEST_LOGIN}/)
-    end
-  end
-
-  #
-  # this gets called each and every time a User object needs to
-  # access the database.
-  #
-  def db_name
-    self.class.db_name(self.login)
-  end
-
-  # returns true if this User instance is stored in tmp db.
-  def is_tmp?
-    self.class.is_tmp?(self.login)
-  end
-
-  # returns true if this user is used for testing purposes
-  # (either a temporary or long lived)
-  def is_test?
-    self.class.is_test?(self.login)
-  end
-
-end
diff --git a/app/models/user.rb b/app/models/user.rb
index 93830cc..1116e6c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,5 +1,6 @@
 require 'login_format_validation'
 require 'local_email'
+require 'temporary_user'
 
 class User < CouchRest::Model::Base
   include LoginFormatValidation
diff --git a/lib/temporary_user.rb b/lib/temporary_user.rb
new file mode 100644
index 0000000..2afae15
--- /dev/null
+++ b/lib/temporary_user.rb
@@ -0,0 +1,93 @@
+#
+# For users with login '*test_user*', we don't want to store these documents in
+# the main users db. This is because we create and destroy a lot of test
+# users. This weirdness of using a different db for some users breaks a lot of
+# things, such as associations. However, this is OK for now since we don't need
+# those for running the frequent nagios tests.
+#
+# This module is included in user.rb. This will only work if it is included
+# after designs are defined, otherwise, the design definition will overwrite
+# find_by_login().
+#
+
+module TemporaryUser
+  extend ActiveSupport::Concern
+  include CouchRest::Model::DatabaseMethod
+
+  USER_DB     = 'users'
+  TMP_USER_DB = 'tmp_users'
+  TMP_LOGIN   = 'tmp_user'  # created and deleted frequently
+  TEST_LOGIN  = 'test_user' # created, rarely deleted
+
+  included do
+    use_database_method :db_name
+
+    # since the original find_by_login is dynamically created with
+    # instance_eval, it appears that we also need to use instance eval to
+    # override it.
+    instance_eval <<-EOS, __FILE__, __LINE__ + 1
+      def find_by_login(*args)
+        if args.grep(/^#{TMP_LOGIN}/).any?
+          by_login.database(tmp_database).key(*args).first()
+        else
+          by_login.key(*args).first()
+        end
+      end
+    EOS
+  end
+
+  module ClassMethods
+    def get(id, db = database)
+      super(id, db) || super(id, tmp_database)
+    end
+    alias :find :get
+
+    # calls db_name(TMP_LOGIN), then creates a CouchRest::Database
+    # from the name
+    def tmp_database
+      choose_database(TMP_LOGIN)
+    end
+
+    def db_name(login=nil)
+      if !login.nil? && login.include?(TMP_LOGIN)
+        TMP_USER_DB
+      else
+        USER_DB
+      end
+    end
+
+    # create the tmp db if it doesn't exist.
+    # requires admin access.
+    def create_tmp_database!
+      design_doc.sync!(tmp_database.tap{|db|db.create!})
+    end
+
+    def is_tmp?(login)
+      !login.nil? && login =~ /^#{TMP_LOGIN}/
+    end
+
+    def is_test?(login)
+      !login.nil? && (login =~ /^#{TMP_LOGIN}/ || login =~ /^#{TEST_LOGIN}/)
+    end
+  end
+
+  #
+  # this gets called each and every time a User object needs to
+  # access the database.
+  #
+  def db_name
+    self.class.db_name(self.login)
+  end
+
+  # returns true if this User instance is stored in tmp db.
+  def is_tmp?
+    self.class.is_tmp?(self.login)
+  end
+
+  # returns true if this user is used for testing purposes
+  # (either a temporary or long lived)
+  def is_test?
+    self.class.is_test?(self.login)
+  end
+
+end
-- 
cgit v1.2.3


From f0d2f44ea3babdafc793856082d8c532b05187ae Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 12 Aug 2016 11:59:05 +0200
Subject: [db] remove DatabaseMethod import from TemporaryUser

It was causing 404s on initializing the database with db:migrate.
DatabaseMethods rewrite of #database does not call prepare_database
and thus does not create the database when needed.

DatabaseMethod is also quite a bit too much for a model that has
two databases that can be memoized easily. There's no way to have
a separate database instance per record.
---
 lib/temporary_user.rb | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/lib/temporary_user.rb b/lib/temporary_user.rb
index 2afae15..e41add5 100644
--- a/lib/temporary_user.rb
+++ b/lib/temporary_user.rb
@@ -12,16 +12,12 @@
 
 module TemporaryUser
   extend ActiveSupport::Concern
-  include CouchRest::Model::DatabaseMethod
 
-  USER_DB     = 'users'
   TMP_USER_DB = 'tmp_users'
   TMP_LOGIN   = 'tmp_user'  # created and deleted frequently
   TEST_LOGIN  = 'test_user' # created, rarely deleted
 
   included do
-    use_database_method :db_name
-
     # since the original find_by_login is dynamically created with
     # instance_eval, it appears that we also need to use instance eval to
     # override it.
@@ -45,15 +41,7 @@ module TemporaryUser
     # calls db_name(TMP_LOGIN), then creates a CouchRest::Database
     # from the name
     def tmp_database
-      choose_database(TMP_LOGIN)
-    end
-
-    def db_name(login=nil)
-      if !login.nil? && login.include?(TMP_LOGIN)
-        TMP_USER_DB
-      else
-        USER_DB
-      end
+      @tmp_database ||= prepare_database TMP_USER_DB
     end
 
     # create the tmp db if it doesn't exist.
@@ -71,12 +59,12 @@ module TemporaryUser
     end
   end
 
-  #
-  # this gets called each and every time a User object needs to
-  # access the database.
-  #
-  def db_name
-    self.class.db_name(self.login)
+  def database
+    if login.present? && login.include?(TMP_LOGIN)
+      self.class.tmp_database
+    else
+      self.class.database
+    end
   end
 
   # returns true if this User instance is stored in tmp db.
-- 
cgit v1.2.3


From 8196f46b2c4d1d0dce7e4eafcc299879ec0d894b Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 12 Aug 2016 12:22:32 +0200
Subject: [ci] checkout submodule on gitlab

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01d8d52..01c4103 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,6 +19,7 @@ cache:
 before_script:
   - ruby -v
   - curl -s couchdb:5984
+  - git submodule update --init
   - cp test/config/gitlab/couchdb.yml config/couchdb.admin.yml
   - cp test/config/gitlab/couchdb.yml config
   - gem install bundler  --no-ri --no-rdoc
-- 
cgit v1.2.3


From 8fbe70729da1d308a118c930e8f938837484a61c Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 12 Aug 2016 17:26:51 +0200
Subject: [db] def database on users instead of use_database

use_database affects all uses of prepare_database - so also the one
in tmp_database. In order to avoid that we do not use_database but
just overwrite the database method itself.
---
 app/models/user.rb               |  2 --
 lib/temporary_user.rb            |  8 ++++++--
 test/unit/temporary_user_test.rb | 28 ++++++++++++++++++++++++----
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 1116e6c..9cebbca 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -5,8 +5,6 @@ require 'temporary_user'
 class User < CouchRest::Model::Base
   include LoginFormatValidation
 
-  use_database :users
-
   property :login, String, :accessible => true
   property :password_verifier, String, :accessible => true
   property :password_salt, String, :accessible => true
diff --git a/lib/temporary_user.rb b/lib/temporary_user.rb
index e41add5..d0db1c4 100644
--- a/lib/temporary_user.rb
+++ b/lib/temporary_user.rb
@@ -13,6 +13,7 @@
 module TemporaryUser
   extend ActiveSupport::Concern
 
+  USER_DB = 'users'
   TMP_USER_DB = 'tmp_users'
   TMP_LOGIN   = 'tmp_user'  # created and deleted frequently
   TEST_LOGIN  = 'test_user' # created, rarely deleted
@@ -38,12 +39,15 @@ module TemporaryUser
     end
     alias :find :get
 
-    # calls db_name(TMP_LOGIN), then creates a CouchRest::Database
-    # from the name
+    def database
+      @database ||= prepare_database USER_DB
+    end
+
     def tmp_database
       @tmp_database ||= prepare_database TMP_USER_DB
     end
 
+
     # create the tmp db if it doesn't exist.
     # requires admin access.
     def create_tmp_database!
diff --git a/test/unit/temporary_user_test.rb b/test/unit/temporary_user_test.rb
index 38ccd67..2c9e70f 100644
--- a/test/unit/temporary_user_test.rb
+++ b/test/unit/temporary_user_test.rb
@@ -6,16 +6,37 @@ class TemporaryUserTest < ActiveSupport::TestCase
     InviteCodeValidator.any_instance.stubs(:validate)
   end
 
-  test "tmp_user saved to tmp_users" do
-    begin
-      assert User.ancestors.include?(TemporaryUser)
+  test "TemporaryUser concern is applied" do
+    assert User.ancestors.include?(TemporaryUser)
+  end
+
+  test "temporary user has tmp_users as db" do
+    tmp_user = User.new :login => 'tmp_user_'+SecureRandom.hex(5).downcase
+    assert_equal 'leap_web_tmp_users', tmp_user.database.name
+  end
 
+  test "normal user has users as db" do
+    user = User.new :login => 'a'+SecureRandom.hex(5).downcase
+    assert_equal 'leap_web_users', user.database.name
+  end
+
+  test "user saved to users" do
+    begin
       assert_difference('User.database.info["doc_count"]') do
         normal_user = User.create!(:login => 'a'+SecureRandom.hex(5).downcase,
           :password_verifier => 'ABCDEF0010101', :password_salt => 'ABCDEF')
         refute normal_user.database.to_s.include?('tmp')
       end
+    ensure
+      begin
+        normal_user.destroy
+      rescue
+      end
+    end
+  end
 
+  test "tmp_user saved to tmp_users" do
+    begin
       assert_difference('User.tmp_database.info["doc_count"]') do
         tmp_user = User.create!(:login => 'tmp_user_'+SecureRandom.hex(5).downcase,
           :password_verifier => 'ABCDEF0010101', :password_salt => 'ABCDEF')
@@ -23,7 +44,6 @@ class TemporaryUserTest < ActiveSupport::TestCase
       end
     ensure
       begin
-        normal_user.destroy
         tmp_user.destroy
       rescue
       end
-- 
cgit v1.2.3


From 75c037e5d6d8b8f2b98477bdd0359f5687bd7517 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 12 Aug 2016 23:10:50 +0200
Subject: [ci] use default db prefix on gitlab and travis

This makes writing the tests for database names easier as they should
be the same strings on gitlab, travis and locally.
---
 test/config/gitlab/couchdb.yml       | 1 -
 test/config/travis/couchdb.admin.yml | 1 -
 test/config/travis/couchdb.yml       | 1 -
 3 files changed, 3 deletions(-)

diff --git a/test/config/gitlab/couchdb.yml b/test/config/gitlab/couchdb.yml
index 5d4f71f..68761dc 100644
--- a/test/config/gitlab/couchdb.yml
+++ b/test/config/gitlab/couchdb.yml
@@ -1,4 +1,3 @@
 test:
   auto_update_design_doc: false
   host: "couchdb"
-  prefix: ""
diff --git a/test/config/travis/couchdb.admin.yml b/test/config/travis/couchdb.admin.yml
index 7c9584c..a7677f9 100644
--- a/test/config/travis/couchdb.admin.yml
+++ b/test/config/travis/couchdb.admin.yml
@@ -2,5 +2,4 @@ test:
   auto_update_design_doc: false
   username: "anna"
   password: "secret"
-  prefix: ""
 
diff --git a/test/config/travis/couchdb.yml b/test/config/travis/couchdb.yml
index 9c8b67b..a57b888 100644
--- a/test/config/travis/couchdb.yml
+++ b/test/config/travis/couchdb.yml
@@ -2,4 +2,3 @@ test:
   auto_update_design_doc: false
   username: "me"
   password: "pwd"
-  prefix: ""
-- 
cgit v1.2.3


From 58c63cac98cdacc6ec7230e1133bcb35f0f22582 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 15 Aug 2016 11:31:40 +0200
Subject: [ci] move configs into config dir

---
 .gitlab-ci.yml                       |  4 ++--
 .travis.yml                          |  8 ++++----
 config/ci/gitlab/couchdb.yml         |  3 +++
 config/ci/travis/README              | 17 +++++++++++++++++
 config/ci/travis/couchdb.admin.yml   |  5 +++++
 config/ci/travis/couchdb.yml         |  4 ++++
 config/ci/travis/ruby-version        |  1 +
 config/ci/travis/setup_couch.sh      | 17 +++++++++++++++++
 test/config/README                   | 17 -----------------
 test/config/gitlab/couchdb.yml       |  3 ---
 test/config/travis/couchdb.admin.yml |  5 -----
 test/config/travis/couchdb.yml       |  4 ----
 test/config/travis/ruby-version      |  1 -
 test/config/travis/setup_couch.sh    | 17 -----------------
 14 files changed, 53 insertions(+), 53 deletions(-)
 create mode 100644 config/ci/gitlab/couchdb.yml
 create mode 100644 config/ci/travis/README
 create mode 100644 config/ci/travis/couchdb.admin.yml
 create mode 100644 config/ci/travis/couchdb.yml
 create mode 100644 config/ci/travis/ruby-version
 create mode 100755 config/ci/travis/setup_couch.sh
 delete mode 100644 test/config/README
 delete mode 100644 test/config/gitlab/couchdb.yml
 delete mode 100644 test/config/travis/couchdb.admin.yml
 delete mode 100644 test/config/travis/couchdb.yml
 delete mode 100644 test/config/travis/ruby-version
 delete mode 100755 test/config/travis/setup_couch.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01c4103..3bf5571 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,8 +20,8 @@ before_script:
   - ruby -v
   - curl -s couchdb:5984
   - git submodule update --init
-  - cp test/config/gitlab/couchdb.yml config/couchdb.admin.yml
-  - cp test/config/gitlab/couchdb.yml config
+  - cp config/ci/gitlab/couchdb.yml config/couchdb.admin.yml
+  - cp config/ci/gitlab/couchdb.yml config
   - gem install bundler  --no-ri --no-rdoc
   - bundle install -j $(nproc) --path vendor --without development debug
   - bundle exec rake RAILS_ENV=test db:rotate
diff --git a/.travis.yml b/.travis.yml
index 2681951..ecf2c16 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,10 @@ before_install:
   - "gem install bundler --version 1.11.2"
 before_script:
   - "rm .ruby-version"
-  - "mv test/config/travis/ruby-version .ruby-version"
-  - "test/config/travis/setup_couch.sh"
-  - "mv test/config/travis/couchdb.admin.yml config/couchdb.admin.yml"
-  - "mv test/config/travis/couchdb.yml config/couchdb.yml"
+  - "mv config/ci/travis/ruby-version .ruby-version"
+  - "config/ci/travis/setup_couch.sh"
+  - "mv config/ci/travis/couchdb.admin.yml config/couchdb.admin.yml"
+  - "mv config/ci/travis/couchdb.yml config/couchdb.yml"
   - "bundle exec rake RAILS_ENV=test db:rotate"
   - "bundle exec rake RAILS_ENV=test db:migrate"
 after_script:
diff --git a/config/ci/gitlab/couchdb.yml b/config/ci/gitlab/couchdb.yml
new file mode 100644
index 0000000..68761dc
--- /dev/null
+++ b/config/ci/gitlab/couchdb.yml
@@ -0,0 +1,3 @@
+test:
+  auto_update_design_doc: false
+  host: "couchdb"
diff --git a/config/ci/travis/README b/config/ci/travis/README
new file mode 100644
index 0000000..58e37b2
--- /dev/null
+++ b/config/ci/travis/README
@@ -0,0 +1,17 @@
+These files are used for Travis tests to test admin and user permissions:
+
+couchdb.yml.admin:
+
+  when activated, leap_web has admin permissions (e.g. ability to create
+  databases, upload design docs).
+
+couchdb.yml.user:
+
+  when activited, leap_web has normal permissions (e.g. can modify all the
+  records).
+
+The term 'user' here is misleading. It is really two different types of admin
+permissions.
+
+Rails or rake must be run with 'test' environment for these configs to be
+used.
diff --git a/config/ci/travis/couchdb.admin.yml b/config/ci/travis/couchdb.admin.yml
new file mode 100644
index 0000000..a7677f9
--- /dev/null
+++ b/config/ci/travis/couchdb.admin.yml
@@ -0,0 +1,5 @@
+test:
+  auto_update_design_doc: false
+  username: "anna"
+  password: "secret"
+
diff --git a/config/ci/travis/couchdb.yml b/config/ci/travis/couchdb.yml
new file mode 100644
index 0000000..a57b888
--- /dev/null
+++ b/config/ci/travis/couchdb.yml
@@ -0,0 +1,4 @@
+test:
+  auto_update_design_doc: false
+  username: "me"
+  password: "pwd"
diff --git a/config/ci/travis/ruby-version b/config/ci/travis/ruby-version
new file mode 100644
index 0000000..68b3a4c
--- /dev/null
+++ b/config/ci/travis/ruby-version
@@ -0,0 +1 @@
+1.9.3-p551
diff --git a/config/ci/travis/setup_couch.sh b/config/ci/travis/setup_couch.sh
new file mode 100755
index 0000000..0502c12
--- /dev/null
+++ b/config/ci/travis/setup_couch.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+HOST="http://localhost:5984"
+echo "couch version :"
+curl -X GET $HOST
+echo "creating user :"
+curl -HContent-Type:application/json -XPUT $HOST/_users/org.couchdb.user:me --data-binary '{"_id": "org.couchdb.user:me","name": "me","roles": [],"type": "user","password": "pwd"}'
+echo "creating databases :"
+curl -X PUT $HOST/sessions
+curl -X PUT $HOST/users
+curl -X PUT $HOST/tickets
+echo "restricting database access :"
+curl -X PUT $HOST/sessions/_security -Hcontent-type:application/json --data-binary '{"admins":{"names":[],"roles":[]},"members":{"names":["me"],"roles":[]}}'
+curl -X PUT $HOST/users/_security -Hcontent-type:application/json --data-binary '{"admins":{"names":[],"roles":[]},"members":{"names":["me"],"roles":[]}}'
+curl -X PUT $HOST/tickets/_security -Hcontent-type:application/json --data-binary '{"admins":{"names":[],"roles":[]},"members":{"names":["me"],"roles":[]}}'
+echo "adding admin :"
+curl -X PUT $HOST/_config/admins/anna -d '"secret"'
diff --git a/test/config/README b/test/config/README
deleted file mode 100644
index 58e37b2..0000000
--- a/test/config/README
+++ /dev/null
@@ -1,17 +0,0 @@
-These files are used for Travis tests to test admin and user permissions:
-
-couchdb.yml.admin:
-
-  when activated, leap_web has admin permissions (e.g. ability to create
-  databases, upload design docs).
-
-couchdb.yml.user:
-
-  when activited, leap_web has normal permissions (e.g. can modify all the
-  records).
-
-The term 'user' here is misleading. It is really two different types of admin
-permissions.
-
-Rails or rake must be run with 'test' environment for these configs to be
-used.
diff --git a/test/config/gitlab/couchdb.yml b/test/config/gitlab/couchdb.yml
deleted file mode 100644
index 68761dc..0000000
--- a/test/config/gitlab/couchdb.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-test:
-  auto_update_design_doc: false
-  host: "couchdb"
diff --git a/test/config/travis/couchdb.admin.yml b/test/config/travis/couchdb.admin.yml
deleted file mode 100644
index a7677f9..0000000
--- a/test/config/travis/couchdb.admin.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-test:
-  auto_update_design_doc: false
-  username: "anna"
-  password: "secret"
-
diff --git a/test/config/travis/couchdb.yml b/test/config/travis/couchdb.yml
deleted file mode 100644
index a57b888..0000000
--- a/test/config/travis/couchdb.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-test:
-  auto_update_design_doc: false
-  username: "me"
-  password: "pwd"
diff --git a/test/config/travis/ruby-version b/test/config/travis/ruby-version
deleted file mode 100644
index 68b3a4c..0000000
--- a/test/config/travis/ruby-version
+++ /dev/null
@@ -1 +0,0 @@
-1.9.3-p551
diff --git a/test/config/travis/setup_couch.sh b/test/config/travis/setup_couch.sh
deleted file mode 100755
index 0502c12..0000000
--- a/test/config/travis/setup_couch.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-HOST="http://localhost:5984"
-echo "couch version :"
-curl -X GET $HOST
-echo "creating user :"
-curl -HContent-Type:application/json -XPUT $HOST/_users/org.couchdb.user:me --data-binary '{"_id": "org.couchdb.user:me","name": "me","roles": [],"type": "user","password": "pwd"}'
-echo "creating databases :"
-curl -X PUT $HOST/sessions
-curl -X PUT $HOST/users
-curl -X PUT $HOST/tickets
-echo "restricting database access :"
-curl -X PUT $HOST/sessions/_security -Hcontent-type:application/json --data-binary '{"admins":{"names":[],"roles":[]},"members":{"names":["me"],"roles":[]}}'
-curl -X PUT $HOST/users/_security -Hcontent-type:application/json --data-binary '{"admins":{"names":[],"roles":[]},"members":{"names":["me"],"roles":[]}}'
-curl -X PUT $HOST/tickets/_security -Hcontent-type:application/json --data-binary '{"admins":{"names":[],"roles":[]},"members":{"names":["me"],"roles":[]}}'
-echo "adding admin :"
-curl -X PUT $HOST/_config/admins/anna -d '"secret"'
-- 
cgit v1.2.3


From 29133bb6f54c58271292794a72e65399488783c0 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 15 Aug 2016 11:34:01 +0200
Subject: cleanup: remove outdated travis setup

---
 .travis.yml                   | 4 ----
 config/ci/travis/ruby-version | 1 -
 2 files changed, 5 deletions(-)
 delete mode 100644 config/ci/travis/ruby-version

diff --git a/.travis.yml b/.travis.yml
index ecf2c16..ab5f78b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,11 +2,7 @@ services:
   - couchdb
 notifications:
   email: false
-before_install:
-  - "gem install bundler --version 1.11.2"
 before_script:
-  - "rm .ruby-version"
-  - "mv config/ci/travis/ruby-version .ruby-version"
   - "config/ci/travis/setup_couch.sh"
   - "mv config/ci/travis/couchdb.admin.yml config/couchdb.admin.yml"
   - "mv config/ci/travis/couchdb.yml config/couchdb.yml"
diff --git a/config/ci/travis/ruby-version b/config/ci/travis/ruby-version
deleted file mode 100644
index 68b3a4c..0000000
--- a/config/ci/travis/ruby-version
+++ /dev/null
@@ -1 +0,0 @@
-1.9.3-p551
-- 
cgit v1.2.3


From 598d73f462a21618c01ea8afd76ebec0bc999298 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 15 Aug 2016 12:04:34 +0200
Subject: [ci] fix travis by using container builds

This is supposed to fix the bundler error reported in
https://github.com/bundler/bundler/issues/3558

sudo: false makes travis use the new infrastructure without sudo
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index ab5f78b..fbc4e06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+sudo: false
 services:
   - couchdb
 notifications:
-- 
cgit v1.2.3


From 75ef60dbf0c12841118065994f381fad110f8307 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 15 Aug 2016 12:06:54 +0200
Subject: [ci] gitlab: actually cache bundle

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3bf5571..45b5fd6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ services:
 # Cache gems in between builds
 cache:
   paths:
-    - vendor/ruby
+    - vendor/
 
 # This is a basic example for a gem or script which doesn't use
 # services such as redis or postgres
-- 
cgit v1.2.3


From 244462f805a7b60e099a379d7214907f728a6e00 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 15 Aug 2016 11:57:14 +0200
Subject: upgrade: rails to latest 4.2 series version

---
 Gemfile.lock | 82 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 42 insertions(+), 40 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ff69a08..88be79b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -26,36 +26,36 @@ GEM
   remote: https://rubygems.org/
   specs:
     SyslogLogger (2.0)
-    actionmailer (4.2.6)
-      actionpack (= 4.2.6)
-      actionview (= 4.2.6)
-      activejob (= 4.2.6)
+    actionmailer (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.6)
-      actionview (= 4.2.6)
-      activesupport (= 4.2.6)
+    actionpack (4.2.7.1)
+      actionview (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.6)
-      activesupport (= 4.2.6)
+    actionview (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.6)
-      activesupport (= 4.2.6)
+    activejob (4.2.7.1)
+      activesupport (= 4.2.7.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.6)
-      activesupport (= 4.2.6)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
-    activerecord (4.2.6)
-      activemodel (= 4.2.6)
-      activesupport (= 4.2.6)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       arel (~> 6.0)
-    activesupport (4.2.6)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -94,7 +94,7 @@ GEM
       simple_form (~> 3.2)
     cliver (0.3.2)
     coderay (1.1.1)
-    concurrent-ruby (1.0.1)
+    concurrent-ruby (1.0.2)
     couchrest (2.0.0.rc3)
       httpclient (~> 2.7)
       mime-types (>= 1.15)
@@ -142,7 +142,7 @@ GEM
       i18n (~> 0.5)
     ffi (1.9.10)
     gherkin (3.2.0)
-    globalid (0.3.6)
+    globalid (0.3.7)
       activesupport (>= 4.1.0)
     haml (4.0.7)
       tilt
@@ -180,20 +180,22 @@ GEM
       mime-types (>= 1.16, < 4)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (3.0)
+    mime-types (3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0221)
-    mini_portile2 (2.0.0)
-    minitest (5.8.4)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
     minitest-stub-const (0.5)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.11.3)
     multi_test (0.1.2)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     phantomjs-binaries (2.1.1.0)
       sys-uname (= 0.9.0)
+    pkg-config (1.1.7)
     poltergeist (1.9.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
@@ -208,16 +210,16 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.6)
-      actionmailer (= 4.2.6)
-      actionpack (= 4.2.6)
-      actionview (= 4.2.6)
-      activejob (= 4.2.6)
-      activemodel (= 4.2.6)
-      activerecord (= 4.2.6)
-      activesupport (= 4.2.6)
+    rails (4.2.7.1)
+      actionmailer (= 4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activerecord (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.6)
+      railties (= 4.2.7.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -232,12 +234,12 @@ GEM
       railties (~> 4.0)
     rails_warden (0.5.8)
       warden (>= 1.0.0)
-    railties (4.2.6)
-      actionpack (= 4.2.6)
-      activesupport (= 4.2.6)
+    railties (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.1.2)
+    rake (11.2.2)
     rdiscount (2.1.8)
     ref (2.0.0)
     regexp_parser (0.3.3)
@@ -262,10 +264,10 @@ GEM
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
     slop (3.6.0)
-    sprockets (3.6.0)
+    sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.4)
+    sprockets-rails (3.1.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-- 
cgit v1.2.3


From 3c6347de6b8dfa86fb4ae23bd07ae4b77db1742c Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 15 Aug 2016 12:02:06 +0200
Subject: upgrade: everything but rails (upgraded before)

---
 Gemfile      |  2 +-
 Gemfile.lock | 79 ++++++++++++++++++++++++++++++------------------------------
 2 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9689a94..1e82977 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ require File.expand_path('../lib/gemfile_tools.rb', __FILE__)
 ## CORE
 # rake 11.x throws lots of warnings about rails 3.2 code
 gem "rake"
-gem "rails", "~> 4.2.6"
+gem "rails", "~> 4.2.7"
 # TODO: drop this and the respond_with usage
 gem 'responders', '~> 2.0'
 gem "couchrest", "~> 2.0.0.rc3"
diff --git a/Gemfile.lock b/Gemfile.lock
index 88be79b..ab97719 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -63,7 +63,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.4.0)
     arel (6.0.3)
-    autoprefixer-rails (6.3.6)
+    autoprefixer-rails (6.4.0.2)
       execjs
     better_errors (2.1.1)
       coderay (>= 1.0.0)
@@ -71,13 +71,13 @@ GEM
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (3.3.6)
+    bootstrap-sass (3.3.7)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
-    braintree (2.60.0)
+    braintree (2.65.0)
       builder (>= 2.0.0)
     builder (3.2.2)
-    byebug (8.2.5)
+    byebug (9.0.5)
     capybara (2.7.1)
       addressable
       mime-types (>= 1.16)
@@ -85,49 +85,49 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    client_side_validations (4.2.3)
+    client_side_validations (4.2.5)
       jquery-rails (>= 3.1.2, < 5.0.0)
       js_regex (~> 1.0, >= 1.0.9)
       rails (>= 4.0.0, < 4.3.0)
-    client_side_validations-simple_form (3.2.3)
+    client_side_validations-simple_form (3.2.4)
       client_side_validations (~> 4.2.3)
       simple_form (~> 3.2)
     cliver (0.3.2)
     coderay (1.1.1)
     concurrent-ruby (1.0.2)
-    couchrest (2.0.0.rc3)
-      httpclient (~> 2.7)
+    couchrest (2.0.0)
+      httpclient (~> 2.8)
       mime-types (>= 1.15)
       multi_json (~> 1.7)
-    couchrest_model (2.1.0.beta2)
+    couchrest_model (2.1.0.rc1)
       activemodel (~> 4.0)
-      couchrest (= 2.0.0.rc3)
+      couchrest (= 2.0.0)
       tzinfo (>= 0.3.22)
     couchrest_session_store (0.4.2)
       actionpack (~> 4.0)
       couchrest (~> 2.0.0.rc3)
       couchrest_model (~> 2.1.0.beta2)
-    cucumber (2.3.3)
+    cucumber (2.4.0)
       builder (>= 2.1.2)
-      cucumber-core (~> 1.4.0)
+      cucumber-core (~> 1.5.0)
       cucumber-wire (~> 0.0.1)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 3.2.0)
+      gherkin (~> 4.0)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
-    cucumber-core (1.4.0)
-      gherkin (~> 3.2.0)
-    cucumber-rails (1.4.3)
+    cucumber-core (1.5.0)
+      gherkin (~> 4.0)
+    cucumber-rails (1.4.4)
       capybara (>= 1.1.2, < 3)
       cucumber (>= 1.3.8, < 3)
       mime-types (>= 1.16, < 4)
       nokogiri (~> 1.5)
-      railties (>= 3, < 5)
+      railties (>= 3, < 5.1)
     cucumber-wire (0.0.1)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    execjs (2.6.0)
+    execjs (2.7.0)
     factory_girl (4.7.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.7.0)
@@ -138,10 +138,10 @@ GEM
       braintree (~> 2.32)
       capybara (>= 2.2.0)
       sinatra
-    faker (1.6.3)
+    faker (1.6.6)
       i18n (~> 0.5)
-    ffi (1.9.10)
-    gherkin (3.2.0)
+    ffi (1.9.14)
+    gherkin (4.0.0)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     haml (4.0.7)
@@ -158,17 +158,17 @@ GEM
       nokogiri (~> 1.6.0)
       ruby_parser (~> 3.5)
     http_accept_language (2.0.5)
-    httpclient (2.8.0)
+    httpclient (2.8.1)
     i18n (0.7.0)
     i18n-missing_translations (0.0.1)
     jquery-rails (4.1.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    js_regex (1.0.14)
-      regexp_parser (= 0.3.3)
+    js_regex (1.0.17)
+      regexp_parser (= 0.3.6)
     json (1.8.3)
-    kaminari (0.16.3)
+    kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     launchy (2.4.3)
@@ -188,7 +188,7 @@ GEM
     minitest-stub-const (0.5)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.11.3)
+    multi_json (1.12.1)
     multi_test (0.1.2)
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
@@ -196,12 +196,11 @@ GEM
     phantomjs-binaries (2.1.1.0)
       sys-uname (= 0.9.0)
     pkg-config (1.1.7)
-    poltergeist (1.9.0)
+    poltergeist (1.10.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
-      multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    pry (0.10.3)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -229,7 +228,7 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    rails-i18n (4.0.8)
+    rails-i18n (4.0.9)
       i18n (~> 0.7)
       railties (~> 4.0)
     rails_warden (0.5.8)
@@ -240,17 +239,17 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (11.2.2)
-    rdiscount (2.1.8)
+    rdiscount (2.2.0.1)
     ref (2.0.0)
-    regexp_parser (0.3.3)
-    responders (2.1.2)
+    regexp_parser (0.3.6)
+    responders (2.2.0)
       railties (>= 4.2.0, < 5.1)
     ruby-srp (0.2.1)
-    ruby_parser (3.8.1)
+    ruby_parser (3.8.2)
       sexp_processor (~> 4.1)
     sass (3.4.22)
-    sass-rails (5.0.4)
-      railties (>= 4.0.0, < 5.0)
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
@@ -278,17 +277,17 @@ GEM
       ref
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.2)
+    tilt (2.0.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (3.0.0)
+    uglifier (3.0.1)
       execjs (>= 0.3.0, < 3)
     valid_email (0.0.13)
       activemodel
       mail (~> 2.6.1)
     warden (1.2.6)
       rack (>= 1.0)
-    websocket-driver (0.6.3)
+    websocket-driver (0.6.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     xpath (2.0.0)
@@ -328,7 +327,7 @@ DEPENDENCIES
   phantomjs-binaries
   poltergeist
   pry
-  rails (~> 4.2.6)
+  rails (~> 4.2.7)
   rails-i18n
   rails_warden
   rake
-- 
cgit v1.2.3


From 20bb76848b852bba9ab3c99b1c2a68464585bd56 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Wed, 17 Aug 2016 16:11:46 +0200
Subject: bugfix: send 406 if an unexpected format is asked for

It used to run the action and then trigger a 500 because the
template was not found.

fixes !3 .
---
 app/controllers/application_controller.rb | 19 +++++++++++++++++++
 test/functional/home_controller_test.rb   | 16 ++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 test/functional/home_controller_test.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2af2f29..61ced21 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,5 +1,6 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
+  before_action :check_mime_types
   before_filter :set_locale
   before_filter :no_cache_header
   before_filter :no_frame_header
@@ -9,8 +10,26 @@ class ApplicationController < ActionController::Base
 
   ActiveSupport.run_load_hooks(:application_controller, self)
 
+  # by default we only respond to html.
+  # If you want to respond with json you are probably working on
+  # an ApiController.
+  respond_to :html
+
   protected
 
+  # UPGRADE: this won't be needed in Rails 5 anymore as it's the default
+  # behavior if a template is present but a different format would be
+  # rendered and that template is not present
+  def check_mime_types
+    mimes = collect_mimes_from_class_level()
+    return if mimes.empty?
+
+    collector = ActionController::MimeResponds::Collector.new(mimes, request.variant)
+    unless collector.negotiate_format(request)
+      raise ActionController::UnknownFormat
+    end
+  end
+
   def default_error_handler(exc)
     respond_to do |format|
       format.json { render_json_error(exc) }
diff --git a/test/functional/home_controller_test.rb b/test/functional/home_controller_test.rb
new file mode 100644
index 0000000..cafaac5
--- /dev/null
+++ b/test/functional/home_controller_test.rb
@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class HomeControllerTest < ActionController::TestCase
+
+  def test_renders_okay
+    get :index
+    assert_response :success
+  end
+
+  def test_other_formats_trigger_406
+    assert_raises ActionController::UnknownFormat do
+      get :index, format: :xml
+    end
+  end
+
+end
-- 
cgit v1.2.3


From fbad882075e745ab7afbe5f89c67544fb3c607c3 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 18 Aug 2016 11:00:16 +0200
Subject: respond_to on a per controller basis

If you inherit respond to and call it again in your controller
it will not overwrite the previous but add to it.

Since we always have some exceptions from the rules it's probably
easiest to be explicit in the controllers that require it themselves.
---
 app/controllers/account_controller.rb              |  2 ++
 app/controllers/account_settings_controller.rb     |  0
 app/controllers/api/identities_controller.rb       |  2 ++
 app/controllers/api/services_controller.rb         |  2 ++
 app/controllers/api/sessions_controller.rb         |  1 +
 app/controllers/api_controller.rb                  |  1 -
 app/controllers/application_controller.rb          | 26 ++++++++--------------
 app/controllers/errors_controller.rb               |  2 ++
 app/controllers/home_controller.rb                 |  2 ++
 app/controllers/pages_controller.rb                |  2 ++
 app/controllers/sessions_controller.rb             |  3 ++-
 app/controllers/users_controller.rb                |  2 +-
 .../app/controllers/billing_admin_controller.rb    |  1 +
 .../app/controllers/billing_base_controller.rb     |  2 ++
 .../billing/app/controllers/payments_controller.rb |  2 ++
 .../app/controllers/subscriptions_controller.rb    |  3 +++
 test/functional/api/certs_controller_test.rb       |  6 +++++
 test/functional/api/sessions_controller_test.rb    |  3 ++-
 test/integration/api/smtp_cert_test.rb             | 12 +++-------
 test/support/api_controller_test.rb                |  2 +-
 test/support/api_integration_test.rb               | 14 +++++++-----
 21 files changed, 53 insertions(+), 37 deletions(-)
 delete mode 100644 app/controllers/account_settings_controller.rb

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index ee7cca4..42e8983 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -3,6 +3,8 @@ class AccountController < ApplicationController
   before_filter :require_registration_allowed
   before_filter :redirect_if_logged_in
 
+  respond_to :html
+
   def new
     @user = User.new
   end
diff --git a/app/controllers/account_settings_controller.rb b/app/controllers/account_settings_controller.rb
deleted file mode 100644
index e69de29..0000000
diff --git a/app/controllers/api/identities_controller.rb b/app/controllers/api/identities_controller.rb
index ab2ac00..de4910a 100644
--- a/app/controllers/api/identities_controller.rb
+++ b/app/controllers/api/identities_controller.rb
@@ -3,6 +3,8 @@ module Api
     before_filter :token_authenticate
     before_filter :require_monitor
 
+    respond_to :json
+
     def show
       @identity = Identity.find_by_address(params[:id])
       if @identity
diff --git a/app/controllers/api/services_controller.rb b/app/controllers/api/services_controller.rb
index da2774b..58e129c 100644
--- a/app/controllers/api/services_controller.rb
+++ b/app/controllers/api/services_controller.rb
@@ -2,6 +2,8 @@ class Api::ServicesController < ApiController
 
   before_filter :require_login, :unless => :anonymous_access_allowed?
 
+  respond_to :json
+
   def show
     respond_with current_user.effective_service_level
   end
diff --git a/app/controllers/api/sessions_controller.rb b/app/controllers/api/sessions_controller.rb
index c8deb7a..178f86e 100644
--- a/app/controllers/api/sessions_controller.rb
+++ b/app/controllers/api/sessions_controller.rb
@@ -2,6 +2,7 @@ module Api
   class SessionsController < ApiController
 
     before_filter :require_login, only: :destroy
+    respond_to :json
 
     def new
       @session = Session.new
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 70b3cac..95c8f57 100644
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -1,7 +1,6 @@
 class ApiController < ApplicationController
 
   skip_before_filter :verify_authenticity_token
-  respond_to :json
 
   protected
 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 61ced21..8d08a2c 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,33 +1,25 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  before_action :check_mime_types
   before_filter :set_locale
   before_filter :no_cache_header
   before_filter :no_frame_header
   before_filter :language_header
+
+  # UPGRADE: this won't be needed in Rails 5 anymore as it's the default
+  # behavior if a template is present but a different format would be
+  # rendered and that template is not present
+  before_filter :verify_request_format!, if: :mime_types_specified
+
   rescue_from StandardError, :with => :default_error_handler
   rescue_from CouchRest::Exception, :with => :default_error_handler
 
   ActiveSupport.run_load_hooks(:application_controller, self)
 
-  # by default we only respond to html.
-  # If you want to respond with json you are probably working on
-  # an ApiController.
-  respond_to :html
-
   protected
 
-  # UPGRADE: this won't be needed in Rails 5 anymore as it's the default
-  # behavior if a template is present but a different format would be
-  # rendered and that template is not present
-  def check_mime_types
-    mimes = collect_mimes_from_class_level()
-    return if mimes.empty?
-
-    collector = ActionController::MimeResponds::Collector.new(mimes, request.variant)
-    unless collector.negotiate_format(request)
-      raise ActionController::UnknownFormat
-    end
+  def mime_types_specified
+    mimes = collect_mimes_from_class_level
+    mimes.present?
   end
 
   def default_error_handler(exc)
diff --git a/app/controllers/errors_controller.rb b/app/controllers/errors_controller.rb
index d869ab5..80c270f 100644
--- a/app/controllers/errors_controller.rb
+++ b/app/controllers/errors_controller.rb
@@ -1,5 +1,7 @@
 # We render http errors ourselves so we can customize them
 class ErrorsController < ApplicationController
+  respond_to :html
+
   # 404
   def not_found
     render status: 404
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 1d62178..86c36e9 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,6 +1,8 @@
 class HomeController < ApplicationController
   layout 'home'
 
+  respond_to :html
+
   def index
     if logged_in?
       redirect_to current_user
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index e0f39e3..b9c601a 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -2,7 +2,9 @@
 # Render static pages
 #
 
+
 class PagesController < ApplicationController
+  respond_to :html
 
   def show
     @show_navigation = false
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 34d4f53..18e5216 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,6 +1,7 @@
 class SessionsController < ApplicationController
 
   before_filter :redirect_if_logged_in, :only => [:new]
+  respond_to :html, :json
 
   def new
     @session = Session.new
@@ -16,7 +17,7 @@ class SessionsController < ApplicationController
   end
 
   #
-  # Warden will catch all 401s and run this instead:
+  # Warden will catch all 401s and triggers this action:
   #
   def unauthenticated
     login_required
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4d198b9..0a0f551 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -7,7 +7,7 @@ class UsersController < ApplicationController
 
   before_filter :require_login
   before_filter :require_admin, :only => [:index, :deactivate, :enable]
-  before_filter :fetch_user, :only => [:show, :edit, :destroy, :deactivate, :enable]
+  before_filter :fetch_user, :except => [:index]
 
   respond_to :html
 
diff --git a/engines/billing/app/controllers/billing_admin_controller.rb b/engines/billing/app/controllers/billing_admin_controller.rb
index 23740d6..7a1de30 100644
--- a/engines/billing/app/controllers/billing_admin_controller.rb
+++ b/engines/billing/app/controllers/billing_admin_controller.rb
@@ -1,5 +1,6 @@
 class BillingAdminController < BillingBaseController
   before_filter :require_admin
+  respond_to :html
 
   #not sure if this controller is still needed. Admin can easly acess
   #braintree's dashboard and check subscriptions. Don't know if everything
diff --git a/engines/billing/app/controllers/billing_base_controller.rb b/engines/billing/app/controllers/billing_base_controller.rb
index c343938..39d41e4 100644
--- a/engines/billing/app/controllers/billing_base_controller.rb
+++ b/engines/billing/app/controllers/billing_base_controller.rb
@@ -3,6 +3,8 @@ class BillingBaseController < ApplicationController
 
   helper 'billing'
 
+  protected
+
   # required for navigation to work.
   def assign_user
     if params[:user_id]
diff --git a/engines/billing/app/controllers/payments_controller.rb b/engines/billing/app/controllers/payments_controller.rb
index 871f1b4..4f93aa6 100644
--- a/engines/billing/app/controllers/payments_controller.rb
+++ b/engines/billing/app/controllers/payments_controller.rb
@@ -1,6 +1,8 @@
 class PaymentsController < BillingBaseController
   before_filter :require_login, :only => [:index]
 
+  respond_to :html
+
   def new
     if current_user.has_payment_info?
       @client_token = Braintree::ClientToken.generate(customer_id: current_user.braintree_customer_id)
diff --git a/engines/billing/app/controllers/subscriptions_controller.rb b/engines/billing/app/controllers/subscriptions_controller.rb
index 1d29cac..9df4ecd 100644
--- a/engines/billing/app/controllers/subscriptions_controller.rb
+++ b/engines/billing/app/controllers/subscriptions_controller.rb
@@ -1,4 +1,7 @@
 class SubscriptionsController < BillingBaseController
+
+  respond_to :html
+
   before_filter :require_login
   before_filter :assign_user
   before_filter :confirm_cancel_subscription, only: [:destroy]
diff --git a/test/functional/api/certs_controller_test.rb b/test/functional/api/certs_controller_test.rb
index f23b4c8..25ceb8e 100644
--- a/test/functional/api/certs_controller_test.rb
+++ b/test/functional/api/certs_controller_test.rb
@@ -57,4 +57,10 @@ class Api::CertsControllerTest < ApiControllerTest
       returns(cert)
     return cert
   end
+
+  # overwrite defaults from ApiController because we don't do json here.
+  def add_api_defaults(args)
+    add_defaults args, version: '2'
+  end
+
 end
diff --git a/test/functional/api/sessions_controller_test.rb b/test/functional/api/sessions_controller_test.rb
index 03a1ef9..06a3c22 100644
--- a/test/functional/api/sessions_controller_test.rb
+++ b/test/functional/api/sessions_controller_test.rb
@@ -44,7 +44,8 @@ class Api::SessionsControllerTest < ApiControllerTest
 
     api_post :update, :id => @user.login, :client_auth => @client_hex
 
-    assert_nil session[:handshake]
+    assert_nil session[:handshake],
+      'session should be cleared to prevent session fixation attacks'
     assert_response :success
     assert json_response.keys.include?("id")
     assert json_response.keys.include?("token")
diff --git a/test/integration/api/smtp_cert_test.rb b/test/integration/api/smtp_cert_test.rb
index 53382c1..3adddfd 100644
--- a/test/integration/api/smtp_cert_test.rb
+++ b/test/integration/api/smtp_cert_test.rb
@@ -3,13 +3,8 @@ require 'openssl'
 
 class SmtpCertTest < ApiIntegrationTest
 
-  setup do
-    @testcode = InviteCode.new
-    @testcode.save!
-  end
-
   test "retrieve smtp cert" do
-    @user = FactoryGirl.create :user, effective_service_level_code: 2, :invite_code => @testcode.invite_code
+    @user = create_invited_user effective_service_level_code: 2
     login
     post smtp_cert_url, {}, RACK_ENV
     assert_text_response
@@ -20,7 +15,7 @@ class SmtpCertTest < ApiIntegrationTest
   end
 
   test "cert and key" do
-    @user = FactoryGirl.create :user, effective_service_level_code: 2, :invite_code => @testcode.invite_code
+    @user = create_invited_user effective_service_level_code: 2
     login
     post smtp_cert_url, {}, RACK_ENV
     assert_text_response
@@ -32,7 +27,7 @@ class SmtpCertTest < ApiIntegrationTest
   end
 
   test "fingerprint is stored with identity" do
-    @user = FactoryGirl.create :user, effective_service_level_code: 2, :invite_code => @testcode.invite_code
+    @user = create_invited_user effective_service_level_code: 2
     login
     post smtp_cert_url, {}, RACK_ENV
     assert_text_response
@@ -46,7 +41,6 @@ class SmtpCertTest < ApiIntegrationTest
   end
 
   test "fetching smtp certs requires email account" do
-
     login
     post smtp_cert_url, {}, RACK_ENV
     assert_access_denied
diff --git a/test/support/api_controller_test.rb b/test/support/api_controller_test.rb
index 06cb46a..97d86fc 100644
--- a/test/support/api_controller_test.rb
+++ b/test/support/api_controller_test.rb
@@ -17,7 +17,7 @@ class ApiControllerTest < ActionController::TestCase
   end
 
   def add_api_defaults(args)
-    add_defaults args, version: '2'
+    add_defaults args, version: '2', format: :json
   end
 
   def add_defaults(args, defaults)
diff --git a/test/support/api_integration_test.rb b/test/support/api_integration_test.rb
index cea480c..7942558 100644
--- a/test/support/api_integration_test.rb
+++ b/test/support/api_integration_test.rb
@@ -7,13 +7,8 @@ class ApiIntegrationTest < ActionDispatch::IntegrationTest
     2
   end
 
-  setup do
-    @testcode = InviteCode.new
-    @testcode.save!
-  end
-
   def login(user = nil)
-    @user ||= user ||= FactoryGirl.create(:user, :invite_code => @testcode.invite_code)
+    @user ||= user ||= create_invited_user
     # DUMMY_TOKEN will be frozen. So let's use a dup
     @token ||= DUMMY_TOKEN.dup
     # make sure @token is up to date if it already exists
@@ -23,6 +18,13 @@ class ApiIntegrationTest < ActionDispatch::IntegrationTest
     @token.save
   end
 
+  def create_invited_user(options = {})
+    @testcode = InviteCode.new
+    @testcode.save!
+    options.reverse_merge! invite_code: @testcode.invite_code
+    FactoryGirl.create :user, options
+  end
+
   teardown do
     if @user && @user.persisted?
       @user.destroy_identities
-- 
cgit v1.2.3


From e46f318077f061a82ac64c767e869ae12666119a Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 26 Aug 2016 10:35:02 +0200
Subject: [load] require login_format_validation in session

We moved it into the lib folder so it's not in an autoload path anymore.
So now it needs to be required before being used.

This fixes a load order issue that would cause non-deterministic failures
in CI
---
 app/models/session.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/session.rb b/app/models/session.rb
index 0d7e10e..21e4dc6 100644
--- a/app/models/session.rb
+++ b/app/models/session.rb
@@ -1,3 +1,5 @@
+require 'login_format_validation'
+
 class Session < SRP::Session
   include ActiveModel::Validations
   include LoginFormatValidation
-- 
cgit v1.2.3


From e1e98d0229b8b79de2105515f0312903a23dc335 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Wed, 24 Aug 2016 15:23:07 +0200
Subject: Update with Twitter

---
 .gitignore                              |  4 +-
 Gemfile                                 |  1 +
 Gemfile.lock                            | 35 ++++++++++++++-
 app/assets/stylesheets/application.scss |  1 +
 app/assets/stylesheets/twitter.scss     | 76 +++++++++++++++++++++++++++++++++
 app/controllers/home_controller.rb      | 17 ++++++++
 app/controllers/twitter_controller.rb   | 19 +++++++++
 app/helpers/twitter_helper.rb           |  2 +
 app/views/home/_content.html.haml       |  6 ++-
 app/views/home/index.html.haml          |  3 +-
 app/views/twitter/_index.html.erb       | 26 +++++++++++
 config/defaults.yml                     |  6 +++
 config/routes.rb                        |  2 +
 13 files changed, 193 insertions(+), 5 deletions(-)
 create mode 100644 app/assets/stylesheets/twitter.scss
 create mode 100644 app/controllers/twitter_controller.rb
 create mode 100644 app/helpers/twitter_helper.rb
 create mode 100644 app/views/twitter/_index.html.erb

diff --git a/.gitignore b/.gitignore
index 8d49deb..5565d6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,7 +33,9 @@ public/assets/*
 public/ca.crt
 public/config/*
 public/provider.json
-config/config.yml
+# config/config.yml
+config.secrets.yml
+config/initializers/test.rb
 public/1/*
 vendor/bundle/*
 public/img
diff --git a/Gemfile b/Gemfile
index 1e82977..3b5435e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -98,6 +98,7 @@ end
 ##
 ## OPTIONAL GEMS AND ENGINES
 ##
+gem 'twitter'
 
 enabled_engines.each do |name, gem_info|
   gem gem_info[:name], :path => gem_info[:path], :groups => gem_info[:env]
diff --git a/Gemfile.lock b/Gemfile.lock
index ab97719..8601b75 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -76,6 +76,7 @@ GEM
       sass (>= 3.3.4)
     braintree (2.65.0)
       builder (>= 2.0.0)
+    buftok (0.2.0)
     builder (3.2.2)
     byebug (9.0.5)
     capybara (2.7.1)
@@ -126,6 +127,9 @@ GEM
     cucumber-wire (0.0.1)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
+    domain_name (0.5.20160615)
+      unf (>= 0.0.5, < 1.0.0)
+    equalizer (0.0.10)
     erubis (2.7.0)
     execjs (2.7.0)
     factory_girl (4.7.0)
@@ -140,6 +144,8 @@ GEM
       sinatra
     faker (1.6.6)
       i18n (~> 0.5)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
     ffi (1.9.14)
     gherkin (4.0.0)
     globalid (0.3.7)
@@ -157,7 +163,16 @@ GEM
       haml (~> 4.0.0)
       nokogiri (~> 1.6.0)
       ruby_parser (~> 3.5)
+    http (1.0.4)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (~> 1.0.1)
+      http_parser.rb (~> 0.6.0)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    http-form_data (1.0.1)
     http_accept_language (2.0.5)
+    http_parser.rb (0.6.0)
     httpclient (2.8.1)
     i18n (0.7.0)
     i18n-missing_translations (0.0.1)
@@ -178,6 +193,8 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
+    memoizable (0.4.2)
+      thread_safe (~> 0.3, >= 0.3.1)
     metaclass (0.0.4)
     method_source (0.8.2)
     mime-types (3.1)
@@ -190,6 +207,8 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.12.1)
     multi_test (0.1.2)
+    multipart-post (2.0.0)
+    naught (1.1.0)
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
@@ -258,6 +277,7 @@ GEM
     simple_form (3.2.1)
       actionpack (> 4, < 5.1)
       activemodel (> 4, < 5.1)
+    simple_oauth (0.3.1)
     sinatra (1.4.7)
       rack (~> 1.5)
       rack-protection (~> 1.4)
@@ -278,10 +298,22 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.5)
+    twitter (5.16.0)
+      addressable (~> 2.3)
+      buftok (~> 0.2.0)
+      equalizer (= 0.0.10)
+      faraday (~> 0.9.0)
+      http (~> 1.0)
+      http_parser.rb (~> 0.6.0)
+      json (~> 1.8)
+      memoizable (~> 0.4.0)
+      naught (~> 1.0)
+      simple_oauth (~> 0.3.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (3.0.1)
       execjs (>= 0.3.0, < 3)
+    unf (0.2.0.beta2)
     valid_email (0.0.13)
       activemodel
       mail (~> 2.6.1)
@@ -337,8 +369,9 @@ DEPENDENCIES
   sass-rails
   simple_form
   therubyracer
+  twitter
   uglifier
   valid_email
 
 BUNDLED WITH
-   1.11.2
+   1.12.5
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 856a559..f42044b 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -16,6 +16,7 @@
 // LEAP web app specific overrides
 //
 @import "leap";
+@import "twitter";
 
 // And finally bootswatch style itself
 // @import "bootswatch/cerulean/bootswatch";
diff --git a/app/assets/stylesheets/twitter.scss b/app/assets/stylesheets/twitter.scss
new file mode 100644
index 0000000..1d54785
--- /dev/null
+++ b/app/assets/stylesheets/twitter.scss
@@ -0,0 +1,76 @@
+.twitter {
+  // position: fixed;
+  // top: 0;
+  // right: 10px;
+  // bottom: 0;
+  // overflow: auto;
+  // width: 250px;
+}
+.twitter_header {
+  padding-top: 8px;
+  height: 30px;
+  font-size: 20px ;
+  text-align: center;
+}
+
+.tweets:hover {
+    background-color: #ccf2ff;
+  }
+
+.tweets {
+  border-bottom-style: solid;
+  border-color: #bfbfbf;
+  // display: inline;
+  // height: 32px;
+  // width: 100%;
+  // position: absolute;
+  // text-align: center;
+}
+
+.tweets_pic {
+  display: block;
+  float: left;
+  width: 28px;
+  height: 33px;
+  padding-left: 8px;
+  padding-top: 8px;
+  // background: hsl(0, 0%, 30%);
+}
+
+.tweets_name {
+  padding-left: 45px;
+  padding-top: 16px;
+  // border-bottom-style: solid;
+  // border-color: #00bfff;
+}
+
+.tweet_text {
+  padding-left: 8px;
+  padding-top: 15px;
+}
+
+.text_date {
+  text-align: right;
+  padding-top: 4px;
+  font-size: 12px ;
+}
+.twitter_footer {
+  padding-top: 8px;
+}
+
+.twitter-image-frame {
+  width: 40px;
+  height: 40px;
+  overflow: hidden;
+  position: relative;
+}
+
+.twitter-image-frame > img {
+  display: block;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  margin: auto;
+}
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 86c36e9..49471ff 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -4,8 +4,25 @@ class HomeController < ApplicationController
   respond_to :html
 
   def index
+    unless Rails.application.secrets.twitter['enabled'] == false
+      twitter_handle = Rails.application.secrets.twitter['twitter_handle']
+      @twitter_screen_name = twitter_handle
+      @twitter_name = twitter_client.user(twitter_handle).name
+      @tweets = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}
+      @tweet_time = "tweeted on"
+    end
+
     if logged_in?
       redirect_to current_user
     end
   end
+
+  def twitter_client
+    Twitter::REST::Client.new do |config|
+      config.consumer_key = Rails.application.secrets.twitter['consumer_key']
+      config.consumer_secret = Rails.application.secrets.twitter['consumer_secret']
+      config.bearer_token = Rails.application.secrets.twitter['bearer_token']
+    end
+  end
+
 end
diff --git a/app/controllers/twitter_controller.rb b/app/controllers/twitter_controller.rb
new file mode 100644
index 0000000..0f6a773
--- /dev/null
+++ b/app/controllers/twitter_controller.rb
@@ -0,0 +1,19 @@
+class TwitterController < ApplicationController
+  def twitter_client
+    Twitter::REST::Client.new do |config|
+      config.consumer_key = Rails.application.secrets.twitter['consumer_key']
+      config.consumer_secret = Rails.application.secrets.twitter['consumer_secret']
+      config.bearer_token = Rails.application.secrets.twitter['bearer_token']
+    end
+  end
+
+  def index
+    unless Rails.application.secrets.twitter['enabled'] == false
+      twitter_handle = Rails.application.secrets.twitter['twitter_handle']
+      @twitter_screen_name = twitter_handle
+      @twitter_name = twitter_client.user(twitter_handle).name
+      @tweets = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}
+      @tweet_time = "tweeted on"
+    end
+  end
+end
diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
new file mode 100644
index 0000000..bb3ed2d
--- /dev/null
+++ b/app/helpers/twitter_helper.rb
@@ -0,0 +1,2 @@
+module TwitterHelper
+end
diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml
index 67e4533..725c391 100644
--- a/app/views/home/_content.html.haml
+++ b/app/views/home/_content.html.haml
@@ -1,10 +1,12 @@
-.row
+.left.column
   %h1= t(:welcome, :provider => APP_CONFIG[:domain])
   .p=t(:welcome_message_html)
 
-.row
   = home_page_buttons
 
+.right.column
+  = render :partial => 'twitter/index'
+
   - if Rails.env == 'development'
     .row
       %hr
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 147cacd..7f07460 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -3,7 +3,8 @@
   #main
     .container-fluid
       = render 'home/content'
+
   #push
     -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3
 #footer
-  = render 'layouts/footer'
\ No newline at end of file
+  = render 'layouts/footer'
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
new file mode 100644
index 0000000..9825afa
--- /dev/null
+++ b/app/views/twitter/_index.html.erb
@@ -0,0 +1,26 @@
+<% unless Rails.application.secrets.twitter['enabled'] == false %>
+  <div class=twitter>
+      <div class="twitter_header">
+        Tweets by <%= @twitter_name %></p>
+      </div>
+    <!-- <p><a href="/followers"> You have <%= @num_followers %> followers.</a></p> -->
+    <% @tweets.each do |e| %>
+      <div class=tweets>
+          <div class="tweets_pic twitter-image-frame"><%= image_tag("team-loadtocode-Loading_icon.gif") %></div>
+          <!-- <img class="tweets_pic"></img> -->
+        <div class=tweets_name>
+          @<%= @twitter_screen_name %>
+        </div>
+        <div class=tweet_text>
+          <%= " #{e.text}" %>
+        </div>
+        <div class=text_date>
+          <%= @tweet_time %> <% t = e.created_at%> <%="#{t.strftime("%m/%d/%Y")}"%>
+        </div>
+      </div>
+    <% end %>
+      <div class="twitter_footer">
+        To prevent leakage no links are displayed. For more information visit @<%= @twitter_name %> on twitter.com.</p>
+      </div>
+    </div>
+  <% end %>
diff --git a/config/defaults.yml b/config/defaults.yml
index 7e2ea58..1c9195f 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -32,6 +32,7 @@ common: &common
   pagination_size: 30
   auth:
     token_expires_after: 60
+
   # handles that will be blocked from being used as logins or email aliases
   # in addition to the ones in /etc/passwd and http://tools.ietf.org/html/rfc2142
   handle_blacklist:
@@ -125,6 +126,11 @@ development:
   secret_token: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
   reraise_errors: true
 
+  twitter:
+    consumer_key    : Change_to_your_consumer_key
+    consumer_secret : Change_to_your_consumer_secret
+    bearer_token    : Change_to_your_bearer_token
+
 test:
   <<: *downloads
   <<: *dev_ca
diff --git a/config/routes.rb b/config/routes.rb
index b152c9c..cb39dc6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,6 @@
 LeapWeb::Application.routes.draw do
+  get 'twitter/index'
+
   #
   # Please do not use root_path or root_url. Use home_path and home_url instead,
   # so that the path will be correctly prefixed with the locale.
-- 
cgit v1.2.3


From 1a8ad3afdb26acf6ae05d5acca2de43ce44086e0 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Wed, 24 Aug 2016 15:31:30 +0200
Subject: Update in config

---
 config/config.yml | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 167 insertions(+)
 create mode 100644 config/config.yml

diff --git a/config/config.yml b/config/config.yml
new file mode 100644
index 0000000..ff3d936
--- /dev/null
+++ b/config/config.yml
@@ -0,0 +1,167 @@
+dev_ca: &dev_ca
+  client_ca_key: "./test/files/ca.key"
+  client_ca_cert: "./test/files/ca.crt"
+  ca_key_password: nil
+
+cert_options: &cert_options
+  client_cert_lifespan: "2 months"
+  client_cert_bit_size: 2024
+  client_cert_hash: "SHA256"
+  allow_limited_certs: false
+  allow_unlimited_certs: true
+  allow_anonymous_certs: false
+  limited_cert_prefix: "LIMITED"
+  unlimited_cert_prefix: "UNLIMITED"
+
+downloads: &downloads
+  client_download_domain: https://dl.bitmask.net
+  available_clients:
+    - linux
+    - osx
+    - windows
+    - android
+  download_paths:
+    android: /android/
+    linux:   /linux/
+    osx:     /mac/
+    windows: /windows/
+    other:   /
+
+common: &common
+  force_ssl: false
+  pagination_size: 30
+  auth:
+    token_expires_after: 60
+
+  # handles that will be blocked from being used as logins or email aliases
+  # in addition to the ones in /etc/passwd and http://tools.ietf.org/html/rfc2142
+  handle_blacklist:
+    - certmaster
+    - ssladmin
+    - arin-admin
+    - administrator
+    - www-data
+    - maildrop
+    - postmaster
+    - admin
+    - contact
+    - info
+    - noreply
+    - robot
+    - helpdesk
+    - help
+    - tickets
+    - owner
+  # handles that will be allowed despite being in /etc/passwd or rfc2142
+  handle_whitelist: []
+  # actions enabled in the account settings
+  # see /users/app/views/users/_edit.html.haml for a list.
+  user_actions: ['contact_email', 'destroy_account']
+  admin_actions: ['contact_email', 'change_pgp_key', 'change_service_level', 'destroy_account']
+  billing: ~
+  default_locale: :en
+  available_locales:
+    - :cs
+    - :de
+    - :el
+    - :en
+    - :es
+    - :fi
+    - :fr
+    - :hu
+    - :it
+    - :lt
+    - :nb
+    - :nl
+    - :pl
+    - :pt
+    - :ru
+    - :tr
+    - :zh
+  minimum_client_version: "0.5"
+  engines:
+    - support
+    - billing
+  allow_registration: true
+  invite_required: false
+  config_file_paths:
+    soledad-service: 'public/1/config/soledad-service.json'
+    eip-service: 'public/1/config/eip-service.json'
+    smtp-service: 'public/1/config/smtp-service.json'
+    provider: 'config/provider/provider.json'
+  mailer:
+    from_address: 'noreply'
+
+service_levels: &service_levels
+  service_levels:
+    1:
+      name: free
+      description: "free account, with rate limited VPN"
+      eip_rate_limit: true
+      storage: 100
+      services:
+        - eip
+    2:
+      name: premium
+      description: "premium account, with unlimited vpn"
+      rate:
+        USD: 10
+        EUR: 10
+      services:
+        - eip
+        - email
+  default_service_level: 1
+
+development:
+  <<: *downloads
+  <<: *dev_ca
+  <<: *cert_options
+  <<: *common
+  <<: *service_levels
+  admins: [blue, red, staff, ava]
+  api_tokens:
+    monitor: nil
+    admin: nil
+  domain: example.org
+  secret_token: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+  reraise_errors: true
+
+  twitter:
+    twitter_handle  : 'xxxxxxxxxxxxxxxxx'
+    consumer_key    : 'xxxxxxxxxxxxxxxxx'
+    consumer_secret : 'xxxxxxxxxxxxxxxxx'
+    bearer_token    : 'xxxxxxxxxxxxxxxxx'
+
+test:
+  <<: *downloads
+  <<: *dev_ca
+  <<: *cert_options
+  <<: *common
+  <<: *service_levels
+  admins: [admin, admin2]
+  api_tokens:
+    monitor: "212da28a59dcaca487365309dc93aa09"
+    admin: nil
+    allowed_ips:
+      - 0.0.0.0
+  domain: test.me
+  secret_token: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+  reraise_errors: true
+  billing: {}
+  default_locale: :en
+  available_locales:
+    - :en
+    - :de
+
+production:
+  <<: *downloads
+  <<: *cert_options
+  <<: *common
+  admins: []
+  api_tokens:
+    monitor: nil
+    admin: nil
+  domain: example.net
+  engines:
+    - support
+  # logfile: /path/to/your/logs
-- 
cgit v1.2.3


From 112d76fe1ba6c66c66e0b3beade901bcadd3410f Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Thu, 25 Aug 2016 18:05:45 +0200
Subject: One more gif to play with

---
 app/assets/images/team-loadtocode-Loading_icon.gif | Bin 0 -> 17490 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 app/assets/images/team-loadtocode-Loading_icon.gif

diff --git a/app/assets/images/team-loadtocode-Loading_icon.gif b/app/assets/images/team-loadtocode-Loading_icon.gif
new file mode 100644
index 0000000..a718bd8
Binary files /dev/null and b/app/assets/images/team-loadtocode-Loading_icon.gif differ
-- 
cgit v1.2.3


From 4054060a68c119c509228db34ec139f0a0e0c00a Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Thu, 25 Aug 2016 18:14:40 +0200
Subject: Update

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 5565d6e..49a57be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,7 +34,7 @@ public/ca.crt
 public/config/*
 public/provider.json
 # config/config.yml
-config.secrets.yml
+config/secrets.yml
 config/initializers/test.rb
 public/1/*
 vendor/bundle/*
-- 
cgit v1.2.3


From fecc0e9e1985be2d3767664453d4776ac20897c0 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Thu, 25 Aug 2016 20:50:12 +0200
Subject: Twitter controller now as helper, some more styling in CSS, bug fix

---
 app/assets/stylesheets/twitter.scss | 21 ++++++++++++--------
 app/controllers/home_controller.rb  | 17 -----------------
 app/helpers/twitter_helper.rb       | 22 +++++++++++++++++++++
 app/views/home/_content.html.haml   | 13 +++++++------
 app/views/twitter/_index.html.erb   | 38 ++++++++++++++++++-------------------
 config/routes.rb                    |  2 --
 6 files changed, 60 insertions(+), 53 deletions(-)

diff --git a/app/assets/stylesheets/twitter.scss b/app/assets/stylesheets/twitter.scss
index 1d54785..6b74cf7 100644
--- a/app/assets/stylesheets/twitter.scss
+++ b/app/assets/stylesheets/twitter.scss
@@ -1,5 +1,5 @@
 .twitter {
-  // position: fixed;
+  position: relative;
   // top: 0;
   // right: 10px;
   // bottom: 0;
@@ -11,13 +11,18 @@
   height: 30px;
   font-size: 20px ;
   text-align: center;
+  margin-bottom: 20px;
+}
+
+.twitter_list {
+  position: relative;
 }
 
-.tweets:hover {
+.tweet:hover {
     background-color: #ccf2ff;
   }
 
-.tweets {
+.tweet {
   border-bottom-style: solid;
   border-color: #bfbfbf;
   // display: inline;
@@ -27,7 +32,7 @@
   // text-align: center;
 }
 
-.tweets_pic {
+.tweet_pic {
   display: block;
   float: left;
   width: 28px;
@@ -37,7 +42,7 @@
   // background: hsl(0, 0%, 30%);
 }
 
-.tweets_name {
+.tweet_name {
   padding-left: 45px;
   padding-top: 16px;
   // border-bottom-style: solid;
@@ -49,7 +54,7 @@
   padding-top: 15px;
 }
 
-.text_date {
+.tweet_text_date {
   text-align: right;
   padding-top: 4px;
   font-size: 12px ;
@@ -58,14 +63,14 @@
   padding-top: 8px;
 }
 
-.twitter-image-frame {
+.twitter_image_frame {
   width: 40px;
   height: 40px;
   overflow: hidden;
   position: relative;
 }
 
-.twitter-image-frame > img {
+.twitter_image_frame > img {
   display: block;
   position: absolute;
   top: 0;
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 49471ff..86c36e9 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -4,25 +4,8 @@ class HomeController < ApplicationController
   respond_to :html
 
   def index
-    unless Rails.application.secrets.twitter['enabled'] == false
-      twitter_handle = Rails.application.secrets.twitter['twitter_handle']
-      @twitter_screen_name = twitter_handle
-      @twitter_name = twitter_client.user(twitter_handle).name
-      @tweets = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}
-      @tweet_time = "tweeted on"
-    end
-
     if logged_in?
       redirect_to current_user
     end
   end
-
-  def twitter_client
-    Twitter::REST::Client.new do |config|
-      config.consumer_key = Rails.application.secrets.twitter['consumer_key']
-      config.consumer_secret = Rails.application.secrets.twitter['consumer_secret']
-      config.bearer_token = Rails.application.secrets.twitter['bearer_token']
-    end
-  end
-
 end
diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index bb3ed2d..9fd4ffd 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -1,2 +1,24 @@
 module TwitterHelper
+
+  def twitter_client
+    Twitter::REST::Client.new do |config|
+      config.consumer_key = Rails.application.secrets.twitter['consumer_key']
+      config.consumer_secret = Rails.application.secrets.twitter['consumer_secret']
+      config.bearer_token = Rails.application.secrets.twitter['bearer_token']
+    end
+  end
+
+  def twitter_handle
+    Rails.application.secrets.twitter['twitter_handle']
+  end
+
+  def twitter_name
+    twitter_client.user(twitter_handle).name
+  end
+
+  def tweets
+    twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}
+  end
 end
+
+# unless Rails.application.secrets.twitter['enabled'] == false
diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml
index 725c391..6efd2d0 100644
--- a/app/views/home/_content.html.haml
+++ b/app/views/home/_content.html.haml
@@ -1,14 +1,15 @@
-.left.column
+.row
   %h1= t(:welcome, :provider => APP_CONFIG[:domain])
   .p=t(:welcome_message_html)
 
-  = home_page_buttons
-
-.right.column
-  = render :partial => 'twitter/index'
+.row
+  .col-md-9
+    = home_page_buttons
+  .col-md-3
+    = render 'twitter/index'
 
   - if Rails.env == 'development'
     .row
       %hr
       %p
-        = link_to "make donation", new_payment_path if APP_CONFIG[:payment].present?
+= link_to "make donation", new_payment_path if APP_CONFIG[:payment].present?
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 9825afa..3dab567 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -1,26 +1,24 @@
-<% unless Rails.application.secrets.twitter['enabled'] == false %>
-  <div class=twitter>
+  <div class="twitter">
       <div class="twitter_header">
-        Tweets by <%= @twitter_name %></p>
+        Tweets by <%= twitter_name %></p>
       </div>
-    <!-- <p><a href="/followers"> You have <%= @num_followers %> followers.</a></p> -->
-    <% @tweets.each do |e| %>
-      <div class=tweets>
-          <div class="tweets_pic twitter-image-frame"><%= image_tag("team-loadtocode-Loading_icon.gif") %></div>
-          <!-- <img class="tweets_pic"></img> -->
-        <div class=tweets_name>
-          @<%= @twitter_screen_name %>
-        </div>
-        <div class=tweet_text>
-          <%= " #{e.text}" %>
-        </div>
-        <div class=text_date>
-          <%= @tweet_time %> <% t = e.created_at%> <%="#{t.strftime("%m/%d/%Y")}"%>
-        </div>
+      <div class="twitter_list">
+        <% tweets.each do |e| %>
+          <div class="tweet">
+              <div class="tweet_pic twitter_image_frame"><%= image_tag("team-loadtocode-Loading_icon.gif") %></div>
+            <div class="tweet_name">
+              @<%= twitter_handle %>
+            </div>
+            <div class="tweet_text">
+              <%= " #{e.text}" %>
+            </div>
+            <div class="tweet_text_date">
+              tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
+            </div>
+          </div>
+        <% end %>
       </div>
-    <% end %>
       <div class="twitter_footer">
-        To prevent leakage no links are displayed. For more information visit @<%= @twitter_name %> on twitter.com.</p>
+        To prevent leakage no links are displayed. For more information visit @<%= twitter_name %> on twitter.com.</p>
       </div>
     </div>
-  <% end %>
diff --git a/config/routes.rb b/config/routes.rb
index cb39dc6..b152c9c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,4 @@
 LeapWeb::Application.routes.draw do
-  get 'twitter/index'
-
   #
   # Please do not use root_path or root_url. Use home_path and home_url instead,
   # so that the path will be correctly prefixed with the locale.
-- 
cgit v1.2.3


From 1959dd6077d9cac95d678b5378022234ccbf979b Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Thu, 25 Aug 2016 21:00:44 +0200
Subject: Code lives now in twitter_helper.rb

---
 app/controllers/twitter_controller.rb | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 app/controllers/twitter_controller.rb

diff --git a/app/controllers/twitter_controller.rb b/app/controllers/twitter_controller.rb
deleted file mode 100644
index 0f6a773..0000000
--- a/app/controllers/twitter_controller.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class TwitterController < ApplicationController
-  def twitter_client
-    Twitter::REST::Client.new do |config|
-      config.consumer_key = Rails.application.secrets.twitter['consumer_key']
-      config.consumer_secret = Rails.application.secrets.twitter['consumer_secret']
-      config.bearer_token = Rails.application.secrets.twitter['bearer_token']
-    end
-  end
-
-  def index
-    unless Rails.application.secrets.twitter['enabled'] == false
-      twitter_handle = Rails.application.secrets.twitter['twitter_handle']
-      @twitter_screen_name = twitter_handle
-      @twitter_name = twitter_client.user(twitter_handle).name
-      @tweets = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}
-      @tweet_time = "tweeted on"
-    end
-  end
-end
-- 
cgit v1.2.3


From e87d797cdbfe5ebe8dff789742adb6a82d92aae4 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Fri, 26 Aug 2016 17:16:35 +0200
Subject: Small updates on method to check if twitter feed enabled

---
 app/helpers/twitter_helper.rb     | 5 +++--
 app/views/twitter/_index.html.erb | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index 9fd4ffd..b01293f 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -1,4 +1,7 @@
 module TwitterHelper
+  def twitter_enabled
+    Rails.application.secrets.twitter['enabled'] == true
+  end
 
   def twitter_client
     Twitter::REST::Client.new do |config|
@@ -20,5 +23,3 @@ module TwitterHelper
     twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}
   end
 end
-
-# unless Rails.application.secrets.twitter['enabled'] == false
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 3dab567..8ac65be 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -1,3 +1,4 @@
+<% if twitter_enabled == true %>
   <div class="twitter">
       <div class="twitter_header">
         Tweets by <%= twitter_name %></p>
@@ -22,3 +23,4 @@
         To prevent leakage no links are displayed. For more information visit @<%= twitter_name %> on twitter.com.</p>
       </div>
     </div>
+<% end %>
-- 
cgit v1.2.3


From 62fb9ec13d2a34e152e270c3bdbf86766eb10373 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Fri, 26 Aug 2016 17:46:39 +0200
Subject: Update on .gitignore to delete an initializers file that doesn't
 exist any longer

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 49a57be..54547f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,7 +35,6 @@ public/config/*
 public/provider.json
 # config/config.yml
 config/secrets.yml
-config/initializers/test.rb
 public/1/*
 vendor/bundle/*
 public/img
-- 
cgit v1.2.3


From e3af6664f997d4dff227fdcd0246eff516520e96 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Fri, 26 Aug 2016 18:02:55 +0200
Subject: Adding config/config.yml file into .gitignore, cleaning up smaller
 typos

---
 .gitignore                        |  2 +-
 app/views/home/_content.html.haml | 10 +++++-----
 app/views/home/index.html.haml    |  1 -
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 54547f7..f898d47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,7 +33,7 @@ public/assets/*
 public/ca.crt
 public/config/*
 public/provider.json
-# config/config.yml
+config/config.yml
 config/secrets.yml
 public/1/*
 vendor/bundle/*
diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml
index 6efd2d0..a299295 100644
--- a/app/views/home/_content.html.haml
+++ b/app/views/home/_content.html.haml
@@ -8,8 +8,8 @@
   .col-md-3
     = render 'twitter/index'
 
-  - if Rails.env == 'development'
-    .row
-      %hr
-      %p
-= link_to "make donation", new_payment_path if APP_CONFIG[:payment].present?
+    - if Rails.env == 'development'
+      .row
+        %hr
+        %p
+          = link_to "make donation", new_payment_path if APP_CONFIG[:payment].present?
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 7f07460..5e33e62 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -3,7 +3,6 @@
   #main
     .container-fluid
       = render 'home/content'
-
   #push
     -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3
 #footer
-- 
cgit v1.2.3


From ea3fc6ffbb8f90aff28ce56fe4432a8d3ff18caa Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Mon, 29 Aug 2016 17:39:46 +0200
Subject: Changes mainly on CSS 'fine tuning' and shortening the Twitter API
 credentials, - only bearer token is needed to access Twitter API

---
 app/assets/stylesheets/twitter.scss |  55 ++++++------
 app/helpers/twitter_helper.rb       |   2 -
 app/views/twitter/_index.html.erb   |  22 +++--
 config/config.yml                   | 167 ------------------------------------
 config/defaults.yml                 |   5 +-
 5 files changed, 42 insertions(+), 209 deletions(-)
 delete mode 100644 config/config.yml

diff --git a/app/assets/stylesheets/twitter.scss b/app/assets/stylesheets/twitter.scss
index 6b74cf7..b0ce982 100644
--- a/app/assets/stylesheets/twitter.scss
+++ b/app/assets/stylesheets/twitter.scss
@@ -1,21 +1,15 @@
 .twitter {
   position: relative;
-  // top: 0;
-  // right: 10px;
-  // bottom: 0;
-  // overflow: auto;
-  // width: 250px;
 }
+
 .twitter_header {
-  padding-top: 8px;
-  height: 30px;
-  font-size: 20px ;
-  text-align: center;
-  margin-bottom: 20px;
+  font-size: 20px;
+  text-align: left;
+  margin-bottom: 30px;
 }
 
 .twitter_list {
-  position: relative;
+  box-sizing: border-box;
 }
 
 .tweet:hover {
@@ -25,33 +19,35 @@
 .tweet {
   border-bottom-style: solid;
   border-color: #bfbfbf;
-  // display: inline;
-  // height: 32px;
-  // width: 100%;
-  // position: absolute;
-  // text-align: center;
+  padding: 10px 8px;
+}
+
+.tweet_title {
+  position: relative;
+  height: 40px;
+  margin-bottom: 10px;
 }
 
 .tweet_pic {
   display: block;
-  float: left;
-  width: 28px;
-  height: 33px;
-  padding-left: 8px;
-  padding-top: 8px;
-  // background: hsl(0, 0%, 30%);
-}
+  width: 40px;
+  height: 40px;
+  overflow: hidden;
+  position: absolute;
+  left: 0;
+  top: 0;
+  }
 
 .tweet_name {
-  padding-left: 45px;
-  padding-top: 16px;
-  // border-bottom-style: solid;
-  // border-color: #00bfff;
+  padding-left: 50px;
+  line-height: 40px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .tweet_text {
-  padding-left: 8px;
-  padding-top: 15px;
+box-sizing: border-box;
 }
 
 .tweet_text_date {
@@ -67,7 +63,6 @@
   width: 40px;
   height: 40px;
   overflow: hidden;
-  position: relative;
 }
 
 .twitter_image_frame > img {
diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index b01293f..d20b7da 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -5,8 +5,6 @@ module TwitterHelper
 
   def twitter_client
     Twitter::REST::Client.new do |config|
-      config.consumer_key = Rails.application.secrets.twitter['consumer_key']
-      config.consumer_secret = Rails.application.secrets.twitter['consumer_secret']
       config.bearer_token = Rails.application.secrets.twitter['bearer_token']
     end
   end
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 8ac65be..eba9675 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -1,26 +1,34 @@
 <% if twitter_enabled == true %>
   <div class="twitter">
+
       <div class="twitter_header">
-        Tweets by <%= twitter_name %></p>
+        Tweets by </br><%= twitter_name %></p>
       </div>
+
       <div class="twitter_list">
         <% tweets.each do |e| %>
           <div class="tweet">
+
+            <div class="tweet_title">
               <div class="tweet_pic twitter_image_frame"><%= image_tag("team-loadtocode-Loading_icon.gif") %></div>
-            <div class="tweet_name">
-              @<%= twitter_handle %>
+                <div class="tweet_name">
+                  @<%= twitter_handle %>
+                </div>
             </div>
-            <div class="tweet_text">
-              <%= " #{e.text}" %>
+
+            <div class="tweet_text"><%= " #{e.text}" %>
             </div>
-            <div class="tweet_text_date">
-              tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
+
+            <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
             </div>
+
           </div>
         <% end %>
       </div>
+
       <div class="twitter_footer">
         To prevent leakage no links are displayed. For more information visit @<%= twitter_name %> on twitter.com.</p>
       </div>
+
     </div>
 <% end %>
diff --git a/config/config.yml b/config/config.yml
deleted file mode 100644
index ff3d936..0000000
--- a/config/config.yml
+++ /dev/null
@@ -1,167 +0,0 @@
-dev_ca: &dev_ca
-  client_ca_key: "./test/files/ca.key"
-  client_ca_cert: "./test/files/ca.crt"
-  ca_key_password: nil
-
-cert_options: &cert_options
-  client_cert_lifespan: "2 months"
-  client_cert_bit_size: 2024
-  client_cert_hash: "SHA256"
-  allow_limited_certs: false
-  allow_unlimited_certs: true
-  allow_anonymous_certs: false
-  limited_cert_prefix: "LIMITED"
-  unlimited_cert_prefix: "UNLIMITED"
-
-downloads: &downloads
-  client_download_domain: https://dl.bitmask.net
-  available_clients:
-    - linux
-    - osx
-    - windows
-    - android
-  download_paths:
-    android: /android/
-    linux:   /linux/
-    osx:     /mac/
-    windows: /windows/
-    other:   /
-
-common: &common
-  force_ssl: false
-  pagination_size: 30
-  auth:
-    token_expires_after: 60
-
-  # handles that will be blocked from being used as logins or email aliases
-  # in addition to the ones in /etc/passwd and http://tools.ietf.org/html/rfc2142
-  handle_blacklist:
-    - certmaster
-    - ssladmin
-    - arin-admin
-    - administrator
-    - www-data
-    - maildrop
-    - postmaster
-    - admin
-    - contact
-    - info
-    - noreply
-    - robot
-    - helpdesk
-    - help
-    - tickets
-    - owner
-  # handles that will be allowed despite being in /etc/passwd or rfc2142
-  handle_whitelist: []
-  # actions enabled in the account settings
-  # see /users/app/views/users/_edit.html.haml for a list.
-  user_actions: ['contact_email', 'destroy_account']
-  admin_actions: ['contact_email', 'change_pgp_key', 'change_service_level', 'destroy_account']
-  billing: ~
-  default_locale: :en
-  available_locales:
-    - :cs
-    - :de
-    - :el
-    - :en
-    - :es
-    - :fi
-    - :fr
-    - :hu
-    - :it
-    - :lt
-    - :nb
-    - :nl
-    - :pl
-    - :pt
-    - :ru
-    - :tr
-    - :zh
-  minimum_client_version: "0.5"
-  engines:
-    - support
-    - billing
-  allow_registration: true
-  invite_required: false
-  config_file_paths:
-    soledad-service: 'public/1/config/soledad-service.json'
-    eip-service: 'public/1/config/eip-service.json'
-    smtp-service: 'public/1/config/smtp-service.json'
-    provider: 'config/provider/provider.json'
-  mailer:
-    from_address: 'noreply'
-
-service_levels: &service_levels
-  service_levels:
-    1:
-      name: free
-      description: "free account, with rate limited VPN"
-      eip_rate_limit: true
-      storage: 100
-      services:
-        - eip
-    2:
-      name: premium
-      description: "premium account, with unlimited vpn"
-      rate:
-        USD: 10
-        EUR: 10
-      services:
-        - eip
-        - email
-  default_service_level: 1
-
-development:
-  <<: *downloads
-  <<: *dev_ca
-  <<: *cert_options
-  <<: *common
-  <<: *service_levels
-  admins: [blue, red, staff, ava]
-  api_tokens:
-    monitor: nil
-    admin: nil
-  domain: example.org
-  secret_token: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
-  reraise_errors: true
-
-  twitter:
-    twitter_handle  : 'xxxxxxxxxxxxxxxxx'
-    consumer_key    : 'xxxxxxxxxxxxxxxxx'
-    consumer_secret : 'xxxxxxxxxxxxxxxxx'
-    bearer_token    : 'xxxxxxxxxxxxxxxxx'
-
-test:
-  <<: *downloads
-  <<: *dev_ca
-  <<: *cert_options
-  <<: *common
-  <<: *service_levels
-  admins: [admin, admin2]
-  api_tokens:
-    monitor: "212da28a59dcaca487365309dc93aa09"
-    admin: nil
-    allowed_ips:
-      - 0.0.0.0
-  domain: test.me
-  secret_token: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
-  reraise_errors: true
-  billing: {}
-  default_locale: :en
-  available_locales:
-    - :en
-    - :de
-
-production:
-  <<: *downloads
-  <<: *cert_options
-  <<: *common
-  admins: []
-  api_tokens:
-    monitor: nil
-    admin: nil
-  domain: example.net
-  engines:
-    - support
-  # logfile: /path/to/your/logs
diff --git a/config/defaults.yml b/config/defaults.yml
index 1c9195f..c06ea7c 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -127,9 +127,8 @@ development:
   reraise_errors: true
 
   twitter:
-    consumer_key    : Change_to_your_consumer_key
-    consumer_secret : Change_to_your_consumer_secret
-    bearer_token    : Change_to_your_bearer_token
+    twitter_handle  : Change_to_your_Twitter_handle
+    bearer_token    : Change_to_your_Bearer_token
 
 test:
   <<: *downloads
-- 
cgit v1.2.3


From 92e7b90d619111fdaaf50ab0b8538c39605fe005 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Thu, 1 Sep 2016 12:17:05 +0200
Subject: Updating the view and CSS, no pic and twitter handle in each tweet;
 Displaying only 3 most tweets

---
 app/assets/stylesheets/twitter.scss | 74 ++++++++++++++++++-------------------
 app/helpers/twitter_helper.rb       |  2 +-
 app/views/home/_content.html.haml   | 14 ++++---
 app/views/twitter/_index.html.erb   | 18 ++++-----
 4 files changed, 52 insertions(+), 56 deletions(-)

diff --git a/app/assets/stylesheets/twitter.scss b/app/assets/stylesheets/twitter.scss
index b0ce982..89cdecf 100644
--- a/app/assets/stylesheets/twitter.scss
+++ b/app/assets/stylesheets/twitter.scss
@@ -5,30 +5,14 @@
 .twitter_header {
   font-size: 20px;
   text-align: left;
-  margin-bottom: 30px;
+  margin-bottom: 80px;
 }
 
-.twitter_list {
-  box-sizing: border-box;
-}
-
-.tweet:hover {
-    background-color: #ccf2ff;
-  }
-
-.tweet {
-  border-bottom-style: solid;
-  border-color: #bfbfbf;
-  padding: 10px 8px;
-}
-
-.tweet_title {
-  position: relative;
-  height: 40px;
-  margin-bottom: 10px;
+.twitter_id {
+  position: absolute;
 }
 
-.tweet_pic {
+.twitter_pic {
   display: block;
   width: 40px;
   height: 40px;
@@ -38,12 +22,39 @@
   top: 0;
   }
 
-.tweet_name {
-  padding-left: 50px;
+.twitter_image_frame {
+  width: 40px;
+  height: 40px;
+  overflow: hidden;
+  }
+
+.twitter_name {
+  padding-left: 65px;
   line-height: 40px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
+  font-size: 20px;
+}
+
+.twitter_image_frame > img {
+  display: block;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  margin: auto;
+  }
+
+.twitter_list {
+  box-sizing: border-box;
+}
+
+.tweet {
+  border-top-style: solid;
+  border-color: lightgrey;
+  padding: 10px 8px;
 }
 
 .tweet_text {
@@ -55,22 +66,9 @@ box-sizing: border-box;
   padding-top: 4px;
   font-size: 12px ;
 }
+
 .twitter_footer {
+  border-top-style: solid;
+  border-color: lightgrey;
   padding-top: 8px;
 }
-
-.twitter_image_frame {
-  width: 40px;
-  height: 40px;
-  overflow: hidden;
-}
-
-.twitter_image_frame > img {
-  display: block;
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  margin: auto;
-}
diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index d20b7da..834e5c6 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -18,6 +18,6 @@ module TwitterHelper
   end
 
   def tweets
-    twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}
+    twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
   end
 end
diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml
index a299295..ecd8524 100644
--- a/app/views/home/_content.html.haml
+++ b/app/views/home/_content.html.haml
@@ -1,11 +1,13 @@
-.row
-  %h1= t(:welcome, :provider => APP_CONFIG[:domain])
-  .p=t(:welcome_message_html)
+.col-md-9
+  .row
+    %h1= t(:welcome, :provider => APP_CONFIG[:domain])
+    .p=t(:welcome_message_html)
 
-.row
-  .col-md-9
+  .row
     = home_page_buttons
-  .col-md-3
+
+.col-md-3
+  .row
     = render 'twitter/index'
 
     - if Rails.env == 'development'
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index eba9675..2d17aad 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -2,20 +2,17 @@
   <div class="twitter">
 
       <div class="twitter_header">
-        Tweets by </br><%= twitter_name %></p>
+        <p>These are the most recent tweets by </br><%= twitter_name%></p>
+
+        <div class="twitter_id">
+          <div class="twitter_pic twitter_image_frame"><%= image_tag("rails.png") %></div>
+          <div class="twitter_name"><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div>
+        </div>
       </div>
 
       <div class="twitter_list">
         <% tweets.each do |e| %>
           <div class="tweet">
-
-            <div class="tweet_title">
-              <div class="tweet_pic twitter_image_frame"><%= image_tag("team-loadtocode-Loading_icon.gif") %></div>
-                <div class="tweet_name">
-                  @<%= twitter_handle %>
-                </div>
-            </div>
-
             <div class="tweet_text"><%= " #{e.text}" %>
             </div>
 
@@ -29,6 +26,5 @@
       <div class="twitter_footer">
         To prevent leakage no links are displayed. For more information visit @<%= twitter_name %> on twitter.com.</p>
       </div>
-
-    </div>
+</div>
 <% end %>
-- 
cgit v1.2.3


From 9414f88f743bfe4a74301eb410e4f2d45f2d5ab0 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Fri, 2 Sep 2016 14:28:26 +0200
Subject: ruby script to generate twitter bearer token

---
 config/generate_bearer_token.rb | 52 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 config/generate_bearer_token.rb

diff --git a/config/generate_bearer_token.rb b/config/generate_bearer_token.rb
new file mode 100644
index 0000000..9d8f517
--- /dev/null
+++ b/config/generate_bearer_token.rb
@@ -0,0 +1,52 @@
+require "net/http"
+require "uri"
+require "json"
+require "base64"
+require "optparse"
+
+options = {}
+
+option_parser = OptionParser.new do |opts|
+  opts.banner = "Create your bearer_token for twitter by including following [options]:"
+
+  opts.on("--key KEY", "consumer_key of your twitter application") do |key|
+    options[:conkey] = key
+  end
+
+  opts.on("--secret SECRET", "consumer_secret of your twitter application") do |secret|
+    options[:consec] = secret
+  end
+
+  opts.on("--file FILE", "file where the bearer_token should be stored to (e.g. config/secrets.yml)") do |file|
+    options[:file] = file
+  end
+
+end
+
+option_parser.parse!
+
+if options[:conkey].nil? || options[:consec].nil? then
+  puts option_parser
+  exit
+else
+  consumer_key = options[:conkey]
+  consumer_secret = options[:consec]
+end
+
+uri = URI("https://api.twitter.com/oauth2/token")
+data = "grant_type=client_credentials"
+cre   = Base64.encode64("#{consumer_key}:#{consumer_secret}")
+cre.delete!("\n")
+authorization_headers = { "Authorization" => "Basic #{cre}"}
+
+Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+  response = http.request_post(uri, data, authorization_headers)
+  token_hash = JSON.parse(response.body)
+  bearer_token = token_hash["access_token"]
+end
+
+if options[:file].nil? || options[:consec].nil? then
+  puts bearer_token
+else
+  # put data into config/secrets.yml
+end
-- 
cgit v1.2.3


From 18cb3ebbcafe09a194c938e8884f9d3f3753f635 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Fri, 2 Sep 2016 15:16:15 +0200
Subject: moved bearer token script

included passing bearer token into secrets-file
---
 config/generate_bearer_token.rb | 52 ----------------------------------------
 script/generate_bearer_token.rb | 53 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 52 deletions(-)
 delete mode 100644 config/generate_bearer_token.rb
 create mode 100644 script/generate_bearer_token.rb

diff --git a/config/generate_bearer_token.rb b/config/generate_bearer_token.rb
deleted file mode 100644
index 9d8f517..0000000
--- a/config/generate_bearer_token.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-require "net/http"
-require "uri"
-require "json"
-require "base64"
-require "optparse"
-
-options = {}
-
-option_parser = OptionParser.new do |opts|
-  opts.banner = "Create your bearer_token for twitter by including following [options]:"
-
-  opts.on("--key KEY", "consumer_key of your twitter application") do |key|
-    options[:conkey] = key
-  end
-
-  opts.on("--secret SECRET", "consumer_secret of your twitter application") do |secret|
-    options[:consec] = secret
-  end
-
-  opts.on("--file FILE", "file where the bearer_token should be stored to (e.g. config/secrets.yml)") do |file|
-    options[:file] = file
-  end
-
-end
-
-option_parser.parse!
-
-if options[:conkey].nil? || options[:consec].nil? then
-  puts option_parser
-  exit
-else
-  consumer_key = options[:conkey]
-  consumer_secret = options[:consec]
-end
-
-uri = URI("https://api.twitter.com/oauth2/token")
-data = "grant_type=client_credentials"
-cre   = Base64.encode64("#{consumer_key}:#{consumer_secret}")
-cre.delete!("\n")
-authorization_headers = { "Authorization" => "Basic #{cre}"}
-
-Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
-  response = http.request_post(uri, data, authorization_headers)
-  token_hash = JSON.parse(response.body)
-  bearer_token = token_hash["access_token"]
-end
-
-if options[:file].nil? || options[:consec].nil? then
-  puts bearer_token
-else
-  # put data into config/secrets.yml
-end
diff --git a/script/generate_bearer_token.rb b/script/generate_bearer_token.rb
new file mode 100644
index 0000000..d3a1e4a
--- /dev/null
+++ b/script/generate_bearer_token.rb
@@ -0,0 +1,53 @@
+require "net/http"
+require "uri"
+require "json"
+require "base64"
+require "optparse"
+
+options = {}
+
+option_parser = OptionParser.new do |opts|
+  opts.banner = "Create your bearer_token for twitter by including following [options]:"
+
+  opts.on("--key KEY", "consumer_key of your twitter application") do |key|
+    options[:conkey] = key
+  end
+
+  opts.on("--secret SECRET", "consumer_secret of your twitter application") do |secret|
+    options[:consec] = secret
+  end
+
+  opts.on("--file FILE", "file where the bearer_token should be stored to (e.g. config/secrets.yml)") do |file|
+    options[:file] = file
+  end
+
+end
+
+option_parser.parse!
+
+if options[:conkey].nil? || options[:consec].nil? then
+  puts option_parser
+  exit
+else
+  consumer_key = options[:conkey]
+  consumer_secret = options[:consec]
+end
+
+uri = URI("https://api.twitter.com/oauth2/token")
+data = "grant_type=client_credentials"
+cre   = Base64.strict_encode64("#{consumer_key}:#{consumer_secret}")
+authorization_headers = { "Authorization" => "Basic #{cre}"}
+
+Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+  response = http.request_post(uri, data, authorization_headers)
+  token_hash = JSON.parse(response.body)
+  @bearer_token = token_hash["access_token"]
+end
+
+if options[:file].nil? then
+  puts @bearer_token
+else
+  if options[:file] == "config/secrets.yml"
+    Rails.application.secrets.twitter['bearer_token'] = @bearer_token
+  end
+end
-- 
cgit v1.2.3


From ae0912e451e14c9d373d694666122c7ae1507ac6 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Mon, 5 Sep 2016 17:35:37 +0200
Subject: resolved bug from PR #236. Included test environment to secrets-file
 and included checking wheather secrets-file exists before running code in
 twitter_helper

---
 app/helpers/twitter_helper.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index d20b7da..b360895 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -1,6 +1,8 @@
 module TwitterHelper
   def twitter_enabled
-    Rails.application.secrets.twitter['enabled'] == true
+    if Rails.application.secrets.twitter
+      Rails.application.secrets.twitter['enabled'] == true
+    end
   end
 
   def twitter_client
-- 
cgit v1.2.3


From 3f83e3078043de06270ec0c406a672f9641ff213 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Mon, 5 Sep 2016 17:56:27 +0200
Subject: deleted twitter part in config/defaults.yml since there is no usage
 for it. to use twitter secrets-file has to be created

---
 config/defaults.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/config/defaults.yml b/config/defaults.yml
index c06ea7c..bcb8dac 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -126,10 +126,6 @@ development:
   secret_token: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
   reraise_errors: true
 
-  twitter:
-    twitter_handle  : Change_to_your_Twitter_handle
-    bearer_token    : Change_to_your_Bearer_token
-
 test:
   <<: *downloads
   <<: *dev_ca
-- 
cgit v1.2.3


From 6f255766d993672d8de17081fae4140564edb989 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Tue, 6 Sep 2016 15:32:51 +0200
Subject: included extra methods to have the twitter call for twitter name only
 have happening at one place

---
 app/helpers/twitter_helper.rb | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index 1081c05..035d75c 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -15,8 +15,24 @@ module TwitterHelper
     Rails.application.secrets.twitter['twitter_handle']
   end
 
+  def twitter_user_info
+      $twitter_user_info ||= []
+  end
+
   def twitter_name
-    twitter_client.user(twitter_handle).name
+    if twitter_user_info[0] == nil
+      update_twitter_info
+    else
+      if Time.now > twitter_user_info[0] + 15.minutes
+        update_twitter_info
+      end
+    end
+    twitter_user_info[1]
+  end
+
+  def update_twitter_info
+    twitter_user_info[0] = Time.now
+    twitter_user_info[1] = twitter_client.user(twitter_handle).name
   end
 
   def tweets
-- 
cgit v1.2.3


From 3c617c92ef3c71b93ed8f68b107d4da080e28872 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Tue, 6 Sep 2016 17:28:21 +0200
Subject: deleted script/generate_bearer_token.rb, it will be replaced by
 script/generate_bearer_token

---
 script/generate_bearer_token.rb | 53 -----------------------------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 script/generate_bearer_token.rb

diff --git a/script/generate_bearer_token.rb b/script/generate_bearer_token.rb
deleted file mode 100644
index d3a1e4a..0000000
--- a/script/generate_bearer_token.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-require "net/http"
-require "uri"
-require "json"
-require "base64"
-require "optparse"
-
-options = {}
-
-option_parser = OptionParser.new do |opts|
-  opts.banner = "Create your bearer_token for twitter by including following [options]:"
-
-  opts.on("--key KEY", "consumer_key of your twitter application") do |key|
-    options[:conkey] = key
-  end
-
-  opts.on("--secret SECRET", "consumer_secret of your twitter application") do |secret|
-    options[:consec] = secret
-  end
-
-  opts.on("--file FILE", "file where the bearer_token should be stored to (e.g. config/secrets.yml)") do |file|
-    options[:file] = file
-  end
-
-end
-
-option_parser.parse!
-
-if options[:conkey].nil? || options[:consec].nil? then
-  puts option_parser
-  exit
-else
-  consumer_key = options[:conkey]
-  consumer_secret = options[:consec]
-end
-
-uri = URI("https://api.twitter.com/oauth2/token")
-data = "grant_type=client_credentials"
-cre   = Base64.strict_encode64("#{consumer_key}:#{consumer_secret}")
-authorization_headers = { "Authorization" => "Basic #{cre}"}
-
-Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
-  response = http.request_post(uri, data, authorization_headers)
-  token_hash = JSON.parse(response.body)
-  @bearer_token = token_hash["access_token"]
-end
-
-if options[:file].nil? then
-  puts @bearer_token
-else
-  if options[:file] == "config/secrets.yml"
-    Rails.application.secrets.twitter['bearer_token'] = @bearer_token
-  end
-end
-- 
cgit v1.2.3


From bd5a537964d835ae1b572ecc0cf7288e30bcc1db Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Tue, 6 Sep 2016 17:29:36 +0200
Subject: bearer token script includes creating token, creating secrets-file or
 just have the missing information filled like token or twitter handle

---
 script/generate_bearer_token | 81 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100755 script/generate_bearer_token

diff --git a/script/generate_bearer_token b/script/generate_bearer_token
new file mode 100755
index 0000000..7f7bb6b
--- /dev/null
+++ b/script/generate_bearer_token
@@ -0,0 +1,81 @@
+#!/usr/bin/env ruby
+
+require "net/http"
+require "uri"
+require "json"
+require "base64"
+require "optparse"
+require "yaml"
+
+options = {}
+
+option_parser = OptionParser.new do |opts|
+  opts.banner = "Create your bearer_token for twitter by including following two [options], feel free to have your secrets-file created/filled giving the other information as well:"
+
+  opts.on("--key KEY", "consumer_key of your twitter application") do |key|
+    options[:conkey] = key
+  end
+
+  opts.on("--secret SECRET", "consumer_secret of your twitter application") do |secret|
+    options[:consec] = secret
+  end
+
+  opts.on("--projectroot DIR", "directory where leapweb is") do |projectroot|
+    options[:projectroot] = projectroot
+  end
+
+  opts.on("--twitterhandle TWI", "twitterhandle without @ which will be passed into secrets-file") do |twitterhandle|
+    options[:twitterhandle] = twitterhandle
+  end
+
+end
+
+option_parser.parse!
+
+if options[:conkey].nil? || options[:consec].nil? then
+  puts option_parser
+  exit
+else
+  consumer_key = options[:conkey]
+  consumer_secret = options[:consec]
+end
+
+uri = URI("https://api.twitter.com/oauth2/token")
+data = "grant_type=client_credentials"
+cre   = Base64.strict_encode64("#{consumer_key}:#{consumer_secret}")
+authorization_headers = { "Authorization" => "Basic #{cre}"}
+
+Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+  response = http.request_post(uri, data, authorization_headers)
+  token_hash = JSON.parse(response.body)
+  $bearer_token = token_hash["access_token"]
+end
+
+if options[:projectroot].nil? then
+  puts "You didn't tell us the directory to have your secrets-file created or being filled. Feel free to copy/paste your bearer_token:"
+  puts $bearer_token
+else
+  if File.exist?("#{options[:projectroot]}/leap_web/config/secrets.yml")
+    secrets = YAML.load_file("#{options[:projectroot]}/leap_web/config/secrets.yml")
+  else
+    # secrets_content = {"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}}
+    # secrets = {"development"=> secrets_content, "test"=>secrets_content}
+    secrets = {"development"=> {"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}}, "test"=>{"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}}}
+    File.new("#{options[:projectroot]}/leap_web/config/secrets.yml", "w")
+  end
+
+  if options[:twitterhandle].nil? then
+    if secrets["development"]["twitter"]["twitter_handle"] == "" then
+      puts "You didn't put your twitter-handle neither in the secrets-file nor passed it as a flag. Don't forget that you can't use the twitter-feature without your twitter-handle."
+    end
+  else
+    secrets["development"]["twitter"]["twitter_handle"] = options[:twitterhandle]
+  end
+
+  secrets["development"]["twitter"]["bearer_token"] = $bearer_token
+  secrets["test"]["twitter"]["bearer_token"] = $bearer_token
+
+  File.open("#{options[:projectroot]}/leap_web/config/secrets.yml", "r+") do |file|
+    file.write(secrets.to_yaml)
+  end
+end
-- 
cgit v1.2.3


From a9ce836e2ef5a2aaa8b30ca7603129ba9573deaf Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Tue, 6 Sep 2016 17:48:03 +0200
Subject: included twitter handle also for test development in secrets-file

---
 script/generate_bearer_token | 1 +
 1 file changed, 1 insertion(+)

diff --git a/script/generate_bearer_token b/script/generate_bearer_token
index 7f7bb6b..ec00740 100755
--- a/script/generate_bearer_token
+++ b/script/generate_bearer_token
@@ -70,6 +70,7 @@ else
     end
   else
     secrets["development"]["twitter"]["twitter_handle"] = options[:twitterhandle]
+    secrets["test"]["twitter"]["twitter_handle"] = options[:twitterhandle]
   end
 
   secrets["development"]["twitter"]["bearer_token"] = $bearer_token
-- 
cgit v1.2.3


From f269b960f9928ce3211ee3ab80e7a8eead426dac Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Wed, 7 Sep 2016 11:34:35 +0200
Subject: error message and exit from script when wrong directory or no
 secrets-file. automatic secrets-file creation was deleted/put as comment

---
 script/generate_bearer_token | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/script/generate_bearer_token b/script/generate_bearer_token
index ec00740..7091a8d 100755
--- a/script/generate_bearer_token
+++ b/script/generate_bearer_token
@@ -58,10 +58,12 @@ else
   if File.exist?("#{options[:projectroot]}/leap_web/config/secrets.yml")
     secrets = YAML.load_file("#{options[:projectroot]}/leap_web/config/secrets.yml")
   else
+    puts "Please make sure that you created a secrets-file as described in the documentation or have given the correct directory. No secrets-file could be found."
+    exit
     # secrets_content = {"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}}
     # secrets = {"development"=> secrets_content, "test"=>secrets_content}
-    secrets = {"development"=> {"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}}, "test"=>{"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}}}
-    File.new("#{options[:projectroot]}/leap_web/config/secrets.yml", "w")
+    # secrets = {"development"=> {"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}}, "test"=>{"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}}}
+    # File.new("#{options[:projectroot]}/leap_web/config/secrets.yml", "w")
   end
 
   if options[:twitterhandle].nil? then
-- 
cgit v1.2.3


From b62bc48bc3bfbd2781cef16d210749ded8d96c37 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Wed, 7 Sep 2016 16:22:20 +0200
Subject: changed naming for tweets-method in _index and included time-checking
 and a twitter call will only be made every 15 minutes

---
 app/helpers/twitter_helper.rb     | 20 ++++++++++++++++++--
 app/views/twitter/_index.html.erb |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index 035d75c..a5e7ae4 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -35,7 +35,23 @@ module TwitterHelper
     twitter_user_info[1] = twitter_client.user(twitter_handle).name
   end
 
-  def tweets
-    twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
+  def twitter_tweets
+      $twitter_tweets ||= []
+  end
+
+  def twitter_timeline
+    if twitter_tweets[0] == nil
+      update_twitter_timeline
+    else
+      if Time.now > twitter_tweets[0] + 15.minutes
+        update_twitter_timeline
+      end
+    end
+    twitter_tweets[1]
+  end
+
+  def update_twitter_timeline
+    twitter_tweets[0] = Time.now
+    twitter_tweets[1] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
   end
 end
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 2d17aad..ac10aa4 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -11,7 +11,7 @@
       </div>
 
       <div class="twitter_list">
-        <% tweets.each do |e| %>
+        <% twitter_timeline.each do |e| %>
           <div class="tweet">
             <div class="tweet_text"><%= " #{e.text}" %>
             </div>
-- 
cgit v1.2.3


From 160c3a961943aa996982a8d84403957afef0a459 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Wed, 7 Sep 2016 16:43:39 +0200
Subject: Added documentation to README about twitter authentification and
 usage of secrets-file

---
 README.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/README.md b/README.md
index e68c117..4d9ca39 100644
--- a/README.md
+++ b/README.md
@@ -187,3 +187,29 @@ Known problems
   designed to allow query of a user database via proxy in order to
   provide network perspective.
 
+Twitter Timeline on Main View
+---------------------------
+
+This is a feature to include a twitter feed that displays most recent tweets
+of a (determined) twitter account (accessed via Twitter API).
+If you chose to use it, the feature gets included in `home/index` of
+LEAP web app (as part of the main view).
+
+* Create Twitter Application on https://apps.twitter.com/
+  * Visit https://apps.twitter.com/ and log in with the twitter account you want to use
+  * Make sure you have a mobile phone number registered with your account to be able to proceed
+  * Choose the option to `Create New App`
+  * Fill in Application Details and Developer Agreement and `Create your Twitter application`
+  * Choose the section "Keys and Access Tokens" to get your consumer key and consumer secret
+  * Optional: Go to section "Permissions" and change the "Access" from `Read and Write` (by default) to `Read only`
+  * Have your consumer key and secret by hand for one of the next steps
+
+* Activate the feature within your local LEAP Web Application
+  * If not already existing create a secrets-file in /config with the name secrets.yml (`/config/secrets.yml`)
+  * Secrets-file should contain the following, make sure its in YAML: {"development"=> {"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}}, "test"=>{"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}}}
+  * To have your bearer token created, run script in terminal being in the file of leap_web: `script/generate_bearer_token`
+  * To have the script run properly you have to add before running: `--key your_consumerkey --secret your_consumersecret`
+  * Add also `--projectroot your_projectroot --twitterhandle your_twitterhandle` as well to not have manually put the data in your secrets-file
+  * The full command looks like this: `script/generate_bearer_token --key your_consumerkey --secret your_consumersecret --projectroot your_projectroot --twitterhandle your_twitterhandle`
+  * If you didn't give all your information to the script, had a typo or want to change anything else, please do so by finding the secrets-file at `/config/secrets.yml`
+  * Make sure that the correct twitterhandle and bearer-token is included
-- 
cgit v1.2.3


From 4a09c2df8df3db979049ee8d98b202ad9f2125a8 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Thu, 8 Sep 2016 18:25:41 +0200
Subject: Helper has caching of name and tweets included now \o/

---
 app/helpers/twitter_helper.rb | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index 834e5c6..fd3f82c 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -1,6 +1,8 @@
 module TwitterHelper
   def twitter_enabled
-    Rails.application.secrets.twitter['enabled'] == true
+    if Rails.application.secrets.twitter
+      Rails.application.secrets.twitter['enabled'] == true
+    end
   end
 
   def twitter_client
@@ -13,11 +15,32 @@ module TwitterHelper
     Rails.application.secrets.twitter['twitter_handle']
   end
 
+  def twitter_user_info
+    $twitter_user_info ||= []
+  end
+
+  def update_twitter_info
+    twitter_user_info[0] = Time.now
+    twitter_user_info[1] = twitter_client.user(twitter_handle).name
+    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
+  end
+
+  def cached_info
+    if twitter_user_info[0] == nil
+      update_twitter_info
+    else
+      if Time.now > twitter_user_info[0] + 15.minutes
+        update_twitter_info
+      end
+    end
+    twitter_user_info
+  end
+
   def twitter_name
-    twitter_client.user(twitter_handle).name
+    cached_info[1]
   end
 
   def tweets
-    twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
+    cached_info[2]
   end
 end
-- 
cgit v1.2.3


From 3408ac694a60df0380a3bf444077165a1f30e87e Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Fri, 9 Sep 2016 13:19:51 +0200
Subject: Added changes in css, view and main view file, as well as default
 avatar is now set as twitter official logo (added 2 official twitter logo
 images; changed footer text.

---
 app/assets/images/Twitter_Logo_Blue.png            | Bin 0 -> 4298 bytes
 app/assets/images/Twitter_Logo_White_On_Blue.png   | Bin 0 -> 4861 bytes
 app/assets/images/rails.png                        | Bin 6646 -> 0 bytes
 app/assets/images/team-loadtocode-Loading_icon.gif | Bin 17490 -> 0 bytes
 app/assets/stylesheets/twitter.scss                |  32 +++++++++-------
 app/views/home/_content.html.haml                  |   4 +-
 app/views/twitter/_index.html.erb                  |  41 ++++++++++++---------
 7 files changed, 45 insertions(+), 32 deletions(-)
 create mode 100644 app/assets/images/Twitter_Logo_Blue.png
 create mode 100644 app/assets/images/Twitter_Logo_White_On_Blue.png
 delete mode 100644 app/assets/images/rails.png
 delete mode 100644 app/assets/images/team-loadtocode-Loading_icon.gif

diff --git a/app/assets/images/Twitter_Logo_Blue.png b/app/assets/images/Twitter_Logo_Blue.png
new file mode 100644
index 0000000..b5eebc8
Binary files /dev/null and b/app/assets/images/Twitter_Logo_Blue.png differ
diff --git a/app/assets/images/Twitter_Logo_White_On_Blue.png b/app/assets/images/Twitter_Logo_White_On_Blue.png
new file mode 100644
index 0000000..25ba09f
Binary files /dev/null and b/app/assets/images/Twitter_Logo_White_On_Blue.png differ
diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png
deleted file mode 100644
index d5edc04..0000000
Binary files a/app/assets/images/rails.png and /dev/null differ
diff --git a/app/assets/images/team-loadtocode-Loading_icon.gif b/app/assets/images/team-loadtocode-Loading_icon.gif
deleted file mode 100644
index a718bd8..0000000
Binary files a/app/assets/images/team-loadtocode-Loading_icon.gif and /dev/null differ
diff --git a/app/assets/stylesheets/twitter.scss b/app/assets/stylesheets/twitter.scss
index 89cdecf..b2481db 100644
--- a/app/assets/stylesheets/twitter.scss
+++ b/app/assets/stylesheets/twitter.scss
@@ -3,9 +3,10 @@
 }
 
 .twitter_header {
-  font-size: 20px;
+  font-size: 16px;
   text-align: left;
-  margin-bottom: 80px;
+  margin-bottom: 55px;
+  padding: 10px 8px;
 }
 
 .twitter_id {
@@ -25,28 +26,29 @@
 .twitter_image_frame {
   width: 40px;
   height: 40px;
-  overflow: hidden;
+  overflow: hidden
   }
 
-.twitter_name {
-  padding-left: 65px;
-  line-height: 40px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  font-size: 20px;
-}
-
 .twitter_image_frame > img {
   display: block;
   position: absolute;
   top: 0;
   bottom: 0;
-  left: 0;
+  left: 30;
   width: 100%;
   margin: auto;
   }
 
+.twitter_name {
+  padding-left: 55px;
+  line-height: 20px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  font-size: 16px;
+}
+
+// Body = displays tweets
 .twitter_list {
   box-sizing: border-box;
 }
@@ -70,5 +72,7 @@ box-sizing: border-box;
 .twitter_footer {
   border-top-style: solid;
   border-color: lightgrey;
-  padding-top: 8px;
+  padding: 10px 8px;
+  font-style: italic;
+  font-size: 12px;
 }
diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml
index ecd8524..5341189 100644
--- a/app/views/home/_content.html.haml
+++ b/app/views/home/_content.html.haml
@@ -1,4 +1,4 @@
-.col-md-9
+.col-md-8
   .row
     %h1= t(:welcome, :provider => APP_CONFIG[:domain])
     .p=t(:welcome_message_html)
@@ -6,6 +6,8 @@
   .row
     = home_page_buttons
 
+.col-md-1
+
 .col-md-3
   .row
     = render 'twitter/index'
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 2d17aad..2cba033 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -1,30 +1,37 @@
 <% if twitter_enabled == true %>
   <div class="twitter">
 
-      <div class="twitter_header">
-        <p>These are the most recent tweets by </br><%= twitter_name%></p>
+    <div class="twitter_header">
+      <div class="twitter_id">
+        <div class="twitter_pic twitter_image_frame"><%= image_tag("Twitter_Logo_White_On_Blue.png") %></div>
+          <div class="twitter_name"><%= twitter_name%><br><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div>
+      </div>
+    </div>
+
+      <!-- <div class="twitter_header">
+        <p>These are the most recent tweets by <%= twitter_name%></p>
 
         <div class="twitter_id">
-          <div class="twitter_pic twitter_image_frame"><%= image_tag("rails.png") %></div>
+          <div class="twitter_pic twitter_image_frame"><%= image_tag("Twitter_Logo_White_On_Blue.png") %></div>
           <div class="twitter_name"><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div>
         </div>
-      </div>
+      </div> -->
 
-      <div class="twitter_list">
-        <% tweets.each do |e| %>
-          <div class="tweet">
-            <div class="tweet_text"><%= " #{e.text}" %>
-            </div>
-
-            <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
-            </div>
+    <div class="twitter_list">
+      <% tweets.each do |e| %>
+        <div class="tweet">
+          <div class="tweet_text"><%= " #{e.text}" %>
+          </div>
 
+          <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
           </div>
-        <% end %>
-      </div>
 
-      <div class="twitter_footer">
-        To prevent leakage no links are displayed. For more information visit @<%= twitter_name %> on twitter.com.</p>
-      </div>
+        </div>
+      <% end %>
+    </div>
+
+    <div class="twitter_footer">
+      <p>This feed uses a Ruby interface to access the Twitter API. Within LEAP Twitter does not track you.</p>
+    </div>
 </div>
 <% end %>
-- 
cgit v1.2.3


From a074684e2556841c75b8db48b10f01d8279c9873 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Fri, 9 Sep 2016 14:53:18 +0200
Subject: changed times for twitter caching

---
 app/helpers/twitter_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index a5e7ae4..0b8f79c 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -23,7 +23,7 @@ module TwitterHelper
     if twitter_user_info[0] == nil
       update_twitter_info
     else
-      if Time.now > twitter_user_info[0] + 15.minutes
+      if Time.now > twitter_user_info[0] + 120.minutes
         update_twitter_info
       end
     end
-- 
cgit v1.2.3


From dcd20f9b532bc7490e45ddda68e228f4c9bf2b93 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Fri, 9 Sep 2016 14:54:01 +0200
Subject: included script to invalidate token

---
 script/invalidate_bearer_token | 47 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100755 script/invalidate_bearer_token

diff --git a/script/invalidate_bearer_token b/script/invalidate_bearer_token
new file mode 100755
index 0000000..eda1c7d
--- /dev/null
+++ b/script/invalidate_bearer_token
@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+
+require "net/http"
+require "uri"
+require "json"
+require "base64"
+require "optparse"
+
+options = {}
+
+option_parser = OptionParser.new do |opts|
+  opts.banner = "Invalidate your bearer_token for twitter by including the following [options]. The bearer token can't be used afterwards anymore. Please create a new bearer-token if you want to activate the twitter feature again."
+
+  opts.on("--key KEY", "consumer_key of your twitter application") do |key|
+    options[:conkey] = key
+  end
+
+  opts.on("--secret SECRET", "consumer_secret of your twitter application") do |secret|
+    options[:consec] = secret
+  end
+
+  opts.on("--token TOKEN", "bearer token for twitter") do |token|
+    options[:token] = token
+  end
+
+end
+
+option_parser.parse!
+
+if options[:conkey].nil? || options[:consec].nil? || options[:token].nil? then
+  puts option_parser
+  exit
+else
+  consumer_key = options[:conkey]
+  consumer_secret = options[:consec]
+  bearer_token = options[:token]
+end
+
+uri = URI("https://api.twitter.com/oauth2/invalidate_token")
+data = "access_token=#{bearer_token}"
+cre   = Base64.strict_encode64("#{consumer_key}:#{consumer_secret}")
+authorization_headers = { "Authorization" => "Basic #{cre}"}
+
+Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+  response = http.request_post(uri, data, authorization_headers)
+  puts JSON.parse(response.body)
+end
-- 
cgit v1.2.3


From 42459748e9e8e30a9cc0c64eaf4b8e10814d2dc2 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Fri, 9 Sep 2016 13:19:51 +0200
Subject: Added changes in css, view and main view file, as well as default
 avatar is now set as twitter official logo (added 2 official twitter logo
 images; changed footer text.

---
 app/assets/images/Twitter_Logo_Blue.png            | Bin 0 -> 4298 bytes
 app/assets/images/Twitter_Logo_White_On_Blue.png   | Bin 0 -> 4861 bytes
 app/assets/images/rails.png                        | Bin 6646 -> 0 bytes
 app/assets/images/team-loadtocode-Loading_icon.gif | Bin 17490 -> 0 bytes
 app/assets/stylesheets/twitter.scss                |  32 ++++++++++++---------
 app/views/home/_content.html.haml                  |   4 ++-
 app/views/twitter/_index.html.erb                  |  25 +++++++++-------
 7 files changed, 36 insertions(+), 25 deletions(-)
 create mode 100644 app/assets/images/Twitter_Logo_Blue.png
 create mode 100644 app/assets/images/Twitter_Logo_White_On_Blue.png
 delete mode 100644 app/assets/images/rails.png
 delete mode 100644 app/assets/images/team-loadtocode-Loading_icon.gif

diff --git a/app/assets/images/Twitter_Logo_Blue.png b/app/assets/images/Twitter_Logo_Blue.png
new file mode 100644
index 0000000..b5eebc8
Binary files /dev/null and b/app/assets/images/Twitter_Logo_Blue.png differ
diff --git a/app/assets/images/Twitter_Logo_White_On_Blue.png b/app/assets/images/Twitter_Logo_White_On_Blue.png
new file mode 100644
index 0000000..25ba09f
Binary files /dev/null and b/app/assets/images/Twitter_Logo_White_On_Blue.png differ
diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png
deleted file mode 100644
index d5edc04..0000000
Binary files a/app/assets/images/rails.png and /dev/null differ
diff --git a/app/assets/images/team-loadtocode-Loading_icon.gif b/app/assets/images/team-loadtocode-Loading_icon.gif
deleted file mode 100644
index a718bd8..0000000
Binary files a/app/assets/images/team-loadtocode-Loading_icon.gif and /dev/null differ
diff --git a/app/assets/stylesheets/twitter.scss b/app/assets/stylesheets/twitter.scss
index 89cdecf..b2481db 100644
--- a/app/assets/stylesheets/twitter.scss
+++ b/app/assets/stylesheets/twitter.scss
@@ -3,9 +3,10 @@
 }
 
 .twitter_header {
-  font-size: 20px;
+  font-size: 16px;
   text-align: left;
-  margin-bottom: 80px;
+  margin-bottom: 55px;
+  padding: 10px 8px;
 }
 
 .twitter_id {
@@ -25,28 +26,29 @@
 .twitter_image_frame {
   width: 40px;
   height: 40px;
-  overflow: hidden;
+  overflow: hidden
   }
 
-.twitter_name {
-  padding-left: 65px;
-  line-height: 40px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  font-size: 20px;
-}
-
 .twitter_image_frame > img {
   display: block;
   position: absolute;
   top: 0;
   bottom: 0;
-  left: 0;
+  left: 30;
   width: 100%;
   margin: auto;
   }
 
+.twitter_name {
+  padding-left: 55px;
+  line-height: 20px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  font-size: 16px;
+}
+
+// Body = displays tweets
 .twitter_list {
   box-sizing: border-box;
 }
@@ -70,5 +72,7 @@ box-sizing: border-box;
 .twitter_footer {
   border-top-style: solid;
   border-color: lightgrey;
-  padding-top: 8px;
+  padding: 10px 8px;
+  font-style: italic;
+  font-size: 12px;
 }
diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml
index ecd8524..5341189 100644
--- a/app/views/home/_content.html.haml
+++ b/app/views/home/_content.html.haml
@@ -1,4 +1,4 @@
-.col-md-9
+.col-md-8
   .row
     %h1= t(:welcome, :provider => APP_CONFIG[:domain])
     .p=t(:welcome_message_html)
@@ -6,6 +6,8 @@
   .row
     = home_page_buttons
 
+.col-md-1
+
 .col-md-3
   .row
     = render 'twitter/index'
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index ac10aa4..ba618b3 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -1,30 +1,35 @@
 <% if twitter_enabled == true %>
   <div class="twitter">
 
-      <div class="twitter_header">
-        <p>These are the most recent tweets by </br><%= twitter_name%></p>
+    <div class="twitter_header">
+      <div class="twitter_id">
+        <div class="twitter_pic twitter_image_frame"><%= image_tag("Twitter_Logo_White_On_Blue.png") %></div>
+          <div class="twitter_name"><%= twitter_name%><br><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div>
+      </div>
+    </div>
+
+      <!-- <div class="twitter_header">
+        <p>These are the most recent tweets by <%= twitter_name%></p>
 
         <div class="twitter_id">
-          <div class="twitter_pic twitter_image_frame"><%= image_tag("rails.png") %></div>
+          <div class="twitter_pic twitter_image_frame"><%= image_tag("Twitter_Logo_White_On_Blue.png") %></div>
           <div class="twitter_name"><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div>
         </div>
-      </div>
+      </div> -->
 
       <div class="twitter_list">
         <% twitter_timeline.each do |e| %>
           <div class="tweet">
             <div class="tweet_text"><%= " #{e.text}" %>
             </div>
-
             <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
             </div>
-
           </div>
         <% end %>
-      </div>
+    </div>
 
-      <div class="twitter_footer">
-        To prevent leakage no links are displayed. For more information visit @<%= twitter_name %> on twitter.com.</p>
-      </div>
+    <div class="twitter_footer">
+      <p>This feed uses a Ruby interface to access the Twitter API. Within LEAP Twitter does not track you.</p>
+    </div>
 </div>
 <% end %>
-- 
cgit v1.2.3


From 2ef8707a7539622007b6d679a7708a5979594ff3 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 12:20:12 +0200
Subject: Cleaning CSS &view code, updating twitter helper with develop

---
 app/assets/stylesheets/twitter.scss |  8 +-------
 app/helpers/twitter_helper.rb       | 39 ++++++++++++++++++++++-------------
 app/views/twitter/_index.html.erb   | 41 +++++++++++++++----------------------
 3 files changed, 42 insertions(+), 46 deletions(-)

diff --git a/app/assets/stylesheets/twitter.scss b/app/assets/stylesheets/twitter.scss
index b2481db..b2233d0 100644
--- a/app/assets/stylesheets/twitter.scss
+++ b/app/assets/stylesheets/twitter.scss
@@ -13,7 +13,7 @@
   position: absolute;
 }
 
-.twitter_pic {
+.twitter_image_frame {
   display: block;
   width: 40px;
   height: 40px;
@@ -23,12 +23,6 @@
   top: 0;
   }
 
-.twitter_image_frame {
-  width: 40px;
-  height: 40px;
-  overflow: hidden
-  }
-
 .twitter_image_frame > img {
   display: block;
   position: absolute;
diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index fd3f82c..0b8f79c 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -16,31 +16,42 @@ module TwitterHelper
   end
 
   def twitter_user_info
-    $twitter_user_info ||= []
+      $twitter_user_info ||= []
   end
 
-  def update_twitter_info
-    twitter_user_info[0] = Time.now
-    twitter_user_info[1] = twitter_client.user(twitter_handle).name
-    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
-  end
-
-  def cached_info
+  def twitter_name
     if twitter_user_info[0] == nil
       update_twitter_info
     else
-      if Time.now > twitter_user_info[0] + 15.minutes
+      if Time.now > twitter_user_info[0] + 120.minutes
         update_twitter_info
       end
     end
-    twitter_user_info
+    twitter_user_info[1]
   end
 
-  def twitter_name
-    cached_info[1]
+  def update_twitter_info
+    twitter_user_info[0] = Time.now
+    twitter_user_info[1] = twitter_client.user(twitter_handle).name
+  end
+
+  def twitter_tweets
+      $twitter_tweets ||= []
+  end
+
+  def twitter_timeline
+    if twitter_tweets[0] == nil
+      update_twitter_timeline
+    else
+      if Time.now > twitter_tweets[0] + 15.minutes
+        update_twitter_timeline
+      end
+    end
+    twitter_tweets[1]
   end
 
-  def tweets
-    cached_info[2]
+  def update_twitter_timeline
+    twitter_tweets[0] = Time.now
+    twitter_tweets[1] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
   end
 end
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 2cba033..41fbf26 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -1,37 +1,28 @@
 <% if twitter_enabled == true %>
   <div class="twitter">
 
-    <div class="twitter_header">
-      <div class="twitter_id">
-        <div class="twitter_pic twitter_image_frame"><%= image_tag("Twitter_Logo_White_On_Blue.png") %></div>
+      <div class="twitter_header">
+        <div class="twitter_id">
+          <div class="twitter_image_frame"><%= image_tag("Twitter_Logo_Blue.png") %></div>
           <div class="twitter_name"><%= twitter_name%><br><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div>
+        </div>
       </div>
-    </div>
-
-      <!-- <div class="twitter_header">
-        <p>These are the most recent tweets by <%= twitter_name%></p>
 
-        <div class="twitter_id">
-          <div class="twitter_pic twitter_image_frame"><%= image_tag("Twitter_Logo_White_On_Blue.png") %></div>
-          <div class="twitter_name"><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div>
-        </div>
-      </div> -->
+      <div class="twitter_list">
+        <% twitter_timeline.each do |e| %>
+          <div class="tweet">
+            <div class="tweet_text"><%= " #{e.text}" %>
+            </div>
 
-    <div class="twitter_list">
-      <% tweets.each do |e| %>
-        <div class="tweet">
-          <div class="tweet_text"><%= " #{e.text}" %>
-          </div>
+            <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
+            </div>
 
-          <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
           </div>
+        <% end %>
+      </div>
 
-        </div>
-      <% end %>
-    </div>
-
-    <div class="twitter_footer">
-      <p>This feed uses a Ruby interface to access the Twitter API. Within LEAP Twitter does not track you.</p>
-    </div>
+      <div class="twitter_footer">
+        <p>This feed uses a Ruby interface to access the Twitter API. Within LEAP Twitter does not track you.</p>
+      </div>
 </div>
 <% end %>
-- 
cgit v1.2.3


From 0e46ed05ff0ab7b860e5bb8a4be99ae16474410d Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 12:34:00 +0200
Subject: No need of 2nd Twitter img

---
 app/assets/images/Twitter_Logo_White_On_Blue.png | Bin 4861 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 app/assets/images/Twitter_Logo_White_On_Blue.png

diff --git a/app/assets/images/Twitter_Logo_White_On_Blue.png b/app/assets/images/Twitter_Logo_White_On_Blue.png
deleted file mode 100644
index 25ba09f..0000000
Binary files a/app/assets/images/Twitter_Logo_White_On_Blue.png and /dev/null differ
-- 
cgit v1.2.3


From 76fd906336e48751f6e4ce623ffdec801b4e2c92 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Tue, 13 Sep 2016 12:42:40 +0200
Subject: included info about invalidate_bearer_token script

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 4d9ca39..4c2921a 100644
--- a/README.md
+++ b/README.md
@@ -213,3 +213,7 @@ LEAP web app (as part of the main view).
   * The full command looks like this: `script/generate_bearer_token --key your_consumerkey --secret your_consumersecret --projectroot your_projectroot --twitterhandle your_twitterhandle`
   * If you didn't give all your information to the script, had a typo or want to change anything else, please do so by finding the secrets-file at `/config/secrets.yml`
   * Make sure that the correct twitterhandle and bearer-token is included
+
+* Deactivate your bearer token
+  * To deactivate your generated bearer token you can run `script/invalidate_bearer_token`
+  * The full command looks like this: `script/invalidate_bearer_token --key your_consumerkey --secret your_consumersecret --token your_bearer_token`
-- 
cgit v1.2.3


From b26c4a45e3f4a82b30972c4b283a98a874bea216 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 13:20:17 +0200
Subject: Deleting one twitter img, only one is needed

---
 app/assets/images/Twitter_Logo_White_On_Blue.png | Bin 4861 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 app/assets/images/Twitter_Logo_White_On_Blue.png

diff --git a/app/assets/images/Twitter_Logo_White_On_Blue.png b/app/assets/images/Twitter_Logo_White_On_Blue.png
deleted file mode 100644
index 25ba09f..0000000
Binary files a/app/assets/images/Twitter_Logo_White_On_Blue.png and /dev/null differ
-- 
cgit v1.2.3


From 4626157572bf20884cfad2b1fc0e24cd60bad918 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 14:47:29 +0200
Subject: Added what was once deleted by mistake

---
 app/assets/images/rails.png | Bin 0 -> 6646 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 app/assets/images/rails.png

diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png
new file mode 100644
index 0000000..d5edc04
Binary files /dev/null and b/app/assets/images/rails.png differ
-- 
cgit v1.2.3


From 45abd9751e3e7d5428bad81a433b85feae328a04 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 15:16:20 +0200
Subject: Restructuring README and documentation in doc file

---
 README.md           | 29 ++---------------------------
 doc/TWITTER_FEED.md | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 27 deletions(-)
 create mode 100644 doc/TWITTER_FEED.md

diff --git a/README.md b/README.md
index 4d9ca39..923b239 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@ The LEAP Web App provides the following functions:
 * Webfinger access to user’s public keys
 * Email aliases and forwarding
 * Localized and Customizable documentation
+* Display of status updates from Twitter (access to tweets via Twitter API)
 
 Written in: Ruby, Rails.
 
@@ -36,6 +37,7 @@ For more information, see these files in the ``doc`` directory:
 * DEPLOY -- for notes on deployment.
 * DEVELOP -- for developer notes.
 * CUSTOM -- how to customize.
+* TWITTER_FEED -- how to use it.
 
 External docs:
 
@@ -186,30 +188,3 @@ Known problems
   attacks. These are very hard to prevent, because our protocol is
   designed to allow query of a user database via proxy in order to
   provide network perspective.
-
-Twitter Timeline on Main View
----------------------------
-
-This is a feature to include a twitter feed that displays most recent tweets
-of a (determined) twitter account (accessed via Twitter API).
-If you chose to use it, the feature gets included in `home/index` of
-LEAP web app (as part of the main view).
-
-* Create Twitter Application on https://apps.twitter.com/
-  * Visit https://apps.twitter.com/ and log in with the twitter account you want to use
-  * Make sure you have a mobile phone number registered with your account to be able to proceed
-  * Choose the option to `Create New App`
-  * Fill in Application Details and Developer Agreement and `Create your Twitter application`
-  * Choose the section "Keys and Access Tokens" to get your consumer key and consumer secret
-  * Optional: Go to section "Permissions" and change the "Access" from `Read and Write` (by default) to `Read only`
-  * Have your consumer key and secret by hand for one of the next steps
-
-* Activate the feature within your local LEAP Web Application
-  * If not already existing create a secrets-file in /config with the name secrets.yml (`/config/secrets.yml`)
-  * Secrets-file should contain the following, make sure its in YAML: {"development"=> {"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}}, "test"=>{"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}}}
-  * To have your bearer token created, run script in terminal being in the file of leap_web: `script/generate_bearer_token`
-  * To have the script run properly you have to add before running: `--key your_consumerkey --secret your_consumersecret`
-  * Add also `--projectroot your_projectroot --twitterhandle your_twitterhandle` as well to not have manually put the data in your secrets-file
-  * The full command looks like this: `script/generate_bearer_token --key your_consumerkey --secret your_consumersecret --projectroot your_projectroot --twitterhandle your_twitterhandle`
-  * If you didn't give all your information to the script, had a typo or want to change anything else, please do so by finding the secrets-file at `/config/secrets.yml`
-  * Make sure that the correct twitterhandle and bearer-token is included
diff --git a/doc/TWITTER_FEED.md b/doc/TWITTER_FEED.md
new file mode 100644
index 0000000..12dc1be
--- /dev/null
+++ b/doc/TWITTER_FEED.md
@@ -0,0 +1,36 @@
+Display of status updates from twitter on main view (access to tweets via Twitter API)
+---------------------------
+
+This is a feature to include status updates that displays most recent tweets
+of a (determined) twitter account (accessed via Twitter API).
+If you chose to use it, the feature gets included in `home/index` of
+LEAP web app (as part of the main view).
+
+## How to use it ##
+
+* Create Twitter Application on https://apps.twitter.com/
+  * Visit https://apps.twitter.com/ and log in with the twitter account you want to use
+  * Make sure you have a mobile phone number registered with your account to be able to proceed
+  * Choose the option to `Create New App`
+  * Fill in Application Details and Developer Agreement and `Create your Twitter application`
+  * Choose the section "Keys and Access Tokens" to get your consumer key and consumer secret
+  * Optional: Go to section "Permissions" and change the "Access" from `Read and Write` (by default) to `Read only`
+  * Have your consumer key and secret by hand for one of the next steps
+
+* Activate the feature within your local LEAP Web Application
+  * If not already existing create a secrets-file in /config with the name secrets.yml (`/config/secrets.yml`)
+  * Secrets-file should contain the following, make sure its in YAML: {"development"=> {"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}}, "test"=>{"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}}}
+  * To have your bearer token created, run script in terminal being in the file of leap_web: `script/generate_bearer_token`
+  * To have the script run properly you have to add before running: `--key your_consumerkey --secret your_consumersecret`
+  * Add also `--projectroot your_projectroot --twitterhandle your_twitterhandle` as well to not have manually put the data in your secrets-file
+  * The full command looks like this: `script/generate_bearer_token --key your_consumerkey --secret your_consumersecret --projectroot your_projectroot --twitterhandle your_twitterhandle`
+  * If you didn't give all your information to the script, had a typo or want to change anything else, please do so by finding the secrets-file at `/config/secrets.yml`
+  * Make sure that the correct twitterhandle and bearer-token is included
+
+* Deactivate your bearer token
+  * To deactivate your generated bearer token you can run script/invalidate_bearer_token
+  * The full command looks like this: script/invalidate_bearer_token --key your_consumerkey --secret your_consumersecret --token your_bearer_token
+
+### Default avatar image ###
+
+This feature uses by default the the twitter bird as avatar picture (Twitter_Logo_Blue.png). By using the Twitter trademarks in these Brand Guidelines, you agree to follow these Twitter Trademark Guidelines (the “Guidelines”) as well as our Terms of Service and all other Twitter rules and policies. Find more details here: https://brand.twitter.com/.
-- 
cgit v1.2.3


From b19280e9937276d908d90be5da7c65cdfbb64be1 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 15:21:12 +0200
Subject: Fixed typo

---
 doc/TWITTER_FEED.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/TWITTER_FEED.md b/doc/TWITTER_FEED.md
index 12dc1be..bfe2a1d 100644
--- a/doc/TWITTER_FEED.md
+++ b/doc/TWITTER_FEED.md
@@ -1,4 +1,4 @@
-Display of status updates from twitter on main view (access to tweets via Twitter API)
+# Display of status updates from twitter on main view #
 ---------------------------
 
 This is a feature to include status updates that displays most recent tweets
@@ -33,4 +33,4 @@ LEAP web app (as part of the main view).
 
 ### Default avatar image ###
 
-This feature uses by default the the twitter bird as avatar picture (Twitter_Logo_Blue.png). By using the Twitter trademarks in these Brand Guidelines, you agree to follow these Twitter Trademark Guidelines (the “Guidelines”) as well as our Terms of Service and all other Twitter rules and policies. Find more details here: https://brand.twitter.com/.
+This feature uses by default the twitter bird as avatar picture (Twitter_Logo_Blue.png). By using the Twitter trademarks in these Brand Guidelines, you agree to follow these Twitter Trademark Guidelines (the “Guidelines”) as well as our Terms of Service and all other Twitter rules and policies. Please find more details here: https://brand.twitter.com/.
-- 
cgit v1.2.3


From 8d825a904f4d84e388a5af2c873b06b344512795 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Tue, 13 Sep 2016 14:59:46 +0200
Subject: reseted index.html.haml old state

---
 app/views/home/index.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 5e33e62..147cacd 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -6,4 +6,4 @@
   #push
     -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3
 #footer
-  = render 'layouts/footer'
+  = render 'layouts/footer'
\ No newline at end of file
-- 
cgit v1.2.3


From 8a9c46dd6bd2538bf9f126ec6901d4ce3ebd2758 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 15:23:11 +0200
Subject: Fixed typo

---
 doc/TWITTER_FEED.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/TWITTER_FEED.md b/doc/TWITTER_FEED.md
index bfe2a1d..218bc26 100644
--- a/doc/TWITTER_FEED.md
+++ b/doc/TWITTER_FEED.md
@@ -1,5 +1,4 @@
 # Display of status updates from twitter on main view #
----------------------------
 
 This is a feature to include status updates that displays most recent tweets
 of a (determined) twitter account (accessed via Twitter API).
-- 
cgit v1.2.3


From 59c841bb29d7fd07b12b1dc480653fd4a4d6ab05 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Tue, 13 Sep 2016 15:37:50 +0200
Subject: reseted config/defaults.yml old state

---
 config/defaults.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/defaults.yml b/config/defaults.yml
index bcb8dac..7e2ea58 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -32,7 +32,6 @@ common: &common
   pagination_size: 30
   auth:
     token_expires_after: 60
-
   # handles that will be blocked from being used as logins or email aliases
   # in addition to the ones in /etc/passwd and http://tools.ietf.org/html/rfc2142
   handle_blacklist:
-- 
cgit v1.2.3


From e768e50cce83cf3e1ff3f5ac7b1b58f73368daef Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 15:41:42 +0200
Subject: added twitter guidelines for usage of twitter image

---
 doc/TWITTER_FEED.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/TWITTER_FEED.md b/doc/TWITTER_FEED.md
index 218bc26..972e683 100644
--- a/doc/TWITTER_FEED.md
+++ b/doc/TWITTER_FEED.md
@@ -32,4 +32,4 @@ LEAP web app (as part of the main view).
 
 ### Default avatar image ###
 
-This feature uses by default the twitter bird as avatar picture (Twitter_Logo_Blue.png). By using the Twitter trademarks in these Brand Guidelines, you agree to follow these Twitter Trademark Guidelines (the “Guidelines”) as well as our Terms of Service and all other Twitter rules and policies. Please find more details here: https://brand.twitter.com/.
+This feature uses by default the twitter bird as avatar picture (Twitter_Logo_Blue.png). By using the Twitter trademarks, you agree to follow these Twitter Trademark Guidelines (the “Guidelines”) as well as Twitter's Terms of Service and all other Twitter rules and policies. Please find more details here: https://brand.twitter.com/.
-- 
cgit v1.2.3


From b66eb2b7af58cd4354f0c5262a7061e3d20e317c Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 15:46:45 +0200
Subject: Clarifying on how to use twitter brand logo

---
 doc/TWITTER_FEED.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/TWITTER_FEED.md b/doc/TWITTER_FEED.md
index 972e683..dd3954c 100644
--- a/doc/TWITTER_FEED.md
+++ b/doc/TWITTER_FEED.md
@@ -32,4 +32,4 @@ LEAP web app (as part of the main view).
 
 ### Default avatar image ###
 
-This feature uses by default the twitter bird as avatar picture (Twitter_Logo_Blue.png). By using the Twitter trademarks, you agree to follow these Twitter Trademark Guidelines (the “Guidelines”) as well as Twitter's Terms of Service and all other Twitter rules and policies. Please find more details here: https://brand.twitter.com/.
+This feature uses by default the twitter bird as avatar picture (Twitter_Logo_Blue.png). By using the Twitter trademarks, you agree to follow the Twitter Trademark Guidelines as well as Twitter's Terms of Service and all other Twitter rules and policies. Please find more details here: https://brand.twitter.com/.
-- 
cgit v1.2.3


From 782be39862394c05a069eab9b7dd8f6779354917 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 17:26:51 +0200
Subject: Change in code for caching

---
 app/helpers/twitter_helper.rb     | 37 +++++++++++++------------------------
 app/views/twitter/_index.html.erb |  2 +-
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index 0b8f79c..f824a03 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -19,39 +19,28 @@ module TwitterHelper
       $twitter_user_info ||= []
   end
 
-  def twitter_name
-    if twitter_user_info[0] == nil
-      update_twitter_info
-    else
-      if Time.now > twitter_user_info[0] + 120.minutes
-        update_twitter_info
-      end
-    end
-    twitter_user_info[1]
-  end
-
   def update_twitter_info
     twitter_user_info[0] = Time.now
     twitter_user_info[1] = twitter_client.user(twitter_handle).name
+    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
   end
 
-  def twitter_tweets
-      $twitter_tweets ||= []
-  end
-
-  def twitter_timeline
-    if twitter_tweets[0] == nil
-      update_twitter_timeline
+  def cached_info
+    if twitter_user_info[0] == nil
+      update_twitter_info
     else
-      if Time.now > twitter_tweets[0] + 15.minutes
-        update_twitter_timeline
+      if Time.now > twitter_user_info[0] + 15.minutes
+        update_twitter_info
       end
     end
-    twitter_tweets[1]
+    twitter_user_info
+  end
+
+  def twitter_name
+    cached_info[1]
   end
 
-  def update_twitter_timeline
-    twitter_tweets[0] = Time.now
-    twitter_tweets[1] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
+  def tweets
+    cached_info[2]
   end
 end
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index e31117e..a7ebd1b 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -9,7 +9,7 @@
       </div>
 
       <div class="twitter_list">
-        <% twitter_timeline.each do |e| %>
+        <% tweets.each do |e| %>
           <div class="tweet">
             <div class="tweet_text"><%= " #{e.text}" %>
             </div>
-- 
cgit v1.2.3


From 6a8afd2f69a13f62841a3fe909beaad96928fadb Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Thu, 15 Sep 2016 12:23:14 +0200
Subject: twitter readme now contains github markup to show secrets-file
 content

---
 doc/TWITTER_FEED.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/doc/TWITTER_FEED.md b/doc/TWITTER_FEED.md
index dd3954c..221c334 100644
--- a/doc/TWITTER_FEED.md
+++ b/doc/TWITTER_FEED.md
@@ -19,6 +19,18 @@ LEAP web app (as part of the main view).
 * Activate the feature within your local LEAP Web Application
   * If not already existing create a secrets-file in /config with the name secrets.yml (`/config/secrets.yml`)
   * Secrets-file should contain the following, make sure its in YAML: {"development"=> {"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}}, "test"=>{"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}}}
+```
+development:
+  twitter:
+    enabled: false # set to true for usage
+    twitter_handle: XXXXX #put your twitter handle here
+    bearer_token: XXXXX #put your bearer token here
+test:
+  twitter:
+    enabled: false # set to true for usage
+    twitter_handle: XXXXX #put your twitter handle here
+    bearer_token: XXXXX #put your bearer token here
+```
   * To have your bearer token created, run script in terminal being in the file of leap_web: `script/generate_bearer_token`
   * To have the script run properly you have to add before running: `--key your_consumerkey --secret your_consumersecret`
   * Add also `--projectroot your_projectroot --twitterhandle your_twitterhandle` as well to not have manually put the data in your secrets-file
-- 
cgit v1.2.3


From 94a5b32a58f5f4fb63eaf677a91af63e1fe3e325 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Thu, 15 Sep 2016 15:29:10 +0200
Subject: included production for readme & secrets

---
 doc/TWITTER_FEED.md          | 5 +++++
 script/generate_bearer_token | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/doc/TWITTER_FEED.md b/doc/TWITTER_FEED.md
index 221c334..592cd38 100644
--- a/doc/TWITTER_FEED.md
+++ b/doc/TWITTER_FEED.md
@@ -30,6 +30,11 @@ test:
     enabled: false # set to true for usage
     twitter_handle: XXXXX #put your twitter handle here
     bearer_token: XXXXX #put your bearer token here
+production:
+  twitter:
+    enabled: false # set to true for usage
+    twitter_handle: XXXXX #put your twitter handle here
+    bearer_token: XXXXX #put your bearer token here
 ```
   * To have your bearer token created, run script in terminal being in the file of leap_web: `script/generate_bearer_token`
   * To have the script run properly you have to add before running: `--key your_consumerkey --secret your_consumersecret`
diff --git a/script/generate_bearer_token b/script/generate_bearer_token
index 7091a8d..60e4600 100755
--- a/script/generate_bearer_token
+++ b/script/generate_bearer_token
@@ -73,10 +73,12 @@ else
   else
     secrets["development"]["twitter"]["twitter_handle"] = options[:twitterhandle]
     secrets["test"]["twitter"]["twitter_handle"] = options[:twitterhandle]
+    secrets["production"]["twitter"]["twitter_handle"] = options[:twitterhandle]
   end
 
   secrets["development"]["twitter"]["bearer_token"] = $bearer_token
   secrets["test"]["twitter"]["bearer_token"] = $bearer_token
+  secrets["production"]["twitter"]["twitter_handle"] = $bearer_token
 
   File.open("#{options[:projectroot]}/leap_web/config/secrets.yml", "r+") do |file|
     file.write(secrets.to_yaml)
-- 
cgit v1.2.3


From a95c0dfe3f70671ee354648fc4b25a79d5b57824 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Tue, 20 Sep 2016 12:13:30 +0200
Subject: deleted leap_web from projectroot

---
 script/generate_bearer_token | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/script/generate_bearer_token b/script/generate_bearer_token
index 60e4600..3a09382 100755
--- a/script/generate_bearer_token
+++ b/script/generate_bearer_token
@@ -55,8 +55,8 @@ if options[:projectroot].nil? then
   puts "You didn't tell us the directory to have your secrets-file created or being filled. Feel free to copy/paste your bearer_token:"
   puts $bearer_token
 else
-  if File.exist?("#{options[:projectroot]}/leap_web/config/secrets.yml")
-    secrets = YAML.load_file("#{options[:projectroot]}/leap_web/config/secrets.yml")
+  if File.exist?("#{options[:projectroot]}/config/secrets.yml")
+    secrets = YAML.load_file("#{options[:projectroot]}/config/secrets.yml")
   else
     puts "Please make sure that you created a secrets-file as described in the documentation or have given the correct directory. No secrets-file could be found."
     exit
-- 
cgit v1.2.3


From 460129e5965751127bb6cb363a661afb7c7d5ab4 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Wed, 21 Sep 2016 14:08:38 +0200
Subject: included error-handling: twitter-helper includes rescue and error
 message for fourth value in array. there will always be an empty array that
 view (text and each - method) does not break. if empty array in view the
 error-message is shown. (its WIP)

---
 app/helpers/twitter_helper.rb     | 24 ++++++++++++++++++++++++
 app/views/twitter/_index.html.erb | 15 ++++++++-------
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index f824a03..8503f24 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -23,6 +23,26 @@ module TwitterHelper
     twitter_user_info[0] = Time.now
     twitter_user_info[1] = twitter_client.user(twitter_handle).name
     twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
+    if twitter_user_info[2] == nil
+      error_handling
+      twitter_user_info[3] = "The twitter-handle does not exist or the account is private. Please change it or contact your provider-admin."
+    end
+  rescue Twitter::Error::BadRequest
+    error_handling
+  rescue Twitter::Error::Unauthorized
+    error_handling
+  rescue Twitter::Error::Forbidden
+    error_handling
+  rescue Twitter::Error::NotAcceptable
+    error_handling
+  rescue Twitter::Error::TooManyRequests
+    error_handling
+  end
+
+  def error_handling
+    twitter_user_info[2] = []
+    twitter_user_info[3] = "The twitter-handle does not exist or the account is private. Please change it or contact your provider-admin."
+    return twitter_user_info
   end
 
   def cached_info
@@ -43,4 +63,8 @@ module TwitterHelper
   def tweets
     cached_info[2]
   end
+
+  def error_message
+    cached_info[3]
+  end
 end
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index a7ebd1b..8529b83 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -9,14 +9,15 @@
       </div>
 
       <div class="twitter_list">
-        <% tweets.each do |e| %>
-          <div class="tweet">
-            <div class="tweet_text"><%= " #{e.text}" %>
+        <%if tweets == [] then%><%= error_message %><% end %>
+          <% tweets.each do |e| %>
+            <div class="tweet">
+              <div class="tweet_text"><%= " #{e.text}" %>
+              </div>
+              <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
+              </div>
             </div>
-            <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
-            </div>
-          </div>
-        <% end %>
+          <% end %>
     </div>
 
     <div class="twitter_footer">
-- 
cgit v1.2.3


From d44fc9292637ed6d1a4a7e04883e8b3b88dc3c15 Mon Sep 17 00:00:00 2001
From: theaamanda <ta.kupler@posteo.de>
Date: Wed, 21 Sep 2016 23:34:53 +0200
Subject: finished error-handling with different error-messages for different
 errors. added info that the account has to be public in Twitter-Doc

---
 app/helpers/twitter_helper.rb | 6 +++++-
 doc/TWITTER_FEED.md           | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index 8503f24..719f95e 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -29,19 +29,23 @@ module TwitterHelper
     end
   rescue Twitter::Error::BadRequest
     error_handling
+    twitter_user_info[3] = "The request to have the tweets shown was invalid or cannot be otherwise served."
   rescue Twitter::Error::Unauthorized
     error_handling
+    twitter_user_info[3] = "Please change your twitter-credentials, make sure that the twitter-account you access is public or contact your provider-admin to have the tweets shown."
   rescue Twitter::Error::Forbidden
     error_handling
+    twitter_user_info[3] = "The request to have the tweets shown is understood, but it has been refused or access is not allowed."
   rescue Twitter::Error::NotAcceptable
     error_handling
+    twitter_user_info[3] = "An invalid format is specified in the request to have the tweets shown."
   rescue Twitter::Error::TooManyRequests
     error_handling
+    twitter_user_info[3] = "The rate-limit for accessing the tweets is reached. You should be able to see the tweets in a couple of minutes."
   end
 
   def error_handling
     twitter_user_info[2] = []
-    twitter_user_info[3] = "The twitter-handle does not exist or the account is private. Please change it or contact your provider-admin."
     return twitter_user_info
   end
 
diff --git a/doc/TWITTER_FEED.md b/doc/TWITTER_FEED.md
index 592cd38..94de8c1 100644
--- a/doc/TWITTER_FEED.md
+++ b/doc/TWITTER_FEED.md
@@ -41,7 +41,7 @@ production:
   * Add also `--projectroot your_projectroot --twitterhandle your_twitterhandle` as well to not have manually put the data in your secrets-file
   * The full command looks like this: `script/generate_bearer_token --key your_consumerkey --secret your_consumersecret --projectroot your_projectroot --twitterhandle your_twitterhandle`
   * If you didn't give all your information to the script, had a typo or want to change anything else, please do so by finding the secrets-file at `/config/secrets.yml`
-  * Make sure that the correct twitterhandle and bearer-token is included
+  * Make sure that the correct twitterhandle and bearer-token is included. The twitter-account you want to have shown (the twitterhandle) is a public account!
 
 * Deactivate your bearer token
   * To deactivate your generated bearer token you can run script/invalidate_bearer_token
-- 
cgit v1.2.3


From f70199b16fc759d020ea8eea6ecaaf8eeced8abb Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 22 Sep 2016 14:16:16 +0200
Subject: customize: provider message more fine grained

We used to replace all of home/content - so we missed the twitter feed
on the providers.

Instead one should now customize home/provider_message only.
---
 app/views/home/_content.html.haml          | 2 ++
 app/views/home/_provider_message.html.haml | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 app/views/home/_provider_message.html.haml

diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml
index 5341189..3f4f36e 100644
--- a/app/views/home/_content.html.haml
+++ b/app/views/home/_content.html.haml
@@ -5,6 +5,8 @@
 
   .row
     = home_page_buttons
+  .row
+    = render 'home/provider_message'
 
 .col-md-1
 
diff --git a/app/views/home/_provider_message.html.haml b/app/views/home/_provider_message.html.haml
new file mode 100644
index 0000000..928215a
--- /dev/null
+++ b/app/views/home/_provider_message.html.haml
@@ -0,0 +1,2 @@
+-# please overwrite me in your customization files at
+-# config/customization/views/home/_provider_message.html.haml
-- 
cgit v1.2.3


From 306b36c045cd62638db179115ed002c6ab7c5cd8 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Thu, 22 Sep 2016 14:36:10 +0200
Subject: included Theas work on error-handling \o/; changed link to
 twitter-account in header; fixed erb escaping characters problem without
 letting evil code pass; setting customized image file 'Avatar_Pic.png' in
 config/custo../assets to get loaded instead of default twitter-logo

---
 app/assets/images/Avatar_Pic.png        | Bin 0 -> 4298 bytes
 app/assets/images/Twitter_Logo_Blue.png | Bin 4298 -> 0 bytes
 app/assets/stylesheets/twitter.scss     |   1 +
 app/helpers/twitter_helper.rb           |  28 ++++++++++++++++++++++++
 app/views/twitter/_index.html.erb       |  19 ++++++++--------
 config/initializers/assets.rb           |   1 +
 config/initializers/customization.rb    |   3 ++-
 config/initializers/twitter.rb          |  37 ++++++++++++++++++++++++++++++++
 8 files changed, 79 insertions(+), 10 deletions(-)
 create mode 100644 app/assets/images/Avatar_Pic.png
 delete mode 100644 app/assets/images/Twitter_Logo_Blue.png
 create mode 100644 config/initializers/assets.rb
 create mode 100644 config/initializers/twitter.rb

diff --git a/app/assets/images/Avatar_Pic.png b/app/assets/images/Avatar_Pic.png
new file mode 100644
index 0000000..b5eebc8
Binary files /dev/null and b/app/assets/images/Avatar_Pic.png differ
diff --git a/app/assets/images/Twitter_Logo_Blue.png b/app/assets/images/Twitter_Logo_Blue.png
deleted file mode 100644
index b5eebc8..0000000
Binary files a/app/assets/images/Twitter_Logo_Blue.png and /dev/null differ
diff --git a/app/assets/stylesheets/twitter.scss b/app/assets/stylesheets/twitter.scss
index b2233d0..a67c044 100644
--- a/app/assets/stylesheets/twitter.scss
+++ b/app/assets/stylesheets/twitter.scss
@@ -21,6 +21,7 @@
   position: absolute;
   left: 0;
   top: 0;
+  // background-image: url(/Avatar_Pic.png);
   }
 
 .twitter_image_frame > img {
diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index f824a03..719f95e 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -23,6 +23,30 @@ module TwitterHelper
     twitter_user_info[0] = Time.now
     twitter_user_info[1] = twitter_client.user(twitter_handle).name
     twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
+    if twitter_user_info[2] == nil
+      error_handling
+      twitter_user_info[3] = "The twitter-handle does not exist or the account is private. Please change it or contact your provider-admin."
+    end
+  rescue Twitter::Error::BadRequest
+    error_handling
+    twitter_user_info[3] = "The request to have the tweets shown was invalid or cannot be otherwise served."
+  rescue Twitter::Error::Unauthorized
+    error_handling
+    twitter_user_info[3] = "Please change your twitter-credentials, make sure that the twitter-account you access is public or contact your provider-admin to have the tweets shown."
+  rescue Twitter::Error::Forbidden
+    error_handling
+    twitter_user_info[3] = "The request to have the tweets shown is understood, but it has been refused or access is not allowed."
+  rescue Twitter::Error::NotAcceptable
+    error_handling
+    twitter_user_info[3] = "An invalid format is specified in the request to have the tweets shown."
+  rescue Twitter::Error::TooManyRequests
+    error_handling
+    twitter_user_info[3] = "The rate-limit for accessing the tweets is reached. You should be able to see the tweets in a couple of minutes."
+  end
+
+  def error_handling
+    twitter_user_info[2] = []
+    return twitter_user_info
   end
 
   def cached_info
@@ -43,4 +67,8 @@ module TwitterHelper
   def tweets
     cached_info[2]
   end
+
+  def error_message
+    cached_info[3]
+  end
 end
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index a7ebd1b..cdfff4b 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -3,20 +3,21 @@
 
       <div class="twitter_header">
         <div class="twitter_id">
-          <div class="twitter_image_frame"><%= image_tag("Twitter_Logo_Blue.png") %></div>
-          <div class="twitter_name"><%= twitter_name%><br><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div>
+          <div class="twitter_image_frame"><%= image_tag("Avatar_Pic.png") %></div>
+          <div class="twitter_name"><%= twitter_name%><br><a href="https://twitter.com/<%= twitter_handle %>">@<%= twitter_handle %></a></div>
         </div>
       </div>
 
       <div class="twitter_list">
-        <% tweets.each do |e| %>
-          <div class="tweet">
-            <div class="tweet_text"><%= " #{e.text}" %>
+        <%if tweets == [] then%><%= error_message %><% end %>
+          <% tweets.each do |e| %>
+            <div class="tweet">
+              <div class="tweet_text"><%= sanitize(e.text) %>
+              </div>
+              <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
+              </div>
             </div>
-            <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
-            </div>
-          </div>
-        <% end %>
+          <% end %>
     </div>
 
     <div class="twitter_footer">
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
new file mode 100644
index 0000000..ccb32b6
--- /dev/null
+++ b/config/initializers/assets.rb
@@ -0,0 +1 @@
+Rails.application.config.assets.precompile += %w( Avatar_Pic.png )
diff --git a/config/initializers/customization.rb b/config/initializers/customization.rb
index 9f537e9..9b3a2b9 100644
--- a/config/initializers/customization.rb
+++ b/config/initializers/customization.rb
@@ -21,7 +21,8 @@ customization_directory = APP_CONFIG["customization_directory"]
 # * For this to work, config.assets.initialize_on_precompile MUST be set to true, otherwise
 #   this initializer will never get called in production mode when the assets are precompiled.
 #
-Rails.application.config.assets.paths.unshift "#{customization_directory}/stylesheets"
+# Rails.application.config.assets.paths.unshift "#{customization_directory}/stylesheets"
+Rails.application.config.assets.paths.unshift "#{customization_directory}/assets"
 
 #
 # Copy files to public
diff --git a/config/initializers/twitter.rb b/config/initializers/twitter.rb
new file mode 100644
index 0000000..9f537e9
--- /dev/null
+++ b/config/initializers/twitter.rb
@@ -0,0 +1,37 @@
+#
+# When deploying, common customizations can be dropped in config/customizations. This initializer makes this work.
+#
+APP_CONFIG["customization_directory"] ||= "#{Rails.root}/config/customization"
+customization_directory = APP_CONFIG["customization_directory"]
+
+#
+# Set customization views as the first view path
+#
+# Rails.application.config.paths['app/views'].unshift "config/customization/views"
+# (For some reason, this does not work here. See application.rb for where this is actually called.)
+
+#
+# Set customization stylesheets as the first asset path
+#
+# Some notes:
+#
+# * This cannot go in application.rb, as far as I can tell. In application.rb, the default paths
+#   haven't been loaded yet, so the path we add will always end up at the end unless we add it here.
+#
+# * For this to work, config.assets.initialize_on_precompile MUST be set to true, otherwise
+#   this initializer will never get called in production mode when the assets are precompiled.
+#
+Rails.application.config.assets.paths.unshift "#{customization_directory}/stylesheets"
+
+#
+# Copy files to public
+#
+if !defined?(RAKE) && Dir.exist?("#{customization_directory}/public")
+  require 'fileutils'
+  FileUtils.cp_r("#{customization_directory}/public/.", "#{Rails.root}/public", :preserve => true)
+end
+
+#
+# Add I18n path
+#
+Rails.application.config.i18n.load_path += Dir["#{customization_directory}/locales/*.{rb,yml,yaml}"]
-- 
cgit v1.2.3


From 6f9c4fdab2caef90e49ca965617e767b50bcbbb2 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Thu, 22 Sep 2016 15:31:52 +0200
Subject: initializer/twitter.rb file unnecessary; added change in main view
 only if twitter feature is set enabled == true

---
 app/views/home/_content.html.haml | 22 +++++++++++++++-------
 config/initializers/twitter.rb    | 37 -------------------------------------
 2 files changed, 15 insertions(+), 44 deletions(-)
 delete mode 100644 config/initializers/twitter.rb

diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml
index 5341189..950f85e 100644
--- a/app/views/home/_content.html.haml
+++ b/app/views/home/_content.html.haml
@@ -1,4 +1,18 @@
-.col-md-8
+- if twitter_enabled == true
+  .col-md-8
+    .row
+      %h1= t(:welcome, :provider => APP_CONFIG[:domain])
+      .p=t(:welcome_message_html)
+
+    .row
+      = home_page_buttons
+
+  .col-md-1
+
+  .col-md-3
+    .row
+      = render 'twitter/index'
+- else
   .row
     %h1= t(:welcome, :provider => APP_CONFIG[:domain])
     .p=t(:welcome_message_html)
@@ -6,12 +20,6 @@
   .row
     = home_page_buttons
 
-.col-md-1
-
-.col-md-3
-  .row
-    = render 'twitter/index'
-
     - if Rails.env == 'development'
       .row
         %hr
diff --git a/config/initializers/twitter.rb b/config/initializers/twitter.rb
deleted file mode 100644
index 9f537e9..0000000
--- a/config/initializers/twitter.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# When deploying, common customizations can be dropped in config/customizations. This initializer makes this work.
-#
-APP_CONFIG["customization_directory"] ||= "#{Rails.root}/config/customization"
-customization_directory = APP_CONFIG["customization_directory"]
-
-#
-# Set customization views as the first view path
-#
-# Rails.application.config.paths['app/views'].unshift "config/customization/views"
-# (For some reason, this does not work here. See application.rb for where this is actually called.)
-
-#
-# Set customization stylesheets as the first asset path
-#
-# Some notes:
-#
-# * This cannot go in application.rb, as far as I can tell. In application.rb, the default paths
-#   haven't been loaded yet, so the path we add will always end up at the end unless we add it here.
-#
-# * For this to work, config.assets.initialize_on_precompile MUST be set to true, otherwise
-#   this initializer will never get called in production mode when the assets are precompiled.
-#
-Rails.application.config.assets.paths.unshift "#{customization_directory}/stylesheets"
-
-#
-# Copy files to public
-#
-if !defined?(RAKE) && Dir.exist?("#{customization_directory}/public")
-  require 'fileutils'
-  FileUtils.cp_r("#{customization_directory}/public/.", "#{Rails.root}/public", :preserve => true)
-end
-
-#
-# Add I18n path
-#
-Rails.application.config.i18n.load_path += Dir["#{customization_directory}/locales/*.{rb,yml,yaml}"]
-- 
cgit v1.2.3


From cd07bbe8d0390a8622bcde257efcb3e11038de63 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Thu, 22 Sep 2016 16:05:02 +0200
Subject: Modified error messages

---
 app/helpers/twitter_helper.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index 719f95e..e3b468a 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -22,26 +22,26 @@ module TwitterHelper
   def update_twitter_info
     twitter_user_info[0] = Time.now
     twitter_user_info[1] = twitter_client.user(twitter_handle).name
-    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
+    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(7)
     if twitter_user_info[2] == nil
       error_handling
-      twitter_user_info[3] = "The twitter-handle does not exist or the account is private. Please change it or contact your provider-admin."
+      twitter_user_info[3] = "The twitter handle does not exist or the account's tweets are protected. Please change the privacy settings accordingly."
     end
   rescue Twitter::Error::BadRequest
     error_handling
-    twitter_user_info[3] = "The request to have the tweets shown was invalid or cannot be otherwise served."
+    twitter_user_info[3] = "The request to display tweets is invalid or cannot be otherwise served."
   rescue Twitter::Error::Unauthorized
     error_handling
-    twitter_user_info[3] = "Please change your twitter-credentials, make sure that the twitter-account you access is public or contact your provider-admin to have the tweets shown."
+    twitter_user_info[3] = "The account's tweets are protected and cannot be displayed. Please change the privacy settings of the corresponding account."
   rescue Twitter::Error::Forbidden
     error_handling
-    twitter_user_info[3] = "The request to have the tweets shown is understood, but it has been refused or access is not allowed."
+    twitter_user_info[3] = "The request to display tweets is understood, but it has been refused or access is not allowed."
   rescue Twitter::Error::NotAcceptable
     error_handling
-    twitter_user_info[3] = "An invalid format is specified in the request to have the tweets shown."
+    twitter_user_info[3] = "An invalid format is specified in the request to display tweets."
   rescue Twitter::Error::TooManyRequests
     error_handling
-    twitter_user_info[3] = "The rate-limit for accessing the tweets is reached. You should be able to see the tweets in a couple of minutes."
+    twitter_user_info[3] = "The rate-limit for accessing the tweets is reached. You should be able to display tweets in a couple of minutes."
   end
 
   def error_handling
-- 
cgit v1.2.3


From a771c63ff6a04f2f80b94c35538dd62ad1b0c310 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Thu, 22 Sep 2016 16:11:12 +0200
Subject: same same but slightly different

---
 app/helpers/twitter_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index e3b468a..cf75a73 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -22,7 +22,7 @@ module TwitterHelper
   def update_twitter_info
     twitter_user_info[0] = Time.now
     twitter_user_info[1] = twitter_client.user(twitter_handle).name
-    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(7)
+    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
     if twitter_user_info[2] == nil
       error_handling
       twitter_user_info[3] = "The twitter handle does not exist or the account's tweets are protected. Please change the privacy settings accordingly."
-- 
cgit v1.2.3


From 7c9aba4a6192617cd29765450711a65affccecef Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Thu, 22 Sep 2016 16:13:42 +0200
Subject: clean up

---
 config/initializers/customization.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/config/initializers/customization.rb b/config/initializers/customization.rb
index 9b3a2b9..a96564c 100644
--- a/config/initializers/customization.rb
+++ b/config/initializers/customization.rb
@@ -1,10 +1,8 @@
-#
 # When deploying, common customizations can be dropped in config/customizations. This initializer makes this work.
 #
 APP_CONFIG["customization_directory"] ||= "#{Rails.root}/config/customization"
 customization_directory = APP_CONFIG["customization_directory"]
 
-#
 # Set customization views as the first view path
 #
 # Rails.application.config.paths['app/views'].unshift "config/customization/views"
@@ -21,7 +19,6 @@ customization_directory = APP_CONFIG["customization_directory"]
 # * For this to work, config.assets.initialize_on_precompile MUST be set to true, otherwise
 #   this initializer will never get called in production mode when the assets are precompiled.
 #
-# Rails.application.config.assets.paths.unshift "#{customization_directory}/stylesheets"
 Rails.application.config.assets.paths.unshift "#{customization_directory}/assets"
 
 #
-- 
cgit v1.2.3


From 4ffa776d2c760618b17bd76a9a023f7fe762babd Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Fri, 23 Sep 2016 11:52:46 +0200
Subject: Doc updated on how to customize avatar picture in twitter feature;
 update error response messages; added 'config/customization/images' + link in
 'config/initializer/customization.rb'

---
 app/helpers/twitter_helper.rb        | 14 ++++++++++----
 config/initializers/customization.rb |  4 ++--
 doc/TWITTER_FEED.md                  |  5 +++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index cf75a73..5a9d28c 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -22,26 +22,32 @@ module TwitterHelper
   def update_twitter_info
     twitter_user_info[0] = Time.now
     twitter_user_info[1] = twitter_client.user(twitter_handle).name
-    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
+    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(10)
     if twitter_user_info[2] == nil
       error_handling
       twitter_user_info[3] = "The twitter handle does not exist or the account's tweets are protected. Please change the privacy settings accordingly."
     end
   rescue Twitter::Error::BadRequest
     error_handling
-    twitter_user_info[3] = "The request to display tweets is invalid or cannot be otherwise served."
+    twitter_user_info[3] = "The request for displaying tweets is invalid or cannot be otherwise served."
   rescue Twitter::Error::Unauthorized
     error_handling
     twitter_user_info[3] = "The account's tweets are protected and cannot be displayed. Please change the privacy settings of the corresponding account."
   rescue Twitter::Error::Forbidden
     error_handling
-    twitter_user_info[3] = "The request to display tweets is understood, but it has been refused or access is not allowed."
+    twitter_user_info[3] = "The request for displaying tweets is understood, but it has been refused or access is not allowed."
   rescue Twitter::Error::NotAcceptable
     error_handling
-    twitter_user_info[3] = "An invalid format is specified in the request to display tweets."
+    twitter_user_info[3] = "An invalid format is specified in the request for displaying tweets."
   rescue Twitter::Error::TooManyRequests
     error_handling
     twitter_user_info[3] = "The rate-limit for accessing the tweets is reached. You should be able to display tweets in a couple of minutes."
+  rescue Twitter::Error::NotFound
+    error_handling
+    twitter_user_info[3] = "The twitter hanlde does not exist."
+  rescue Twitter::Error
+    error_handling
+    twitter_user_info[3] = "An error occured while fetching the tweets."
   end
 
   def error_handling
diff --git a/config/initializers/customization.rb b/config/initializers/customization.rb
index a96564c..6d9c741 100644
--- a/config/initializers/customization.rb
+++ b/config/initializers/customization.rb
@@ -19,8 +19,8 @@ customization_directory = APP_CONFIG["customization_directory"]
 # * For this to work, config.assets.initialize_on_precompile MUST be set to true, otherwise
 #   this initializer will never get called in production mode when the assets are precompiled.
 #
-Rails.application.config.assets.paths.unshift "#{customization_directory}/assets"
-
+Rails.application.config.assets.paths.unshift "#{customization_directory}/images"
+Rails.application.config.assets.paths.unshift "#{customization_directory}/stylesheets"
 #
 # Copy files to public
 #
diff --git a/doc/TWITTER_FEED.md b/doc/TWITTER_FEED.md
index dd3954c..3e54a4d 100644
--- a/doc/TWITTER_FEED.md
+++ b/doc/TWITTER_FEED.md
@@ -24,7 +24,7 @@ LEAP web app (as part of the main view).
   * Add also `--projectroot your_projectroot --twitterhandle your_twitterhandle` as well to not have manually put the data in your secrets-file
   * The full command looks like this: `script/generate_bearer_token --key your_consumerkey --secret your_consumersecret --projectroot your_projectroot --twitterhandle your_twitterhandle`
   * If you didn't give all your information to the script, had a typo or want to change anything else, please do so by finding the secrets-file at `/config/secrets.yml`
-  * Make sure that the correct twitterhandle and bearer-token is included
+  * Make sure that the correct twitter handle and bearer token is included
 
 * Deactivate your bearer token
   * To deactivate your generated bearer token you can run script/invalidate_bearer_token
@@ -32,4 +32,5 @@ LEAP web app (as part of the main view).
 
 ### Default avatar image ###
 
-This feature uses by default the twitter bird as avatar picture (Twitter_Logo_Blue.png). By using the Twitter trademarks, you agree to follow the Twitter Trademark Guidelines as well as Twitter's Terms of Service and all other Twitter rules and policies. Please find more details here: https://brand.twitter.com/.
+This feature uses by default the twitter bird as avatar picture, you can find here (app/assets/images/Avatar_Pic.png). For customization you can upload your own avatar picture to 'config/customization/images' naming the image file 'Avatar_Pic.png'. This will replace the default image file.
+By using the Twitter trademarks, you agree to follow the Twitter Trademark Guidelines as well as Twitter's Terms of Service and all other Twitter rules and policies. Please find more details here: https://brand.twitter.com/.
-- 
cgit v1.2.3


From a7ab66b0478c1845ed0fdbff7dd3c83ea804826c Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Fri, 23 Sep 2016 15:46:25 +0200
Subject: increase number of fetched tweets to make sure 3 most recent tweets
 without RTs and @ are displayed

---
 app/helpers/twitter_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index 5a9d28c..2312ed9 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -22,7 +22,7 @@ module TwitterHelper
   def update_twitter_info
     twitter_user_info[0] = Time.now
     twitter_user_info[1] = twitter_client.user(twitter_handle).name
-    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(10)
+    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle, {:count => 200}).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
     if twitter_user_info[2] == nil
       error_handling
       twitter_user_info[3] = "The twitter handle does not exist or the account's tweets are protected. Please change the privacy settings accordingly."
-- 
cgit v1.2.3


From 194557d8bd11ffcf31333c252a63318683bcccf4 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Fri, 23 Sep 2016 15:55:09 +0200
Subject: included count for tweet fetch

---
 app/helpers/twitter_helper.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index 719f95e..cc48084 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -22,7 +22,6 @@ module TwitterHelper
   def update_twitter_info
     twitter_user_info[0] = Time.now
     twitter_user_info[1] = twitter_client.user(twitter_handle).name
-    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
     if twitter_user_info[2] == nil
       error_handling
       twitter_user_info[3] = "The twitter-handle does not exist or the account is private. Please change it or contact your provider-admin."
-- 
cgit v1.2.3


From af32db82732060fe5a309977afdb648aa9a62212 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Fri, 23 Sep 2016 16:47:01 +0200
Subject: Fixed typo in helper

---
 app/helpers/twitter_helper.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index 9b1d78d..f520286 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -22,7 +22,6 @@ module TwitterHelper
   def update_twitter_info
     twitter_user_info[0] = Time.now
     twitter_user_info[1] = twitter_client.user(twitter_handle).name
-<<<<<<< HEAD
     twitter_user_info[2] = twitter_client.user_timeline(twitter_handle, {:count => 200}).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
     if twitter_user_info[2] == nil
       error_handling
-- 
cgit v1.2.3


From 69b182b1bf811e1d09c734debf0f71f8412dd6b7 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Fri, 23 Sep 2016 16:56:58 +0200
Subject: Adapted description to use case 'tweets are protected'

---
 doc/TWITTER_FEED.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/TWITTER_FEED.md b/doc/TWITTER_FEED.md
index 552dc54..6deb432 100644
--- a/doc/TWITTER_FEED.md
+++ b/doc/TWITTER_FEED.md
@@ -41,7 +41,7 @@ production:
   * Add also `--projectroot your_projectroot --twitterhandle your_twitterhandle` as well to not have manually put the data in your secrets-file
   * The full command looks like this: `script/generate_bearer_token --key your_consumerkey --secret your_consumersecret --projectroot your_projectroot --twitterhandle your_twitterhandle`
   * If you didn't give all your information to the script, had a typo or want to change anything else, please do so by finding the secrets-file at `/config/secrets.yml`
-  * Make sure that the correct twitter-handle and bearer-token is included. The tweets of the twitter-account you want to have shown have to be public!
+  * Make sure that the correct twitter-handle and bearer-token is included. The account's tweets must not be protected, otherwise they cannot be displayed.
 
 * Deactivate your bearer token
   * To deactivate your generated bearer token you can run script/invalidate_bearer_token
-- 
cgit v1.2.3


From e3158f56e9e17dc959c98825b7f005e0749b3c29 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 26 Sep 2016 09:57:50 +0200
Subject: Display provider message next to tweets aswell

The content.html.haml was modified to pick the layout based on wether tweets
are enabled or not. We need to display the provider message in both cases.
---
 app/views/home/_content.html.haml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml
index 45afd92..c7902b1 100644
--- a/app/views/home/_content.html.haml
+++ b/app/views/home/_content.html.haml
@@ -6,6 +6,8 @@
 
     .row
       = home_page_buttons
+    .row
+      = render 'home/provider_message'
 
   .col-md-1
 
-- 
cgit v1.2.3


From 8a9ef9e96193a737b8d21e1f21db43d0d69394ef Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Fri, 30 Sep 2016 12:13:22 +0200
Subject: added 'show more tweets'-link when more tweets are existing than
 displayed, method included to set number of tweets which should be displayed

---
 app/assets/stylesheets/twitter.scss |  5 +++++
 app/helpers/twitter_helper.rb       | 14 +++++++++++---
 app/views/twitter/_index.html.erb   |  9 ++++++++-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/twitter.scss b/app/assets/stylesheets/twitter.scss
index a67c044..4419918 100644
--- a/app/assets/stylesheets/twitter.scss
+++ b/app/assets/stylesheets/twitter.scss
@@ -71,3 +71,8 @@ box-sizing: border-box;
   font-style: italic;
   font-size: 12px;
 }
+
+.more_tweets_link {
+  text-align: right;
+  font-size: 12px;
+}
diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index f520286..1afe50d 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -22,7 +22,7 @@ module TwitterHelper
   def update_twitter_info
     twitter_user_info[0] = Time.now
     twitter_user_info[1] = twitter_client.user(twitter_handle).name
-    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle, {:count => 200}).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
+    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle, {:count => 200}).select{ |tweet| tweet.text.start_with?('RT','@')==false}
     if twitter_user_info[2] == nil
       error_handling
       twitter_user_info[3] = "The twitter handle does not exist or the account's tweets are protected. Please change the privacy settings accordingly or contact your provider-admin."
@@ -52,7 +52,7 @@ module TwitterHelper
 
   def error_handling
     twitter_user_info[2] = []
-    return twitter_user_info
+    twitter_user_info
   end
 
   def cached_info
@@ -70,11 +70,19 @@ module TwitterHelper
     cached_info[1]
   end
 
+  def num_of_tweets
+    2
+  end
+
   def tweets
-    cached_info[2]
+    cached_info[2].take(num_of_tweets)
   end
 
   def error_message
     cached_info[3]
   end
+
+  def all_tweets_count
+    twitter_user_info[2].count
+  end
 end
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index cdfff4b..6e592c7 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -18,9 +18,16 @@
               </div>
             </div>
           <% end %>
-    </div>
+          <%if all_tweets_count > num_of_tweets then%>
+            <div class="tweet">
+              <div class="more_tweets_link"><a href="https://twitter.com/<%= twitter_handle %>">Show more tweets...</a>
+              </div>
+            </div>
+          <% end %>
+      </div>
 
     <div class="twitter_footer">
+
       <p>This feed uses a Ruby interface to access the Twitter API. Within LEAP Twitter does not track you.</p>
     </div>
 </div>
-- 
cgit v1.2.3


From c275ff63cd78872f27b1b83d0da27c6ad537b2c9 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Fri, 30 Sep 2016 12:25:55 +0200
Subject: changed number 2 to 3 to have three tweets shown

---
 app/helpers/twitter_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index 1afe50d..7ce28be 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -71,7 +71,7 @@ module TwitterHelper
   end
 
   def num_of_tweets
-    2
+    3
   end
 
   def tweets
-- 
cgit v1.2.3