enumerize 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7430100f0e35ac39085f08ca0dca223b4f101a86
-  data.tar.gz: 5726bf780a70d9cfd67e6c51622c734abd7a9644
+  metadata.gz: e4e3454dcf7faa010477afaa0c7de0b49e3e7e7e
+  data.tar.gz: fe8517318865f32bfe0421493e2431f90ca568dc
 SHA512:
-  metadata.gz: 1221db4e0a2377d4123c0d64f3b0fbcf63d549e15963d44562a96d4a68eac0017015fbba7ce4e56bdaf4f6904ca5ab99592fdad70813333cdd52032ae440902c
-  data.tar.gz: dfd016c59f61900a641483df577bf793ce9f6b36f695958d6f9676ef49ed4f54d7cce57e1a2c9936ab8f7f63ee76f9932244d998474cf32677a55671339cc6d8
+  metadata.gz: 9e54b9a844cf53b5570f82b4da4fbf509e4f62ef0b947ee16776b0608d2dfdde6b49d56c401abc7a16ed242bf57c64bf51450279513e70c7b577a2cbf67a4c87
+  data.tar.gz: 0a607cef37922a25e47df3fa99b03ae4e86e06ced6b58d77c4faa91cce771ac373bdbad30244da1d052488bac2c7bfb6ab497669581430fa2253ac16e821e470

data/.gitignore

@@ -12,6 +12,7 @@ _yardoc
 coverage
 doc/
 lib/bundler/man
+log/*
 pkg
 rdoc
 spec/reports

data/.ruby-version

@@ -0,0 +1 @@
+2.1.5

data/.travis.yml

@@ -5,7 +5,7 @@ before_install:
   - gem install bundler
 gemfile:
   - Gemfile
-  - Gemfile.rails4
+  - Gemfile.rails32
 rvm:
   - 1.9.3
   - 2.0.0
@@ -15,7 +15,12 @@ rvm:
 matrix:
   exclude:
     - rvm: 2.2
-      gemfile: Gemfile
+      gemfile: Gemfile.rails32
+  include:
+    - rvm: 2.2
+      gemfile: Gemfile.rails40
+    - rvm: 2.2
+      gemfile: Gemfile.mongo_mapper
 notifications:
   email:
     recipients:

data/CHANGELOG.md

@@ -4,6 +4,16 @@
 
 ### bug fix
 
+## 0.11.0 (March 29, 2015) ##
+
+### enhancements
+ * Add ability to set default value for enumerized field with multiple type. (by [@nashby](https://github.com/nashby))
+ * Support Rails 4.2. (by [@lest](https://github.com/lest))
+
+### bug fix
+ * Use Mongoid's `:in` method for generated scopes, fix chained scopes. (by [@nashby](https://github.com/nashby))
+ * Use `after_initialize` callback to set default value in Mongoid documents. (by [@nashby](https://github.com/nashby))
+
 ## 0.10.1 (March 4, 2015) ##
 
 ### bug fix

data/Gemfile

@@ -3,10 +3,10 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake'
-gem 'minitest', '~> 4.1'
+gem 'minitest', '~> 5.5.1'
 gem 'rspec', :require => false
 
-gem 'rails', '~> 3.2.0', :require => false
+gem 'rails', '4.2.0', :require => false
 gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 
@@ -18,6 +18,5 @@ platforms :rbx do
 end
 
 gem 'mongoid'
-gem 'mongo_mapper'
 gem 'simple_form'
 gem 'formtastic'

data/Gemfile.mongo_mapper

@@ -0,0 +1,22 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'rake'
+gem 'minitest', '~> 5.5.1'
+gem 'rspec', :require => false
+
+gem 'rails', '4.2.0', :require => false
+gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]
+gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'psych'
+  gem 'rubinius-developer_tools'
+  gem 'rubysl-test-unit'
+end
+
+gem 'mongo_mapper'
+gem 'simple_form'
+gem 'formtastic'

data/Gemfile.rails32

@@ -0,0 +1,23 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'rake'
+gem 'minitest', '~> 4.1'
+gem 'rspec', :require => false
+
+gem 'rails', '~> 3.2.0', :require => false
+gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]
+gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'psych'
+  gem 'rubinius-developer_tools'
+  gem 'rubysl-test-unit'
+end
+
+gem 'mongoid'
+gem 'mongo_mapper'
+gem 'simple_form'
+gem 'formtastic'

data/{Gemfile.rails4 → Gemfile.rails40}

@@ -17,7 +17,6 @@ platforms :rbx do
   gem 'rubysl-test-unit'
 end
 
-gem 'mongoid', github: 'mongoid/mongoid', ref: 'f91feef0a0c6b83a1b878e154f1014536aa1c298'
-gem 'mongo_mapper', github: 'jnunemaker/mongomapper'
+gem 'mongoid'
 gem 'simple_form'
-gem 'formtastic', github: 'justinfrench/formtastic'
+gem 'formtastic'

data/lib/enumerize.rb

@@ -13,6 +13,7 @@ module Enumerize
   autoload :ModuleAttributes, 'enumerize/module_attributes'
 
   autoload :ActiveRecordSupport, 'enumerize/activerecord'
+  autoload :MongoidSupport,      'enumerize/mongoid'
 
   module Scope
     autoload :ActiveRecord, 'enumerize/scope/activerecord'
@@ -27,9 +28,16 @@ module Enumerize
   def self.extended(base)
     base.send :include, Enumerize::Base
     base.extend Enumerize::Predicates
-    base.extend Enumerize::ActiveRecordSupport
-    base.extend Enumerize::Scope::ActiveRecord if defined?(::ActiveRecord::Base)
-    base.extend Enumerize::Scope::Mongoid      if defined?(::Mongoid::Document)
+
+    if defined?(::ActiveRecord::Base)
+      base.extend Enumerize::ActiveRecordSupport
+      base.extend Enumerize::Scope::ActiveRecord
+    end
+
+    if defined?(::Mongoid::Document)
+      base.extend Enumerize::MongoidSupport
+      base.extend Enumerize::Scope::Mongoid
+    end
 
     if defined?(::RailsAdmin)
       require 'enumerize/integrations/rails_admin'

data/lib/enumerize/activerecord.rb

@@ -4,7 +4,7 @@ module Enumerize
       super
 
       _enumerize_module.dependent_eval do
-        if defined?(::ActiveRecord::Base) && self < ::ActiveRecord::Base
+        if self < ::ActiveRecord::Base
           include InstanceMethods
 
           # Since Rails use `allocate` method on models and initializes them with `init_with` method.

data/lib/enumerize/attribute.rb

@@ -134,6 +134,14 @@ module Enumerize
   end
 
   module Multiple
+    def find_default_value(value)
+      if value.respond_to?(:call)
+        value
+      else
+        find_values(*value)
+      end
+    end
+
     def define_methods!(mod)
       mod.module_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{name}

data/lib/enumerize/base.rb

@@ -8,8 +8,9 @@ module Enumerize
       end
 
       class << base
-        if (method_defined?(:inherited) || private_method_defined?(:inherited)) && (not method_defined? :inherited_without_enumerized)
+        if (method_defined?(:inherited) || private_method_defined?(:inherited)) && !private_method_defined?(:inherited_without_enumerized)
           alias_method :inherited_without_enumerized, :inherited
+          private :inherited_without_enumerized
         end
 
         alias_method :inherited, :inherited_with_enumerized
@@ -98,7 +99,9 @@ module Enumerize
           next
         end
 
-        if !attr_value && !_enumerized_values_for_validation.key?(attr.name.to_s)
+        value_for_validation = _enumerized_values_for_validation[attr.name.to_s]
+
+        if (!attr_value || attr_value.empty?) && (!value_for_validation || value_for_validation.empty?)
           value = attr.default_value
 
           if value.respond_to?(:call)

data/lib/enumerize/form_helper.rb

@@ -1,7 +1,9 @@
 # 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)
+  ActionView::Helpers::InstanceTag.singleton_class.class_eval do
+    remove_method :check_box_checked?
+
+    def check_box_checked?(value, checked_value)
       case value
       when TrueClass, FalseClass
         value

data/lib/enumerize/mongoid.rb

@@ -0,0 +1,13 @@
+module Enumerize
+  module MongoidSupport
+    def enumerize(name, options={})
+      super
+
+      _enumerize_module.dependent_eval do
+        if self < ::Mongoid::Document
+          after_initialize :_set_default_value_for_enumerized_attributes
+        end
+      end
+    end
+  end
+end

data/lib/enumerize/scope/mongoid.rb

@@ -20,12 +20,7 @@ module Enumerize
 
         define_singleton_method scope_name do |*values|
           values = enumerized_attributes[name].find_values(*values).map(&:value)
-
-          if values.size == 1
-            where(name => values.first)
-          else
-            where(name.in => values)
-          end
+          self.in(name => values)
         end
 
         if options[:scope] == true

data/lib/enumerize/set.rb

@@ -57,6 +57,10 @@ module Enumerize
       "#<Enumerize::Set {#{join(', ')}}>"
     end
 
+    def encode_with(coder)
+      coder.represent_object(Array, @values)
+    end
+
     private
 
     def predicate_call(value)

data/lib/enumerize/version.rb

@@ -1,3 +1,3 @@
 module Enumerize
-  VERSION = "0.10.1"
+  VERSION = "0.11.0"
 end

data/test/activerecord_test.rb

@@ -15,13 +15,13 @@ ActiveRecord::Base.connection.instance_eval do
     t.string :lambda_role
     t.string :name
     t.string :interests
-    t.string :status
+    t.integer :status
     t.string :account_type, :default => :basic
   end
 
   create_table :documents do |t|
     t.string :visibility
-    t.timestamps
+    t.timestamps null: true
   end
 end
 
@@ -154,7 +154,7 @@ describe Enumerize::ActiveRecordSupport do
 
   it "uses persisted value for validation if it hasn't been set" do
     user = User.create! :sex => :male
-    User.find(user).read_attribute_for_validation(:sex).must_equal 'male'
+    User.find(user.id).read_attribute_for_validation(:sex).must_equal 'male'
   end
 
   it 'is valid with empty string assigned' do
@@ -336,7 +336,6 @@ describe Enumerize::ActiveRecordSupport do
     user = User.create(:status => :active)
     user.status = :blocked
 
-    expected = ActiveSupport::HashWithIndifferentAccess.new(status: [1, 2]).to_yaml
-    assert_equal expected, user.changes.to_yaml
+    assert_equal [1, 2], YAML.load(user.changes.to_yaml)[:status]
   end
 end

data/test/formtastic_test.rb

@@ -1,16 +1,7 @@
 require 'test_helper'
-require 'rails'
-
-module Formtastic
-  module Helpers
-    module InputHelper
-      remove_method :input_class
-      def input_class(as)
-        input_class_with_const_defined(as)
-      end
-    end
-  end
-end
+
+Formtastic::FormBuilder.action_class_finder = Formtastic::ActionClassFinder
+Formtastic::FormBuilder.input_class_finder  = Formtastic::InputClassFinder
 
 class FormtasticSpec < MiniTest::Spec
   include ViewTestHelper

data/test/mongo_mapper_test.rb

@@ -1,5 +1,7 @@
 require 'test_helper'
 
+begin
+
 silence_warnings do
   require 'mongo_mapper'
 end
@@ -66,3 +68,7 @@ describe Enumerize do
     user.sex.must_equal 'female'
   end
 end
+
+rescue LoadError
+  # Skip
+end

data/test/mongoid_test.rb

@@ -1,5 +1,7 @@
 require 'test_helper'
 
+begin
+
 silence_warnings do
   require 'mongoid'
 end
@@ -17,9 +19,10 @@ describe Enumerize do
 
     field :sex
     field :role
-    enumerize :sex, :in => %w[male female], scope: true
-    enumerize :role, :in => %w[admin user], :default => 'user', scope: :having_role
-    enumerize :mult, :in => %w[one two three four], :multiple => true
+    enumerize :sex,    :in => %w[male female], scope: true
+    enumerize :status, :in => %w[notice warning error], scope: true
+    enumerize :role,   :in => %w[admin user], :default => 'user', scope: :having_role
+    enumerize :mult,   :in => %w[one two three four], :multiple => true
   end
 
   before { $VERBOSE = nil }
@@ -55,6 +58,14 @@ describe Enumerize do
     model.new.role.must_equal 'user'
   end
 
+  it 'uses after_initialize callback to set default value' do
+    model.delete_all
+    model.create!(sex: 'male', role: nil)
+
+    user = model.where(sex: 'male').first
+    user.role.must_equal 'user'
+  end
+
   it 'validates inclusion' do
     user = model.new
     user.role = 'wrong'
@@ -95,9 +106,24 @@ describe Enumerize do
     model.having_role(:user).to_a.must_equal [user_2]
   end
 
+  it 'chains scopes' do
+    model.delete_all
+
+    user_1 = model.create!(status: :notice)
+    user_2 = model.create!(status: :warning)
+    user_3 = model.create!(status: :error)
+
+    model.with_status(:notice, :warning).with_status(:notice, :error).to_a.must_equal [user_1]
+    model.with_status(:notice, :warning).union.with_status(:notice, :error).to_a.must_equal [user_1, user_2, user_3]
+  end
+
   it 'ignores not enumerized values that passed to the scope method' do
     model.delete_all
 
     model.with_sex(:foo).must_equal []
   end
 end
+
+rescue LoadError
+  # Skip
+end

data/test/multiple_test.rb

@@ -24,6 +24,21 @@ describe Enumerize::Base do
     object.foos.must_equal %w(a c)
   end
 
+  it 'sets default value as single value' do
+    klass.enumerize :foos, in: %w(a b c), default: 'b', multiple: true
+    object.foos.must_equal %w(b)
+  end
+
+  it 'sets default value as array of one element' do
+    klass.enumerize :foos, in: %w(a b c), default: %w(b), multiple: true
+    object.foos.must_equal %w(b)
+  end
+
+  it 'sets default value as array of several elements' do
+    klass.enumerize :foos, in: %w(a b c), default: %w(b c), multiple: true
+    object.foos.must_equal %w(b c)
+  end
+
   it "doesn't define _text method" do
     klass.enumerize :foos, in: %w(a b c), multiple: true
     object.wont_respond_to :foos_text

data/test/rspec_spec.rb

@@ -1,3 +1,4 @@
+require 'rails'
 require 'enumerize'
 require 'rspec'
 

data/test/set_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'yaml'
 
 describe Enumerize::Set do
   let(:klass) do
@@ -147,4 +148,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,29 @@ require 'minitest/autorun'
 require 'minitest/spec'
 require 'active_support/core_ext/kernel/reporting'
 require 'active_model'
-
-$VERBOSE=true
+require 'rails'
 
 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,4 +1,5 @@
 require 'test_helper'
+require 'yaml'
 
 describe Enumerize::Value do
   let(:attr)  { Struct.new(:values).new([]) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enumerize
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Sergey Nartimov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -32,10 +32,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.rails4
+- Gemfile.mongo_mapper
+- Gemfile.rails32
+- Gemfile.rails40
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -54,6 +57,7 @@ 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