From 0e051b1f93e8b5187d5258d96bb2d1ce29ac9fdc Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Sat, 20 Sep 2025 17:35:58 -0500 Subject: [PATCH] rename qwaiter to mozo --- Rakefile | 2 +- ...aiter-cartoon-1.png => mozo-cartoon-1.png} | Bin ...aiter-cartoon-2.png => mozo-cartoon-2.png} | Bin ...aiter-cartoon-3.png => mozo-cartoon-3.png} | Bin ...aiter-cartoon-4.png => mozo-cartoon-4.png} | Bin ...aiter-cartoon-5.png => mozo-cartoon-5.png} | Bin ...aiter-cartoon-6.png => mozo-cartoon-6.png} | Bin app/assets/images/logo.svg | 6 +++--- app/assets/images/logo_backup.svg | 6 +++--- ...ot-phone.png => Mozo-screenshot-phone.png} | Bin ...ot-phone.xcf => Mozo-screenshot-phone.xcf} | Bin ...er_den_haag.png => home_mozo_den_haag.png} | Bin app/assets/images/user/logo.svg | 12 +++++------ .../stylesheets/theme1/pages/_home.sass | 2 +- app/controllers/application_controller.rb | 4 ++-- app/models/list.rb | 4 ++-- app/models/section.rb | 2 +- app/models/supplier/counters.rb | 20 +++++++++--------- .../employees/employee_serializer.rb | 2 +- .../employees/employee_shift_serializer.rb | 2 +- .../employees/supplier_serializer.rb | 2 +- .../suppliers/employee_serializer.rb | 2 +- .../suppliers/employee_shift_serializer.rb | 2 +- .../suppliers/join_request_serializer.rb | 3 ++- app/serializers/suppliers/list_serializer.rb | 2 +- app/serializers/suppliers/order_serializer.rb | 2 +- app/serializers/suppliers/page_serializer.rb | 2 +- .../suppliers/product_category_serializer.rb | 2 +- .../suppliers/product_order_serializer.rb | 2 +- .../suppliers/product_serializer.rb | 3 ++- .../suppliers/product_variant_serializer.rb | 2 +- .../suppliers/section_area_serializer.rb | 2 +- .../suppliers/section_element_serializer.rb | 2 +- .../suppliers/section_serializer.rb | 3 ++- .../suppliers/supplier_serializer.rb | 2 +- .../suppliers/svg_element_serializer.rb | 2 +- app/serializers/suppliers/table_serializer.rb | 2 +- app/serializers/suppliers/user_serializer.rb | 2 +- .../users/join_request_serializer.rb | 3 ++- app/serializers/users/list_serializer.rb | 3 ++- app/serializers/users/order_serializer.rb | 3 ++- .../users/product_category_serializer.rb | 3 ++- .../users/product_order_serializer.rb | 3 ++- app/serializers/users/product_serializer.rb | 4 +++- .../users/product_variant_serializer.rb | 3 ++- app/serializers/users/supplier_serializer.rb | 3 ++- app/serializers/users/table_serializer.rb | 3 ++- app/serializers/users/user_serializer.rb | 3 ++- .../waiter/product_category_serializer.rb | 3 ++- app/serializers/waiter/product_serializer.rb | 3 ++- .../waiter/product_variant_serializer.rb | 3 ++- app/serializers/waiter/section_serializer.rb | 3 ++- app/serializers/waiter/supplier_serializer.rb | 3 ++- app/serializers/waiter/table_serializer.rb | 3 ++- app/views/dashboard/cartoon.html.slim | 2 +- app/views/layouts/phone.html.slim | 10 ++++----- app/views/layouts/user/foundation.html.slim | 12 +++++------ .../suppliers/application/_head.html.erb | 2 +- bin/build_mobile_app.rb | 6 +++--- config.ru | 2 +- config/application.rb | 6 +++--- config/couchbase.yml | 8 +++---- config/couchdb.yml | 10 ++++----- config/deploy.rb | 4 ++-- config/environment.rb | 2 +- config/environments/development.rb | 2 +- config/environments/production.rb | 2 +- config/environments/test.rb | 2 +- config/environments/user_app.rb | 2 +- .../initializers/active_model_serializer.rb | 4 ++-- config/initializers/devise.rb | 4 ++-- config/initializers/mozo_settings.rb | 10 ++++----- config/initializers/secret_token.rb | 3 ++- config/initializers/session_store.rb | 4 ++-- config/routes.rb | 2 +- lib/couchbase-setting.rb | 10 ++++----- lib/{qwaiter.rb => mozo.rb} | 2 +- lib/{qwaiter => mozo}/broadcaster.rb | 2 +- lib/{qwaiter => mozo}/broadcaster/faye.rb | 4 ++-- lib/{qwaiter => mozo}/couchbase.rb | 4 ++-- lib/{qwaiter => mozo}/counter.rb | 2 +- lib/{qwaiter => mozo}/distribution.rb | 2 +- lib/{qwaiter => mozo}/drb_counter.rb | 2 +- .../employee_base_serializer.rb | 2 +- lib/{qwaiter => mozo}/serializer.rb | 2 +- .../supplier_base_serializer.rb | 2 +- lib/{qwaiter => mozo}/user_base_serializer.rb | 2 +- .../waiter_base_serializer.rb | 2 +- make_mobile | 4 ++-- .../suppliers/dashboard_steps.rb | 4 ++-- spec/lib/{qwaiter => mozo}/counter_spec.rb | 8 +++---- .../{qwaiter => mozo}/distribution_spec.rb | 4 ++-- spec/models/order_spec.rb | 16 +++++++------- spec/models/supplier/counters_spec.rb | 8 +++---- spec/models/supplier_spec.rb | 2 +- spec/rails_helper.rb | 8 +++---- spec/serializers_spec.rb | 4 ++-- .../matchers/broadcast_to_supplier_matcher.rb | 6 +++--- .../matchers/broadcast_to_user_matcher.rb | 6 +++--- 99 files changed, 189 insertions(+), 168 deletions(-) rename app/assets/images/cartoon/{qwaiter-cartoon-1.png => mozo-cartoon-1.png} (100%) rename app/assets/images/cartoon/{qwaiter-cartoon-2.png => mozo-cartoon-2.png} (100%) rename app/assets/images/cartoon/{qwaiter-cartoon-3.png => mozo-cartoon-3.png} (100%) rename app/assets/images/cartoon/{qwaiter-cartoon-4.png => mozo-cartoon-4.png} (100%) rename app/assets/images/cartoon/{qwaiter-cartoon-5.png => mozo-cartoon-5.png} (100%) rename app/assets/images/cartoon/{qwaiter-cartoon-6.png => mozo-cartoon-6.png} (100%) rename app/assets/images/site/{Qwaiter-screenshot-phone.png => Mozo-screenshot-phone.png} (100%) rename app/assets/images/site/{Qwaiter-screenshot-phone.xcf => Mozo-screenshot-phone.xcf} (100%) rename app/assets/images/theme1/{home_qwaiter_den_haag.png => home_mozo_den_haag.png} (100%) rename lib/{qwaiter.rb => mozo.rb} (97%) rename lib/{qwaiter => mozo}/broadcaster.rb (85%) rename lib/{qwaiter => mozo}/broadcaster/faye.rb (83%) rename lib/{qwaiter => mozo}/couchbase.rb (91%) rename lib/{qwaiter => mozo}/counter.rb (97%) rename lib/{qwaiter => mozo}/distribution.rb (98%) rename lib/{qwaiter => mozo}/drb_counter.rb (89%) rename lib/{qwaiter => mozo}/employee_base_serializer.rb (95%) rename lib/{qwaiter => mozo}/serializer.rb (98%) rename lib/{qwaiter => mozo}/supplier_base_serializer.rb (96%) rename lib/{qwaiter => mozo}/user_base_serializer.rb (96%) rename lib/{qwaiter => mozo}/waiter_base_serializer.rb (96%) rename spec/lib/{qwaiter => mozo}/counter_spec.rb (76%) rename spec/lib/{qwaiter => mozo}/distribution_spec.rb (77%) diff --git a/Rakefile b/Rakefile index e2fdef51..0963212e 100644 --- a/Rakefile +++ b/Rakefile @@ -4,4 +4,4 @@ require File.expand_path('../config/application', __FILE__) -Qwaiter::Application.load_tasks +Mozo::Application.load_tasks diff --git a/app/assets/images/cartoon/qwaiter-cartoon-1.png b/app/assets/images/cartoon/mozo-cartoon-1.png similarity index 100% rename from app/assets/images/cartoon/qwaiter-cartoon-1.png rename to app/assets/images/cartoon/mozo-cartoon-1.png diff --git a/app/assets/images/cartoon/qwaiter-cartoon-2.png b/app/assets/images/cartoon/mozo-cartoon-2.png similarity index 100% rename from app/assets/images/cartoon/qwaiter-cartoon-2.png rename to app/assets/images/cartoon/mozo-cartoon-2.png diff --git a/app/assets/images/cartoon/qwaiter-cartoon-3.png b/app/assets/images/cartoon/mozo-cartoon-3.png similarity index 100% rename from app/assets/images/cartoon/qwaiter-cartoon-3.png rename to app/assets/images/cartoon/mozo-cartoon-3.png diff --git a/app/assets/images/cartoon/qwaiter-cartoon-4.png b/app/assets/images/cartoon/mozo-cartoon-4.png similarity index 100% rename from app/assets/images/cartoon/qwaiter-cartoon-4.png rename to app/assets/images/cartoon/mozo-cartoon-4.png diff --git a/app/assets/images/cartoon/qwaiter-cartoon-5.png b/app/assets/images/cartoon/mozo-cartoon-5.png similarity index 100% rename from app/assets/images/cartoon/qwaiter-cartoon-5.png rename to app/assets/images/cartoon/mozo-cartoon-5.png diff --git a/app/assets/images/cartoon/qwaiter-cartoon-6.png b/app/assets/images/cartoon/mozo-cartoon-6.png similarity index 100% rename from app/assets/images/cartoon/qwaiter-cartoon-6.png rename to app/assets/images/cartoon/mozo-cartoon-6.png diff --git a/app/assets/images/logo.svg b/app/assets/images/logo.svg index 88f99f48..3efd97f4 100644 --- a/app/assets/images/logo.svg +++ b/app/assets/images/logo.svg @@ -197,7 +197,7 @@ style="font-size:4.56339216px;fill:#634227;font-family:HelveticaRounded-Bold" x="8.5248251" y="30.760637" - inkscape:export-filename="/Users/bterkuile/Qwaiter/Android app/Pictures/icon-high-res.png" + inkscape:export-filename="/Users/bterkuile/Mozo/Android app/Pictures/icon-high-res.png" inkscape:export-xdpi="766.79059" inkscape:export-ydpi="766.79059"> "all" link href="/favicon.ico" rel="shortcut icon" - - if ENV['QWAITER_MOBILE_EXPORT'] == 'yes' + - if ENV['MOZO_MOBILE_EXPORT'] == 'yes' javascript: - var QMobile, Qwaiter, Quser; + var QMobile, Mozo, Quser; var data_host = 'http://data.mozo.bar'; - var event_host = '#{Qwaiter.event_host}'; + var event_host = '#{Mozo.event_host}'; var $asset_paths = '##assets_path##'; var Qstorage = localStorage; - else javascript: - var QMobile, Qwaiter, Quser; + var QMobile, Mozo, Quser; var data_host = 'http://data.mozo.bar'; - var event_host = '#{Qwaiter.event_host}'; + var event_host = '#{Mozo.event_host}'; var $assets_path = '/assets/'; var Qstorage = localStorage; #{user_dynamic_data_host} diff --git a/app/views/layouts/user/foundation.html.slim b/app/views/layouts/user/foundation.html.slim index 53c80c05..371d775b 100644 --- a/app/views/layouts/user/foundation.html.slim +++ b/app/views/layouts/user/foundation.html.slim @@ -9,9 +9,9 @@ html lang="en" = stylesheet_link_tag "user/foundation/application" - if Rails.env.user_app? javascript: - var QMobile, Qwaiter, Quser; + var QMobile, Mozo, Quser; var $data_host = 'http://data.mozo.bar'; - var $event_host = '#{Qwaiter.event_host}'; + var $event_host = '#{Mozo.event_host}'; var $assets_path = './assets/'; var $app_version = '#{app_version}'; var $day_names = ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"] @@ -23,9 +23,9 @@ html lang="en" var $log = function(params){$.post('http://log.mozo.bar/user_app', {log: params})}; - elsif Rails.env.production? javascript: - var QMobile, Qwaiter, Quser; + var QMobile, Mozo, Quser; var $data_host = null; - var $event_host = '#{Qwaiter.event_host}'; + var $event_host = '#{Mozo.event_host}'; var $assets_path = '/assets/'; var $app_version = '#{app_version}'; var $day_names = ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"] @@ -38,9 +38,9 @@ html lang="en" var $log = function(params){console.log('App log:'); console.log(params);console.log('=======================================')}; - else javascript: - var QMobile, Qwaiter, Quser; + var QMobile, Mozo, Quser; var $data_host = null; - var $event_host = '#{Qwaiter.event_host}'; + var $event_host = '#{Mozo.event_host}'; var $assets_path = '/assets/'; var $app_version = '#{app_version}'; var $day_names = ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"] diff --git a/app/views/suppliers/application/_head.html.erb b/app/views/suppliers/application/_head.html.erb index eea9c4b6..2b77cebc 100644 --- a/app/views/suppliers/application/_head.html.erb +++ b/app/views/suppliers/application/_head.html.erb @@ -5,6 +5,6 @@ var supplier_object=<%= {id: current_supplier.id}.to_json.html_safe %>; var employee_object=<%=raw current_employee.object_attributes.to_json %>; var data_host = ''; var $asset_path = '/assets/'; -var event_host = '<%= Qwaiter.event_host %>'; +var event_host = '<%= Mozo.event_host %>'; //var datepicker_options = {dateFormat: 'yy-mm-dd', firstDay: <%= current_supplier.week_starts_on_monday? ? 1 : 0 %>}; diff --git a/bin/build_mobile_app.rb b/bin/build_mobile_app.rb index 6a94a680..1277f38d 100644 --- a/bin/build_mobile_app.rb +++ b/bin/build_mobile_app.rb @@ -14,9 +14,9 @@ Rails.application.routes.default_url_options = {format: 'html'} # append .html e rails_assets_path = Rails.root.join('public', 'assets') android_root = '/Users/bterkuile/Documents/workspace/mozo/www' -ios_root = '/Users/bterkuile/Documents/iOS/Qwaiter/www' +ios_root = '/Users/bterkuile/Documents/iOS/Mozo/www' -# android_root_url = "file:///Users/bterkuile/Documents/workspace/Qwaiter/assets" +# android_root_url = "file:///Users/bterkuile/Documents/workspace/Mozo/assets" android_root_url = 'file:///android_asset' # Cleanup and setup android structure @@ -85,7 +85,7 @@ for action in uc.action_methods File.open(File.join(ios_root, "#{action}.html"), 'w'){|f| f.puts ios_view} ## MODIFY FOR ANDROID - #result.sub! //, '' + #result.sub! //, '' android_view = result.gsub /(href|src)="\/user\/([^"]+)/, %|\\1="/\\2| # replace absolute path names to relative ones android_view.gsub! /(href|src)="([^#])/, %|\\1="#{android_root_url}\\2| # replace relative uri's with android specific one # android_view.sub! /<\/title>/, '' diff --git a/config.ru b/config.ru index 85b31bdf..9cd5290f 100644 --- a/config.ru +++ b/config.ru @@ -3,4 +3,4 @@ require ::File.expand_path('../config/environment', __FILE__) #require 'faye' #use Faye::RackAdapter, :mount => '/faye', :timeout => 25 -run Qwaiter::Application +run Mozo::Application diff --git a/config/application.rb b/config/application.rb index 220cc3b6..c57a8b59 100644 --- a/config/application.rb +++ b/config/application.rb @@ -8,7 +8,7 @@ require 'action_mailer/railtie' #require 'active_resource/railtie' require 'rails/test_unit/railtie' require 'sprockets/railtie' -require 'net/http' # lib/qwaiter/broadcaster/faye.rb +require 'net/http' # lib/mozo/broadcaster/faye.rb # custom override hack for the couchbase-setting gem, needs to be loaded before other gems, is settings only without dependencies #require File.expand_path('./../../lib/couchbase-setting', __FILE__) @@ -228,7 +228,7 @@ end # This is a fix for testing models that # are frozen after destroy and then extended # by active_decorator when running the specs -module Qwaiter +module Mozo class Application < Rails::Application # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers @@ -322,5 +322,5 @@ module Qwaiter config.assets.version = '1.0' end end -require 'qwaiter' +require 'mozo' require 'rqrcode-rails3' diff --git a/config/couchbase.yml b/config/couchbase.yml index dd94c19b..8931063e 100644 --- a/config/couchbase.yml +++ b/config/couchbase.yml @@ -3,17 +3,17 @@ defaults: &defaults development: <<: *defaults - bucket: qwaiter_development + bucket: mozo_development test: <<: *defaults - bucket: qwaiter_test + bucket: mozo_test production: <<: *defaults - bucket: qwaiter + bucket: mozo_backend user_app: <<: *defaults - bucket: qwaiter_development + bucket: mozo_development diff --git a/config/couchdb.yml b/config/couchdb.yml index 7e692a84..c416755e 100644 --- a/config/couchdb.yml +++ b/config/couchdb.yml @@ -1,18 +1,18 @@ development: validation_framework: :active_model #optional - #database: "http://mozo:secret@localhost:5984/qwaiter_development" + #database: "http://mozo:secret@localhost:5984/mozo_development" database: "http://admin:<%= ENV['COUCHDB_ADMIN_PASSWORD']%>@localhost:5984/mozo_development" #database: mozo_development test: validation_framework: :active_model #optional - #database: "http://mozo:secret@localhost:5984/qwaiter_test" + #database: "http://mozo:secret@localhost:5984/mozo_test" #Testing can only be done as couchdb admin, since it requires creating and destroying the database database: "http://admin:<%= ENV['COUCHDB_ADMIN_PASSWORD']%>@localhost:5984/mozo_test" - # database: "http://admin:secret@localhost:5984/qwaiter_test" + # database: "http://admin:secret@localhost:5984/mozo_test" production: validation_framework: :active_model #optional - database: "http://admin:<%= ENV['COUCHDB_ADMIN_PASSWORD']%>@localhost:5984/qwaiter" - #database: qwaiter + database: "http://admin:<%= ENV['COUCHDB_ADMIN_PASSWORD']%>@localhost:5984/mozo_backend" + #database: mozo user_app: validation_framework: :active_model #optional database: mozo_development diff --git a/config/deploy.rb b/config/deploy.rb index c16f25b6..3064de1e 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -3,8 +3,8 @@ #require 'capistrano/local_precompile' set :application, 'mozo.bar' -#set :repo_url, 'root@uflows.com:/var/git/qwaiter.git' -set :repo_url, '/var/git/qwaiter.git' +#set :repo_url, 'root@uflows.com:/var/git/mozo.git' +set :repo_url, '/var/git/mozo.git' # Default branch is :master # ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call diff --git a/config/environment.rb b/config/environment.rb index af47b461..5f8f011a 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -2,4 +2,4 @@ require File.expand_path('../application', __FILE__) # Initialize the rails application -Qwaiter::Application.initialize! +Mozo::Application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb index 32d8b6c3..40a16cc9 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -Qwaiter::Application.configure do +Mozo::Application.configure do # Settings specified here will take precedence over those in config/application.rb # In the development environment your application's code is reloaded on diff --git a/config/environments/production.rb b/config/environments/production.rb index 9ac65c5d..bb8c6fbb 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -1,4 +1,4 @@ -Qwaiter::Application.configure do +Mozo::Application.configure do # Settings specified here will take precedence over those in config/application.rb # Code is not reloaded between requests diff --git a/config/environments/test.rb b/config/environments/test.rb index 7b143266..05f2ed10 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -1,4 +1,4 @@ -Qwaiter::Application.configure do +Mozo::Application.configure do # Settings specified here will take precedence over those in config/application.rb # The test environment is used exclusively to run your application's diff --git a/config/environments/user_app.rb b/config/environments/user_app.rb index d1cc8e43..c5bacc3c 100644 --- a/config/environments/user_app.rb +++ b/config/environments/user_app.rb @@ -1,4 +1,4 @@ -Qwaiter::Application.configure do +Mozo::Application.configure do # Settings specified here will take precedence over those in config/application.rb # Code is not reloaded between requests diff --git a/config/initializers/active_model_serializer.rb b/config/initializers/active_model_serializer.rb index dbc23951..fbf2cb31 100644 --- a/config/initializers/active_model_serializer.rb +++ b/config/initializers/active_model_serializer.rb @@ -13,7 +13,7 @@ module ActiveModel::SerializerSupport end =begin -class Qwaiter::JsonAdapter < ActiveModel::Serializer::Adapter::JsonApi +class Mozo::JsonAdapter < ActiveModel::Serializer::Adapter::JsonApi def add_resource_relationships_old1(attrs, serializer, options = {}) options[:add_included] = options.fetch(:add_included, true) serializer.associations.each do |association| #do |name, association, opts| @@ -85,5 +85,5 @@ class Qwaiter::JsonAdapter < ActiveModel::Serializer::Adapter::JsonApi end =end #ActiveModel::Serializer.config.adapter = :json_api -#ActiveModel::Serializer.config.adapter = Qwaiter::JsonAdapter +#ActiveModel::Serializer.config.adapter = Mozo::JsonAdapter #ActiveModel::Serializer.config.adapter = :flatten_json diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index f8bd23a1..d368e114 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -1,4 +1,4 @@ -module Qwaiter +module Mozo class FailureApp < Devise::FailureApp def respond if request.format.json? @@ -267,7 +267,7 @@ Devise.setup do |config| # change the failure app, you can configure them inside the config.warden block. # config.warden do |manager| - manager.failure_app = Qwaiter::FailureApp + manager.failure_app = Mozo::FailureApp # manager.intercept_401 = false # manager.default_strategies(:scope => :user).unshift :some_external_strategy end diff --git a/config/initializers/mozo_settings.rb b/config/initializers/mozo_settings.rb index 61041b32..8c2fda09 100644 --- a/config/initializers/mozo_settings.rb +++ b/config/initializers/mozo_settings.rb @@ -1,15 +1,15 @@ if Rails.env.development? - Qwaiter.event_host = "http://localhost:9296/faye" + Mozo.event_host = "http://localhost:9296/faye" else - Qwaiter.event_host = "https://events.mozo.bar/faye" + Mozo.event_host = "https://events.mozo.bar/faye" end -Qwaiter.broadcaster = Qwaiter::Broadcaster::Faye.new +Mozo.broadcaster = Mozo::Broadcaster::Faye.new # use the connection from couchbase-structures/documents # will be overwritten in the specs since flushing the real # thing is difficult -# Qwaiter::Counter.connection = $cb unless Rails.env.test? +# Mozo::Counter.connection = $cb unless Rails.env.test? # Use the Drb counter -Qwaiter::Counter.connection = Qwaiter::DrbCounter.object unless Rails.env.test? +Mozo::Counter.connection = Mozo::DrbCounter.object unless Rails.env.test? diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb index 9a488576..2433ee1b 100644 --- a/config/initializers/secret_token.rb +++ b/config/initializers/secret_token.rb @@ -4,4 +4,5 @@ # If you change this key, all old signed cookies will become invalid! # Make sure the secret is at least 30 characters and all random, # no regular words or you'll be exposed to dictionary attacks. -Qwaiter::Application.config.secret_token = 'a2d0002614aa5e1a04dd5f57c3a239765ee47df0f5e3214adf41c4893b84a95cd805f650f5edb321f2474adf6bb01a625b911d34a3c879815281d7e1db4415c8' +#TODO: I think this one is no longer used and its just credentials now. Written when using rails 8.0.2 +Mozo::Application.config.secret_token = 'a2d0002614aa5e1a04dd5f57c3a239765ee47df0f5e3214adf41c4893b84a95cd805f650f5edb321f2474adf6bb01a625b911d34a3c879815281d7e1db4415c8' diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index ffb1535a..78dadc01 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,8 +1,8 @@ # Be sure to restart your server when you modify this file. -Qwaiter::Application.config.session_store :cookie_store, key: '_qwaiter_session' +Mozo::Application.config.session_store :cookie_store, key: '_mozo_session' # Use the database for sessions instead of the cookie-based default, # which shouldn't be used to store highly confidential information # (create the session table with "rails generate session_migration") -# Qwaiter::Application.config.session_store :active_record_store +# Mozo::Application.config.session_store :active_record_store diff --git a/config/routes.rb b/config/routes.rb index 4c853f2c..8fc06e9a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ ALLOWED_LOCALES = /nl|de|fr|en|es/ -Qwaiter::Application.routes.draw do +Mozo::Application.routes.draw do devise_for :users, controllers: { omniauth_callbacks: "users/omniauth_callbacks" } #devise_for :suppliers, controllers: { confirmations: 'confirmations', registrations: 'registrations' } devise_for :employees, controllers: { diff --git a/lib/couchbase-setting.rb b/lib/couchbase-setting.rb index 7ee8ba00..1501c2b9 100644 --- a/lib/couchbase-setting.rb +++ b/lib/couchbase-setting.rb @@ -11,7 +11,7 @@ module CouchbaseSetting end def self.bucket - config :bucket, default: 'qwaiter' + config :bucket, default: 'mozo' end def self.config(setting, default: nil) @@ -22,19 +22,19 @@ end CouchbaseSetting.configs = { supplier_counters: { development: { - bucket: 'qwaiter_development' + bucket: 'mozo_development' }, test:{ - bucket: 'qwaiter_development' + bucket: 'mozo_development' }, production: {} }, queue: { development: { - bucket: 'qwaiter_development' + bucket: 'mozo_development' }, test:{ - bucket: 'qwaiter_development' + bucket: 'mozo_development' }, production: {} } diff --git a/lib/qwaiter.rb b/lib/mozo.rb similarity index 97% rename from lib/qwaiter.rb rename to lib/mozo.rb index d3555826..391fe77b 100644 --- a/lib/qwaiter.rb +++ b/lib/mozo.rb @@ -1,4 +1,4 @@ -module Qwaiter +module Mozo mattr_accessor :event_host mattr_accessor :broadcaster extend ActiveSupport::Autoload diff --git a/lib/qwaiter/broadcaster.rb b/lib/mozo/broadcaster.rb similarity index 85% rename from lib/qwaiter/broadcaster.rb rename to lib/mozo/broadcaster.rb index 2a0a1e13..1522a0b9 100644 --- a/lib/qwaiter/broadcaster.rb +++ b/lib/mozo/broadcaster.rb @@ -1,4 +1,4 @@ -module Qwaiter +module Mozo module Broadcaster extend ActiveSupport::Autoload autoload :Faye diff --git a/lib/qwaiter/broadcaster/faye.rb b/lib/mozo/broadcaster/faye.rb similarity index 83% rename from lib/qwaiter/broadcaster/faye.rb rename to lib/mozo/broadcaster/faye.rb index 659e6d06..f277ff7b 100644 --- a/lib/qwaiter/broadcaster/faye.rb +++ b/lib/mozo/broadcaster/faye.rb @@ -1,8 +1,8 @@ -module Qwaiter +module Mozo module Broadcaster class Faye def broadcast(message) - @uri ||= URI.parse(Qwaiter.event_host) + @uri ||= URI.parse(Mozo.event_host) Net::HTTP.post_form(@uri, message: message.merge(ext: {auth_token: '6be65f9b5e7d21b8ca8de4ccfad5ba24cf40d440b370af79'}).to_json) rescue => e Rails.logger.error("[FAYE][ERROR] #{e.message}") diff --git a/lib/qwaiter/couchbase.rb b/lib/mozo/couchbase.rb similarity index 91% rename from lib/qwaiter/couchbase.rb rename to lib/mozo/couchbase.rb index ff3c2cac..511551bd 100644 --- a/lib/qwaiter/couchbase.rb +++ b/lib/mozo/couchbase.rb @@ -1,4 +1,4 @@ -module Qwaiter +module Mozo module Couchbase def self.connection $cb @@ -18,7 +18,7 @@ module Qwaiter def self.flush_counters! return unless connection.present? - design_doc('supplier').counters(reduce: false).each{|counter| Qwaiter::Counter.set counter.key, 0} + design_doc('supplier').counters(reduce: false).each{|counter| Mozo::Counter.set counter.key, 0} end end end diff --git a/lib/qwaiter/counter.rb b/lib/mozo/counter.rb similarity index 97% rename from lib/qwaiter/counter.rb rename to lib/mozo/counter.rb index 03388971..ac4648d4 100644 --- a/lib/qwaiter/counter.rb +++ b/lib/mozo/counter.rb @@ -1,4 +1,4 @@ -module Qwaiter +module Mozo module Counter mattr_accessor :connection diff --git a/lib/qwaiter/distribution.rb b/lib/mozo/distribution.rb similarity index 98% rename from lib/qwaiter/distribution.rb rename to lib/mozo/distribution.rb index 5502c217..7104b81f 100644 --- a/lib/qwaiter/distribution.rb +++ b/lib/mozo/distribution.rb @@ -1,4 +1,4 @@ -module Qwaiter +module Mozo module Distribution module DistributionMethods def epsilon diff --git a/lib/qwaiter/drb_counter.rb b/lib/mozo/drb_counter.rb similarity index 89% rename from lib/qwaiter/drb_counter.rb rename to lib/mozo/drb_counter.rb index 6b9da2ae..e9e20cf2 100644 --- a/lib/qwaiter/drb_counter.rb +++ b/lib/mozo/drb_counter.rb @@ -1,4 +1,4 @@ -module Qwaiter +module Mozo module DrbCounter def self.object require 'drb' diff --git a/lib/qwaiter/employee_base_serializer.rb b/lib/mozo/employee_base_serializer.rb similarity index 95% rename from lib/qwaiter/employee_base_serializer.rb rename to lib/mozo/employee_base_serializer.rb index dbcbaacd..2896eaa0 100644 --- a/lib/qwaiter/employee_base_serializer.rb +++ b/lib/mozo/employee_base_serializer.rb @@ -1,4 +1,4 @@ -module Qwaiter::EmployeeBaseSerializer +module Mozo::EmployeeBaseSerializer extend ActiveSupport::Concern include JSONAPI::Serializer included do diff --git a/lib/qwaiter/serializer.rb b/lib/mozo/serializer.rb similarity index 98% rename from lib/qwaiter/serializer.rb rename to lib/mozo/serializer.rb index 09c9e0ed..b219ef95 100644 --- a/lib/qwaiter/serializer.rb +++ b/lib/mozo/serializer.rb @@ -1,5 +1,5 @@ =begin -module Qwaiter +module Mozo class Serializer < ActiveModel::Serializer def self.root=(val) ActiveSupport::Deprecation.new('1.0', 'Mozo') diff --git a/lib/qwaiter/supplier_base_serializer.rb b/lib/mozo/supplier_base_serializer.rb similarity index 96% rename from lib/qwaiter/supplier_base_serializer.rb rename to lib/mozo/supplier_base_serializer.rb index b51a4422..581b63d7 100644 --- a/lib/qwaiter/supplier_base_serializer.rb +++ b/lib/mozo/supplier_base_serializer.rb @@ -1,4 +1,4 @@ -module Qwaiter::SupplierBaseSerializer +module Mozo::SupplierBaseSerializer extend ActiveSupport::Concern include JSONAPI::Serializer included do diff --git a/lib/qwaiter/user_base_serializer.rb b/lib/mozo/user_base_serializer.rb similarity index 96% rename from lib/qwaiter/user_base_serializer.rb rename to lib/mozo/user_base_serializer.rb index e5dd558a..0a3a8362 100644 --- a/lib/qwaiter/user_base_serializer.rb +++ b/lib/mozo/user_base_serializer.rb @@ -1,4 +1,4 @@ -module Qwaiter::UserBaseSerializer +module Mozo::UserBaseSerializer extend ActiveSupport::Concern include JSONAPI::Serializer included do diff --git a/lib/qwaiter/waiter_base_serializer.rb b/lib/mozo/waiter_base_serializer.rb similarity index 96% rename from lib/qwaiter/waiter_base_serializer.rb rename to lib/mozo/waiter_base_serializer.rb index 8cee6f29..efcfc306 100644 --- a/lib/qwaiter/waiter_base_serializer.rb +++ b/lib/mozo/waiter_base_serializer.rb @@ -1,4 +1,4 @@ -module Qwaiter::WaiterBaseSerializer +module Mozo::WaiterBaseSerializer extend ActiveSupport::Concern include JSONAPI::Serializer included do diff --git a/make_mobile b/make_mobile index 0e065236..667250f8 100644 --- a/make_mobile +++ b/make_mobile @@ -27,7 +27,7 @@ end `rm -rf #{APP_ASSET_ROOT}` `mkdir #{APP_ASSET_ROOT}` `rm -rf public/assets` -`QWAITER_MOBILE_EXPORT=yes RAILS_ENV=user_app bundle exec rake assets:precompile` +`MOZO_MOBILE_EXPORT=yes RAILS_ENV=user_app bundle exec rake assets:precompile` `find public/assets -name "*.gz" -exec rm -f {} \\;` %w[ supplier @@ -70,7 +70,7 @@ end # rm -rf public/assets/site; # rm -rf public/assets/cartoon; # rm -rf public/assets/frames; -# QWAITER_MOBILE_EXPORT=yes RAILS_ENV=user_app TEST_HOST=$1 bundle exec rails runner bin/build_mobile_app.rb; +# MOZO_MOBILE_EXPORT=yes RAILS_ENV=user_app TEST_HOST=$1 bundle exec rails runner bin/build_mobile_app.rb; `rm -rf public/assets` # Set app versions diff --git a/spec/acceptance_steps/suppliers/dashboard_steps.rb b/spec/acceptance_steps/suppliers/dashboard_steps.rb index 86b7d751..dfc0681a 100644 --- a/spec/acceptance_steps/suppliers/dashboard_steps.rb +++ b/spec/acceptance_steps/suppliers/dashboard_steps.rb @@ -8,8 +8,8 @@ step "there is an active list and order" do @order = create :order, user: @user, list: @list, supplier: @supplier, section: @section, state: 'placed' @product_order = create :product_order, order: @order, product: @product, quantity: 3, price: 2.11, product_name: 'Old Product name' # @list.set_price.should == 6.33 # does not belong here, but good test. must take product order price above product price - Qwaiter::Counter.set "supplier_counter:#{@supplier.id}:orders_placed", 11 - Qwaiter::Counter.set "supplier_counter:#{@supplier.id}:orders_in_process", 7 + Mozo::Counter.set "supplier_counter:#{@supplier.id}:orders_placed", 11 + Mozo::Counter.set "supplier_counter:#{@supplier.id}:orders_in_process", 7 end step "the supplier dashboard should display the active list" do diff --git a/spec/lib/qwaiter/counter_spec.rb b/spec/lib/mozo/counter_spec.rb similarity index 76% rename from spec/lib/qwaiter/counter_spec.rb rename to spec/lib/mozo/counter_spec.rb index 61428a77..8fb905f1 100644 --- a/spec/lib/qwaiter/counter_spec.rb +++ b/spec/lib/mozo/counter_spec.rb @@ -1,14 +1,14 @@ require 'spec_helper' -describe Qwaiter::Counter do +describe Mozo::Counter do describe 'couchbase connection', broken: true do # couchbase not used at the moment before do - @original_connection = Qwaiter::Counter.connection - Qwaiter::Counter.connection = $cb + @original_connection = Mozo::Counter.connection + Mozo::Counter.connection = $cb end after do - Qwaiter::Counter.connection = @original_connection + Mozo::Counter.connection = @original_connection end describe '.incr' do it 'sets nonexistent keys to 1' do diff --git a/spec/lib/qwaiter/distribution_spec.rb b/spec/lib/mozo/distribution_spec.rb similarity index 77% rename from spec/lib/qwaiter/distribution_spec.rb rename to spec/lib/mozo/distribution_spec.rb index dd25fa0e..429aef54 100644 --- a/spec/lib/qwaiter/distribution_spec.rb +++ b/spec/lib/mozo/distribution_spec.rb @@ -1,7 +1,7 @@ # encoding: UTF-8 require 'spec_helper' -describe Qwaiter::Distribution do +describe Mozo::Distribution do describe 'distribute_lattice' do { [20 , 10, 4] => [10.0, 5.0], @@ -15,7 +15,7 @@ describe Qwaiter::Distribution do [13.6, 40, 10] => [ 6.8, 8.0], [40, 40, 23] => [ 8.0, 8.0], }.each do |params, result| - it("handles #{params.join(', ')}"){ Qwaiter::Distribution.distribute_lattice(*params).should == result } + it("handles #{params.join(', ')}"){ Mozo::Distribution.distribute_lattice(*params).should == result } end end end diff --git a/spec/models/order_spec.rb b/spec/models/order_spec.rb index a207accf..31858fe0 100644 --- a/spec/models/order_spec.rb +++ b/spec/models/order_spec.rb @@ -49,8 +49,8 @@ describe Order do describe 'counters' do before do # hack some initial values - Qwaiter::Counter.set "supplier_counter:#{supplier.id}:orders_placed", 11 - Qwaiter::Counter.set "supplier_counter:#{supplier.id}:orders_in_process", 7 + Mozo::Counter.set "supplier_counter:#{supplier.id}:orders_placed", 11 + Mozo::Counter.set "supplier_counter:#{supplier.id}:orders_in_process", 7 end it 'reduces the orders_placed count and communicates it to user' do @@ -89,8 +89,8 @@ describe Order do describe 'counters' do before do # hack some initial values - Qwaiter::Counter.set "supplier_counter:#{supplier.id}:orders_placed", 11 - Qwaiter::Counter.set "supplier_counter:#{supplier.id}:orders_in_process", 7 + Mozo::Counter.set "supplier_counter:#{supplier.id}:orders_placed", 11 + Mozo::Counter.set "supplier_counter:#{supplier.id}:orders_in_process", 7 end it 'decreases the orders_in_process count and communicates it to user' do @@ -123,8 +123,8 @@ describe Order do describe 'counters' do before do # hack some initial values - Qwaiter::Counter.set "supplier_counter:#{supplier.id}:orders_placed", 11 - Qwaiter::Counter.set "supplier_counter:#{supplier.id}:orders_in_process", 7 + Mozo::Counter.set "supplier_counter:#{supplier.id}:orders_placed", 11 + Mozo::Counter.set "supplier_counter:#{supplier.id}:orders_in_process", 7 end it 'decreases the placed count and communicates it to user when state is placed through the order_cancelled broadcast message' do @@ -157,8 +157,8 @@ describe Order do describe 'counters' do before do # hack some initial values - Qwaiter::Counter.set "supplier_counter:#{supplier.id}:orders_placed", 11 - Qwaiter::Counter.set "supplier_counter:#{supplier.id}:orders_in_process", 7 + Mozo::Counter.set "supplier_counter:#{supplier.id}:orders_placed", 11 + Mozo::Counter.set "supplier_counter:#{supplier.id}:orders_in_process", 7 end it "decrements the orders_placed_count for when a placed order is closed" do diff --git a/spec/models/supplier/counters_spec.rb b/spec/models/supplier/counters_spec.rb index cd7a9cc7..e92191e8 100644 --- a/spec/models/supplier/counters_spec.rb +++ b/spec/models/supplier/counters_spec.rb @@ -15,16 +15,16 @@ describe Supplier::Counters do end # it 'cleans counter values if orders are no longer available', broken: defined?($cb) do - # old_connection = Qwaiter::Counter.connection + # old_connection = Mozo::Counter.connection # # this spec should run on the couchbase database - # Qwaiter::Counter.connection = $cb + # Mozo::Counter.connection = $cb # supplier = create :supplier - # Qwaiter::Counter.set "supplier_counter:#{supplier.id}:orders_placed", 9 + # Mozo::Counter.set "supplier_counter:#{supplier.id}:orders_placed", 9 # supplier.orders_placed_count.should == 9 # Supplier.reset_counters! # sleep 1 # supplier.orders_placed_count.should == 0 - # Qwaiter::Counter.connection = old_connection + # Mozo::Counter.connection = old_connection # end # it 'sets the counters to the right values for one supplier' do diff --git a/spec/models/supplier_spec.rb b/spec/models/supplier_spec.rb index bd4a7367..61321f1a 100644 --- a/spec/models/supplier_spec.rb +++ b/spec/models/supplier_spec.rb @@ -76,7 +76,7 @@ describe Supplier do describe '#decrement_orders_placed_count!' do it 'decreases orders_placed' do - Qwaiter::Counter.set "supplier_counter:#{supplier.id}:orders_placed", 9 + Mozo::Counter.set "supplier_counter:#{supplier.id}:orders_placed", 9 supplier.decrement_orders_placed_count!.should == 8 end end diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index e344e448..058d406e 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -43,7 +43,7 @@ end module BroadcastHelpers def expect_broadcast(obj) - expect(Qwaiter.broadcaster).to receive(:broadcast).with(obj) + expect(Mozo.broadcaster).to receive(:broadcast).with(obj) end end @@ -189,13 +189,13 @@ RSpec.configure do |config| # instead of true. #config.use_transactional_fixtures = true config.before :suite do - Qwaiter::Couchbase.load_design_docs! - Qwaiter::Counter.connection = TestCounter.new + Mozo::Couchbase.load_design_docs! + Mozo::Counter.connection = TestCounter.new end config.before :each do CouchPotato.couchrest_database.recreate! - Qwaiter::Counter.connection.flush + Mozo::Counter.connection.flush end config.before :each, type: :feature do diff --git a/spec/serializers_spec.rb b/spec/serializers_spec.rb index 30c7df8f..5c6dc8ac 100644 --- a/spec/serializers_spec.rb +++ b/spec/serializers_spec.rb @@ -3,9 +3,9 @@ require 'spec_helper' describe 'Serializers' do let(:serializer_classes){ Dir.glob(Rails.root.join('app/serializers/*_serializer.rb')).map{|f| File.basename(f).sub(/\.rb$/,'').classify.constantize}} describe 'classes' do - it 'inherits from Qwaiter::Serializer' do + it 'inherits from Mozo::Serializer' do serializer_classes.each do |serializer| - serializer.ancestors.should include Qwaiter::Serializer + serializer.ancestors.should include Mozo::Serializer end end end diff --git a/spec/support/matchers/broadcast_to_supplier_matcher.rb b/spec/support/matchers/broadcast_to_supplier_matcher.rb index 7ed1f120..f947303d 100644 --- a/spec/support/matchers/broadcast_to_supplier_matcher.rb +++ b/spec/support/matchers/broadcast_to_supplier_matcher.rb @@ -17,11 +17,11 @@ module Matchers end def matches?(block) - old_broadcaster = Qwaiter.broadcaster + old_broadcaster = Mozo.broadcaster test_broadcaster = TestBroadcaster.new - Qwaiter.broadcaster = test_broadcaster + Mozo.broadcaster = test_broadcaster block.call - Qwaiter.broadcaster = old_broadcaster + Mozo.broadcaster = old_broadcaster relevant_broadcasts = test_broadcaster.broadcasts.select{|b| b[:channel] =~ /^\/supplier\/#{@supplier_id}/ && b[:data][:event] == @message} @failure_debug_content = "was #{relevant_broadcasts.map{|b| b[:data][:data].inspect}.join(" and ")}" diff --git a/spec/support/matchers/broadcast_to_user_matcher.rb b/spec/support/matchers/broadcast_to_user_matcher.rb index 7044fdd9..3b524e66 100644 --- a/spec/support/matchers/broadcast_to_user_matcher.rb +++ b/spec/support/matchers/broadcast_to_user_matcher.rb @@ -18,11 +18,11 @@ module Matchers end def matches?(block) - old_broadcaster = Qwaiter.broadcaster + old_broadcaster = Mozo.broadcaster test_broadcaster = TestBroadcaster.new - Qwaiter.broadcaster = test_broadcaster + Mozo.broadcaster = test_broadcaster block.call - Qwaiter.broadcaster = old_broadcaster + Mozo.broadcaster = old_broadcaster relevant_broadcasts = test_broadcaster.broadcasts.select{|b| b[:channel] =~ /^\/user\/#{@user_id}/ && b[:data][:event] == @message} @failure_message = "User #{@user_id} did not receive any broadcasts" and return false if relevant_broadcasts.empty?