the_role 1.6.9 → 1.7.0

data/README.md

@@ -203,13 +203,12 @@ You should to define **@ownership_checking_object** before invoke of **owner_req
 
 ```ruby
 class User
-  after_create :set_default_role
+  before_create :set_default_role
 
   private
 
   def set_default_role
     self.role = Role.where(:name => :user).first
-    self.save
   end
 end
 ```
@@ -379,6 +378,7 @@ new_role_hash = {
 
 ### Changelog
 
+* 1.7.0 - mass assignment for User#role_id, doc, locales, changes in test app
 * 1.6.9 - assets precompile addon
 * 1.6.8 - doc, re dependencies
 * 1.6.7 - Es locale (beta 0.2)
@@ -394,8 +394,12 @@ new_role_hash = {
 
 **Es** by @igmarin
 
+**zh_CN** by @doabit & @linjunpop
+
 ... waiting for contributors
 
+### MIT-LICENSE
+
 ##### Copyright (c) 2012 [Ilya N.Zykin]
 
 Permission is hereby granted, free of charge, to any person obtaining

data/config/locales/zh_CN.yml

@@ -0,0 +1,42 @@
+zh_CN:
+  the_role:
+    role_created:             角色已创建
+    role_updated:             角色已更新
+    role_deleted:             角色已删除
+    section_created:          章节已创建
+    section_not_created:      章节没有被创建
+    section_rule_created:     "章节的规则已创建"
+    section_rule_not_created: "章节的规则没有被创建"
+    section_rule_on:          "章节的规则可有"
+    section_rule_off:         "章节的规则不可有"
+    state_not_changed:        "章节的规则没有改变"
+    section_deleted:          章节已删除
+    section_not_deleted:      章节没有被删除
+    section_rule_deleted:     "章节的规则已被删除"
+    section_rule_not_deleted: "章节的规则没有被删除"
+
+  admin:
+    roles:
+      new:
+        create: 创建新角色
+        name: 角色名称 (字符串)
+        title: 角色标题 (文本)
+        description: 角色描述 (文本)
+      role:
+        role_name: '角色名称:'
+        title:     '角色标题:'
+        role_description: '角色描述:'
+        delete_section: 删除章节
+        section_delete_confirm: '你想要删除章节?'
+        rule_delete_confirm: '你想删除规则?'
+        enable: 可用
+        disable: 不可用
+        delete_rule: 删除规则
+        new_section_placeholder: 新章节名称
+        create_section: 创建新章节
+        new_rule_placeholder: 新规则名称
+        create_rule: 创建新规则
+      sidebar:
+        roles_list: 角色列表
+        new_role: 创建新角色
+        delete_role_confirm: '你确定? 可能存在风险!'

data/lib/tasks/roles.rake

@@ -1,5 +1,6 @@
 namespace :db do
   namespace :roles do
+
     # rake db:roles:test
     desc 'create roles'
     task :test => :environment do
@@ -9,16 +10,23 @@ namespace :db do
           :administrator => true
         }
       }
-      Role.new(
-        :name => :admin,
-        :title => 'Administrator',
+
+      Role.create!(
+        :name        => :admin,
+        :title       => 'Administrator',
         :description => 'Role for administrator',
-        :the_role => role.to_json
-      ).save!
+        :the_role    => role.to_json
+      )
+
       puts 'Administrator'
 
       # MODERATOR
       role = {
+        :users => {
+          :edit   => true,
+          :show   => true,
+          :update => true
+        },
         :moderator => {
           :pages => true
         },
@@ -26,95 +34,101 @@ namespace :db do
           :html => true
         }
       }
-      Role.new(
+
+      Role.create!(
         :name => :moderator,
-        :title => 'Moderator of pages',
+        :title       => 'Moderator of pages',
         :description => "Moderator #1",
-        :the_role => role.to_json
-      ).save!
+        :the_role    => role.to_json
+      )
+
       puts 'Moderator of pages'
 
       # USER
       role = {
         :users => {
-          :cabinet => true,
-          :update => true,
-          :avatar_upload => true
+          :edit   => true,
+          :show   => true,
+          :update => true
         },
         :profiles => {
-          :edit => true,
+          :edit   => true,
           :update => true
         },
-        :articles => {
-          :new => true,
-          :create => true,
-          :edit => true,
-          :update => true,
+        :articles  => {
+          :new     => true,
+          :create  => true,
+          :edit    => true,
+          :update  => true,
           :destroy => true,
-          :tags => false
+          :tags    => false
         },
         :pages => {
-          :new => true,
-          :create => true,
-          :edit => true,
-          :update => true,
+          :new     => true,
+          :create  => true,
+          :edit    => true,
+          :update  => true,
           :destroy => true,
-          :tags => true
+          :tags    => true
         },
         :markup => {
           :html => false
         }
       }
-      Role.new(
-        :name => :user,
-        :title => 'User',
+
+      Role.create!(
+        :name        => :user,
+        :title       => 'User',
         :description => "Role for User",
-        :the_role => role.to_json
-      ).save!
+        :the_role    => role.to_json
+      )
+
       puts 'User'
 
       # DEMO
       role = {
         :users => {
-          :cabinet => true,
-          :update => false,
-          :avatar_upload => false
+          :edit   => true,
+          :show   => true,
+          :update => true
         },
         :profiles => {
-          :edit => true,
+          :edit   => true,
           :update => false
         },
-        :articles => {
-          :new => true,
-          :show => true,
-          :create => false,
-          :edit => true,
-          :update => false,
+        :articles  => {
+          :new     => true,
+          :show    => true,
+          :create  => false,
+          :edit    => true,
+          :update  => false,
           :destroy => false,
-          :tags => false
+          :tags    => false
         },
         :pages => {
-          :new => true,
-          :show => true,
-          :create => false,
-          :edit => true,
-          :update => false,
+          :new     => true,
+          :show    => true,
+          :create  => false,
+          :edit    => true,
+          :update  => false,
           :destroy => false,
-          :tags => false
+          :tags    => false
         },
         :markup => {
           :html => false
         }
       }
-      Role.new(
-        :name => :demo,
-        :title => 'Demo',
+
+      Role.create!(
+        :name        => :demo,
+        :title       => 'Demo',
         :description => "Demo user",
-        :the_role => role.to_json
-      ).save!
+        :the_role    => role.to_json
+      )
+
       puts 'Demo'
 
       puts 'Roles created'
-    end#test
-  end#roles
-end#db
+    end
+  end
+end

data/lib/the_role/modules/role_model.rb

@@ -58,10 +58,6 @@ module TheRole
           the_role
         end
 
-        def to_s
-          the_role
-        end
-
         # U
 
         # source_hash will be reset to false

data/lib/the_role/modules/user_model.rb

@@ -23,8 +23,7 @@ module TheRole
 
     def self.included(base)
       base.class_eval do
-        belongs_to      :role
-        attr_accessible :role
+        belongs_to :role
         after_save { |user| user.instance_variable_set(:@role_hash, nil) }
       end
     end

data/lib/the_role/version.rb

@@ -1,3 +1,3 @@
 module TheRole
-  VERSION = "1.6.9"
+  VERSION = "1.7.0"
 end

data/the_role.gemspec

@@ -5,7 +5,7 @@ require "the_role/version"
 Gem::Specification.new do |s|
   s.name        = "the_role"
   s.version     = TheRole::VERSION
-  s.authors     = ["Ilya N. Zykin [the-teacher], John Henderson [jhenderson]"]
+  s.authors     = ["Ilya N. Zykin [the-teacher]"]
   s.email       = ["zykin-ilya@ya.ru"]
   s.homepage    = "https://github.com/the-teacher/the_role"
   s.summary     = %q{Authorization lib for Rails 3 with Web Interface, aka CanCan killer}

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: the_role
 version: !ruby/object:Gem::Version
-  version: 1.6.9
+  version: 1.7.0
   prerelease: 
 platform: ruby
 authors:
-- Ilya N. Zykin [the-teacher], John Henderson [jhenderson]
+- Ilya N. Zykin [the-teacher]
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000 Z
+date: 2012-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &16822500 !ruby/object:Gem::Requirement
+  requirement: &21325720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16822500
+  version_requirements: *21325720
 description: Authorization lib for Rails 3 with Web Interface, aka CanCan killer
 email:
 - zykin-ilya@ya.ru
@@ -33,7 +33,6 @@ files:
 - .rvmrc.example
 - Bye_bye_CanCan_I_got_the_Role.png
 - Gemfile
-- MIT-LICENSE
 - README.md
 - Rakefile
 - app/assets/javascripts/admin_the_role.js
@@ -56,6 +55,7 @@ files:
 - config/locales/en.yml
 - config/locales/es.yml
 - config/locales/ru.yml
+- config/locales/zh_CN.yml
 - config/routes.rb
 - db/migrate/20111025025129_create_roles.rb
 - lib/tasks/roles.rake

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2011 [name of plugin creator]
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.