diff --git a/.gitignore b/.gitignore index dba3d69..6189d65 100644 --- a/.gitignore +++ b/.gitignore @@ -14,9 +14,8 @@ # Ignore branded content app/views/branded/* -#app/assets/**/* +app/assets config/locales/static_pages/*.yml -app/assets/stylesheets/*-branded.scss # Ignore gemfile.lock #Gemfile.lock diff --git a/.travis.yml b/.travis.yml index d1badfb..0beeb02 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,6 @@ - cp config/initializers/devise.rb.example config/initializers/devise.rb - cp config/initializers/recaptcha.rb.example config/initializers/recaptcha.rb - cp config/initializers/wicked_pdf.rb.example config/initializers/wicked_pdf.rb - - cp app/assets/stylesheets/dmproadmap-branded.scss.example app/assets/stylesheets/dmproadmap-branded.scss - - cp app/assets/stylesheets/overrides-branded.scss.example app/assets/stylesheets/overrides-branded.scss - bundle exec rake db:drop RAILS_ENV=test - bundle exec rake db:create RAILS_ENV=test - bundle exec rake db:schema:load RAILS_ENV=test diff --git a/Gemfile b/Gemfile index 1416a26..f131cc1 100644 --- a/Gemfile +++ b/Gemfile @@ -5,32 +5,32 @@ # ------------------------------------------------ # RAILS gem 'rails', '4.2.7' -gem 'railties' +gem 'railties', '~> 4.2' # GEMS ADDED TO HELP HANDLE RAILS MIGRATION FROM 3.x to 4.2 # THESE GEMS HELP SUPPORT DEPRACATED FUNCTIONALITY AND WILL LOSE SUPPORT IN FUTURE VERSIONS # WE SHOULD CONSIDER BRINGING THE CODE UP TO DATE INSTEAD -gem 'protected_attributes' # Provides attr_accessor functions +gem 'protected_attributes', '~> 1.1.3' # Provides attr_accessor functions gem 'responders', '~> 2.0' # Allows use of respond_with and respond_to in controllers # ------------------------------------------------ # DATABASE/SERVER gem 'mysql2', '~> 0.3.18' -gem 'pg' -gem 'flag_shih_tzu' # Allows for bitfields in activereccord +gem 'pg', '~> 0.19.0' +gem 'flag_shih_tzu', '~> 0.3' # Allows for bitfields in activereccord # ------------------------------------------------ # JS <-> RUBY BRIDGE -gem 'libv8' +gem 'libv8', '~> 3.16' gem 'therubyracer', '>=0.11.4', platforms: :ruby # ------------------------------------------------ # JSON DSL - USED BY API -gem 'jbuilder' +gem 'jbuilder', '~> 2.6.0' # ------------------------------------------------ # SLUGS/PERMALINKS -gem 'friendly_id' +gem 'friendly_id', '~> 5.1.0' # ------------------------------------------------ # SUPER ADMIN SECTION @@ -39,38 +39,38 @@ # ------------------------------------------------ # USERS # devise for user authentication -gem 'devise' -gem 'devise_invitable' -gem 'omniauth' -gem 'omniauth-shibboleth' -gem 'omniauth-orcid' +gem 'devise', '~> 4.2.0' +gem 'devise_invitable', '~> 1.7.0' +gem 'omniauth', '~> 1.3.1' +gem 'omniauth-shibboleth', '~> 1.2.1' +gem 'omniauth-orcid', '~> 1.2.1' #rolify for roles -gem 'rolify' +gem 'rolify', '~> 5.1.0' # Gems for repository integration -gem 'pundit' +gem 'pundit', '~> 1.1.0' # ------------------------------------------------ # SETTINGS FOR TEMPLATES AND PLANS (FONTS, COLUMN LAYOUTS, ETC) -gem 'ledermann-rails-settings' +gem 'ledermann-rails-settings', '~> 2.4.2' # ------------------------------------------------ # VIEWS -gem 'sass-rails' -gem 'less-rails' # WE SHOULD PROBABLY USE SASS OR LESS NOT BOTH -gem 'font-awesome-rails' -gem 'contact_us', '>= 1.2.0' # COULD BE EASILY REPLACED WITH OUR OWN CODE -gem 'recaptcha', '>= 4.0' -gem 'dragonfly' # LOGO UPLOAD -gem 'formtastic' +gem 'sass-rails', '~> 5.0.6' +gem 'less-rails', '~> 2.8.0' # WE SHOULD PROBABLY USE SASS OR LESS NOT BOTH +gem 'font-awesome-rails', '~> 4.7.0' +gem 'contact_us', '~> 1.2.0' # COULD BE EASILY REPLACED WITH OUR OWN CODE +gem 'recaptcha', '~> 4.1.0' +gem 'dragonfly', '~> 1.0.12' # LOGO UPLOAD +gem 'formtastic', '~> 3.1.4' # ------------------------------------------------ # EXPORTING -gem 'wkhtmltopdf-binary' -gem 'thin' -gem 'wicked_pdf' -gem 'htmltoword' -gem 'feedjira' +gem 'wkhtmltopdf-binary', '~> 0.12.3' +gem 'thin', '~> 1.7' +gem 'wicked_pdf', '~> 1.1.0' +gem 'htmltoword', '~> 0.5.1' +gem 'feedjira', '~> 2.0.0' gem 'yaml_db', :git => 'https://github.com/vyruss/yaml_db.git' # ------------------------------------------------ @@ -82,40 +82,40 @@ # ------------------------------------------------ # API -gem 'swagger-docs' +gem 'swagger-docs', '>= 0.2.9 ' # ------------------------------------------------ # CODE DOCUMENTATION -gem 'yard' -gem 'redcarpet' +gem 'yard', '>= 0.9.5' +gem 'redcarpet', '>= 3.3.4' # ------------------------------------------------ # ENVIRONMENT SPECIFIC DEPENDENCIES group :development, :test do - gem "byebug" + gem "byebug", '~> 9.0' end group :test do - gem 'minitest-rails-capybara' - gem 'minitest-reporters' - gem 'rack-test' - gem 'webmock' - gem 'sqlite3' - gem 'simplecov', require: false + gem 'minitest-rails-capybara', '~> 2.1.2' + gem 'minitest-reporters', '~> 1.1.11' + gem 'rack-test', '~> 0.6.3' + gem 'webmock', '~> 2.1.0' + gem 'sqlite3', '~> 1.3.12' + gem 'simplecov', '~> 0.12', require: false end group :development do - gem "better_errors" - gem "binding_of_caller" - gem 'web-console', '~>2.0' - gem 'rack-mini-profiler' + gem "better_errors", '~> 2.1.1' + gem "binding_of_caller", '~> 0.7.2' + gem 'web-console', '~> 2.3.0' + gem 'rack-mini-profiler', '~> 0.10.1' #gem 'flamegraph' end group :production do - gem 'uglifier' # JS minifier + gem 'uglifier', '~> 3.0.2' # JS minifier end # ------------------------------------------------ diff --git a/Gemfile.lock b/Gemfile.lock index 0c57777..3eea93f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,7 +18,7 @@ GIT remote: https://github.com/vyruss/yaml_db.git - revision: 99022d5702c58e209277259910441b8e184e4631 + revision: 00b304aeb0243b0ad1d96519564e7650c9760f21 specs: yaml_db (0.4.2) rails (>= 3.0, < 5.1) @@ -62,31 +62,30 @@ minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.4.0) ansi (1.5.0) - arel (6.0.4) + arel (6.0.3) autoprefixer-rails (6.7.7.2) execjs bcrypt (3.1.11) - better_errors (2.3.0) + better_errors (2.1.1) coderay (>= 1.0.0) - erubi (>= 1.0.0) + erubis (>= 2.6.6) rack (>= 0.9.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - builder (3.2.3) - byebug (9.0.6) - capybara (2.15.1) + builder (3.2.2) + byebug (9.0.5) + capybara (2.9.1) addressable - mini_mime (>= 0.1.3) + mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) coderay (1.1.1) commonjs (0.2.7) - concurrent-ruby (1.0.5) + concurrent-ruby (1.0.2) contact_us (1.2.0) rails (>= 4.2.0) crack (0.4.3) @@ -94,44 +93,42 @@ daemons (1.2.4) datetime_picker_rails (0.0.7) momentjs-rails (>= 2.8.1) - debug_inspector (0.0.3) - devise (4.3.0) + debug_inspector (0.0.2) + devise (4.2.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.2) + railties (>= 4.1.0, < 5.1) responders warden (~> 1.2.3) - devise_invitable (1.7.2) - actionmailer (>= 4.1.0) + devise_invitable (1.7.0) + actionmailer (>= 4.0.0) devise (>= 4.0.0) docile (1.1.5) - dragonfly (1.1.3) + dragonfly (1.0.12) addressable (~> 2.3) multi_json (~> 1.0) - rack (>= 1.3) - erubi (1.6.1) + rack (>= 1.3.0) erubis (2.7.0) - eventmachine (1.2.5) + eventmachine (1.2.0.1) execjs (2.7.0) - faraday (0.12.2) + faraday (0.9.2) multipart-post (>= 1.2, < 3) - faraday_middleware (0.12.2) - faraday (>= 0.7.4, < 1.0) - fast_gettext (1.4.1) - feedjira (2.1.2) - faraday (>= 0.9) - faraday_middleware (>= 0.9) - loofah (>= 2.0) - sax-machine (>= 1.0) - ffi (1.9.18) - flag_shih_tzu (0.3.19) - font-awesome-rails (4.7.0.2) - railties (>= 3.2, < 5.2) - formtastic (3.1.5) + faraday_middleware (0.10.0) + faraday (>= 0.7.4, < 0.10) + fast_gettext (1.3.0) + feedjira (2.0.0) + faraday (~> 0.9) + faraday_middleware (~> 0.9) + loofah (~> 2.0) + sax-machine (~> 1.0) + flag_shih_tzu (0.3.15) + font-awesome-rails (4.7.0.1) + railties (>= 3.2, < 5.1) + formtastic (3.1.4) actionpack (>= 3.2.13) - friendly_id (5.2.1) + friendly_id (5.1.0) activerecord (>= 4.0.0) - gettext (3.2.3) + gettext (3.2.2) locale (>= 2.0.5) text (>= 1.3.0) gettext_i18n_rails (1.8.0) @@ -141,25 +138,25 @@ gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - globalid (0.4.0) - activesupport (>= 4.2.0) - hashdiff (0.3.5) - hashie (3.5.6) + globalid (0.3.7) + activesupport (>= 4.1.0) + hashdiff (0.3.0) + hashie (3.4.6) htmltoword (0.5.1) actionpack nokogiri rubyzip (>= 1.0) - i18n (0.8.6) - i18n-js (3.0.1) + i18n (0.7.0) + i18n-js (3.0.0.rc14) i18n (~> 0.6, >= 0.6.6) - jbuilder (2.7.0) - activesupport (>= 4.2.0) - multi_json (>= 1.2) - jquery-rails (4.3.1) + jbuilder (2.6.0) + activesupport (>= 3.0.0, < 5.1) + multi_json (~> 1.2) + jquery-rails (4.2.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.6) + json (1.8.3) jwt (1.5.6) kaminari (1.0.1) activesupport (>= 4.1.0) @@ -182,18 +179,17 @@ less (~> 2.6.0) sprockets (> 2, < 4) tilt - libv8 (3.16.14.19) + libv8 (3.16.14.15) locale (2.1.2) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.6) + mail (2.6.4) mime-types (>= 1.16, < 4) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mini_mime (0.1.3) - mini_portile2 (2.2.0) - minitest (5.10.3) + mini_portile2 (2.1.0) + minitest (5.9.1) minitest-capybara (0.8.2) capybara (~> 2.2) minitest (~> 5.0) @@ -208,7 +204,7 @@ minitest-capybara (~> 0.8) minitest-metadata (~> 0.6) minitest-rails (~> 2.1) - minitest-reporters (1.1.14) + minitest-reporters (1.1.11) ansi builder minitest (>= 5.0) @@ -216,39 +212,40 @@ momentjs-rails (2.17.1) railties (>= 3.1) multi_json (1.12.1) - multi_xml (0.6.0) + multi_xml (0.5.5) multipart-post (2.0.0) mysql2 (0.3.21) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) normalize-rails (4.1.1) - oauth2 (1.4.0) - faraday (>= 0.8, < 0.13) + oauth2 (1.2.0) + faraday (>= 0.8, < 0.10) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - omniauth (1.6.1) - hashie (>= 3.4.6, < 3.6.0) - rack (>= 1.6.2, < 3) + omniauth (1.3.1) + hashie (>= 1.2, < 4) + rack (>= 1.0, < 3) omniauth-oauth2 (1.4.0) oauth2 (~> 1.0) omniauth (~> 1.2) - omniauth-orcid (2.0.2) + omniauth-orcid (1.2.1) omniauth-oauth2 (~> 1.3) omniauth-shibboleth (1.2.1) omniauth (>= 1.0.0) orm_adapter (0.5.0) - pg (0.21.0) + pg (0.19.0) + pkg-config (1.1.7) po_to_json (1.0.1) json (>= 1.6.0) - protected_attributes (1.1.4) + protected_attributes (1.1.3) activemodel (>= 4.0.1, < 5.0) - public_suffix (2.0.5) pundit (1.1.0) activesupport (>= 3.0.0) - rack (1.6.8) - rack-mini-profiler (0.10.5) + rack (1.6.4) + rack-mini-profiler (0.10.1) rack (>= 1.2.0) rack-test (0.6.3) rack (>= 1.0) @@ -265,9 +262,9 @@ sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.8) + rails-dom-testing (1.0.7) activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6) + nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) @@ -276,26 +273,18 @@ activesupport (= 4.2.7) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.0.0) - rb-fsevent (0.10.2) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - recaptcha (4.3.1) + rake (11.3.0) + recaptcha (4.1.0) json - redcarpet (3.4.0) + redcarpet (3.3.4) ref (2.0.0) - responders (2.4.0) - actionpack (>= 4.2.0, < 5.3) - railties (>= 4.2.0, < 5.3) + responders (2.3.0) + railties (>= 4.2.0, < 5.1) rolify (5.1.0) ruby-progressbar (1.8.1) - rubyzip (1.2.1) + rubyzip (1.2.0) safe_yaml (1.0.4) - sass (3.5.1) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + sass (3.4.22) sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) @@ -304,113 +293,113 @@ tilt (>= 1.1, < 3) sax-machine (1.3.2) selectize-rails (0.12.4) - simplecov (0.14.1) + simplecov (0.12.0) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.1) - sprockets (3.7.1) + simplecov-html (0.10.0) + sprockets (3.7.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.0) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.13) + sqlite3 (1.3.12) swagger-docs (0.2.9) activesupport (>= 3) rails (>= 3) text (1.3.1) - therubyracer (0.12.3) - libv8 (~> 3.16.14.15) + therubyracer (0.12.2) + libv8 (~> 3.16.14.0) ref - thin (1.7.2) + thin (1.7.0) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (0.19.4) - thread_safe (0.3.6) - tilt (2.0.8) - tzinfo (1.2.3) + thor (0.19.1) + thread_safe (0.3.5) + tilt (2.0.5) + tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (3.2.0) + uglifier (3.0.2) execjs (>= 0.3.0, < 3) - warden (1.2.7) + warden (1.2.6) rack (>= 1.0) web-console (2.3.0) activemodel (>= 4.0) binding_of_caller (>= 0.7.2) railties (>= 4.0) sprockets-rails (>= 2.0, < 4.0) - webmock (3.0.1) + webmock (2.1.0) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff wicked_pdf (1.1.0) - wkhtmltopdf-binary (0.12.3.1) - xpath (2.1.0) + wkhtmltopdf-binary (0.12.3) + xpath (2.0.0) nokogiri (~> 1.3) - yard (0.9.9) + yard (0.9.5) PLATFORMS ruby DEPENDENCIES administrate! - better_errors - binding_of_caller - byebug - contact_us (>= 1.2.0) - devise - devise_invitable - dragonfly - feedjira - flag_shih_tzu - font-awesome-rails - formtastic - friendly_id + better_errors (~> 2.1.1) + binding_of_caller (~> 0.7.2) + byebug (~> 9.0) + contact_us (~> 1.2.0) + devise (~> 4.2.0) + devise_invitable (~> 1.7.0) + dragonfly (~> 1.0.12) + feedjira (~> 2.0.0) + flag_shih_tzu (~> 0.3) + font-awesome-rails (~> 4.7.0) + formtastic (~> 3.1.4) + friendly_id (~> 5.1.0) gettext (>= 3.0.2) gettext_i18n_rails (~> 1.8) gettext_i18n_rails_js (~> 1.2.0) - htmltoword + htmltoword (~> 0.5.1) i18n-js (>= 3.0.0.rc11) - jbuilder - ledermann-rails-settings - less-rails - libv8 - minitest-rails-capybara - minitest-reporters + jbuilder (~> 2.6.0) + ledermann-rails-settings (~> 2.4.2) + less-rails (~> 2.8.0) + libv8 (~> 3.16) + minitest-rails-capybara (~> 2.1.2) + minitest-reporters (~> 1.1.11) mysql2 (~> 0.3.18) - omniauth - omniauth-orcid - omniauth-shibboleth - pg - protected_attributes - pundit - rack-mini-profiler - rack-test + omniauth (~> 1.3.1) + omniauth-orcid (~> 1.2.1) + omniauth-shibboleth (~> 1.2.1) + pg (~> 0.19.0) + protected_attributes (~> 1.1.3) + pundit (~> 1.1.0) + rack-mini-profiler (~> 0.10.1) + rack-test (~> 0.6.3) rails (= 4.2.7) - railties - recaptcha (>= 4.0) - redcarpet + railties (~> 4.2) + recaptcha (~> 4.1.0) + redcarpet (>= 3.3.4) responders (~> 2.0) - rolify - sass-rails - simplecov - sqlite3 - swagger-docs + rolify (~> 5.1.0) + sass-rails (~> 5.0.6) + simplecov (~> 0.12) + sqlite3 (~> 1.3.12) + swagger-docs (>= 0.2.9) therubyracer (>= 0.11.4) - thin - uglifier - web-console (~> 2.0) - webmock - wicked_pdf - wkhtmltopdf-binary + thin (~> 1.7) + uglifier (~> 3.0.2) + web-console (~> 2.3.0) + webmock (~> 2.1.0) + wicked_pdf (~> 1.1.0) + wkhtmltopdf-binary (~> 0.12.3) yaml_db! - yard + yard (>= 0.9.5) RUBY VERSION - ruby 2.3.3p222 + ruby 2.2.2p95 BUNDLED WITH 1.13.0 diff --git a/app/assets/stylesheets/dmproadmap-branded.scss.example b/app/assets/stylesheets/dmproadmap-branded.scss.example deleted file mode 100644 index 8ecace1..0000000 --- a/app/assets/stylesheets/dmproadmap-branded.scss.example +++ /dev/null @@ -1,6 +0,0 @@ -/* This file is intended for you to use to override the sites SASS variables */ -/* This file is loaded immediately after dmproadmap.scss and before dmproadmap.scss */ -/* ----------------------------------------------------------------------------------- */ - -$background-color: #FFF; -$color: $dark-grey; /* This example makes use of one of the variables defined in dmproadmap.scss */ \ No newline at end of file diff --git a/app/assets/stylesheets/overrides-branded.scss.example b/app/assets/stylesheets/overrides-branded.scss.example deleted file mode 100644 index ea1c275..0000000 --- a/app/assets/stylesheets/overrides-branded.scss.example +++ /dev/null @@ -1,2 +0,0 @@ -/* Place your overrides to the generic site's styling here. */ -/* -------------------------------------------------------- */ diff --git a/app/assets/stylesheets/overrides.scss b/app/assets/stylesheets/overrides.scss deleted file mode 100644 index b036de9..0000000 --- a/app/assets/stylesheets/overrides.scss +++ /dev/null @@ -1,12 +0,0 @@ -/* This file contains overrides to the core Bootstrap 3.x styling */ -/* -------------------------------------------------------------- */ - -/* Footer Section */ -footer { - margin-top: $footer-margin-top; - background: $footer-background; - color: $footer-color; - - a { color: $footer-color; } - -} \ No newline at end of file diff --git a/lib/assets/stylesheets/application.scss b/lib/assets/stylesheets/application.scss index 848fba6..67270bb 100644 --- a/lib/assets/stylesheets/application.scss +++ b/lib/assets/stylesheets/application.scss @@ -23,7 +23,6 @@ /* SASS Variables */ @import "dmproadmap"; -@import "dmproadmap-branded"; /* Place your customizations to the SASS variables in this file */ /* These will eventually go away once Boostrap is in place */ @import "dmproadmap/base"; @@ -35,4 +34,3 @@ /* Overrides to Bootstrap styling */ @import "overrides"; -@import "overrides-branded"; /* Place your customizations to the general CSS in this file */ diff --git a/lib/assets/stylesheets/overrides.scss b/lib/assets/stylesheets/overrides.scss new file mode 100644 index 0000000..b036de9 --- /dev/null +++ b/lib/assets/stylesheets/overrides.scss @@ -0,0 +1,12 @@ +/* This file contains overrides to the core Bootstrap 3.x styling */ +/* -------------------------------------------------------------- */ + +/* Footer Section */ +footer { + margin-top: $footer-margin-top; + background: $footer-background; + color: $footer-color; + + a { color: $footer-color; } + +} \ No newline at end of file