Merge pull request pinballmap#668 from RyanTG/search_results_follow

Search results follow

.gitignore

@@ -7,3 +7,6 @@ tmp/**/*
 public/uploads/
 database.yml
 .DS_Store
+coverage
+vendor/ruby
+.coveralls.yml

.rubocop.yml

@@ -0,0 +1,37 @@
+LineLength:
+  Enabled: false
+Documentation:
+  Enabled: false
+MethodLength:
+  Enabled: false
+ClassLength:
+  Enabled: false
+GuardClause:
+  Enabled: false
+PerlBackrefs:
+  Enabled: false
+CyclomaticComplexity:
+  Max: 15
+PerceivedComplexity:
+  Max: 15
+AbcSize:
+  Enabled: false
+Metrics/BlockLength:
+  Enabled: false
+IndentArray:
+  Enabled: false
+RequireParentheses:
+  Enabled: false
+IfInsideElse:
+  Enabled: false
+IdenticalConditionalBranches:
+  Enabled: false
+NonLocalExitFromIterator:
+  Enabled: false
+
+AllCops:
+  Exclude:
+    - 'db/**/*'
+    - 'config/**/*'
+    - 'autotest/**/*'
+    - 'vendor/**/*'

.ruby-version

@@ -0,0 +1 @@
+2.1.7

.travis.yml

@@ -0,0 +1,17 @@
+language: ruby
+cache:
+  directories:
+    - travis_phantomjs
+rvm:
+  - "2.1.7"
+script:
+  - RAILS_ENV=test bundle exec rake db:migrate --trace
+  - bundle exec rake
+addons:
+  postgresql: "9.3"
+before_install:
+# update phantomjs
+  - export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH; if [ $(phantomjs --version) != '2.1.1' ]; then rm -rf $PWD/travis_phantomjs; mkdir -p $PWD/travis_phantomjs && wget https://assets.membergetmember.co/software/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 && tar -xvf $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi
+before_script:
+  - psql -c 'create database travis_ci_test;' -U postgres
+  - cp config/database.yml.travis config/database.yml

Capfile

@@ -1,4 +1,4 @@
 load 'deploy' if respond_to?(:namespace) # cap2 differentiator
-Dir['vendor/gems/*/recipes/*.rb','vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
+Dir['vendor/gems/*/recipes/*.rb', 'vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
 
 load 'config/deploy'

Gemfile

@@ -1,65 +1,70 @@
 source 'http://rubygems.org'
+ruby '2.1.7'
 
-gem 'rails', '3.2.11'
-gem 'arel'
 gem 'pg'
-gem 'rake'
-gem 'rack'
+gem 'rails', '4.1'
 
-gem 'paperclip'
-gem 'devise'
+gem 'apipie-rails'
+gem 'aws-sdk', '< 2.0'
+gem 'cancancan', '~> 1.15'
+gem 'dalli'
+gem 'declarative_authorization', '0.5.7'
+gem 'devise', '3.2.4'
 gem 'devise-encryptable'
-gem 'inherited_resources'
-gem 'simple_form'
+gem 'exception_notification'
+gem 'geocoder'
+gem 'haml-rails'
 gem 'has_scope'
-gem 'kaminari'
-gem 'escape_utils'
+gem 'inherited_resources'
+gem 'jbuilder'
 gem 'jquery-rails'
-gem 'rails_admin'
-gem "cancan"
-gem 'declarative_authorization'
-gem 'haml'
-gem 'haml-rails'
-gem 'mini_magick'
-gem 'remotipart'
-gem 'pony'
-gem 'recaptcha', :require => 'recaptcha/rails'
-gem 'newrelic_rpm'
-gem 'capistrano'
-gem 'geocoder'
-gem 'exception_notification_rails3', :require => 'exception_notifier'
-gem 'aws-sdk'
-gem 'newrelic_rpm'
-gem 'dalli'
-gem 'oink'
 gem 'jquery-ui-rails'
-gem 'jbuilder'
+gem 'kaminari'
+gem 'memcachier'
+gem 'newrelic_rpm'
+gem 'paperclip'
+gem 'pony'
+gem 'protected_attributes'
+gem 'puma'
+gem 'puma_worker_killer'
+gem 'rack-attack'
+gem 'rails_admin', '~> 0.8'
+gem 'rails_autolink'
+gem 'rake'
+gem 'rakismet'
+gem 'recaptcha', require: 'recaptcha/rails'
+gem 'remotipart'
+gem 'sanitize'
+gem 'sass-rails'
+gem 'simple_form'
+gem 'simple_token_authentication'
+gem 'twitter'
+
+group :production do
+  gem 'rails_12factor'
+end
 
 group :test do
-  gem 'cucumber-rails', :require => false
-  gem 'rspec'
+  gem 'capybara'
+  gem 'coveralls', require: false
+  gem 'factory_girl_rails'
+  gem 'launchy'
+  gem 'poltergeist'
   gem 'rspec-rails'
+  gem 'rspec-retry'
+  gem 'rubocop'
+  gem 'simplecov'
   gem 'spork'
-  gem 'factory_girl'
-  gem 'factory_girl_rails', :require => false
-  gem 'cucumber_factory'
-  gem 'cucumber'
-  gem 'launchy'
-  gem 'capybara'
-  gem 'autotest'
-  gem 'autotest-rails'
-  gem 'selenium'
-  gem 'selenium-client'
-  gem 'selenium-webdriver'
-  gem 'autotest-growl'
   gem 'timecop'
 end
 
 group :development, :test do
-  gem 'database_cleaner'
-  gem 'gherkin'
-  gem 'ruby-growl'
-  gem 'pickle'
   gem 'bullet'
+  gem 'database_cleaner'
+  gem 'derailed'
   gem 'email_spec'
+  gem 'pry'
+  gem 'rack_session_access'
+  gem 'rails_real_favicon'
+  gem 'ruby-growl'
 end