enumbler 0.6.14 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66bbc4c564df073b9bc20f03c8910c4f20c41d807c263f07184ad858e9cb96eb
-  data.tar.gz: cedfcee8d80c6a453c8ddea9954c40405da2558d3be9e603fc0d5f6d8bf42986
+  metadata.gz: af754378eb4d6913b7d2f6521ae88e1cc59ceb3b8d76211e1cad637bc154634f
+  data.tar.gz: 19fcc7da7e52d35a079e9fbb4da6781d84df7b704fe1482a69ec553edf2dd709
 SHA512:
-  metadata.gz: e3ed4b05cd073b3586922f4836e7529ae8f9360c8bf5231d4ba436abe176c788577db93215af9ef9d675da48ae15ffe796db81cdefb3c55f1d8f8ae741f4390d
-  data.tar.gz: dba88529dafd834bf7c5dbd522b52fadb6ab18b975493e091ba349c1a10dee5652dac21ad5b70e50f231e6620bca909768a0fa3219eb105a59ebafc75389d30d
+  metadata.gz: db53c9304123815cbda6900f3855b33b6fe7100233bd8b0eb7dea3223fea32b57760fe0ea0adfe02b4f5cda86dea0bb8ce327873117369577045f7502ba4af07
+  data.tar.gz: cdc6f3e944d5b1e92b2a6f41f118ef6d4685bb4bf78ce01c267f9549b9a009daf9b9d3edacd9111acfac96b4f1a2571181e29207684f9e197fd4f12d9afc8e76

data/.gitignore

@@ -9,5 +9,6 @@
 
 # rspec failure tracking
 .rspec_status
+.byebug_history
 
 tags*

data/.rubocop.yml

@@ -1,7 +1,6 @@
 AllCops:
-  TargetRubyVersion: 2.6
-  Exclude:
-    - 'bin/pre_commit_rubocop.rb'
+  NewCops: enable
+  TargetRubyVersion: 2.5
 
 Layout/ArgumentAlignment:
   Enabled: true
@@ -11,16 +10,36 @@ Layout/FirstHashElementIndentation:
   Enabled: true
   EnforcedStyle: consistent
 
+Layout/HashAlignment:
+  Enabled: true
+  # This allows "implicit" hash arguments (without curly braces) to be aligned
+  # differently.
+  EnforcedLastArgumentHashStyle: ignore_implicit
+
 Layout/LineLength:
   AllowURI: true
   Max: 119
 
+Layout/MultilineMethodCallIndentation:
+  Enabled: true
+  EnforcedStyle: indented
+
 Lint/RaiseException:
   Enabled: true
 
 Lint/StructNewOverride:
   Enabled: true
 
+Metrics:
+  Enabled: false
+
+Naming/MethodParameterName:
+  Enabled: true
+  AllowedNames: [at, by, db, id, in, ip, of, on, to, tz]
+
+Naming/PredicateName:
+  Enabled: true
+
 Style/Documentation:
   Enabled: false
 
@@ -33,6 +52,9 @@ Style/HashTransformKeys:
 Style/HashTransformValues:
   Enabled: true
 
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
 Style/TrailingCommaInHashLiteral:
   Enabled: true
   EnforcedStyleForMultiline: consistent_comma
@@ -41,5 +63,5 @@ Style/TrailingCommaInArrayLiteral:
   Enabled: true
   EnforcedStyleForMultiline: consistent_comma
 
-Metrics:
-  Enabled: false
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: consistent_comma

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in enumbler.gemspec
 gemspec

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    enumbler (0.6.14)
-      activerecord (>= 5.2.3, < 6.1)
-      activesupport (>= 5.2.3, < 6.1)
+    enumbler (0.9.0)
+      activerecord (>= 5.2.3, < 7)
+      activesupport (>= 5.2.3, < 7)
 
 GEM
   remote: https://rubygems.org/
@@ -19,7 +19,8 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    ast (2.4.0)
+    ast (2.4.1)
+    coderay (1.1.2)
     concurrent-ruby (1.1.6)
     database_cleaner (1.8.5)
     database_cleaner-active_record (1.8.0)
@@ -31,13 +32,17 @@ GEM
       ruby-progressbar (~> 1.4)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
+    method_source (1.0.0)
     minitest (5.14.1)
     parallel (1.19.1)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rainbow (3.0.0)
     rake (12.3.3)
+    regexp_parser (1.7.1)
     rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -52,14 +57,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.81.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.91.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
       rexml
