enumerize 0.0.2 → 0.0.3

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## 0.0.3 (February 8, 2012) ##
+
+### enhancements
+  * Mongoid support (by @lest)
+  * Boolean methods (by @Dreamfa11)

data/Gemfile

@@ -4,6 +4,9 @@ gemspec
 
 gem 'rake'
 gem 'minitest', '~> 2.11.0'
+gem 'mocha'
 
 gem 'activerecord'
 gem 'sqlite3'
+
+gem 'mongoid'

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Sergey Nartimov
+Copyright (c) 2012 Twinslash
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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)
+# 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)
 
 Enumerated attributes with I18n and ActiveRecord support
 
@@ -40,6 +40,18 @@ class User < ActiveRecord::Base
 end
 ```
 
+Mongoid:
+
+```ruby
+class User
+  include Mongoid::Document
+  include Enumerize
+
+  field :role
+  enumerize :role, :in => [:user, :admin], :default => :user
+end
+```
+
 I18n:
 
 ```ruby
@@ -64,7 +76,7 @@ en:
 get attribute value:
 
 ```ruby
-  @user.sex_text # or @user.sex.text
+@user.sex_text # or @user.sex.text
 ```
 
 use it with forms:
@@ -75,6 +87,16 @@ use it with forms:
 <% end %>
 ```
 
+Boolean methods:
+
+```ruby
+user.sex = :male
+user.sex.male? #=> true
+user.sex.female? #=> false
+```
+
+
+
 ## Contributing
 
 1. Fork it

data/lib/enumerize.rb

@@ -8,11 +8,11 @@ module Enumerize
 
   extend ActiveSupport::Concern
 
+  include Integrations::Basic
+
   included do
     if defined?(ActiveRecord::Base) && self < ActiveRecord::Base
       include Integrations::ActiveRecord
-    else
-      include Integrations::Basic
     end
   end
 end

data/lib/enumerize/integrations/active_record.rb

@@ -4,24 +4,6 @@ module Enumerize
   module Integrations
     module ActiveRecord
       extend ActiveSupport::Concern
-
-      include Integrations::Basic
-
-      module ClassMethods
-        private
-
-        def _define_enumerize_attribute(mod, attr)
-          mod.module_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def #{attr.name}
-              self.class.#{attr.name}.find_value(super)
-            end
-
-            def #{attr.name}=(new_value)
-              super self.class.#{attr.name}.find_value(new_value).to_s
-            end
-          RUBY
-        end
-      end
     end
   end
 end

data/lib/enumerize/integrations/basic.rb

@@ -37,15 +37,23 @@ module Enumerize
         def _define_enumerize_attribute(mod, attr)
           mod.module_eval <<-RUBY, __FILE__, __LINE__ + 1
             def #{attr.name}
-              if defined?(@#{attr.name})
-                self.class.#{attr.name}.find_value(@#{attr.name})
+              if defined?(super)
+                self.class.#{attr.name}.find_value(super)
               else
-                @#{attr.name} = nil
+                if defined?(@#{attr.name})
+                  self.class.#{attr.name}.find_value(@#{attr.name})
+                else
+                  @#{attr.name} = nil
+                end
               end
             end
 
             def #{attr.name}=(new_value)
-              @#{attr.name} = self.class.#{attr.name}.find_value(new_value).to_s
+              if defined?(super)
+                super self.class.#{attr.name}.find_value(new_value).to_s
+              else
+                @#{attr.name} = self.class.#{attr.name}.find_value(new_value).to_s
+              end
             end
           RUBY
         end

data/lib/enumerize/value.rb

@@ -15,5 +15,12 @@ module Enumerize
       i18n_keys.map! { |k| :"enumerize.#{k}#{@attr.name}.#{self}" }
       I18n.t(i18n_keys.shift, :default => i18n_keys)
     end
+
+    def method_missing(method, *args)
+      value = method.to_s.gsub(/\?\Z/, '')
+      super unless @attr.values.include?(value)
+      raise ArgumentError if args.any?
+      value == self
+    end
   end
 end

data/lib/enumerize/version.rb

@@ -1,3 +1,3 @@
 module Enumerize
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/{active_record_test.rb → activerecord_test.rb}

@@ -2,11 +2,26 @@ require 'test_helper'
 require 'active_record'
 require 'logger'
 
-ActiveRecord::Migration.verbose = false
-ActiveRecord::Base.logger = Logger.new(nil)
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
-ActiveRecord::Migrator.migrate File.expand_path("../active_record/migrate", __FILE__)
-require File.expand_path('../active_record/models', __FILE__)
+silence_warnings do
+  ActiveRecord::Migration.verbose = false
+  ActiveRecord::Base.logger = Logger.new(nil)
+  ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+end
+
+ActiveRecord::Base.connection.instance_eval do
+  create_table :users do |t|
+    t.string :sex
+    t.string :role
+  end
+end
+
+class User < ActiveRecord::Base
+  include Enumerize
+
+  enumerize :sex, :in => [:male, :female]
+
+  enumerize :role, :in => [:user, :admin], :default => :user
+end
 
 describe Enumerize::Integrations::ActiveRecord do
   it 'sets nil if invalid value is passed' do

data/test/mongoid_test.rb

@@ -0,0 +1,55 @@
+require 'test_helper'
+
+silence_warnings do
+  require 'mongoid'
+end
+
+Mongoid.configure do |config|
+  config.master  = Mongo::Connection.new('127.0.0.1', 27017).db('enumerize-test-suite')
+  config.use_utc = true
+  config.include_root_in_json = true
+end
+
+describe Enumerize do
+  class MongoidUser
+    include Mongoid::Document
+    include Enumerize
+
+    field :sex
+    field :role
+    enumerize :sex, :in => %w[male female]
+    enumerize :role, :in => %w[admine user], :default => 'user'
+  end
+
+  before { $VERBOSE = nil }
+  after  { $VERBOSE = true }
+
+  let(:model) { MongoidUser }
+
+  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
+    I18n.backend.store_translations(:en, :enumerize => {:sex => {:male => 'Male'}})
+    model.create!(:sex => :male)
+    user = model.first
+    user.sex.must_equal 'male'
+    user.sex_text.must_equal 'Male'
+  end
+
+  it 'has default value' do
+    model.new.role.must_equal 'user'
+  end
+end

data/test/test_helper.rb

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

data/test/value_test.rb

@@ -1,8 +1,8 @@
 require 'test_helper'
-require 'yaml'
 
 describe Enumerize::Value do
-  let(:value) { Enumerize::Value.new(nil, 'test_value') }
+  let(:attr)  { Object.new }
+  let(:value) { Enumerize::Value.new(attr, 'test_value') }
 
   it 'is a string' do
     value.must_be_kind_of String
@@ -15,4 +15,30 @@ describe Enumerize::Value do
   it 'is frozen' do
     value.must_be :frozen?
   end
+
+  describe 'boolean methods comparison' do
+    before do
+      attr.stubs(:values).returns([value, Enumerize::Value.new(attr, 'other_value')])
+    end
+
+    it 'returns true if value equals method' do
+      value.test_value?.must_equal true
+    end
+
+    it 'returns false if value does not equal method' do
+      value.other_value?.must_equal false
+    end
+
+    it 'raises NoMethodError if there are no values like boolean method' do
+      proc {
+        value.some_method?
+      }.must_raise NoMethodError
+    end
+
+    it 'raises ArgumentError if arguments are passed' do
+      proc {
+        value.other_value?('<3')
+      }.must_raise ArgumentError
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enumerize
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000 Z
+date: 2012-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &24691120 !ruby/object:Gem::Requirement
+  requirement: &23049480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *24691120
+  version_requirements: *23049480
 description: Enumerated attributes with I18n and ActiveRecord support
 email: info@twinslash.com
 executables: []
@@ -30,6 +30,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -42,11 +43,10 @@ files:
 - lib/enumerize/integrations/basic.rb
 - lib/enumerize/value.rb
 - lib/enumerize/version.rb
-- test/active_record/migrate/1_create_tables.rb
-- test/active_record/models.rb
-- test/active_record_test.rb
+- test/activerecord_test.rb
 - test/attribute_test.rb
 - test/basic_test.rb
+- test/mongoid_test.rb
 - test/test_helper.rb
 - test/value_test.rb
 homepage: https://github.com/twinslash/enumerize
@@ -63,7 +63,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2302864515113486890
+      hash: 1283897538830316283
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2302864515113486890
+      hash: 1283897538830316283
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15
@@ -80,10 +80,9 @@ signing_key:
 specification_version: 3
 summary: Enumerated attributes with I18n and ActiveRecord support
 test_files:
-- test/active_record/migrate/1_create_tables.rb
-- test/active_record/models.rb
-- test/active_record_test.rb
+- test/activerecord_test.rb
 - test/attribute_test.rb
 - test/basic_test.rb
+- test/mongoid_test.rb
 - test/test_helper.rb
 - test/value_test.rb

data/test/active_record/migrate/1_create_tables.rb

@@ -1,8 +0,0 @@
-class CreateTables < ActiveRecord::Migration
-  def up
-    create_table :users do |t|
-      t.string :sex
-      t.string :role
-    end
-  end
-end

data/test/active_record/models.rb

@@ -1,7 +0,0 @@
-class User < ActiveRecord::Base
-  include Enumerize
-
-  enumerize :sex, :in => [:male, :female]
-
-  enumerize :role, :in => [:user, :admin], :default => :user
-end