diff --git a/Gemfile.lock b/Gemfile.lock index 0442a6f..fd7b57f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - mtdevise (13.0.0) + mtdevise (14.0.0) bootstrap-sass (~> 3.3, >= 3.3.7) carrierwave (~> 1.2, >= 1.2.1) cloudinary (~> 1.8, >= 1.8.2) @@ -19,22 +19,22 @@ PATH omniauth-github (~> 1.3) omniauth-instagram (~> 1.2) omniauth-twitter (~> 1.4) - paper_trail (~> 8.1) + paper_trail (~> 8.1, >= 8.1.2) pg (~> 0.21.0) - phcadmin1 (~> 17.0) - phcadmin2 (~> 15.0) - phcadmin3 (~> 12.0) - phcnotifi (~> 13.0) - phctheme1 (~> 22.0) - phctheme2 (~> 12.0) - phctitleseo (~> 14.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) rabl (~> 0.13.1) rails (~> 5.1, >= 5.1.4) responders (~> 2.4) sass-rails (~> 5.0, >= 5.0.7) simple_token_authentication (~> 1.15, >= 1.15.1) - tinymce-rails (~> 4.7, >= 4.7.3) - webpacker (~> 3.0, >= 3.0.2) + tinymce-rails (~> 4.7, >= 4.7.4) + webpacker (~> 3.2) GEM remote: https://rubygems.org/ @@ -79,7 +79,7 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) arel (8.0.0) - autoprefixer-rails (7.1.6) + autoprefixer-rails (7.2.3) execjs aws_cf_signer (0.1.3) bcrypt (3.1.11) @@ -105,7 +105,7 @@ GEM aws_cf_signer rest-client concurrent-ruby (1.0.5) - countries (2.1.2) + countries (2.1.3) i18n_data (~> 0.8.0) money (~> 6.9) sixarm_ruby_unaccent (~> 1.1) @@ -132,8 +132,8 @@ GEM factory_bot_rails (4.8.2) factory_bot (~> 4.8.2) railties (>= 3.0.0) - faker (1.8.4) - i18n (~> 0.5) + faker (1.8.7) + i18n (>= 0.7) faraday (0.12.2) multipart-post (>= 1.2, < 3) ffi (1.9.18) @@ -144,7 +144,7 @@ GEM globalid (0.4.1) activesupport (>= 4.2.0) gravtastic (3.2.6) - hashie (3.5.6) + hashie (3.5.7) houser (2.0.0) rack http-cookie (1.0.3) @@ -176,16 +176,16 @@ GEM mini_mime (1.0.0) mini_portile2 (2.3.0) minitest (5.10.3) - money (6.10.0) + money (6.10.1) i18n (>= 0.6.4, < 1.0) multi_json (1.12.2) multi_xml (0.6.0) multipart-post (2.0.0) netrc (0.11.0) - nio4r (2.1.0) + nio4r (2.2.0) nokogiri (1.8.1) mini_portile2 (~> 2.3.0) - oauth (0.5.3) + oauth (0.5.4) oauth2 (1.4.0) faraday (>= 0.8, < 0.13) jwt (~> 1.0) @@ -193,7 +193,7 @@ GEM multi_xml (~> 0.5) rack (>= 1.2, < 3) oj (3.3.9) - omniauth (1.7.1) + omniauth (1.8.1) hashie (>= 3.4.6, < 3.6.0) rack (>= 1.6.2, < 3) omniauth-facebook (4.0.0) @@ -207,106 +207,132 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.4.0) - oauth2 (~> 1.0) + omniauth-oauth2 (1.5.0) + oauth2 (~> 1.1) omniauth (~> 1.2) omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack orm_adapter (0.5.0) - paper_trail (8.1.0) + paper_trail (8.1.2) activerecord (>= 4.2, < 5.2) request_store (~> 1.1) pg (0.21.0) - phcadmin1 (17.0.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) + paper_trail (~> 8.1, >= 8.1.2) 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.6) - tinymce-rails (~> 4.7, >= 4.7.1) - webpacker (~> 3.0, >= 3.0.2) - phcadmin2 (15.0.0) + sass-rails (~> 5.0, >= 5.0.7) + tinymce-rails (~> 4.7, >= 4.7.4) + 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) + paper_trail (~> 8.1, >= 8.1.2) 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.3) - webpacker (~> 3.0, >= 3.0.2) - phcadmin3 (12.0.0) + tinymce-rails (~> 4.7, >= 4.7.4) + 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) + paper_trail (~> 8.1, >= 8.1.2) 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.3) - webpacker (~> 3.0, >= 3.0.2) - phcnotifi (13.0.0) + tinymce-rails (~> 4.7, >= 4.7.4) + 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) + paper_trail (~> 8.1, >= 8.1.2) pg (~> 0.21.0) rails (~> 5.1, >= 5.1.4) sass-rails (~> 5.0, >= 5.0.7) - webpacker (~> 3.0, >= 3.0.2) - phctheme1 (22.0.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) + paper_trail (~> 8.1, >= 8.1.2) 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.6) - tinymce-rails (~> 4.7, >= 4.7.1) - webpacker (~> 3.0, >= 3.0.2) - phctheme2 (12.0.0) + sass-rails (~> 5.0, >= 5.0.7) + tinymce-rails (~> 4.7, >= 4.7.4) + 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) + paper_trail (~> 8.1, >= 8.1.2) 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.3) - webpacker (~> 3.0, >= 3.0.2) - phctitleseo (14.0.0) + tinymce-rails (~> 4.7, >= 4.7.4) + 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) + paper_trail (~> 8.1, >= 8.1.2) pg (~> 0.21.0) rails (~> 5.1, >= 5.1.4) sass-rails (~> 5.0, >= 5.0.7) - webpacker (~> 3.0, >= 3.0.2) + webpacker (~> 3.2) public_suffix (3.0.1) rabl (0.13.1) activesupport (>= 2.3.14) rack (2.0.3) - rack-proxy (0.6.2) + rack-proxy (0.6.3) rack rack-test (0.8.2) rack (>= 1.0, < 3) @@ -363,7 +389,7 @@ GEM rspec-support (~> 3.7.0) rspec-support (3.7.0) rubyzip (1.2.1) - sass (3.5.3) + sass (3.5.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -402,7 +428,7 @@ GEM thor (0.20.0) thread_safe (0.3.6) tilt (2.0.8) - tinymce-rails (4.7.3) + tinymce-rails (4.7.4) railties (>= 3.1.1) tzinfo (1.2.4) thread_safe (~> 0.1) @@ -412,7 +438,7 @@ GEM unicode_utils (1.4.0) warden (1.2.7) rack (>= 1.0) - webpacker (3.0.2) + webpacker (3.2.0) activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) @@ -430,7 +456,7 @@ DEPENDENCIES 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.4) + 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) @@ -443,4 +469,4 @@ DEPENDENCIES sqlite3 (~> 1.3, >= 1.3.13) BUNDLED WITH - 1.16.0 + 1.16.1 diff --git a/README.md b/README.md index 48ca17a..3467ade 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ [![security](https://hakiri.io/github/PHCNetworks/multi-tenancy-devise/master.svg)](https://hakiri.io/github/PHCNetworks/multi-tenancy-devise/master) [![Code Climate](https://codeclimate.com/github/PHCNetworks/multi-tenancy-devise/badges/gpa.svg)](https://codeclimate.com/github/PHCNetworks/multi-tenancy-devise) -[![Dependency Status](https://gemnasium.com/badges/github.com/PHCNetworks/multi-tenancy-devise.svg)](https://gemnasium.com/github.com/PHCNetworks/multi-tenancy-devise) [![Gem Version](https://badge.fury.io/rb/mtdevise.svg)](https://badge.fury.io/rb/mtdevise) [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/PHCNetworks/multi-tenancy-devise/blob/master/MIT-LICENSE) @@ -23,7 +22,7 @@ Generate a user.rb file in your mainapp and add the code below #### Step 2 - Add Mtdevise to your gemfile and run command - gem 'mtdevise', '~> 13.0' + gem 'mtdevise', '~> 14.0' bundle exec install #### Step 3 - Add and migrate mtdevise database tables diff --git a/lib/mtdevise/version.rb b/lib/mtdevise/version.rb index a133183..d025b4a 100644 --- a/lib/mtdevise/version.rb +++ b/lib/mtdevise/version.rb @@ -1,3 +1,3 @@ module Mtdevise - VERSION = '13.0.0' + VERSION = '14.0.0' end diff --git a/mtdevise.gemspec b/mtdevise.gemspec index 109932c..bd2b7d3 100644 --- a/mtdevise.gemspec +++ b/mtdevise.gemspec @@ -19,7 +19,7 @@ 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' + spec.add_dependency 'paper_trail', '~> 8.1', '>= 8.1.2' spec.add_dependency 'pg', '~> 0.21.0' spec.add_dependency 'rails', '~> 5.1', '>= 5.1.4' @@ -29,14 +29,23 @@ Gem::Specification.new do |spec| 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 'webpacker', '~> 3.0', '>= 3.0.2' + spec.add_dependency 'webpacker', '~> 3.2' - # UI & Frontend Dependencies Extras + # 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' + # Upload & Media Dependencies + spec.add_dependency 'carrierwave', '~> 1.2', '>= 1.2.1' + spec.add_dependency 'cloudinary', '~> 1.8', '>= 1.8.2' + + # PHCEngine Helper Dependencies + spec.add_dependency 'phcnotifi', '~> 14.0', '>= 14.0.1' + spec.add_dependency 'phctitleseo', '~> 15.0', '>= 15.0.1' + # WYSIWYG Editor Dependencies - spec.add_dependency 'tinymce-rails', '~> 4.7', '>= 4.7.3' + spec.add_dependency 'tinymce-rails', '~> 4.7', '>= 4.7.4' # API Dependencies spec.add_dependency 'multi_json', '~> 1.12', '>= 1.12.2' @@ -44,25 +53,14 @@ Gem::Specification.new do |spec| spec.add_dependency 'rabl', '~> 0.13.1' spec.add_dependency 'responders', '~> 2.4' - # Upload & Media Dependencies - spec.add_dependency 'carrierwave', '~> 1.2', '>= 1.2.1' - spec.add_dependency 'cloudinary', '~> 1.8', '>= 1.8.2' - - # URL Dependencies - spec.add_dependency 'friendly_id', '~> 5.2', '>= 5.2.3' - - # PHCEngine Dependencies - spec.add_dependency 'phcnotifi', '~> 13.0' - spec.add_dependency 'phctitleseo', '~> 14.0' - # PHCTheme Dependencies - spec.add_dependency 'phctheme1', '~> 22.0' - spec.add_dependency 'phctheme2', '~> 12.0' + spec.add_dependency 'phctheme1', '~> 23.0' + spec.add_dependency 'phctheme2', '~> 13.0' # PHCAdmin Dependencies - spec.add_dependency 'phcadmin1', '~> 17.0' - spec.add_dependency 'phcadmin2', '~> 15.0' - spec.add_dependency 'phcadmin3', '~> 12.0' + spec.add_dependency 'phcadmin1', '~> 18.0' + spec.add_dependency 'phcadmin2', '~> 16.0' + spec.add_dependency 'phcadmin3', '~> 13.0' # Security Dependencies spec.add_dependency 'devise', '~> 4.3' @@ -81,7 +79,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'database_cleaner', '~> 1.6', '>= 1.6.2' spec.add_development_dependency 'factory_bot_rails', '~> 4.8', '>= 4.8.2' - spec.add_development_dependency 'faker', '~> 1.8', '>= 1.8.4' + spec.add_development_dependency 'faker', '~> 1.8', '>= 1.8.7' spec.add_development_dependency 'launchy', '~> 2.4', '>= 2.4.3' spec.add_development_dependency 'rspec-rails', '~> 3.7', '>= 3.7.2' @@ -92,6 +90,7 @@ Gem::Specification.new do |spec| # 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 'simplecov', '~> 0.15.1'