Merge branch 'hotfix/0.9.2' into main

octoopi · May 3, 2021 · 267ce7c · 267ce7c
2 parents 86145b7 + b68eb7e
commit 267ce7c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/lib/enumbler/enumble.rb b/lib/enumbler/enumble.rb
@@ -11,7 +11,7 @@ def initialize(enum, id, label: nil, label_column_name: :label, **attributes)
       @label_column_name = label_column_name
       @label = (label_col_specified? ? attributes[label_column_name] : label) || enum.to_s.dasherize
       @additional_attributes = attributes || {}
-      @additional_attributes.merge!({ label: label }) if label_col_specified?
+      @additional_attributes.merge!({ label: label }) unless label.nil?
     end
 
     def ==(other)
@@ -21,7 +21,6 @@ def ==(other)
 
     def attributes
       hash = { id: id, label_column_name => label }
-      hash.merge!({ label: @additional_attributes[:label] }) if label_col_specified?
       @additional_attributes.merge(hash)
     end
 

diff --git a/lib/enumbler/version.rb b/lib/enumbler/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Enumbler
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end