+      rubocop-ast (>= 0.4.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.4.0)
+      parser (>= 2.7.1.4)
     ruby-progressbar (1.10.1)
     sqlite3 (1.4.2)
     thread_safe (0.3.6)
@@ -75,9 +83,10 @@ DEPENDENCIES
   database_cleaner-active_record (~> 1.8.0)
   enumbler!
   fuubar (~> 2.5)
+  pry
   rake (~> 12.0)
   rspec (~> 3.9.0)
-  rubocop (~> 0.81.0)
+  rubocop (~> 0.91.0)
   sqlite3 (~> 1.4.0)
 
 BUNDLED WITH

data/README.md

@@ -91,6 +91,17 @@ Color.ids_from_enumbler(:black, 'does-no-exist') # => [1, nil]
 Color.ids_from_enumbler!(:black, 'does-no-exist') # => raises Enumbler::Error
 Color.id_from_enumbler!(:does_not_exist) # => raises Enumbler::Error
 
+# Get a model instance (like `.find_by` in Rails)
+Color.find_by_enumble(1)
+Color.find_by_enumble(:black)
+Color.find_by_enumble("black")
+Color.find_by_enumble("BLACK")
+Color.find_by_enumble(Color.black) # => self
+Color.find_by_enumble("whoops")    # => nil
+
+# Raise ActiveRecord::RecordNotFound error with bang
+Color.find_by_enumble!("whoops")    # => nil
+
 # Get enumble object by id
 house = House.create!(color: Color.black)
 
@@ -108,12 +119,14 @@ House.color(Color.black, :white) # => ActiveRecord::Relation<house, house2>
 
 ### Use a column other than `label`
 
-By default, the Enumbler expects a table in the database with a column `label`.  However, you can change this to another underlying column name.  Note that the enumbler still treats it as a `label` column; however it will be saved to the correct place in the database.
+By default, the Enumbler expects a table in the database with a column `label`.  However, you can change this to another underlying column name.  Note that the enumbler still treats it as a `label` column; however it will be saved to the correct place in the database. Your model now can have its own `label` separate from whatever attribute/column was
+specified for Enumbler usage.
 
 ```ruby
 ActiveRecord::Schema.define do
   create_table :feelings, force: true do |t|
     t.string :emotion, null: false, index: { unique: true }
+    t.string :label
   end
 end
 
@@ -125,8 +138,15 @@ class Feeling < ApplicationRecord
 
   enumble :sad, 1
   enumble :happy, 2
-  enumble :verklempt, 3, label: 'overcome with emotion'
+  enumble :verklempt, 3, label: "Verklempt!", emotion: 'overcome with emotion'
 end
+
+# Now the `Feeling` model can use `label` if it wants to
+# and not conflict with Enumbler usage (:emotion in this case)
+# .enumble.label & .emotion is used internally by Enumbler
+Feeling.verklempt.label           # => 'Verklempt!'
+Feeling.verklempt.enumble.label   # => 'overcome with emotion'
+Feeling.verklempt.emotion         # => 'overcome with emotion'
 ```
 
 ## Core ext
@@ -140,6 +160,7 @@ when :black
 when :blue, :purple
   'very surprised'
 end
+```
 
 ## Development
 
@@ -149,14 +170,12 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Roadmap
 
-* We need to add in support for additional attributes/columns in the enumbled table.  For example, following the `Color` concept, we may want to have a column which is `hex` and stores the colors `hex` value (e.g., `FFFFFF`).  This should be supported.
-* Ideally, we could make this work more like a traditional `enum`; for example, overriding the `.where` method by allowing something like: `House.where(color: :blue)` instead of `House.where_color(:blue)`.  But right now am in a rush and not sure how to go about doing that properly.
+* Ideally, we could make this work more like a traditional `enum`; for example, overriding the `.where` method by allowing something like: `House.where(color: :blue)` instead of `House.color(:blue)`.  But right now am in a rush and not sure how to go about doing that properly.
 
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/linguabee/enumbler.
 
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/Rakefile

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 

data/bin/console

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'bundler/setup'
-require 'enumbler'
+require "bundler/setup"
+require "enumbler"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -11,5 +11,5 @@ require 'enumbler'
 # require "pry"
 # Pry.start
 
-require 'irb'
+require "irb"
 IRB.start(__FILE__)

data/bin/pre_commit_rubocop.rb

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # Put this file into your path and use `<file> install` to add a new hook
 # or use it as a binary to check changed files
 
-require 'shellwords'
+require "shellwords"
 
 if ARGV == ["install"]
   exec "ln", "-sf", File.expand_path(File.basename(__FILE__), __dir__), ".git/hooks/pre-commit"
@@ -10,15 +12,23 @@ else
   raise unless ARGV == []
 end
 
-changed = `git status --porcelain`.
-  split("\n").
-  map { |l| l.split(" ", 2) }.
-  select { |status, _| ["A", "AM", "M"].include?(status) }.
-  map { |_, file| file.delete('"') }
+changed = `git status --porcelain`
+  .split("\n")
+  .map { |l| l.split(" ", 2) }
+  .select { |status, _| %w[A AM M].include?(status) }
+  .map { |_, file| file.delete('"') }
 
 exit if changed.empty?
 
-parallel = ((File.read(".rubocop.yml").include?("UseCache: false") rescue false) ? "" : " --parallel")
+parallel = (if begin
+  File.read(".rubocop.yml").include?("UseCache: false")
+rescue StandardError
+  false
+end
+              ""
+            else
+              " --parallel"
+            end)
 result = `bundle exec rubocop #{parallel} --color --force-exclusion #{changed.shelljoin}`
