monarchy 2.0.8 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a877a7ac740060484a3f64d5d0f9fbb7fcf310b
-  data.tar.gz: f26a5bd2af7906227bb78e9a35937e9bfd2ebe4a
+  metadata.gz: 4c1b86d97c67b9409578191ef62d270fb906dec7
+  data.tar.gz: 77e1921b3153f9ebd4ec32a7a025efae77c9ec05
 SHA512:
-  metadata.gz: 8727e6be4d706c8117fc1dae73f19bff9cab7e57269c2c85e942f14b4dbf7e9e761a065ecd8d031fe13c39ce1b6961073dd8e4d6e4937e2c558253bc910668e0
-  data.tar.gz: 2fd0924823fba6765740c972246a1db28cb358be122c290a28957451b85bc886e306ad89d1c6797436f0a74e763de5f0c70255fb10fdcf0b6dce8c84974c1b8f
+  metadata.gz: a25851a0766ad737e3707026aae70160d28077de7c545bdfea6e1b0645bad7ecd460c90192162632c80a2d860944e5f462799660dc2af9c59542779dc4b8ebe5
+  data.tar.gz: e1ad1bf1ee4f3f6eca2c722a30fb38e1efd1e61dcae631506b54c6554dba33e4ca6a257e72faba47df681a9deeb1d80f4efe6c8816f6dfd9dc3cd41bcc7614cf

data/.github_changelog_generator

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

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
   Exclude:
    - 'dummy/db/seeds.rb'
    - 'dummy/db/migrate/**'
@@ -11,6 +11,8 @@ Metrics/LineLength:
   Max: 125
 Metrics/ModuleLength:
   Max: 150
+Metrics/BlockLength:
+  ExcludedMethods: ['describe', 'context']
 Style/CaseIndentation:
   Enabled: false
 Style/StructInheritance:

data/.travis.yml

@@ -3,7 +3,7 @@ addons:
     repo_token: 60b8a9fc7e8d659c7dd22ed8912651c35b3ca5eebf1c23d5470308e6a802abbd
 language: ruby
 rvm:
-  - 2.3.1
-before_install: gem install bundler -v 1.12
+  - 2.4.0
+before_install: gem update --system
 after_success:
   - bundle exec codeclimate-test-reporter

data/CHANGELOG.md

@@ -1,7 +1,15 @@
 # Change Log
 
-## [2.0.8](https://github.com/Exelord/Monarchy/tree/2.0.8) (2017-01-12)
-[Full Changelog](https://github.com/Exelord/Monarchy/compare/v2.0.7...2.0.8)
+## [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)
+
+**Merged pull requests:**
+
+- Users/Members with\_access\_to specific resource [\#70](https://github.com/Exelord/Monarchy/pull/70) ([Exelord](https://github.com/Exelord))
+- Update gems [\#69](https://github.com/Exelord/Monarchy/pull/69) ([Exelord](https://github.com/Exelord))
+
+## [v2.0.8](https://github.com/Exelord/Monarchy/tree/v2.0.8) (2017-01-12)
+[Full Changelog](https://github.com/Exelord/Monarchy/compare/v2.0.7...v2.0.8)
 
 **Merged pull requests:**
 

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 source 'https://rubygems.org'
-ruby '2.3.1'
+ruby '2.4.0'
 
 # Declare your gem's dependencies in monarchy.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
@@ -22,11 +22,10 @@ group :development, :test do
   gem 'pry-rails', '0.3.4'
   gem 'rails', '5.0.1'
   gem 'rspec-rails', '3.5.2'
-  gem 'rubocop', '0.46.0'
+  gem 'rubocop', '0.47.1'
   gem 'shoulda-matchers', '3.1.1'
   gem 'sqlite3', '1.3.13'
-  gem 'tqdm', '0.3.0'
 end
 
-gem 'codeclimate-test-reporter', '1.0.4', group: :test
-gem 'simplecov', '0.12.0', group: :test
+gem 'codeclimate-test-reporter', '~>1.0.5', group: :test
+gem 'simplecov', '0.13.0', group: :test

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    monarchy (2.0.8)
+    monarchy (2.1.0)
       active_record_union (= 1.2.0)
       activerecord (>= 4.2.7.1)
-      closure_tree (= 6.2.0)
+      closure_tree (= 6.3.0)
       configurations (= 2.2.2)
       tqdm (= 0.3.0)
 
@@ -52,17 +52,17 @@ GEM
       tzinfo (~> 1.1)
     arel (7.1.4)
     ast (2.3.0)
-    builder (3.2.2)
-    closure_tree (6.2.0)
+    builder (3.2.3)
+    closure_tree (6.3.0)
       activerecord (>= 4.1.0)
       with_advisory_lock (>= 3.0.0)
-    codeclimate-test-reporter (1.0.4)
+    codeclimate-test-reporter (1.0.5)
       simplecov
     coderay (1.1.1)
     concurrent-ruby (1.0.4)
     configurations (2.2.2)
     database_cleaner (1.5.3)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
     erubis (2.7.0)
     factory_girl (4.8.0)
@@ -73,7 +73,7 @@ GEM
     ffaker (2.4.0)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
-    i18n (0.7.0)
+    i18n (0.8.0)
     json (2.0.3)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
@@ -88,7 +88,7 @@ GEM
     nio4r (1.2.1)
     nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
-    parser (2.3.3.1)
+    parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
     pry (0.10.4)
@@ -146,8 +146,8 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.46.0)
-      parser (>= 2.3.1.1, < 3.0)
+    rubocop (0.47.1)
+      parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
@@ -155,7 +155,7 @@ GEM
     ruby-progressbar (1.8.1)
     shoulda-matchers (3.1.1)
       activesupport (>= 4.0.0)
-    simplecov (0.12.0)
+    simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
@@ -174,8 +174,8 @@ GEM
     tqdm (0.3.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unicode-display_width (1.1.2)
-    websocket-driver (0.6.4)
+    unicode-display_width (1.1.3)
+    websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     with_advisory_lock (3.0.0)
@@ -187,7 +187,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.12)
-  codeclimate-test-reporter (= 1.0.4)
+  codeclimate-test-reporter (~> 1.0.5)
   database_cleaner (= 1.5.3)
   factory_girl_rails (= 4.8.0)
   ffaker (= 2.4.0)
@@ -197,14 +197,13 @@ DEPENDENCIES
   rake (~> 12.0)
   rspec (= 3.5.0)
   rspec-rails (= 3.5.2)
-  rubocop (= 0.46.0)
+  rubocop (= 0.47.1)
   shoulda-matchers (= 3.1.1)
-  simplecov (= 0.12.0)
+  simplecov (= 0.13.0)
   sqlite3 (= 1.3.13)
-  tqdm (= 0.3.0)
 
 RUBY VERSION
-   ruby 2.3.1p112
+   ruby 2.4.0p0
 
 BUNDLED WITH
-   1.13.7
+   1.14.3

data/docs/acts_as_member.md

@@ -22,6 +22,13 @@ You can select all members accessible for specific user by using a scope: `acces
 ``` ruby
 Monarchy::member_class.accessible_for(current_user)   # returns [member1, member2, member5]
 ```
+
+### .with_access_to
+You can select all members with access to the specific resource by using a scope: `with_access_to`, eg:
+``` ruby
+Monarchy::member_class.with_access_to(resource)   # returns [member1, member2, member5]
+```
+
 ## Public Relations:
 
 ### #roles

data/docs/acts_as_user.md

@@ -22,6 +22,12 @@ Returns all memberships (`member` model) of the user
 Returns all users accessible for the specific user
 It includes all users from all resource which the user has any access.
 
+### .with_access_to
+You can select all users with access to the specific resource by using a scope: `with_access_to`, eg:
+``` ruby
+Monarchy::user_class.with_access_to(resource)   # returns [user1, user2, user5]
+```
+
 ## Methods
 
 ### #roles_for(resource, inheritance = true)

data/lib/monarchy/acts_as_member.rb

@@ -26,6 +26,11 @@ module Monarchy
           Monarchy::Validators.user(user)
           where(hierarchy: Monarchy.hierarchy_class.accessible_for(user))
         end)
+
+        scope :with_access_to, (lambda do |resource|
+          Monarchy::Validators.resource(resource)
+          with_ancestors_access(resource).union(with_descendants_access(resource))
+        end)
       end
 
       def include_callbacks
@@ -45,6 +50,17 @@ module Monarchy
         belongs_to :user, class_name: "::#{Monarchy.user_class}"
         belongs_to :hierarchy, class_name: "::#{Monarchy.hierarchy_class}"
       end
+
+      private
+
+      def with_ancestors_access(resource)
+        unscoped.where(hierarchy: resource.hierarchy.self_and_ancestors)
+                .joins(:roles).where(monarchy_roles: { inherited: true })
+      end
+
+      def with_descendants_access(resource)
+        unscoped.where(hierarchy: resource.hierarchy.descendants)
+      end
     end
 
     module InstanceMethods

data/lib/monarchy/acts_as_user.rb

@@ -5,14 +5,26 @@ module Monarchy
 
     module ClassMethods
       def acts_as_user
+        extend Monarchy::ActsAsUser::SupportMethods
+
         has_many :members, class_name: "::#{Monarchy.member_class}", dependent: :destroy
         has_many :hierarchies, through: :members, class_name: "::#{Monarchy.hierarchy_class}"
 
+        include_scopes
+
+        include Monarchy::ActsAsUser::InstanceMethods
+      end
+    end
+
+    module SupportMethods
+      def include_scopes
         scope :accessible_for, (lambda do |user|
           where(id: Monarchy.member_class.accessible_for(user).select('user_id AS id')).union(where(id: user.id))
         end)
 
-        include Monarchy::ActsAsUser::InstanceMethods
+        scope :with_access_to, (lambda do |resource|
+          User.where(id: Member.with_access_to(resource).select(:user_id))
+        end)
       end
     end
 

data/lib/monarchy/version.rb

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

data/monarchy.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.3'
 
   s.add_dependency 'activerecord', '>=4.2.7.1'
-  s.add_dependency 'closure_tree', '6.2.0'
+  s.add_dependency 'closure_tree', '6.3.0'
   s.add_dependency 'configurations', '2.2.2'
   s.add_dependency 'active_record_union', '1.2.0'
   s.add_dependency 'tqdm', '0.3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monarchy
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.1.0
 platform: ruby
 authors:
 - Exelord
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 6.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 6.3.0
 - !ruby/object:Gem::Dependency
   name: configurations
   requirement: !ruby/object:Gem::Requirement
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Hierarchical access management system with roles inheritance.