monarchy 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4734b0ccb0db7937722f2fa64a0bbe4d47c65cb7
-  data.tar.gz: f7b5fa3002944a30b7eba6e2404c958c4c0762d9
+  metadata.gz: c15282927b5b58ca3da1c4102405a299faa6e6a9
+  data.tar.gz: 0ad457f343ef448dbede073ade8fe820011b13dc
 SHA512:
-  metadata.gz: 9f3aa4a7caa467471faa25ff5ed132db52f9c4c82f21786f3191a8d9ad0ebdca134a55cc1bd6927bee27c208cd04bbc0b5716c256d9aa9183ef3246f574524d5
-  data.tar.gz: 40faced1c717c0329ea1ce5da56c533ed309e05baac0d3df4e36fec148633c5959775c619fcaf06dbb1738f0704f163f1964b4e8c6296c6444fc5afb8ade4690
+  metadata.gz: 79f77cba2b572d85260f640727bdca9dc6f3b53d80e72e5cab50e2f48f5584a19ed03d31d0d1e2128e0c3b66ea366e0a923c8541f606bb13e3e616ba22c571e7
+  data.tar.gz: ea747c578065b293e644d3b4ef982a9b6b62c21e50636895a39ed5898779ef217d0fbf1e72205fe3bf9fb5a464744b89bd02b49c943effa164e3cd13d90d1898

data/.github_changelog_generator

@@ -1 +1 @@
-future-release=2.1.0
+future-release=2.2.1

data/CHANGELOG.md

@@ -1,7 +1,30 @@
 # Change Log
 
-## [2.1.0](https://github.com/Exelord/Monarchy/tree/2.1.0) (2017-03-30)
-[Full Changelog](https://github.com/Exelord/Monarchy/compare/v2.0.8...2.1.0)
+## [2.2.1](https://github.com/Exelord/Monarchy/tree/2.2.1) (2017-05-29)
+[Full Changelog](https://github.com/Exelord/Monarchy/compare/v2.2.0...2.2.1)
+
+**Merged pull requests:**
+
+- Fix potential n-query [\#74](https://github.com/Exelord/Monarchy/pull/74) ([Exelord](https://github.com/Exelord))
+
+## [v2.2.0](https://github.com/Exelord/Monarchy/tree/v2.2.0) (2017-04-14)
+[Full Changelog](https://github.com/Exelord/Monarchy/compare/v2.1.0...v2.2.0)
+
+**Merged pull requests:**
+
+- Feature model accessible for [\#72](https://github.com/Exelord/Monarchy/pull/72) ([Exelord](https://github.com/Exelord))
+- Update gems [\#71](https://github.com/Exelord/Monarchy/pull/71) ([Exelord](https://github.com/Exelord))
+
+## [v2.1.0](https://github.com/Exelord/Monarchy/tree/v2.1.0) (2017-03-30)
+[Full Changelog](https://github.com/Exelord/Monarchy/compare/v2.0.8...v2.1.0)
+
+**Fixed bugs:**
+
+- Fix roles order [\#63](https://github.com/Exelord/Monarchy/pull/63) ([Exelord](https://github.com/Exelord))
+
+**Closed issues:**
+
+- Improve performance [\#59](https://github.com/Exelord/Monarchy/issues/59)
 
 **Merged pull requests:**
 
@@ -27,10 +50,6 @@
 ## [v2.0.6](https://github.com/Exelord/Monarchy/tree/v2.0.6) (2016-11-29)
 [Full Changelog](https://github.com/Exelord/Monarchy/compare/v2.0.5...v2.0.6)
 
-**Fixed bugs:**
-
-- Fix roles order [\#63](https://github.com/Exelord/Monarchy/pull/63) ([Exelord](https://github.com/Exelord))
-
 ## [v2.0.5](https://github.com/Exelord/Monarchy/tree/v2.0.5) (2016-11-10)
 [Full Changelog](https://github.com/Exelord/Monarchy/compare/v2.0.4...v2.0.5)
 
@@ -44,7 +63,6 @@
 
 **Closed issues:**
 
-- Improve performance [\#59](https://github.com/Exelord/Monarchy/issues/59)
 - Default role - is it still needed? [\#48](https://github.com/Exelord/Monarchy/issues/48)
 - Complete Readme and WIKI [\#5](https://github.com/Exelord/Monarchy/issues/5)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    monarchy (2.2.0)
+    monarchy (2.2.1)
       active_record_union (= 1.2.0)
       activerecord (>= 4.2.7.1)
       closure_tree (= 6.5.0)

data/lib/monarchy/acts_as_user.rb

@@ -63,7 +63,8 @@ module Monarchy
       private
 
       def accessible_roles_for(resource, inheritnce)
-        return Monarchy.role_class.none unless resource.hierarchy
+        return Monarchy.role_class.none unless resource.persisted?
+
         accessible_roles = if inheritnce
                              resource_and_inheritance_roles(resource)
                            else
@@ -75,29 +76,32 @@ module Monarchy
       end
 
       def resource_and_inheritance_roles(resource)
-        hierarchy_ids = resource.hierarchy.ancestors.select(:id)
-
         Monarchy.role_class.where(id:
           Monarchy.role_class
             .joins('INNER JOIN monarchy_members_roles ON monarchy_roles.id = monarchy_members_roles.role_id')
             .joins("INNER JOIN (SELECT id, hierarchy_id FROM monarchy_members WHERE user_id = #{id}) as " \
               'monarchy_members ON monarchy_members.id = monarchy_members_roles.member_id')
             .where('monarchy_roles.inherited': 't')
-            .where('monarchy_members.hierarchy_id': hierarchy_ids)
+            .where('monarchy_members.hierarchy_id': ancestors_for(resource).select(:id))
             .select('monarchy_roles.inherited_role_id'))
                 .union(resource_roles(resource))
       end
 
       def resource_roles(resource)
+        resource_hierarchy = hierarchies_for(resource).select(:id)
+
+        user_memberships = Monarchy.member_class
+                                   .where(hierarchy_id: resource_hierarchy, user_id: id)
+                                   .select(:id, :hierarchy_id).to_sql
+
         Monarchy.role_class
                 .joins('INNER JOIN monarchy_members_roles ON monarchy_roles.id = monarchy_members_roles.role_id')
-                .joins('INNER JOIN (SELECT id, hierarchy_id FROM monarchy_members WHERE ' \
-                  "hierarchy_id = #{resource.hierarchy.id} AND user_id = #{id}) as monarchy_members ON " \
+                .joins("INNER JOIN (#{user_memberships}) as monarchy_members ON " \
                   'monarchy_members.id = monarchy_members_roles.member_id')
       end
 
       def descendant_role(resource)
-        descendants = resource.hierarchy.descendants
+        descendants = descendants_for(resource)
         children_access = members_for(descendants).present?
 
         if children_access
@@ -148,12 +152,38 @@ module Monarchy
         member
       end
 
+      def inherited_default_role
+        @inherited_default_role ||= Monarchy.role_class.find_by(name: Monarchy.configuration.inherited_default_role)
+      end
+
+      # TODO: Make these methods public in related interfaces
+
       def members_for(hierarchies)
         Monarchy.member_class.where(hierarchy: hierarchies, user_id: id)
       end
 
-      def inherited_default_role
-        @inherited_default_role ||= Monarchy.role_class.find_by(name: Monarchy.configuration.inherited_default_role)
+      def hierarchies_for(resources)
+        Monarchy.hierarchy_class.where(resource: resources)
+      end
+
+      def descendants_for(resources)
+        resources_hierarchies = hierarchies_for(resources).select(:id)
+
+        Monarchy.hierarchy_class
+                .joins('INNER JOIN monarchy_hierarchy_hierarchies ON ' \
+                  'monarchy_hierarchies.id = monarchy_hierarchy_hierarchies.descendant_id')
+                .where(monarchy_hierarchy_hierarchies: { ancestor_id: resources_hierarchies })
+                .where.not(monarchy_hierarchies: { id: resources_hierarchies })
+      end
+
+      def ancestors_for(resources)
+        resources_hierarchies = hierarchies_for(resources).select(:id)
+
+        Monarchy.hierarchy_class
+                .joins('INNER JOIN monarchy_hierarchy_hierarchies ON ' \
+                  'monarchy_hierarchies.id = monarchy_hierarchy_hierarchies.ancestor_id')
+                .where(monarchy_hierarchy_hierarchies: { descendant_id: resources_hierarchies })
+                .where.not(monarchy_hierarchies: { id: resources_hierarchies })
       end
     end
   end

data/lib/monarchy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Monarchy
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monarchy
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Exelord
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-14 00:00:00.000000000 Z
+date: 2017-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord