monarchy 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: addca284a9a12f9d545fbf43ebf3de15908a6618
-  data.tar.gz: ba69a2d1eb4a11dff1a6ad294c9d2469b653d5f8
+  metadata.gz: 387d2b45a06426e506849cb93e65233de8eb28f2
+  data.tar.gz: 7d5bc881940cb9b75831e01fee258a30409bd277
 SHA512:
-  metadata.gz: b0b5d0651fc8ea7b1bcf4e77bb532304fac7a3d695093510fcf11e2115bcc98ea2cc4a22b05bf1df6796a204bccaa63b74b21b6365f3804762f87fd6d15d0102
-  data.tar.gz: 7184060eb920b6323dfbe85ffac7e2f8725907c458be8f9691c6b305bf5443c4e74ec686bb101b7accd1bcfd4eb1a715fdc28402eeee2c6fed13175897bde2a8
+  metadata.gz: d3254e9c61cce95221d874bbce2b4f62857f504ba0442f079a24e59d1f37b75f97121482cc2806ee89e9563a6ad8d064b3597a16399312d393c8d3ca34549975
+  data.tar.gz: 791954cbe20ab2d4bbb7ac3c9ebd0a26d1ca7252a8a5e5b265cbfd65303b94adfbe86ee18950c9862a6e43883d98be1b2253819cc46d8b021eb8d2d94ddb14aa

data/.github_changelog_generator

@@ -1 +1 @@
-future-release=2.0.6
+future-release=2.0.7

data/CHANGELOG.md

@@ -1,7 +1,16 @@
 # Change Log
 
-## [2.0.6](https://github.com/Exelord/Monarchy/tree/2.0.6) (2016-11-29)
-[Full Changelog](https://github.com/Exelord/Monarchy/compare/v2.0.5...2.0.6)
+## [2.0.7](https://github.com/Exelord/Monarchy/tree/2.0.7) (2017-01-09)
+[Full Changelog](https://github.com/Exelord/Monarchy/compare/v2.0.6...2.0.7)
+
+**Merged pull requests:**
+
+- Improve coverage [\#66](https://github.com/Exelord/Monarchy/pull/66) ([Exelord](https://github.com/Exelord))
+- Update gems [\#65](https://github.com/Exelord/Monarchy/pull/65) ([Exelord](https://github.com/Exelord))
+- Feature custom inherited roles [\#64](https://github.com/Exelord/Monarchy/pull/64) ([Exelord](https://github.com/Exelord))
+
+## [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:**
 

data/Gemfile

@@ -16,17 +16,17 @@ gemspec
 # gem 'byebug', group: [:development, :test]
 
 group :development, :test do
-  gem 'sqlite3', '1.3.12'
-  gem 'rubocop', '0.43.0'
+  gem 'database_cleaner', '1.5.3'
+  gem 'factory_girl_rails', '4.8.0'
+  gem 'ffaker', '2.4.0'
   gem 'pry-rails', '0.3.4'
-  gem 'shoulda-matchers', '3.1.1'
+  gem 'rails', '5.0.1'
   gem 'rspec-rails', '3.5.2'
-  gem 'factory_girl_rails', '4.7.0'
-  gem 'ffaker', '2.2.0'
-  gem 'database_cleaner', '1.5.3'
+  gem 'rubocop', '0.46.0'
+  gem 'shoulda-matchers', '3.1.1'
+  gem 'sqlite3', '1.3.13'
   gem 'tqdm', '0.3.0'
-  gem 'rails', '5.0.0.1'
 end
 
+gem 'codeclimate-test-reporter', '1.0.4', group: :test
 gem 'simplecov', '0.12.0', group: :test
-gem 'codeclimate-test-reporter', '1.0.0', group: :test

data/Gemfile.lock

@@ -1,51 +1,51 @@
 PATH
   remote: .
   specs:
-    monarchy (2.0.6)
+    monarchy (2.0.7)
       active_record_union (= 1.2.0)
       activerecord (>= 4.2.7.1)
       closure_tree (= 6.2.0)
-      configurations (= 2.2.1)
+      configurations (= 2.2.2)
       tqdm (= 0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.0.1)
-      actionpack (= 5.0.0.1)
+    actioncable (5.0.1)
+      actionpack (= 5.0.1)
       nio4r (~> 1.2)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.0.1)
-      actionpack (= 5.0.0.1)
-      actionview (= 5.0.0.1)
-      activejob (= 5.0.0.1)
+    actionmailer (5.0.1)
+      actionpack (= 5.0.1)
+      actionview (= 5.0.1)
+      activejob (= 5.0.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.0.1)
-      actionview (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    actionpack (5.0.1)
+      actionview (= 5.0.1)
+      activesupport (= 5.0.1)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.0.1)
-      activesupport (= 5.0.0.1)
+    actionview (5.0.1)
+      activesupport (= 5.0.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     active_record_union (1.2.0)
       activerecord (>= 4.0)
-    activejob (5.0.0.1)
-      activesupport (= 5.0.0.1)
+    activejob (5.0.1)
+      activesupport (= 5.0.1)
       globalid (>= 0.3.6)
-    activemodel (5.0.0.1)
-      activesupport (= 5.0.0.1)
-    activerecord (5.0.0.1)
-      activemodel (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    activemodel (5.0.1)
+      activesupport (= 5.0.1)
+    activerecord (5.0.1)
+      activemodel (= 5.0.1)
+      activesupport (= 5.0.1)
       arel (~> 7.0)
-    activesupport (5.0.0.1)
+    activesupport (5.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -56,20 +56,21 @@ GEM
     closure_tree (6.2.0)
       activerecord (>= 4.1.0)
       with_advisory_lock (>= 3.0.0)
-    codeclimate-test-reporter (1.0.0)
+    codeclimate-test-reporter (1.0.4)
+      simplecov
     coderay (1.1.1)
-    concurrent-ruby (1.0.2)
-    configurations (2.2.1)
+    concurrent-ruby (1.0.4)
+    configurations (2.2.2)
     database_cleaner (1.5.3)
     diff-lcs (1.2.5)
     docile (1.1.5)
     erubis (2.7.0)
-    factory_girl (4.7.0)
+    factory_girl (4.8.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.7.0)
-      factory_girl (~> 4.7.0)
+    factory_girl_rails (4.8.0)
+      factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
-    ffaker (2.2.0)
+    ffaker (2.4.0)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
@@ -83,11 +84,11 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.9.1)
+    minitest (5.10.1)
     nio4r (1.2.1)
-    nokogiri (1.6.8.1)
+    nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
-    parser (2.3.1.4)
+    parser (2.3.3.1)
       ast (~> 2.2)
     powerpack (0.1.1)
     pry (0.10.4)
@@ -99,31 +100,31 @@ GEM
     rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.0.1)
-      actioncable (= 5.0.0.1)
-      actionmailer (= 5.0.0.1)
-      actionpack (= 5.0.0.1)
-      actionview (= 5.0.0.1)
-      activejob (= 5.0.0.1)
-      activemodel (= 5.0.0.1)
-      activerecord (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    rails (5.0.1)
+      actioncable (= 5.0.1)
+      actionmailer (= 5.0.1)
+      actionpack (= 5.0.1)
+      actionview (= 5.0.1)
+      activejob (= 5.0.1)
+      activemodel (= 5.0.1)
+      activerecord (= 5.0.1)
+      activesupport (= 5.0.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.0.1)
+      railties (= 5.0.1)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.1)
+    rails-dom-testing (2.0.2)
       activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.0.1)
-      actionpack (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    railties (5.0.1)
+      actionpack (= 5.0.1)
+      activesupport (= 5.0.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.1.0)
-    rake (11.3.0)
+    rainbow (2.2.1)
+    rake (12.0.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -145,7 +146,7 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.43.0)
+    rubocop (0.46.0)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -160,20 +161,20 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    sprockets (3.7.0)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.12)
-    thor (0.19.1)
+    sqlite3 (1.3.13)
+    thor (0.19.4)
     thread_safe (0.3.5)
     tqdm (0.3.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unicode-display_width (1.1.1)
+    unicode-display_width (1.1.2)
     websocket-driver (0.6.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
@@ -186,24 +187,24 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.12)
-  codeclimate-test-reporter (= 1.0.0)
+  codeclimate-test-reporter (= 1.0.4)
   database_cleaner (= 1.5.3)
-  factory_girl_rails (= 4.7.0)
-  ffaker (= 2.2.0)
+  factory_girl_rails (= 4.8.0)
+  ffaker (= 2.4.0)
   monarchy!
   pry-rails (= 0.3.4)
-  rails (= 5.0.0.1)
-  rake (~> 11.3)
+  rails (= 5.0.1)
+  rake (~> 12.0)
   rspec (= 3.5.0)
   rspec-rails (= 3.5.2)
-  rubocop (= 0.43.0)
+  rubocop (= 0.46.0)
   shoulda-matchers (= 3.1.1)
   simplecov (= 0.12.0)
-  sqlite3 (= 1.3.12)
+  sqlite3 (= 1.3.13)
   tqdm (= 0.3.0)
 
 RUBY VERSION
    ruby 2.3.1p112
 
 BUNDLED WITH
-   1.13.6
+   1.13.7

data/README.md

@@ -17,12 +17,11 @@
   </a>
 </p>
 
-Monarchy is a ruby gem offering a complete solution to manage an access in your web application.
-Hierarchical structure and built-in roles inheritance options make it the most powerful tool to control an access to your resources.
+Monarchy is a ruby gem offering a complete solution to manage an authorization access in Ruby on Rails applications. A hierarchical structure as well as built-in roles inheritance options make it the most powerful tool to control access to application data resources.
 
-Thanks to [closure_tree](https://github.com/mceachen/closure_tree), Monarchy can deliver the best in class algorithmic performance and allows you to forget about hierarchies and complicated structures.
+Thanks to [closure_tree](https://github.com/mceachen/closure_tree) - a gem used to manage binary trees - Monarchy can deliver the best-in-class algorithmic performance and enables developers to forget about hierarchies and complicated structures.
 
-It is like a [rolify](https://github.com/RolifyCommunity/rolify) but with advanced possibilities to inherit roles and collect all accessible resources with just one method.
+If you feel limited while using rolify, feel free to use Monarchy with its advanced capacity to inherit roles and collect all accessible resources with just one method.
 
 ## Usage Example
 After Monarchy setup you can enjoy with roles inheritance and accessible resources.

data/docs/acts_as_hierarchy.md

@@ -16,6 +16,10 @@ You can select all hierarchies accessible for specific user by using a scope: `a
 ``` ruby
 Monarchy.hierarchy_class.accessible_for(current_user)   # returns [hierarchy1, hierarchy2, hierarchy5]
 ```
+Optionally you can pass extra allowed roles which should be inherited for this request
+``` ruby
+Monarchy.hierarchy_class.accessible_for(current_user, [:blocked, :visitors])   # returns [hierarchy1, hierarchy2, hierarchy5, hierarchy6]
+```
 
 ### .in(resource, true)
 You can select all hierarchies scoped into another by using scope: `in`:

data/docs/acts_as_resource.md

@@ -69,6 +69,10 @@ You can select all resources accessible for specyfic user by using scope: `acces
 ``` ruby
 Resource.accessible_for(current_user)   # returns [resource1, resource2, resource5]
 ```
+Optionally you can pass extra allowed roles which should be inherited for this request
+``` ruby
+Resource.accessible_for(current_user, [:blocked, :visitors])   # returns [resource1, resource2, resource5, resource6]
+```
 
 ### .in(resource, true)
 You can select all resources scoped into another by using scope: `in`:

data/lib/monarchy/acts_as_hierarchy.rb

@@ -29,10 +29,10 @@ module Monarchy
           where(id: descendants ? hierarchy.descendants : hierarchy.children)
         end)
 
-        scope :accessible_for, (lambda do |user|
+        scope :accessible_for, (lambda do |user, inherited_roles = []|
           Monarchy::Validators.user(user)
           user_id = user.id
-          where(id: accessible_roots_ids(user_id).union_all(accessible_leaves_ids(user_id)))
+          where(id: accessible_roots_ids(user_id).union_all(accessible_leaves_ids(user_id, inherited_roles)))
         end)
       end
 
@@ -44,30 +44,37 @@ module Monarchy
                 'members.hierarchy_id = monarchy_hierarchy_hierarchies.descendant_id').select(:id)
       end
 
-      def accessible_leaves_ids(user_id)
-        ancestor_leaves_for_user(user_id)
+      def accessible_leaves_ids(user_id, inherited_roles = [])
+        ancestor_leaves_for_user(user_id, false)
           .select('monarchy_hierarchy_hierarchies.ancestor_id AS id')
-          .union_all(descendant_leaves_for_user(user_id)).select(:id)
+          .union_all(descendant_leaves_for_user(user_id, inherited_roles)).select(:id)
       end
 
-      def ancestor_leaves_for_user(user_id, inherited = false)
-        inherited = inherited ? 't' : 'f'
+      def descendant_leaves_for_user(user_id, inherited_roles = [])
+        ancestor_leaves_for_user(user_id, true, inherited_roles)
+          .joins('INNER JOIN monarchy_hierarchy_hierarchies AS monarchy_descendants ON ' \
+            'monarchy_descendants.ancestor_id = monarchy_hierarchies.id')
+          .select('monarchy_descendants.descendant_id AS id')
+      end
 
+      def ancestor_leaves_for_user(user_id, inherited, inherited_roles = [])
         unscoped
           .joins('INNER JOIN monarchy_hierarchy_hierarchies ON ' \
             'monarchy_hierarchies.id = monarchy_hierarchy_hierarchies.descendant_id')
           .joins('INNER JOIN (SELECT id, hierarchy_id FROM monarchy_members WHERE ' \
             "user_id = #{user_id}) as monarchy_members ON monarchy_members.hierarchy_id = monarchy_hierarchies.id")
           .joins('INNER JOIN monarchy_members_roles ON monarchy_members_roles.member_id = monarchy_members.id')
-          .joins("INNER JOIN (SELECT id, inherited FROM monarchy_roles WHERE inherited = '#{inherited}') as " \
+          .joins("INNER JOIN (#{inheritance_query(inherited_roles, inherited)}) as " \
             'monarchy_roles ON monarchy_members_roles.role_id = monarchy_roles.id')
       end
 
-      def descendant_leaves_for_user(user_id)
-        ancestor_leaves_for_user(user_id, true)
-          .joins('INNER JOIN monarchy_hierarchy_hierarchies AS monarchy_descendants ON ' \
-            'monarchy_descendants.ancestor_id = monarchy_hierarchies.id')
-          .select('monarchy_descendants.descendant_id AS id')
+      def inheritance_query(inherited_roles, inherited)
+        if inherited_roles.present?
+          Monarchy.role_class.select(:id, :inherited, :name)
+                  .where('inherited = ? OR name IN (?)', inherited, inherited_roles).to_sql
+        else
+          Monarchy.role_class.select(:id, :inherited).where(inherited: inherited).to_sql
+        end
       end
     end
   end

data/lib/monarchy/acts_as_resource.rb

@@ -51,8 +51,9 @@ module Monarchy
           joins(:hierarchy).where(monarchy_hierarchies: { id: hierarchies })
         end)
 
-        scope :accessible_for, (lambda do |user|
-          joins(:hierarchy).where(monarchy_hierarchies: { id: Monarchy.hierarchy_class.accessible_for(user) })
+        scope :accessible_for, (lambda do |user, inherited_roles = []|
+          joins(:hierarchy).where(monarchy_hierarchies: { id: Monarchy.hierarchy_class
+                                                                      .accessible_for(user, inherited_roles) })
         end)
       end
 
@@ -84,11 +85,13 @@ module Monarchy
       end
 
       def ensure_hierarchy(force = false)
+        return nil unless self.class.automatic_hierarchy || force
+
         self.hierarchy ||= Monarchy.hierarchy_class.create(
           resource: self,
           parent: parent.try(:hierarchy),
           children: hierarchies_for(children)
-        ) if self.class.automatic_hierarchy || force
+        )
       end
 
       private

data/lib/monarchy/acts_as_user.rb

@@ -9,8 +9,7 @@ module Monarchy
         has_many :hierarchies, through: :members, class_name: "::#{Monarchy.hierarchy_class}"
 
         scope :accessible_for, (lambda do |user|
-          where(id: Monarchy.hierarchy_class.accessible_for(user)
-                                       .joins(members: [:user]).select(:user_id)).union(where(id: user.id))
+          where(id: Monarchy.member_class.accessible_for(user).select('user_id AS id')).union(where(id: user.id))
         end)
 
         include Monarchy::ActsAsUser::InstanceMethods
@@ -110,9 +109,9 @@ module Monarchy
       def revoking_last_role(role, resource, strategy)
         case strategy
         when :revoke_access
-          return revoke_access(resource)
+          revoke_access(resource)
         when :revoke_member
-          return member_for(resource).delete
+          member_for(resource).delete
         else
           default_role = Monarchy::Validators.default_role?(resource, role)
           raise Monarchy::Exceptions::RoleNotRevokable if default_role

data/lib/monarchy/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Monarchy
-  VERSION = '2.0.6'
+  VERSION = '2.0.7'
 end

data/monarchy.gemspec

@@ -28,11 +28,11 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activerecord', '>=4.2.7.1'
   s.add_dependency 'closure_tree', '6.2.0'
-  s.add_dependency 'configurations', '2.2.1'
+  s.add_dependency 'configurations', '2.2.2'
   s.add_dependency 'active_record_union', '1.2.0'
   s.add_dependency 'tqdm', '0.3.0'
 
   s.add_development_dependency 'bundler', '~> 1.12'
-  s.add_development_dependency 'rake', '~> 11.3'
+  s.add_development_dependency 'rake', '~> 12.0'
   s.add_development_dependency 'rspec', '3.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monarchy
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Exelord
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: active_record_union
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement