enumerize 2.2.1 → 2.5.0

data/test/set_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'yaml'
 
@@ -39,36 +41,36 @@ describe Enumerize::Set do
   end
 
   it 'equals to other set' do
-    set.must_equal Enumerize::Set.new(nil, kklass.foo, %w(a))
+    expect(set).must_equal Enumerize::Set.new(nil, kklass.foo, %w(a))
   end
 
   it 'equals to array' do
-    set.must_equal %w(a)
+    expect(set).must_equal %w(a)
   end
 
   it 'equals to array of symbols' do
-    set.must_equal [:a]
+    expect(set).must_equal [:a]
   end
 
   it 'has unique values' do
     set << :a
-    set.must_equal %w(a)
+    expect(set).must_equal %w(a)
   end
 
   it 'equals to array with different value order' do
     set << :b
-    set.must_equal %w(b a)
+    expect(set).must_equal %w(b a)
   end
 
   it "isn't equal to a part of values" do
     set << :b
-    set.wont_equal %w(a)
+    expect(set).wont_equal %w(a)
   end
 
   describe '#push' do
     it 'appends values' do
       set.push :b
-      set.must_include :b
+      expect(set).must_include :b
     end
 
     it 'reassigns attribute' do
@@ -81,7 +83,7 @@ describe Enumerize::Set do
   describe '#delete' do
     it 'deletes value' do
       set.delete :a
-      set.wont_include :a
+      expect(set).wont_include :a
     end
 
     it 'reassigns attribute' do
@@ -94,64 +96,64 @@ describe Enumerize::Set do
   describe '#inspect' do
     it 'returns custom string' do
       set << :b
-      set.inspect.must_equal '#<Enumerize::Set {a, b}>'
+      expect(set.inspect).must_equal '#<Enumerize::Set {a, b}>'
     end
   end
 
   describe '#to_ary' do
     it 'returns array' do
-      set.to_ary.must_be_instance_of Array
+      expect(set.to_ary).must_be_instance_of Array
     end
   end
 
   describe '#texts' do
     it 'returns array of text values' do
-      set.texts.must_equal ['A']
+      expect(set.texts).must_equal ['A']
     end
   end
 
   describe '#join' do
     it 'joins values' do
       set << :b
-      set.join(', ').must_equal 'a, b'
+      expect(set.join(', ')).must_equal 'a, b'
     end
   end
 
   describe 'boolean methods comparison' do
     it 'returns true if value equals method' do
       set << :a
-      set.a?.must_equal true
+      expect(set.a?).must_equal true
     end
 
     it 'returns false if value does not equal method' do
       set << :a
-      set.b?.must_equal false
+      expect(set.b?).must_equal false
     end
 
     it 'raises NoMethodError if there are no values like boolean method' do
-      proc {
+      expect(proc {
         set.some_method?
-      }.must_raise NoMethodError
+      }).must_raise NoMethodError
     end
 
     it 'raises ArgumentError if arguments are passed' do
-      proc {
+      expect(proc {
         set.a?('<3')
-      }.must_raise ArgumentError
+      }).must_raise ArgumentError
     end
 
     it 'responds to methods for existing values' do
-      set.must_respond_to :a?
-      set.must_respond_to :b?
-      set.must_respond_to :c?
+      expect(set).must_respond_to :a?
+      expect(set).must_respond_to :b?
+      expect(set).must_respond_to :c?
     end
 
     it 'returns a method object' do
-      set.method(:a?).must_be_instance_of Method
+      expect(set.method(:a?)).must_be_instance_of Method
     end
 
     it 'does not respond to a method for not existing value' do
-      set.wont_respond_to :some_method?
+      expect(set).wont_respond_to :some_method?
     end
   end
 

data/test/simple_form_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'simple_form/version'
 
@@ -40,6 +42,12 @@ class SimpleFormSpec < MiniTest::Spec
     end
   end
 
+  class Registration < Struct.new(:sex)
+    extend Enumerize
+
+    enumerize :sex, in: [:male, :female]
+  end
+
   let(:user) { User.new }
   let(:post) { Post.new }
 
@@ -129,6 +137,15 @@ class SimpleFormSpec < MiniTest::Spec
     assert_select 'input.string'
   end
 
+  it 'renders select with enumerized values for non-ActiveModel object' do
+    concat(simple_form_for(Registration.new, as: 'registration', url: '/') do |f|
+      f.input(:sex)
+    end)
+
+    assert_select 'select option[value=male]'
+    assert_select 'select option[value=female]'
+  end
+
   it 'does not affect forms without object' do
     concat(simple_form_for('') do |f|
       f.input(:name)

data/test/support/mock_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MockController
   attr_writer :action_name
 

data/test/support/shared_enums.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'active_record'
+require 'sequel'
+
+module EnumerizeExtention
+  def self.included(base)
+    case
+    when base < ActiveRecord::Base
+      base.extend Enumerize
+    when base < Sequel::Model
+      base.plugin :enumerize
+    end
+  end
+end
+
+module SkipValidationsEnum
+  def self.included(base)
+    base.include EnumerizeExtention
+    base.enumerize :foo, :in => [:bar, :baz], :skip_validations => true
+  end
+end
+
+module DoNotSkipValidationsEnum
+  def self.included(base)
+    base.include EnumerizeExtention
+    base.enumerize :foo, :in => [:bar, :baz], :skip_validations => false
+  end
+end
+
+module SkipValidationsLambdaEnum
+  def self.included(base)
+    base.include EnumerizeExtention
+    base.enumerize :foo, :in => [:bar, :baz], :skip_validations => lambda { true }
+  end
+end
+
+module SkipValidationsLambdaWithParamEnum
+  def self.included(base)
+    base.include EnumerizeExtention
+    base.enumerize :foo, :in => [:bar, :baz], :skip_validations => lambda { |record| true }
+  end
+end

data/test/support/view_test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/concern'
 require 'active_support/testing/setup_and_teardown'
 
@@ -5,10 +7,21 @@ if defined?(ActionView::RoutingUrlFor)
   ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor)
 end
 
-module ViewTestHelper
+module SetupAndTeardownHelper
   extend ActiveSupport::Concern
 
   include ActiveSupport::Testing::SetupAndTeardown
+
+  included do
+    include ActiveSupport::Callbacks
+    define_callbacks :setup, :teardown
+  end
+end
+
+module ViewTestHelper
+  extend ActiveSupport::Concern
+
+  include SetupAndTeardownHelper
   include ActionView::TestCase::Behavior
 
   included do

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'minitest/autorun'
 require 'minitest/spec'
 require 'active_support/core_ext/kernel/reporting'

data/test/value_test.rb

@@ -1,46 +1,49 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'yaml'
 
 describe Enumerize::Value do
-  class Attr < Struct.new(:values)
+  class Model
+  end
+
+  class Attr < Struct.new(:values, :name, :i18n_scopes, :klass)
   end
 
-  let(:attr) { Attr.new([]) }
-  let(:val)  { Enumerize::Value.new(attr, 'test_value', 1) }
+  let(:attr) { Attr.new([], "attribute_name", [], Model) }
+  let(:val) { Enumerize::Value.new(attr, 'test_value', 1) }
 
   it 'is a string' do
-    val.must_be_kind_of String
+    expect(val).must_be_kind_of String
   end
 
   describe 'equality' do
     it 'is compared to string' do
-      val.must_be :==, 'test_value'
-      val.wont_be :==, 'not_value'
+      expect(val).must_be :==, 'test_value'
+      expect(val).wont_be :==, 'not_value'
     end
 
     it 'is compared to symbol' do
-      val.must_be :==, :test_value
-      val.wont_be :==, :not_value
+      expect(val).must_be :==, :test_value
+      expect(val).wont_be :==, :not_value
     end
 
     it 'is compared to integer' do
-      val.must_be :==, 1
-      val.wont_be :==, 2
+      expect(val).must_be :==, 1
+      expect(val).wont_be :==, 2
     end
   end
 
   describe 'translation' do
-    let(:attr)  { Struct.new(:values, :name, :i18n_scopes).new([], "attribute_name", []) }
-
     it 'uses common translation' do
       store_translations(:en, :enumerize => {:attribute_name => {:test_value => "Common translation"}}) do
-        val.text.must_be :==, "Common translation"
+        expect(val.text).must_be :==, "Common translation"
       end
     end
 
     it 'uses default translation from the "default" section if its present' do
       store_translations(:en, :enumerize => {:defaults => {:attribute_name => {:test_value => "Common translation"}}}) do
-        val.text.must_be :==, "Common translation"
+        expect(val.text).must_be :==, "Common translation"
       end
     end
 
@@ -48,7 +51,7 @@ describe Enumerize::Value do
       attr.i18n_scopes = ["enumerize.model_name.attribute_name"]
 
       store_translations(:en, :enumerize => {:model_name => {:attribute_name => {:test_value => "Model Specific translation"}}}) do
-        val.text.must_be :==, "Model Specific translation"
+        expect(val.text).must_be :==, "Model Specific translation"
       end
     end
 
@@ -56,13 +59,13 @@ describe Enumerize::Value do
       attr.i18n_scopes = ["enumerize.model_name.attribute_name"]
 
       store_translations(:en, :enumerize => {:attribute_name => {:test_value => "Common translation"}, :model_name => {:attribute_name => {:test_value => "Model Specific translation"}}}) do
-        val.text.must_be :==, "Model Specific translation"
+        expect(val.text).must_be :==, "Model Specific translation"
       end
     end
 
     it 'uses simply humanized value when translation is undefined' do
       store_translations(:en, :enumerize => {}) do
-        val.text.must_be :==, "Test value"
+        expect(val.text).must_be :==, "Test value"
       end
     end
 
@@ -70,7 +73,7 @@ describe Enumerize::Value do
       attr.i18n_scopes = ["other.scope"]
 
       store_translations(:en, :other => {:scope => {:test_value => "Scope specific translation"}}) do
-        val.text.must_be :==, "Scope specific translation"
+        expect(val.text).must_be :==, "Scope specific translation"
       end
     end
 
@@ -78,7 +81,7 @@ describe Enumerize::Value do
       attr.i18n_scopes = ["nonexistent.scope", "other.scope"]
 
       store_translations(:en, :other => {:scope => {:test_value => "Scope specific translation"}}) do
-        val.text.must_be :==, "Scope specific translation"
+        expect(val.text).must_be :==, "Scope specific translation"
       end
     end
   end
@@ -89,36 +92,44 @@ describe Enumerize::Value do
     end
 
     it 'returns true if value equals method' do
-      val.test_value?.must_equal true
+      expect(val.test_value?).must_equal true
     end
 
     it 'returns false if value does not equal method' do
-      val.other_value?.must_equal false
+      expect(val.other_value?).must_equal false
     end
 
     it 'raises NoMethodError if there are no values like boolean method' do
-      proc {
+      expect(proc {
         val.some_method?
-      }.must_raise NoMethodError
+      }).must_raise NoMethodError
     end
 
     it 'raises ArgumentError if arguments are passed' do
-      proc {
+      expect(proc {
         val.other_value?('<3')
-      }.must_raise ArgumentError
+      }).must_raise ArgumentError
     end
 
     it 'responds to methods for existing values' do
-      val.must_respond_to :test_value?
-      val.must_respond_to :other_value?
+      expect(val).must_respond_to :test_value?
+      expect(val).must_respond_to :other_value?
     end
 
     it 'returns a method object' do
-      val.method(:test_value?).must_be_instance_of Method
+      expect(val.method(:test_value?)).must_be_instance_of Method
     end
 
     it "doesn't respond to a method for not existing value" do
-      val.wont_respond_to :some_method?
+      expect(val).wont_respond_to :some_method?
+    end
+
+    it "doesn't respond to methods is value was modified" do
+      modified_value = val.upcase
+
+      expect(modified_value.upcase).wont_respond_to :some_method?
+      expect(modified_value.upcase).wont_respond_to :test_value?
+      expect(modified_value.upcase).wont_respond_to :other_value?
     end
   end
 
@@ -131,7 +142,17 @@ describe Enumerize::Value do
 
     it 'serializes with Marshal' do
       dump_value = Marshal.dump(val)
-      Marshal.load(dump_value).must_equal 'test_value'
+      expect(Marshal.load(dump_value)).must_equal 'test_value'
+    end
+  end
+
+  describe 'initialize' do
+    it 'no output if undefined boolean method' do
+      assert_silent() { Enumerize::Value.new(attr, 'test_value') }
+    end
+
+    it 'error output if defined boolean method' do
+      assert_output(nil, /`empty\?` is defined/) { Enumerize::Value.new(attr, 'empty') }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enumerize
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Sergey Nartimov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2021-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -31,16 +31,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.global
 - Gemfile.mongo_mapper
-- Gemfile.rails42
-- Gemfile.rails50
-- Gemfile.rails52
+- Gemfile.rails60
+- Gemfile.rails61
+- Gemfile.rails70
+- Gemfile.railsmaster
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -68,6 +69,7 @@ files:
 - lib/enumerize/scope/sequel.rb
 - lib/enumerize/sequel.rb
 - lib/enumerize/set.rb
+- lib/enumerize/utils.rb
 - lib/enumerize/value.rb
 - lib/enumerize/version.rb
 - lib/sequel/plugins/enumerize.rb
@@ -89,6 +91,7 @@ files:
 - test/set_test.rb
 - test/simple_form_test.rb
 - test/support/mock_controller.rb
+- test/support/shared_enums.rb
 - test/support/view_test_helper.rb
 - test/test_helper.rb
 - test/value_test.rb
@@ -111,30 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Enumerated attributes with I18n and ActiveRecord/Mongoid/MongoMapper support
-test_files:
-- spec/enumerize/integrations/rspec/matcher_spec.rb
-- spec/spec_helper.rb
-- test/activemodel_test.rb
-- test/activerecord_test.rb
-- test/attribute_map_test.rb
-- test/attribute_test.rb
-- test/base_test.rb
-- test/formtastic_test.rb
-- test/module_attributes_test.rb
-- test/mongo_mapper_test.rb
-- test/mongoid_test.rb
-- test/multiple_test.rb
-- test/predicates_test.rb
-- test/rails_admin_test.rb
-- test/sequel_test.rb
-- test/set_test.rb
-- test/simple_form_test.rb
-- test/support/mock_controller.rb
-- test/support/view_test_helper.rb
-- test/test_helper.rb
-- test/value_test.rb
+test_files: []

data/.travis.yml

@@ -1,35 +0,0 @@
-language: ruby
-sudo: false
-services:
-  - postgresql
-  - mongodb
-gemfile:
-  - Gemfile
-  - Gemfile.rails42
-  - Gemfile.rails50
-  - Gemfile.rails52
-  - Gemfile.mongo_mapper
-rvm:
-  - 2.2.7
-  - 2.3.3
-  - 2.4.1
-  - jruby-9.1.14.0
-env:
-  global:
-    - DB_USER=postgres
-    - DB_PASS=
-  matrix:
-    - DB=sqlite3
-    - DB=postgresql
-matrix:
-  fast_finish: true
-  allow_failures:
-    - rvm: jruby-9.1.14.0
-  exclude:
-    - gemfile: Gemfile.mongo_mapper
-      env: DB=postgresql
-branches:
-  only:
-    - master
-notifications:
-  email: false

data/Gemfile.rails42

@@ -1,7 +0,0 @@
-eval_gemfile('Gemfile.global')
-
-gem 'minitest', '~> 5.8'
-gem 'rails',    '4.2.8', :require => false
-gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.0', platform: :jruby
-gem 'activerecord-jdbcpostgresql-adapter', '~> 1.3.0', platform: :jruby
-gem 'mongoid',  '~> 5.0'

data/Gemfile.rails50

@@ -1,7 +0,0 @@
-eval_gemfile('Gemfile.global')
-
-gem 'minitest', '~> 5.8'
-gem 'rails',    '5.0.6', require: false
-gem 'activerecord-jdbcsqlite3-adapter', '~> 51.0', platform: :jruby
-gem 'activerecord-jdbcpostgresql-adapter', '~> 51.0', platform: :jruby
-gem 'mongoid'

data/Gemfile.rails52

@@ -1,7 +0,0 @@
-eval_gemfile('Gemfile.global')
-
-gem 'minitest', '~> 5.8'
-gem 'rails',    '5.2.0.rc1', require: false
-gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master', platform: :jruby
-gem 'activerecord-jdbcpostgresql-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master', platform: :jruby
-gem 'mongoid',  github: 'mongodb/mongoid'