cafmal 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3cd71fdce05fdc565e0d0492e03ee852d5d2acf
-  data.tar.gz: 252c075420d09aa7a87ff27f0d44accd55483c87
+  metadata.gz: 2bc4e521a1035531524381816426e507ddb3a708
+  data.tar.gz: caa5300dbc3e15c6a3bc2cc96889ec9de1bf2dc5
 SHA512:
-  metadata.gz: 3fed0dc271d2b44e5a47f7a6f8e35e58d41d2db5ecca7ae8d1b5a62cc81ccf363ecf31321e92f97094ef968dbfa85c689d36525675927a41bc4f941460daff72
-  data.tar.gz: db0aa9e725d24936c66540c2ca4787b609546a87453edba4c60fe6972ed6cfe6fe52bfe94e674597d1af5dd7c343a7f08c2751754a17fdf2985c33a3d70b17fa
+  metadata.gz: b241ea4efcec128233ad5ede36bfa64af08529f0d566076ec08452c7a75bff3097f881dcb5b01f57dfe081a6a8ee3ec12520e122e2b7c0afb20be4c9d38e6e1b
+  data.tar.gz: cfcb96c721b66b1b4d541b4dbcb5bf5c9ab821fafef3c97c27b57b39e0f069f434fc79e837960cc81b70a215985f4da66dfefd338910fca1386c6f392e7341b7

data/lib/cafmal/auth.rb

@@ -32,14 +32,14 @@ module Cafmal
     def login(email = 'admin@example.com', password = 'cafmal')
       credentials = {auth: {email: email, password: password}}.to_json
       request_auth = Cafmal::Request::Post.new(@cafmal_api_url + '/user_token', credentials, {"Content-Type" => "application/json"})
-      if request_auth.code < 300
+      if request_auth.response.code < 300
         @token = JSON.parse(request_auth.response.body)["jwt"]
         @decoded_token = {}
         @decoded_token['header'] = JSON.parse(Base64.decode64(@token.split('.')[0]))
         @decoded_token['payload'] = JSON.parse(Base64.decode64(@token.split('.')[1]))
 
         if (@decoded_token['payload']['role'] != 'worker' && @decoded_token['payload']['role'] != 'alerter')
-          team_id = JSON.parse(Cafmal::User.new(@cafmal_api_url, @token).show(@decoded_token['payload']['sub']))["team_id"]
+          team_id = JSON.parse(Cafmal::User.new(@cafmal_api_url, @token).show(@decoded_token['payload']['sub']).body)["team_id"]
           event = Cafmal::Event.new(@cafmal_api_url, @token)
           event.create({name: 'user.login', message: "#{email} has logged in.", kind: 'login', severity: 'info', team_id: team_id})
 
@@ -58,14 +58,12 @@ module Cafmal
       decoded_token['header'] = JSON.parse(Base64.decode64(token.split('.')[0]))
       decoded_token['payload'] = JSON.parse(Base64.decode64(token.split('.')[1]))
 
-      user = JSON.parse(Cafmal::User.new(@cafmal_api_url, token).show(decoded_token['payload']['sub']))
+      user = JSON.parse(Cafmal::User.new(@cafmal_api_url, token).show(decoded_token['payload']['sub']).body)
       team_id = user["team_id"]
       email = user["email"]
 
-      #@TODO if you are the last logged in user, unsilence your team alerts
-
       # kind has to be login, as it's a label of events
-      event_id = JSON.parse(Cafmal::Event.new(@cafmal_api_url, token).create({name: 'user.logout', message: "#{email} has logged out.", kind: 'login', severity: 'info', team_id: team_id}))
+      event_id = JSON.parse(Cafmal::Event.new(@cafmal_api_url, token).create({name: 'user.logout', message: "#{email} has logged out.", kind: 'login', severity: 'info', team_id: team_id}).body)
 
       if event_id.nil?
         false
@@ -80,19 +78,17 @@ module Cafmal
     def refresh(token)
       headers = {"Content-Type" => "application/json", "Authorization" => "Bearer #{token}"}
       credentials = {token: token}.to_json
-      refresh_request = Cafmal::Request::Post.new(@cafmal_api_url + '/user_token_refresh', credentials, headers)
-      if refresh_request.code < 300
-        @token = JSON.parse(refresh_request.response.body)['jwt']
+      request_refresh = Cafmal::Request::Post.new(@cafmal_api_url + '/user_token_refresh', credentials, headers)
+      if request_refresh.response.code < 300
+        @token = JSON.parse(request_refresh.response.body)['jwt']
         @decoded_token = {}
         @decoded_token['header'] = JSON.parse(Base64.decode64(@token.split('.')[0]))
         @decoded_token['payload'] = JSON.parse(Base64.decode64(@token.split('.')[1]))
 
         if (@decoded_token['payload']['role'] != 'worker' && @decoded_token['payload']['role'] != 'alerter')
-          team_id = JSON.parse(Cafmal::User.new(@cafmal_api_url, @token).show(@decoded_token['payload']['sub']))["team_id"]
+          team_id = JSON.parse(Cafmal::User.new(@cafmal_api_url, @token).show(@decoded_token['payload']['sub']).body)["team_id"]
           event = Cafmal::Event.new(@cafmal_api_url, @token)
           event.create({name: 'user.refresh_login', message: "#{@decoded_token['payload']['email']} has refreshed his login.", kind: 'login', severity: 'info', team_id: team_id})
-
-          #@TODO silence all alerts for your team_id, set silenced_at now + 1h
         end
         return true
       else

data/lib/cafmal/request.rb

@@ -3,45 +3,36 @@
 module Cafmal
   module Request
     @response = nil
-    @code = nil
 
     class Post
       attr_reader :response
-      attr_reader :code
 
       def initialize(url, body, headers)
         @response = HTTParty.post(url, body: body, headers: headers)
-        @code = @response.code
       end
     end
 
     class Get
       attr_reader :response
-      attr_reader :code
 
       def initialize(url, headers)
         @response = HTTParty.get(url, headers: headers)
-        @code = @response.code
       end
     end
 
     class Put
       attr_reader :response
-      attr_reader :code
 
       def initialize(url, body, headers)
         @response = HTTParty.put(url, body: body, headers: headers)
-        @code = @response.code
       end
     end
 
     class Delete
       attr_reader :response
-      attr_reader :code
 
       def initialize(url, body, headers)
         @response = HTTParty.delete(url, body: body, headers: headers)
-        @code = @response.code
       end
     end
 

data/lib/cafmal/resource.rb

@@ -29,37 +29,37 @@ module Cafmal
     def create(params)
       request_create_resource = Cafmal::Request::Post.new(@cafmal_api_url + "/#{@resourcename}", params.to_json, @headers)
 
-      return request_create_resource.response.body
+      return request_create_resource.response
     end
 
     def new
       request_new_resource = Cafmal::Request::Get.new(@cafmal_api_url + "/#{@resourcename}/new", @headers)
 
-      return request_new_resource.response.body
+      return request_new_resource.response
     end
 
     def list(*options)
       request_list_resource = Cafmal::Request::Get.new(@cafmal_api_url + "/#{@resourcename}" + @query, @headers)
 
-      return request_list_resource.response.body
+      return request_list_resource.response
     end
 
     def show(id)
       request_show_resource = Cafmal::Request::Get.new(@cafmal_api_url + "/#{@resourcename}/" + id.to_s, @headers)
 
-      return request_show_resource.response.body
+      return request_show_resource.response
     end
 
     def update(params)
       request_update_resource = Cafmal::Request::Put.new(@cafmal_api_url + "/#{@resourcename}/#{params['id']}", params.to_json, @headers)
 
-      return request_update_resource.response.body
+      return request_update_resource.response
     end
 
     def destroy(params)
       request_destroy_resource = Cafmal::Request::Delete.new(@cafmal_api_url + "/#{@resourcename}/#{params['id']}", params.to_json, @headers)
 
-      return request_destroy_resource.response.body
+      return request_destroy_resource.response
     end
 
     # helpers below

data/lib/cafmal/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Cafmal
-  VERSION = "0.24.0"
+  VERSION = "0.25.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cafmal
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Nils Bartels
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-10 00:00:00.000000000 Z
+date: 2017-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Create alerts from metrics and logs