enumerize 0.4.0 → 0.5.0

data/.travis.yml

@@ -5,6 +5,7 @@ before_install:
   - gem install bundler
 rvm:
   - 1.9.3
+  - ruby-head
   - jruby-19mode
   - rbx-19mode
 matrix:

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.5.0 (October 31, 2012) ##
+
+The previous method of adding enumerize to a class was deprecated. Please use
+`extend Enumerize` instead of `include Enumerize`.
+
+### enhancements
+  * SimpleForm support for multiple attributes. (by [@nashby](https://github.com/nashby))
+  * Formtastic support for multiple attributes. (by [@nashby](https://github.com/nashby))
+  * Array-like multiple attributes. (by [@lest](https://github.com/lest))
+
 ## 0.4.0 (September 6, 2012) ##
 
 Legacy support was dropped. The following versions are supported:
@@ -8,7 +18,7 @@ Legacy support was dropped. The following versions are supported:
 * SimpleForm 2+
 * Mongoid 3+
 
-### enchancements
+### enhancements
   * Ability to define predicate methods on enumerized object. (by [@lest](https://github.com/lest))
 
 ## 0.3.0 (July 9, 2012) ##

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake'
-gem 'minitest', '~> 3.1'
+gem 'minitest', '~> 4.1'
 
 gem 'activerecord', '~> 3.2.0'
 gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]

data/README.md

@@ -22,7 +22,7 @@ Basic:
 
 ```ruby
 class User
-  include Enumerize
+  extend Enumerize
 
   enumerize :sex, :in => [:male, :female]
 end
@@ -32,7 +32,7 @@ ActiveRecord:
 
 ```ruby
 class User < ActiveRecord::Base
-  include Enumerize
+  extend Enumerize
 
   enumerize :sex, :in => [:male, :female]
 
@@ -45,7 +45,7 @@ Mongoid:
 ```ruby
 class User
   include Mongoid::Document
-  include Enumerize
+  extend Enumerize
 
   field :role
   enumerize :role, :in => [:user, :admin], :default => :user
@@ -105,7 +105,8 @@ Predicate methods:
 
 ```ruby
 class User
-  include Enumerize
+  extend Enumerize
+
   enumerize :sex, in: %w(male female), predicates: true
 end
 
@@ -124,7 +125,8 @@ Using prefix:
 
 ```ruby
 class User
-  include Enumerize
+  extend Enumerize
+
   enumerize :sex, in: %w(male female), predicates: { prefix: true }
 end
 
@@ -138,7 +140,7 @@ To make some attributes shared across different classes it's possible to define
 
 ```ruby
 module PersonEnumerations
-  include Enumerize
+  extend Enumerize
 
   enumerize :sex, :in => %w[male female]
 end
@@ -156,10 +158,37 @@ It's also possible to store enumerized attribute value using custom values (e.g.
 
 ```ruby
 class User < ActiveRecord::Base
+  extend Enumerize
+
   enumerize :role, :in => {:user => 1, :admin => 2}
 end
 ```
 
+Array-like attributes with plain ruby objects:
+
+```ruby
+class User
+  extend Enumerize
+
+  enumerize :interests, :in => [:music, :sports], :multiple => true
+end
+
+user = User.new
+user.interests << :music
+user.interests << :sports
+```
+
+and with ActiveRecord:
+
+```ruby
+class User < ActiveRecord::Base
+  extend Enumerize
+
+  serialize :interests, Array
+  enumerize :interests, :in => [:music, :sports], :multiple => true
+end
+```
+
 ### SimpleForm
 
 If you are using SimpleForm gem you don't need to specify input type (`:select` by default) and collection:

data/lib/enumerize.rb

@@ -5,12 +5,18 @@ module Enumerize
   autoload :Attribute,    'enumerize/attribute'
   autoload :AttributeMap, 'enumerize/attribute_map'
   autoload :Value,        'enumerize/value'
+  autoload :Set,          'enumerize/set'
   autoload :Base,         'enumerize/base'
   autoload :ActiveRecord, 'enumerize/activerecord'
   autoload :Predicates,   'enumerize/predicates'
   autoload :ModuleAttributes, 'enumerize/module_attributes'
 
   def self.included(base)
+    ActiveSupport::Deprecation.warn '`include Enumerize` was deprecated. Please use `extend Enumerize`.', caller
+    extended(base)
+  end
+
+  def self.extended(base)
     base.send :include, Enumerize::Base
     base.extend Enumerize::Predicates
 
@@ -29,6 +35,7 @@ module Enumerize
   begin
     require 'simple_form'
     require 'enumerize/hooks/simple_form'
+    require 'enumerize/form_helper'
   rescue LoadError
   end
 

data/lib/enumerize/attribute.rb

@@ -5,6 +5,8 @@ module Enumerize
     def initialize(klass, name, options={})
       raise ArgumentError, ':in option is required' unless options[:in]
 
+      extend Multiple if options[:multiple]
+
       @klass  = klass
       @name   = name.to_sym
       @values = Array(options[:in]).map { |v| Value.new(self, *v) }
@@ -28,5 +30,75 @@ module Enumerize
     def options
       @values.map { |v| [v.text, v.to_s] }
     end
+
+    def define_methods!(mod)
+      mod.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def #{name}
+          if defined?(super)
+            self.class.enumerized_attributes[:#{name}].find_value(super)
+          else
+            if defined?(@#{name})
+              self.class.enumerized_attributes[:#{name}].find_value(@#{name})
+            else
+              @#{name} = nil
+            end
+          end
+        end
+
+        def #{name}=(new_value)
+          _enumerized_values_for_validation[:#{name}] = new_value.nil? ? nil : new_value.to_s
+
+          allowed_value_or_nil = self.class.enumerized_attributes[:#{name}].find_value(new_value)
+          allowed_value_or_nil = allowed_value_or_nil.value unless allowed_value_or_nil.nil?
+
+          if defined?(super)
+            super allowed_value_or_nil
+          else
+            @#{name} = allowed_value_or_nil
+          end
+        end
+
+        def #{name}_text
+          self.#{name} && self.#{name}.text
+        end
+      RUBY
+    end
+  end
+
+  module Multiple
+    def define_methods!(mod)
+      mod.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def #{name}
+          if defined?(@_#{name}_enumerized_set)
+            @_#{name}_enumerized_set
+          else
+            if defined?(super)
+              self.#{name} = super
+            else
+              if defined?(@#{name})
+                self.#{name} = @#{name}
+              else
+                self.#{name} = []
+              end
+            end
+          end
+        end
+
+        def #{name}=(values)
+          _enumerized_values_for_validation[:#{name}] = values.respond_to?(:map) ? values.map(&:to_s) : values
+
+          @_#{name}_enumerized_set = Enumerize::Set.new(self, self.class.enumerized_attributes[:#{name}], values)
+          string_values = #{name}.values.map(&:to_str)
+
+          if defined?(super)
+            super string_values
+          else
+            @#{name} = string_values
+          end
+
+          #{name}
+        end
+      RUBY
+    end
   end
 end

data/lib/enumerize/base.rb

@@ -4,6 +4,12 @@ module Enumerize
   module Base
     extend ActiveSupport::Concern
 
+    included do
+      if respond_to?(:validate)
+        validate :_validate_enumerized_attributes
+      end
+    end
+
     module ClassMethods
       def enumerize(name, options={})
         attr = Attribute.new(self, name, options)
@@ -17,17 +23,7 @@ module Enumerize
           RUBY
         end
 
-        _define_enumerize_attribute(attr)
-
-        _enumerize_module.module_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{attr.name}_text
-            #{attr.name} && #{attr.name}.text
-          end
-        RUBY
-
-        if respond_to?(:validates)
-          validates name, :inclusion => { :in => enumerized_attributes[name].values, :allow_nil => true, :allow_blank => true }
-        end
+        attr.define_methods!(_enumerize_module)
       end
 
       def enumerized_attributes
@@ -54,35 +50,6 @@ module Enumerize
           mod
         end
       end
-
-      def _define_enumerize_attribute(attr)
-        _enumerize_module.module_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{attr.name}
-            if defined?(super)
-              self.class.enumerized_attributes[:#{attr.name}].find_value(super)
-            else
-              if defined?(@#{attr.name})
-                self.class.enumerized_attributes[:#{attr.name}].find_value(@#{attr.name})
-              else
-                @#{attr.name} = nil
-              end
-            end
-          end
-
-          def #{attr.name}=(new_value)
-            _enumerized_values_for_validation[:#{attr.name}] = new_value.nil? ? nil : new_value.to_s
-
-            allowed_value_or_nil = self.class.enumerized_attributes[:#{attr.name}].find_value(new_value)
-            allowed_value_or_nil = allowed_value_or_nil.value unless allowed_value_or_nil.nil?
-
-            if defined?(super)
-              super allowed_value_or_nil
-            else
-              @#{attr.name} = allowed_value_or_nil
-            end
-          end
-        RUBY
-      end
     end
 
     def initialize(*)
@@ -93,7 +60,7 @@ module Enumerize
     end
 
     def read_attribute_for_validation(key)
-      if self.class.enumerized_attributes[key].instance_of?(Enumerize::Attribute) && _enumerized_values_for_validation.has_key?(key)
+      if _enumerized_values_for_validation.has_key?(key)
         _enumerized_values_for_validation[key]
       else
         super
@@ -105,5 +72,20 @@ module Enumerize
     def _enumerized_values_for_validation
       @_enumerized_values_for_validation ||= {}
     end
+
+    def _validate_enumerized_attributes
+      self.class.enumerized_attributes.each do |attr|
+        value = read_attribute_for_validation(attr.name)
+        next if value.blank?
+
+        allowed = attr.values
+
+        if attr.kind_of? Multiple
+          errors.add attr.name unless value.respond_to?(:all?) && value.all? { |v| v.blank? || allowed.include?(v) }
+        else
+          errors.add attr.name unless allowed.include?(value)
+        end
+      end
+    end
   end
 end

data/lib/enumerize/form_helper.rb

@@ -0,0 +1,27 @@
+# backport of https://github.com/rails/rails/commit/3be9e8a0c2187744b6c9879ca2836cef5ebed693
+module ActionView
+  module Helpers
+    module FormHelper
+      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
+  end
+end

data/lib/enumerize/hooks/formtastic.rb

@@ -11,8 +11,13 @@ module Enumerize
 
       def input_with_enumerize(method, options={})
         klass = object.class
+
         if klass.respond_to?(:enumerized_attributes) && (attr = klass.enumerized_attributes[method])
           options[:collection] ||= attr.options
+
+          if attr.kind_of?(Enumerize::Multiple) && options[:as] != :check_boxes
+            options[:input_html] = options.fetch(:input_html, {}).merge(:multiple => true)
+          end
         end
 
         input_without_enumerize(method, options)

data/lib/enumerize/hooks/simple_form.rb

@@ -11,8 +11,13 @@ module Enumerize
 
       def input_with_enumerize(attribute_name, options={}, &block)
         klass = object.class
+
         if klass.respond_to?(:enumerized_attributes) && (attr = klass.enumerized_attributes[attribute_name])
           options[:collection] ||= attr.options
+
+          if attr.kind_of?(Enumerize::Multiple) && options[:as] != :check_boxes
+            options[:input_html] = options.fetch(:input_html, {}).merge(:multiple => true)
+          end
         end
 
         input_without_enumerize(attribute_name, options, &block)

data/lib/enumerize/module_attributes.rb

@@ -1,7 +1,7 @@
 module Enumerize
   module ModuleAttributes
     def included(base)
-      base.send :include, Enumerize
+      base.extend Enumerize
       base.send :include, _enumerize_module
       base.extend _enumerize_module._class_methods
       enumerized_attributes.add_dependant base.enumerized_attributes

data/lib/enumerize/predicates.rb

@@ -4,7 +4,7 @@ module Enumerize
   # Basic usage:
   #
   #     class User
-  #       include Enumerize
+  #       extend Enumerize
   #       enumerize :sex, in: %w(male female), predicates: true
   #     end
   #
@@ -21,7 +21,7 @@ module Enumerize
   # Using prefix:
   #
   #     class User
-  #       include Enumerize
+  #       extend Enumerize
   #       enumerize :sex, in: %w(male female), predicates: { prefix: true }
   #     end
   #

data/lib/enumerize/set.rb

@@ -0,0 +1,60 @@
+module Enumerize
+  class Set
+    include Enumerable
+
+    attr_reader :values
+
+    def initialize(obj, attr, values)
+      @obj    = obj
+      @attr   = attr
+      @values = ::Set.new
+
+      if values.respond_to?(:each)
+        values.each do |input|
+          value = @attr.find_value(input)
+          @values << value if value
+        end
+      end
+    end
+
+    def <<(value)
+      @values << value
+      mutate!
+    end
+
+    alias_method :push, :<<
+
+    delegate :each, :empty?, :size, to: :values
+
+    def to_ary
+      @values.to_a
+    end
+
+    delegate :join, to: :to_ary
+
+    def ==(other)
+      other.size == size && other.all? { |v| @values.include?(@attr.find_value(v)) }
+    end
+
+    alias_method :eql?, :==
+
+    def include?(value)
+      @values.include?(@attr.find_value(value))
+    end
+
+    def delete(value)
+      @values.delete(@attr.find_value(value))
+      mutate!
+    end
+
+    def inspect
+      "#<Enumerize::Set {#{join(', ')}}>"
+    end
+
+    private
+
+    def mutate!
+      @values = @obj.public_send("#{@attr.name}=", @values).values
+    end
+  end
+end

data/lib/enumerize/version.rb

@@ -1,3 +1,3 @@
 module Enumerize
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/test/activerecord_test.rb

@@ -13,15 +13,19 @@ ActiveRecord::Base.connection.instance_eval do
     t.string :sex
     t.string :role
     t.string :name
+    t.string :interests
   end
 end
 
 class User < ActiveRecord::Base
-  include Enumerize
+  extend Enumerize
 
   enumerize :sex, :in => [:male, :female]
 
   enumerize :role, :in => [:user, :admin], :default => :user
+
+  serialize :interests, Array
+  enumerize :interests, :in => [:music, :sports, :dancing, :programming], :multiple => true
 end
 
 describe Enumerize::ActiveRecord do
@@ -82,4 +86,44 @@ describe Enumerize::ActiveRecord do
     user.role = ''
     user.read_attribute(:role).must_equal nil
   end
+
+  it 'supports multiple attributes' do
+    user = User.new
+    user.interests.must_be_empty
+    user.interests << :music
+    user.interests.must_equal %w(music)
+    user.save!
+
+    user = User.find(user.id)
+    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
 end

data/test/base_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 describe Enumerize::Base do
   let(:klass) do
     Class.new do
-      include Enumerize
+      extend Enumerize
     end
   end
 
@@ -154,7 +154,7 @@ describe Enumerize::Base do
 
     klass = Class.new do
       include accessors
-      include Enumerize
+      extend Enumerize
 
       enumerize :foo, :in => %w[test]
     end

data/test/formtastic_test.rb

@@ -15,11 +15,20 @@ class FormtasticSpec < MiniTest::Spec
   include ViewTestHelper
   include Formtastic::Helpers::FormHelper
 
+  class Thing < Struct.new(:name)
+    extend ActiveModel::Naming
+    include ActiveModel::Conversion
+
+    def persisted?
+      false
+    end
+  end
+
   class User < Struct.new(:sex, :age)
     extend ActiveModel::Naming
     include ActiveModel::Conversion
 
-    include Enumerize
+    extend Enumerize
 
     enumerize :sex, :in => [:male, :female]
 
@@ -28,10 +37,24 @@ class FormtasticSpec < MiniTest::Spec
     end
   end
 
+  class Post < Struct.new(:category, :title)
+    extend ActiveModel::Naming
+    include ActiveModel::Conversion
+
+    extend Enumerize
+
+    enumerize :categories, :in => [:music, :games], :multiple => true
+
+    def persisted?
+      false
+    end
+  end
+
   before { $VERBOSE = nil }
   after  { $VERBOSE = true }
 
   let(:user) { User.new }
+  let(:post) { Post.new }
 
   it 'renders select with enumerized values' do
     concat(semantic_form_for(user) do |f|
@@ -42,6 +65,49 @@ class FormtasticSpec < MiniTest::Spec
     assert_select 'select option[value=female]'
   end
 
+  it 'renders multiple select with enumerized values' do
+    concat(semantic_form_for(post) do |f|
+      f.input(:categories)
+    end)
+
+    assert_select 'select[multiple=multiple]'
+    assert_select 'select option[value=music]'
+    assert_select 'select option[value=games]'
+  end
+
+  it 'renders multiple select with selected enumerized value' do
+    post.categories << :music
+
+    concat(semantic_form_for(post) do |f|
+      f.input(:categories)
+    end)
+
+    assert_select 'select[multiple=multiple]'
+    assert_select 'select option[value=music][selected=selected]'
+    assert_select 'select option[value=games][selected=selected]', count: 0
+  end
+
+  it 'renders checkboxes with enumerized values' do
+    concat(semantic_form_for(post) do |f|
+      f.input(:categories, as: :check_boxes)
+    end)
+
+    assert_select 'select[multiple=multiple]', count: 0
+    assert_select 'input[type=checkbox][value=music]'
+    assert_select 'input[type=checkbox][value=games]'
+  end
+
+  it 'renders checkboxes with selected enumerized value' do
+    post.categories << :music
+
+    concat(semantic_form_for(post) do |f|
+      f.input(:categories, as: :check_boxes)
+    end)
+
+    assert_select 'input[type=checkbox][value=music][checked=checked]'
+    assert_select 'input[type=checkbox][value=games][checked=checked]', count: 0
+  end
+
   it 'renders radio buttons with enumerized values' do
     concat(semantic_form_for(user) do |f|
       f.input :sex, :as => :radio
@@ -58,4 +124,12 @@ class FormtasticSpec < MiniTest::Spec
 
     assert_select 'input[type=text]'
   end
+
+  it 'does not affect not enumerized classes' do
+    concat(semantic_form_for(Thing.new) do |f|
+      f.input(:name)
+    end)
+
+    assert_select 'input[type=text]'
+  end
 end

data/test/module_attributes_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class ModuleAttributesSpec < MiniTest::Spec
   it 'inherits attribute from the module' do
     mod = Module.new do
-      include Enumerize
+      extend Enumerize
       enumerize :sex, :in => %w[male female], :default => 'male'
     end
 
@@ -16,7 +16,7 @@ class ModuleAttributesSpec < MiniTest::Spec
 
   it 'uses new attributes from the module' do
     mod = Module.new do
-      include Enumerize
+      extend Enumerize
     end
 
     klass = Class.new

data/test/mongoid_test.rb

@@ -13,7 +13,7 @@ end
 describe Enumerize do
   class MongoidUser
     include Mongoid::Document
-    include Enumerize
+    extend Enumerize
 
     field :sex
     field :role

data/test/multiple_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+
+describe Enumerize::Base do
+  let(:klass) do
+    Class.new do
+      extend Enumerize
+    end
+  end
+
+  let(:subklass) do
+    Class.new(klass)
+  end
+
+  let(:object) { klass.new }
+
+  it 'returns [] when not set' do
+    klass.enumerize :foos, in: %w(a b), multiple: true
+    object.foos.must_equal []
+  end
+
+  it 'returns setted array' do
+    klass.enumerize :foos, in: %w(a b c), multiple: true
+    object.foos = %w(a c)
+    object.foos.must_equal %w(a 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
+  end
+end

data/test/predicates_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 describe Enumerize::Predicates do
   let(:klass) do
     Class.new do
-      include Enumerize
+      extend Enumerize
     end
   end
 

data/test/set_test.rb

@@ -0,0 +1,112 @@
+require 'test_helper'
+
+describe Enumerize::Set do
+  let(:klass) do
+    Class.new do
+      extend Enumerize
+      enumerize :foo, :in => %w(a b c), :multiple => true
+    end
+  end
+
+  let(:object) { klass.new }
+
+  def build_set(values)
+    @set = Enumerize::Set.new(object, klass.foo, values)
+  end
+
+  def set
+    @set
+  end
+
+  def assert_called(object, method)
+    called = false
+
+    object.singleton_class.class_eval do
+      define_method method do |*args, &block|
+        called = true
+        super(*args, &block)
+      end
+    end
+
+    yield
+
+    assert called, "Expected ##{method} to be called"
+  end
+
+  before do
+    build_set %w(a)
+  end
+
+  it 'equals to other set' do
+    set.must_equal Enumerize::Set.new(nil, klass.foo, %w(a))
+  end
+
+  it 'equals to array' do
+    set.must_equal %w(a)
+  end
+
+  it 'equals to array of symbols' do
+    set.must_equal [:a]
+  end
+
+  it 'has unique values' do
+    set << :a
+    set.must_equal %w(a)
+  end
+
+  it 'equals to array with different value order' do
+    set << :b
+    set.must_equal %w(b a)
+  end
+
+  it "isn't equal to a part of values" do
+    set << :b
+    set.wont_equal %w(a)
+  end
+
+  describe '#push' do
+    it 'appends values' do
+      set.push :b
+      set.must_include :b
+    end
+
+    it 'reassigns attribute' do
+      assert_called object, :foo= do
+        set.push :b
+      end
+    end
+  end
+
+  describe '#delete' do
+    it 'deletes value' do
+      set.delete :a
+      set.wont_include :a
+    end
+
+    it 'reassigns attribute' do
+      assert_called object, :foo= do
+        set.delete :a
+      end
+    end
+  end
+
+  describe '#inspect' do
+    it 'returns custom string' do
+      set << :b
+      set.inspect.must_equal '#<Enumerize::Set {a, b}>'
+    end
+  end
+
+  describe '#to_ary' do
+    it 'returns array' do
+      set.to_ary.must_be_instance_of Array
+    end
+  end
+
+  describe '#join' do
+    it 'joins values' do
+      set << :b
+      set.join(', ').must_equal 'a, b'
+    end
+  end
+end

data/test/simple_form_test.rb

@@ -5,11 +5,20 @@ class SimpleFormSpec < MiniTest::Spec
   include ViewTestHelper
   include SimpleForm::ActionViewExtensions::FormHelper
 
+  class Thing < Struct.new(:name)
+    extend ActiveModel::Naming
+    include ActiveModel::Conversion
+
+    def persisted?
+      false
+    end
+  end
+
   class User < Struct.new(:sex, :age)
     extend ActiveModel::Naming
     include ActiveModel::Conversion
 
-    include Enumerize
+    extend Enumerize
 
     enumerize :sex, :in => [:male, :female]
 
@@ -18,7 +27,21 @@ class SimpleFormSpec < MiniTest::Spec
     end
   end
 
+  class Post < Struct.new(:category, :title)
+    extend ActiveModel::Naming
+    include ActiveModel::Conversion
+
+    extend Enumerize
+
+    enumerize :categories, :in => [:music, :games], :multiple => true
+
+    def persisted?
+      false
+    end
+  end
+
   let(:user) { User.new }
+  let(:post) { Post.new }
 
   it 'renders select with enumerized values' do
     concat(simple_form_for(user) do |f|
@@ -29,11 +52,52 @@ class SimpleFormSpec < MiniTest::Spec
     assert_select 'select option[value=female]'
   end
 
-  it 'renders radio buttons with enumerated values' do
-    as = SimpleForm::VERSION > '2.0' ? :radio_buttons : :radio
+  it 'renders multiple select with enumerized values' do
+    concat(simple_form_for(post) do |f|
+      f.input(:categories)
+    end)
+
+    assert_select 'select[multiple=multiple]'
+    assert_select 'select option[value=music]'
+    assert_select 'select option[value=games]'
+  end
+
+  it 'renders multiple select with selected enumerized value' do
+    post.categories << :music
+
+    concat(simple_form_for(post) do |f|
+      f.input(:categories)
+    end)
+
+    assert_select 'select[multiple=multiple]'
+    assert_select 'select option[value=music][selected=selected]'
+    assert_select 'select option[value=games][selected=selected]', count: 0
+  end
+
+  it 'renders checkboxes with enumerized values' do
+    concat(simple_form_for(post) do |f|
+      f.input(:categories, as: :check_boxes)
+    end)
+
+    assert_select 'select[multiple=multiple]', count: 0
+    assert_select 'input[type=checkbox][value=music]'
+    assert_select 'input[type=checkbox][value=games]'
+  end
+
+  it 'renders checkboxes with selected enumerized value' do
+    post.categories << :music
 
+    concat(simple_form_for(post) do |f|
+      f.input(:categories, as: :check_boxes)
+    end)
+
+    assert_select 'input[type=checkbox][value=music][checked=checked]'
+    assert_select 'input[type=checkbox][value=games][checked=checked]', count: 0
+  end
+
+  it 'renders radio buttons with enumerated values' do
     concat(simple_form_for(user) do |f|
-      f.input(:sex, :as => as)
+      f.input(:sex, :as => :radio_buttons)
     end)
 
     assert_select 'input[type=radio][value=male]'
@@ -47,4 +111,12 @@ class SimpleFormSpec < MiniTest::Spec
 
     assert_select 'input.string'
   end
+
+  it 'does not affect not enumerized classes' do
+    concat(simple_form_for(Thing.new) do |f|
+      f.input(:name)
+    end)
+
+    assert_select 'input.string'
+  end
 end

metadata

@@ -1,32 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: enumerize
 version: !ruby/object:Gem::Version
-  version: 0.4.0
   prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Sergey Nartimov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2012-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
+    none: false
+  prerelease: false
+  name: activesupport
 description: Enumerated attributes with I18n and ActiveRecord/Mongoid support
 email: team@brainspec.com
 executables: []
@@ -46,10 +46,12 @@ 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/simple_form.rb
 - lib/enumerize/module_attributes.rb
 - lib/enumerize/predicates.rb
+- lib/enumerize/set.rb
 - lib/enumerize/value.rb
 - lib/enumerize/version.rb
 - test/activerecord_test.rb
@@ -59,7 +61,9 @@ files:
 - test/formtastic_test.rb
 - test/module_attributes_test.rb
 - test/mongoid_test.rb
+- test/multiple_test.rb
 - test/predicates_test.rb
+- test/set_test.rb
 - test/simple_form_test.rb
 - test/support/mock_controller.rb
 - test/support/view_test_helper.rb
@@ -72,23 +76,23 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      hash: -4428159694445712973
       version: '0'
       segments:
       - 0
-      hash: 1785538232513352876
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      hash: -4428159694445712973
       version: '0'
       segments:
       - 0
-      hash: 1785538232513352876
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -103,7 +107,9 @@ test_files:
 - test/formtastic_test.rb
 - test/module_attributes_test.rb
 - test/mongoid_test.rb
+- test/multiple_test.rb
 - test/predicates_test.rb
+- test/set_test.rb
 - test/simple_form_test.rb
 - test/support/mock_controller.rb
 - test/support/view_test_helper.rb