code42 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e4779f663016dbb2239a99c9cee391ce4c03627
-  data.tar.gz: 599b65430440a9aea5cc384675af10739f6e7b8c
+  metadata.gz: 204c4d637432178116bea0a22a7c4e96cb23fa4f
+  data.tar.gz: db890339d0aa2ad510ff27e2d4d1c6fef6e674ca
 SHA512:
-  metadata.gz: d7ef9ef0c96aff020be4c584cae265ed8ed365834d9effdfa582e4e98b4cc6c240d4bcc399fc17ef5d23325c440df223b488524081e4c1caacb1fa54196f10ba
-  data.tar.gz: 630b13729bb81af29b7fb072cce7da8981127f170a9666403637e70554cb0be4d2efa7f4ec971d79e6c04d7e9bac511b7b46a4fb69176bedfb76b26d92e86034
+  metadata.gz: 15576c7015eed483f0b87b9f95400e6ef24442ceb6bedcd805bf58f272544e4b4dba047feef0ef1a53af91e7bac91ce27aff11dafc6a17867509087b66670279
+  data.tar.gz: ef2c016a06290d0440b70ab303f0015e7e1895584f68d5483215d0cfe7444b00464e01a0e1a9990cc26a7e375d8d4d60d9fd6aa37f8fd39d7f1b104296946a06

data/lib/code42.rb

@@ -22,6 +22,7 @@ require "code42/token"
 require "code42/role"
 require "code42/role_collection"
 require "code42/token_validation"
+require "code42/permission"
 
 module Code42
   class << self

data/lib/code42/api/role.rb

@@ -18,6 +18,36 @@ module Code42
       def user_roles(id = 'my')
         collection_from_response(Code42::RoleCollection, Code42::Role, :get, "userRole/#{id}")
       end
+
+      # Unassign a role from a user
+      # @return true if role was unassigned
+      # @param id [String, Integer] The id of the user to return roles for
+      # @param id [String] The role name to unassign
+      # @example
+      #   client.unassign_role(2, 'Admin')
+      def unassign_role(id, role_name)
+        delete('UserRole', { :userId => id, :roleName => role_name })
+      end
+
+      def roles(attrs = {})
+        collection_from_response(Code42::RoleCollection, Code42::Role, :get, "role", attrs)
+      end
+
+      def role(id)
+        object_from_response(Code42::Role, :get, "role/#{id}")
+      end
+
+      def create_role(name, permissions)
+        object_from_response(Code42::Role, :post, "role", role_name: name, permissions: permissions)
+      end
+
+      def update_role(id, attrs = {})
+        object_from_response(Code42::Role, :put, "role/#{id}", attrs)
+      end
+
+      def delete_role(id)
+        delete("Role/#{id}")
+      end
     end
   end
 end

data/lib/code42/api/user.rb

@@ -85,6 +85,13 @@ module Code42
       def activate_user(id)
         delete("UserDeactivation/#{id}")
       end
+
+      # Returns a list of permissions for the session user
+      # @return [Array] An array of matching permissions
+      def permissions
+        objects_from_response(Code42::Permission, :get, 'permission')
+      end
+
     end
   end
 end

data/lib/code42/attribute_serializer.rb

@@ -58,7 +58,7 @@ module Code42
         elsif klass.respond_to?(:from_response)
           klass.from_response(value)
         elsif klass.respond_to?(:parse)
-          klass.parse(value)
+          klass.parse(value) unless value.nil?
         else
           value
         end

data/lib/code42/client.rb

@@ -10,7 +10,7 @@ module Code42
     include Code42::API::Token
     include Code42::API::PasswordReset
 
-    attr_accessor :settings
+    attr_reader :settings
 
     def initialize(options = {})
       self.settings = options

data/lib/code42/permission.rb

@@ -0,0 +1,13 @@
+module Code42
+  class Permission < Resource
+    # @!attribute [rw] name
+    #   @return [String] The name of the permission
+    # @!attribute [rw] value
+    #   @return [String] The value of the permission
+    # @!attribute [rw] description
+    #   @return [String] The description of the permission
+    attribute :name
+    attribute :value
+    attribute :description
+  end
+end

data/lib/code42/resource.rb

@@ -31,9 +31,10 @@ module Code42
       end
 
       def collection_from_response(array)
-        array.map { |element| self.deserialize_and_initialize(element, self) }
+        (array || []).map { |element| self.deserialize_and_initialize(element, self) }
       end
     end
+
     attr_accessor :client, :attributes
 
     def initialize(data = {}, client = nil)
@@ -47,7 +48,7 @@ module Code42
           self.class.instance_eval { attr_reader key.to_sym }
         end
         self.send("#{key}=", value)
-        attributes[key.to_sym] = send(key.to_sym)
+        attributes[key.to_sym] = self.send(key.to_sym)
       end
     end
 

data/lib/code42/role.rb

@@ -12,7 +12,6 @@ module Code42
     # @!attribute [rw] updated_at
     #   @return [DateTime] The timestamp for the time the role was updated
 
-    attribute :user_id
     attribute :id, :from => :roleId
     attribute :name, :from => :roleName
     attribute :created_at, :from => :creationDate, :as => DateTime
@@ -22,5 +21,13 @@ module Code42
     def permissions=(permissions = [])
       @permissions = permissions.map { |p| p['permission'] }
     end
+
+    def update(attrs = {})
+      client.update_role(id, attrs)
+    end
+
+    def delete
+      client.delete_role(id)
+    end
   end
 end

data/lib/code42/role_collection.rb

@@ -31,5 +31,9 @@ module Code42
     def includes_name?(name)
       map(&:name).include? name
     end
+
+    def empty?
+      @roles.empty?
+    end
   end
 end

data/lib/code42/user.rb

@@ -50,6 +50,11 @@ module Code42
       client.assign_role(attrs)
     end
 
+    # Delete a role from this user
+    def unassign_role(role_name)
+      client.unassign_role(id, role_name)
+    end
+
     def block
       client.block_user(id)
       client.user id
@@ -69,5 +74,10 @@ module Code42
       client.deactivate_user(id)
       client.user(id, active: false)
     end
+
+    def permissions
+      client.permissions
+    end
+
   end
 end

data/lib/code42/version.rb

@@ -1,3 +1,3 @@
 module Code42
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/cassettes/Code42_Client/_create_org/returns_created_org.yml

@@ -2,13 +2,13 @@
 http_interactions:
 - request:
     method: post
-    uri: http://admin:admin@localhost:7280/api/org
+    uri: http://admin:admin@localhost:4280/api/org
     body:
       encoding: UTF-8
       string: '{"orgName":"IBM"}'
     headers:
       User-Agent:
-      - Faraday v0.8.7
+      - Faraday v0.9.0
       Content-Type:
       - application/json
       Accept-Encoding:
@@ -24,51 +24,17 @@ http_interactions:
       - no-store
       Pragma:
       - no-cache
+      Content-Location:
+      - http://localhost:4280/api/v1/org
       Content-Type:
-      - application/json; charset=utf-8
+      - application/json;charset=UTF-8
       Transfer-Encoding:
       - chunked
       Server:
       - Jetty(7.6.3.v20120416)
     body:
       encoding: UTF-8
-      string: |-
-        {
-          "metadata":   {
-            "timestamp": "2013-06-13T15:16:29.975-05:00",
-            "params": {}
-          },
-          "data":   {
-            "orgId": 87,
-            "orgUid": "587885375444888214",
-            "orgName": "IBM",
-            "status": "Active",
-            "active": true,
-            "blocked": false,
-            "parentOrgId": null,
-            "type": "ENTERPRISE",
-            "externalId": "587885375444888214",
-            "hierarchyCounts": {},
-            "configInheritanceCounts": {},
-            "creationDate": "2013-06-13T15:16:29.859-05:00",
-            "modificationDate": "2013-06-13T15:16:29.957-05:00",
-            "registrationKey": "SCTR-799T-224R-JWTW",
-            "reporting": {},
-            "customConfig": false,
-            "settings":     {
-              "maxSeats": null,
-              "maxBytes": null
-            },
-            "settingsInherited":     {
-              "maxSeats": "",
-              "maxBytes": ""
-            },
-            "settingsSummary":     {
-              "maxSeats": "",
-              "maxBytes": ""
-            }
-          }
-        }
+      string: '{"metadata":{"timestamp":"2014-07-09T10:34:43.890-05:00","params":{}},"data":{"orgId":444,"orgUid":"644534473905930608","orgName":"IBM","status":"Active","active":true,"blocked":false,"parentOrgId":null,"type":"ENTERPRISE","classification":"BASIC","externalId":"644534473905930608","hierarchyCounts":{},"configInheritanceCounts":{},"creationDate":"2014-07-09T10:34:43.764-05:00","modificationDate":"2014-07-09T10:34:43.854-05:00","registrationKey":"TTT2-2T4R-MJWR-HR84","reporting":{},"customConfig":false,"settings":{"maxSeats":null,"maxBytes":null},"settingsInherited":{"maxSeats":"","maxBytes":""},"settingsSummary":{"maxSeats":"","maxBytes":""}}}'
     http_version: 
-  recorded_at: Thu, 13 Jun 2013 20:16:29 GMT
+  recorded_at: Wed, 09 Jul 2014 15:34:43 GMT
 recorded_with: VCR 2.5.0

data/spec/cassettes/Code42_Client/_create_role/creates_a_role.yml

@@ -0,0 +1,42 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://admin:admin@localhost:4280/api/role
+    body:
+      encoding: UTF-8
+      string: '{"roleName":"My Role","permissions":["admin.user.read"]}'
+    headers:
+      User-Agent:
+      - Faraday v0.9.0
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Cache-Control:
+      - no-store
+      Pragma:
+      - no-cache
+      Content-Location:
+      - http://localhost:4280/api/v1/role
+      Content-Type:
+      - application/json;charset=UTF-8
+      Transfer-Encoding:
+      - chunked
+      Server:
+      - Jetty(7.6.3.v20120416)
+    body:
+      encoding: UTF-8
+      string: '{"metadata":{"timestamp":"2014-07-09T10:46:21.189-05:00","params":{}},"data":{"roleId":62,"roleName":"My
+        Role","locked":false,"numberOfUsers":0,"creationDate":"2014-07-09T10:46:21.181-05:00","modificationDate":"2014-07-09T10:46:21.181-05:00","permissions":[{"permission":"admin.user.read","description":"Permission
+        to view user information"}]}}'
+    http_version: 
+  recorded_at: Wed, 09 Jul 2014 15:46:21 GMT
+recorded_with: VCR 2.5.0

data/spec/cassettes/Code42_Client/_create_user/returns_created_user.yml

@@ -2,13 +2,13 @@
 http_interactions:
 - request:
     method: post
-    uri: http://admin:admin@localhost:7280/api/user
+    uri: http://admin:admin@localhost:4280/api/user
     body:
       encoding: UTF-8
       string: '{"orgId":2,"username":"testuser"}'
     headers:
       User-Agent:
-      - Faraday v0.8.7
+      - Faraday v0.9.0
       Content-Type:
       - application/json
       Accept-Encoding:
@@ -24,42 +24,18 @@ http_interactions:
       - no-store
       Pragma:
       - no-cache
+      Content-Location:
+      - http://localhost:4280/api/v1/user
       Content-Type:
-      - application/json; charset=utf-8
+      - application/json;charset=UTF-8
       Transfer-Encoding:
       - chunked
       Server:
       - Jetty(7.6.3.v20120416)
     body:
       encoding: UTF-8
