enumerize 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e11fc29306be657be93429d810d7d38d15633f7
-  data.tar.gz: 2d2f0590533e31c71432f9f1a35e0cf8e8120f50
+  metadata.gz: fcc222d35f7bc7e96f344ebac473c10324a42bd9
+  data.tar.gz: 4509894cf1723e3df5403c8c93108c316b1ffbb1
 SHA512:
-  metadata.gz: d1a583881a025b925000573c7602bbdd118485544c4fa5f3b08cc740c12e780b297013b5ccee04b4d49a1d9fbb93e7691ac0cc5f9c203fefc587cba9f35cccc3
-  data.tar.gz: 738971e9f0f3b253df6ae23c9d36fdf628b543cfafc8304b90b871f896b131ff491d35a1b92e81f6d34b4f3d69f97afa7798ddf6adb80a99a9835c0ed410c084
+  metadata.gz: b1237ba9ede67eefc02b235ec0b74ff2bc6774f89479c22e0e5733dba911b487449bf24e49e82a3be2623cfb432198d6cedf59425f26fab11e36c8c11c073769
+  data.tar.gz: 98234b48c034f98cdd43e2379b8ad277dbad8d68088b3cabdfffe71767584028be87ead75629db81fc036862743e16bb5554c680f75d3aa22e814fada961c113

data/.travis.yml

@@ -1,22 +1,32 @@
 language: ruby
 sudo: false
 services:
+  - postgresql
   - mongodb
 gemfile:
   - Gemfile
   - Gemfile.rails42
+  - Gemfile.rails51
   - Gemfile.mongo_mapper
 rvm:
-  - 2.2.6
+  - 2.2.7
   - 2.3.3
-  - ruby-head
-  - jruby-9.1.6.0
+  - 2.4.1
+  - jruby-9.1.8.0
+env:
+  global:
+    - DB_USER=postgres
+    - DB_PASS=
+  matrix:
+    - DB=sqlite3
+    - DB=postgresql
 matrix:
+  fast_finish: true
   allow_failures:
-    - gemfile: Gemfile.rails42
-      rvm: ruby-head
+    - rvm: jruby-9.1.8.0
+  exclude:
     - gemfile: Gemfile.mongo_mapper
-      rvm: ruby-head
+      env: DB=postgresql
 branches:
   only:
     - master

data/CHANGELOG.md

@@ -4,6 +4,17 @@
 
 ### bug fix
 
+## 2.1.1 (May 1, 2017)
+
+### enhancements
+
+* Run tests with multiple DBs (SQLite and PostgreSQL). (by [tkawa](https://github.com/tkawa))
+
+### bug fix
+
+* Support deserialize and Rails 4.2 methods in the custom AR::Type class. (by [@lest](https://github.com/lest))
+* Support dumping custom AR type to JSON. (by [@lest](https://github.com/lest))
+
 ## 2.1.0 (March 31, 2017)
 
 ### enhancements

data/Gemfile

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

data/Gemfile.global

@@ -6,6 +6,7 @@ gem 'rake'
 gem 'rspec', :require => false
 
 gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]
+gem 'pg', :platform => [:ruby, :mswin, :mingw]
 gem 'sequel'
 
 platforms :rbx do

data/Gemfile.mongo_mapper

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

data/Gemfile.rails42

@@ -1,6 +1,7 @@
 eval_gemfile('Gemfile.global')
 
 gem 'minitest', '~> 5.8'
-gem 'rails',    '4.2.7', :require => false
-gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+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

@@ -0,0 +1,7 @@
+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'

data/lib/enumerize/activerecord.rb

@@ -78,6 +78,18 @@ module Enumerize
         v = @attr.find_value(value)
         v && v.value
       end
+
+      alias type_cast_for_database serialize
+
+      def deserialize(value)
+        @attr.find_value(value)
+      end
+
+      alias type_cast_from_database deserialize
+
+      def as_json(options = nil)
+        {attr: @attr.name, subtype: @subtype}.as_json(options)
+      end
     end
   end
 end

data/lib/enumerize/version.rb

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

data/test/activerecord_test.rb

@@ -1,11 +1,39 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'active_record'
 require 'logger'
 
+db = (ENV['DB'] || 'sqlite3').to_sym
+
 silence_warnings do
   ActiveRecord::Migration.verbose = false
   ActiveRecord::Base.logger = Logger.new(nil)
-  ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+  ActiveRecord::Base.configurations = {
+    'sqlite3' => {
+      'adapter' => 'sqlite3',
+      'database' => ':memory:'
+    },
+    'postgresql' => {
+      'adapter' => 'postgresql',
+      'username' => ENV['DB_USER'],
+      'password' => ENV['DB_PASSD'],
+      'database' => 'enumerize_test'
+    },
+    'postgresql_master' => {
+      'adapter' => 'postgresql',
+      'username' => ENV['DB_USER'],
+      'password' => ENV['DB_PASS'],
+      'database' => 'template1',
+      'schema_search_path' => 'public'
+    }
+  }
+  if db == :postgresql
+    ActiveRecord::Base.establish_connection(:postgresql_master)
+    ActiveRecord::Base.connection.recreate_database('enumerize_test')
+  end
+
+  ActiveRecord::Base.establish_connection(db)
 end
 
 ActiveRecord::Base.connection.instance_eval do
@@ -79,7 +107,7 @@ describe Enumerize::ActiveRecordSupport do
   it 'sets nil if invalid value is passed' do
     user = User.new
     user.sex = :invalid
-    user.sex.must_equal nil
+    user.sex.must_be_nil
   end
 
   it 'saves value' do
@@ -181,7 +209,7 @@ describe Enumerize::ActiveRecordSupport do
   it 'stores nil when empty string assigned' do
     user = User.new
     user.role = ''
-    user.read_attribute(:role).must_equal nil
+    user.read_attribute(:role).must_be_nil
   end
 
   it 'supports multiple attributes' do
@@ -379,6 +407,14 @@ describe Enumerize::ActiveRecordSupport do
     assert_equal [1, 2], YAML.load(user.changes.to_yaml)[:status]
   end
 
+  it 'does not change by the practical same value' do
+    user = User.create!(status: 'active')
+    user.reload
+    user.status = 'active'
+
+    user.changes.must_be_empty
+  end
+
   it 'allows using update_all' do
     User.delete_all
 
@@ -467,15 +503,18 @@ describe Enumerize::ActiveRecordSupport do
 
     User.update_all(status: :foo)
     user.reload
-    user.status.must_equal nil
+    user.status.must_be_nil
   end
 
   it 'supports AR types serialization' do
-    User.delete_all
-
     type = User.type_for_attribute('status')
     type.must_be_instance_of Enumerize::ActiveRecordSupport::Type
     serialized = type.serialize('blocked')
     serialized.must_equal 2
   end
+
+  it 'has AR type itself JSON serializable' do
+    type = User.type_for_attribute('status')
+    type.as_json['attr'].must_equal 'status'
+  end
 end

data/test/base_test.rb

@@ -15,7 +15,7 @@ describe Enumerize::Base do
 
   it 'returns nil when not set' do
     klass.enumerize(:foo, :in => [:a, :b])
-    object.foo.must_equal nil
+    object.foo.must_be_nil
   end
 
   it 'returns value that was set' do
@@ -37,7 +37,7 @@ describe Enumerize::Base do
   it 'returns nil as translation when value is nil' do
     store_translations(:en, :enumerize => {:foo => {:a => 'a text'}}) do
       klass.enumerize(:foo, :in => [:a, :b])
-      object.foo_text.must_equal nil
+      object.foo_text.must_be_nil
     end
   end
 
@@ -120,7 +120,7 @@ describe Enumerize::Base do
     klass.enumerize(:foo, :in => %w[a b])
     subklass.enumerize(:bar, :in => %w[c d])
 
-    klass.enumerized_attributes[:bar].must_equal nil
+    klass.enumerized_attributes[:bar].must_be_nil
   end
 
   it 'adds new parent class attributes to subclass' do
@@ -132,7 +132,7 @@ describe Enumerize::Base do
   it 'stores nil value' do
     klass.enumerize(:foo, :in => [:a, :b])
     object.foo = nil
-    object.instance_variable_get(:@foo).must_equal nil
+    object.instance_variable_get(:@foo).must_be_nil
   end
 
   it 'casts value to string for validation' do
@@ -144,7 +144,7 @@ describe Enumerize::Base do
   it "doesn't cast nil to string for validation" do
     klass.enumerize(:foo, :in => [:a, :b])
     object.foo = nil
-    object.read_attribute_for_validation(:foo).must_equal nil
+    object.read_attribute_for_validation(:foo).must_be_nil
   end
 
   it 'calls super in the accessor method' do

data/test/mongo_mapper_test.rb

@@ -29,7 +29,7 @@ describe Enumerize do
   it 'sets nil if invalid value is passed' do
     user = model.new
     user.sex = :invalid
-    user.sex.must_equal nil
+    user.sex.must_be_nil
   end
 
   it 'saves value' do

data/test/mongoid_test.rb

@@ -32,7 +32,7 @@ describe Enumerize do
   it 'sets nil if invalid value is passed' do
     user = model.new
     user.sex = :invalid
-    user.sex.must_equal nil
+    user.sex.must_be_nil
   end
 
   it 'saves value' do

data/test/sequel_test.rb

@@ -71,7 +71,7 @@ module SequelTest
     it 'sets nil if invalid value is passed' do
       user = User.new
       user.sex = :invalid
-      user.sex.must_equal nil
+      user.sex.must_be_nil
     end
 
     it 'saves value' do
@@ -147,7 +147,7 @@ module SequelTest
     it 'stores nil when empty string assigned' do
       user = User.new
       user.role = ''
-      user.values[:role].must_equal nil
+      user.values[:role].must_be_nil
     end
 
     it 'supports multiple attributes' do

data/test/support/mock_controller.rb

@@ -22,4 +22,8 @@ class MockController
   end
 
   def hash_for_users_path(*); end
+
+  def polymorphic_mappings
+    {}
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enumerize
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Sergey Nartimov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,6 +39,7 @@ files:
 - Gemfile.global
 - Gemfile.mongo_mapper
 - Gemfile.rails42
+- Gemfile.rails51
 - MIT-LICENSE
 - README.md
 - Rakefile