the_role_api 3.0.3 → 3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e674f0dd2dc0594d5ac45772e90d9598e3826f9
-  data.tar.gz: a09b705f2a54564c4ace010b930d4dc44352b7f8
+  metadata.gz: 5a844d9bf293e91485ac8d799c3290c7d0bb2632
+  data.tar.gz: 089fa53faea125dfea6ffe8beb4d6643cb57c09b
 SHA512:
-  metadata.gz: 792835ea786a1213b135f3474df426b56298c65105a4f0415e7f9dc809e050aa6e974cda0eaa501c49243f95ba5b59d4ae9696596c445de907fb714dee13a1bd
-  data.tar.gz: e77808eb708ba630b59eda57dbde30c4af27ee624b1f25f70a018d6ee7d7706166f688d1578ed86267c4c3cfe04b00c3b89330db0e5865e95ab3eb51020e88f9
+  metadata.gz: 5d3d457ce0c1978db76cc1d7204a7ba65e148d1f6ee896da9a0f1209a4addb94fd98826f9685d88b70c4721a6b8f5afbb9785f8f1ef959e3c9ce5c33669c3035
+  data.tar.gz: 54d290cd963068817beedc68097786cbaca2fc2d0509655425dfe75bd682be3077ff20b9389a3cb1db2e5887ef21d71cac4cebfe3a08cdc56140192c253adee4

data/README.md

@@ -16,14 +16,11 @@
 </p>
 
 <div align="center" class='center' style="text-align:center">
-
-<a href="http://badge.fury.io/rb/the_role"><img src="https://badge.fury.io/rb/the_role.svg" alt="Gem Version" height="18"></a>
-&nbsp;
-<a href="https://travis-ci.org/TheRole/DummyApp"><img src="https://travis-ci.org/TheRole/DummyApp.svg?branch=master" alt="Build Status" height="18"></a>
-&nbsp;
-<a href="https://codeclimate.com/github/TheRole/TheRoleApi"><img src="https://codeclimate.com/github/TheRole/TheRoleApi/badges/gpa.svg" /></a>
-&nbsp;
-<a href="https://www.ruby-toolbox.com/categories/rails_authorization">ruby-toolbox</a>
+TheRole: <a href="http://badge.fury.io/rb/the_role"><img src="https://badge.fury.io/rb/the_role.svg" alt="Gem Version" height="18"></a>
+API: <a href="http://badge.fury.io/rb/the_role_api"><img src="https://badge.fury.io/rb/the_role_api.svg" alt="Gem Version" height="18"></a>
+GUI: <a href="http://badge.fury.io/rb/the_role_management_panel"><img src="https://badge.fury.io/rb/the_role_management_panel.svg" alt="Gem Version" height="18"></a>
+CI: <a href="https://travis-ci.org/TheRole/DummyApp"><img src="https://travis-ci.org/TheRole/DummyApp.svg?branch=master" alt="Build Status" height="18"></a>
+&nbsp;<a href="https://www.ruby-toolbox.com/categories/rails_authorization">ruby-toolbox</a>
 </div>
 
 <hr>

data/app/controllers/concerns/the_role/controller.rb

@@ -46,7 +46,12 @@ module TheRole
           has_access_to_object: current_user.try(:owner?, @owner_check_object)
         }, status: 401
       else
-        redirect_to :back, flash: { error: access_denied_msg }
+        # When the user paste non authorized URL in browser the REFERER is blank and application crash
+        if request.env["HTTP_REFERER"].present? and request.env["HTTP_REFERER"] != request.env["REQUEST_URI"]
+          redirect_to :back, flash: { error: access_denied_msg }
+        else
+          redirect_to root_path, flash: { error: access_denied_msg }
+        end
       end
     end
   end

data/app/models/concerns/the_role/api/role.rb

@@ -27,6 +27,7 @@ module TheRole
       def to_json
         the_role
       end
+
       # ~ HELPERS
 
       alias_method :has?, :has_role?
@@ -55,7 +56,7 @@ module TheRole
         end
 
         after_create do
-          unless based_on_role.blank?
+          if based_on_role.present?
             if base_role = self.class.where(id: based_on_role).first
               update_role base_role.to_hash
             end

data/app/models/concerns/the_role/api/user.rb

@@ -6,11 +6,14 @@ module TheRole
       include TheRole::Api::BaseMethods
 
       # HELPERS
+
       # version for `User`  model
       def role_hash
         @role_hash ||= role.try(:to_hash) || {}
       end
 
+      # ~ HELPERS
+
       included do
         belongs_to :role
         before_validation :set_default_role, on: :create

data/config/locales/zh_CN.the_role.yml

@@ -1,3 +1,12 @@
 zh_CN:
+  activerecord:
+    models:
+      role: "角色"
+    attributes:
+      role:
+        name: "角色名"
+        title: "角色代码"
+        description: "角色描述"
+        
   the_role:
-    access_denied: "Access Denied"
+    access_denied: "拒绝访问"

data/gem_version.rb

@@ -1,3 +1,3 @@
 module TheRoleApi
-  VERSION = "3.0.3"
+  VERSION = "3.5"
 end

data/lib/the_role_api.rb

@@ -30,17 +30,11 @@ module TheRole
       %w[ base_methods role user ].each do |file|
         require_dependency "#{ app }/models/concerns/the_role/api/#{ file }.rb"
       end
-    end
-
-    if Rails::VERSION::MAJOR == 4
+    else
       config.autoload_paths << "#{ config.root }/app/models/concerns/**"
       config.autoload_paths << "#{ config.root }/app/controllers/concerns/**"
     end
 
-    if Rails::VERSION::MAJOR == 5
-      raise Exception.new("TheRole 3. Version for Rails 5 not tested yet")
-    end
-
     initializer "the_role_precompile_hook", group: :all do |app|
       app.config.assets.precompile += %w(
         the_role_management_panel.js

data/the_role_api.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'multi_json'
   s.add_dependency 'the_string_to_slug', '~> 1.2'
-  s.add_runtime_dependency 'rails', ['>= 3.2', '< 5']
+  s.add_runtime_dependency 'rails', ['>= 3.2', '< 6']
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: the_role_api
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: '3.5'
 platform: ruby
 authors:
 - Ilya N. Zykin [the-teacher]
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -47,7 +47,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 description: Authorization for Rails with Web Interface
 email:
 - zykin-ilya@ya.ru
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Authorization for Rails