monarchy 1.0.0 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dfc2d0fdc01fa14cb113bb0d1cf87533af6e849
-  data.tar.gz: 6ca7712af3dfbe53c0f309432415471bb1f70cf8
+  metadata.gz: 6ee35ff7681e64755e2287e318540e66ef5fd891
+  data.tar.gz: 60d1a4cf7ba3727517250c2a44c40024cc211224
 SHA512:
-  metadata.gz: defd04040f7ece731b35b84ee04000f72cb08be7cceef9d63ba043d61b77459e8a11cdee5f15cbdcece69f1898ce3709c3e127816040159997bf49a96be01a16
-  data.tar.gz: fb7b2313b86d63b912b8741038fe245dbf6847ecccce9d681db5575ba370a7f1661bbc5658c6fdeadbdbc650e23e08c809c89db894f49a5a17e51a8247f9ee94
+  metadata.gz: 66f9f19fe4eaffd3e31f4324b55d69f4b5ed8afaf9d1adf6b370ff990b12a1ee9300b2ebdc9f159f81242535fbfc208f35d2417179afc3406ce19f7c37973b07
+  data.tar.gz: ecca2c24e3c2eb3f830d52e720ad6dc0ec54e876fe4a4596b768a981ba3004d496a05d8680668af9a2a80d54f642474c1f3eca81e8390e4520bb8714ee47bf79

data/.rubocop.yml

@@ -8,7 +8,7 @@ AllCops:
 Documentation:
   Enabled: false
 Metrics/LineLength:
-  Max: 120
+  Max: 125
 Style/CaseIndentation:
   Enabled: false
 Style/StructInheritance:

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 2.3.0
-before_install: gem install bundler -v 1.10.6
+  - 2.3.1
+before_install: gem install bundler -v 1.12

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 source 'https://rubygems.org'
-ruby '2.3.0'
+ruby '2.3.1'
 
 # Declare your gem's dependencies in monarchy.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
@@ -17,14 +17,14 @@ gemspec
 
 group :development, :test do
   gem 'sqlite3', '1.3.11'
-  gem 'rubocop', '0.40.0'
+  gem 'rubocop', '0.42.0'
   gem 'pry-rails', '0.3.4'
   gem 'shoulda-matchers', '3.1.1'
-  gem 'rspec-rails', '3.4.2'
+  gem 'rspec-rails', '3.5.1'
   gem 'factory_girl_rails', '4.7.0'
   gem 'ffaker', '2.2.0'
   gem 'database_cleaner', '1.5.3'
   gem 'tqdm', '0.3.0'
 end
 
-gem 'simplecov', '0.11.2', require: false, group: :test
+gem 'simplecov', '0.12.0', require: false, group: :test

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    monarchy (0.3.1)
-      active_record_union (= 1.1.1)
-      closure_tree (= 6.0.0)
+    monarchy (1.1.3)
+      active_record_union (= 1.2.0)
+      closure_tree (= 6.1.0)
       configurations (= 2.2.0)
       rails (~> 4.2, >= 4.2.4)
       tqdm (= 0.3.0)
@@ -30,7 +30,7 @@ GEM
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    active_record_union (1.1.1)
+    active_record_union (1.2.0)
       activerecord (>= 4.0)
     activejob (4.2.7)
       activesupport (= 4.2.7)
@@ -51,7 +51,7 @@ GEM
     arel (6.0.3)
     ast (2.3.0)
     builder (3.2.2)
-    closure_tree (6.0.0)
+    closure_tree (6.1.0)
       activerecord (>= 4.1.0)
       with_advisory_lock (>= 3.0.0)
     coderay (1.1.1)
@@ -123,29 +123,29 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)
     rake (11.2.2)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.2)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-rails (3.4.2)
-      actionpack (>= 3.0, < 4.3)
-      activesupport (>= 3.0, < 4.3)
-      railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    rubocop (0.40.0)
-      parser (>= 2.3.1.0, < 3.0)
+      rspec-support (~> 3.5.0)
+    rspec-rails (3.5.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rubocop (0.42.0)
+      parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
@@ -153,9 +153,9 @@ GEM
     ruby-progressbar (1.8.1)
     shoulda-matchers (3.1.1)
       activesupport (>= 4.0.0)
-    simplecov (0.11.2)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
@@ -181,18 +181,18 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.10)
+  bundler (~> 1.12)
   database_cleaner (= 1.5.3)
   factory_girl_rails (= 4.7.0)
   ffaker (= 2.2.0)
   monarchy!
   pry-rails (= 0.3.4)
   rake (~> 11.1)
-  rspec (= 3.4.0)
-  rspec-rails (= 3.4.2)
-  rubocop (= 0.40.0)
+  rspec (= 3.5.0)
+  rspec-rails (= 3.5.1)
+  rubocop (= 0.42.0)
   shoulda-matchers (= 3.1.1)
-  simplecov (= 0.11.2)
+  simplecov (= 0.12.0)
   sqlite3 (= 1.3.11)
   tqdm (= 0.3.0)
 

data/README.md

