enumerize 2.1.2 → 2.4.0

data/test/set_test.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'yaml'
 
 describe Enumerize::Set do
-  let(:klass) do
+  let(:kklass) do
     Class.new do
       extend Enumerize
       enumerize :foo, :in => %w(a b c), :multiple => true
     end
   end
 
-  let(:object) { klass.new }
+  let(:object) { kklass.new }
 
   def build_set(values)
-    @set = Enumerize::Set.new(object, klass.foo, values)
+    @set = Enumerize::Set.new(object, kklass.foo, values)
   end
 
   def set
@@ -39,7 +41,7 @@ describe Enumerize::Set do
   end
 
   it 'equals to other set' do
-    set.must_equal Enumerize::Set.new(nil, klass.foo, %w(a))
+    set.must_equal Enumerize::Set.new(nil, kklass.foo, %w(a))
   end
 
   it 'equals to array' do

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
 

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,12 +1,17 @@
+# 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
@@ -30,8 +35,6 @@ describe Enumerize::Value do
   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"
@@ -81,6 +84,13 @@ describe Enumerize::Value do
         val.text.must_be :==, "Scope specific translation"
       end
     end
+
+    it 'returns nil if value was modified' do
+      store_translations(:en, :enumerize => {:attribute_name => {:test_value => "Common translation"}}) do
+        modified_val = val.upcase
+        modified_val.text.must_be_nil
+      end
+    end
   end
 
   describe 'boolean methods comparison' do
@@ -120,6 +130,14 @@ describe Enumerize::Value do
     it "doesn't respond to a method for not existing value" do
       val.wont_respond_to :some_method?
     end
+
+    it "doesn't respond to methods is value was modified" do
+      modified_value = val.upcase
+
+      modified_value.upcase.wont_respond_to :some_method?
+      modified_value.upcase.wont_respond_to :test_value?
+      modified_value.upcase.wont_respond_to :other_value?
+    end
   end
 
   describe 'serialization' do
@@ -134,4 +152,14 @@ describe Enumerize::Value do
       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.1.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Sergey Nartimov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2020-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,13 +38,14 @@ files:
 - Gemfile
 - Gemfile.global
 - Gemfile.mongo_mapper
-- Gemfile.rails42
-- Gemfile.rails51
+- Gemfile.rails60
+- Gemfile.rails61
 - 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
@@ -66,10 +67,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
@@ -85,6 +89,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
@@ -92,7 +97,7 @@ homepage: https://github.com/brainspec/enumerize
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -107,14 +112,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.0.8
+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
@@ -130,6 +135,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/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', platform: :jruby
-gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-gem 'mongoid',  '~> 5.0'

data/Gemfile.rails51

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