enumerize 2.0.0 → 2.7.0

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 }
 
@@ -128,4 +136,21 @@ 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)
+    end)
+
+    assert_select 'input.string'
+  end
 end

data/test/support/mock_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MockController
   attr_writer :action_name
 
@@ -22,4 +24,8 @@ class MockController
   end
 
   def hash_for_users_path(*); end
+
+  def polymorphic_mappings
+    {}
+  end
 end

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'
@@ -44,6 +46,14 @@ module MiscHelpers
       I18n.reload!
     end
   end
+
+  def unsafe_yaml_load(yaml)
+    if YAML.respond_to?(:unsafe_load)
+      YAML.unsafe_load(yaml)
+    else
+      YAML.load(yaml)
+    end
+  end
 end
 
 class MiniTest::Spec

data/test/value_test.rb

@@ -1,46 +1,52 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'yaml'
 
-describe Enumerize::Value do
-  class Attr < Struct.new(:values)
+class ValueTest < MiniTest::Spec
+  class Model
+  end
+
+  class Attr < Struct.new(:values, :name, :i18n_scopes, :klass)
+    def value?(value)
+      values.include?(value)
+    end
   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 +54,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 +62,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 +76,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 +84,15 @@ 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
+
+    it 'allows to pass a proc as i18n_scopes param' do
+      attr.i18n_scopes = [proc { |v| "other.scope.#{v}" }]
+
+      store_translations(:en, :other => {:scope => {:"1" => {:test_value => "Scope specific translation"}}}) do
+        expect(val.text).must_be :==, "Scope specific translation"
       end
     end
   end
@@ -89,36 +103,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 +153,13 @@ 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
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enumerize
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Sergey Nartimov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2023-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -31,19 +31,23 @@ 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.rails60
+- Gemfile.rails61
+- Gemfile.rails70
+- Gemfile.railsmaster
 - MIT-LICENSE
 - README.md
 - Rakefile
 - enumerize.gemspec
 - lib/enumerize.rb
+- lib/enumerize/activemodel.rb
 - lib/enumerize/activerecord.rb
 - lib/enumerize/attribute.rb
 - lib/enumerize/attribute_map.rb
@@ -65,10 +69,13 @@ 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
 - 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
@@ -84,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
@@ -99,21 +107,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.6
 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
@@ -129,6 +137,7 @@ test_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

data/.travis.yml

@@ -1,18 +0,0 @@
-language: ruby
-sudo: false
-services:
-  - mongodb
-gemfile:
-  - Gemfile
-  - Gemfile.rails42
-  - Gemfile.mongo_mapper
-rvm:
-  - 2.2.5
-  - 2.3.1
-  - jruby-9.1.2.0
-matrix:
-  allow_failures:
-    - gemfile: Gemfile
-      rvm: jruby-9.1.2.0
-notifications:
-  email: false

data/Gemfile.rails42

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