auth-lh 0.19.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a22d8eead87f8f516ef69eabf359ff54471549a
-  data.tar.gz: 8f5b73115bae82568e66ad8496979e16261b7e1c
+  metadata.gz: 91fe36c4c406bc28b91b4b2b0586d844ce941e55
+  data.tar.gz: 880ad85c804d85da07f22754a99aca9035d0d499
 SHA512:
-  metadata.gz: 3868727a81315dce91601ffb161a2f113eac959e6af75ba4480104d1bdd2a41443000147625535adce2265ca230da74574c6f6568744ede655fb40fa40373a73
-  data.tar.gz: 659a0aadee29282762a2b8ad612fd81e3d52c82bd17e7203f06341a823041ab0ca5d1c6d6dc0e180ec2f6a92c5c39b902dd6683d2fd6a1b91335c06b9221ee15
+  metadata.gz: b3adec353faa191a022755987ead2094b048dfb41d27016822f56259ffbbd6a871cfd30a71d681c8b44c58e0488100366a74a946e68c4c944721cef05364d1a7
+  data.tar.gz: 6a0d1fcdb8be33e24fa0c4c5294a2987dd18a0a36bd9d6eab1bfdd84255c063a2d03cd1c0438054f9f4ff6d0121a1aba0db1bf08c146c14e1835ecce5548d739

data/CHANGELOG.md

@@ -213,3 +213,11 @@
 ## v0.19.1
 
 * Removed assignable from role.
+
+## v0.20.0
+
+* Refactor on attributes for user and user extended.
+
+## v0.20.1
+
+* Refactor on attributes for users and roles.

data/lib/auth/lh/version.rb

@@ -1,5 +1,5 @@
 module Auth
   module Lh
-    VERSION = "0.19.1"
+    VERSION = "0.21.0"
   end
 end

data/lib/auth_lh/external_app_extended.rb

@@ -1,7 +1,6 @@
 module AuthLh
   class ExternalAppExtended
-    attr_accessor :code, :name, :description, :url, :send_notifications,
-      :is_local, :notifications_url
+    attr_accessor :code, :name, :description, :url, :is_local
 
     def initialize(attributes={})
       attributes.each do |k,v|

data/lib/auth_lh/user.rb

@@ -1,14 +1,16 @@
 module AuthLh
   class User
     attr_accessor :email, :jabber, :first_name, :last_name, :login,
-    :shop_code, :shop_id, :shop_name, :enabled, :role_ids,
-    :password_expired, :has_remote_desktop, :attendance_mode,
-    :fingerprint_from, :fingerprint_to, :external_apps
+    :shop_code, :shop_id, :shop_name, :enabled, :password_expired,
+    :has_remote_desktop, :attendance_mode, :fingerprint_from,
+    :fingerprint_to, :attendance_mode, :external_apps, :roles
 
     def initialize(attributes={})
       attributes.each do |k,v|
         if k.to_s == 'external_apps'
           self.external_apps = v.map { |x| ExternalApp.new(x) }
+        elsif k.to_s == 'roles'
+          self.roles = v.map { |x| Role.new(x) }
         else
           self.send("#{k}=", v)
         end
@@ -19,6 +21,10 @@ module AuthLh
       "#{first_name} #{last_name}"
     end
 
+    def role_ids
+      roles.map(&:id)
+    end
+
     def has_role?(role_id)
       role_ids.include?(role_id.to_i)
     end

data/lib/auth_lh/user_extended.rb

@@ -1,17 +1,50 @@
 module AuthLh
   class UserExtended
-    attr_accessor :email, :jabber, :first_name, :last_name, :login,
-      :password_digest, :password_expired, :enabled, :shop_code,
-      :allow_remote_access, :session_timeout, :only_working_time,
-      :allow_multiple_sessions, :working_time, :has_remote_desktop,
-      :fingerprint_from, :fingerprint_to, :attendance_mode,
-      :role_ids, :app_codes
+    attr_accessor :email, :jabber, :login, :password_digest, :password_expired,
+      :enabled, :shop_code, :shop_id, :allow_remote_access, :session_timeout, :only_working_time,
+      :allow_multiple_sessions, :working_time, :has_remote_desktop, :fingerprint_from,
+      :fingerprint_to, :pending_password_refresh, :first_name, :last_name, :attendance_mode,
+      :testing_user, :disable_time, :password_remember_enabled, :external_apps, :roles
 
     def initialize(attributes={})
       attributes.each do |k,v|
-        self.send("#{k}=", v)
+        if k.to_s == 'external_apps'
+          self.external_apps = v.map { |x| ExternalAppExtended.new(x) }
+        elsif k.to_s == 'roles'
+          self.roles = v.map { |x| Role.new(x) }
+        else
+          self.send("#{k}=", v)
+        end
       end
     end
+
+    def name
+      "#{first_name} #{last_name}"
+    end
+
+    def role_ids
+      roles.map(&:id)
+    end
+
+    def app_codes
+      external_apps.map(&:code)
+    end
+
+    def has_role?(role_id)
+      role_ids.include?(role_id.to_i)
+    end
+
+    def has_some_role?(r_ids)
+      r_ids.any? { |r_id|
+        role_ids.include?(r_id.to_i)
+      }
+    end
+
+    def has_all_roles?(r_ids)
+      r_ids.all? { |r_id|
+        role_ids.include?(r_id.to_i)
+      }
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: auth-lh
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Matias Hick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-03 00:00:00.000000000 Z
+date: 2017-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler