friendly_routes 0.4.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 270cb4d5ebbc534560258c054aa5a9e919dac8b0
-  data.tar.gz: 9605c2f025439483bbf9bc12f35760f47052e7cc
+  metadata.gz: fe66cea5553050a8e5fd7aa79ea09a8b03ab2226
+  data.tar.gz: 795e61395c576e55426d68b8343ea231ac15b5c4
 SHA512:
-  metadata.gz: 22515c1fc10f0d2ec607306ae755ed1665d8e82acd592d40351a2c9f47d997853b9c3f284c56b651d6a72f4773c6e15cae974784f2e4d9ef5071bf9bf08e26b4
-  data.tar.gz: ba7ad4a6a9d9a8d854a83512a6f763e06c25b21594a0ca5a5da23f8c65a81c9a32fda6e60d00f1c10a2e87a16bda6688530f0e67b1ea94b4a746d7a8ff5bfe8c
+  metadata.gz: 11cd1edc4b0c4f38a00b04fc9e2a29fb403aad180e5e7a6ebe38a31d1df692ca656d7c9dab2e32c09492d4446d92bb5511d0056123b70b3b3abcd4686cbe2140
+  data.tar.gz: 928ba6f615b00d1fb5e8dada10c868bc95611492e6945366c0b33b48847dc3220fd7307f37b1796d10a6f33bb74d8071ec334085aceb5147349a37cc646da575

data/lib/friendly_routes/params/collection_params.rb

@@ -14,6 +14,7 @@ module FriendlyRoutes
         @collection = collection
         @key_attr = key_attr
         check_params
+        @collection_ids = collection.pluck(:id)
       end
 
       def constraints
@@ -28,17 +29,23 @@ module FriendlyRoutes
       end
 
       # (see Base#compose)
-      # @param [Integer] id id of collection member
+      # @param [Integer|Object] id_or_instance collection instance or it id
       # @return [String] member key attr
-      def compose(id)
-        @collection.find(id)[@key_attr]
+      def compose(id_or_instance)
+        instance = id_or_instance
+        instance = @collection.find(id_or_instance) unless instance.is_a?(ActiveRecord::Base)
+        instance[@key_attr]
       end
 
       # (see Base#allowed?)
-      # @param [Integer] id id of collection member
+      # @param [Integer|Object] id_or_instance collection instance or it id
       # @return [Boolean]
-      def allowed?(id)
-        @collection.find_by(id: id).present?
+      def allowed?(id_or_instance)
+        if id_or_instance.is_a?(@collection.class)
+          @collection_ids.includes?(id_or_instance.id)
+        else
+          @collection.find_by(id: id_or_instance).present?
+        end
       end
 
       private

data/lib/friendly_routes/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FriendlyRoutes
-  VERSION = '0.4.6'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_routes
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.0
 platform: ruby
 authors:
 - Roman Gritsay