shopapp 0.76.05 → 0.77.07

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba66cce2f3541a827ff4526b546b0017141951403102b28ae052457acd6b2151
-  data.tar.gz: 68c7bf6f0c79d30ef16aa34b835be5ea208671cd82696caefee1b71436a5869e
+  metadata.gz: 9802f951ba4ef09c8d2cd5b41eb4096216831f14862a0e4929329d84d95a90c9
+  data.tar.gz: '04863306ac254d2ee9f96c7fa2738fcbc63c6c4582a2bcfb4e1635f8fe2abc86'
 SHA512:
-  metadata.gz: faf94e28764653181b8991cf1588a5411075b13e7bbed9490ec6e265af622fb33f811a7198be5fe1068252f12a7cd3a84bdfff5d9b5641e2c6622c9290db1860
-  data.tar.gz: c9a6e23f79d9c85763bbfcd00573dc0ef92185205af2fa11afc517cd4f9a1acc5add7bf154db9276755b8f86d232a84618245d58ab50313c07db55827582679b
+  metadata.gz: 47031f63b195a44c07395d327763107da293eb7d67eb92158547ae71468400eff724aa649eae0fa844e5643348b09fd961fa808b6a685dff883475d841d666b7
+  data.tar.gz: 9964525e49da455a91148b6b8930c1c0ce86ac9865536a9d08c59f12b1ddb300d9102f11b255a1d79b2e8ef7bcf18b20ee179df507f14173cd370f1fbd515623

data/README.md

@@ -95,4 +95,4 @@ shopapp to support i18n, add two methods to your ApplicationController:
 
 To build new version of this gem, change the version in shopapp.gemspec and run:
 
-    gem build shopapp.gemspec ; gem push shopapp-0.76.05.gem; gem install shopapp
+    gem build shopapp.gemspec ; gem push shopapp-0.77.07.gem; gem install shopapp

data/app/controllers/concerns/remote_request_manager.rb

@@ -25,22 +25,35 @@ module RemoteRequestManager
     if error.instance_of?(ActiveRecord::RecordInvalid)
       respond_to_js(error.record.errors.messages)
     else
-      respond_to_js(error)
+      respond_to_js(error.message)
     end
   end
 
   private
 
   def respond_to_js(error_message)
-    flash.now[:danger] = error_message
-    respond_to do |format|
-      format.js do
-        render PATH_TO_JS_FILE, locals: { flash: flash }
-      end
-    end
+    Rails.logger.debug "Request format: #{request.format}"
+    flash.now[:danger] = format_error_message(error_message)
+    render PATH_TO_JS_FILE, locals: { flash: flash }
+    # respond_to do |format|
+    #   format.js do
+    #     render PATH_TO_JS_FILE, locals: { flash: flash }
+    #   end
+    # end
   end
 
   def redirect_path(args)
     args[:to].presence || request.referer || root_path
   end
+
+  def format_error_message(message)
+    case message
+    when Array
+      message.join(", ")
+    when Hash
+      message.map { |k, v| "#{k}: #{v.join(', ')}" }.join("; ")
+    else
+      message.to_s
+    end
+  end
 end

data/app/helpers/euro_helper.rb

@@ -8,7 +8,7 @@ module EuroHelper
   end
 
   def mdi_tag(name = nil, included_classes: '', size: 16,  icon: 'highlight_off', **other_named_params)
-    if name.match?(/^([\w\-\_]+)( (\d\d)px)?$/) && size == 16 && icon == 'highlight_off'
+    if icon == 'highlight_off' && name.to_s.match?(/^([\w\-\_]+)( (\d\d)px)?$/) && size == 16
       results = name.match(/^([\w\-\_]+)( (\d\d)px)?$/)
       icon = results[1]
       size = results[3].to_i if results[3].present?
@@ -23,4 +23,21 @@ module EuroHelper
 
     "<i class=\"material-icons md-#{size} #{name} #{included_classes}\" #{other_actions}>#{icon}</i>".html_safe
   end
+
+  def mdi_tag(name = nil, included_classes: '', size: 16,  icon: 'highlight_off', **other_named_params)
+    if name.to_s.match?(/^([\w\-\_]+)( (\d\d)px)?$/) && size == 16 && icon == 'highlight_off'
+      results = name.to_s.match(/^([\w\-\_]+)( (\d\d)px)?$/)
+      icon = results[1]
+      size = results[3].to_i if results[3].present?
+    end
+
+    included_classes += " " + other_named_params[:class] if other_named_params[:class].present?
+    other_actions = other_named_params.except(:class).keys.map { |key| "#{key}=\"#{other_named_params[key]}\"" }.join(' ')
+
+    icon = 'edit' if icon == 'stylus'
+    icon = 'person_add' if icon == 'account-plus-outline'
+    icon = 'earth' if icon == 'language'
+
+    "<i class=\"material-icons md-#{size} #{name} #{included_classes}\" #{other_actions}>#{icon}</i>".html_safe
+  end
 end

data/app/views/shopapp/login_message.haml

@@ -7,9 +7,7 @@
     -# %link{:href => "https://fonts.googleapis.com/css?family=Fira+Sans:400,500,700", :rel => "stylesheet"}/
     = csrf_meta_tags
     = stylesheet_link_tag    'application', media: 'all'
-    - fail "please check shopapp/app/views/login_message.haml"
     = javascript_importmap_tags
-    = javascript_include_tag 'application', type: "module"
     = shopapp3_favicon
   %body.bg-light
     .row.justify-content-center

data/app/views/shopapp/modal_errors.js.erb

@@ -1,5 +1,6 @@
-$(".modal-errors").html(
-  "<%= escape_javascript(render partial: 'shopapp/modal_errors',
-                                locals: { flash: flash })
-   %>"
-);
+<% if flash.any? %>
+$(".modal-errors").html("<%= escape_javascript(render partial: 'shopapp/modal_errors', locals: { flash: flash }) %>");
+$(".modal-errors").show();
+<% else %>
+$(".modal-errors").hide();
+<% end %>

data/shopapp.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name        = 'shopapp'
   # Version for Rails 7 / Ruby 3 start with 0.74
-  s.version     = '0.76.05'
-  s.date        = '2024-07-12'
+  s.version     = '0.77.07'
+  s.date        = '2024-08-13'
   s.summary     = 'Do a shoplift.'
   s.description = 'Ha! Art thou Bedlam? Dost thou thirst base Trojan, to have me fold up Parca\'s fatal web? Hence!\
                    I am qualmish at the smell of leek.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopapp
 version: !ruby/object:Gem::Version
-  version: 0.76.05
+  version: 0.77.07
 platform: ruby
 authors:
 - Zeljko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-12 00:00:00.000000000 Z
+date: 2024-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml-rails