shopapp 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20d46c43bba283b3d2a3abda46048b8b0e55f1c1f73070f84c2af1ec1b84d5c5
-  data.tar.gz: 320def0a006db8f0d21388a31c1dcd1df78d51c307d5c639af1a94630ab4d99b
+  metadata.gz: 1efb4ab69d027b53cc22882935a5c376247a8884612e842b2d47f3c55cbcc6b3
+  data.tar.gz: 4e8474a4232daac45e29f069ab23e68db9f4d44de01c3d6505d6b182ace8b69f
 SHA512:
-  metadata.gz: 6b1843c4265d331d351da3f35e3d9b10d14cfb8b7400a0519bf8cb6d8986ac8139ec5af3eeba6988b86d8063fee1dee1881ac5594ac7621df3e7c0b559b2fa75
-  data.tar.gz: 1694787c6c6b52cded3499723e38883f24181dadbbe3c499851b436718a9e8e30618078a45b59bc5b02bfb82466ba05080048e4a38796d55aa85df5e8fde3f91
+  metadata.gz: 3a296df9c3ce2d60d9ddf1c1c779f232f73bc9aca5acaae37609136c7e72358f8e9bc68fb96da7d69ca9548f9fcdcd078954469d4de240036bc9288587a8ef7b
+  data.tar.gz: 8afc7bd7b044c24085ecf96c190f610de546418959a0a363327ee0e4ef27c3c8eaa5bb8d1a722b04317e0e6ad711d5ee0890be631c8543ebd70db348053bad90

data/app/controllers/concerns/shoplift_client.rb

@@ -97,7 +97,11 @@ module ShopliftClient
       begin
         x = srv.get '/api/users/profile'
         @current_user_json_hash = @current_user = JSON.parse x.response.body
-        user_scopes = JSON.parse @current_user['scopes']
+        unless @current_user['scopes'].is_a? String
+          user_scopes = @current_user['scopes']
+        else
+          user_scopes = JSON.parse @current_user['scopes']
+        end
         unless user_scopes.include? 'admin'
           (self.class.required_scopes || []).each do |required_scope|
             unless user_scopes.include? required_scope

data/app/helpers/shopapp_helper.rb

@@ -1,6 +1,10 @@
 module ShopappHelper
   def user_allowed?(scope)
-    user_scopes = JSON.parse @current_user['scopes']
+    unless @current_user['scopes'].is_a? String
+      user_scopes = @current_user['scopes']
+    else
+      user_scopes = JSON.parse @current_user['scopes']
+    end
     user_scopes.include?('admin') || user_scopes.include?(scope.to_s)
   end
 

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

@@ -47,8 +47,16 @@
         .sidebar-sticky
           = render 'layouts/sidebar'
       %main.col-md-10.ml-sm-auto.col-lg-10.px-4.mt-2{:role => "main"}
+        - if notice
+          .alert.alert-secondary.mt-3(role="alert")= notice
+        - if alert
+          .alert.alert-danger.mt-3(role="alert")= alert
         = yield
   - else
     .row
       %main.col.px-4.mt-2{:role => "main"}
+        - if notice
+          .alert.alert-secondary.mt-3(role="alert")= notice
+        - if alert
+          .alert.alert-danger.mt-3(role="alert")= alert
         = yield

data/shopapp.gemspec

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