shopapp 0.2.70 → 0.2.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 213fc1cbb42de44c43a10bd8da52d7ad5e6ebf4f54cc476ee34ddc22c363e3cc
-  data.tar.gz: 0e7eec3aff1f2d611d35ec4605bdeb594ced9769bd74b34e2c2b8d1f157346f1
+  metadata.gz: 874495e5720b2a801792b23fdb4f64397b8c69d5e4ef3f38473f45217857a707
+  data.tar.gz: b22cf4b6d9fa37ef383342ec1662fc41ede7cc5cb2eab2f4439670fb8b17eab9
 SHA512:
-  metadata.gz: e6f2ae308decae896633f1263487e152591df3588f9c2e08b05df2431b8b190e15fc2744fa1be21c985cb7dec28321dc5da4ad21307cb19a1819fd67623af4de
-  data.tar.gz: 82c20ae0c651ef494db2988c105b9147b4c6923a81c9071fc39d6c083f47e0ae44bf928000dc358685c42d144b82b1e72b387e3af61018018e6704e3d5bd21ff
+  metadata.gz: 4abd1682238b019eaf23b615aaf580a28b9f298bdce62288a031a7524139f62a5e95bd50a8afdd8cb57a7fd9421704cdaf541e102601efa82a6fbf8f648e8d0d
+  data.tar.gz: bd72b665b7639efe76b6e4dea240d2a4c425fd7385841cd18f0e11e0f36081b4ea2edf7d0f8e64c8c8adbb23ad9b9960c5151e62bb0e471912f728e5e7d441bf

data/README.md

@@ -93,4 +93,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.2.70.gem; gem install shopapp
+    gem build shopapp.gemspec ; gem push shopapp-0.2.71.gem; gem install shopapp

data/app/assets/javascripts/shopapp3.js

@@ -17,11 +17,17 @@ function shopappSnackbar(message, timeout) {
 }
 
 function shopappAlert(message, type) {
-  if(type === undefined) {
+  if (type === undefined) {
     type = 'danger';
   }
   $('main > div:nth-child(2) > div:first-child').append(
-    "<div class=\"alert alert-" + type + " alert-dismissible fade mt-3 show\" role=\"alert\">" +
-    message +
-    "<button aria-label=\"Close\" class=\"close\" data-dismiss=\"alert\" type=\"button\"><span aria-hidden=\"true\">×</span></button></div>");
+      '<div class="alert alert-' + type + ' alert-dismissible fade mt-3 show" role="alert">' +
+      message +
+      '<button aria-label="Close" class="close" data-dismiss="alert" type="button"><span aria-hidden="true">×</span></button></div>');
 }
+
+// Following makes BS tooltips work. See /views/layouts/application.html.haml
+$(function() {
+  $('[data-tooltip="tooltip"]').tooltip();
+  $('[data-toggle="tooltip"]').tooltip();
+});

data/app/controllers/concerns/remote_request_manager.rb

@@ -0,0 +1,46 @@
+module RemoteRequestManager
+  extend ActiveSupport::Concern
+
+  PATH_TO_JS_FILE = "shopapp/modal_errors"
+
+  included do
+  end
+
+  class_methods do
+  end
+
+  def redirect_remote_request(notice, args = {})
+    respond_to do |format|
+      format.html { redirect_to redirect_path(args), success: notice }
+      format.js do
+        flash[:success] = notice
+        render js: "window.location='#{redirect_path(args)}'"
+      end
+    end
+  end
+
+  def rescue_remote_request(error)
+    Rails.logger.error error.message
+    Rails.logger.error error.backtrace.join("\n")
+    if error.instance_of?(ActiveRecord::RecordInvalid)
+      respond_to_js(error.record.errors.messages)
+    else
+      respond_to_js(error)
+    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
+  end
+
+  def redirect_path(args)
+    args[:to].presence || request.referer || root_path
+  end
+end

data/app/helpers/shopapp3_form_helper.rb

