enumerize 0.8.0 → 1.1.1

data/test/sequel_test.rb

@@ -0,0 +1,291 @@
+require 'test_helper'
+require 'sequel'
+require 'logger'
+require 'jdbc/sqlite3' if RUBY_PLATFORM == 'java'
+
+module SequelTest
+  silence_warnings do
+    DB = if RUBY_PLATFORM == 'java'
+      Sequel.connect('jdbc:sqlite::memory:')
+    else
+      Sequel.sqlite
+    end
+    DB.loggers << Logger.new(nil)
+  end
+
+  DB.create_table :users do
+    primary_key :id
+    String :sex
+    String :role
+    String :lambda_role
+    String :name
+    String :interests
+    String :status
+    String :account_type, default: "basic"
+  end
+
+  DB.create_table :documents do
+    primary_key :id
+    String :visibility
+    Time :created_at
+    Time :updated_at
+  end
+
+  class Document < Sequel::Model
+    extend Enumerize
+    enumerize :visibility, :in => [:public, :private, :protected], :scope => true, :default => :public
+  end
+
+  module RoleEnum
+    extend Enumerize
+    enumerize :role, :in => [:user, :admin], :default => :user, scope: :having_role
+    enumerize :lambda_role, :in => [:user, :admin], :default => lambda { :admin }
+  end
+
+  class User < Sequel::Model
+    plugin :serialization, :json, :interests
+    plugin :dirty
+    plugin :defaults_setter
+    plugin :validation_helpers
+    extend Enumerize
+    include RoleEnum
+
+    enumerize :sex, :in => [:male, :female]
+
+    enumerize :interests, :in => [:music, :sports, :dancing, :programming], :multiple => true
+
+    enumerize :status, :in => { active: 1, blocked: 2 }, scope: true
+
+    enumerize :account_type, :in => [:basic, :premium]
+  end
+
+  class UniqStatusUser < User
+    def validate
+      super
+      validates_unique :status
+      validates_presence :sex
+    end
+  end
+
+  describe Enumerize::SequelSupport do
+    it 'sets nil if invalid value is passed' do
+      user = User.new
+      user.sex = :invalid
+      user.sex.must_equal nil
+    end
+
+    it 'saves value' do
+      User.filter.delete
+      user = User.new
+      user.sex = :female
+      user.save
+      user.sex.must_equal 'female'
+    end
+
+    it 'loads value' do
+      User.filter.delete
+      User.create(:sex => :male)
+      store_translations(:en, :enumerize => {:sex => {:male => 'Male'}}) do
+        user = User.first
+        user.sex.must_equal 'male'
+        user.sex_text.must_equal 'Male'
+      end
+    end
+
+    it 'has default value' do
+      User.new.role.must_equal 'user'
+      User.new.values[:role].must_equal 'user'
+    end
+
+    it 'does not set default value for not selected attributes' do
+      User.filter.delete
+      User.create(:sex => :male)
+
+      assert_equal [:id], User.select(:id).first.values.keys
+    end
+
+    it 'has default value with lambda' do
+      User.new.lambda_role.must_equal 'admin'
+      User.new.values[:lambda_role].must_equal 'admin'
+    end
+    it 'uses after_initialize callback to set default value' do
+      User.filter.delete
+      User.create(sex: 'male', lambda_role: nil)
+
+      user = User.where(:sex => 'male').first
+      user.lambda_role.must_equal 'admin'
+    end
+
+    it 'uses default value from db column' do
+      User.new.account_type.must_equal 'basic'
+    end
+
+    it 'validates inclusion' do
+      user = User.new
+      user.role = 'wrong'
+      user.wont_be :valid?
+      user.errors[:role].must_include 'is not included in the list'
+    end
+
+    it 'validates inclusion on mass assignment' do
+      assert_raises Sequel::ValidationFailed do
+        User.create(role: 'wrong')
+      end
+    end
+
+    it "uses persisted value for validation if it hasn't been set" do
+      user = User.create :sex => :male
+      User[user.id].read_attribute_for_validation(:sex).must_equal 'male'
+    end
+
+    it 'is valid with empty string assigned' do
+      user = User.new
+      user.role = ''
+      user.must_be :valid?
+    end
+
+    it 'stores nil when empty string assigned' do
+      user = User.new
+      user.role = ''
+      user.values[:role].must_equal nil
+    end
+
+    it 'supports multiple attributes' do
+      user = User.new
+      user.interests ||= []
+      user.interests.must_be_empty
+      user.interests << "music"
+      user.interests.must_equal %w(music)
+      user.save
+
+      user = User[user.id]
+      user.interests.must_be_instance_of Enumerize::Set
+      user.interests.must_equal %w(music)
+      user.interests << "sports"
+      user.interests.must_equal %w(music sports)
+
+      user.interests = []
+      interests = user.interests
+      interests << "music"
+      interests.must_equal %w(music)
+      interests << "dancing"
+      interests.must_equal %w(music dancing)
+    end
+
+    it 'returns invalid multiple value for validation' do
+      user = User.new
+      user.interests << :music
+      user.interests << :invalid
+      values = user.read_attribute_for_validation(:interests)
+      values.must_equal %w(music invalid)
+    end
+
+    it 'validates multiple attributes' do
+      user = User.new
+      user.interests << :invalid
+      user.wont_be :valid?
+
+      user.interests = Object.new
+      user.wont_be :valid?
+
+      user.interests = ['music', '']
+      user.must_be :valid?
+    end
+
+    it 'stores custom values for multiple attributes' do
+      User.filter.delete
+
+      klass = Class.new(User)
+      klass.enumerize :interests, in: { music: 0, sports: 1, dancing: 2, programming: 3}, multiple: true
+
+      user = klass.new
+      user.interests << :music
+      user.interests.must_equal %w(music)
+      user.save
+
+      user = klass[user.id]
+      user.interests.must_equal %w(music)
+    end
+
+    it 'adds scope' do
+      User.filter.delete
+
+      user_1 = User.create(status: :active, role: :admin)
+      user_2 = User.create(status: :blocked)
+
+      User.with_status(:active).to_a.must_equal [user_1]
+      User.with_status(:blocked).to_a.must_equal [user_2]
+      User.with_status(:active, :blocked).to_set.must_equal [user_1, user_2].to_set
+
+      User.without_status(:active).to_a.must_equal [user_2]
+      User.without_status(:active, :blocked).to_a.must_equal []
+
+      User.having_role(:admin).to_a.must_equal [user_1]
+    end
+
+    it 'allows either key or value as valid' do
+      user_1 = User.new(status: :active)
+      user_2 = User.new(status: 1)
+      user_3 = User.new(status: '1')
+
+      user_1.status.must_equal 'active'
+      user_2.status.must_equal 'active'
+      user_3.status.must_equal 'active'
+
+      user_1.must_be :valid?
+      user_2.must_be :valid?
+      user_3.must_be :valid?
+    end
+
+    it 'supports defining enumerized attributes on abstract class' do
+      Document.filter.delete
+
+      document = Document.new
+      document.visibility = :protected
+      document.visibility.must_equal 'protected'
+    end
+
+    it 'supports defining enumerized scopes on abstract class' do
+      Document.filter.delete
+
+      document_1 = Document.create(visibility: :public)
+      document_2 = Document.create(visibility: :private)
+
+      Document.with_visibility(:public).to_a.must_equal [document_1]
+    end
+
+    it 'validates uniqueness' do
+      user = User.create(status: :active, sex: "male")
+
+      user = UniqStatusUser.new
+      user.sex = "male"
+      user.status = :active
+      user.valid?.must_equal false
+
+      user.errors[:status].wont_be :empty?
+    end
+
+    it "doesn't update record" do
+      Document.filter.delete
+
+      expected = Time.new(2010, 10, 10)
+
+      document = Document.new
+      document.updated_at = expected
+      document.save
+
+      document = Document.last
+      document.save
+
+      assert_equal expected, document.updated_at
+    end
+
+    it 'changes from dirty should be serialized as scalar values' do
+      user = User.create(:status => :active)
+      user.status = :blocked
+
+      expected = { status: [1, 2] }.to_yaml
+      assert_equal expected, user.column_changes.to_yaml
+    end
+  end
+end

