shopapp 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a79004b05f353393d4787b77d4261599f671c2d722acd395260748d7f4e572a6
-  data.tar.gz: 740821d7b2e7ba2aec300ec2ec9ab5b5243032ad2d3bb7477adf85284f1e11c3
+  metadata.gz: e7358bcd191eca835a745a359c283c2c021a89578552c09b82fdecfcd44c2ca1
+  data.tar.gz: 8d1f82dfba08d9da9dd1a19d55db02b121ca65d5d904fe1ab5750d1b47184736
 SHA512:
-  metadata.gz: 7901c675fe62f1fb0edc6de6d13d77f3daeffefec6e37d2963ed63ad8650ae8c7c31654bb57e4583d5279df0aedfbea418175ceecfb72d55ab7ea16b77aa5914
-  data.tar.gz: a6f8880d72bbab944295f97633b408afc3c5e88fc403141168864b9154cc1be332bca2409ab6a0cf9837d0bc4a96b44890e9bce1cc110589f0fe609f4c1e7177
+  metadata.gz: 4767ee96a987c7000aa21f81a1084cb6851d120e19c16d144bd1b477dae3a75853d2126e9ca4f84ecf0b931962f7fe8c47ca478c4889b3d6d69940b16586f901
+  data.tar.gz: e9f323c0da1970f17c8bfcb27e4e7b5308cb2902fa83c90e1a5d7f9b9d5554b8351d57382282170f737e57f5eefd01192c0e18cd2055854b15b4e07749e939e4

data/app/controllers/concerns/shoplift_client.rb

@@ -9,6 +9,8 @@ module ShopliftClient
     attr_reader :api_key
     attr_reader :current_user
     attr_reader :current_company
+    attr_reader :do_hide_search_for_this_action
+    helper_method :company_logo_path_defined
   end
 
   class_methods do
@@ -18,6 +20,7 @@ module ShopliftClient
 
     def set_search_path(value)
       @search_path = value
+      return if @search_path == :current_path
       @search_path = "/#{@search_path}" unless @search_path[0] == '/'
       @search_path = "#{@search_path}/" unless @search_path[-1] == '/'
     end
@@ -34,6 +37,10 @@ module ShopliftClient
     end
   end
 
+  def hide_search_for_this_action
+    @do_hide_search_for_this_action = true
+  end
+
   def session_cookie
     session["authlift_session_id"]
   end
@@ -195,4 +202,12 @@ module ShopliftClient
                                   Rails.configuration.settings['authlift_app_secret'],
                                   site: Rails.configuration.settings['authlift_url']
   end
-end
+
+  def company_logo_path_defined
+    if  defined? self.company_logo_path
+      company_logo_path
+    else
+      "https://media.shoplift.fi/company_logos/#{@current_company.code}_company_logo_24.png"
+    end
+  end
+end

data/app/helpers/shopapp_helper.rb

@@ -43,4 +43,12 @@ module ShopappHelper
       </li>
     HTML
   end
+
+  def search_path
+    if controller.class.search_path == :current_path
+      request.path
+    else
+      "#{controller.class.search_path || '/'}"
+    end
+  end
 end

data/app/views/shopapp/_shopapp.html.haml

@@ -4,14 +4,14 @@
 %nav.navbar.navbar-dark.fixed-top.bg-dark.flex-md-nowrap.p-0.shadow.navbar-expand-md
   -#= link_to(Rails.configuration.settings['shopapp_name'], '/', class: 'navbar-brand col-3 col-md-2 mr-0')
   = link_to('/', class: 'navbar-brand col-3 col-md-2 mr-0') do
-    = image_tag "https://media.shoplift.fi/company_logos/#{@current_company.code}_company_logo_24.png", style: "padding-bottom: 3px;"
+    = image_tag company_logo_path_defined, style: "padding-bottom: 3px;"
     %span= Rails.configuration.settings['shopapp_name']
   %button.navbar-toggler(type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation")
     %span.navbar-toggler-icon
   #navbarSupportedContent.collapse.navbar-collapse.navbar-toggleable-xs
-    - unless controller.class.do_hide_search_for_this_controller
+    - unless controller.class.do_hide_search_for_this_controller || controller.do_hide_search_for_this_action
       .w-75.mx-md-auto.mt-4.mt-md-0.ml-3
-        %form(action="#{controller.class.search_path || '/'}")
+        %form(action=search_path)
           .input-group.input-group-sm
             %input#search.form-control(name="search" placeholder="Search" type="text" value=@search)
             .input-group-append

data/shopapp.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'shopapp'
-  s.version     = '0.2.6'
-  s.date        = '2018-09-13'
+  s.version     = '0.2.7'
+  s.date        = '2018-09-25'
   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.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Zeljko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-13 00:00:00.000000000 Z
+date: 2018-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties