enumbler 0.6.12 → 0.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d88e3b0c2b84e7fc868c0c249f07024410c345c302fb73ce9d258b69c4521d9f
-  data.tar.gz: 88221bf5dd81bd739e76ee6fafc6d1c7ea88776d5fb2cf63951a685d5ab484fc
+  metadata.gz: 66bbc4c564df073b9bc20f03c8910c4f20c41d807c263f07184ad858e9cb96eb
+  data.tar.gz: cedfcee8d80c6a453c8ddea9954c40405da2558d3be9e603fc0d5f6d8bf42986
 SHA512:
-  metadata.gz: fbb8eda79025a550a86ec856eafacd22f120ac980730036e8127f813e915a9239ff6a3277f9f3cd50b60e8013714f162dfe91b455e72a80c15fb58fc7acda405
-  data.tar.gz: c2c4268c754c0fc957cbe3c6d669e82317c766500ef225c471ddd4e549ba4b6293ffd39ffad0ec42367e6959fd58ef3a3d7f15bf68747809fed9423cb92c5656
+  metadata.gz: e3ed4b05cd073b3586922f4836e7529ae8f9360c8bf5231d4ba436abe176c788577db93215af9ef9d675da48ae15ffe796db81cdefb3c55f1d8f8ae741f4390d
+  data.tar.gz: dba88529dafd834bf7c5dbd522b52fadb6ab18b975493e091ba349c1a10dee5652dac21ad5b70e50f231e6620bca909768a0fa3219eb105a59ebafc75389d30d

data/.github/workflows/ruby.yml

@@ -3,6 +3,8 @@ name: CI Matrix Testing
 on:
   push:
     branches: [ master ]
+    tags:
+      - "*"
   pull_request:
     branches: [ master ]
 
@@ -51,6 +53,7 @@ jobs:
         ruby-version: 2.7.x
 
     - name: Publish to RubyGems
+      if: contains(github.ref, 'refs/tags/')
       run: |
         mkdir -p $HOME/.gem
         touch $HOME/.gem/credentials

data/.gitignore

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enumbler (0.6.12)
+    enumbler (0.6.14)
       activerecord (>= 5.2.3, < 6.1)
       activesupport (>= 5.2.3, < 6.1)
 
@@ -20,7 +20,6 @@ GEM
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
     ast (2.4.0)
-    byebug (11.1.3)
     concurrent-ruby (1.1.6)
     database_cleaner (1.8.5)
     database_cleaner-active_record (1.8.0)
@@ -73,7 +72,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  byebug
   database_cleaner-active_record (~> 1.8.0)
   enumbler!
   fuubar (~> 2.5)

data/enumbler.gemspec

@@ -32,7 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activerecord', ['>= 5.2.3', '< 6.1']
   spec.add_dependency 'activesupport', ['>= 5.2.3', '< 6.1']
 
-  spec.add_development_dependency 'byebug'
   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'

data/lib/enumbler/enumble.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enumbler
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.6.14
 platform: ruby
 authors:
 - Damon Timm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -50,20 +50,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  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: database_cleaner-active_record
   requirement: !ruby/object:Gem::Requirement