incline 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d480afc97f1235565c6a453fc357d1a3055b3b0
-  data.tar.gz: 439acc31750a1a618f1255f3fcf6d4efaea31492
+  metadata.gz: 56411284e4d17a3c8427fcd363ab5a9a06ee7238
+  data.tar.gz: cadb63efd1172b4de4315f27ffb91313cc6c50f3
 SHA512:
-  metadata.gz: 3dd29096c66f7cf8678dee49f828fc9f0dfa79aa014837068fc1194ba031dc48ab915bf211344934e20cc495954a9267c9cea8837c609733d7b4d2b6ca16eddf
-  data.tar.gz: 2e9f293bdd559bf718ea385031de52c15683f3978613df97370712dd518c76e8bc1899347edd3cfc0cc33ae5d1b99d3f1968124d16a1b99ca38d3a2e5c183e96
+  metadata.gz: 04d13291b6afcfb36c51547322fa707c11776719d4224edc88a36c14f2b637eb77df7be9f55a0d31e60a99c31e3886994a32aa66a32b7c4431bd9baeb0a2627f
+  data.tar.gz: 606cb3af25ea7278e0fc578edc2aa959c11fd86d9affca6c40d16ad5ee2fe796482b6a285eb1353d40a6c87c8423d34f387210cdf45df3bd96cdd17a7ae3f5f3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    incline (0.2.18)
+    incline (0.2.19)
       ansi (~> 1.5.0)
       bcrypt
       bootstrap-sass

data/lib/incline/version.rb

@@ -1,3 +1,3 @@
 module Incline
-  VERSION = "0.2.18"
+  VERSION = "0.2.19"
 end

data/lib/incline.rb

@@ -126,11 +126,7 @@ module Incline
           get_routes(Rails.application.routes.routes).sort do |a,b|
             if a[:engine] == b[:engine]
               if a[:controller] == b[:controller]
-                if a[:action] == b[:action]
-                  a[:path] <=> b[:path]
-                else
-                  a[:action] <=> b[:action]
-                end
+                a[:action] <=> b[:action]
               else
                 a[:controller] <=> b[:controller]
               end
@@ -242,11 +238,13 @@ module Incline
     end
 
     result.inject([]) do |ret,item|
-      existing = ret.find{|r| r[:engine] == item[:engine] && r[:controller] == item[:controller] && r[:action] == item[:action]}
+      existing = ret.find{|r| r[:engine] == item[:engine] && r[:controller] == item[:controller] && r[:action] == item[:action] && r[:path] == item[:path]}
       if existing
-        existing[:verb] += '|' + item[:verb]
+        verbs = existing[:verb].split('|')
+        verbs << item[:verb] unless verbs.include?(item[:verb])
+        existing[:verb] += verbs.sort.join('|')
       else
-        ret << item
+        ret << item.dup
       end
       ret
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: incline
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - Beau Barker