notable_web 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06f7f35d20e1ddd65c7e23f32c020cfad761592c4bf43fabdc33b574426ad331
-  data.tar.gz: 64192bf25aa8dac121da8f6946ae56013096b09d5030bfea1320c5050e669282
+  metadata.gz: 83db2dcf6fc00691e60ca86c55c4b03e5817360d413ecc3220dd23719e2b2ed4
+  data.tar.gz: 93f464e993be043de1b36928e9607dd192c17ce464dfe21f67092e2e790e2ac4
 SHA512:
-  metadata.gz: 57aaa64c33a5fde0dc5dd582ba42cb952dfbd15774ed8e736bc0aea128ccb73f4e39402c54f2561516883f38309c2946adcfb8f4f2711474626b90df452910cc
-  data.tar.gz: 81db2475ebb56425ac0380fba3c354e7a3cd80d0bf6b54291be80f2e650bcbd2109a6c92c48cabc567cab3f4ce5aa1a3c4f5ec8e972a27c0d2a94498688e6388
+  metadata.gz: fae7b69eb9cace5dc38a9df81364b8b6728c41e4468e7b72f1fbc9d8be5a62aa6a2dac258ba83a77ba9872ae8ac06bd850aff16c64ebd6ab60f28f9900bf073d
+  data.tar.gz: b701d080fef88f746e613a4416e1712904d3edd7704d1778e2823b1e30c258b3f48139b8eaa7ac6cddb4582472665c7225c0c15a5904c4ea7d552147fe007a64

data/CHANGELOG.md

@@ -1,12 +1,16 @@
-## 0.1.1
+## 0.1.2 (2019-12-23)
+
+- Fixed error with Rails 6
+
+## 0.1.1 (2019-10-27)
 
 - Added support for Sprockets 4
 
-## 0.1.0
+## 0.1.0 (2019-05-28)
 
 - Fixed errors with Rails 5 and 6
 - Dropped support for Rails < 5
 
-## 0.0.1
+## 0.0.1 (2014-12-22)
 
 - First release

data/app/controllers/notable_web/home_controller.rb

@@ -7,9 +7,7 @@ module NotableWeb
     http_basic_authenticate_with name: ENV["NOTABLE_USERNAME"], password: ENV["NOTABLE_PASSWORD"] if ENV["NOTABLE_PASSWORD"]
 
     def index
-      @safe_params = params.slice(:status, :note_type, :note, :user_id, :user_type, :action_name, :status, :scope).permit!.to_h
-
-      where = @safe_params.slice(:status, :note_type, :note, :user_id, :user_type)
+      where = safe_params.slice(:status, :note_type, :note, :user_id, :user_type)
       where = {notable_requests: where} if where.any?
 
       page_method_name = Kaminari.config.page_method_name
@@ -71,5 +69,9 @@ module NotableWeb
       Notable::Request.where("action IS NOT NULL AND (status = 503 OR note_type = 'Slow Request')")
     end
 
+    def safe_params
+      params.slice(:status, :note_type, :note, :user_id, :user_type, :action_name, :status, :scope).permit!.to_h
+    end
+    helper_method :safe_params
   end
 end

data/app/views/notable_web/home/_stream.html.erb

@@ -11,7 +11,7 @@
         <%= request.note %>
         <span style="color: #999;"><%= request.action %></span>
         <% if request.user and show_user %>
-          <%= link_to NotableWeb.user_name_method.call(request.user), params.slice(:status, :note_type, :scope).merge(user_id: request.user_id, user_type: request.user_type) %>
+          <%= link_to NotableWeb.user_name_method.call(request.user), safe_params.slice(:status, :note_type, :scope).merge(user_id: request.user_id, user_type: request.user_type) %>
         <% end %>
         <% if params[:scope] == "referrer" %>
           <br /><%= link_to nil, request.referrer, target: "_blank" %>

data/app/views/notable_web/home/index.html.erb

@@ -14,7 +14,7 @@
         <tr>
           <td>
             <%= agg.note %> <span style="color: #999;"><%= agg.action %></span>
-            <%= link_to "view", @safe_params.merge(note: agg.note, action_name: agg.action) %>
+            <%= link_to "view", safe_params.merge(note: agg.note, action_name: agg.action) %>
           </td>
           <td style="text-align: right;"><%= agg.count_user %></td>
           <td style="text-align: right;"><%= agg.count_all %></td>
@@ -31,8 +31,8 @@
 <%= render partial: "stream", locals: {requests: @requests, show_user: !(params[:user_id] && params[:user_type])} %>
 
 <% if @requests.current_page != 1 %>
-  <%= link_to "Prev", @safe_params.merge(page: @requests.current_page - 1), style: "margin-right: 20px;" %>
+  <%= link_to "Prev", safe_params.merge(page: @requests.current_page - 1), style: "margin-right: 20px;" %>
 <% end %>
 <% if @requests.size == @requests.limit_value %>
-  <%= link_to "Next", @safe_params.merge(page: @requests.current_page + 1) %>
+  <%= link_to "Next", safe_params.merge(page: @requests.current_page + 1) %>
 <% end %>

data/lib/notable_web/version.rb

@@ -1,3 +1,3 @@
 module NotableWeb
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notable_web
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2019-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties