monarchy 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06424c3fd8fd9422b232967b61867089bc1411e4
-  data.tar.gz: 2d1fea1e4a50bbb1f64a02c156f16ee980bae7ea
+  metadata.gz: addca284a9a12f9d545fbf43ebf3de15908a6618
+  data.tar.gz: ba69a2d1eb4a11dff1a6ad294c9d2469b653d5f8
 SHA512:
-  metadata.gz: fdc98fcda0e37b21191488d55daa1380698a89cb0c55cf147feeae57965862b47fa0f6214aa8ae33c986fa080a9f3c23a6364b8ba360a54fcbef46f215ae6e69
-  data.tar.gz: 63eb3b30a58961cf0561f866aea7c9812db0f14a12cb914c3b04ef9900250d25b47ad8ace94e5164c0c0d4583bfcdebfde5b6c43f089d1270542219f43796e9b
+  metadata.gz: b0b5d0651fc8ea7b1bcf4e77bb532304fac7a3d695093510fcf11e2115bcc98ea2cc4a22b05bf1df6796a204bccaa63b74b21b6365f3804762f87fd6d15d0102
+  data.tar.gz: 7184060eb920b6323dfbe85ffac7e2f8725907c458be8f9691c6b305bf5443c4e74ec686bb101b7accd1bcfd4eb1a715fdc28402eeee2c6fed13175897bde2a8

data/.github_changelog_generator

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

data/.rubocop.yml

@@ -9,6 +9,8 @@ Documentation:
   Enabled: false
 Metrics/LineLength:
   Max: 125
+Metrics/ModuleLength:
+  Max: 150
 Style/CaseIndentation:
   Enabled: false
 Style/StructInheritance:

data/.travis.yml

@@ -1,4 +1,9 @@
+addons:
+  code_climate:
+    repo_token: 60b8a9fc7e8d659c7dd22ed8912651c35b3ca5eebf1c23d5470308e6a802abbd
 language: ruby
 rvm:
   - 2.3.1
 before_install: gem install bundler -v 1.12
+after_success:
+  - bundle exec codeclimate-test-reporter

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 # Change Log
 
-## [2.0.5](https://github.com/Exelord/Monarchy/tree/2.0.5) (2016-11-10)
-[Full Changelog](https://github.com/Exelord/Monarchy/compare/v2.0.4...2.0.5)
+## [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)
+
+**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)
 
 **Merged pull requests:**
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    monarchy (2.0.5)
+    monarchy (2.0.6)
       active_record_union (= 1.2.0)
       activerecord (>= 4.2.7.1)
       closure_tree (= 6.2.0)

data/README.md

@@ -12,6 +12,9 @@
   <a href="https://codeclimate.com/github/Exelord/Monarchy">
     <img src="https://codeclimate.com/github/Exelord/Monarchy/badges/gpa.svg">
   </a>
+  <a href="https://codeclimate.com/github/Exelord/Monarchy/coverage">
+    <img src="https://codeclimate.com/github/Exelord/Monarchy/badges/coverage.svg" />
+  </a>
 </p>
 
 Monarchy is a ruby gem offering a complete solution to manage an access in your web application.
@@ -33,19 +36,29 @@ manager_role = Monarchy.role_class.create(name: :manager, level: 4, inherited_ro
 project1 = Project.create()
 project2 = Project.create(parent: project1)
 project3 = Project.create(parent: project2)
-project4 = Project.create()
+project4 = Project.create(parent: project1)
 
 # Grant user
 user.grant(:manager, project2)
 
 # Accessible projects
-Project.accessible_for(user)  # returns [Project1, Project2, Project3]
+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 []
+
+# Graphical visualization
+
+#                              project1 (default role, eg. guest)
+#                                 |
+#                                 |
+#   (granted as manager) project2   project4 (no access)
+#                           |
+#                           |
+#                        project3 (admin | inherited role from manager_role)
 ```
 
 ## Requirements

data/lib/monarchy/acts_as_user.rb

@@ -55,10 +55,10 @@ module Monarchy
         accessible_roles = if inheritnce
                              resource_and_inheritance_roles(resource)
                            else
-                             resource_roles(resource).order('level desc')
+                             resource_roles(resource)
                            end
 
-        return accessible_roles if accessible_roles.present?
+        return accessible_roles.order(level: :desc, name: :asc) if accessible_roles.present?
         inheritnce ? descendant_role(resource) : Monarchy.role_class.none
       end
 
@@ -87,7 +87,12 @@ module Monarchy
       def descendant_role(resource)
         descendants = resource.hierarchy.descendants
         children_access = members_for(descendants).present?
-        children_access ? Monarchy.role_class.where(id: inherited_default_role) : Monarchy.role_class.none
+
+        if children_access
+          Monarchy.role_class.where(id: inherited_default_role).order(level: :desc, name: :asc)
+        else
+          Monarchy.role_class.none
+        end
       end
 
       def revoking_role(role_name, resource, strategy = nil)

data/lib/monarchy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monarchy
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Exelord
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord