enumerize 0.6.1 → 0.7.0

data/.travis.yml

@@ -9,7 +9,6 @@ gemfile:
 rvm:
   - 1.9.3
   - 2.0.0
-  - ruby-head
   - jruby-19mode
   - rbx-19mode
 matrix:

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.7.0 (August 21, 2013) ##
+
+### enhancements
+  * Give priority to model specific translation definition. See example [here](https://github.com/brainspec/enumerize/pull/96) (by [@labocho](https://github.com/labocho))
+  * Allow lambda in default value (by [@adie](https://github.com/adie))
+  * Add predicate methods to the multiple attributes (by [@nashby](https://github.com/nashby))
+  * Add RSpec matcher (by [@nashby](https://github.com/nashby))
+  * Add `*_value` method that returns actual value of the enumerized attribute (useful for attributes with custom values)
+    (by [@tkyowa](https://github.com/tkyowa))
+
+### bug fix
+  * Make validation work when `write_attribute` is using for setting enumerized values (by [@nashby](https://github.com/nashby))
+  * Validates enumerized values when enumeration is included via module
+    (by [@nashby](https://github.com/nashby)) and (by [@lest](https://github.com/lest))
+
 ## 0.6.1 (May 20, 2013) ##
 
 ### bug fix

data/Gemfile

@@ -4,11 +4,13 @@ gemspec
 
 gem 'rake'
 gem 'minitest', '~> 4.1'
+gem 'rspec', :require => false
 
-gem 'activerecord', '~> 3.2.0'
+gem 'rails', '~> 3.2.0', :require => false
 gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 
 gem 'mongoid'
+gem 'mongo_mapper'
 gem 'simple_form'
 gem 'formtastic'

data/Gemfile.rails4

@@ -4,11 +4,13 @@ gemspec
 
 gem 'rake'
 gem 'minitest', '~> 4.1'
+gem 'rspec', :require => false
 
-gem 'activerecord', '4.0.0.rc1'
+gem 'rails', '4.0.0', :require => false
 gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 
 gem 'mongoid', github: 'mongoid/mongoid'
-gem 'simple_form', '3.0.0.beta1'
+gem 'mongo_mapper', github: 'jnunemaker/mongomapper'
+gem 'simple_form', github: 'plataformatec/simple_form'
 gem 'formtastic', github: 'justinfrench/formtastic'

data/README.md

@@ -1,6 +1,6 @@
 # Enumerize [![TravisCI](https://secure.travis-ci.org/brainspec/enumerize.png?branch=master)](http://travis-ci.org/brainspec/enumerize) [![Gemnasium](https://gemnasium.com/brainspec/enumerize.png)](https://gemnasium.com/brainspec/enumerize)
 
-Enumerated attributes with I18n and ActiveRecord/Mongoid support
+Enumerated attributes with I18n and ActiveRecord/Mongoid/MongoMapper support
 
 ## Installation
 
@@ -34,7 +34,7 @@ ActiveRecord:
 class User < ActiveRecord::Base
   extend Enumerize
 
-  enumerize :sex, in: [:male, :female]
+  enumerize :sex, in: [:male, :female], default: lambda { |user| SexIdentifier.sex_for_name(user.name).to_sym }
 
   enumerize :role, in: [:user, :admin], default: :user
 end
@@ -52,6 +52,18 @@ class User
 end
 ```
 
+MongoMapper:
+
+```ruby
+class User
+  include MongoMapper::Document
+  extend Enumerize
+
+  key :role
+  enumerize :role, in: [:user, :admin], default: :user
+end
+```
+
 I18n:
 
 ```ruby
@@ -73,6 +85,15 @@ en:
       female: "Female"
 ```
 
+Note that if you want to use I18n feature with plain Ruby object don't forget to extend it with `ActiveModel::Naming`:
+
+```ruby
+class User
+  extend Enumerize
+  extend ActiveModel::Naming
+end
+```
+
 get attribute value:
 
 ```ruby
@@ -162,6 +183,11 @@ class User < ActiveRecord::Base
 
   enumerize :role, in: {:user => 1, :admin => 2}
 end
+
+user = User.new
+user.role = :user
+user.role #=> 'user'
+user.role_value #=> 1
 ```
 
 ActiveRecord scopes:
@@ -244,6 +270,23 @@ and if you want it as radio buttons:
 <% end %>
 ```
 
+### RSpec
+
+Also you can use builtin RSpec matcher:
+
+```ruby
+class User
+  extend Enumerize
+
+  enumerize :sex, in: [:male, :female], default: :male
+end
+
+describe User do
+  it { should enumerize(:sex).in(:male, :female) }
+  it { should enumerize(:sex).in(:male, :female).with_default(:male) }
+end
+```
+
 ### Other Integrations
 
 Enumerize integrates with the following automatically:

data/Rakefile

@@ -2,10 +2,16 @@
 require "bundler/gem_tasks"
 
 require 'rake/testtask'
+require 'rspec/core/rake_task'
+
 Rake::TestTask.new do |t|
   t.libs << 'test'
   t.pattern = 'test/*_test.rb'
   t.verbose = true
 end
 
+RSpec::Core::RakeTask.new('default') do |t|
+  t.pattern = FileList['test/rspec_spec.rb']
+end
+
 task :default => :test

data/enumerize.gemspec

@@ -4,8 +4,8 @@ require File.expand_path('../lib/enumerize/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Sergey Nartimov"]
   gem.email         = "team@brainspec.com"
-  gem.description   = %q{Enumerated attributes with I18n and ActiveRecord/Mongoid support}
-  gem.summary       = %q{Enumerated attributes with I18n and ActiveRecord/Mongoid support}
+  gem.description   = %q{Enumerated attributes with I18n and ActiveRecord/Mongoid/MongoMapper support}
+  gem.summary       = %q{Enumerated attributes with I18n and ActiveRecord/Mongoid/MongoMapper support}
   gem.homepage      = "https://github.com/brainspec/enumerize"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.name          = "enumerize"
   gem.require_paths = ["lib"]
   gem.version       = Enumerize::VERSION
-  
+
   gem.required_ruby_version = '>= 1.9.3'
 
   gem.add_dependency('activesupport', '>= 3.2')

data/lib/enumerize.rb

@@ -10,6 +10,7 @@ module Enumerize
   autoload :Module,       'enumerize/module'
   autoload :ActiveRecord, 'enumerize/activerecord'
   autoload :Predicates,   'enumerize/predicates'
+  autoload :Predicatable, 'enumerize/predicatable'
   autoload :ModuleAttributes, 'enumerize/module_attributes'
 
   def self.included(base)
@@ -47,4 +48,8 @@ module Enumerize
     require 'enumerize/hooks/formtastic'
   rescue LoadError
   end
+
+  if defined?(::RSpec)
+    require 'enumerize/integrations/rspec'
+  end
 end

data/lib/enumerize/activerecord.rb

@@ -1,5 +1,3 @@
-require 'active_support/concern'
-
 module Enumerize
   module ActiveRecord
     def enumerize(name, options={})
@@ -8,23 +6,43 @@ module Enumerize
       if options[:scope]
         _enumerize_module.dependent_eval do
           if defined?(::ActiveRecord::Base) && self < ::ActiveRecord::Base
-            scope_name = options[:scope] == true ? "with_#{name}" : options[:scope]
-            define_singleton_method scope_name do |*values|
-              values = values.map { |value| enumerized_attributes[name].find_value(value).value }
-              values = values.first if values.size == 1
+            _define_scope_methods!(name, options)
 
-              where(name => values)
-            end
+            class_eval do
+              # https://github.com/brainspec/enumerize/issues/74
+              def write_attribute(attr_name, value)
+                _enumerized_values_for_validation[attr_name] = value
 
-            if options[:scope] == true
-              define_singleton_method "without_#{name}" do |*values|
-                values = values.map { |value| enumerized_attributes[name].find_value(value).value }
-                where(arel_table[name].not_in(values))
+                super
               end
+
+              # Since Rails use `allocate` method on models and initializes them with `init_with` method.
+              # This way `initialize` method is not being called, but `after_initialize` callback always gets triggered.
+              after_initialize :_set_default_value_for_enumerized_attributes
             end
           end
         end
       end
     end
+
+    private
+
+    def _define_scope_methods!(name, options)
+      scope_name = options[:scope] == true ? "with_#{name}" : options[:scope]
+
+      define_singleton_method scope_name do |*values|
+        values = values.map { |value| enumerized_attributes[name].find_value(value).value }
+        values = values.first if values.size == 1
+
+        where(name => values)
+      end
+
+      if options[:scope] == true
+        define_singleton_method "without_#{name}" do |*values|
+          values = values.map { |value| enumerized_attributes[name].find_value(value).value }
+          where(arel_table[name].not_in(values))
+        end
+      end
+    end
   end
 end

data/lib/enumerize/attribute.rb

@@ -14,11 +14,19 @@ module Enumerize
       @value_hash.merge! Hash[@values.map { |v| [v.to_s, v] }]
 
       if options[:default]
-        @default_value = find_value(options[:default])
+        @default_value = find_default_value(options[:default])
         raise ArgumentError, 'invalid default value' unless @default_value
       end
     end
 
+    def find_default_value(value)
+      if value.respond_to?(:call)
+        value
+      else
+        find_value(value)
+      end
+    end
+
     def find_value(value)
       @value_hash[value.to_s] unless value.nil?
     end
@@ -82,6 +90,10 @@ module Enumerize
         def #{name}_text
           self.#{name} && self.#{name}.text
         end
+
+        def #{name}_value
+          self.#{name} && self.#{name}.value
+        end
       RUBY
     end
   end

data/lib/enumerize/attribute_map.rb

@@ -1,5 +1,7 @@
 module Enumerize
   class AttributeMap
+    attr_reader :attributes
+
     def initialize
       @attributes = {}
       @dependants = []

data/lib/enumerize/base.rb

@@ -1,12 +1,10 @@
-require 'active_support/concern'
-
 module Enumerize
   module Base
-    extend ActiveSupport::Concern
+    def self.included(base)
+      base.extend ClassMethods
 
-    included do
-      if respond_to?(:validate)
-        validate :_validate_enumerized_attributes
+      if base.respond_to?(:validate)
+        base.validate :_validate_enumerized_attributes
       end
     end
 
@@ -48,11 +46,7 @@ module Enumerize
 
     def initialize(*)
       super
-      self.class.enumerized_attributes.each do |attr|
-        if !public_send(attr.name) && !_enumerized_values_for_validation.key?(attr.name)
-          public_send("#{attr.name}=", attr.default_value)
-        end
-      end
+      _set_default_value_for_enumerized_attributes
     end
 
     def read_attribute_for_validation(key)
@@ -81,5 +75,19 @@ module Enumerize
         end
       end
     end
+
+    def _set_default_value_for_enumerized_attributes
+      self.class.enumerized_attributes.each do |attr|
+        if !public_send(attr.name) && !_enumerized_values_for_validation.key?(attr.name)
+          value = attr.default_value
+
+          if value.respond_to?(:call)
+            value = value.arity == 0 ? value.call : value.call(self)
+          end
+
+          public_send("#{attr.name}=", value)
+        end
+      end
+    end
   end
 end

data/lib/enumerize/integrations/rspec.rb

@@ -0,0 +1,17 @@
+require 'enumerize/integrations/rspec/matcher'
+
+module Enumerize
+  module Integrations
+    module RSpec
+      def enumerize(attr)
+        ::Enumerize::Integrations::RSpec::Matcher.new(attr)
+      end
+    end
+  end
+end
+
+module RSpec
+  module Matchers
+    include Enumerize::Integrations::RSpec
+  end
+end

data/lib/enumerize/integrations/rspec/matcher.rb

@@ -0,0 +1,76 @@
+module Enumerize
+  module Integrations
+    module RSpec
+      class Matcher
+        attr_accessor :attr, :values, :subject, :default
+
+        def initialize(attr)
+          self.attr = attr
+        end
+
+        def in(*values)
+          self.values = values.map(&:to_s).sort
+          self
+        end
+
+        def with_default(default)
+          self.default = default.to_s
+          self
+        end
+
+        def failure_message
+          message  = " expected :#{attr} to allow value#{values.size == 1 ? nil : 's'}: #{quote_values(values)},"
+          message += " but it allows #{quote_values(enumerized_values)} instead"
+
+          if default
+            message  = " expected :#{attr} to have #{default.inspect} as default value,"
+            message += " but it sets #{enumerized_default.inspect} instead"
+          end
+
+          message
+        end
+
+        def description
+          description  = "enumerize :#{attr} in: #{quote_values(values)}"
+          description += " with #{default.inspect} as default value" if default
+        end
+
+        def matches?(subject)
+          self.subject = subject
+          matches      = true
+
+          matches &= matches_attributes?
+          matches &= matches_default_value? if default
+
+          matches
+        end
+
+        private
+
+        def matches_attributes?
+          values == enumerized_values
+        end
+
+        def matches_default_value?
+          default == enumerized_default
+        end
+
+        def enumerized_values
+          @enumerized_values ||= attributes[attr.to_s].values.sort
+        end
+
+        def enumerized_default
+          @enumerized_default ||= attributes[attr.to_s].default_value
+        end
+
+        def attributes
+          subject.class.enumerized_attributes.attributes
+        end
+
+        def quote_values(values)
+          values.map(&:inspect).join(', ')
+        end
+      end
+    end
+  end
+end

data/lib/enumerize/predicatable.rb

@@ -0,0 +1,30 @@
+module Enumerize
+  module Predicatable
+    def method_missing(method, *args, &block)
+      if boolean_method?(method)
+        define_query_methods
+        send(method, *args, &block)
+      else
+        super
+      end
+    end
+
+    def respond_to_missing?(method, include_private=false)
+      boolean_method?(method)
+    end
+
+    private
+
+    def define_query_methods
+      @attr.values.each do |value|
+        unless singleton_methods.include?(:"#{value}?")
+          define_query_method(value)
+        end
+      end
+    end
+
+    def boolean_method?(method)
+      method[-1] == '?' && @attr.values.include?(method[0..-2])
+    end
+  end
+end

data/lib/enumerize/set.rb

@@ -1,6 +1,7 @@
 module Enumerize
   class Set
     include Enumerable
+    include Predicatable
 
     attr_reader :values
 
@@ -53,6 +54,14 @@ module Enumerize
 
     private
 
+    def define_query_method(value)
+      singleton_class.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def #{value}?
+          include?("#{value}")
+        end
+      RUBY
+    end
+
     def mutate!
       @values = @obj.public_send("#{@attr.name}=", @values).values
     end

data/lib/enumerize/value.rb

@@ -2,6 +2,8 @@ require 'i18n'
 
 module Enumerize
   class Value < String
+    include Predicatable
+
     def initialize(attr, name, value=nil)
       @attr  = attr
       @value = value || name.to_s
@@ -17,38 +19,21 @@ module Enumerize
       I18n.t(i18n_keys[0], :default => i18n_keys[1..-1])
     end
 
-    def method_missing(method, *args, &block)
-      if boolean_method?(method)
-        define_query_methods
-        send(method, *args, &block)
-      else
-        super
-      end
-    end
-
-    def respond_to_missing?(method, include_private=false)
-      boolean_method?(method)
-    end
-
     private
 
-    def define_query_methods
-      @attr.values.each do |value|
-        unless singleton_methods.include?(:"#{value}?")
-          singleton_class.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def #{value}?
-              #{value == self}
-            end
-          RUBY
+    def define_query_method(value)
+      singleton_class.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def #{value}?
+          #{value == self}
         end
-      end
+      RUBY
     end
 
     def i18n_keys
       @i18n_keys ||= begin
         i18n_keys = []
-        i18n_keys << i18n_scope
         i18n_keys << i18n_scope(i18n_suffix)
+        i18n_keys << i18n_scope
         i18n_keys << self.humanize # humanize value if there are no translations
       end
     end
@@ -60,9 +45,5 @@ module Enumerize
     def i18n_suffix
       "#{@attr.i18n_suffix}." if @attr.i18n_suffix
     end
-
-    def boolean_method?(method)
-      method[-1] == '?' && @attr.values.include?(method[0..-2])
-    end
   end
 end

data/lib/enumerize/version.rb

@@ -1,3 +1,3 @@
 module Enumerize
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/test/activerecord_test.rb

@@ -12,6 +12,7 @@ ActiveRecord::Base.connection.instance_eval do
   create_table :users do |t|
     t.string :sex
     t.string :role
+    t.string :lambda_role
     t.string :name
     t.string :interests
     t.string :status
@@ -36,6 +37,7 @@ 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 < ActiveRecord::Base
@@ -82,6 +84,19 @@ describe Enumerize::ActiveRecord do
     User.new.attributes['role'].must_equal 'user'
   end
 
+  it 'has default value with lambda' do
+    User.new.lambda_role.must_equal 'admin'
+    User.new.attributes['lambda_role'].must_equal 'admin'
+  end
+
+  it 'uses after_initialize callback to set default value' do
+    User.delete_all
+    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
@@ -102,6 +117,13 @@ describe Enumerize::ActiveRecord do
     user.errors[:role].must_include 'is not included in the list'
   end
 
+  it 'validates inclusion when using write_attribute' do
+    user = User.new
+    user.send(:write_attribute, :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 ActiveRecord::RecordInvalid do
       User.create!(role: 'wrong')

data/test/base_test.rb

@@ -78,6 +78,16 @@ describe Enumerize::Base do
     object.foo.must_equal 'b'
   end
 
+  it 'handles default value with lambda' do
+    klass.enumerize(:foo, :in => [:a, :b], :default => lambda { :b })
+    object.foo.must_equal 'b'
+  end
+
+  it 'injects object instance into lamda default value' do
+    klass.enumerize(:foo, :in => [:a, :b], :default => lambda { |obj| :b if obj.is_a? klass })
+    object.foo.must_equal 'b'
+  end
+
   it 'raises exception on invalid default value' do
     proc {
       klass.enumerize(:foo, :in => [:a, :b], :default => :c)
@@ -168,7 +178,7 @@ describe Enumerize::Base do
     object.attributes.must_equal(:foo => 'test')
   end
 
-  it 'returns stores hash values' do
+  it 'stores hash values' do
     klass.enumerize(:foo, :in => {:a => 1, :b => 2})
 
     object.foo = :a
@@ -179,4 +189,14 @@ describe Enumerize::Base do
     object.instance_variable_get(:@foo).must_equal 2
     object.foo.must_equal 'b'
   end
+
+  it 'returns custom value' do
+    klass.enumerize(:foo, :in => {:a => 1, :b => 2})
+
+    object.foo = :a
+    object.foo_value.must_equal 1
+
+    object.foo = :b
+    object.foo_value.must_equal 2
+  end
 end

data/test/formtastic_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'rails'
 
 module Formtastic
   module Helpers

data/test/module_attributes_test.rb

@@ -26,4 +26,25 @@ class ModuleAttributesSpec < MiniTest::Spec
     klass.new.sex.must_equal 'male'
     klass.sex.must_be_instance_of Enumerize::Attribute
   end
+
+  it 'validates attributes' do
+    mod = Module.new do
+      extend Enumerize
+      enumerize :sex, :in => %w[male female]
+    end
+
+    klass = Class.new do
+      include ActiveModel::Validations
+      include mod
+
+      def self.model_name
+        ActiveModel::Name.new(self, nil, 'name')
+      end
+    end
+
+    object = klass.new
+    object.sex = 'wrong'
+    object.wont_be :valid?
+    object.errors[:sex].must_include 'is not included in the list'
+  end
 end

data/test/mongo_mapper_test.rb

@@ -0,0 +1,68 @@
+require 'test_helper'
+
+silence_warnings do
+  require 'mongo_mapper'
+end
+
+MongoMapper.connection = Mongo::Connection.new('localhost', 27017)
+MongoMapper.database   = 'enumerize-test-suite-of-mongomapper'
+
+describe Enumerize do
+  class MongoMapperUser
+    include MongoMapper::Document
+    extend Enumerize
+
+    key :sex
+    key :role
+
+    enumerize :sex, :in => %w[male female]
+    enumerize :role, :in => %w[admin user], :default => 'user'
+  end
+
+  before { $VERBOSE = nil }
+  after  { $VERBOSE = true }
+
+  let(:model) { MongoMapperUser }
+
+  it 'sets nil if invalid value is passed' do
+    user = model.new
+    user.sex = :invalid
+    user.sex.must_equal nil
+  end
+
+  it 'saves value' do
+    model.delete_all
+    user = model.new
+    user.sex = :female
+    user.save!
+    user.sex.must_equal 'female'
+  end
+
+  it 'loads value' do
+    model.delete_all
+    model.create!(:sex => :male)
+    store_translations(:en, :enumerize => {:sex => {:male => 'Male'}}) do
+      user = model.first
+      user.sex.must_equal 'male'
+      user.sex_text.must_equal 'Male'
+    end
+  end
+
+  it 'has default value' do
+    model.new.role.must_equal 'user'
+  end
+
+  it 'validates inclusion' do
+    user = model.new
+    user.role = 'wrong'
+    user.wont_be :valid?
+  end
+
+  it 'assigns value on loaded record' do
+    model.delete_all
+    model.create!(:sex => :male)
+    user = model.first
+    user.sex = :female
+    user.sex.must_equal 'female'
+  end
+end

data/test/mongoid_test.rb

@@ -18,7 +18,7 @@ describe Enumerize do
     field :sex
     field :role
     enumerize :sex, :in => %w[male female]
-    enumerize :role, :in => %w[admine user], :default => 'user'
+    enumerize :role, :in => %w[admin user], :default => 'user'
   end
 
   before { $VERBOSE = nil }

data/test/multiple_test.rb

@@ -28,4 +28,9 @@ describe Enumerize::Base do
     klass.enumerize :foos, in: %w(a b c), multiple: true
     object.wont_respond_to :foos_text
   end
+
+  it "doesn't define _value method" do
+    klass.enumerize :foos, in: %w(a b c), multiple: true
+    object.wont_respond_to :foos_value
+  end
 end

data/test/predicates_test.rb

@@ -15,6 +15,12 @@ describe Enumerize::Predicates do
     object.must_respond_to :b?
   end
 
+  it 'creates predicate methods on multiple attribute' do
+    klass.enumerize(:foo, in: %w(a b), predicates: true, multiple: true)
+    object.must_respond_to :a?
+    object.must_respond_to :b?
+  end
+
   it 'checks values' do
     klass.enumerize(:foo, in: %w(a b), predicates: true)
     object.foo = 'a'
@@ -22,6 +28,13 @@ describe Enumerize::Predicates do
     object.b?.must_equal false
   end
 
+  it 'checks values on multiple attribute' do
+    klass.enumerize(:foo, in: %w(a b), predicates: true, multiple: true)
+    object.foo << :a
+    object.a?.must_equal true
+    object.b?.must_equal false
+  end
+
   it 'prefixes methods' do
     klass.enumerize(:foo, in: %w(a b), predicates: { prefix: 'bar' })
     object.wont_respond_to :a?

data/test/rspec_matcher_test.rb

@@ -0,0 +1,53 @@
+require 'test_helper'
+require 'enumerize/integrations/rspec'
+
+describe Enumerize::Integrations::RSpec do
+  class Should
+    include Enumerize::Integrations::RSpec
+  end
+
+  let(:klass) do
+    Class.new do
+      extend Enumerize
+    end
+  end
+
+  let(:should) { Should.new }
+  let(:object) { klass.new }
+
+  describe '#matches?' do
+    before do
+      klass.enumerize(:sex, :in => [:male, :female])
+    end
+
+    it 'returns true' do
+      matcher = should.enumerize(:sex).in(:male, :female)
+      matcher.matches?(object).must_equal true
+    end
+
+    it 'returns false' do
+      matcher = should.enumerize(:sex).in(:bar)
+      matcher.matches?(object).must_equal false
+    end
+  end
+
+  describe '#failure_message' do
+    before do
+      klass.enumerize(:sex, :in => [:male, :female], :default => :male)
+    end
+
+    it 'returns failure message for invalid :in option' do
+      matcher = should.enumerize(:sex).in(:bar)
+      matcher.subject = object
+      expected = ' expected :sex to allow value: "bar", but it allows "female", "male" instead'
+      matcher.failure_message.must_equal expected
+    end
+
+    it 'returns failure message for invalid :with_default option' do
+      matcher = should.enumerize(:sex).in(:male, :female).with_default(:foo)
+      matcher.subject = object
+      expected = ' expected :sex to have "foo" as default value, but it sets "male" instead'
+      matcher.failure_message.must_equal expected
+    end
+  end
+end

data/test/rspec_spec.rb

@@ -0,0 +1,13 @@
+require 'enumerize'
+require 'rspec'
+
+class RSpecUser
+  extend Enumerize
+
+  enumerize :sex, in: [:male, :female], default: :male
+end
+
+describe RSpecUser do
+  it { should enumerize(:sex).in(:male, :female) }
+  it { should enumerize(:sex).in(:male, :female).with_default(:male) }
+end

data/test/set_test.rb

@@ -109,4 +109,42 @@ describe Enumerize::Set do
       set.join(', ').must_equal 'a, b'
     end
   end
+
+  describe 'boolean methods comparison' do
+    it 'returns true if value equals method' do
+      set << :a
+      set.a?.must_equal true
+    end
+
+    it 'returns false if value does not equal method' do
+      set << :a
+      set.b?.must_equal false
+    end
+
+    it 'raises NoMethodError if there are no values like boolean method' do
+      proc {
+        set.some_method?
+      }.must_raise NoMethodError
+    end
+
+    it 'raises ArgumentError if arguments are passed' do
+      proc {
+        set.a?('<3')
+      }.must_raise ArgumentError
+    end
+
+    it 'responds to methods for existing values' do
+      set.must_respond_to :a?
+      set.must_respond_to :b?
+      set.must_respond_to :c?
+    end
+
+    it 'returns a method object' do
+      set.method(:a?).must_be_instance_of Method
+    end
+
+    it 'does not respond to a method for not existing value' do
+      set.wont_respond_to :some_method?
+    end
+  end
 end

data/test/simple_form_test.rb

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

data/test/test_helper.rb

@@ -5,20 +5,6 @@ require 'active_model'
 
 $VERBOSE=true
 
-module SimpleForm
-  module Rails
-    def self.env
-      ActiveSupport::StringInquirer.new("test")
-    end
-  end
-end
-
-module Formtastic
-  module Rails
-    VERSION = ActiveSupport::VERSION
-  end
-end
-
 module RailsAdmin
 end
 

data/test/value_test.rb

@@ -12,6 +12,34 @@ describe Enumerize::Value do
     value.must_be :==, 'test_value'
   end
 
+  describe 'translation' do
+    let(:attr)  { Struct.new(:values, :name, :i18n_suffix).new([], "attribute_name", "model_name") }
+
+    it 'uses common translation' do
+      store_translations(:en, :enumerize => {:attribute_name => {:test_value => "Common translation"}}) do
+        value.text.must_be :==, "Common translation"
+      end
+    end
+
+    it 'uses model specific translation' do
+      store_translations(:en, :enumerize => {:model_name => {:attribute_name => {:test_value => "Model Specific translation"}}}) do
+        value.text.must_be :==, "Model Specific translation"
+      end
+    end
+
+    it 'uses model specific translation rather than common translation' do
+      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"
+      end
+    end
+
+    it 'uses simply humanized value when translation is undefined' do
+      store_translations(:en, :enumerize => {}) do
+        value.text.must_be :==, "Test value"
+      end
+    end
+  end
+
   describe 'boolean methods comparison' do
     before do
       attr.values = [value, Enumerize::Value.new(attr, 'other_value')]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enumerize
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -27,7 +27,8 @@ dependencies:
     none: false
   prerelease: false
   name: activesupport
-description: Enumerated attributes with I18n and ActiveRecord/Mongoid support
+description: Enumerated attributes with I18n and ActiveRecord/Mongoid/MongoMapper
+  support
 email: team@brainspec.com
 executables: []
 extensions: []
@@ -51,8 +52,11 @@ files:
 - lib/enumerize/hooks/formtastic.rb
 - lib/enumerize/hooks/simple_form.rb
 - lib/enumerize/integrations/rails_admin.rb
+- lib/enumerize/integrations/rspec.rb
+- lib/enumerize/integrations/rspec/matcher.rb
 - lib/enumerize/module.rb
 - lib/enumerize/module_attributes.rb
+- lib/enumerize/predicatable.rb
 - lib/enumerize/predicates.rb
 - lib/enumerize/set.rb
 - lib/enumerize/value.rb
@@ -63,10 +67,13 @@ files:
 - 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/rspec_matcher_test.rb
+- test/rspec_spec.rb
 - test/set_test.rb
 - test/simple_form_test.rb
 - test/support/mock_controller.rb
@@ -89,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: 2431695080895268301
+      hash: 2859816307703102675
       version: '0'
       segments:
       - 0
@@ -99,5 +106,5 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Enumerated attributes with I18n and ActiveRecord/Mongoid support
+summary: Enumerated attributes with I18n and ActiveRecord/Mongoid/MongoMapper support
 test_files: []