keycloak-ruby-client 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15e664b3d8f91b89f7f6486f322a364a5b201045
-  data.tar.gz: a87cad169868812f3504296963c5306ea62f8c9c
+  metadata.gz: 91adde1a917a9abc16e320afab4bceb64ffcc177
+  data.tar.gz: 349fe8ced7814acfd3f9b09a77aa4d0b4cff0afd
 SHA512:
-  metadata.gz: 3f4a1411d8033cfb0a1b9c4e551377266d3ced6c801e32ece8908220438735d0a899cf57728be994635284d7167a13932f663464cecd1771ccce3db1b1126fe7
-  data.tar.gz: 5931bbeb64841be046af2877ae8df52669c44e504ae1e32a515ceca1e39ff17fdc544247f329e3b8cd18b6a571aa75a4c94e81d532b4c56f38ecfc1b8c2f1d2d
+  metadata.gz: 4f2f96727de3173f496d9919cd85e5acec9d5ec6fe85dcfe28c164e296befa01fa9a4ea054c682d5f37b5e7ac163bddec2aebcfb973308a895e26d1fcdda0db7
+  data.tar.gz: 246966257694d98680ee4cb821dbc190c6f55833fe980901eb5467552744cd209e5a1198c935d064d233e5c402cbbcb2cbfc4bc62d4146182afb02bfce7b27dd

data/README.md

@@ -136,7 +136,9 @@ Your model file `User.rb` as the following:
 class User < ApplicationRecord
   include Keycloak::UserEntity
   
-  use_keycloak_client Keycloak::Realm.shundao_admin.client
+  def keycloak_client
+    Keycloak::Realm.shundao_admin.client
+  end
 end
 ```
 

data/lib/keycloak/user_entity.rb

@@ -2,34 +2,31 @@ module Keycloak
   module UserEntity
     extend ActiveSupport::Concern
 
-    class_methods do
-      cattr_reader :keycloak_client
-
-      # @param client [Keycloak::Client] keycloak client
-      def use_keycloak_client(client)
-        @keycloak_client = client
+    included do
+      def keycloak_client
+        raise NotImplementedError
       end
-    end
 
-    included do
       def keycloak_identify
         id
       end
 
       def user_info(reload = false)
-        _set_or_get_keycloak_data(:user_info, reload) { keycloak_client.find_user(keycloak_identify) }
+        _set_or_get_keycloak_data(:@user_info, reload) { keycloak_client.find_user(keycloak_identify) }
       end
 
       def realm_roles(reload = false)
-        _set_or_get_keycloak_data(:realm_roles, reload) { keycloak_client.find_user_realm_roles(keycloak_identify) }
+        _set_or_get_keycloak_data(:@realm_roles, reload) { keycloak_client.find_user_realm_roles(keycloak_identify) }
       end
 
       def has_role?(role)
-        realm_roles.include?(role)
+        realm_roles.map(&:name).include?(role)
       end
 
       def _set_or_get_keycloak_data(attr_name, reload)
-        reload ? instance_variable_set(yield) : instance_variable_get(attr_name) || instance_variable_set(yield)
+        reload ?
+          instance_variable_set(attr_name, yield) :
+          instance_variable_get(attr_name) || instance_variable_set(attr_name, yield)
       end
     end
   end

data/lib/keycloak/version.rb

@@ -1,3 +1,3 @@
 module Keycloak
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keycloak-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Fuxin Hao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-27 00:00:00.000000000 Z
+date: 2019-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails