enumerize 2.0.0 → 2.7.0

data/lib/enumerize/value.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'i18n'
+require 'active_support/inflector'
 
 module Enumerize
   class Value < String
@@ -11,10 +14,20 @@ module Enumerize
       @value = value.nil? ? name.to_s : value
 
       super(name.to_s)
+
+      @i18n_keys = @attr.i18n_scopes.map do |s|
+        scope = Utils.call_if_callable(s, @value)
+
+        :"#{scope}.#{self}"
+      end
+      @i18n_keys << :"enumerize.defaults.#{@attr.name}.#{self}"
+      @i18n_keys << :"enumerize.#{@attr.name}.#{self}"
+      @i18n_keys << ActiveSupport::Inflector.humanize(ActiveSupport::Inflector.underscore(self)) # humanize value if there are no translations
+      @i18n_keys
     end
 
     def text
-      I18n.t(i18n_keys[0], :default => i18n_keys[1..-1])
+      I18n.t(@i18n_keys[0], :default => @i18n_keys[1..-1]) if @i18n_keys
     end
 
     def ==(other)
@@ -30,19 +43,5 @@ module Enumerize
     def predicate_call(value)
       value == self
     end
-
-    def i18n_keys
-      @i18n_keys ||= begin
-        i18n_keys = i18n_scopes
-        i18n_keys << :"enumerize.defaults.#{@attr.name}.#{self}"
-        i18n_keys << :"enumerize.#{@attr.name}.#{self}"
-        i18n_keys << self.underscore.humanize # humanize value if there are no translations
-        i18n_keys
-      end
-    end
-
-    def i18n_scopes
-      @attr.i18n_scopes.map { |s| :"#{s}.#{self}" }
-    end
   end
 end

data/lib/enumerize/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Enumerize
-  VERSION = "2.0.0"
+  VERSION = '2.7.0'
 end

data/lib/enumerize.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'active_support/concern'
+require 'active_support/core_ext/object/blank'
 require 'enumerize/version'
 
 module Enumerize
@@ -10,8 +13,10 @@ module Enumerize
   autoload :Module,       'enumerize/module'
   autoload :Predicates,   'enumerize/predicates'
   autoload :Predicatable, 'enumerize/predicatable'
+  autoload :Utils,        'enumerize/utils'
   autoload :ModuleAttributes, 'enumerize/module_attributes'
 
+  autoload :ActiveModelAttributesSupport, 'enumerize/activemodel'
   autoload :ActiveRecordSupport, 'enumerize/activerecord'
   autoload :SequelSupport, 'enumerize/sequel'
   autoload :MongoidSupport,      'enumerize/mongoid'
@@ -31,6 +36,10 @@ module Enumerize
     base.send :include, Enumerize::Base
     base.extend Enumerize::Predicates
 
+    if defined?(::ActiveModel::Attributes)
+      base.extend Enumerize::ActiveModelAttributesSupport
+    end
+
     if defined?(::ActiveRecord::Base)
       base.extend Enumerize::ActiveRecordSupport
       base.extend Enumerize::Scope::ActiveRecord

data/lib/sequel/plugins/enumerize.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Sequel
+  module Plugins
+    module Enumerize
+      # Depend on the def_dataset_method plugin
+      def self.apply(model)
+        model.plugin(:def_dataset_method) unless model.respond_to?(:def_dataset_method)
+      end
+
+      module InstanceMethods
+        def self.included(base)
+          base.extend ::Enumerize
+        end
+      end
+    end
+  end
+end

data/spec/enumerize/integrations/rspec/matcher_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record'
 
 silence_warnings do
@@ -11,6 +13,7 @@ ActiveRecord::Base.connection.instance_eval do
     t.string :sex
     t.string :role
     t.string :account_type
+    t.string :status
   end
 end
 
@@ -20,6 +23,7 @@ class User < ActiveRecord::Base
   enumerize :sex, :in => [:male, :female], scope: true
   enumerize :role, :in => [:user, :admin], scope: :having_role
   enumerize :account_type, :in => [:basic, :premium]
+  enumerize :status, :in => [:active, :disabled], scope: :shallow
 end
 
 RSpec.describe Enumerize::Integrations::RSpec::Matcher do
@@ -39,7 +43,6 @@ RSpec.describe Enumerize::Integrations::RSpec::Matcher do
   end
 
   describe 'without qualifier' do
-
     it 'accepts when has defined a enumerize' do
       model.enumerize(:sex, :in => [:male, :female])
       expect(subject).to enumerize(:sex)
@@ -54,9 +57,7 @@ RSpec.describe Enumerize::Integrations::RSpec::Matcher do
   end
 
   describe '#in' do
-
     context 'defined as array' do
-
       before do
         model.enumerize(:sex, :in => [:male, :female])
       end
@@ -89,7 +90,6 @@ RSpec.describe Enumerize::Integrations::RSpec::Matcher do
     end
 
     context 'defined as hash' do
-
       before do
         model.enumerize(:sex, :in => { male: 0, female: 1 })
       end
@@ -128,7 +128,6 @@ RSpec.describe Enumerize::Integrations::RSpec::Matcher do
   end
 
   describe '#with_default' do
-
     before do
       model.enumerize(:sex, :in => [:male, :female], default: :female)
     end
@@ -159,9 +158,7 @@ RSpec.describe Enumerize::Integrations::RSpec::Matcher do
   end
 
   describe '#with_i18n_scope' do
-
     context 'defined as string' do
-
       before do
         model.enumerize(:sex, :in => [:male, :female], i18n_scope: 'sex')
       end