-      string: |-
-        {
-          "metadata":   {
-            "timestamp": "2013-06-13T15:16:29.797-05:00",
-            "params": {}
-          },
-          "data":   {
-            "userId": 3,
-            "userUid": "2062352522e63ee1",
-            "status": "Active",
-            "username": "testuser",
-            "email": null,
-            "firstName": null,
-            "lastName": null,
-            "quotaInBytes": -1,
-            "orgId": 2,
-            "orgUid": "proserverdemo",
-            "orgName": "PROServer Demo",
-            "active": true,
-            "blocked": false,
-            "emailPromo": true,
-            "invited": true,
-            "orgType": "ENTERPRISE",
-            "usernameIsAnEmail": null,
-            "creationDate": "2013-06-13T15:14:39.703-05:00",
-            "modificationDate": "2013-06-13T15:16:29.777-05:00"
-          }
-        }
+      string: '{"metadata":{"timestamp":"2014-07-09T10:34:44.846-05:00","params":{}},"data":{"userId":38,"userUid":"7a1c8ea53caabfe3","status":"Active","username":"testuser","email":null,"firstName":null,"lastName":"Jenkins","quotaInBytes":-1,"orgId":2,"orgUid":"proserverdemo","orgName":"PROServer
+        Demo","active":true,"blocked":false,"emailPromo":true,"invited":true,"orgType":"ENTERPRISE","usernameIsAnEmail":null,"creationDate":"2014-07-09T10:27:12.465-05:00","modificationDate":"2014-07-09T10:34:44.835-05:00","passwordReset":false}}'
     http_version: 
-  recorded_at: Thu, 13 Jun 2013 20:16:29 GMT
+  recorded_at: Wed, 09 Jul 2014 15:34:44 GMT
 recorded_with: VCR 2.5.0

data/spec/cassettes/Code42_Client/_create_user/when_sending_an_invalid_email/raises_an_exception.yml

@@ -2,13 +2,13 @@
 http_interactions:
 - request:
     method: post
-    uri: http://admin:admin@localhost:7280/api/user
+    uri: http://admin:admin@localhost:4280/api/user
     body:
       encoding: UTF-8
       string: '{"orgId":2,"username":"testuser","email":"testuser"}'
     headers:
       User-Agent:
-      - Faraday v0.8.7
+      - Faraday v0.9.0
       Content-Type:
       - application/json
       Accept-Encoding:
@@ -18,22 +18,23 @@ http_interactions:
   response:
     status:
       code: 500
-      message: '[{   "name": "EMAIL_INVALID",   "description": "Email is invalid",   "objects":
-        [] }]'
+      message: '[{"name":"EMAIL_INVALID","description":"com.code42.core.BuilderException","objects":[]}]'
     headers:
       Pragma:
       - no-cache
+      Content-Location:
+      - http://localhost:4280/api/v1/user
       Content-Type:
       - text/html;charset=ISO-8859-1
       Cache-Control:
       - must-revalidate,no-cache,no-store
       Content-Length:
-      - '72'
+      - '88'
       Server:
       - Jetty(7.6.3.v20120416)
     body:
       encoding: UTF-8
-      string: '[{"name":"EMAIL_INVALID","description":"Email is invalid","objects":[]}]'
+      string: '[{"name":"EMAIL_INVALID","description":"com.code42.core.BuilderException","objects":[]}]'
     http_version: 
-  recorded_at: Thu, 13 Jun 2013 20:16:29 GMT
+  recorded_at: Wed, 09 Jul 2014 15:34:44 GMT
 recorded_with: VCR 2.5.0

data/spec/cassettes/Code42_Client/_deactivate_org/puts_to_the_correct_route.yml

@@ -2,13 +2,13 @@
 http_interactions:
 - request:
     method: put
-    uri: http://admin:admin@localhost:7280/api/OrgDeactivation/88
+    uri: http://admin:admin@localhost:4280/api/OrgDeactivation/88
     body:
       encoding: UTF-8
       string: '{}'
     headers:
       User-Agent:
-      - Faraday v0.8.9
+      - Faraday v0.9.0
       Content-Type:
       - application/json
       Accept-Encoding:
@@ -17,8 +17,8 @@ http_interactions:
       - '*/*'
   response:
     status:
-      code: 201
-      message: Created
+      code: 204
+      message: No Content
     headers:
       Cache-Control:
       - no-store
@@ -28,13 +28,11 @@ http_interactions:
       - http://localhost:4280/api/v1/OrgDeactivation/88
       Content-Type:
       - application/json
-      Content-Length:
-      - '0'
       Server:
       - Jetty(7.6.3.v20120416)
     body:
       encoding: UTF-8
       string: ''
-    http_version:
-  recorded_at: Mon, 28 Apr 2014 21:18:38 GMT
+    http_version: 
+  recorded_at: Wed, 09 Jul 2014 15:34:44 GMT
 recorded_with: VCR 2.5.0