jirametrics 1.3 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02be53200d02a09c1dd8829dba1a06147959d6fc7c14960e810497ab72c8c731
-  data.tar.gz: b3f79887cc78af19ec5199140bb655cb161a21fc548d52b98fee04c287fdc100
+  metadata.gz: bc425ec4e1efcb78c2e12facdbfb0109383c379c1e08a83f46e3587dceabda7a
+  data.tar.gz: aa98dca9360bec6250a423790f7e1d54d5d3c102804b514468aad220c4913cad
 SHA512:
-  metadata.gz: d05d5ea737475206c127b3e1bde806a5fb98493f4cd5d75dbc7d0ce1d89093fb5778ae276f1189a37096a6f800550f7f1bb86a2bbf1e9433f80caa90cc905ba8
-  data.tar.gz: 82dd49447e33017bd5d0dfb527011d27ae018d32c60e310bb8cc30ca1bcc8265888264df7aa2387109d8fe822a75381e6687bd750923de0d742b28dfb153bdf6
+  metadata.gz: 7ad6615bf254963dabe4557e907f6bacb0340562d9120c9fc3d5ca722b88709531b3e58148d1957707931e88512950053be04c49ace5d531c2990e99cb6e4254
+  data.tar.gz: 06b0af0ce2512d028bb0d11771610c75d88246113a0bc3cb789a348f4d3e24c745d419802248f4ad25caebf845e682ecabd7aa24b1aa39a911164fe0332d111a

data/lib/jirametrics/board.rb

@@ -84,7 +84,7 @@ class Board
   end
 
   def project_id
-    @raw['location']['id']
+    @raw['location']&.[]('id')
   end
 
   def name

data/lib/jirametrics/issue.rb

@@ -51,15 +51,7 @@ class Issue
   def summary = @raw['fields']['summary']
 
   def status
-    raw_status = @raw['fields']['status']
-    raw_category = raw_status['statusCategory']
-
-    Status.new(
-      name: raw_status['name'],
-      id: raw_status['id'].to_i,
-      category_name: raw_category['name'],
-      category_id: raw_category['id'].to_i
-    )
+    Status.new raw: @raw['fields']['status']
   end
 
   def status_id

data/lib/jirametrics/project_config.rb

@@ -41,7 +41,7 @@ class ProjectConfig
   def run
     unless aggregated_project?
       load_all_boards
-      @project_id = @all_boards.first.last.project_id
+      @project_id = @all_boards.first.last&.project_id
       load_status_category_mappings
       load_project_metadata
       load_sprints
@@ -101,7 +101,7 @@ class ProjectConfig
       return
     end
 
-    add_possible_status Status.new(name: status, id: nil, category_name: category, category_id: nil)
+    add_possible_status Status.new(name: status, category_name: category)
   end
 
   def load_all_boards
@@ -172,15 +172,7 @@ class ProjectConfig
     end
 
     status_json_snippets.each do |snippet|
-      category_config = snippet['statusCategory']
-      status_name = snippet['name']
-      add_possible_status Status.new(
-        name: status_name,
-        id: snippet['id'].to_i,
-        category_name: category_config['name'],
-        category_id: category_config['id'].to_i,
-        project_id: snippet['scope']&.[]('project')&.[]('id') # May have a value if this is a NextGen project
-      )
+      add_possible_status Status.new(raw: snippet)
     end
   end
 
@@ -202,7 +194,7 @@ class ProjectConfig
 
   def add_possible_status status
     # If it's project scoped and it's not this project, just ignore it.
-    return if status.project_id && status.project_id != @project_id
+    return if status.project_id && (@project_id.nil? || status.project_id != @project_id)
 
     existing_status = find_status(name: status.name)
 

data/lib/jirametrics/status.rb

@@ -4,12 +4,27 @@ class Status
   attr_reader :id, :type, :category_name, :category_id, :project_id
   attr_accessor :name
 
-  def initialize name:, id:, category_name:, category_id:, project_id: nil
+  def initialize name: nil, id: nil, category_name: nil, category_id: nil, project_id: nil, raw: nil
     @name = name
     @id = id
     @category_name = category_name
     @category_id = category_id
     @project_id = project_id
+
+    if raw
+      @raw = raw
+      @name = raw['name']
+      @id = raw['id'].to_i
+
+      category_config = raw['statusCategory']
+      @category_name = category_config['name']
+      @category_id = category_config['id'].to_i
+
+      # If this is a NextGen project then this status may be project specific. When this field is
+      # nil then the status is global.
+      @project_id = raw['scope']&.[]('project')&.[]('id')
+    end
+
   end
 
   def to_s
@@ -22,6 +37,8 @@ class Status
   end
 
   def state
-    instance_variables.map { |variable| instance_variable_get variable }
+    instance_variables
+      .reject {|variable| variable == :@raw}
+      .map { |variable| instance_variable_get variable }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jirametrics
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.5'
 platform: ruby
 authors:
 - Mike Bowler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-05 00:00:00.000000000 Z
+date: 2024-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: random-word