updates for new development env

app/controllers/application_controller.rb

@@ -137,16 +137,21 @@ private
   def json_response(obj, options = {})
     if obj.is_a?(SimplyStored::Couch)
       if obj.errors.present?
-        json_api_errors = obj.errors.details.map{|key, ers| {id: key, status: '422', title: ers.map{|e| e[:error].to_s}.join(', '), source: {parameter: key}}}
+        #json_api_errors = obj.errors.details.map{|key, ers| {id: key, status: '422', title: ers.map{|e| e[:error].to_s}.join(', '), source: {parameter: key}}}
+        json_api_errors = obj.errors.map{|error| {id: error.attribute, status: '422', title: error.message}}
         options.reverse_merge(json: {errors: json_api_errors, ok: false}, status: :unprocessable_entity)
       else
         options.reverse_merge(json: obj)
       end
     else # assume crude Hash
+      if obj[:errors]
+        obj
+      else
         obj[:ok] = true unless obj.has_key?(:ok)
         obj
       end
     end
+  end
 
   def force_reloads
     load Rails.root.join('config/initializers/custom_form_builder.rb')

app/controllers/supplier_controller.rb

@@ -1,7 +1,7 @@
 class SupplierController < Suppliers::ApplicationController
   def home
     if Rails.env.development?
-      redirect_to "https://supplier.mozo.local/supplier/#{params[:other]}"
+      redirect_to "https://localhost:4202/supplier/#{params[:other]}"
     else
       redirect_to "https://supplier.mozo.bar/supplier/#{params[:other]}"
     end

app/helpers/application_helper.rb

@@ -7,7 +7,7 @@ module ApplicationHelper
 
   def user_root_path
     case Rails.env
-    when 'development' then 'https://user.mozo.local/'
+    when 'development' then 'https://localhost:4201/'
     else 'https://user.mozo.bar/'
     end
   end

app/views/dashboard/demo_both.html.slim

@@ -3,6 +3,6 @@ iframe.phone-content-frame src=user_root_path
 
 .tablet-wrapper
 - if Rails.env.development?
-  iframe.tablet-content-frame src="https://supplier.mozo.local/supplier/"
+  iframe.tablet-content-frame src="https://localhost:4202/supplier/"
 - else
   iframe.tablet-content-frame src="https://supplier.mozo.bar/supplier/"

config/initializers/mozo_settings.rb

@@ -1,5 +1,5 @@
 if Rails.env.development?
-  Qwaiter.event_host = "https://events.mozo.local:9296/faye"
+  Qwaiter.event_host = "https://localhost:9296/faye"
 else
   Qwaiter.event_host = "https://events.mozo.bar:9296/faye"
 end

config/initializers/omniauth.rb

@@ -1,2 +1,2 @@
-OmniAuth.config.full_host = Rails.env.production? ? 'https://www.mozo.bar' : 'https://www.mozo.local'
+OmniAuth.config.full_host = Rails.env.production? ? 'https://www.mozo.bar' : 'https://localhost:3002'
 

faye/Dockerfile

@@ -39,4 +39,3 @@ EXPOSE $FAYE_PORT
 
 #CMD thin start -R config.ru -p $FAYE_PORT
 CMD thin start -R config.ru -p $FAYE_PORT --ssl --ssl-key-file=ssl/privkey.pem --ssl-cert-file=ssl/fullchain.pem
-

faye/rebuild-docker.sh

@@ -47,8 +47,10 @@ docker build -f faye/Dockerfile -t mozo_faye .
 
 # 5. Spin up the counter container from the generated image
 if [ $arch == "Darwin" ]; then
+  echo "Running the created image using the Mac Darwin port exposing"
   docker run -p 9296:9296 --restart unless-stopped --detach --name=mozo_faye mozo_faye
 else
+  echo "Running the created image using network=host"
   docker run --network=host --restart unless-stopped --detach --name=mozo_faye mozo_faye
 fi