enumerations 2.5.4 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96fda6cfaff4da9dfd29920b976700cb73ac86717712db80e65f255188ee5c42
-  data.tar.gz: 2bc62be14144f04d162423d9d36f9949e397f6a325464d4e4fd5488e16688b83
+  metadata.gz: 2d4e5a6f8e18a9d70f988c555ea97c303467d965a1cf55a9e02f0406ddebdb85
+  data.tar.gz: 7cdec6ecd8e4ad23732ea23a5b41185b2ad1deb6cd44cedc96d73f2a28136925
 SHA512:
-  metadata.gz: fd955f210f7747cfd692f7ee2f333e66aeca3a280ab20d1eee9fb96c9287505f95b438cc0576339b03ac171d7abbb362bef81de212bad37acb799f14a256d13c
-  data.tar.gz: c9b384db06f64b3b10e335416fbb7855949d0d859273776de100865ee5ed858d7efc80ff9daf69b827eaecd40831dc372014203bc9b82fa95215957c4fb357b0
+  metadata.gz: 29193d63c19d102f702ecdbe16f9c1031cdd43a6a33768c977992749b6a722c7b3aaaa1e6011786c5bd9be7d20543b37b6611d930d1a205119984a9a91d6f2cc
+  data.tar.gz: 20b7ed5790969bb7b9ef820cc9ff89968cfef42560e46f3dbbc83b765a48bd4cef82b1d0092496ea7709db92aa4e0749d05d8b516b2d20a591807982f8c31f51

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [v2.6.0](https://github.com/infinum/enumerations/tree/v2.6.0) (2024-10-22)
+[Full Changelog](https://github.com/infinum/enumerations/compare/v2.5.4...v2.6.0)
+
+**Implemented enhancements:**
+
+- Add ability to specify foreign key suffix on enum class.
+
 ## [v2.5.4](https://github.com/infinum/enumerations/tree/v2.5.4) (2023-01-09)
 [Full Changelog](https://github.com/infinum/enumerations/compare/v2.5.3...v2.5.4)
 

data/README.md

@@ -379,11 +379,12 @@ post = Post.new
 post.status = Status.draft      # => post.status_id = 1
 ```
 
-If you want to configure primary key per enumeration class, you can use `primary_key=` class method:
+If you want to configure primary key or foreign key suffix per enumeration class, you can use `primary_key=` and `foreign_key_suffix=` class method:
 
 ```ruby
 class Status < Enumerations::Base
   self.primary_key = :id
+  self.foreign_key_suffix = :id
 
   value :draft,           id: 1, name: 'Draft'
   value :review_pending,  id: 2, name: 'Review pending'

data/enumerations.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry-byebug'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'sqlite3', '~> 1.4.0'
+  s.add_development_dependency 'sqlite3'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/enumerations/base.rb

@@ -8,11 +8,12 @@ module Enumerations
     extend Enumerations::FinderMethods
     include Enumerations::Value
 
-    class_attribute :_values, :_symbol_index, :_primary_key
+    class_attribute :_values, :_symbol_index, :_primary_key, :_foreign_key_suffix
 
     self._values = {}
     self._symbol_index = {}
     self._primary_key = nil
+    self._foreign_key_suffix = nil
 
     # Adding new value to enumeration
     #
@@ -108,6 +109,34 @@ module Enumerations
       _primary_key || Enumerations.configuration.primary_key
     end
 
+    # Sets foreign key suffix for enumeration class.
+    #
+    # Example:
+    #
+    #   class Status < Enumeration::Base
+    #     foreign_key_suffix = :id
+    #   end
+
+    def self.foreign_key_suffix=(suffix)
+      self._foreign_key_suffix = suffix && suffix.to_sym
+    end
+
+    # Gets foreign key suffix for enumeration class.
+    #
+    # Example:
+    #
+    #   Status.foreign_key_suffix  => # nil
+    #
+    #   class Status < Enumeration::Base
+    #     foreign_key_suffix = :id
+    #   end
+    #
+    #   Status.foreign_key_suffix  => # :id
+    #
+    def self.foreign_key_suffix
+      _foreign_key_suffix || Enumerations.configuration.foreign_key_suffix
+    end
+
     def self.validate_symbol_and_primary_key(symbol, attributes)
       raise Enumerations::DuplicatedSymbolError if find(symbol)
 

data/lib/enumerations/reflection.rb

@@ -22,7 +22,7 @@ module Enumerations
     private
 
     def default_foreign_key_name
-      [name, Enumerations.configuration.foreign_key_suffix].compact.join('_')
+      [name, enumerator_class.foreign_key_suffix].compact.join('_')
     end
   end
 end

data/lib/enumerations/version.rb

@@ -1,3 +1,3 @@
 module Enumerations
-  VERSION = '2.5.4'.freeze
+  VERSION = '2.6.0'.freeze
 end

data/test/configuration/enumerations_test.rb

@@ -47,5 +47,15 @@ module Configuration
 
       assert_equal query_hash, custom_enum_id: 1
     end
+
+    def test_enumerations_overrides
+      assert_equal :id, OverridableStatus.primary_key
+      assert_equal :id, OverridableStatus.foreign_key_suffix
+
+      model = OverridableModel.new
+      model.overridable_status = OverridableStatus.draft
+
+      assert_equal 1, model.overridable_status_id
+    end
   end
 end

data/test/helpers/database_helper.rb

@@ -17,4 +17,8 @@ ActiveRecord::Schema.define do
     t.integer :custom_enum_id
     t.integer :custom_enum
   end
+
+  create_table :overridable_models, force: true do |t|
+    t.integer :overridable_status_id
+  end
 end

data/test/helpers/test_helper.rb

@@ -40,3 +40,14 @@ class User < ActiveRecord::Base
   enumeration :role
   enumeration :status
 end
+
+class OverridableStatus < Enumerations::Base
+  self.primary_key = :id
+  self.foreign_key_suffix = :id
+
+  value :draft, id: 1
+end
+
+class OverridableModel < ActiveRecord::Base
+  enumeration :overridable_status
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enumerations
 version: !ruby/object:Gem::Version
-  version: 2.5.4
+  version: 2.6.0
 platform: ruby
 authors:
 - Tomislav Car
@@ -9,7 +9,7 @@ authors:
 - Nikola Santić
 - Stjepan Hadjić
 - Petar Ćurković
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2017-09-08 00:00:00.000000000 Z
@@ -102,16 +102,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
 description: Extends ActiveRecord with enumeration capabilites.
 email:
 - tomislav@infinum.hr
@@ -160,7 +160,7 @@ homepage: https://github.com/infinum/enumerations
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -175,23 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.5
-signing_key:
+rubygems_version: 3.5.15
+signing_key: 
 specification_version: 4
 summary: Enumerations for ActiveRecord!
-test_files:
-- test/base_test.rb
-- test/configuration/configuration.rb
-- test/configuration/custom_configuration_test.rb
-- test/configuration/enumerations_test.rb
-- test/configuration/finder_test.rb
-- test/configuration_test.rb
-- test/enumerations_test.rb
-- test/finder_test.rb
-- test/helpers/database_helper.rb
-- test/helpers/locale_helper.rb
-- test/helpers/test_helper.rb
-- test/locales/hr.yml
-- test/reflection_test.rb
-- test/translation_test.rb
-- test/value_test.rb
+test_files: []