enumerize 0.2.2 → 0.3.0

data/.travis.yml

@@ -10,5 +10,6 @@ gemfile:
 notifications:
   email:
     recipients:
-      - sergey.nartimov@twinslash.com
-      - vasily.ermolovich@twinslash.com
+      - lest@brainspec.com
+      - nashby@brainspec.com
+      - dreamfall@brainspec.com

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.0 (July 9, 2012) ##
+
+### enhancements
+  * Accept a values hash to store an attribute using custom values (e.g. integers) (by [@lest](https://github.com/lest))
+
 ## 0.2.2 (May 22, 2012) ##
 
 ### bug fix

data/Gemfile

@@ -3,8 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake'
-gem 'minitest', '~> 2.12.0'
-gem 'mocha'
+gem 'minitest', '~> 3.1'
 
 gem 'activerecord', '~> 3.2.0'
 gem 'sqlite3'

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Twinslash
+Copyright (c) 2012 Brainspec
 
 MIT License
 

data/README.md

@@ -1,4 +1,4 @@
-# Enumerize [![TravisCI](https://secure.travis-ci.org/twinslash/enumerize.png?branch=master)](http://travis-ci.org/twinslash/enumerize) [![Gemnasium](https://gemnasium.com/twinslash/enumerize.png)](https://gemnasium.com/twinslash/enumerize)
+# 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
 
@@ -93,6 +93,42 @@ use it with forms:
 <% end %>
 ```
 
+Boolean methods:
+
+```ruby
+user.sex = :male
+user.sex.male? #=> true
+user.sex.female? #=> false
+```
+
+To make some attributes shared across different classes it's possible to define them in a separate module and then include it into classes:
+
+```ruby
+module PersonEnumerations
+  include Enumerize
+
+  enumerize :sex, :in => %w[male female]
+end
+
+class Person
+  include PersonEnumerations
+end
+
+class User
+  include PersonEnumerations
+end
+```
+
+It's also possible to store enumerized attribute value using custom values (e.g. integers). You can pass a hash as `:in` option to achieve this:
+
+```ruby
+class User < ActiveRecord::Base
+  enumerize :role, :in => {:user => 1, :admin => 2}
+end
+```
+
+### SimpleForm
+
 If you are using SimpleForm gem you don't need to specify input type (`:select` by default) and collection:
 
 ```erb
@@ -109,6 +145,8 @@ and if you want it as radio buttons:
 <% end %>
 ```
 
+### Formtastic
+
 If you are using Formtastic gem you also don't need to specify input type (`:select` by default) and collection:
 
 ```erb
@@ -125,33 +163,6 @@ and if you want it as radio buttons:
 <% end %>
 ```
 
-Boolean methods:
-
-```ruby
-user.sex = :male
-user.sex.male? #=> true
-user.sex.female? #=> false
-```
-
-To make some attributes shared across different classes it's possible to define them in a separate module and then include it into classes:
-
-```ruby
-module PersonEnumerations
-  include Enumerize
-
-  enumerize :sex, :in => %w[male female]
-end
-
-class Person
-  include PersonEnumerations
-end
-
-class User
-  include PersonEnumerations
-end
-```
-
-
 ## Contributing
 
 1. Fork it

data/enumerize.gemspec

@@ -3,10 +3,10 @@ require File.expand_path('../lib/enumerize/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Sergey Nartimov"]
-  gem.email         = "info@twinslash.com"
+  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.homepage      = "https://github.com/twinslash/enumerize"
+  gem.homepage      = "https://github.com/brainspec/enumerize"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")

data/gemfiles/Gemfile-ar-3.1.x

@@ -3,8 +3,7 @@ source 'https://rubygems.org'
 gem 'enumerize', :path => '..'
 
 gem 'rake'
-gem 'minitest', '~> 2.12.0'
-gem 'mocha'
+gem 'minitest', '~> 3.0.0'
 
 gem 'activerecord', '~> 3.1.0'
 gem 'sqlite3'

data/lib/enumerize/attribute.rb

@@ -7,8 +7,9 @@ module Enumerize
 
       @klass  = klass
       @name   = name.to_sym
-      @values = Array(options[:in]).map { |v| Value.new(self, v) }
-      @value_hash = Hash[@values.map { |v| [v.to_s, v] }]
+      @values = Array(options[:in]).map { |v| Value.new(self, *v) }
+      @value_hash = Hash[@values.map { |v| [v.value.to_s, v] }]
+      @value_hash.merge! Hash[@values.map { |v| [v.to_s, v] }]
 
       if options[:default]
         @default_value = find_value(options[:default])

data/lib/enumerize/base.rb

@@ -75,7 +75,7 @@ module Enumerize
             _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.to_s unless allowed_value_or_nil.nil?
+            allowed_value_or_nil = allowed_value_or_nil.value unless allowed_value_or_nil.nil?
 
             if defined?(super)
               super allowed_value_or_nil

data/lib/enumerize/value.rb

@@ -2,10 +2,15 @@ require 'i18n'
 
 module Enumerize
   class Value < String
-    def initialize(attr, value)
-      @attr = attr
+    def initialize(attr, name, value=nil)
+      @attr  = attr
+      @value = value || name.to_s
 
-      super(value.to_s)
+      super(name.to_s)
+    end
+
+    def value
+      @value
     end
 
     def text

data/lib/enumerize/version.rb

@@ -1,3 +1,3 @@
 module Enumerize
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/test/attribute_map_test.rb

@@ -50,10 +50,11 @@ module Enumerize
 
     it 'updates dependants' do
       attr = make_attr(:a)
-      dependant = mock
-      dependant.expects(:<<).with(attr)
+      dependant = MiniTest::Mock.new
+      dependant.expect(:<<, nil, [attr])
       subject.add_dependant dependant
       subject << attr
+      dependant.verify
     end
 
     it 'adds attrs to dependant' do

data/test/attribute_test.rb

@@ -25,4 +25,19 @@ describe Enumerize::Attribute do
       attr.options.must_equal [['a text', 'a'], ['b text', 'b']]
     end
   end
+
+  describe 'values hash' do
+    before do
+      build_attr nil, :foo, :in => {:a => 1, :b => 2}
+    end
+
+    it 'returns hash keys as values' do
+      attr.values.must_equal %w[a b]
+    end
+
+    it 'finds values by hash values' do
+      attr.find_value(1).must_equal 'a'
+      attr.find_value(2).must_equal 'b'
+    end
+  end
 end

data/test/base_test.rb

@@ -167,4 +167,16 @@ describe Enumerize::Base do
     object.foo.must_equal 'test'
     object.attributes.must_equal(:foo => 'test')
   end
+
+  it 'returns stores hash values' do
+    klass.enumerize(:foo, :in => {:a => 1, :b => 2})
+
+    object.foo = :a
+    object.instance_variable_get(:@foo).must_equal 1
+    object.foo.must_equal 'a'
+
+    object.foo = :b
+    object.instance_variable_get(:@foo).must_equal 2
+    object.foo.must_equal 'b'
+  end
 end

data/test/test_helper.rb

@@ -1,6 +1,5 @@
 require 'minitest/autorun'
 require 'minitest/spec'
-require 'mocha'
 require 'active_support/core_ext/kernel/reporting'
 
 $VERBOSE=true

data/test/value_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 describe Enumerize::Value do
-  let(:attr)  { Object.new }
+  let(:attr)  { Struct.new(:values).new([]) }
   let(:value) { Enumerize::Value.new(attr, 'test_value') }
 
   it 'is a string' do
@@ -14,7 +14,7 @@ describe Enumerize::Value do
 
   describe 'boolean methods comparison' do
     before do
-      attr.stubs(:values).returns([value, Enumerize::Value.new(attr, 'other_value')])
+      attr.values = [value, Enumerize::Value.new(attr, 'other_value')]
     end
 
     it 'returns true if value equals method' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enumerize
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.1.3
 description: Enumerated attributes with I18n and ActiveRecord/Mongoid support
-email: info@twinslash.com
+email: team@brainspec.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -64,7 +64,7 @@ files:
 - test/support/view_test_helper.rb
 - test/test_helper.rb
 - test/value_test.rb
-homepage: https://github.com/twinslash/enumerize
+homepage: https://github.com/brainspec/enumerize
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -78,7 +78,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4327206353620209815
+      hash: -3692164922268239392
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4327206353620209815
+      hash: -3692164922268239392
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23