incline 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2846685d579c97b8dea5676b5658caffc91c8ce
-  data.tar.gz: f72cb83c349d080073bab59993a94b936fbc903f
+  metadata.gz: 26b57eeb71154ecd78ca518cff42f4611b83039d
+  data.tar.gz: deaf5ce2ff1810f725b928d00aec489e80e63a76
 SHA512:
-  metadata.gz: f5afc6ca4f6a52f9cabba786848ba7e51c2f4550860ee18967517b65bbd22a599fc8c35fd55da6838b1135b20613ca2cda57f06ae18419a32e394f36c29ff5da
-  data.tar.gz: c9a5a3995188ff87793a9e5e9d40a44862697a943cde1e92ef1b8e06a44f8ac5a40fa778e6310bebf6cac401e315abb8ff6c4a6af727d602a20ef70365bdee62
+  metadata.gz: 0b1350992064923d07dbdd0de0257ebbe98f9bf308a62b5b35d3dbe36dfd9c90f905fb1b18d16009ba82b4ee7438eb090820c4c80424a3698bd240cb58a96917
+  data.tar.gz: 25bc635ab9533868136a17239a0141ab7922d74f814eb11a99de455055334b04cbcbf052cfab22b7906c9b88be7c08bcbf06f68498fec9cfae78acf6b40d7d0c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    incline (0.2.16)
+    incline (0.2.17)
       ansi (~> 1.5.0)
       bcrypt
       bootstrap-sass
@@ -58,7 +58,7 @@ GEM
       tzinfo (~> 1.1)
     ansi (1.5.0)
     arel (6.0.4)
-    autoprefixer-rails (7.1.4.1)
+    autoprefixer-rails (7.1.5)
       execjs
     bcrypt (3.1.11)
     bootstrap-sass (3.3.7)
@@ -140,7 +140,7 @@ GEM
     redcarpet (3.4.0)
     rubyserial (0.4.0)
       ffi (~> 1.9, >= 1.9.3)
-    sass (3.5.1)
+    sass (3.5.2)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)

data/app/models/incline/action_security.rb

@@ -109,20 +109,39 @@ module Incline
       @valid_items = nil if refresh
       @valid_items ||=
           begin
-            Incline::ActionSecurity.update_all(visible: false)
+            # remove all paths and set all items to hidden.
+            Incline::ActionSecurity.update_all(visible: false, path: '#')
 
             ret = Incline
                       .route_list
-                      .reject{|r| r[:action] == 'api'}
+                      .reject{|r| %w(api locate).include?(r[:action]) }
                       .map do |r|
+              
               item = ActionSecurity.find_or_initialize_by(controller_name: r[:controller], action_name: r[:action])
-              item.path = "#{r[:path]} [#{r[:verb]}]"
+              
+              # ensure the current path is set to the item.
+              item_path = "#{r[:path]} [#{r[:verb]}]"
+              if item.path == '#' || item.path.blank?
+                item.path = item_path
+                # only update the flags once if the path has not yet been set.
+                item.update_flags if update_flags
+              elsif !item.path.include?(item_path)
+                item.path += "\n" + item_path
+              end
+              
+              # re-sort the path list and make the item visible.
+              item.path = item.path.split("\n").sort.join("\n")
               item.visible = true
-              item.update_flags if update_flags
+              
               item.save!
               item
+            end.sort do |a,b|
+              if a.controller_name == b.controller_name
+                a.action_name <=> b.action_name
+              else
+                a.controller_name <=> b.controller_name
+              end
             end
-                      .sort{|a,b| a.controller_name == b.controller_name ? a.action_name <=> b.action_name : a.controller_name <=> b.controller_name}
 
             def ret.[](*args)
               if args.length == 2

data/app/views/incline/security/_list.html.erb

@@ -41,7 +41,17 @@
             {
               data: 'path',
               orderable: true,
-              searchable: true
+              searchable: true,
+              render: function(data, type, row, meta) {
+                if (type === 'display')
+                {
+                  return data.replace(/\n/g, '<br>');
+                }
+                else
+                {
+                  return data;
+                }
+              }
             },
             {
               data: 'controller_name',

data/lib/incline/version.rb

@@ -1,3 +1,3 @@
 module Incline
-  VERSION = "0.2.16"
+  VERSION = "0.2.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: incline
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - Beau Barker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails