monarchy 2.0.0.pre.beta.1 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c68ab46ff143acf0dbf4724039a5eda03caad6a
-  data.tar.gz: 7bffa186ec4eddd5c42e08d9217197329f223c77
+  metadata.gz: 668e988a05baee787f7ede9df0c24c0625559a86
+  data.tar.gz: 3e24077bf0b110a0db6afb69a6c75b013e24e67a
 SHA512:
-  metadata.gz: 2e2f56e8b44dc277700951c9fda570907ea47b1ba98e6050d3e2a256f2f42b5620b8e158087292f1c797255f0fda311fa2f43ccabf3eacb63ec635d9349e4dba
-  data.tar.gz: 406793fd9ad57d2c65872594840a7761c5592801ab536cd006b9fde3936b914177b61e78c1809c09fc9e12cb6f2d9ec80bf9d12de11ece9b92ba3a644f349f90
+  metadata.gz: 32d61f36e24cac3b72e944d63aa2bf2758872f59adaaeaa8b3736308d3cfd543ad502c6f0c57bcb51ac8873068618bd964b651f1144065f0444d53d5aa5ccb0c
+  data.tar.gz: e26d3ef36d35f622889578eb1f6afebc0dc9b3b1cc3d2987090f9555e87929e50670f8c7d600959cb74f907e90bc329b6d7ecf983a53ae08636bfe021077ea02

data/.github_changelog_generator

@@ -0,0 +1 @@
+future-release=2.0.4

data/CHANGELOG.md

@@ -1,11 +1,155 @@
-### 2.0.x LTS
-- Docs in files
-- Improve `.in` scope in AAR
-- Change `.in` scope in AAH
-  - Now it takes `hierarchy` and returns array of `hierarchies`
-- Update gems
-- Add dynamic `hierarchy` class
-- Add `users` relationship to AAH
-- Add a validator for `hierarchy`
-- Add new exceptions for `hierarchy`
-- Fix scopes in `hierarchy`
+# Change Log
+
+## [2.0.4](https://github.com/Exelord/Monarchy/tree/2.0.4) (2016-11-06)
+[Full Changelog](https://github.com/Exelord/Monarchy/compare/v2.0.0-beta.1...2.0.4)
+
+**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)
+
+**Merged pull requests:**
+
+- Improve AAH performance [\#60](https://github.com/Exelord/Monarchy/pull/60) ([Exelord](https://github.com/Exelord))
+- Upgrade to Rails 5 [\#55](https://github.com/Exelord/Monarchy/pull/55) ([Exelord](https://github.com/Exelord))
+- Update packages [\#54](https://github.com/Exelord/Monarchy/pull/54) ([Exelord](https://github.com/Exelord))
+- Documentation, improvments and fixes [\#52](https://github.com/Exelord/Monarchy/pull/52) ([Exelord](https://github.com/Exelord))
+
+## [v2.0.0-beta.1](https://github.com/Exelord/Monarchy/tree/v2.0.0-beta.1) (2016-09-10)
+[Full Changelog](https://github.com/Exelord/Monarchy/compare/v1.2.0...v2.0.0-beta.1)
+
+**Fixed bugs:**
+
+- Quick fix for v2.0 [\#51](https://github.com/Exelord/Monarchy/pull/51) ([Exelord](https://github.com/Exelord))
+
+**Merged pull requests:**
+
+- Remove default role granting [\#50](https://github.com/Exelord/Monarchy/pull/50) ([Exelord](https://github.com/Exelord))
+
+## [v1.2.0](https://github.com/Exelord/Monarchy/tree/v1.2.0) (2016-08-26)
+[Full Changelog](https://github.com/Exelord/Monarchy/compare/v1.1.5...v1.2.0)
+
+**Fixed bugs:**
+
+- Probably missing tests  [\#20](https://github.com/Exelord/Monarchy/issues/20)
+- Rise errors where incorrect resource was assigned  [\#19](https://github.com/Exelord/Monarchy/issues/19)
+
+**Merged pull requests:**
+
+- Feature exceptions [\#42](https://github.com/Exelord/Monarchy/pull/42) ([Exelord](https://github.com/Exelord))
+
+## [v1.1.5](https://github.com/Exelord/Monarchy/tree/v1.1.5) (2016-08-19)
+[Full Changelog](https://github.com/Exelord/Monarchy/compare/v1.1.4...v1.1.5)
+
+**Fixed bugs:**
+
+- Fix for assign parent [\#47](https://github.com/Exelord/Monarchy/pull/47) ([Exelord](https://github.com/Exelord))
+
+## [v1.1.4](https://github.com/Exelord/Monarchy/tree/v1.1.4) (2016-08-16)
+[Full Changelog](https://github.com/Exelord/Monarchy/compare/v1.1.3...v1.1.4)
+
+**Fixed bugs:**
+
+- Move tasks to Monarchy methods [\#46](https://github.com/Exelord/Monarchy/pull/46) ([Exelord](https://github.com/Exelord))
+
+## [v1.1.3](https://github.com/Exelord/Monarchy/tree/v1.1.3) (2016-08-15)
+[Full Changelog](https://github.com/Exelord/Monarchy/compare/v.1.1.1...v1.1.3)
+
+**Merged pull requests:**
+
+- Fix assign parent [\#45](https://github.com/Exelord/Monarchy/pull/45) ([Exelord](https://github.com/Exelord))
+
+## [v.1.1.1](https://github.com/Exelord/Monarchy/tree/v.1.1.1) (2016-08-15)
+[Full Changelog](https://github.com/Exelord/Monarchy/compare/v1.0.0...v.1.1.1)
+
+**Fixed bugs:**
+
+- Fix revoking role [\#44](https://github.com/Exelord/Monarchy/pull/44) ([Exelord](https://github.com/Exelord))
+- Fix rake tasks [\#43](https://github.com/Exelord/Monarchy/pull/43) ([Exelord](https://github.com/Exelord))
+
+**Closed issues:**
+
+- Rise warnings [\#3](https://github.com/Exelord/Monarchy/issues/3)
+
+**Merged pull requests:**
+
+- Feature better restricted roles [\#41](https://github.com/Exelord/Monarchy/pull/41) ([Exelord](https://github.com/Exelord))
+- Update gems [\#40](https://github.com/Exelord/Monarchy/pull/40) ([Exelord](https://github.com/Exelord))
+
+## [v1.0.0](https://github.com/Exelord/Monarchy/tree/v1.0.0) (2016-08-05)
+[Full Changelog](https://github.com/Exelord/Monarchy/compare/v0.3.1...v1.0.0)
+
+**Fixed bugs:**
+
+- Teams [\#36](https://github.com/Exelord/Monarchy/pull/36) ([Exelord](https://github.com/Exelord))
+
+**Closed issues:**
+
+- Dynamic relationships [\#32](https://github.com/Exelord/Monarchy/issues/32)
+- Extend `parent\_as` method [\#17](https://github.com/Exelord/Monarchy/issues/17)
+- Custom Up and down roles inheritence [\#15](https://github.com/Exelord/Monarchy/issues/15)
+
+**Merged pull requests:**
+
+- Revert "Update gems - Rails 5" [\#39](https://github.com/Exelord/Monarchy/pull/39) ([Exelord](https://github.com/Exelord))
+- Feature dynamic classes [\#38](https://github.com/Exelord/Monarchy/pull/38) ([Exelord](https://github.com/Exelord))
+- Update gems - Rails 5 [\#37](https://github.com/Exelord/Monarchy/pull/37) ([Exelord](https://github.com/Exelord))
+
+## [v0.3.1](https://github.com/Exelord/Monarchy/tree/v0.3.1) (2016-05-29)
+[Full Changelog](https://github.com/Exelord/Monarchy/compare/v0.2.0...v0.3.1)
+
+**Fixed bugs:**
+
+- Rework on roles\_for [\#28](https://github.com/Exelord/Monarchy/issues/28)
+- Rspec warnings [\#25](https://github.com/Exelord/Monarchy/issues/25)
+- Internal hierarchy model [\#4](https://github.com/Exelord/Monarchy/issues/4)
+- Fix closure tree [\#30](https://github.com/Exelord/Monarchy/pull/30) ([PoslinskiNet](https://github.com/PoslinskiNet))
+- Fix directory name [\#26](https://github.com/Exelord/Monarchy/pull/26) ([Exelord](https://github.com/Exelord))
+
+**Closed issues:**
+
+- Better revoking roles [\#18](https://github.com/Exelord/Monarchy/issues/18)
+
+**Merged pull requests:**
+
+- Add gitter channel [\#35](https://github.com/Exelord/Monarchy/pull/35) ([Exelord](https://github.com/Exelord))
+- DEP\#27 Refactored specs and fixes [\#31](https://github.com/Exelord/Monarchy/pull/31) ([Exelord](https://github.com/Exelord))
+- Another big bang theory [\#27](https://github.com/Exelord/Monarchy/pull/27) ([Exelord](https://github.com/Exelord))
+
+## [v0.2.0](https://github.com/Exelord/Monarchy/tree/v0.2.0) (2016-04-20)
+[Full Changelog](https://github.com/Exelord/Monarchy/compare/v0.1-alpha...v0.2.0)
+
+**Fixed bugs:**
+
+- Rename Hierarchy\_spec.rb to hierarchy\_spec.rb [\#23](https://github.com/Exelord/Monarchy/pull/23) ([Exelord](https://github.com/Exelord))
+
+**Closed issues:**
+
+- Renaming gem :D [\#21](https://github.com/Exelord/Monarchy/issues/21)
+- Scope modules into Treelify [\#13](https://github.com/Exelord/Monarchy/issues/13)
+- When deleting Role delete also members role relation [\#1](https://github.com/Exelord/Monarchy/issues/1)
+
+**Merged pull requests:**
+
+- Feature gem renaming [\#24](https://github.com/Exelord/Monarchy/pull/24) ([Exelord](https://github.com/Exelord))
+- Feature scoped modules [\#22](https://github.com/Exelord/Monarchy/pull/22) ([Exelord](https://github.com/Exelord))
+
+## [v0.1-alpha](https://github.com/Exelord/Monarchy/tree/v0.1-alpha) (2016-04-12)
+**Closed issues:**
+
+- Revoke user from resource [\#2](https://github.com/Exelord/Monarchy/issues/2)
+
+**Merged pull requests:**
+
+- Dependent destroy on MembersRole [\#14](https://github.com/Exelord/Monarchy/pull/14) ([Exelord](https://github.com/Exelord))
+- User revoke [\#12](https://github.com/Exelord/Monarchy/pull/12) ([Exelord](https://github.com/Exelord))
+- Update README.md [\#11](https://github.com/Exelord/Monarchy/pull/11) ([Exelord](https://github.com/Exelord))
+- Resource documentation [\#10](https://github.com/Exelord/Monarchy/pull/10) ([Exelord](https://github.com/Exelord))
+- Parent as option [\#9](https://github.com/Exelord/Monarchy/pull/9) ([Exelord](https://github.com/Exelord))
+- Bump ruby to 2.3.0 [\#8](https://github.com/Exelord/Monarchy/pull/8) ([Exelord](https://github.com/Exelord))
+- Add missing tests [\#7](https://github.com/Exelord/Monarchy/pull/7) ([Exelord](https://github.com/Exelord))
+
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile

@@ -25,7 +25,8 @@ group :development, :test do
   gem 'ffaker', '2.2.0'
   gem 'database_cleaner', '1.5.3'
   gem 'tqdm', '0.3.0'
+  gem 'rails', '5.0.0.1'
 end
 
-gem 'simplecov', '0.12.0', require: false, group: :test
-gem 'codeclimate-test-reporter', group: :test, require: nil
+gem 'simplecov', '0.12.0', group: :test
+gem 'codeclimate-test-reporter', '1.0.0', group: :test

data/Gemfile.lock

@@ -1,61 +1,62 @@
 PATH
   remote: .
   specs:
-    monarchy (2.0.0.pre.beta.1)
+    monarchy (2.0.4)
       active_record_union (= 1.2.0)
+      activerecord (>= 4.2.7.1)
       closure_tree (= 6.2.0)
       configurations (= 2.2.1)
-      rails (~> 4.2, >= 4.2.7.1)
       tqdm (= 0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
+    actioncable (5.0.0.1)
+      actionpack (= 5.0.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)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.7.1)
-      actionview (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.0.1)
+      actionview (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionview (5.0.0.1)
+      activesupport (= 5.0.0.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     active_record_union (1.2.0)
       activerecord (>= 4.0)
-    activejob (4.2.7.1)
-      activesupport (= 4.2.7.1)
-      globalid (>= 0.3.0)
-    activemodel (4.2.7.1)
-      activesupport (= 4.2.7.1)
-      builder (~> 3.1)
-    activerecord (4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      arel (~> 6.0)
-    activesupport (4.2.7.1)
+    activejob (5.0.0.1)
+      activesupport (= 5.0.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)
+      arel (~> 7.0)
+    activesupport (5.0.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.3)
+    arel (7.1.4)
     ast (2.3.0)
     builder (3.2.2)
     closure_tree (6.2.0)
       activerecord (>= 4.1.0)
       with_advisory_lock (>= 3.0.0)
-    codeclimate-test-reporter (0.6.0)
-      simplecov (>= 0.7.1, < 1.0.0)
+    codeclimate-test-reporter (1.0.0)
     coderay (1.1.1)
     concurrent-ruby (1.0.2)
     configurations (2.2.1)
@@ -72,7 +73,7 @@ GEM
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
-    json (1.8.3)
+    json (2.0.2)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
@@ -83,6 +84,7 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
     minitest (5.9.1)
+    nio4r (1.2.1)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
     parser (2.3.1.4)
@@ -94,31 +96,30 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.4)
       pry (>= 0.9.10)
-    rack (1.6.4)
+    rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.7.1)
-      actionmailer (= 4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activerecord (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    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)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.7.1)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
+      railties (= 5.0.0.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
       nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    railties (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)
@@ -173,6 +174,9 @@ GEM
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unicode-display_width (1.1.1)
+    websocket-driver (0.6.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
     with_advisory_lock (3.0.0)
       activerecord (>= 3.2)
       thread_safe
@@ -182,12 +186,13 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.12)
-  codeclimate-test-reporter
+  codeclimate-test-reporter (= 1.0.0)
   database_cleaner (= 1.5.3)
   factory_girl_rails (= 4.7.0)
   ffaker (= 2.2.0)
   monarchy!
   pry-rails (= 0.3.4)
+  rails (= 5.0.0.1)
   rake (~> 11.3)
   rspec (= 3.5.0)
   rspec-rails (= 3.5.2)

data/README.md

@@ -1,14 +1,60 @@
-[![Build Status](https://travis-ci.org/Exelord/Monarchy.svg?branch=master)](https://travis-ci.org/Exelord/Monarchy)
-[![Dependency Status](https://gemnasium.com/badges/github.com/Exelord/Monarchy.svg)](https://gemnasium.com/github.com/Exelord/Monarchy)
-[![Gitter](https://badges.gitter.im/Exelord/Monarchy.svg)](https://gitter.im/Exelord/Monarchy?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
-[![Code Climate](https://codeclimate.com/github/Exelord/Monarchy/badges/gpa.svg)](https://codeclimate.com/github/Exelord/Monarchy)
-
 <p align="center">
-  <img align="center" src="monarchy.png?raw=true" alt="Sublime's custom image"/>
+  <img src="monarchy.png?raw=true" alt="Sublime's custom image"/>
+  <a href="https://travis-ci.org/Exelord/Monarchy">
+    <img src="https://travis-ci.org/Exelord/Monarchy.svg?branch=master">
+  </a>
+  <a href="https://gemnasium.com/github.com/Exelord/Monarchy">
+    <img src="https://gemnasium.com/badges/github.com/Exelord/Monarchy.svg">
+  </a>
+  <a href="https://gitter.im/Exelord/Monarchy?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge">
+    <img src="https://badges.gitter.im/Exelord/Monarchy.svg">
+  </a>
+  <a href="https://codeclimate.com/github/Exelord/Monarchy">
+    <img src="https://codeclimate.com/github/Exelord/Monarchy/badges/gpa.svg">
+  </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.
+
+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.
+
+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.
+
+## Usage Example
+After Monarchy setup you can enjoy with roles inheritance and accessible resources.
+
+```ruby
+# Create roles
+admin_role = Monarchy.role_class.create(name: :admin, level: 5, inherited: true)
+manager_role = Monarchy.role_class.create(name: :manager, level: 4, inherited_role: admin_role, inherited: true)
+
+# Create resources
+project1 = Project.create()
+project2 = Project.create(parent: project1)
+project3 = Project.create(parent: project2)
+project4 = Project.create()
+
+# Grant user
+user.grant(:manager, project2)
+
+# Accessible projects
+Project.accessible_for(user)  # returns [Project1, Project2, Project3]
+
+# User inherited roles
+user.roles_for(project1) # returns a default role eg. [guest_role]
+user.roles_for(project2) # returns [manager_role]
+user.roles_for(project3) # returns [admin_role]
+user.roles_for(project4) # returns empty array []
+```
+
+## Requirements
+Monarchy requires:
+  - Ruby 2.3
+
 ## Documentation
-There is existing fully documentation for that project in our Wiki. Take a look at [Monarchy Documentation] (https://github.com/Exelord/Monarchy/wiki)
+We are preparing an official [website][5c7e0096] with documentation.
+Meanwhile you can look to the `docs` directory for actual [documentation](https://github.com/Exelord/Monarchy/tree/master/docs).
 
 ## Contributing
 
@@ -16,4 +62,6 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/exelor
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+This version of the gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+
+[5c7e0096]: https://exelord.github.io/Monarchy/ "Monarchy Website"

data/docs/acts_as_hierarchy.md

@@ -1,45 +1,45 @@
-## Hierarchy
+# Hierarchy
 `Hierarchy` is an internal model of `Monarchy` and should not be used unless it is really necessary.
 
 > hmm... sounds like `private`
 
-### Methods
+## Methods
 ** We do not recommend to use it but if yo have to: **
 We are using [Closure Tree][e5c808aa] behind `Hierarchy` class. There is a bunch of methods and functions available behind the hood. Check their documentation.
 
   [e5c808aa]: https://github.com/mceachen/closure_tree "Closure Tree"
 
-### Scopes:
+## Scopes:
 
-#### .accessible_for
+### .accessible_for
 You can select all hierarchies accessible for specific user by using a scope: `accessible_for`, eg:
 ``` ruby
-Monarchy::Hierarchy.accessible_for(current_user)   # returns [hierarchy1, hierarchy2, hierarchy5]
+Monarchy.hierarchy_class.accessible_for(current_user)   # returns [hierarchy1, hierarchy2, hierarchy5]
 ```
 
-#### .in(resource, true)
+### .in(resource, true)
 You can select all hierarchies scoped into another by using scope: `in`:
 
 - If the second argument is `true` (`true` is by default):
 ``` ruby
-Monarchy::Hierarchy.in(project.hierarchy) # returns [hierarchy1, hierarchy2, hierarchy5]
+Monarchy.hierarchy_class.in(project.hierarchy) # returns [hierarchy1, hierarchy2, hierarchy5]
 ```
 It will returns for you all `hierarchies` which parent is `project.hierarchy` or one of his children.
 
 - If the second argument is `false`:
 ``` ruby
-Monarchy::Hierarchy.in(project.hierarchy, false) # returns [hierarchy1, hierarchy2]
+Monarchy.hierarchy_class.in(project.hierarchy, false) # returns [hierarchy1, hierarchy2]
 ```
 It will returns for you all `hierarchies` which parent is `project.hierarchy`
 
 
 ## Relations
 
-#### #members
+### #members
 Return all members explicitly granted to the hierarchy.
 
-#### #users
+### #users
 Returns all users which have been granted explicitly to the hierarchy.
 
-#### #resource
+### #resource
 Returns a resource model of the hierarchy.

data/docs/acts_as_member.md

@@ -0,0 +1,34 @@
+# Member
+It is a model of class which was registered in Monarchy config and is acting as `acts_as_member`.
+
+## Methods:
+
+### #resource
+Returns a resource of member, example:
+``` ruby
+User was granted to Project so the resource of his Member will be Project
+```
+
+### #resource=
+You can overwrite a `#resource` for `member` by using:
+```ruby
+member.resource = new_resource_model
+```
+
+## Scopes:
+
+### .accessible_for
+You can select all members accessible for specific user by using a scope: `accessible_for`, eg:
+``` ruby
+Monarchy::member_class.accessible_for(current_user)   # returns [member1, member2, member5]
+```
+## Public Relations:
+
+### #roles
+Returns all roles explicitly assigned to the member.
+
+### #user
+Returns a user model of the member.
+
+### #hierarchy
+Returns a hierarchy model of the member.

data/docs/acts_as_resource.md

@@ -1,3 +1,5 @@
+# Resource
+
 To generate a new resource you can use:
 ```
 rails g monarchy:resource [resource_name]
@@ -9,7 +11,7 @@ class Resource < ActiveRecord::Base
 end
 ```
 
-##### - Options
+#### - Options
 You can pass an options to `acts_as_resource`:
 - `parent_as: :association_name`
 
@@ -27,7 +29,7 @@ You can pass an options to `acts_as_resource`:
 
 ## Methods
 
-#### #parent
+### #parent
 You can easily assign parent by using `parent=` method, eg:
 ``` ruby
 resource.parent = Project.last
@@ -39,7 +41,7 @@ resource.parent   # returns Project.last
 
 Parents can be only models which have `acts_as_resource`
 
-#### #children
+### #children
 You can easily assign children by using `children=` method, eg:
 ``` ruby
 resource.children = [child1, child2, child3]
@@ -50,25 +52,25 @@ resource.children   # returns [child1, child2, child3]
 ```
 Children can be only models which have `acts_as_resource`
 
-#### #ensure_hierarchy
+### #ensure_hierarchy
 It creates a hierarchy for resource model if it not exist and `automatic_hierarchy` flag is set to true.
 If you want to bypass `automatic_hierarchy` flag you can pass `true` to the method params.
 
-#### .default_role_name
+### .default_role_name
 Returns default role name for the class
 
-#### .default_role
+### .default_role
 Returns default role object `Monarchy::Role` for the class
 
 ### Scopes:
 
-#### .accessible_for
+### .accessible_for
 You can select all resources accessible for specyfic user by using scope: `accessible_for`, eg:
 ``` ruby
 Resource.accessible_for(current_user)   # returns [resource1, resource2, resource5]
 ```
 
-#### .in(resource, true)
+### .in(resource, true)
 You can select all resources scoped into another by using scope: `in`:
 
 - If the second argument is `true` (`true` is by default):
@@ -86,13 +88,13 @@ It will return for you all `resources` which parent is `Project.first`
 
 ## Relations
 
-#### #members
+### #members
 Return all members explicitly granted to the resource.
 
-#### #users
+### #users
 Returns all users which have been granted explicitly to the resource.
 
-#### #hierarchy
+### #hierarchy
 Returns a hierarchy model of the resource. (DO NOT USE UNLESS IS NECESSARY)
 
 ## Flags

data/docs/acts_as_role.md

@@ -0,0 +1,12 @@
+# Role
+
+It is a model of a class which was registered in Monarchy config and is acting as `acts_as_role`.
+
+## Public Relations:
+
+### #members
+Returns all members with the role which was explicitly assigned.
+
+### #inherited_role
+Returns a `role` which will be inherited to lower level resources.
+> If you would like to know more about `inherited_role` check the `Usage` page.

data/docs/acts_as_user.md

@@ -1,3 +1,5 @@
+# User
+
 You have to add it to your user model or the custom one specified in a config file.
 
 ``` ruby
@@ -8,43 +10,43 @@ end
 
 ## Relations
 
-#### .hierarchies
+### .hierarchies
 Return all hierarchies in which user is explicitly granted.
 
-#### .members
+### .members
 Returns all memberships (`member` model) of the user
 
 ## Scopes
 
-#### .accessible_for (user)
+### .accessible_for (user)
 Returns all users accessible for the specific user
 It includes all users from all resource which the user has any access.
 
 ## Methods
 
-#### #roles_for(resource, inheritance = true)
+### #roles_for(resource, inheritance = true)
 Returns all roles for the user to the specific `resource`.
 You can choose if this method should return also inherited roles or just these, granted explicitly.
 
-#### #member_for(resource)
+### #member_for(resource)
 Returns a `member` object for the user in specyfic resource.
 
-#### #grant(role_names, resource)
+### #grant(role_names, resource)
 By this method, you can give the user an access to a specific resource.
 You can specify a role name or an array of roles names.
 **Remember to use `symbols`!**
 
-#### #revoke_access(resource)
+### #revoke_access(resource)
 You can revoke total access of a user from the resource and his children by using this method.
 Optionally you can specify `hierarchies` as the second argument from which user's members should be deleted.
 
-#### #revoke_role(role_name, resource)
+### #revoke_role(role_name, resource)
 It revokes specified role from a user's member of the resource.
 If is it last role and the default for the resource it will raise an error `Monarchy::Exceptions::RoleNotRevokable`. Otherwise, if it's just a last role it will remove the one and grant a user with default one.
 
 **It guaranty that user will have always last role or a default one**
 
-#### #revoke_role!(role_name, resource)
+### #revoke_role!(role_name, resource)
 It behaves exactly like `#revoke_role` but with one difference during revoking last_role.
 Depend on which `revoke_strategy` did you choose in configuration,
 it will delete a member after revoking the last role or will revoke an access to the resource.

data/docs/installation_and_usage.md

@@ -0,0 +1,97 @@
+# Installation and Usage
+
+## Install a gem
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'monarchy'
+```
+
+And then execute:
+
+    $ bundle
+
+To create initials migrations and necessary files run:
+```
+rails g monarchy:setup
+```
+
+This will create for you:
+
+1. Migrations:
+  - `monarchy_create_users`
+  - `monarchy_create_hierarchies`
+  - `monarchy_create_memberships`
+2. Configuration file in `config/initializers/monarchy`
+3. Default `User` model (optional)
+
+**If you want to use your current `User` model just skip generation of: **
+ - `db/migrate/monarchy_create_users.rb`
+ - `app/models/user.rb`
+
+And add to your current `User` model `acts_as_user`
+
+## Create roles
+Go to `rails console` or create a migration with your new roles.
+
+### How to create a role?
+Think about your roles structure.
+You can access role class through: `Monarchy.role_class`
+
+Below you can find `Role` parameters with description.
+
+#### Properties description
+
+- `name` - `REQUIRED` - `symbol` - name of the role
+
+- `level` - `0 as DEFAULT` - `number` - higher level means higher level of access, eg. Admin has 10, User has 1
+
+- `inherited` - `true by DEFAULT` - `boolean` - defines if role should be down inherited or not
+- `inherited_role_id` - `(SELF) as DEFAULT` - `number` - id of role which should be  inherited to lower resources (ROLE HAS TO EXIST), eg.
+  - Role `manager` has `inherited_role` as `member` and `inherited` flag has been set to `true`.
+  - Example `User` has been granted as `manager` to `Project`.
+  - In all resources bellow `Project`, the user will have a `member` role which was down inherited from `manager`
+
+#### Example hash:
+``` ruby
+hash_with_properties = {
+  name: :admin,
+  level: 5,
+  inherited_role_id: 4,
+  inherited: true
+}
+```
+
+#### Role creating
+```ruby
+Monarchy.role_class.create(hash_with_properties)
+```
+
+## Setup actors
+
+### Mark user as actor
+Setup your resources by adding `acts_as_resource` (for docs look to `Resource` page).
+
+For your current `User` model or freshly generated one, add or check if exist, `acts_as_user`.
+``` ruby
+class User < ActiveRecord::Base
+  acts_as_user
+end
+```
+
+> Check documentation of [Acts as user] (https://github.com/Exelord/Monarchy/wiki/Acts-as-user)
+
+### Mark resources as actors
+For all models that you want to be accessible for users and controlled by `Monarchy` add `acts_as_resource`.
+
+> Check documentation of [Acts as resource] (https://github.com/Exelord/Monarchy/wiki/Acts-as-resource)
+
+## Build a tree!
+Build Hierarchies and a tree with just one command in `rails console`
+
+``` ruby
+Monarchy.rebuild!
+```
+
+That's it...
+> Have a long monarchy! :)

data/dummy/config/application.rb

@@ -18,8 +18,5 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
   end
 end

data/dummy/config/environments/production.rb

@@ -23,7 +23,7 @@ Rails.application.configure do
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
-  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
+  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

data/dummy/config/environments/test.rb

@@ -14,8 +14,8 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static file server for tests with Cache-Control for performance.
-  config.serve_static_files   = true
-  config.static_cache_control = 'public, max-age=3600'
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

data/lib/monarchy/acts_as_hierarchy.rb

@@ -31,35 +31,43 @@ module Monarchy
 
         scope :accessible_for, (lambda do |user|
           Monarchy::Validators.user(user)
-          where(id: accessible_roots(user).union(accessible_leaves(user)))
+          user_id = user.id
+          where(id: accessible_roots_ids(user_id).union_all(accessible_leaves_ids(user_id)))
         end)
       end
 
-      def accessible_roots(user)
-        unscoped.joins('INNER JOIN "monarchy_hierarchy_hierarchies" ON '\
-          '"monarchy_hierarchies"."id" = "monarchy_hierarchy_hierarchies"."ancestor_id"')
-                .joins('INNER JOIN "monarchy_members" ON '\
-          '"monarchy_members"."hierarchy_id" = "monarchy_hierarchy_hierarchies"."descendant_id"')
-                .where(monarchy_members: { user_id: user.id }).distinct
+      def accessible_roots_ids(user_id)
+        unscoped.joins('INNER JOIN monarchy_hierarchy_hierarchies ON ' \
+          'monarchy_hierarchies.id = monarchy_hierarchy_hierarchies.ancestor_id')
+                .joins('INNER JOIN (SELECT hierarchy_id FROM monarchy_members ' \
+              "WHERE monarchy_members.user_id = #{user_id}) as members ON " \
+                'members.hierarchy_id = monarchy_hierarchy_hierarchies.descendant_id').select(:id)
       end
 
-      def accessible_leaves(user)
-        descendant_leaves.where('monarchy_hierarchy_hierarchies.descendant_id': descendant_leaves_for_user(user)
-            .where('monarchy_roles.inherited': false)
-            .select('monarchy_hierarchy_hierarchies.ancestor_id')).union(
-              descendant_leaves
-                .where('monarchy_hierarchy_hierarchies.ancestor_id': descendant_leaves_for_user(user)
-                .where.not('monarchy_roles.inherited': false))
-            )
+      def accessible_leaves_ids(user_id)
+        ancestor_leaves_for_user(user_id)
+          .select('monarchy_hierarchy_hierarchies.ancestor_id AS id')
+          .union_all(descendant_leaves_for_user(user_id)).select(:id)
       end
 
-      def descendant_leaves_for_user(user)
-        descendant_leaves.joins(members: [:roles]).where(monarchy_members: { user_id: user.id })
+      def ancestor_leaves_for_user(user_id, inherited = false)
+        inherited = inherited ? 't' : 'f'
+
+        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 " \
+            'monarchy_roles ON monarchy_members_roles.role_id = monarchy_roles.id')
       end
 
-      def descendant_leaves
-        unscoped.joins('INNER JOIN "monarchy_hierarchy_hierarchies" ON "monarchy_hierarchies"."id" =' \
-          '"monarchy_hierarchy_hierarchies"."descendant_id"')
+      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')
       end
     end
   end

data/lib/monarchy/acts_as_user.rb

@@ -63,17 +63,24 @@ module Monarchy
 
       def resource_and_inheritance_roles(resource)
         hierarchy_ids = resource.hierarchy.ancestors.select(:id)
+
         Monarchy.role_class.where(id:
-                      Monarchy.role_class.joins(:members).where('monarchy_members.user_id': id)
-                      .where('monarchy_roles.inherited': 't', 'monarchy_members.hierarchy_id': hierarchy_ids)
-                      .select(:inherited_role_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)
+            .select('monarchy_roles.inherited_role_id'))
                 .union(resource_roles(resource))
-                .distinct
       end
 
       def resource_roles(resource)
-        Monarchy.role_class.joins(:members)
-                .where('monarchy_members.hierarchy_id': resource.hierarchy.id, 'monarchy_members.user_id': 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 ' \
+                  "hierarchy_id = #{resource.hierarchy.id} AND user_id = #{id}) as monarchy_members ON " \
+                  'monarchy_members.id = monarchy_members_roles.member_id')
       end
 
       def descendant_role(resource)

data/lib/monarchy/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Monarchy
-  VERSION = '2.0.0-beta.1'
+  VERSION = '2.0.4'
 end

data/monarchy.gemspec

@@ -24,8 +24,9 @@ Gem::Specification.new do |s|
   s.bindir        = 'exe'
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ['lib']
+  s.required_ruby_version = '>= 2.3'
 
-  s.add_runtime_dependency 'rails', '~> 4.2', '>= 4.2.7.1'
+  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 'active_record_union', '1.2.0'

metadata

@@ -1,22 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: monarchy
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta.1
+  version: 2.0.4
 platform: ruby
 authors:
 - Exelord
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.7.1
@@ -24,9 +21,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.7.1
@@ -136,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github_changelog_generator"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -155,11 +150,12 @@ files:
 - bin/console
 - bin/setup
 - docs/acts_as_hierarchy.md
+- docs/acts_as_member.md
 - docs/acts_as_resource.md
+- docs/acts_as_role.md
 - docs/acts_as_user.md
 - docs/configuration.md
-- docs/installation.md
-- docs/usage.md
+- docs/installation_and_usage.md
 - dummy/.rspec
 - dummy/README.rdoc
 - dummy/Rakefile
@@ -255,15 +251,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Hierarchical access management system with roles inheritance.

data/docs/installation.md

@@ -1,30 +0,0 @@
-# Installation
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'monarchy'
-```
-
-And then execute:
-
-    $ bundle
-
-To create initials migrations and necessary files run:
-```
-rails g monarchy:setup
-```
-
-This will create for you:
-
-1. Migrations:
-  - `monarchy_create_users`
-  - `monarchy_create_hierarchies`
-  - `monarchy_create_memberships`
-2. Configuration file in `config/initializers/monarchy`
-3. Default `User` model (optional)
-
-**If you want to use your current `User` model just skip generation of: **
- - `db/migrate/monarchy_create_users.rb`
- - `app/models/user.rb`
-
-And add to your current `User` model `acts_as_user`

data/docs/usage.md

@@ -1,22 +0,0 @@
-# Usage
-The only think you have to do is mark models to be one of part of Monarchy.
-
-You can use 2 available markers:
-
-1. `acts_as_user`
-2. `acts_as_resource`
-
-## Acts as user
-For your current `User` model or freshly generated one, add or check if exist, `acts_as_user`.
-``` ruby
-class User < ActiveRecord::Base
-  acts_as_user
-end
-```
-
-> Check documentation of [Acts as user] (https://github.com/Exelord/Monarchy/wiki/Acts-as-user)
-
-## Acts as resource
-For all models that you want to be accessible for users add `acts_as_resource`.
-
-> Check documentation of [Acts as resource] (https://github.com/Exelord/Monarchy/wiki/Acts-as-resource)