bterkuile/mozo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates

Browse Source
This commit is contained in:
Benjamin
2021-04-19 15:14:37 -05:00
parent 2e3daf1e9c
commit 46fc427694
23 changed files with 322 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -7,6 +7,7 @@
# Ignore bundler config # Ignore bundler config
.bundle .bundle
faye/ssl faye/ssl
config/certs-local
# Ignore the default SQLite database. # Ignore the default SQLite database.
/db/*.sqlite3 /db/*.sqlite3
Gemfile
+10 -10
View File
@@ -1,6 +1,6 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'rails', '~> 6.0.2' gem 'rails', '~> 6.1.3.1'
gem 'rack-cors', require: 'rack/cors' gem 'rack-cors', require: 'rack/cors'
# Bundle edge Rails instead: # Bundle edge Rails instead:
@@ -28,7 +28,7 @@ group :assets do
#gem 'capistrano-local-precompile', require: false #gem 'capistrano-local-precompile', require: false
# See https://github.com/sstephenson/execjs#readme for more supported runtimes # See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'therubyracer', platforms: :ruby #gem 'therubyracer', platforms: :ruby
gem 'uglifier', '>= 1.0.3' gem 'uglifier', '>= 1.0.3'
@@ -98,7 +98,7 @@ end
group :development, :test do group :development, :test do
gem 'rspec-rails' gem 'rspec-rails'
gem 'test_squad' gem 'test_squad'
gem 'factory_girl_rails' gem 'factory_bot_rails'
end end
group :development do group :development do
#gem 'quiet_assets' #gem 'quiet_assets'
@@ -108,13 +108,13 @@ group :development do
gem 'spring' gem 'spring'
gem 'spring-commands-rspec' gem 'spring-commands-rspec'
#gem 'web-console', '~> 2.0.0' #gem 'web-console', '~> 2.0.0'
gem 'foreman' gem 'foreman', require: false
gem 'capistrano', require: false #gem 'capistrano', require: false
gem 'capistrano-bundler', require: false #gem 'capistrano-bundler', require: false
gem 'capistrano-rvm', require: false #gem 'capistrano-rvm', require: false
gem 'capistrano-rails', require: false #gem 'capistrano-rails', require: false
gem 'capistrano3-puma', require: false #gem 'capistrano3-puma', require: false
gem "airbrussh", require: false #gem "airbrussh", require: false
end end
group :test do group :test do
Gemfile.lock
+231 -249
View File
@@ -1,5 +1,5 @@
GIT GIT
remote: git://github.com/bterkuile/cmtool.git remote: https://github.com/bterkuile/cmtool.git
revision: 3aa204aa303c7c0579a00cf0b638e5e733ff8319 revision: 3aa204aa303c7c0579a00cf0b638e5e733ff8319
branch: master branch: master
specs: specs:
@@ -16,21 +16,21 @@ GIT
tinymce-rails tinymce-rails
GIT GIT
remote: git://github.com/bterkuile/devise_simply_stored.git remote: https://github.com/bterkuile/devise_simply_stored.git
revision: 86f93782c607958e7f99a6fdbae5566e17047273 revision: b2f308d0e359ed18a5d09f26454c9569d9c69ca8
specs: specs:
devise_simply_stored (0.3.0) devise_simply_stored (0.3.0)
devise devise
GIT GIT
remote: git://github.com/bterkuile/jsonapi-serializers.git remote: https://github.com/bterkuile/jsonapi-serializers.git
revision: 625e44d65a798c554093f6651b3a15318bf88bee revision: 625e44d65a798c554093f6651b3a15318bf88bee
specs: specs:
jsonapi-serializers (0.2.6) jsonapi-serializers (0.2.6)
activesupport activesupport
GIT GIT
remote: git://github.com/bterkuile/simply_stored.git remote: https://github.com/bterkuile/simply_stored.git
revision: bf0d9f6b4645d0a24d5321b6db27bab6625c10ef revision: bf0d9f6b4645d0a24d5321b6db27bab6625c10ef
branch: master branch: master
specs: specs:
@@ -39,8 +39,8 @@ GIT
couch_potato (>= 1.7.0) couch_potato (>= 1.7.0)
GIT GIT
remote: git://github.com/langalex/couch_potato.git remote: https://github.com/langalex/couch_potato.git
revision: 70f221f43975195958662cabea3cbc9e440a090e revision: fbab728b1112442a5190b9074576f319bbc973b8
specs: specs:
couch_potato (1.7.1) couch_potato (1.7.1)
activemodel (>= 4.0) activemodel (>= 4.0)
@@ -50,110 +50,94 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
ace-rails-ap (4.3) ace-rails-ap (4.4)
actioncable (6.0.2.1) actioncable (6.1.3.1)
actionpack (= 6.0.2.1) actionpack (= 6.1.3.1)
activesupport (= 6.1.3.1)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailbox (6.0.2.1) actionmailbox (6.1.3.1)
actionpack (= 6.0.2.1) actionpack (= 6.1.3.1)
activejob (= 6.0.2.1) activejob (= 6.1.3.1)
activerecord (= 6.0.2.1) activerecord (= 6.1.3.1)
activestorage (= 6.0.2.1) activestorage (= 6.1.3.1)
activesupport (= 6.0.2.1) activesupport (= 6.1.3.1)
mail (>= 2.7.1) mail (>= 2.7.1)
actionmailer (6.0.2.1) actionmailer (6.1.3.1)
actionpack (= 6.0.2.1) actionpack (= 6.1.3.1)
actionview (= 6.0.2.1) actionview (= 6.1.3.1)
activejob (= 6.0.2.1) activejob (= 6.1.3.1)
activesupport (= 6.1.3.1)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (6.0.2.1) actionpack (6.1.3.1)
actionview (= 6.0.2.1) actionview (= 6.1.3.1)
activesupport (= 6.0.2.1) activesupport (= 6.1.3.1)
rack (~> 2.0, >= 2.0.8) rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.2.1) actiontext (6.1.3.1)
actionpack (= 6.0.2.1) actionpack (= 6.1.3.1)
activerecord (= 6.0.2.1) activerecord (= 6.1.3.1)
activestorage (= 6.0.2.1) activestorage (= 6.1.3.1)
activesupport (= 6.0.2.1) activesupport (= 6.1.3.1)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (6.0.2.1) actionview (6.1.3.1)
activesupport (= 6.0.2.1) activesupport (= 6.1.3.1)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0)
active_attr (0.15.0) active_attr (0.15.3)
actionpack (>= 3.0.2, < 6.1) actionpack (>= 3.0.2, < 7.0)
activemodel (>= 3.0.2, < 6.1) activemodel (>= 3.0.2, < 7.0)
activesupport (>= 3.0.2, < 6.1) activesupport (>= 3.0.2, < 7.0)
active_decorator (1.3.2) active_decorator (1.3.4)
activesupport activesupport
activejob (6.0.2.1) activejob (6.1.3.1)
activesupport (= 6.0.2.1) activesupport (= 6.1.3.1)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (6.0.2.1) activemodel (6.1.3.1)
activesupport (= 6.0.2.1) activesupport (= 6.1.3.1)
activerecord (6.0.2.1) activerecord (6.1.3.1)
activemodel (= 6.0.2.1) activemodel (= 6.1.3.1)
activesupport (= 6.0.2.1) activesupport (= 6.1.3.1)
activestorage (6.0.2.1) activestorage (6.1.3.1)
actionpack (= 6.0.2.1) actionpack (= 6.1.3.1)
activejob (= 6.0.2.1) activejob (= 6.1.3.1)
activerecord (= 6.0.2.1) activerecord (= 6.1.3.1)
marcel (~> 0.3.1) activesupport (= 6.1.3.1)
activesupport (6.0.2.1) marcel (~> 1.0.0)
mini_mime (~> 1.0.2)
activesupport (6.1.3.1)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 1.6, < 2)
minitest (~> 5.1) minitest (>= 5.1)
tzinfo (~> 1.1) tzinfo (~> 2.0)
zeitwerk (~> 2.2) zeitwerk (~> 2.3)
addressable (2.7.0) addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0) public_suffix (>= 2.0.2, < 5.0)
airbrussh (1.4.0) bcrypt (3.1.16)
sshkit (>= 1.6.1, != 1.7.0) bourbon (7.0.0)
bcrypt (3.1.13) thor (~> 1.0)
bourbon (6.0.0)
thor (~> 0.19)
builder (3.2.4) builder (3.2.4)
c21e (1.1.9) cancancan (3.2.1)
cancancan (3.0.2) capybara (3.35.3)
capistrano (3.12.0)
airbrussh (>= 1.0.0)
i18n
rake (>= 10.0.0)
sshkit (>= 1.9.0)
capistrano-bundler (1.6.0)
capistrano (~> 3.1)
capistrano-rails (1.4.0)
capistrano (~> 3.1)
capistrano-bundler (~> 1.1)
capistrano-rvm (0.1.2)
capistrano (~> 3.0)
sshkit (~> 1.2)
capistrano3-puma (4.0.0)
capistrano (~> 3.7)
capistrano-bundler
puma (~> 4.0)
capybara (3.31.0)
addressable addressable
mini_mime (>= 0.1.3) mini_mime (>= 0.1.3)
nokogiri (~> 1.8) nokogiri (~> 1.8)
rack (>= 1.6.0) rack (>= 1.6.0)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
regexp_parser (~> 1.5) regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2) xpath (~> 3.2)
capybara-screenshot (1.0.24) capybara-screenshot (1.0.25)
capybara (>= 1.0, < 4) capybara (>= 1.0, < 4)
launchy launchy
chunky_png (1.3.11) chunky_png (1.4.0)
climate_control (0.2.0) climate_control (0.2.0)
cliver (0.3.2) cliver (0.3.2)
coderay (1.1.2) coderay (1.1.3)
coffee-rails (5.0.0) coffee-rails (5.0.0)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 5.2.0) railties (>= 5.2.0)
@@ -161,28 +145,30 @@ GEM
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.12.2) coffee-script-source (1.12.2)
concurrent-ruby (1.1.6) concurrent-ruby (1.1.8)
cookiejar (0.3.3) cookiejar (0.3.3)
couchrest (2.0.1) couchrest (2.0.1)
httpclient (~> 2.8) httpclient (~> 2.8)
mime-types (>= 1.15) mime-types (>= 1.15)
multi_json (~> 1.7) multi_json (~> 1.7)
crack (0.4.3) crack (0.4.5)
safe_yaml (~> 1.0.0) rexml
crass (1.0.6) crass (1.0.6)
cucumber-messages (2.1.2) cucumber-gherkin (14.2.0)
google-protobuf (>= 3.2, <= 3.7) cucumber-messages (~> 12.4, >= 12.4.0)
devise (4.7.1) cucumber-messages (12.4.0)
protobuf-cucumber (~> 3.10, >= 3.10.8)
devise (4.7.3)
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (>= 4.1.0) railties (>= 4.1.0)
responders responders
warden (~> 1.2.3) warden (~> 1.2.3)
devise-i18n (1.9.0) devise-i18n (1.9.3)
devise (>= 4.7.1) devise (>= 4.7.1)
diff-lcs (1.3) diff-lcs (1.4.4)
docile (1.3.2) docile (1.3.5)
em-http-request (1.1.5) em-http-request (1.1.7)
addressable (>= 2.3.4) addressable (>= 2.3.4)
cookiejar (!= 0.3.1) cookiejar (!= 0.3.1)
em-socksify (>= 0.3) em-socksify (>= 0.3)
@@ -190,126 +176,127 @@ GEM
http_parser.rb (>= 0.6.0) http_parser.rb (>= 0.6.0)
em-socksify (0.3.2) em-socksify (0.3.2)
eventmachine (>= 1.0.0.beta.4) eventmachine (>= 1.0.0.beta.4)
email_validator (2.0.1) email_validator (2.2.3)
activemodel activemodel
erubi (1.9.0) erubi (1.10.0)
eventmachine (1.2.7) eventmachine (1.2.7)
exception_notification (4.4.0) exception_notification (4.4.3)
actionmailer (>= 4.0, < 7) actionmailer (>= 4.0, < 7)
activesupport (>= 4.0, < 7) activesupport (>= 4.0, < 7)
execjs (2.7.0) execjs (2.7.0)
factory_girl (4.9.0) factory_bot (6.1.0)
activesupport (>= 3.0.0) activesupport (>= 5.0.0)
factory_girl_rails (4.9.0) factory_bot_rails (6.1.0)
factory_girl (~> 4.9.0) factory_bot (~> 6.1.0)
railties (>= 3.0.0) railties (>= 5.0.0)
faraday (1.0.0) faraday (1.4.1)
faraday-excon (~> 1.1)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
faye (1.2.4) ruby2_keywords (>= 0.0.4)
faraday-excon (1.1.0)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.1.0)
faye (1.4.0)
cookiejar (>= 0.3.0) cookiejar (>= 0.3.0)
em-http-request (>= 0.3.0) em-http-request (>= 1.1.6)
eventmachine (>= 0.12.0) eventmachine (>= 0.12.0)
faye-websocket (>= 0.9.1) faye-websocket (>= 0.11.0)
multi_json (>= 1.0.0) multi_json (>= 1.0.0)
rack (>= 1.0.0) rack (>= 1.0.0)
websocket-driver (>= 0.5.1) websocket-driver (>= 0.5.1)
faye-websocket (0.10.9) faye-websocket (0.11.0)
eventmachine (>= 0.12.0) eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1) websocket-driver (>= 0.5.1)
ffi (1.12.2) ffi (1.15.0)
font-awesome-rails (4.7.0.5) font-awesome-rails (4.7.0.7)
railties (>= 3.2, < 6.1) railties (>= 3.2, < 7)
foreman (0.87.0) foreman (0.87.2)
foundation-rails (5.5.3.2) foundation-rails (5.5.3.2)
railties (>= 3.1.0) railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5) sass (>= 3.3.0, < 3.5)
fuubar (2.5.0) fuubar (2.5.1)
rspec-core (~> 3.0) rspec-core (~> 3.0)
ruby-progressbar (~> 1.4) ruby-progressbar (~> 1.4)
gherkin (6.0.17)
c21e (~> 1.1.9)
cucumber-messages (~> 2.1.2)
globalid (0.4.2) globalid (0.4.2)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
google-protobuf (3.7.0) hashdiff (1.0.1)
hashdiff (1.0.0) hashie (4.1.0)
hashie (3.6.0)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
httpclient (2.8.3) httpclient (2.8.3)
i18n (1.8.2) i18n (1.8.10)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
iso_country_codes (0.7.8) iso_country_codes (0.7.8)
jquery-rails (4.3.5) jquery-rails (4.4.0)
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
jquery-ui-rails (6.0.1) jquery-ui-rails (6.0.1)
railties (>= 3.2.16) railties (>= 3.2.16)
js-routes (1.4.9) js-routes (1.4.14)
railties (>= 4) railties (>= 4)
sprockets-rails json (2.5.1)
json (2.3.0) jwt (2.2.2)
jwt (2.2.1) kaminari (1.2.1)
kaminari (1.2.0)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.0) kaminari-actionview (= 1.2.1)
kaminari-activerecord (= 1.2.0) kaminari-activerecord (= 1.2.1)
kaminari-core (= 1.2.0) kaminari-core (= 1.2.1)
kaminari-actionview (1.2.0) kaminari-actionview (1.2.1)
actionview actionview
kaminari-core (= 1.2.0) kaminari-core (= 1.2.1)
kaminari-activerecord (1.2.0) kaminari-activerecord (1.2.1)
activerecord activerecord
kaminari-core (= 1.2.0) kaminari-core (= 1.2.1)
kaminari-core (1.2.0) kaminari-core (1.2.1)
launchy (2.4.3) launchy (2.5.0)
addressable (~> 2.3) addressable (~> 2.7)
letter_opener (1.7.0) letter_opener (1.7.0)
launchy (~> 2.2) launchy (~> 2.2)
libv8 (3.16.14.19) loofah (2.9.1)
loofah (2.4.0)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.7.1) mail (2.7.1)
mini_mime (>= 0.1.1) mini_mime (>= 0.1.1)
marcel (0.3.3) marcel (1.0.1)
mimemagic (~> 0.3.2) method_source (1.0.0)
method_source (0.9.2) middleware (0.1.0)
mime-types (3.3.1) mime-types (3.3.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2019.1009) mime-types-data (3.2021.0225)
mimemagic (0.3.4) mimemagic (0.3.10)
mini_magick (4.10.1) nokogiri (~> 1)
mini_mime (1.0.2) rake
mini_portile2 (2.4.0) mini_magick (4.11.0)
minitest (5.14.0) mini_mime (1.0.3)
multi_json (1.14.1) mini_portile2 (2.5.0)
minitest (5.14.4)
multi_json (1.15.0)
multi_xml (0.6.0) multi_xml (0.6.0)
multipart-post (2.1.1) multipart-post (2.1.1)
naught (1.1.0) naught (1.1.0)
net-scp (2.0.0) nio4r (2.5.7)
net-ssh (>= 2.6.5, < 6.0.0) nokogiri (1.11.3)
net-ssh (5.2.0) mini_portile2 (~> 2.5.0)
nio4r (2.5.2) racc (~> 1.4)
nokogiri (1.10.8) oauth2 (1.4.7)
mini_portile2 (~> 2.4.0)
oauth2 (1.4.4)
faraday (>= 0.8, < 2.0) faraday (>= 0.8, < 2.0)
jwt (>= 1.0, < 3.0) jwt (>= 1.0, < 3.0)
multi_json (~> 1.3) multi_json (~> 1.3)
multi_xml (~> 0.5) multi_xml (~> 0.5)
rack (>= 1.2, < 3) rack (>= 1.2, < 3)
omniauth (1.9.0) omniauth (1.9.1)
hashie (>= 3.4.6, < 3.7.0) hashie (>= 3.4.6)
rack (>= 1.6.2, < 3) rack (>= 1.6.2, < 3)
omniauth-facebook (6.0.0) omniauth-facebook (8.0.0)
omniauth-oauth2 (~> 1.2) omniauth-oauth2 (~> 1.2)
omniauth-instagram (1.3.0) omniauth-instagram (1.3.0)
omniauth (~> 1) omniauth (~> 1)
omniauth-oauth2 (~> 1) omniauth-oauth2 (~> 1)
omniauth-oauth2 (1.6.0) omniauth-oauth2 (1.7.1)
oauth2 (~> 1.1) oauth2 (~> 1.4)
omniauth (~> 1.9) omniauth (>= 1.9, < 3)
orm_adapter (0.5.0) orm_adapter (0.5.0)
paperclip (6.1.0) paperclip (6.1.0)
activemodel (>= 4.2.0) activemodel (>= 4.2.0)
@@ -323,88 +310,94 @@ GEM
capybara (>= 2.1, < 4) capybara (>= 2.1, < 4)
cliver (~> 0.3.1) cliver (~> 0.3.1)
websocket-driver (>= 0.2.0) websocket-driver (>= 0.2.0)
pry (0.12.2) protobuf-cucumber (3.10.8)
coderay (~> 1.1.0) activesupport (>= 3.2)
method_source (~> 0.9.0) middleware
pry-doc (1.0.0) thor
thread_safe
pry (0.14.1)
coderay (~> 1.1)
method_source (~> 1.0)
pry-doc (1.1.0)
pry (~> 0.11) pry (~> 0.11)
yard (~> 0.9.11) yard (~> 0.9.11)
pry-rails (0.3.9) pry-rails (0.3.9)
pry (>= 0.10.4) pry (>= 0.10.4)
public_suffix (4.0.3) public_suffix (4.0.6)
puma (4.3.1) puma (5.2.2)
nio4r (~> 2.0) nio4r (~> 2.0)
rack (2.2.2) racc (1.5.2)
rack (2.2.3)
rack-cors (1.1.1) rack-cors (1.1.1)
rack (>= 2.0.0) rack (>= 2.0.0)
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rails (6.0.2.1) rails (6.1.3.1)
actioncable (= 6.0.2.1) actioncable (= 6.1.3.1)
actionmailbox (= 6.0.2.1) actionmailbox (= 6.1.3.1)
actionmailer (= 6.0.2.1) actionmailer (= 6.1.3.1)
actionpack (= 6.0.2.1) actionpack (= 6.1.3.1)
actiontext (= 6.0.2.1) actiontext (= 6.1.3.1)
actionview (= 6.0.2.1) actionview (= 6.1.3.1)
activejob (= 6.0.2.1) activejob (= 6.1.3.1)
activemodel (= 6.0.2.1) activemodel (= 6.1.3.1)
activerecord (= 6.0.2.1) activerecord (= 6.1.3.1)
activestorage (= 6.0.2.1) activestorage (= 6.1.3.1)
activesupport (= 6.0.2.1) activesupport (= 6.1.3.1)
bundler (>= 1.3.0) bundler (>= 1.15.0)
railties (= 6.0.2.1) railties (= 6.1.3.1)
sprockets-rails (>= 2.0.0) sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0) rails-html-sanitizer (1.3.0)
loofah (~> 2.3) loofah (~> 2.3)
railties (6.0.2.1) railties (6.1.3.1)
actionpack (= 6.0.2.1) actionpack (= 6.1.3.1)
activesupport (= 6.0.2.1) activesupport (= 6.1.3.1)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0) thor (~> 1.0)
rake (13.0.1) rake (13.0.3)
ref (2.0.0) regexp_parser (2.1.1)
regexp_parser (1.7.0) responders (3.0.1)
responders (3.0.0)
actionpack (>= 5.0) actionpack (>= 5.0)
railties (>= 5.0) railties (>= 5.0)
rqrcode (1.1.2) rexml (3.2.5)
rqrcode (1.2.0)
chunky_png (~> 1.0) chunky_png (~> 1.0)
rqrcode_core (~> 0.1) rqrcode_core (~> 0.2)
rqrcode_core (0.1.1) rqrcode_core (0.2.0)
rspec (3.9.0) rspec (3.10.0)
rspec-core (~> 3.9.0) rspec-core (~> 3.10.0)
rspec-expectations (~> 3.9.0) rspec-expectations (~> 3.10.0)
rspec-mocks (~> 3.9.0) rspec-mocks (~> 3.10.0)
rspec-core (3.9.1) rspec-core (3.10.1)
rspec-support (~> 3.9.1) rspec-support (~> 3.10.0)
rspec-expectations (3.9.0) rspec-expectations (3.10.1)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0) rspec-support (~> 3.10.0)
rspec-its (1.3.0) rspec-its (1.3.0)
rspec-core (>= 3.0.0) rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0) rspec-expectations (>= 3.0.0)
rspec-mocks (3.9.1) rspec-mocks (3.10.2)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0) rspec-support (~> 3.10.0)
rspec-rails (3.9.0) rspec-rails (5.0.1)
actionpack (>= 3.0) actionpack (>= 5.2)
activesupport (>= 3.0) activesupport (>= 5.2)
railties (>= 3.0) railties (>= 5.2)
rspec-core (~> 3.9.0) rspec-core (~> 3.10)
rspec-expectations (~> 3.9.0) rspec-expectations (~> 3.10)
rspec-mocks (~> 3.9.0) rspec-mocks (~> 3.10)
rspec-support (~> 3.9.0) rspec-support (~> 3.10)
rspec-support (3.9.2) rspec-support (3.10.2)
ruby-progressbar (1.10.1) ruby-progressbar (1.11.0)
safe_yaml (1.0.5) ruby2_keywords (0.0.4)
sass (3.4.25) sass (3.4.25)
sass-rails (6.0.0) sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.1) sassc-rails (~> 2.1, >= 2.1.1)
sassc (2.2.1) sassc (2.4.0)
ffi (~> 1.9) ffi (~> 1.9)
sassc-rails (2.1.2) sassc-rails (2.1.2)
railties (>= 4.0.0) railties (>= 4.0.0)
@@ -412,66 +405,62 @@ GEM
sprockets (> 3.0) sprockets (> 3.0)
sprockets-rails sprockets-rails
tilt tilt
simplecov (0.18.4) simplecov (0.21.2)
docile (~> 1.1) docile (~> 1.1)
simplecov-html (~> 0.11) simplecov-html (~> 0.11)
simplecov-html (0.12.1) simplecov_json_formatter (~> 0.1)
slim (4.0.1) simplecov-html (0.12.3)
simplecov_json_formatter (0.1.2)
slim (4.1.0)
temple (>= 0.7.6, < 0.9) temple (>= 0.7.6, < 0.9)
tilt (>= 2.0.6, < 2.1) tilt (>= 2.0.6, < 2.1)
slim-rails (3.2.0) slim-rails (3.2.0)
actionpack (>= 3.1) actionpack (>= 3.1)
railties (>= 3.1) railties (>= 3.1)
slim (>= 3.0, < 5.0) slim (>= 3.0, < 5.0)
spring (2.1.0) spring (2.1.1)
spring-commands-rspec (1.0.4) spring-commands-rspec (1.0.4)
spring (>= 0.9.1) spring (>= 0.9.1)
sprockets (4.0.0) sprockets (4.0.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
rack (> 1, < 3) rack (> 1, < 3)
sprockets-rails (3.2.1) sprockets-rails (3.2.2)
actionpack (>= 4.0) actionpack (>= 4.0)
activesupport (>= 4.0) activesupport (>= 4.0)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
sshkit (1.20.0) sucker_punch (3.0.1)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
sucker_punch (2.1.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
temple (0.8.2) temple (0.8.2)
terrapin (0.6.0) terrapin (0.6.0)
climate_control (>= 0.0.3, < 1.0) climate_control (>= 0.0.3, < 1.0)
test_squad (0.1.3) test_squad (0.1.3)
rails rails
therubyracer (0.12.3) thor (1.1.0)
libv8 (~> 3.16.14.15)
ref
thor (0.20.3)
thread_safe (0.3.6) thread_safe (0.3.6)
tilt (2.0.10) tilt (2.0.10)
timecop (0.9.1) timecop (0.9.4)
tinymce-rails (5.2.0) tinymce-rails (5.7.1)
railties (>= 3.1.1) railties (>= 3.1.1)
turnip (4.0.1) turnip (4.2.0)
gherkin (~> 6.0.17) cucumber-gherkin (~> 14.0)
rspec (>= 3.0, < 4.0) rspec (>= 3.0, < 4.0)
tzinfo (1.2.6) tzinfo (2.0.4)
thread_safe (~> 0.1) concurrent-ruby (~> 1.0)
uglifier (4.2.0) uglifier (4.2.0)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
warden (1.2.8) warden (1.2.9)
rack (>= 2.0.6) rack (>= 2.0.9)
webmock (3.8.2) webmock (3.12.2)
addressable (>= 2.3.6) addressable (>= 2.3.6)
crack (>= 0.3.2) crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0) hashdiff (>= 0.4.0, < 2.0.0)
websocket-driver (0.7.1) websocket-driver (0.7.3)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4) websocket-extensions (0.1.5)
xpath (3.2.0) xpath (3.2.0)
nokogiri (~> 1.8) nokogiri (~> 1.8)
yard (0.9.24) yard (0.9.26)
zeitwerk (2.3.0) zeitwerk (2.4.2)
PLATFORMS PLATFORMS
ruby ruby
@@ -480,14 +469,8 @@ DEPENDENCIES
ace-rails-ap ace-rails-ap
active_attr active_attr
active_decorator active_decorator
airbrussh
bourbon bourbon
cancancan cancancan
capistrano
capistrano-bundler
capistrano-rails
capistrano-rvm
capistrano3-puma
capybara-screenshot capybara-screenshot
cmtool! cmtool!
coffee-rails (>= 5.0.0) coffee-rails (>= 5.0.0)
@@ -496,7 +479,7 @@ DEPENDENCIES
devise-i18n devise-i18n
devise_simply_stored! devise_simply_stored!
exception_notification exception_notification
factory_girl_rails factory_bot_rails
faye faye
font-awesome-rails font-awesome-rails
foreman foreman
@@ -521,7 +504,7 @@ DEPENDENCIES
pry-rails pry-rails
puma puma
rack-cors rack-cors
rails (~> 6.0.2) rails (~> 6.1.3.1)
rqrcode rqrcode
rspec-its rspec-its
rspec-rails rspec-rails
@@ -533,11 +516,10 @@ DEPENDENCIES
spring-commands-rspec spring-commands-rspec
sucker_punch sucker_punch
test_squad test_squad
therubyracer
timecop timecop
turnip turnip
uglifier (>= 1.0.3) uglifier (>= 1.0.3)
webmock webmock
BUNDLED WITH BUNDLED WITH
1.17.3 2.1.4
app/controllers/tests/application_controller.rb
+1 -1
View File
@@ -1,7 +1,7 @@
module Tests module Tests
class ApplicationController < ::ApplicationController class ApplicationController < ::ApplicationController
def f def f
FactoryGirl FactoryBot
end end
end end
end end
config/couchdb.yml
+2 -1
View File
@@ -1,7 +1,8 @@
development: development:
validation_framework: :active_model #optional validation_framework: :active_model #optional
#database: "http://mozo:secret@localhost:5984/qwaiter_development" #database: "http://mozo:secret@localhost:5984/qwaiter_development"
database: mozo_development database: "http://admin:development@localhost:5984/mozo_development"
#database: mozo_development
test: test:
validation_framework: :active_model #optional validation_framework: :active_model #optional
#database: "http://mozo:secret@localhost:5984/qwaiter_test" #database: "http://mozo:secret@localhost:5984/qwaiter_test"
config/environments/development.rb
+5 -3
View File
@@ -24,14 +24,16 @@ Qwaiter::Application.configure do
#config.ember.variant = :development #config.ember.variant = :development
config.action_controller.asset_host = "https://assets.mozo.local" config.action_controller.asset_host = "https://localhost:3002"
config.force_ssl = true
# config.web_console.automount = true # config.web_console.automount = true
# Don't care if the mailer can't send # Don't care if the mailer can't send
config.action_mailer.raise_delivery_errors = false config.action_mailer.raise_delivery_errors = false
config.action_mailer.delivery_method = :letter_opener config.action_mailer.delivery_method = :letter_opener
config.action_mailer.default_url_options = { host: 'https://www.mozo.local', port: 80 } config.action_mailer.default_url_options = { host: 'https://localhost', port: 3002 }
config.action_controller.default_url_options = { host: 'https://www.mozo.local', port: 80 } config.action_controller.default_url_options = { host: 'https://localhost', port: 3002 }
# Print deprecation notices to the Rails logger # Print deprecation notices to the Rails logger
config.active_support.deprecation = :log config.active_support.deprecation = :log
config/puma.rb
+54
View File
@@ -0,0 +1,54 @@
# Puma can serve each request in a thread from an internal thread pool.
# The `threads` method setting takes two numbers: a minimum and maximum.
# Any libraries that use thread pools should be configured to match
# the maximum value specified for Puma. Default is set to 5 threads for minimum
# and maximum; this matches the default thread size of Active Record.
#
max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
threads min_threads_count, max_threads_count
# Specifies the `worker_timeout` threshold that Puma will use to wait before
# terminating a worker in development environments.
#
worker_timeout 3600 if ENV.fetch("RAILS_ENV", "development") == "development"
# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
#
port ENV.fetch("PORT") { 3001 }
# Specifies the `environment` that Puma will run in.
#
environment ENV.fetch("RAILS_ENV") { "development" }
if ENV['RAILS_ENV'] == 'development'
localhost_key = "#{File.join('config', 'certs-local', 'localhost-key.pem')}"
localhost_crt = "#{File.join('config', 'certs-local', 'localhost.pem')}"
# To be able to use rake etc
ssl_bind '0.0.0.0', 3002, {
key: localhost_key,
cert: localhost_crt,
verify_mode: 'none'
}
end
# Specifies the `pidfile` that Puma will use.
pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
# Specifies the number of `workers` to boot in clustered mode.
# Workers are forked web server processes. If using threads and workers together
# the concurrency of the application would be max `threads` * `workers`.
# Workers do not work on JRuby or Windows (both of which do not support
# processes).
#
workers ENV.fetch("WEB_CONCURRENCY") { 2 }
# Use the `preload_app!` method when specifying a `workers` number.
# This directive tells Puma to first boot the application and load code
# before forking the application. This takes advantage of Copy On Write
# process behavior so workers use less memory.
#
# preload_app!
# Allow puma to be restarted by `rails restart` command.
plugin :tmp_restart
spec/factories/employee_factory.rb
+1 -1
View File
@@ -1,4 +1,4 @@
FactoryGirl.define do FactoryBot.define do
factory :employee do factory :employee do
sequence(:name){|i| "Employee #{i}"} sequence(:name){|i| "Employee #{i}"}
sequence(:email){ |i| "employee#{i}@mozo.bar" } sequence(:email){ |i| "employee#{i}@mozo.bar" }
spec/factories/employee_shift_factory.rb
+1 -1
View File
@@ -1,4 +1,4 @@
FactoryGirl.define do FactoryBot.define do
factory :employee_shift do factory :employee_shift do
end end
end end
spec/factories/list_factory.rb
+1 -1
View File
@@ -1,4 +1,4 @@
FactoryGirl.define do FactoryBot.define do
factory :list do factory :list do
association :table association :table
association :supplier #TODO warning! this may create a different supplier than the one created by the associated table association :supplier #TODO warning! this may create a different supplier than the one created by the associated table
spec/factories/list_payment.rb
+1 -1
View File
@@ -1,4 +1,4 @@
FactoryGirl.define do FactoryBot.define do
factory :list_payment do factory :list_payment do
end end
spec/factories/order_factory.rb
+1 -1
View File
@@ -1,4 +1,4 @@
FactoryGirl.define do FactoryBot.define do
factory :order do factory :order do
association :list association :list
association :user association :user
spec/factories/page_factory.rb
+1 -1
View File
@@ -1,4 +1,4 @@
FactoryGirl.define do FactoryBot.define do
factory :page do factory :page do
locale 'en' locale 'en'
layout 'theme1' layout 'theme1'
spec/factories/product_category_factory.rb
+1 -1
View File
@@ -1,4 +1,4 @@
FactoryGirl.define do FactoryBot.define do
factory :product_category do factory :product_category do
sequence(:name){|i| "ProductCategory#{i}"} sequence(:name){|i| "ProductCategory#{i}"}
sequence(:position){|i| i} sequence(:position){|i| i}
spec/factories/product_factory.rb
+1 -1
View File
@@ -1,4 +1,4 @@
FactoryGirl.define do FactoryBot.define do
factory :product do factory :product do
sequence(:name){|i| "Product#{i}"} sequence(:name){|i| "Product#{i}"}
price 34.95 price 34.95
spec/factories/product_order_factory.rb
+1 -1
View File
@@ -1,4 +1,4 @@
FactoryGirl.define do FactoryBot.define do
factory :product_order do factory :product_order do
quantity 1 quantity 1
association :order association :order
spec/factories/product_variant.rb
+1 -1
View File
@@ -1,4 +1,4 @@
FactoryGirl.define do FactoryBot.define do
factory :product_variant do factory :product_variant do
sequence(:name){|i| "Variant #{i}"} sequence(:name){|i| "Variant #{i}"}
association :product association :product
spec/factories/section_factory.rb
+1 -1
View File
@@ -1,4 +1,4 @@
FactoryGirl.define do FactoryBot.define do
factory :section do factory :section do
sequence(:title){|i| "Section #{i} title"} sequence(:title){|i| "Section #{i} title"}
association :supplier association :supplier
spec/factories/supplier_factory.rb
+1 -1
View File
@@ -1,4 +1,4 @@
FactoryGirl.define do FactoryBot.define do
factory :supplier do factory :supplier do
sequence(:name){|i| "Supplier #{i}"} sequence(:name){|i| "Supplier #{i}"}
trait :open do trait :open do
spec/factories/table_factory.rb
+1 -1
View File
@@ -1,4 +1,4 @@
FactoryGirl.define do FactoryBot.define do
factory :table do factory :table do
number 22 number 22
association :supplier association :supplier
spec/factories/user_factory.rb
+1 -1
View File
@@ -1,4 +1,4 @@
FactoryGirl.define do FactoryBot.define do
factory :user do factory :user do
sequence( :email ){|i| "test#{i}@example.com" } sequence( :email ){|i| "test#{i}@example.com" }
password "secret" password "secret"
spec/rails_helper.rb
+1 -1
View File
@@ -115,7 +115,7 @@ RSpec.configure do |config|
# config.mock_with :flexmock # config.mock_with :flexmock
# config.mock_with :rr # config.mock_with :rr
#config.mock_with :rspec #config.mock_with :rspec
config.include FactoryGirl::Syntax::Methods config.include FactoryBot::Syntax::Methods
config.include FactoryAttributesFor config.include FactoryAttributesFor
config.include Devise::TestHelpers, type: :controller config.include Devise::TestHelpers, type: :controller
config.include SpecControllerHelpers, type: :controller config.include SpecControllerHelpers, type: :controller
spec/support/features/basic_helpers.rb
+3 -3
View File
@@ -3,14 +3,14 @@ module Features
# Put helper methods you need to be available in all acceptance specs here. # Put helper methods you need to be available in all acceptance specs here.
def create_user(email, password='secret') def create_user(email, password='secret')
@user = User.find_by_email(email) || FactoryGirl.create(:user, email: email, password: password) @user = User.find_by_email(email) || FactoryBot.create(:user, email: email, password: password)
end end
#def create_supplier(email, password='secret') #def create_supplier(email, password='secret')
#@supplier = Supplier.find_by_email(email) || FactoryGirl.create(:supplier, email: email, password: password) #@supplier = Supplier.find_by_email(email) || FactoryBot.create(:supplier, email: email, password: password)
#end #end
def create_confirmed_supplier(email, password='secret') def create_confirmed_supplier(email, password='secret')
@supplier = Supplier.find_by_email(email) || FactoryGirl.create(:supplier, :confirmed, email: email, password: password) @supplier = Supplier.find_by_email(email) || FactoryBot.create(:supplier, :confirmed, email: email, password: password)
@supplier.confirm! unless @supplier.confirmed? @supplier.confirm! unless @supplier.confirmed?
end end