softwear-lib 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46309929f4ab433f39e2249d28c52de5083e9c0c
-  data.tar.gz: 214c83ab78624f336433d4ea95c12664a0b1de47
+  metadata.gz: df335f36b039e01cffdcfc3383eefd57ade6211c
+  data.tar.gz: 85d03c23a947a194b8148385841007261bed41ce
 SHA512:
-  metadata.gz: 6294137fd3a37d5881187f5bddeecc78a34a5dfe957f1aca785bc94454f9ec62f196ff88ed42712e6d1ac8b7b94825c5f5f17fb5fb63dcfba50fa20fc4e23d56
-  data.tar.gz: e59c12a9c183fb7fb1de46f33d9741bb2f9b6c5b5b0299c0330ea00f3c89297bedeec5fc6cee311976d71766b62eee897d500f16bee62f2ca38ab4558033fedb
+  metadata.gz: 2abb795beff31832cd6145858e14272b840415abee52011d6b3f510e7f40ccd24080ec38003347083621e6fccdbc9e0b84c7dd2eb1c077f52bb66322820aac5e
+  data.tar.gz: 3e317d8d8fc9a83dd9a726ccb847b556bf5b2ee1d3033e1ce618e94f5b49e0d53565ef3ec5e0708109aa43092c948f29c58394f8aff0d4eec27a0ebedb6066e6

data/lib/softwear/auth/standard_model.rb

@@ -405,7 +405,7 @@ module Softwear
 
       REMOTE_ATTRIBUTES = [
         :id, :email, :first_name, :last_name,
-        :profile_picture_url
+        :roles, :profile_picture_url
       ]
       REMOTE_ATTRIBUTES.each(&method(:attr_accessor))
 
@@ -466,6 +466,16 @@ module Softwear
       def valid_password?(pass)
         query("pass #{id} #{pass}") == 'yes'
       end
+
+      def role?(*wanted_roles)
+        return true if wanted_roles.empty?
+
+        if @roles.nil?
+          query("role #{id} #{wanted_roles.join(' ')}") == 'yes'
+        else
+          wanted_roles.any? { |r| @roles.include?(r) }
+        end
+      end
     end
   end
 end

data/lib/softwear/auth/stubbed_model.rb

@@ -1,5 +1,34 @@
 module Softwear
   module Auth
+    # =======================================================================
+    # In development, unless ENV['AUTH_SERVER'] is set, Softwear::Auth::Model is
+    # set to this StubbedModel. The StubbedModel does not contact the auth_server,
+    # and instead retrieves user info from config/users.yml, which assumes the
+    # following format:
+=begin
+---
+signed_in: nigel@annarbortees.com
+
+users:
+  admin@softwearcrm.com:
+    first_name: Admin
+    last_name:  User
+    roles:
+      - sales_manager
+
+  nigel@annarbortees.com:
+    first_name: Nigel
+    last_name:  Baillie
+    roles:
+      - developer
+
+  ricky@annarbortees.com:
+    first_name: Ricky
+    last_name:  Winowiecki
+=end
+    # Changes in this .yml file will be reflected live, without restarting your
+    # server.
+    # =======================================================================
     class StubbedModel < Softwear::Auth::StandardModel
       class << self
         def raw_query(*)

data/lib/softwear/lib/version.rb

@@ -1,5 +1,5 @@
 module Softwear
   module Lib
-    VERSION = "1.7.1"
+    VERSION = "1.7.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softwear-lib
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Nigel Baillie