kennel 1.41.0 → 1.42.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8fd1df00b8cba5414b3c34f245b8c67c7263faf63440400850762406b999517d
4
- data.tar.gz: 81c1c103f5792d68999531e09b2198d803ea0ec4085c8ca18d7b5871981da980
3
+ metadata.gz: 8c6dc438fb91def5e1512131ebe5ee1e173494a6ae9baf46de466ade56289e81
4
+ data.tar.gz: 6f21ff61fb6045767be9b60eec26e3949bf2112a957cdd1cd6b965a55bbeb9b1
5
5
  SHA512:
6
- metadata.gz: d684a807b876bbe5e438d6fb3a8f5d1de4797c9b81fe4545d2bf2eb2aecd69a3f50e0adf0437b5952ffc4a83de05a090874a30e5bf2764c6cd37f48a136e5628
7
- data.tar.gz: 870ec2d6580e31f437f07bf21c2becc36b2bc1926e523a054bde905f86754f5e7c4fcab2914f7d3c107b96e1f8c7992931a1e8997b5dd5a4cad0cf54a13ebb44
6
+ metadata.gz: b3c30cdd1e51494d9e7b9a49e2055339962950bff49e16d4ea58afa13f8114cae33bef3bd145da484dbd147c87f12f4403e1ac55472b2778cef689dffb9f5089
7
+ data.tar.gz: 1c1efa3f42d08d21234ba4f511c3eb957dd8fb3f32b3ca78bca540c2c6be9a8c7185d2fddda8388c25229752084b0e24162da14beaa6a273cefa99f82263d34e
@@ -2,7 +2,7 @@
2
2
 
3
3
  module Kennel
4
4
  class Importer
5
- TITLES = [:name, :title, :board_title].freeze
5
+ TITLES = [:name, :title].freeze
6
6
  SORT_ORDER = [*TITLES, :id, :kennel_id, :type, :tags, :query, :message, :description, :template_variables].freeze
7
7
 
8
8
  def initialize(api)
@@ -10,26 +10,22 @@ module Kennel
10
10
  end
11
11
 
12
12
  def import(resource, id)
13
- begin
14
- model =
15
- begin
16
- Kennel::Models.const_get(resource.capitalize)
17
- rescue NameError
18
- raise ArgumentError, "#{resource} is not supported"
19
- end
20
- data = @api.show(model.api_resource, id)
21
- rescue StandardError => e
22
- retried ||= 0
23
- retried += 1
24
- raise e if retried != 1 || resource != "dash" || !e.message.match?(/No \S+ matches that/)
25
- resource = "screen"
26
- retry
13
+ if ["screen", "dash"].include?(resource)
14
+ raise ArgumentError, "resource 'screen' and 'dash' are deprecated, use 'dashboard'"
27
15
  end
28
16
 
29
- data = data[resource.to_sym] || data
30
- id = data.fetch(:id) # store numerical id returned from the api
31
- model.normalize({}, data)
17
+ model =
18
+ begin
19
+ Kennel::Models.const_get(resource.capitalize)
20
+ rescue NameError
21
+ raise ArgumentError, "#{resource} is not supported"
22
+ end
23
+
24
+ data = @api.show(model.api_resource, id)
25
+ id = data.fetch(:id) # keep native value
26
+ model.normalize({}, data) # removes id
32
27
  data[:id] = id
28
+
33
29
  data[:kennel_id] = Kennel::Utils.parameterize(data.fetch(TITLES.detect { |t| data[t] }))
34
30
 
35
31
  if resource == "monitor"
@@ -1,4 +1,4 @@
1
1
  # frozen_string_literal: true
2
2
  module Kennel
3
- VERSION = "1.41.0"
3
+ VERSION = "1.42.0"
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kennel
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.41.0
4
+ version: 1.42.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael Grosser
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-06-24 00:00:00.000000000 Z
11
+ date: 2019-06-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: faraday