From 4bda320a9799d71020d53e182f39e6f2979c1253 Mon Sep 17 00:00:00 2001 From: BradPotts <bpotts@phcnetworks.net> Date: Sun, 14 Jan 2018 14:42:33 -0800 Subject: [PATCH] updated gemspec and engine file.: --- Gemfile.lock | 287 ++++++++++++++++++---------------------- lib/mtwarden/engine.rb | 37 ++++++ lib/mtwarden/version.rb | 2 +- mtwarden.gemspec | 73 +++++----- 4 files changed, 205 insertions(+), 194 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 35feb3e..740ac6f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,37 +1,35 @@ PATH remote: . specs: - mtwarden (15.0.0) - bcrypt (~> 3.1, >= 3.1.11) - bootstrap-sass (~> 3.3, >= 3.3.7) - braintree (~> 2.80, >= 2.80.1) - carrierwave (~> 1.2, >= 1.2.1) - cloudinary (~> 1.8, >= 1.8.2) - country_select (~> 3.1, >= 3.1.1) - dynamic_form (~> 1.1, >= 1.1.4) - font-awesome-rails (~> 4.7, >= 4.7.0.2) - friendly_id (~> 5.2, >= 5.2.3) - gravtastic (~> 3.2, >= 3.2.6) + mtwarden (16.0.0) + bcrypt (~> 3.1) + braintree (~> 2.80) + carrierwave (~> 1.2) + cloudinary (~> 1.8) + country_select (~> 3.1) + dynamic_form (~> 1.1) + friendly_id (~> 5.2) + gravtastic (~> 3.2) houser (~> 2.0) - jquery-rails (~> 4.3, >= 4.3.1) - jquery-ui-rails (~> 6.0, >= 6.0.1) - multi_json (~> 1.12, >= 1.12.2) - oj (~> 3.3, >= 3.3.9) - paper_trail (~> 8.1, >= 8.1.2) + jquery-rails (~> 4.3) + jquery-ui-rails (~> 6.0) + multi_json (~> 1.13) + oj (~> 3.3) + paper_trail (~> 8.1) pg (~> 0.21.0) - phcadmin1 (~> 18.0) - phcadmin2 (~> 16.0) - phcadmin3 (~> 13.0) - phcnotifi (~> 14.0, >= 14.0.1) - phctheme1 (~> 23.0) - phctheme2 (~> 13.0) - phctitleseo (~> 15.0, >= 15.0.1) + phcadmin1 (~> 21.0) + phcadmin2 (~> 19.0) + phcadmin3 (~> 16.0) + phcnotifi (~> 18.0) + phctheme1 (~> 26.0) + phctheme2 (~> 16.0) + phctitleseo (~> 19.0) rabl (~> 0.13.1) - rails (~> 5.1, >= 5.1.4) + rails (~> 5.1) responders (~> 2.4) - sass-rails (~> 5.0, >= 5.0.7) - tinymce-rails (~> 4.7, >= 4.7.4) - warden (~> 1.2, >= 1.2.7) + sass-rails (~> 5.0) + tinymce-rails (~> 4.7) + warden (~> 1.2) webpacker (~> 3.2) GEM @@ -77,25 +75,20 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) arel (8.0.0) - autoprefixer-rails (7.2.3) - execjs aws_cf_signer (0.1.3) bcrypt (3.1.11) - bootstrap-sass (3.3.7) - autoprefixer-rails (>= 5.2.1) - sass (>= 3.3.4) - braintree (2.80.1) + braintree (2.81.0) builder (>= 2.0.0) builder (3.2.3) byebug (9.1.0) - capybara (2.16.1) + capybara (2.17.0) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - xpath (~> 2.0) - carrierwave (1.2.1) + xpath (>= 2.0, < 4.0) + carrierwave (1.2.2) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) @@ -121,7 +114,6 @@ GEM unf (>= 0.0.5, < 1.0.0) dynamic_form (1.1.4) erubi (1.7.0) - execjs (2.7.0) factory_bot (4.8.2) activesupport (>= 3.0.0) factory_bot_rails (4.8.2) @@ -130,8 +122,6 @@ GEM faker (1.8.7) i18n (>= 0.7) ffi (1.9.18) - font-awesome-rails (4.7.0.2) - railties (>= 3.2, < 5.2) friendly_id (5.2.3) activerecord (>= 4.0.0) globalid (0.4.1) @@ -153,7 +143,7 @@ GEM json (2.1.0) launchy (2.4.3) addressable (~> 2.3) - letter_opener (1.4.1) + letter_opener (1.6.0) launchy (~> 2.2) loofah (2.1.1) crass (~> 1.0.2) @@ -166,128 +156,114 @@ GEM mime-types-data (3.2016.0521) mini_mime (1.0.0) mini_portile2 (2.3.0) - minitest (5.10.3) + minitest (5.11.1) money (6.10.1) i18n (>= 0.6.4, < 1.0) - multi_json (1.12.2) + multi_json (1.13.1) netrc (0.11.0) nio4r (2.2.0) nokogiri (1.8.1) mini_portile2 (~> 2.3.0) - oj (3.3.9) + oj (3.3.10) paper_trail (8.1.2) activerecord (>= 4.2, < 5.2) request_store (~> 1.1) pg (0.21.0) - phcadmin1 (18.0.0) - bootstrap-sass (~> 3.3, >= 3.3.7) - carrierwave (~> 1.2, >= 1.2.1) - cloudinary (~> 1.8, >= 1.8.2) - country_select (~> 3.1, >= 3.1.1) - font-awesome-rails (~> 4.7, >= 4.7.0.2) - friendly_id (~> 5.2, >= 5.2.3) - gravtastic (~> 3.2, >= 3.2.6) - jquery-rails (~> 4.3, >= 4.3.1) - jquery-ui-rails (~> 6.0, >= 6.0.1) - paper_trail (~> 8.1, >= 8.1.2) + phcadmin1 (21.0.0) + carrierwave (~> 1.2) + cloudinary (~> 1.8) + country_select (~> 3.1) + friendly_id (~> 5.2) + gravtastic (~> 3.2) + jquery-rails (~> 4.3) + jquery-ui-rails (~> 6.0) + paper_trail (~> 8.1) pg (~> 0.21.0) - phcnotifi (~> 14.0, >= 14.0.1) - phctitleseo (~> 15.0, >= 15.0.1) - rails (~> 5.1, >= 5.1.4) - sass-rails (~> 5.0, >= 5.0.7) - tinymce-rails (~> 4.7, >= 4.7.4) + phcnotifi (~> 18.0) + phctitleseo (~> 19.0) + rails (~> 5.1) + sass-rails (~> 5.0) + tinymce-rails (~> 4.7) webpacker (~> 3.2) - phcadmin2 (16.0.0) - bootstrap-sass (~> 3.3, >= 3.3.7) - carrierwave (~> 1.2, >= 1.2.1) - cloudinary (~> 1.8, >= 1.8.2) - country_select (~> 3.1, >= 3.1.1) - font-awesome-rails (~> 4.7, >= 4.7.0.2) - friendly_id (~> 5.2, >= 5.2.3) - gravtastic (~> 3.2, >= 3.2.6) - jquery-rails (~> 4.3, >= 4.3.1) - jquery-ui-rails (~> 6.0, >= 6.0.1) - paper_trail (~> 8.1, >= 8.1.2) + phcadmin2 (19.0.0) + carrierwave (~> 1.2) + cloudinary (~> 1.8) + country_select (~> 3.1) + friendly_id (~> 5.2) + gravtastic (~> 3.2) + jquery-rails (~> 4.3) + jquery-ui-rails (~> 6.0) + paper_trail (~> 8.1) pg (~> 0.21.0) - phcnotifi (~> 14.0, >= 14.0.1) - phctitleseo (~> 15.0, >= 15.0.1) - rails (~> 5.1, >= 5.1.4) - sass-rails (~> 5.0, >= 5.0.7) - tinymce-rails (~> 4.7, >= 4.7.4) + phcnotifi (~> 18.0) + phctitleseo (~> 19.0) + rails (~> 5.1) + sass-rails (~> 5.0) + tinymce-rails (~> 4.7) webpacker (~> 3.2) - phcadmin3 (13.0.0) - bootstrap-sass (~> 3.3, >= 3.3.7) - carrierwave (~> 1.2, >= 1.2.1) - cloudinary (~> 1.8, >= 1.8.2) - country_select (~> 3.1, >= 3.1.1) - font-awesome-rails (~> 4.7, >= 4.7.0.2) - friendly_id (~> 5.2, >= 5.2.3) - gravtastic (~> 3.2, >= 3.2.6) - jquery-rails (~> 4.3, >= 4.3.1) - jquery-ui-rails (~> 6.0, >= 6.0.1) - paper_trail (~> 8.1, >= 8.1.2) + phcadmin3 (16.0.0) + carrierwave (~> 1.2) + cloudinary (~> 1.8) + country_select (~> 3.1) + friendly_id (~> 5.2) + gravtastic (~> 3.2) + jquery-rails (~> 4.3) + jquery-ui-rails (~> 6.0) + paper_trail (~> 8.1) pg (~> 0.21.0) - phcnotifi (~> 14.0, >= 14.0.1) - phctitleseo (~> 15.0, >= 15.0.1) - rails (~> 5.1, >= 5.1.4) - sass-rails (~> 5.0, >= 5.0.7) - tinymce-rails (~> 4.7, >= 4.7.4) + phcnotifi (~> 18.0) + phctitleseo (~> 19.0) + rails (~> 5.1) + sass-rails (~> 5.0) + tinymce-rails (~> 4.7) webpacker (~> 3.2) - phcnotifi (14.0.1) - bootstrap-sass (~> 3.3, >= 3.3.7) - font-awesome-rails (~> 4.7, >= 4.7.0.2) - jquery-rails (~> 4.3, >= 4.3.1) - jquery-ui-rails (~> 6.0, >= 6.0.1) - paper_trail (~> 8.1, >= 8.1.2) + phcnotifi (18.0.0) + jquery-rails (~> 4.3) + jquery-ui-rails (~> 6.0) + paper_trail (~> 8.1) pg (~> 0.21.0) - rails (~> 5.1, >= 5.1.4) - sass-rails (~> 5.0, >= 5.0.7) + rails (~> 5.1) + sass-rails (~> 5.0) webpacker (~> 3.2) - phctheme1 (23.0.0) - bootstrap-sass (~> 3.3, >= 3.3.7) - carrierwave (~> 1.2, >= 1.2.1) - cloudinary (~> 1.8, >= 1.8.2) - country_select (~> 3.1, >= 3.1.1) - font-awesome-rails (~> 4.7, >= 4.7.0.2) - friendly_id (~> 5.2, >= 5.2.3) - gravtastic (~> 3.2, >= 3.2.6) - jquery-rails (~> 4.3, >= 4.3.1) - jquery-ui-rails (~> 6.0, >= 6.0.1) - paper_trail (~> 8.1, >= 8.1.2) + phctheme1 (26.0.0) + carrierwave (~> 1.2) + cloudinary (~> 1.8) + country_select (~> 3.1) + friendly_id (~> 5.2) + gravtastic (~> 3.2) + jquery-rails (~> 4.3) + jquery-ui-rails (~> 6.0) + paper_trail (~> 8.1) pg (~> 0.21.0) - phcnotifi (~> 14.0, >= 14.0.1) - phctitleseo (~> 15.0, >= 15.0.1) - rails (~> 5.1, >= 5.1.4) - sass-rails (~> 5.0, >= 5.0.7) - tinymce-rails (~> 4.7, >= 4.7.4) + phcnotifi (~> 18.0) + phctitleseo (~> 19.0) + rails (~> 5.1) + sass-rails (~> 5.0) + tinymce-rails (~> 4.7) webpacker (~> 3.2) - phctheme2 (13.0.0) - bootstrap-sass (~> 3.3, >= 3.3.7) - carrierwave (~> 1.2, >= 1.2.1) - cloudinary (~> 1.8, >= 1.8.2) - country_select (~> 3.1, >= 3.1.1) - font-awesome-rails (~> 4.7, >= 4.7.0.2) - friendly_id (~> 5.2, >= 5.2.3) - gravtastic (~> 3.2, >= 3.2.6) - jquery-rails (~> 4.3, >= 4.3.1) - jquery-ui-rails (~> 6.0, >= 6.0.1) - paper_trail (~> 8.1, >= 8.1.2) + phctheme2 (16.0.0) + carrierwave (~> 1.2) + cloudinary (~> 1.8) + country_select (~> 3.1) + friendly_id (~> 5.2) + gravtastic (~> 3.2) + jquery-rails (~> 4.3) + jquery-ui-rails (~> 6.0) + paper_trail (~> 8.1) pg (~> 0.21.0) - phcnotifi (~> 14.0, >= 14.0.1) - phctitleseo (~> 15.0, >= 15.0.1) - rails (~> 5.1, >= 5.1.4) - sass-rails (~> 5.0, >= 5.0.7) - tinymce-rails (~> 4.7, >= 4.7.4) + phcnotifi (~> 18.0) + phctitleseo (~> 19.0) + rails (~> 5.1) + sass-rails (~> 5.0) + tinymce-rails (~> 4.7) webpacker (~> 3.2) - phctitleseo (15.0.1) - bootstrap-sass (~> 3.3, >= 3.3.7) - font-awesome-rails (~> 4.7, >= 4.7.0.2) - jquery-rails (~> 4.3, >= 4.3.1) - jquery-ui-rails (~> 6.0, >= 6.0.1) - paper_trail (~> 8.1, >= 8.1.2) + phctitleseo (19.0.0) + jquery-rails (~> 4.3) + jquery-ui-rails (~> 6.0) + paper_trail (~> 8.1) pg (~> 0.21.0) - rails (~> 5.1, >= 5.1.4) - sass-rails (~> 5.0, >= 5.0.7) + rails (~> 5.1) + sass-rails (~> 5.0) webpacker (~> 3.2) public_suffix (3.0.1) rabl (0.13.1) @@ -324,7 +300,8 @@ GEM rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) - request_store (1.3.2) + request_store (1.4.0) + rack (>= 1.4) responders (2.4.0) actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) @@ -332,7 +309,7 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rspec-core (3.7.0) + rspec-core (3.7.1) rspec-support (~> 3.7.0) rspec-expectations (3.7.0) diff-lcs (>= 1.2.0, < 2.0) @@ -350,7 +327,7 @@ GEM rspec-support (~> 3.7.0) rspec-support (3.7.0) rubyzip (1.2.1) - sass (3.5.4) + sass (3.5.5) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -402,28 +379,28 @@ GEM websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) - xpath (2.1.0) - nokogiri (~> 1.3) + xpath (3.0.0) + nokogiri (~> 1.8) PLATFORMS ruby DEPENDENCIES byebug (~> 9.1) - capybara (~> 2.16, >= 2.16.1) - database_cleaner (~> 1.6, >= 1.6.2) - factory_bot_rails (~> 4.8, >= 4.8.2) - faker (~> 1.8, >= 1.8.7) - launchy (~> 2.4, >= 2.4.3) - letter_opener (~> 1.4, >= 1.4.1) - minitest (~> 5.10, >= 5.10.3) + capybara (~> 2.17) + database_cleaner (~> 1.6) + factory_bot_rails (~> 4.8) + faker (~> 1.8) + launchy (~> 2.4) + letter_opener (~> 1.6) + minitest (~> 5.11) mtwarden! - nokogiri (~> 1.8, >= 1.8.1) - rspec-rails (~> 3.7, >= 3.7.2) + nokogiri (~> 1.8) + rspec-rails (~> 3.7) selenium-webdriver (~> 3.8) - shoulda-matchers (~> 3.1, >= 3.1.2) + shoulda-matchers (~> 3.1) simplecov (~> 0.15.1) - sqlite3 (~> 1.3, >= 1.3.13) + sqlite3 (~> 1.3) BUNDLED WITH 1.16.1 diff --git a/lib/mtwarden/engine.rb b/lib/mtwarden/engine.rb index 74b6e2a..8eefbd2 100644 --- a/lib/mtwarden/engine.rb +++ b/lib/mtwarden/engine.rb @@ -8,6 +8,43 @@ module Mtwarden class Engine < ::Rails::Engine + # Main Dependencies + require 'paper_trail' + + # PHCEngines & Theme Dependencies + require 'phcnotifi' + require 'phctitleseo' + + require 'phctheme1' + require 'phctheme2' + require 'phcadmin1' + require 'phcadmin2' + require 'phcadmin3' + + # UI & Frontend Dependencies + require 'country_select' + require 'gravtastic' + require 'jquery-rails' + require 'jquery-ui-rails' + require 'sass-rails' + require 'webpacker' + + # API Dependencies + require 'rabl' + require 'oj' + require 'multi_json' + require 'responders' + + # Clean URLS + require 'friendly_id' + + # WYSIWYG Editor Dependencies + require 'tinymce-rails' + + # Upload & Media Dependencies + require 'carrierwave' + require 'cloudinary' + isolate_namespace Mtwarden config.generators do |g| diff --git a/lib/mtwarden/version.rb b/lib/mtwarden/version.rb index ce69a01..3f58b77 100644 --- a/lib/mtwarden/version.rb +++ b/lib/mtwarden/version.rb @@ -1,3 +1,3 @@ module Mtwarden - VERSION = '15.0.0' + VERSION = '16.0.0' end diff --git a/mtwarden.gemspec b/mtwarden.gemspec index 105b7ed..8cc261b 100644 --- a/mtwarden.gemspec +++ b/mtwarden.gemspec @@ -19,77 +19,74 @@ Gem::Specification.new do |spec| spec.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"] # Main Dependencies - spec.add_dependency 'paper_trail', '~> 8.1', '>= 8.1.2' + spec.add_dependency 'paper_trail', '~> 8.1' spec.add_dependency 'pg', '~> 0.21.0' - spec.add_dependency 'rails', '~> 5.1', '>= 5.1.4' + spec.add_dependency 'rails', '~> 5.1' # UI & Frontend Dependencies - spec.add_dependency 'bootstrap-sass', '~> 3.3', '>= 3.3.7' - spec.add_dependency 'font-awesome-rails', '~> 4.7', '>= 4.7.0.2' - spec.add_dependency 'jquery-rails', '~> 4.3', '>= 4.3.1' - spec.add_dependency 'jquery-ui-rails', '~> 6.0', '>= 6.0.1' - spec.add_dependency 'sass-rails', '~> 5.0', '>= 5.0.7' + spec.add_dependency 'jquery-rails', '~> 4.3' + spec.add_dependency 'jquery-ui-rails', '~> 6.0' + spec.add_dependency 'sass-rails', '~> 5.0' spec.add_dependency 'webpacker', '~> 3.2' # UI & URL Frontend Dependencies Extras - spec.add_dependency 'country_select', '~> 3.1', '>= 3.1.1' - spec.add_dependency 'friendly_id', '~> 5.2', '>= 5.2.3' - spec.add_dependency 'gravtastic', '~> 3.2', '>= 3.2.6' + spec.add_dependency 'country_select', '~> 3.1' + spec.add_dependency 'friendly_id', '~> 5.2' + spec.add_dependency 'gravtastic', '~> 3.2' # Upload & Media Dependencies - spec.add_dependency 'carrierwave', '~> 1.2', '>= 1.2.1' - spec.add_dependency 'cloudinary', '~> 1.8', '>= 1.8.2' + spec.add_dependency 'carrierwave', '~> 1.2' + spec.add_dependency 'cloudinary', '~> 1.8' # PHCEngine Helper Dependencies - spec.add_dependency 'phcnotifi', '~> 14.0', '>= 14.0.1' - spec.add_dependency 'phctitleseo', '~> 15.0', '>= 15.0.1' + spec.add_dependency 'phcnotifi', '~> 18.0' + spec.add_dependency 'phctitleseo', '~> 19.0' # WYSIWYG Editor Dependencies - spec.add_dependency 'tinymce-rails', '~> 4.7', '>= 4.7.4' + spec.add_dependency 'tinymce-rails', '~> 4.7' # API Dependencies - spec.add_dependency 'multi_json', '~> 1.12', '>= 1.12.2' - spec.add_dependency 'oj', '~> 3.3', '>= 3.3.9' + spec.add_dependency 'multi_json', '~> 1.13' + spec.add_dependency 'oj', '~> 3.3' spec.add_dependency 'rabl', '~> 0.13.1' spec.add_dependency 'responders', '~> 2.4' # PHCTheme Dependencies - spec.add_dependency 'phctheme1', '~> 23.0' - spec.add_dependency 'phctheme2', '~> 13.0' + spec.add_dependency 'phctheme1', '~> 26.0' + spec.add_dependency 'phctheme2', '~> 16.0' # PHCAdmin Dependencies - spec.add_dependency 'phcadmin1', '~> 18.0' - spec.add_dependency 'phcadmin2', '~> 16.0' - spec.add_dependency 'phcadmin3', '~> 13.0' + spec.add_dependency 'phcadmin1', '~> 21.0' + spec.add_dependency 'phcadmin2', '~> 19.0' + spec.add_dependency 'phcadmin3', '~> 16.0' # Warden - Security, Subscriptions & Forms - spec.add_dependency 'bcrypt', '~> 3.1', '>= 3.1.11' - spec.add_dependency 'braintree', '~> 2.80', '>= 2.80.1' + spec.add_dependency 'bcrypt', '~> 3.1' + spec.add_dependency 'braintree', '~> 2.80' - spec.add_dependency 'dynamic_form', '~> 1.1', '>= 1.1.4' + spec.add_dependency 'dynamic_form', '~> 1.1' spec.add_dependency 'houser', '~> 2.0' - spec.add_dependency 'warden', '~> 1.2', '>= 1.2.7' + spec.add_dependency 'warden', '~> 1.2' # Development & Testing Dependencies spec.add_development_dependency 'byebug', '~> 9.1' - spec.add_development_dependency 'capybara', '~> 2.16', '>= 2.16.1' - spec.add_development_dependency 'database_cleaner', '~> 1.6', '>= 1.6.2' + spec.add_development_dependency 'capybara', '~> 2.17' + spec.add_development_dependency 'database_cleaner', '~> 1.6' - spec.add_development_dependency 'factory_bot_rails', '~> 4.8', '>= 4.8.2' - spec.add_development_dependency 'faker', '~> 1.8', '>= 1.8.7' - spec.add_development_dependency 'launchy', '~> 2.4', '>= 2.4.3' + spec.add_development_dependency 'factory_bot_rails', '~> 4.8' + spec.add_development_dependency 'faker', '~> 1.8' + spec.add_development_dependency 'launchy', '~> 2.4' - spec.add_development_dependency 'rspec-rails', '~> 3.7', '>= 3.7.2' + spec.add_development_dependency 'rspec-rails', '~> 3.7' spec.add_development_dependency 'selenium-webdriver', '~> 3.8' - spec.add_development_dependency 'sqlite3', '~> 1.3', '>= 1.3.13' + spec.add_development_dependency 'sqlite3', '~> 1.3' - spec.add_development_dependency 'nokogiri', '~> 1.8', '>= 1.8.1' + spec.add_development_dependency 'nokogiri', '~> 1.8' + spec.add_development_dependency 'minitest', '~> 5.11' # Extra Development & Testing Dependencies - spec.add_development_dependency 'minitest', '~> 5.10', '>= 5.10.3' - - spec.add_development_dependency 'letter_opener', '~> 1.4', '>= 1.4.1' - spec.add_development_dependency 'shoulda-matchers', '~> 3.1', '>= 3.1.2' + spec.add_development_dependency 'letter_opener', '~> 1.6' + spec.add_development_dependency 'shoulda-matchers', '~> 3.1' spec.add_development_dependency 'simplecov', '~> 0.15.1' end