the_role 2.5.2 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12b0ae2b2e4a5afcc9026717b0c81155f02fa4d7
-  data.tar.gz: 7867224f80ba6715d9d3a562e77ea04f642a592f
+  metadata.gz: 2c29fc0d973ff434fce0aa391383b08339ca3892
+  data.tar.gz: df6130fb9708c35a2a918c043cecb3e6cf2cbc48
 SHA512:
-  metadata.gz: e768d539904516605ab9be3e3de04debe263116639edf2891eef306ced2db0c16008d3a7f9cfe3cc73f3ec054ca62d60deda76703e821c99d083d20ee7ee8681
-  data.tar.gz: d343d3fc7478400b0903eb278b0db31ce0653a27bf69ef478d9bd91486fafa06843bf9c57b01bd55c0903ff9ae07aa1ef4239534953396fa72c482ac5ffc1d4d
+  metadata.gz: db22cab2f348f17cc28282f308d45a5371228ea8a0c38b45b7035d9806344a37b06a4825a908fdd3cd6d8d01eba4e60e7170302a8605877e137c4789e55fc304
+  data.tar.gz: 6bc9f19977d48ee6a0fa59a42fa2dc0f3dacd9116fbb3cc46580934602e7e570572c5e342be89588b76eac1e21447e5f9533d024ca8ff25bfae0e1956cd574d7

data/README.md

@@ -44,7 +44,7 @@ puts following yields into your layout:
 ### Rails 4 version
 
 ```
-gem 'the_role', '~> 2.4'
+gem 'the_role', '~> 2.5.2'
 
 gem 'the_role_bootstrap3_ui'
 ```

data/app/controllers/admin/roles_controller.rb

@@ -56,7 +56,7 @@ class Admin::RolesController < ApplicationController
   protected
 
   def role_params
-    params.require(:role).permit(:name, :title, :description, :the_role)
+    params.require(:role).permit(:name, :title, :description, :the_role, :based_on_role)
   end
 
   def role_find

data/app/models/concerns/role.rb

@@ -16,17 +16,29 @@ module TheRole
     end
 
     included do
+      attr_accessor :based_on_role
+
       has_many  :users, dependent: TheRole.config.destroy_strategy
       validates :name,  presence: true, uniqueness: true
       validates :title, presence: true, uniqueness: true
       validates :description, presence: true
 
+      private
+
       before_save do
         self.name = name.to_slug_param(sep: '_')
 
-        rules_set = self.the_role
-        self.the_role = {}.to_json if rules_set.blank? # blank
-        self.the_role = rules_set.to_json if rules_set.is_a?(Hash) # Hash
+        rules_set     = self.the_role
+        self.the_role = {}.to_json        if rules_set.blank?
+        self.the_role = rules_set.to_json if rules_set.is_a?(Hash)
+      end
+
+      after_create do
+        unless based_on_role.blank?
+          if base_role = self.class.where(id: based_on_role).first
+            update_role base_role.to_hash
+          end
+        end
       end
     end
 

data/config/locales/en.yml

@@ -23,6 +23,7 @@ en:
         name: Name of role (underscored latin string)
         title: Title of role (text)
         description: Description of role (text)
+        based_on_role: "New role will be based on:"
       role:
         role_name: 'Role name:'
         title:     'Title:'

data/config/locales/ru.yml

@@ -22,6 +22,7 @@ ru:
         name: Имя роли (строка из латинских символов + нижнее подчеркивание)
         title: Заголовок роли
         description: Описание роли
+        based_on_role: "Новая роль будет основана на:"
       role:
         role_name: 'Имя роли:'
         title:     'Заголовок:'

data/lib/the_role/version.rb

@@ -1,3 +1,3 @@
 module TheRole
-  VERSION = "2.5.2"
+  VERSION = "2.5.3"
 end

data/spec/dummy_app/Gemfile

@@ -18,17 +18,21 @@ gem 'uglifier'
 gem 'jquery-rails'
 gem 'jbuilder', '~> 1.0.1'
 
-gem 'the_string_to_slug',
-  path: "../../../the_string_to_slug"
+# gem 'the_string_to_slug', path: "../../../the_string_to_slug"
 
 gem 'the_role',
-  # "~> 2.5.1"
-  path: '../../'
+  # path: '../../'
+  "~> 2.5.3"
 
 gem 'the_role_bootstrap3_ui',
+  # path: "path: '../../../../../the_role_bootstrap3_ui"
   github: 'the-teacher/the_role_bootstrap3_ui',
   branch: 'master'
 
+group :development do
+  gem 'pry-rails'
+end
+
 group :test do
   gem 'factory_girl_rails', '~> 4.0'
   gem 'database_cleaner', git: 'https://github.com/bmabey/database_cleaner.git', tag: 'v1.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: the_role
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.3
 platform: ruby
 authors:
 - Ilya N. Zykin [the-teacher]
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: the_string_to_slug