easy_login 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a57e821422a316de12f805f9f639473334d33b5
-  data.tar.gz: e544cf4de046b12c993b612b172f71cbc81c41fa
+  metadata.gz: e00cd84fb0550b1f959fd94e89b221d5b8ae86bd
+  data.tar.gz: c570dcae15f361d3c20809352f027d614f2395f3
 SHA512:
-  metadata.gz: 3e7a69063d661542d440bc69005ce716d797e730b72abb09529b4d7fe95314cdaa62bd46986f95dfeb2f3d6b1576590d043df83bebd825060496dc84caf5fe45
-  data.tar.gz: 95f8672679ae005263b8dd3d4aa64ecd57710dfa641043727f457fbb40c908f386987ebabe8c2b46025bc6f2c7935d6a35717428236ba99e1590bdd1eb85a9b8
+  metadata.gz: 85626c496515785223794660e051b19e58a1c1a97e3b630683fd1054df7a4e2396cf1c2835ffaf57a2de7025cf210225d64b2fbfb60c193870efcd04218ed57a
+  data.tar.gz: 03f6b8b3ac5394d18157d59e106e0167a1d39c9938acbecf8a2e1e9375bba2e7afc90e6adbcad665440f8149788e70c8fd3670df98b59eea323fae8f0a024f83

data/README.md

@@ -47,41 +47,44 @@ Add a config file to `config/redirect_to.yml` as following
 
 ```yaml
 default:
-  unsign: login_users_path
+  ope: pass
+  customer: pass
+  unsigned: redirect_to->login_users_path
 users:
   login:
-    ope: root_path
-    customer: root_path
+    ope: redirect_to->root_path
+    customer: redirect_to->root_path
 tools:
   default:
-    customer: 404
-    unsign: /tools/login
+    customer: raise->Routing Error
+    unsigned: redirect_to->/tools/login
   login:
-    ope: tools_path
-    customer: 404
+    ope: redirect_to->tools_path
+    customer: raise->Other Error
 ```
 
-The basic format for this redirect schema is like
+The basic format for this permission schema is like
 
 ```yaml
 controller:
   action:
-    user_role1: redirect_url
-    user_role2: redirect_url
-    user_role3: redirect_url
+    user_role1: pass
+    user_role2: redirect_to->{path}
+    user_role3: raise->{message}
 ```
 
 The `user_role` if the role attribute of your user model configed in
 `config/application.rb` or `config/environments/*.rb`  
-`redirect_url` has 3 types
+`action` has 3 types
 
 ```
-404 --> means raise a 404 error name 'Routing Error'
-XXXX_path --> means using rails routing method
-nil --> means not redirect and render view absolutely
-otherwise --> means using as absolute url string
+pass --> run the logic in action normally
+redirect_to --> redirect to other {path}, {path} also has two types, {xxx_path} means using rails routing method, and {other format} means used as absolute url string
+raise --> raise a 404 response with {message}
 ```
 
+If the schema was not defined in controller/action/user_role, the schema in controller/default/user_role will be used, Also, if it was not defined in controller/default/user_role, default/user_role will be used, if still default/user_role could not be found, easylogin will do action same as 'pass'
+
 *※ If you also want to use in ActionCable in Rails 5*  
 Add following code to `application_cable/connection.rb`
 

data/lib/easy_login/permission.rb

@@ -0,0 +1,35 @@
+module EasyLogin
+	class Permission
+		def self.action(controller_ins)
+      url = self.parse controller_ins
+			if url
+        params = url.split ':'
+        return if params[0] == "pass"
+				raise ActionController::RoutingError.new(params[1]) if params[0] == "raise"
+        if params[0] == "redirect_to"
+          params[1] = controller_ins.send params[1] if params[1].end_with? "path"
+          controller_ins.redirect_to params[1]
+        end
+			end
+		end
+
+    private
+    def self.parse(controller_ins)
+      per = YAML.load_file Rails.root.join "config", "easy_login_permission.yml"
+      controller = controller_ins.params[:controller]
+      action = controller_ins.params[:action]
+
+      default = nil
+      role = controller_ins.signed_in? ? controller_ins.current_user.send(EasyLogin.config.user_role_attr) : 'unsigned'
+      default = per['default'][role] if per['default'] && per['default'][role]
+
+      return default unless per[controller]
+      per = per[controller]
+      default = per['default'][role] if per['default'] && per['default'][role]
+
+      return default unless per[action]
+      per = per[action]
+      return per[role] || default
+    end
+	end
+end

data/lib/easy_login/version.rb

@@ -1,3 +1,3 @@
 module EasyLogin
-  VERSION = "1.1.0"
+  VERSION = "1.1.2"
 end

data/lib/easy_login.rb

@@ -6,7 +6,7 @@ require "easy_login/version"
 require "easy_login/config"
 require "easy_login/session"
 require "easy_login/grape_helper"
-require "easy_login/redirect"
+require "easy_login/permission"
 
 module EasyLogin
 	def self.helper_method
@@ -30,7 +30,7 @@ module EasyLogin
     if base == ApplicationController
       base.helper_method EasyLogin.helper_method
       base.send :before_action do |controller|
-        Redirect.parse controller
+        Permission.action controller
       end
     elsif base == ApplicationCable::Connection
       base.send :identified_by, :client

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_login
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - goshan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,7 +70,7 @@ files:
 - lib/easy_login.rb
 - lib/easy_login/config.rb
 - lib/easy_login/grape_helper.rb
-- lib/easy_login/redirect.rb
+- lib/easy_login/permission.rb
 - lib/easy_login/session.rb
 - lib/easy_login/version.rb
 - pkg/easy_login-0.1.0.gem

data/lib/easy_login/redirect.rb

@@ -1,23 +0,0 @@
-module EasyLogin
-	class Redirect
-		def self.parse(controller_ins)
-			per = YAML.load_file Rails.root.join "config", "redirect_to.yml"
-			controller = controller_ins.params[:controller]
-			action = controller_ins.params[:action]
-			p = per[controller]
-			p = p[action] || p['default'] if p
-			p = per['default'] unless p
-			if controller_ins.signed_in?
-				url = p[controller_ins.current_user.send(EasyLogin.config.user_role_attr)]
-			else
-				url = p['unsign']
-			end
-			if url
-				raise ActionController::RoutingError.new("Routing Error") if url == 404
-				url = controller_ins.send url if url.end_with? "path"
-        return if url == "nil"
-				controller_ins.redirect_to url
-			end
-		end
-	end
-end