@@ -198,7 +195,6 @@ RSpec.describe Enumerize::Integrations::RSpec::Matcher do
   end
 
   describe '#with_predicates' do
-
     it 'accepts when predicates is defined as a boolean' do
       model.enumerize(:sex, :in => [:male, :female], predicates: true)
       expect(subject).to enumerize(:sex).in(:male, :female).with_predicates(true)
@@ -209,6 +205,11 @@ RSpec.describe Enumerize::Integrations::RSpec::Matcher do
       expect(subject).to enumerize(:sex).in(:male, :female).with_predicates(prefix: true)
     end
 
+    it 'accepts when custom values are used as attribute' do
+      model.enumerize(:sex, :in => { male: 0, female: 1 }, predicates: true)
+      expect(subject).to enumerize(:sex).in(:male, :female).with_predicates(true)
+    end
+
     it 'rejects when predicates is not defined' do
       model.enumerize(:sex, :in => [:male, :female])
       message = 'Expected Model to define enumerize :sex in: "female", "male" predicates: true'
@@ -219,7 +220,6 @@ RSpec.describe Enumerize::Integrations::RSpec::Matcher do
   end
 
   describe '#with_multiple' do
-
     it 'accepts when has defined the multiple' do
       model.enumerize(:sex, :in => [:male, :female], multiple: true)
       expect(subject).to enumerize(:sex).in(:male, :female).with_multiple(true)
@@ -235,7 +235,6 @@ RSpec.describe Enumerize::Integrations::RSpec::Matcher do
   end
 
   describe '#with_scope' do
-
     subject do
       User.new
     end
@@ -248,6 +247,10 @@ RSpec.describe Enumerize::Integrations::RSpec::Matcher do
       expect(subject).to enumerize(:role).in(:user, :admin).with_scope(scope: :having_role)
     end
 
+    it 'accepts shallow scope' do
+      expect(subject).to enumerize(:status).in(:active, :disabled).with_scope(:shallow)
+    end
+
     it 'rejects when scope is not defined' do
       message = 'Expected User to define enumerize :account_type in: "basic", "premium" scope: true'
       expect do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails'
 require 'enumerize'
 require 'rspec/matchers/fail_matchers'

data/test/activemodel_test.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+if defined?(::ActiveModel::Attributes)
+
+class ActiveModelTest < MiniTest::Spec
+  class ActiveModelUser
+    include ActiveModel::Model
+    include ActiveModel::Attributes
+    extend Enumerize
+
+    attribute :name, :string
+    enumerize :sex, :in => %w[male female]
+    enumerize :role, :in => %w[admin user], :default => 'user'
+    enumerize :interests, :in => [:music, :sports, :dancing, :programming], :multiple => true
+  end
+
+  class InterestsRequiredActiveModelUser < ActiveModelUser
+    validates :interests, presence: true
+  end
+
+  let(:model) { ActiveModelUser }
+
+  it 'initialize value' do
+    user = model.new(:name => 'active_model_user', :sex => :male, :role => :user, :interests => [:music, :programming])
+    expect(user.sex).must_equal 'male'
+    expect(user.sex_text).must_equal 'Male'
+    expect(user.role).must_equal 'user'
+    expect(user.role_text).must_equal 'User'
+    expect(user.interests).must_equal %w(music programming)
+  end
+
+  it 'sets nil if invalid value is passed' do
+    user = model.new
+    user.sex = :invalid
+    expect(user.sex).must_be_nil
+  end
+
+  it 'stores value' do
+    user = model.new
+    user.sex = :female
+    expect(user.sex).must_equal 'female'
+  end
+
+  it 'has default value' do
+    expect(model.new.role).must_equal 'user'
+  end
+
+  it 'validates inclusion' do
+    user = model.new
+    user.role = 'wrong'
+    expect(user).wont_be :valid?
+  end
+
+  it 'supports multiple attributes' do
+    user = ActiveModelUser.new
+    expect(user.interests).must_be_instance_of Enumerize::Set
+    expect(user.interests).must_be_empty
+    user.interests << :music
+    expect(user.interests).must_equal %w(music)
+    user.interests << :sports
+    expect(user.interests).must_equal %w(music sports)
+
+    user.interests = []
+    interests = user.interests
+    interests << :music
+    expect(interests).must_equal %w(music)
+    interests << :dancing
+    expect(interests).must_equal %w(music dancing)
+  end
+
+  it 'returns invalid multiple value for validation' do
+    user = ActiveModelUser.new
+    user.interests << :music
+    user.interests << :invalid
+    values = user.read_attribute_for_validation(:interests)
+    expect(values).must_equal %w(music invalid)
+  end
+
+  it 'validates multiple attributes' do
+    user = ActiveModelUser.new
+    user.interests << :invalid
+    expect(user).wont_be :valid?
+
+    user.interests = Object.new
+    expect(user).wont_be :valid?
+
+    user.interests = ['music', '']
+    expect(user).must_be :valid?
+  end
+
+  it 'validates presence with multiple attributes' do
+    user = InterestsRequiredActiveModelUser.new
+    user.interests = []
+    user.valid?
+
+    expect(user.errors[:interests]).wont_be :empty?
+
+    user.interests = ['']
+    user.valid?
+
+    expect(user.errors[:interests]).wont_be :empty?
+
+    user.interests = [:dancing, :programming]
+    user.valid?
+
+    expect(user.errors[:interests]).must_be_empty
+  end
+end
+
+else
+  # Skip
+end