-puts result unless $?.success?
-exit $?.exitstatus
+puts result unless $CHILD_STATUS.success?
+exit $CHILD_STATUS.exitstatus

data/enumbler.gemspec

@@ -1,41 +1,42 @@
 # frozen_string_literal: true
 
-require_relative 'lib/enumbler/version'
+require_relative "lib/enumbler/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'enumbler'
+  spec.name          = "enumbler"
   spec.version       = Enumbler::VERSION
-  spec.authors       = ['Damon Timm']
-  spec.email         = ['damon@linguabee.com']
+  spec.authors       = ["Damon Timm"]
+  spec.email         = ["damon@linguabee.com"]
 
   spec.summary       = "Enums are terrific, but lack integrity.  Let's add some!"
-  spec.description   = 'A more complete description is forthcoming.'
-  spec.homepage      = 'https://github.com/linguabee/enumbler'
-  spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
+  spec.description   = "A more complete description is forthcoming."
+  spec.homepage      = "https://github.com/linguabee/enumbler"
+  spec.license       = "MIT"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = spec.homepage
-  spec.metadata['changelog_uri'] = spec.homepage
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+  spec.metadata["changelog_uri"] = spec.homepage
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = 'exe'
+  spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-
-  spec.add_dependency 'activerecord', ['>= 5.2.3', '< 6.1']
-  spec.add_dependency 'activesupport', ['>= 5.2.3', '< 6.1']
-
-  spec.add_development_dependency 'database_cleaner-active_record', '~> 1.8.0'
-  spec.add_development_dependency 'fuubar', '~> 2.5'
-  spec.add_development_dependency 'rake', '~> 12.0'
-  spec.add_development_dependency 'rspec', '~> 3.9.0'
-  spec.add_development_dependency 'rubocop', '~> 0.81.0'
-  spec.add_development_dependency 'sqlite3', '~> 1.4.0'
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "activerecord", [">= 5.2.3", "< 7"]
+  spec.add_dependency "activesupport", [">= 5.2.3", "< 7"]
+
+  spec.add_development_dependency "database_cleaner-active_record", "~> 1.8.0"
+  spec.add_development_dependency "fuubar", "~> 2.5"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rspec", "~> 3.9.0"
+  spec.add_development_dependency "rubocop", "~> 0.91.0"
+  spec.add_development_dependency "sqlite3", "~> 1.4.0"
 end

data/lefthook.yml

@@ -0,0 +1,12 @@
+# EXAMPLE USAGE
+# Refer for explanation to following link:
+# https://github.com/Arkweid/lefthook/blob/master/docs/full_guide.md
+
+pre-commit:
+  parallel: true
+  commands:
+    rubocop:
+      tags: backend style
+      glob: "*.rb"
+      exclude: "application.rb|routes.rb"
+      run: bundle exec rubocop --force-exclusion {all_files}

data/lib/enumbler.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'enumbler/core_ext/symbol/case_equality_operator'
+require "enumbler/core_ext/symbol/case_equality_operator"
 
-require 'enumbler/collection'
-require 'enumbler/enumble'
-require 'enumbler/enabler'
-require 'enumbler/version'
+require "enumbler/collection"
+require "enumbler/enumble"
+require "enumbler/enabler"
+require "enumbler/version"
 
-require 'active_support/concern'
-require 'active_support/inflector'
+require "active_support/concern"
+require "active_support/inflector"
 
 # The Enumbler add integrity to our enum implementation!
 module Enumbler

data/lib/enumbler/collection.rb

@@ -16,7 +16,7 @@ module Enumbler
       super
     end
 
-    def respond_to_missing?(method_name, include_private = false)
+    def respond_to_missing?(method_name, *args, &block)
       enumble = find { |e| e.enum == method_name }
       enumble.present? || super
     end

data/lib/enumbler/enabler.rb

@@ -12,7 +12,7 @@ module Enumbler
     def enumble
       @enumble = self.class.find_enumble(id)
 
-      raise Error, 'An enumble is not defined for this record!' if @enumble.nil?
+      raise Error, "An enumble is not defined for this record!" if @enumble.nil?
 
       @enumble
     end
@@ -126,6 +126,51 @@ module Enumbler
         @enumbler_label_column_name = label_column_name
       end
 
+      # Like `ActiveRecord#find_by`, will try and return an instance of this
+      # model that matches any of our enumble attributes (instance, id, string,
+      # or symbol).
+      #
+      #   Color.find_by_enumble(1)
+      #   Color.find_by_enumble(:black)
+      #   Color.find_by_enumble("black")
+      #   Color.find_by_enumble("BLACK")
+      #   Color.find_by_enumble(Color.black) # => self
+      #   Color.find_by_enumble("whoops")    # => nil
+      #
+      # @param arg [Class, String, Integer, Symbol] search argument
+      # @param case_sensitive [Boolean] string search to be case sensitive (default: false)
+      # @param raise_error [Boolean] whether to raise RecordNotFound error (default: false)
+      # @return [self]
+      def find_by_enumble(arg, case_sensitive: false, raise_error: false)
+        return arg if arg.instance_of?(@enumbled_model)
+
+        id = id_from_enumbler(arg, case_sensitive: case_sensitive, raise_error: raise_error)
+
+        find_by = raise_error ? :find_by! : :find_by
+        @enumbled_model.public_send(find_by, id: id)
+      rescue Enumbler::Error
+        raise ActiveRecord::RecordNotFound.new("Couldn't find #{@enumbled_model}", @enumbled_model)
+      end
+
+      # Like `ActiveRecord#find`, will try and return an instance of this model
+      # that matches any of our enumble attributes (instance, id, string, or
+      # symbol) raises a `RecordNotFound` error if none found.
+      #
+      #   Color.find_by_enumble!(1)
+      #   Color.find_by_enumble!(:black)
+      #   Color.find_by_enumble!("black")
+      #   Color.find_by_enumble!("BLACK")
+      #   Color.find_by_enumble!(Color.black) # => returns self
+      #   Color.find_by_enumble!("whoops")    # => raise ActiveRecord::RecordNotFound
+      #
+      # @param arg [Class, String, Integer, Symbol] search argument
+      # @param case_sensitive [Boolean] string search to be case sensitive (default: false)
+      # @param raise_error [Boolean] whether to raise RecordNotFound error (default: false)
+      # @return [self]
+      def find_by_enumble!(arg, case_sensitive: false)
+        find_by_enumble(arg, case_sensitive: case_sensitive, raise_error: true)
+      end
+
       # See {.find_enumbles}.  Simply returns the first object.  Use when you
       # want one argument to be found and not returned in an array.
       # @raise [Error] when there is no [Enumbler::Enumble] to be found and
@@ -182,6 +227,8 @@ module Enumbler
             enumble =
               if arg.is_a?(Symbol)
                 @enumbled_model.enumbles.find { |e| e.enum == arg }
+              elsif arg.is_a?(Enumbler::Enumble)
+                @enumbled_model.enumbles.find { |e| e.enum == arg.enum }
               elsif arg.is_a?(String)
                 @enumbled_model.enumbles.find do |e|
                   if case_sensitive
@@ -285,7 +332,7 @@ module Enumbler
       #   longer defined (default: false)
       # @param validate [Boolean] validate on save?
       def seed_the_enumbler(delete_missing_records: false, validate: true)
-        max_database_id = all.order('id desc').take&.id || 0
+        max_database_id = all.order("id desc").take&.id || 0
         max_enumble_id = @enumbles.map(&:id).max
 
         # If we are not deleting records, we just need to update each listed
@@ -330,11 +377,21 @@ module Enumbler
         method_name = "#{enumble.enum}?"
         not_method_name = "not_#{enumble.enum}?"
         alias_method_name = "is_#{enumble.enum}"
