diff --git a/Gemfile.lock b/Gemfile.lock index 7fb9d393..7e8ab7ed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,130 +1,133 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.3.4) + addressable (2.3.6) ago (0.1.5) - hoe (>= 1.12.2) ansi (1.4.3) - bcrypt-ruby (3.0.1) - builder (3.2.0) - celluloid (0.14.1) - timers (>= 1.0.0) - childprocess (0.3.9) + bcrypt (3.1.7) + bcrypt-ruby (3.1.5) + bcrypt (>= 3.1.3) + builder (3.2.2) + celluloid (0.15.2) + timers (~> 1.1.0) + childprocess (0.5.2) ffi (~> 1.0, >= 1.0.11) - coderay (1.0.9) + coderay (1.1.0) columnize (0.3.6) - connection_pool (1.1.0) - crack (0.3.2) - debugger (1.6.1) + connection_pool (2.0.0) + crack (0.4.2) + safe_yaml (~> 1.0.0) + debugger (1.6.6) columnize (>= 0.3.1) debugger-linecache (~> 1.2.0) - debugger-ruby_core_source (~> 1.2.3) + debugger-ruby_core_source (~> 1.3.2) debugger-linecache (1.2.0) - debugger-ruby_core_source (1.2.3) - fabrication (2.7.1) - faker (1.1.2) + debugger-ruby_core_source (1.3.2) + docile (1.1.3) + fabrication (2.11.0) + faker (1.3.0) i18n (~> 0.5) - ffi (1.4.0) + ffi (1.9.3) hashie (2.0.5) - hiredis (0.4.5) - hoe (3.6.3) - rake (>= 0.8, < 11.0) - i18n (0.6.4) - json (1.8.0) - kgio (2.8.0) + hiredis (0.5.0) + i18n (0.6.9) + json (1.8.1) + kgio (2.9.2) magic (0.2.6) ffi (>= 0.6.3) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - metaclass (0.0.1) - method_source (0.8.1) - mime-types (1.23) - minitest (4.7.4) - minitest-reporters (0.14.19) + metaclass (0.0.4) + method_source (0.8.2) + mime-types (1.25.1) + minitest (5.3.1) + minitest-reporters (1.0.2) ansi builder - minitest (>= 2.12, < 5.0) + minitest (>= 5.0) powerbar - mocha (0.14.0) + mocha (1.0.0) metaclass (~> 0.0.1) - multi_json (1.7.3) - pg (0.15.1) - polyglot (0.3.3) + multi_json (1.9.2) + pg (0.17.1) + polyglot (0.3.4) powerbar (1.0.11) ansi (~> 1.4.0) hashie (>= 1.1.0) - pry (0.9.12.2) - coderay (~> 1.0.5) + pry (0.9.12.6) + coderay (~> 1.0) method_source (~> 0.8) slop (~> 3.4) pry-debugger (0.2.2) debugger (~> 1.3) pry (~> 0.9.10) - puma (2.0.1) + puma (2.8.1) rack (>= 1.1, < 2.0) rack (1.5.2) - rack-protection (1.5.0) + rack-protection (1.5.2) rack rack-recaptcha (0.6.6) json rack-test (0.6.2) rack (>= 1.0) - rainbows (4.5.0) + rainbows (4.6.1) kgio (~> 2.5) rack (~> 1.1) - unicorn (~> 4.6, >= 4.6.2) - raindrops (0.10.0) - rake (10.0.4) - redis (3.0.4) - redis-namespace (1.3.0) - redis (~> 3.0.0) + unicorn (~> 4.8) + raindrops (0.13.0) + rake (10.2.1) + redis (3.0.7) + redis-namespace (1.4.1) + redis (~> 3.0.4) rmagick (2.13.2) - rubyzip (0.9.9) - selenium-webdriver (2.33.0) - childprocess (>= 0.2.5) + rubyzip (1.1.2) + safe_yaml (1.0.1) + selenium-webdriver (2.40.0) + childprocess (>= 0.5.0) multi_json (~> 1.0) - rubyzip + rubyzip (~> 1.0) websocket (~> 1.0.4) - sequel (3.47.0) - sequel_pg (1.6.6) + sequel (4.8.0) + sequel_pg (1.6.9) pg (>= 0.8.0) sequel (>= 3.39.0) shotgun (0.9) rack (>= 1.0) - sidekiq (2.13.0) - celluloid (>= 0.14.1) + sidekiq (2.17.7) + celluloid (>= 0.15.2) connection_pool (>= 1.0.0) json - redis (>= 3.0) - redis-namespace - simplecov (0.7.1) - multi_json (~> 1.0) - simplecov-html (~> 0.7.1) - simplecov-html (0.7.1) - sinatra (1.4.2) - rack (~> 1.5, >= 1.5.2) + redis (>= 3.0.6) + redis-namespace (>= 1.3.1) + simplecov (0.8.2) + docile (~> 1.1.0) + multi_json + simplecov-html (~> 0.8.0) + simplecov-html (0.8.0) + sinatra (1.4.4) + rack (~> 1.4) rack-protection (~> 1.4) tilt (~> 1.3, >= 1.3.4) sinatra-flash (0.3.0) sinatra (>= 1.0.0) - sinatra-xsendfile (0.4.0) + sinatra-xsendfile (0.4.2) sinatra (>= 0.9.1) - slim (1.3.9) - temple (~> 0.6.3) - tilt (~> 1.3, >= 1.3.3) - slop (3.4.5) - temple (0.6.5) + slim (2.0.2) + temple (~> 0.6.6) + tilt (>= 1.3.3, < 2.1) + slop (3.5.0) + temple (0.6.7) tilt (1.4.1) timers (1.1.0) - treetop (1.4.14) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - unicorn (4.6.2) + unicorn (4.8.2) kgio (~> 2.6) rack raindrops (~> 0.7) - webmock (1.11.0) + webmock (1.17.4) addressable (>= 2.2.7) crack (>= 0.3.2) websocket (1.0.7) diff --git a/environment.rb b/environment.rb index 6f296296..04504503 100644 --- a/environment.rb +++ b/environment.rb @@ -7,7 +7,7 @@ Encoding.default_external = 'UTF-8' require 'yaml' require 'json' require 'logger' -require 'zip/zip' +require 'zip' Bundler.require Bundler.require :development if ENV['RACK_ENV'] == 'development' @@ -15,6 +15,7 @@ Bundler.require :development if ENV['RACK_ENV'] == 'development' $config = YAML.load_file(File.join(DIR_ROOT, 'config.yml'))[ENV['RACK_ENV']] DB = Sequel.connect $config['database'], sslmode: 'disable', max_connections: $config['database_pool'] +DB.extension :pagination Dir.glob('workers/*.rb').each {|w| require File.join(DIR_ROOT, "/#{w}") } @@ -37,7 +38,7 @@ require File.join(DIR_ROOT, 'workers', 'screenshot_worker.rb') require File.join(DIR_ROOT, 'workers', 'email_worker.rb') Sequel.datetime_class = Time -Sequel.extension :pagination +Sequel.extension :core_extensions Sequel.extension :migration Sequel::Model.plugin :validation_helpers Sequel::Model.plugin :force_encoding, 'UTF-8' diff --git a/tests/app_test.rb b/tests/app_test.rb index 45813320..8d9b8b2d 100644 --- a/tests/app_test.rb +++ b/tests/app_test.rb @@ -7,8 +7,6 @@ def status; last_response.status end def headers; last_response.headers end def body; last_response.body end -SimpleCov.command_name 'minitest' - describe 'index' do it 'loads' do get '/' diff --git a/tests/environment.rb b/tests/environment.rb index a0481ce4..141ded8e 100644 --- a/tests/environment.rb +++ b/tests/environment.rb @@ -7,6 +7,8 @@ SimpleCov.start do add_filter "/migrations/" end +SimpleCov.command_name 'minitest' + require './environment' require 'webmock' include WebMock::API