diff --git a/Gemfile b/Gemfile index f7f2e1a..6be0ef0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,19 +1,20 @@ source 'https://rubygems.org' -gem 'rails', '4.2.5.2' -gem 'sass-rails' +ruby '2.2.3' + +gem 'rails', '>= 5.0.0.beta3', '< 5.1' +gem 'sass-rails', '~> 5.0' gem 'coffee-rails', '~> 4.1.0' gem 'uglifier', '>= 2.7.2' + gem 'jquery-rails' -gem 'foundation-rails', '~> 5.5.1' +gem 'foundation-rails', '~> 6.2.1' gem 'foundation-icons-sass-rails' gem 'font-awesome-sass' +gem 'angularjs-rails' gem 'jbuilder' -gem 'mongoid' -gem 'mongoid-tree' -gem 'mongoid-pagination' gem 'redcarpet' gem 'rouge' gem 'slim-rails' @@ -22,34 +23,36 @@ gem 'mini_magick' gem 'carrierwave-mongoid' gem 'html_truncator' gem 'nokogiri' -gem 'angularjs-rails' gem 'figaro' gem 'rqrcode-with-patches', require: 'rqrcode' gem 'chunky_png' gem 'sidekiq' gem 'redis-namespace' gem 'rest-client' -gem 'unicorn' gem 'newrelic_rpm' +gem 'unicorn' + gem 'mina', require: false gem 'mina-multistage', require: false gem 'mina-sidekiq', require: false gem 'mina-unicorn', require: false group :development do - gem 'spring' gem 'quiet_assets' gem 'guard' gem 'guard-rails' gem 'guard-rspec', require: false gem 'guard-bundler', require: false + gem 'listen', '~> 3.0.5' + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' + gem 'rack-cors', :require => 'rack/cors' end group :test do gem 'capybara' - gem 'mongoid-rspec', :require => false gem 'database_cleaner' gem 'rspec-sidekiq' gem "codeclimate-test-reporter", group: :test, require: nil diff --git a/Gemfile.lock b/Gemfile.lock index affa7d2..352f743 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,62 +1,67 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.5.2) - actionpack (= 4.2.5.2) - actionview (= 4.2.5.2) - activejob (= 4.2.5.2) + actioncable (5.0.0.beta3) + actionpack (= 5.0.0.beta3) + nio4r (~> 1.2) + websocket-driver (~> 0.6.1) + actionmailer (5.0.0.beta3) + actionpack (= 5.0.0.beta3) + actionview (= 5.0.0.beta3) + activejob (= 5.0.0.beta3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.5.2) - actionview (= 4.2.5.2) - activesupport (= 4.2.5.2) - rack (~> 1.6) - rack-test (~> 0.6.2) + actionpack (5.0.0.beta3) + actionview (= 5.0.0.beta3) + activesupport (= 5.0.0.beta3) + rack (~> 2.x) + rack-test (~> 0.6.3) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.5.2) - activesupport (= 4.2.5.2) + actionview (5.0.0.beta3) + activesupport (= 5.0.0.beta3) 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.5.2) - activesupport (= 4.2.5.2) - globalid (>= 0.3.0) - activemodel (4.2.5.2) - activesupport (= 4.2.5.2) - builder (~> 3.1) - activerecord (4.2.5.2) - activemodel (= 4.2.5.2) - activesupport (= 4.2.5.2) - arel (~> 6.0) - activesupport (4.2.5.2) + activejob (5.0.0.beta3) + activesupport (= 5.0.0.beta3) + globalid (>= 0.3.6) + activemodel (5.0.0.beta3) + activesupport (= 5.0.0.beta3) + activerecord (5.0.0.beta3) + activemodel (= 5.0.0.beta3) + activesupport (= 5.0.0.beta3) + arel (~> 7.0) + activesupport (5.0.0.beta3) + concurrent-ruby (~> 1.0) 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) angularjs-rails (1.5.0) - arel (6.0.3) - bson (4.0.4) + arel (7.0.0) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) + bson (4.1.0) builder (3.2.2) - capybara (2.6.2) + capybara (2.7.0) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - carrierwave (0.10.0) + carrierwave (0.11.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) json (>= 1.7) mime-types (>= 1.16) - carrierwave-mongoid (0.8.1) - carrierwave (>= 0.8.0, < 0.11.0) - mongoid (>= 3.0, < 6.0) - mongoid-grid_fs (>= 1.3, < 3.0) + carrierwave-mongoid (0.1.0) + carrierwave + mongoid chunky_png (1.3.5) codeclimate-test-reporter (0.5.0) simplecov (>= 0.7.1, < 1.0.0) @@ -70,17 +75,18 @@ GEM coffee-script-source (1.10.0) concurrent-ruby (1.0.1) connection_pool (2.2.0) - database_cleaner (1.5.1) + database_cleaner (1.5.2) diff-lcs (1.2.5) docile (1.1.5) - domain_name (0.5.20160309) + domain_name (0.5.20160310) unf (>= 0.0.5, < 1.0.0) + durran-validatable (2.0.1) erubis (2.7.0) execjs (2.6.0) - factory_girl (4.5.0) + factory_girl (4.7.0) activesupport (>= 3.0.0) - factory_girl_rails (4.6.0) - factory_girl (~> 4.5.0) + factory_girl_rails (4.7.0) + factory_girl (~> 4.7.0) railties (>= 3.0.0) ffi (1.9.10) figaro (1.1.1) @@ -91,9 +97,10 @@ GEM foundation-icons-sass-rails (3.0.0) railties (>= 3.1.1) sass-rails (>= 3.1.1) - foundation-rails (5.5.3.2) + foundation-rails (6.2.1.0) railties (>= 3.1.0) sass (>= 3.3.0, < 3.5) + sprockets-es6 (>= 0.9.0) globalid (0.3.6) activesupport (>= 4.1.0) guard (2.13.0) @@ -113,7 +120,7 @@ GEM guard-rails (0.7.2) guard (~> 2.11) guard-compat (~> 1.0) - guard-rspec (4.6.4) + guard-rspec (4.6.5) guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) @@ -131,14 +138,15 @@ GEM thor (>= 0.14, < 2.0) json (1.8.3) kgio (2.10.0) + leshill-will_paginate (2.3.11) listen (3.0.6) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9.7) loofah (2.0.3) nokogiri (>= 1.5.9) lumberjack (1.0.10) - mail (2.6.3) - mime-types (>= 1.16, < 3) + mail (2.6.4) + mime-types (>= 1.16, < 4) method_source (0.8.2) mime-types (2.99.1) mina (0.3.8) @@ -149,39 +157,27 @@ GEM mina-sidekiq (0.3.1) mina mina-unicorn (0.4.0) - mini_magick (4.4.0) + mini_magick (4.5.1) mini_portile2 (2.0.0) minitest (5.8.4) mongo (2.2.4) bson (~> 4.0) - mongoid (5.1.1) - activemodel (~> 4.0) - mongo (~> 2.1) - origin (~> 2.2) - tzinfo (>= 0.3.37) - mongoid-grid_fs (2.2.1) - mime-types (>= 1.0, < 3.0) - mongoid (>= 3.0, < 6.0) - mongoid-pagination (0.2.0) - activesupport - mongoid - mongoid-rspec (3.0.0) - mongoid (~> 5.0) - rake - rspec (~> 3.3) - mongoid-tree (2.0.1) - mongoid (>= 4.0, < 6.0) + mongoid (1.0.6) + activesupport (>= 2.2.2) + durran-validatable (>= 2.0.1) + leshill-will_paginate (>= 2.3.11) + mongo (>= 0.18.2) multi_json (1.11.2) nenv (0.3.0) netrc (0.11.0) - newrelic_rpm (3.15.0.314) + newrelic_rpm (3.15.1.316) + nio4r (1.2.1) nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) notiffany (0.0.8) nenv (~> 0.1) shellany (~> 0.0) open4 (1.3.4) - origin (2.2.0) pry (0.10.3) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -192,21 +188,23 @@ GEM pry (>= 0.9.10) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) - rack (1.6.4) + rack (2.0.0.alpha) + json rack-cors (0.4.0) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.5.2) - actionmailer (= 4.2.5.2) - actionpack (= 4.2.5.2) - actionview (= 4.2.5.2) - activejob (= 4.2.5.2) - activemodel (= 4.2.5.2) - activerecord (= 4.2.5.2) - activesupport (= 4.2.5.2) + rails (5.0.0.beta3) + actioncable (= 5.0.0.beta3) + actionmailer (= 5.0.0.beta3) + actionpack (= 5.0.0.beta3) + actionview (= 5.0.0.beta3) + activejob (= 5.0.0.beta3) + activemodel (= 5.0.0.beta3) + activerecord (= 5.0.0.beta3) + activesupport (= 5.0.0.beta3) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.5.2) - sprockets-rails + railties (= 5.0.0.beta3) + sprockets-rails (>= 2.0.0) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.7) @@ -215,18 +213,19 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (4.2.5.2) - actionpack (= 4.2.5.2) - activesupport (= 4.2.5.2) + railties (5.0.0.beta3) + actionpack (= 5.0.0.beta3) + activesupport (= 5.0.0.beta3) + method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.16.0) - rake (11.1.1) + rake (11.1.2) rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) redcarpet (3.3.4) - redis (3.2.2) + redis (3.3.0) redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) rest-client (1.8.0) @@ -236,31 +235,30 @@ GEM rouge (1.10.1) rqrcode-with-patches (0.6.0) chunky_png - rspec (3.4.0) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-core (3.4.4) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) + rspec (3.1.0) + rspec-core (~> 3.1.0) + rspec-expectations (~> 3.1.0) + rspec-mocks (~> 3.1.0) + rspec-core (3.1.7) + rspec-support (~> 3.1.0) + rspec-expectations (3.1.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-mocks (3.4.1) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-rails (3.4.2) - actionpack (>= 3.0, < 4.3) - activesupport (>= 3.0, < 4.3) - railties (>= 3.0, < 4.3) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-support (~> 3.4.0) + rspec-support (~> 3.1.0) + rspec-mocks (3.1.3) + rspec-support (~> 3.1.0) + rspec-rails (3.1.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.1.0) + rspec-expectations (~> 3.1.0) + rspec-mocks (~> 3.1.0) + rspec-support (~> 3.1.0) rspec-sidekiq (2.2.0) rspec (~> 3.0, >= 3.0.0) sidekiq (>= 2.4.0) - rspec-support (3.4.1) - sass (3.4.21) + rspec-support (3.1.2) + sass (3.4.22) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) sass (~> 3.1) @@ -290,10 +288,17 @@ GEM railties (>= 3.1, < 5.0) slim (~> 3.0) slop (3.6.0) - spring (1.6.4) - sprockets (3.5.2) + spring (1.7.1) + spring-watcher-listen (2.0.0) + listen (>= 2.7, < 4.0) + spring (~> 1.2) + sprockets (3.6.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) + sprockets-es6 (0.9.0) + babel-source (>= 5.8.11) + babel-transpiler + sprockets (>= 3.0.0) sprockets-rails (3.0.4) actionpack (>= 4.0) activesupport (>= 4.0) @@ -304,16 +309,17 @@ GEM tilt (2.0.2) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (3.0.0) + execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext unf_ext (0.0.7.2) - unicorn (5.0.1) + unicorn (5.1.0) kgio (~> 2.6) - rack raindrops (~> 0.7) + websocket-driver (0.6.3) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) xpath (2.0.0) nokogiri (~> 1.3) @@ -332,7 +338,7 @@ DEPENDENCIES figaro font-awesome-sass foundation-icons-sass-rails - foundation-rails (~> 5.5.1) + foundation-rails (~> 6.2.1) guard guard-bundler guard-rails @@ -340,22 +346,19 @@ DEPENDENCIES html_truncator jbuilder jquery-rails + listen (~> 3.0.5) mina mina-multistage mina-sidekiq mina-unicorn mini_magick - mongoid - mongoid-pagination - mongoid-rspec - mongoid-tree newrelic_rpm nokogiri pry-nav pry-rails quiet_assets rack-cors - rails (= 4.2.5.2) + rails (>= 5.0.0.beta3, < 5.1) redcarpet redis-namespace rest-client @@ -363,10 +366,14 @@ DEPENDENCIES rqrcode-with-patches rspec-rails (>= 2.8.1) rspec-sidekiq - sass-rails + sass-rails (~> 5.0) sidekiq simple_form slim-rails spring + spring-watcher-listen (~> 2.0.0) uglifier (>= 2.7.2) unicorn + +BUNDLED WITH + 1.11.2