data/test/set_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'yaml'
 
 describe Enumerize::Set do
   let(:klass) do
@@ -103,6 +104,12 @@ describe Enumerize::Set do
     end
   end
 
+  describe '#texts' do
+    it 'returns array of text values' do
+      set.texts.must_equal ['A']
+    end
+  end
+
   describe '#join' do
     it 'joins values' do
       set << :b
@@ -147,4 +154,11 @@ describe Enumerize::Set do
       set.wont_respond_to :some_method?
     end
   end
+
+  describe 'serialization' do
+    it 'is serialized to yaml as array' do
+      set << :a
+      assert_equal YAML.dump(%w(a)), YAML.dump(set)
+    end
+  end
 end

data/test/simple_form_test.rb

@@ -1,6 +1,5 @@
 require 'test_helper'
 require 'simple_form/version'
-require 'rails'
 
 class SimpleFormSpec < MiniTest::Spec
   include ViewTestHelper

data/test/support/view_test_helper.rb

@@ -1,6 +1,10 @@
 require 'active_support/concern'
 require 'active_support/testing/setup_and_teardown'
 
+if defined?(ActionView::RoutingUrlFor)
+  ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor)
+end
+
 module ViewTestHelper
   extend ActiveSupport::Concern
 

data/test/test_helper.rb

@@ -2,12 +2,33 @@ require 'minitest/autorun'
 require 'minitest/spec'
 require 'active_support/core_ext/kernel/reporting'
 require 'active_model'
-
-$VERBOSE=true
+require 'rails'
+begin
+  require 'mongoid'
+rescue LoadError
+end
 
 module RailsAdmin
 end
 
+require 'simple_form'
+SimpleForm.setup {}
+
+require 'formtastic'
+
+module EnumerizeTest
+  class Application < Rails::Application
+    config.active_support.deprecation = :stderr
+    config.active_support.test_order = :random
+    config.eager_load = false
+    config.secret_key_base = 'secret'
+  end
+end
+
+EnumerizeTest::Application.initialize!
+
+$VERBOSE=true
+
 require 'enumerize'
 
 Dir["#{File.dirname(__FILE__)}/support/*.rb"].each do |file|

data/test/value_test.rb

@@ -1,15 +1,32 @@
 require 'test_helper'
+require 'yaml'
 
 describe Enumerize::Value do
-  let(:attr)  { Struct.new(:values).new([]) }
-  let(:value) { Enumerize::Value.new(attr, 'test_value') }
+  class Attr < Struct.new(:values)
+  end
+
+  let(:attr) { Attr.new([]) }
+  let(:val)  { Enumerize::Value.new(attr, 'test_value', 1) }
 
   it 'is a string' do
-    value.must_be_kind_of String
+    val.must_be_kind_of String
   end
 
-  it 'is compared to string' do
-    value.must_be :==, 'test_value'
+  describe 'equality' do
+    it 'is compared to string' do
+      val.must_be :==, 'test_value'
+      val.wont_be :==, 'not_value'
+    end
+
+    it 'is compared to symbol' do
+      val.must_be :==, :test_value
+      val.wont_be :==, :not_value
+    end
+
+    it 'is compared to integer' do
+      val.must_be :==, 1
+      val.wont_be :==, 2
+    end
   end
 
   describe 'translation' do
@@ -17,7 +34,13 @@ describe Enumerize::Value do
 
     it 'uses common translation' do
       store_translations(:en, :enumerize => {:attribute_name => {:test_value => "Common translation"}}) do
-        value.text.must_be :==, "Common translation"
+        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"
       end
     end
 
@@ -25,7 +48,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
-        value.text.must_be :==, "Model Specific translation"
+        val.text.must_be :==, "Model Specific translation"
       end
     end
 
@@ -33,13 +56,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
-        value.text.must_be :==, "Model Specific translation"
+        val.text.must_be :==, "Model Specific translation"
       end
     end
 
     it 'uses simply humanized value when translation is undefined' do
       store_translations(:en, :enumerize => {}) do
-        value.text.must_be :==, "Test value"
+        val.text.must_be :==, "Test value"
       end
     end
 
@@ -47,7 +70,7 @@ describe Enumerize::Value do
       attr.i18n_scopes = ["other.scope"]
 
       store_translations(:en, :other => {:scope => {:test_value => "Scope specific translation"}}) do
-        value.text.must_be :==, "Scope specific translation"
+        val.text.must_be :==, "Scope specific translation"
       end
     end
 
@@ -55,53 +78,60 @@ describe Enumerize::Value do
       attr.i18n_scopes = ["nonexistent.scope", "other.scope"]
 
       store_translations(:en, :other => {:scope => {:test_value => "Scope specific translation"}}) do
-        value.text.must_be :==, "Scope specific translation"
+        val.text.must_be :==, "Scope specific translation"
       end
     end
   end
 
   describe 'boolean methods comparison' do
     before do
-      attr.values = [value, Enumerize::Value.new(attr, 'other_value')]
+      attr.values = [val, Enumerize::Value.new(attr, 'other_value')]
     end
 
     it 'returns true if value equals method' do
-      value.test_value?.must_equal true
+      val.test_value?.must_equal true
     end
 
     it 'returns false if value does not equal method' do
-      value.other_value?.must_equal false
+      val.other_value?.must_equal false
     end
 
     it 'raises NoMethodError if there are no values like boolean method' do
       proc {
-        value.some_method?
+        val.some_method?
       }.must_raise NoMethodError
     end
 
     it 'raises ArgumentError if arguments are passed' do
       proc {
-        value.other_value?('<3')
+        val.other_value?('<3')
       }.must_raise ArgumentError
     end
 
     it 'responds to methods for existing values' do
-      value.must_respond_to :test_value?
-      value.must_respond_to :other_value?
+      val.must_respond_to :test_value?
+      val.must_respond_to :other_value?
     end
 
     it 'returns a method object' do
-      value.method(:test_value?).must_be_instance_of Method
+      val.method(:test_value?).must_be_instance_of Method
     end
 
     it "doesn't respond to a method for not existing value" do
-      value.wont_respond_to :some_method?
+      val.wont_respond_to :some_method?
     end
   end
 
   describe 'serialization' do
+    let(:val) { Enumerize::Value.new(attr, 'test_value') }
+
     it 'should be serialized to yaml as string value' do
-      assert_equal YAML.dump('test_value'), YAML.dump(value)
+      assert_equal YAML.dump('test_value'), YAML.dump(val)
+    end
+
+    it 'serializes with Marshal' do
+      dump_value = Marshal.dump(val)
+      Marshal.load(dump_value).must_equal 'test_value'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enumerize
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Sergey Nartimov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -32,10 +32,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.rails4
+- Gemfile.global
+- Gemfile.mongo_mapper
+- Gemfile.rails40
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -45,8 +48,8 @@ files:
 - lib/enumerize/attribute.rb
 - lib/enumerize/attribute_map.rb
 - lib/enumerize/base.rb
-- lib/enumerize/form_helper.rb
 - lib/enumerize/hooks/formtastic.rb
+- lib/enumerize/hooks/sequel_dataset.rb
 - lib/enumerize/hooks/simple_form.rb
 - lib/enumerize/hooks/uniqueness.rb
 - lib/enumerize/integrations/rails_admin.rb
@@ -54,11 +57,18 @@ files:
 - lib/enumerize/integrations/rspec/matcher.rb
 - lib/enumerize/module.rb
 - lib/enumerize/module_attributes.rb
+- lib/enumerize/mongoid.rb
 - lib/enumerize/predicatable.rb
 - lib/enumerize/predicates.rb
+- lib/enumerize/scope/activerecord.rb
+- lib/enumerize/scope/mongoid.rb
+- lib/enumerize/scope/sequel.rb
+- lib/enumerize/sequel.rb
 - lib/enumerize/set.rb
 - lib/enumerize/value.rb
 - lib/enumerize/version.rb
+- spec/enumerize/integrations/rspec/matcher_spec.rb
+- spec/spec_helper.rb
 - test/activerecord_test.rb
 - test/attribute_map_test.rb
 - test/attribute_test.rb
@@ -70,8 +80,7 @@ files:
 - test/multiple_test.rb
 - test/predicates_test.rb
 - test/rails_admin_test.rb
-- test/rspec_matcher_test.rb
-- test/rspec_spec.rb
+- test/sequel_test.rb
 - test/set_test.rb
 - test/simple_form_test.rb
 - test/support/mock_controller.rb
@@ -97,8 +106,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Enumerated attributes with I18n and ActiveRecord/Mongoid/MongoMapper support
-test_files: []
+test_files:
+- spec/enumerize/integrations/rspec/matcher_spec.rb
+- spec/spec_helper.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

data/lib/enumerize/form_helper.rb

@@ -1,23 +0,0 @@
-# backport of https://github.com/rails/rails/commit/3be9e8a0c2187744b6c9879ca2836cef5ebed693
-if defined?(ActionView::Helpers::InstanceTag)
-  ActionView::Helpers::InstanceTag.class_eval do
-    def self.check_box_checked?(value, checked_value)
-      case value
-      when TrueClass, FalseClass
-        value
-      when NilClass
-        false
-      when Integer
-        value != 0
-      when String
-        value == checked_value
-      else
-        if value.respond_to?(:include?)
-          value.include?(checked_value)
-        else
-          value.to_i != 0
-        end
-      end
-    end
-  end
-end