+        any_method_name = "any_#{enumble.enum}?"
+
+        [method_name, not_method_name, alias_method_name].each do |mname|
+          detect_enumbler_conflict(enumble.enum, mname)
+        end
+
+        [enumble.enum, any_method_name].each do |mname|
+          detect_enumbler_conflict(enumble.enum, mname, klass_method: true)
+        end
 
         const_set(enumble.enum.to_s.upcase, enumble.id)
         define_method(method_name) { id == enumble.id }
         define_method(not_method_name) { id != enumble.id }
         alias_method alias_method_name, method_name
+
         define_singleton_method(enumble.enum) do |attr = nil|
           return find(enumble.id) if attr.nil?
 
@@ -343,13 +400,42 @@ module Enumbler
           raise Enumbler::Error, "The attribute #{attr} is not supported on this Enumble."
         end
 
-        define_singleton_method("any_#{enumble.enum}?") do
+        define_singleton_method(any_method_name) do
           where(id: enumble.id).exists?
         rescue NoMethodError
           raise Enumbler::Error, "The attribute #{attr} is not supported on this Enumble."
         end
       end
 
+      # This idea sourced lovingly from ActiveRecord::Enum
+      ENUMBLER_CONFLICT_MESSAGE = <<~TEXT.squish
+        You tried to define the enumble :%<enum>s on the model %<klass>s, but
+        this will generate a %<type>s method `%<method>s`, which is already defined
+        by %<source>s.
+      TEXT
+
+      def detect_enumbler_conflict(enumble_name, method_name, klass_method: false)
+        if klass_method && dangerous_class_method?(method_name)
+          raise_conflict_error(enumble_name, method_name, type: "class")
+        elsif klass_method && method_defined_within?(method_name, ActiveRecord::Relation)
+          raise_conflict_error(enumble_name, method_name, type: "class", source: ActiveRecord::Relation.name)
+        elsif !klass_method && dangerous_attribute_method?(method_name)
+          raise_conflict_error(enumble_name, method_name)
+        end
+      end
+
+      def raise_conflict_error(enumble_name, method_name, type: "instance", source: "ActiveRecord")
+        raise Error,
+          format(
+            ENUMBLER_CONFLICT_MESSAGE,
+            enum: enumble_name,
+            klass: name,
+            type: type,
+            method: method_name,
+            source: source,
+          )
+      end
+
       # I accidentally forgot to provide an id one time and it was confusing as
       # the last argument became the hash of options.  This should help.
       def validate_id_is_numeric(enum, id)
@@ -370,7 +456,7 @@ module Enumbler
           "The model #{self} does not support the attribute(s): #{unsupported_attrs.keys.map(&:to_s).to_sentence}"
       rescue ActiveRecord::StatementInvalid
         warn "[Enumbler Warning] => Unable to find a table for #{self}."\
-          'This is to be expected if there is a pending migration; however, if there is not then something is amiss.'
+          "This is to be expected if there is a pending migration; however, if there is not then something is amiss."
       end
     end
   end

data/lib/enumbler/enumble.rb

@@ -8,9 +8,10 @@ module Enumbler
     def initialize(enum, id, label: nil, label_column_name: :label, **attributes)
       @id = id
       @enum = enum
-      @label = label || enum.to_s.dasherize
       @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?
     end
 
     def ==(other)
@@ -19,10 +20,9 @@ module Enumbler
     end
 
     def attributes
-      @additional_attributes.merge({
-        id: id,
-        label_column_name => label,
-      })
+      hash = { id: id, label_column_name => label }
+      hash.merge!({ label: @additional_attributes[:label] }) if label_col_specified?
+      @additional_attributes.merge(hash)
     end
 
     # Used to return itself from a class method.
@@ -50,5 +50,11 @@ module Enumbler
     def to_s
       enum
     end
+
+    private
+
+    def label_col_specified?
+      label_column_name != :label
+    end
   end
 end

data/lib/enumbler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Enumbler
-  VERSION = '0.6.14'
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enumbler
 version: !ruby/object:Gem::Version
-  version: 0.6.14
+  version: 0.9.0
 platform: ruby
 authors:
 - Damon Timm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: 5.2.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 5.2.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: 5.2.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: 5.2.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: database_cleaner-active_record
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +78,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +126,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.81.0
+        version: 0.91.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.81.0
+        version: 0.91.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +169,7 @@ files:
 - bin/pre_commit_rubocop.rb
 - bin/setup
 - enumbler.gemspec
+- lefthook.yml
 - lib/enumbler.rb
 - lib/enumbler/collection.rb
 - lib/enumbler/core_ext/symbol/case_equality_operator.rb
@@ -184,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Enums are terrific, but lack integrity.  Let's add some!