@@ -0,0 +1,193 @@
+module Shopapp3FormHelper
+  def sf_text_field(f, tag, params = {})
+    unless params.key?(:label)
+      params[:label] = tag.to_s.capitalize
+    end
+    label_tag = f.label tag, params[:label] unless params[:label].nil?
+    input_tag = f.text_field tag,
+                             value: params[:value],
+                             placeholder: params[:placeholder],
+                             class: ["form-control", params[:class]].join(' '),
+                             required: params[:required],
+                             'aria-describedby' => "#{tag}_help",
+                             readonly: params[:readonly],
+                             onkeyup: params[:onkeyup],
+                             pattern: params[:pattern],
+                             title: params[:title]
+
+    <<~HTML.html_safe
+      <div class="form-group">
+        #{label_flag(tag, params)}
+        #{label_tag}
+        #{input_tag}
+        #{help_tag(tag, params)}
+        #{invalid_feedback(params)}
+      </div>
+    HTML
+  end
+
+  def label_flag(tag, params)
+    if params[:language].present?
+      render partial: 'shopapp/display_flag', locals: { language: params[:language], html_class: ""}
+    end
+  end
+
+  def sf_number_field(f, tag, params = {})
+    unless params.key?(:label)
+      params[:label] = tag.to_s.capitalize
+    end
+    label_tag = f.label tag, params[:label]
+    input_tag = f.number_field tag,
+                               value: params[:value],
+                               min: 0,
+                               placeholder: params[:placeholder],
+                               class: 'form-control',
+                               required: params[:required],
+                               'aria-describedby' => "#{tag}_help"
+
+    <<~HTML.html_safe
+      <div class="form-group">
+        #{label_tag}
+        #{input_tag}
+        #{help_tag(tag, params)}
+        #{invalid_feedback(params)}
+      </div>
+    HTML
+  end
+
+  def sf_checkbox(f, tag, params = {})
+    unless params.key?(:label)
+      params[:label] = tag.to_s.capitalize
+    end
+    label_tag = f.label tag,
+                value: params[:label],
+                class: 'form-check-label'
+    input_tag = f.check_box tag,
+                             value: params[:value],
+                             placeholder: params[:placeholder],
+                             class: 'form-check-input',
+                             required: params[:required],
+                             'aria-describedby' => "#{tag}_help",
+                             readonly: params[:readonly]
+
+    <<~HTML.html_safe
+      <div class="form-group form-check pt-2">
+        #{input_tag}
+        #{label_tag}
+        #{help_tag(tag, params)}
+        #{invalid_feedback(params)}
+      </div>
+    HTML
+  end
+
+  def sf_select(f, tag, params = {})
+    unless params.key?(:label)
+      params[:label] = tag.to_s.capitalize
+    end
+    label_tag = f.label tag, params[:label]
+    options_list = if params.key? :enum
+                     options_for_select(params[:enum].keys, params[:selected_value])
+                   elsif params.key? :list
+                     options_for_select(params[:list], params[:selected_value])
+                   else
+                     # we will impolement them as we go
+                     fail NotImplementedError
+                   end
+
+    select_tag = f.select tag,
+                          options_list,
+                          { include_blank: (params[:blank_option_title] || "Please select...") }.merge(params[:select_params].to_h),
+                          { class: "custom-select", required: params[:required] }.merge(params[:html_params].to_h)
+    help_tag = if params[:help].present?
+      %(<small class="form-text text-muted" id="#{tag}_help">#{params[:help]}</small>)
+    end
+
+    <<~HTML.html_safe
+      <div class="form-group">
+        #{label_tag}
+        #{select_tag}
+        #{help_tag(tag, params)}
+        #{invalid_feedback(params)}
+      </div>
+    HTML
+  end
+
+  def sf_submit(*params_numbered, **params)
+    rails ArgumentError unless params_numbered.count <= 1
+    params_numbered << 'Submit' if params_numbered.count < 1
+    # label = 'Submit'
+    %(<button name="#{params[:name]}" type="submit" class="btn btn-primary float-right ml-2 mt-3 #{params[:class]}">#{params_numbered[0]}</button>).html_safe
+  end
+
+  def sf_cancel(return_path, label = 'Cancel', params = {})
+    %(<a href="#{return_path}" class="btn btn-warning float-right ml-2 mt-3" role="button">#{label}</a>).html_safe
+  end
+
+  def sf_action(url, action_name = nil, text = nil, remote: true, method: :post, additional_classes: nil, form_class: nil, onclick: onclick)
+    action_name ||= :submit
+    button_to((text || action_name.to_s.humanize),
+              url,
+              {
+                form_class: (form_class || 'float-right mr-2'),
+                name: :button_action,
+                method: method,
+                remote: remote,
+                class: ["btn", additional_classes || 'btn-secondary'].join(' '),
+                data: { disable_with: "Please wait..." },
+                onclick: onclick,
+              }
+    )
+    #%button.btn.btn-danger.btn-sm Reject
+  end
+
+  def sf_model_validation(model)
+    if model.errors.any?
+      <<~HTML.html_safe
+        <div class="alert alert-danger">
+          <h5>#{pluralize(@product.errors.count, "error")} appeared in the form:</h5>
+          <ul>
+            #{model.errors.full_messages.map { |msg| "<li>#{msg}</li>" }.join}
+          <ul>
+        </div>
+      HTML
+    end
+  end
+
+  def sf_bool_value(value)
+      symbol = value ? 'check-outline' : 'close-outline'
+      mdi_tag "#{symbol} 24px"
+  end
+
+  # private helpers
+
+  def help_tag(tag, params)
+    if params[:help].present?
+      %(<small class="form-text text-muted" id="#{tag}_help">#{params[:help]}</small>)
+    end
+  end
+
+  def invalid_feedback(params)
+    if params[:invalid_feedback].present?
+      %(<div class="invalid-feedback">#{params[:invalid_feedback]}</div>)
+    end
+
+  end
+
+  def format_js_render_remote_response(destination_selector, partial, locals = {})
+    respond_to do |format|
+      format.js {
+        render_remote_response(destination_selector, partial, locals)
+      }
+    end
+  end
+
+  def render_remote_response(destination_selector, partial, locals = {})
+    status = locals[:status]
+    locals.delete :status
+    render :render_remote_response, status: status, locals: {
+      destination_selector: destination_selector,
+      partial: partial.to_s,
+      locals: locals
+    }
+  end
+end

data/app/views/shopapp/_display_flag.haml

@@ -0,0 +1,4 @@
+- if resolve_asset_path("flags/#{language}.png")
+  = image_tag "flags/#{language}.png", style: "height: 24; width: 24px;", class: html_class
+- else
+  %h3= language

data/app/views/shopapp/_modal_errors.haml

@@ -0,0 +1,15 @@
+#alert-container
+  - flash.keys.each do |f|
+    .alert.alert-dismissible.fade.show(class="alert-#{f.gsub('notice', 'info').gsub('alert', 'warning')}" role="alert")
+      -if flash[f].is_a? Hash
+        - flash[f].values.each do |flsh|
+          = "- #{flsh.first}"
+          %br
+          %button.close(type="button" data-dismiss="alert" aria-label="Close")
+            %span(aria-hidden="true")
+              = mdi_tag 'close 12px'
+      -else
+        = flash[f]
+        %button.close(type="button" data-dismiss="alert" aria-label="Close")
+          %span(aria-hidden="true")
+            = mdi_tag 'close 12px'

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

@@ -0,0 +1,5 @@
+$(".modal-errors").html(
+  "<%= escape_javascript(render partial: 'shopapp/modal_errors',
+                                locals: { flash: flash })
+   %>"
+);

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

@@ -0,0 +1,13 @@
+$("<%= destination_selector %>").html(
+    "<%= escape_javascript(render partial: partial,
+                                  locals: locals.except(:snackbar_message, :alert))
+     %>"
+  );
+
+<% if (locals[:snackbar_message]).present? %>
+  shopappSnackbar("<%=locals[:snackbar_message]%>");
+<% end %>
+
+<% if (locals[:alert]).present? %>
+  alert("<%=locals[:alert]%>");
+<% end %>

data/shopapp.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'shopapp'
-  s.version     = '0.2.70'
-  s.date        = '2019-10-08'
+  s.version     = '0.2.71'
+  s.date        = '2019-12-14'
   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.2.70
+  version: 0.2.71
 platform: ruby
 authors:
 - Zeljko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2019-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -411,6 +411,7 @@ files:
 - app/assets/stylesheets/variables.scss
 - app/controllers/api_controller.rb
 - app/controllers/auth_controller.rb
+- app/controllers/concerns/remote_request_manager.rb
 - app/controllers/concerns/shopapp3.rb
 - app/controllers/concerns/shoplift_client.rb
 - app/controllers/concerns/shoplift_search.rb
@@ -418,15 +419,20 @@ files:
 - app/controllers/user_authenticated_controller.rb
 - app/controllers/user_authenticated_or_api_controller.rb
 - app/helpers/euro_helper.rb
+- app/helpers/shopapp3_form_helper.rb
 - app/helpers/shopapp3_helper.rb
 - app/helpers/shopapp_helper.rb
 - app/views/layouts/_header_menu.html.haml
 - app/views/shopapp/403.html.haml
+- app/views/shopapp/_display_flag.haml
+- app/views/shopapp/_modal_errors.haml
 - app/views/shopapp/_shopapp.html.haml
 - app/views/shopapp/_shopapp2.html.haml
 - app/views/shopapp/_shopapp3.html.haml
 - app/views/shopapp/_shopapp_alerts.html.haml
 - app/views/shopapp/login_message.haml
+- app/views/shopapp/modal_errors.js.erb
+- app/views/shopapp/render_remote_response.js.erb
 - bin/shop
 - bin/shopitapp
 - config/initializers/active_settings.rb