@@ -1,7 +1,10 @@
 [![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)
-![Monarchy Logo](monarchy.png?raw=true)
+
+<p align="center">
+  <img align="center" src="monarchy.png?raw=true" alt="Sublime's custom image"/>
+</p>
 
 ## Documentation
 There is existing fully documentation for that project in our Wiki. Take a look at [Monarchy Documentation] (https://github.com/Exelord/Monarchy/wiki)
@@ -10,11 +13,6 @@ There is existing fully documentation for that project in our Wiki. Take a look
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/exelord/Monarchy. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
-## Development
-Gem dependencies:
-- https://github.com/mceachen/closure_tree
-- https://github.com/beatrichartz/configurations
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/lib/generators/templates/config.rb

@@ -8,5 +8,4 @@ Monarchy.configure do |config|
   # config.user_class_name = 'User'
 
   # config.member_force_revoke = true
-  # config.restricted_role_names = ['member']
 end

data/lib/monarchy/acts_as_hierarchy.rb

@@ -9,8 +9,7 @@ module Monarchy
         has_closure_tree dependent: :destroy
 
         has_many :members, class_name: "::#{Monarchy.member_class}", dependent: :destroy
-        belongs_to :resource, polymorphic: true, dependent: :destroy
-
+        belongs_to :resource, polymorphic: true
         include_scopes
 
         validates :resource_type, presence: true
@@ -41,18 +40,14 @@ module Monarchy
 
       def accessible_leaves(user)
         descendant_leaves.where('monarchy_hierarchy_hierarchies.descendant_id': descendant_leaves_for_user(user)
-            .where('monarchy_roles.name': restricted_role_names)
+            .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.name': restricted_role_names))
+                .where.not('monarchy_roles.inherited': false))
             )
       end
 
-      def restricted_role_names
-        Array(Monarchy.configuration.restricted_role_names) + [default_role_name]
-      end
-
       def default_role_name
         Monarchy.configuration.default_role.name
       end

data/lib/monarchy/acts_as_resource.rb

@@ -82,7 +82,11 @@ module Monarchy
 
       def assign_parent(force = false)
         parent = self.class.parentize
-        self.parent = send(parent) if parent && (send("#{parent}_id_changed?") || force)
+
+        if parent
+          was_changed = changes["#{parent}_id"] || changes["#{parent}_type"]
+          self.parent = send(parent) if was_changed || force
+        end
       end
 
       def children_resources

data/lib/monarchy/acts_as_user.rb

@@ -81,8 +81,8 @@ module Monarchy
       end
 
       def revoking_role(role_name, resource, force = false)
-        member = member_for(resource)
-        member_roles = member.members_roles
+        member_roles = member_for(resource).try(:members_roles)
+        return 0 if member_roles.nil?
 
         return revoke_access(resource) if last_role?(member_roles, role_name) && force
         member_roles.joins(:role).where(monarchy_roles: { name: role_name }).delete_all

data/lib/monarchy/version.rb

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

data/lib/monarchy.rb

@@ -23,7 +23,6 @@ module Monarchy
     config.member_class_name = 'Monarchy::Member'
     config.role_class_name = 'Monarchy::Role'
     config.member_force_revoke = false
-    config.restricted_role_names = []
   end
 
   not_configured do |prop|

data/lib/tasks/monarchy_tasks.rake

@@ -2,17 +2,33 @@
 require 'tqdm'
 
 task 'monarchy:reparentize' do
+  p 'Monarchy reparentize...'
+
   Monarchy.resource_classes.with_progress.each do |klass|
     klass.all.each do |model|
       model.send(:assign_parent, true)
     end
   end
+
+  Monarchy::Hierarchy.rebuild!
+  p 'Monarchy reparentize ended!'
 end
 
 task 'monarchy:hierarchization' do
+  p 'Monarchy hierarchization...'
   Monarchy.resource_classes.with_progress.each do |klass|
     klass.all.each do |model|
       model.send(:ensure_hierarchy)
     end
   end
+  p 'Monarchy hierarchization ended!'
+end
+
+task 'monarchy:rebuild' do
+  p 'Rebuilding Monarchy...'
+
+  Rake::Task['monarchy:hierarchization'].invoke
+  Rake::Task['monarchy:reparentize'].invoke
+
+  p 'Rebuilding Monarchy ended!'
 end

data/monarchy.gemspec

@@ -26,12 +26,12 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency 'rails', '~> 4.2', '>= 4.2.4'
-  s.add_dependency 'closure_tree', '6.0.0'
+  s.add_dependency 'closure_tree', '6.1.0'
   s.add_dependency 'configurations', '2.2.0'
-  s.add_dependency 'active_record_union', '1.1.1'
+  s.add_dependency 'active_record_union', '1.2.0'
   s.add_dependency 'tqdm', '0.3.0'
 
-  s.add_development_dependency 'bundler', '~> 1.10'
+  s.add_development_dependency 'bundler', '~> 1.12'
   s.add_development_dependency 'rake', '~> 11.1'
-  s.add_development_dependency 'rspec', '3.4.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: 1.0.0
+  version: 1.1.3
 platform: ruby
 authors:
 - Exelord
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: configurations
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: tqdm
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +120,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
 description: Hierarchical access management system with roles inheritance.
 email:
 - ''