acts_as_enumeration 0.1.15 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4afd8b2c797537339bee4306d4061e213cac31ad
-  data.tar.gz: 4f53befa038a1f14a8e51afe7776637105307c5b
+SHA256:
+  metadata.gz: 718e945ae870fccfeeccc24a0da07df9eec10398a812f80b7754a5c64c232069
+  data.tar.gz: ee06785a3f3d10ddec6c6fe09f25c6b4e730b600f9c9354b5d710415ceab6635
 SHA512:
-  metadata.gz: 1b8e2ca924a72b9dadf91810c4b4872d59ca472176ea7f0bece27c28ca241e3ae78e4226bb1cd87baef1b3d8a3bf5f3bd5f692288f0f1e1d8d0c11837b73db29
-  data.tar.gz: 9c529b7e047b55f30500cac391812c048a5706fe8d21749a9b3e729e6b93d1b4bcc23c009d63fbdbec0066f4f72804f434c8c8bc04587a76dcabe1e2beacf067
+  metadata.gz: aa17d9df0e149bd4ab644ff27850dc68226d1742b8c448e5df93b1dcec8c2a47bb1d2a2535d0303afa727cf849a3ec463394022f557ae73f22e73a956aebc1e8
+  data.tar.gz: 44bb24803543f1211bd7a50b3d183d9fa10698c3754a64c5c84c978e60bb26574fb94abd60e795d1993c40f2a71742761658f5d7ebb13a66657e523df3d830a7

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in acts_as_enumeration.gemspec

data/README.md

@@ -1,5 +1,11 @@
 # ActsAsEnumeration
 
+If you've found this, you may be wondering why it exists since Rails has had enum since version 4.1.8. The biggest 
+difference with this one is that it allows you to have a separate table to hold your enumerated values and have the 
+primary key as the enumeration, which adds flexibility in how they are used.
+
+The big plus that ActiveRecord::Enum has is that it adds scopes directly, 
+
 acts_as_enumeration and its aliases acts_as_enumerable, acts_as_enum, enumerable_column and enum_column
 allow for unique names in a database column to behave as if they were enumerated
 types, including chaining etc.

data/Rakefile

@@ -1,2 +1,3 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
 
+require 'bundler/gem_tasks'

data/acts_as_enumeration.gemspec

@@ -1,5 +1,8 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+require 'English'
+
+lib = File.expand_path('lib', __dir__)
 require File.dirname(__FILE__) + '/lib/active_record/acts/enumeration'
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
@@ -9,27 +12,19 @@ Gem::Specification.new do |spec|
   spec.authors = ['Paul McKibbin']
   spec.email = ['pmckibbin@gmail.com']
 
-  spec.description = %q(Active Record extender to enable the selection of a database column and have all of it's values enumerable)
-  spec.summary = %q(enumerable values from database columns)
-  spec.homepage = "http://blackrat.org"
-  spec.license = "MIT"
+  spec.description = 'Active Record extender to make a database column enumerable and queryable'
+  spec.summary = 'enumerable values from database columns'
+  spec.homepage = 'http://blackrat.org'
+  spec.license = 'MIT'
 
-  spec.files = `git ls-files`.split($/)
+  spec.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'sqlite3'
-  if RUBY_VERSION >= '2.2.2'
-    spec.add_development_dependency 'minitest'
-    spec.add_development_dependency 'activerecord'
-  elsif RUBY_VERSION >= '1.9'
-    spec.add_development_dependency 'minitest'
-    spec.add_development_dependency 'activerecord', '~> 3.0'
-  else
-    spec.add_development_dependency 'test-unit'
-    spec.add_development_dependency 'activerecord', '~> 2.3'
-  end
+  spec.add_development_dependency 'activerecord', '~> 6.1'
+  spec.add_development_dependency 'bundler', '~> 2.2.24'
+  spec.add_development_dependency 'minitest', '~> 5.14'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'sqlite3', '~> 1.4'
 end

data/init.rb

@@ -1 +1,3 @@
-require File.join(File.dirname(__FILE__), 'lib', 'acts_as_enumeration')
+# frozen_string_literal: true
+
+require File.join(File.dirname(__FILE__), 'lib', 'acts_as_enumeration')

data/lib/active_record/acts/enumeration.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module Acts
     module Enumeration
-
-      VERSION="0.1.15"
+      VERSION = '0.1.17'
       class << self
-
         def included(base)
           base.instance_eval do
             extend ClassMethods
@@ -13,9 +13,12 @@ module ActiveRecord
       end
 
       module ClassMethods
+        extend Gem::Deprecate
+
         private
+
         def portable_select(*args)
-          respond_to?(:scoped) ? scoped(:select => "#{args.join(',')}") : select(*args)
+          respond_to?(:scoped) ? scoped(select: args.join(',').to_s) : select(*args)
         end
 
         def normalize(string)
@@ -23,24 +26,25 @@ module ActiveRecord
         end
 
         public
+
         def normalize_intern(string)
           normalize(string).intern
         end
 
         def acts_as_enumeration(*args)
-          class << self;
-            attr_accessor :enumeration;
+          class << self
+            attr_accessor :enumeration
           end
-          self.enumeration||=HashWithIndifferentAccess.new
+          self.enumeration ||= HashWithIndifferentAccess.new
           args.each do |field|
-            self.enumeration[field]=HashWithIndifferentAccess[
+            self.enumeration[field] = HashWithIndifferentAccess[
               *portable_select(field, primary_key).map do |x|
                 [normalize_intern(x.send(field)), x.send(x.class.primary_key)]
               end.flatten
             ]
             (
-            class << self;
-              self;
+            class << self
+              self
             end).class_eval do
               define_method(:enumerations) { |name| self.enumeration[name.intern] }
               define_method("#{field}_valid?") { |value| !!send("id_for_#{field}", value) }
@@ -48,16 +52,36 @@ module ActiveRecord
               define_method("id_for_#{field}") { |value| enumerations(field)[value.intern] }
               define_method("for_#{field}") { |value| find(send("id_for_#{field}", value)) }
               define_method("enum_#{field}") { enumerations(field) }
-              define_method("as_key") { |value| find(value).as_key rescue nil }
+              define_method('as_key') do |value|
+                begin
+                                                  find(value).as_key
+                rescue StandardError
+                  nil
+                                                end
+              end
+            end
+
+            define_method(:is?) do |*types|
+              types.any? do |x|
+                self == (begin
+                                        self.class.send(x)
+                         rescue StandardError
+                           nil
+                                      end)
+              end
+            end
+            # Deprecated: Please use 'not?' instead
+            define_method(:is_not?) do |*types|
+              not?(*types)
             end
+            define_method(:not?) { |*types| !is?(*types) }
+            deprecate :is_not?, :not?, '2021', '7'
 
-            define_method(:is?) { |*types| types.any? { |x| self==(self.class.send(x) rescue nil) } }
-            define_method(:is_not?) { |*types| !is?(*types) }
             define_method(:method_missing) do |method_id, *args, &block|
-              method_name=method_id.to_s
-              if match_data=method_name.match(/^(is[_not]*)(\?|_(\w*)\?)/)
-                method  =match_data[1] << "?"
-                new_args= (match_data[2]=='?') ? args : match_data[3].split(/_or_/)
+              method_name = method_id.to_s
+              if match_data = method_name.match(/^(is[_not]*)(\?|_(\w*)\?)/)
+                method = match_data[1] << '?'
+                new_args = match_data[2] == '?' ? args : match_data[3].split(/_or_/)
                 respond_to?(method) ? send(method, *new_args, &block) : false
               else
                 super method_id, *args, &block
@@ -65,57 +89,55 @@ module ActiveRecord
             end
 
             def allowed_chars(string)
-              string.to_s=~/^[a-z_]/
+              string.to_s =~ /^[a-z_]/
             end
 
-            def check_string(string, &block)
+            def check_string(string)
               allowed_chars(string) && (yield string)
             end
 
             def _key(string)
-              check_string(string) {|y| !respond_to?(y)} ? string : "_#{string}"
+              check_string(string) { |y| !respond_to?(y) } ? string : "_#{string}"
             end
 
             def _camelized_key(string)
-              check_string(string) {|y| !const_defined?(string.camelize)} ? string.camelize : "_#{string.camelize}"
+              check_string(string) { |_y| !const_defined?(string.camelize) } ? string.camelize : "_#{string.camelize}"
             end
 
             def _camelized_upcase_key(string)
-              check_string(string) {|y| !const_defined?(string.camelize.upcase)} ? string.camelize.upcase : "_#{string.camelize.upcase}"
+              check_string(string) { |_y| !const_defined?(string.camelize.upcase) } ? string.camelize.upcase : "_#{string.camelize.upcase}"
             end
 
             portable_select(field).map { |x| normalize_intern(x.send(field)) }.each do |y|
-              key=_key(y.to_s)
-              camelized_key=_camelized_key(y.to_s)
-              camelized_upcase_key=_camelized_upcase_key(y.to_s)
+              key = _key(y.to_s)
+              camelized_key = _camelized_key(y.to_s)
+              camelized_upcase_key = _camelized_upcase_key(y.to_s)
               define_method(:as_key) { self.class.normalize_intern(send(field)) }
               define_method("is_#{y}?") { is?(y) }
               alias_method "#{key}?", "is_#{y}?"
-              class << self;
-                self;
+              class << self
+                self
               end.instance_eval do
-                define_method(key) { self.send("for_#{field}", y) }
-                define_method(camelized_key) { self.send("id_for_#{field}", y)}
-                define_method(camelized_upcase_key) { self.send("id_for_#{field}", y)}
+                define_method(key) { send("for_#{field}", y) }
+                define_method(camelized_key) { send("id_for_#{field}", y) }
+                define_method(camelized_upcase_key) { send("id_for_#{field}", y) }
               end
               begin
-                self.const_set(camelized_key,self.send("id_for_#{field}",y))
-              rescue Exception=>e
+                const_set(camelized_key, send("id_for_#{field}", y))
+              rescue Exception => e
                 puts("Warning: Skipping constant definition for #{camelized_key}")
               end
               begin
-                self.const_set(camelized_upcase_key,self.send("id_for_#{field}",y))
-              rescue Exception=>e
+                const_set(camelized_upcase_key, send("id_for_#{field}", y))
+              rescue Exception => e
                 puts("Warning: Skipping constant definition for #{camelized_upcase_key}")
               end
             end
           end
         end
 
-        [:acts_as_enum, :enum_column, :enumerable_column, :acts_as_enumerable].each do |aliased|
-          unless defined?(aliased)
-            alias_method aliased, :acts_as_enumeration
-          end
+        %i[acts_as_enum enum_column enumerable_column acts_as_enumerable].each do |aliased|
+          alias_method aliased, :acts_as_enumeration unless defined?(aliased)
         end
       end
     end

data/lib/acts_as_enumeration.rb

@@ -1,2 +1,2 @@
-require (File.join(File.dirname(__FILE__), 'active_record', 'acts', 'enumeration.rb'))
-ActiveRecord::Base.send :include, ActiveRecord::Acts::Enumeration
+require File.join(File.dirname(__FILE__), 'active_record', 'acts', 'enumeration.rb')
+ActiveRecord::Base.include ActiveRecord::Acts::Enumeration

data/test/enumeration_test.rb

@@ -1,25 +1,26 @@
+# frozen_string_literal: true
+
 require 'rubygems'
-if RUBY_VERSION >= '1.9'
-  require 'minitest/autorun'
-  require 'active_record'
-else
-  require 'test/unit'
-  require 'activerecord'
-  require 'sqlite3'
-end
+require 'minitest/autorun'
+require 'active_record'
+
 $:.unshift File.dirname(__FILE__) + '/../lib'
 require 'acts_as_enumeration'
 
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
 
 def setup_db
   ActiveRecord::Base.logger
-  ActiveRecord::Schema.define(:version => 1) do
+  ActiveRecord::Schema.define(version: 1) do
     create_table :enumerates do |t|
       t.column :type, :string
       t.column :name, :string
       t.column :description, :string
     end
+
+    create_table :associated_tables do |t|
+      t.references :enumerates
+    end
   end
 end
 
@@ -36,23 +37,27 @@ class BrokenEnumeration < Enumerate; end
 
 class EnumerateTest < (
 begin
-  MiniTest::Test rescue Test::Unit::TestCase
+  begin
+    MiniTest::Test
+  rescue StandardError
+    Test::Unit::TestCase
+  end
 end)
   def setup
     setup_db
     [EnumerateAll].each do |klass|
-      klass.create! :name => 'first', :description => 'First field'
-      klass.create! :name => 'second', :description => 'Second field'
-      klass.create! :name => 'third', :description => 'Third field'
+      klass.create! name: 'first', description: 'First field'
+      klass.create! name: 'second', description: 'Second field'
+      klass.create! name: 'third', description: 'Third field'
     end
     [EnumerateSome].each do |klass|
-      klass.create! :name => 'forth', :description => 'Forth field'
-      klass.create! :name => 'fifth', :description => 'Fifth field'
-      klass.create! :name => 'sixth', :description => 'Sixth field'
+      klass.create! name: 'forth', description: 'Forth field'
+      klass.create! name: 'fifth', description: 'Fifth field'
+      klass.create! name: 'sixth', description: 'Sixth field'
     end
     [BrokenEnumeration].each do |klass|
-      klass.create! :name => '33108', :description => '33108 field'
-      klass.create! :name => 'all', :description => 'already defined method'
+      klass.create! name: '33108', description: '33108 field'
+      klass.create! name: 'all', description: 'already defined method'
     end
     EnumerateAll.acts_as_enumeration :description
     EnumerateSome.acts_as_enumeration :description
@@ -83,15 +88,15 @@ end)
     assert !EnumerateAll.valid_description?(:blah_blah_field)
     assert !EnumerateAll.valid_description?('blah_blah_field')
     assert Enumerate.first.id, EnumerateAll.id_for_description(:first_field)
-    assert EnumerateAll::FIRSTFIELD,Enumerate.first.id
-    assert EnumerateAll::FirstField,Enumerate.first.id
-    assert EnumerateAll.FIRSTFIELD,Enumerate.first.id
-    assert EnumerateAll.FirstField,Enumerate.first.id
-    assert BrokenEnumeration._33108,BrokenEnumeration.first.id
-    assert BrokenEnumeration._all,BrokenEnumeration.find_by_name('all')
-    assert BrokenEnumeration::All,BrokenEnumeration.find_by_name('all').id
-    assert BrokenEnumeration::ALL,BrokenEnumeration.find_by_name('all').id
-    assert BrokenEnumeration::ALL,BrokenEnumeration.id_for_name(:all)
+    assert EnumerateAll::FIRSTFIELD, Enumerate.first.id
+    assert EnumerateAll::FirstField, Enumerate.first.id
+    assert EnumerateAll.FIRSTFIELD, Enumerate.first.id
+    assert EnumerateAll.FirstField, Enumerate.first.id
+    assert BrokenEnumeration._33108, BrokenEnumeration.first.id
+    assert BrokenEnumeration._all, BrokenEnumeration.find_by_name('all')
+    assert BrokenEnumeration::All, BrokenEnumeration.find_by_name('all').id
+    assert BrokenEnumeration::ALL, BrokenEnumeration.find_by_name('all').id
+    assert BrokenEnumeration::ALL, BrokenEnumeration.id_for_name(:all)
   end
 
   def test_sti
@@ -116,4 +121,3 @@ end)
     assert EnumerateSome.first.id, EnumerateSome.id_for_description(:forth_field)
   end
 end
-

metadata

@@ -1,87 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_enumeration
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.17
 platform: ruby
 authors:
 - Paul McKibbin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2021-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.24
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.24
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Active Record extender to enable the selection of a database column and
-  have all of it's values enumerable
+        version: '1.4'
+description: Active Record extender to make a database column enumerable and queryable
 email:
 - pmckibbin@gmail.com
 executables: []
@@ -103,7 +102,7 @@ homepage: http://blackrat.org
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -118,9 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: enumerable values from database columns
 test_files: