kennel 1.41.0 → 1.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fd1df00b8cba5414b3c34f245b8c67c7263faf63440400850762406b999517d
-  data.tar.gz: 81c1c103f5792d68999531e09b2198d803ea0ec4085c8ca18d7b5871981da980
+  metadata.gz: 8c6dc438fb91def5e1512131ebe5ee1e173494a6ae9baf46de466ade56289e81
+  data.tar.gz: 6f21ff61fb6045767be9b60eec26e3949bf2112a957cdd1cd6b965a55bbeb9b1
 SHA512:
-  metadata.gz: d684a807b876bbe5e438d6fb3a8f5d1de4797c9b81fe4545d2bf2eb2aecd69a3f50e0adf0437b5952ffc4a83de05a090874a30e5bf2764c6cd37f48a136e5628
-  data.tar.gz: 870ec2d6580e31f437f07bf21c2becc36b2bc1926e523a054bde905f86754f5e7c4fcab2914f7d3c107b96e1f8c7992931a1e8997b5dd5a4cad0cf54a13ebb44
+  metadata.gz: b3c30cdd1e51494d9e7b9a49e2055339962950bff49e16d4ea58afa13f8114cae33bef3bd145da484dbd147c87f12f4403e1ac55472b2778cef689dffb9f5089
+  data.tar.gz: 1c1efa3f42d08d21234ba4f511c3eb957dd8fb3f32b3ca78bca540c2c6be9a8c7185d2fddda8388c25229752084b0e24162da14beaa6a273cefa99f82263d34e

data/lib/kennel/importer.rb

@@ -2,7 +2,7 @@
 
 module Kennel
   class Importer
-    TITLES = [:name, :title, :board_title].freeze
+    TITLES = [:name, :title].freeze
     SORT_ORDER = [*TITLES, :id, :kennel_id, :type, :tags, :query, :message, :description, :template_variables].freeze
 
     def initialize(api)
@@ -10,26 +10,22 @@ module Kennel
     end
 
     def import(resource, id)
-      begin
-        model =
-          begin
-            Kennel::Models.const_get(resource.capitalize)
-          rescue NameError
-            raise ArgumentError, "#{resource} is not supported"
-          end
-        data = @api.show(model.api_resource, id)
-      rescue StandardError => e
-        retried ||= 0
-        retried += 1
-        raise e if retried != 1 || resource != "dash" || !e.message.match?(/No \S+ matches that/)
-        resource = "screen"
-        retry
+      if ["screen", "dash"].include?(resource)
+        raise ArgumentError, "resource 'screen' and 'dash' are deprecated, use 'dashboard'"
       end
 
-      data = data[resource.to_sym] || data
-      id = data.fetch(:id) # store numerical id returned from the api
-      model.normalize({}, data)
+      model =
+        begin
+          Kennel::Models.const_get(resource.capitalize)
+        rescue NameError
+          raise ArgumentError, "#{resource} is not supported"
+        end
+
+      data = @api.show(model.api_resource, id)
+      id = data.fetch(:id) # keep native value
+      model.normalize({}, data) # removes id
       data[:id] = id
+
       data[:kennel_id] = Kennel::Utils.parameterize(data.fetch(TITLES.detect { |t| data[t] }))
 
       if resource == "monitor"

data/lib/kennel/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Kennel
-  VERSION = "1.41.0"
+  VERSION = "1.42.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.41.0
+  version: 1.42.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-24 00:00:00.000000000 Z
+date: 2019-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday