simple_enum 1.6.2 → 1.6.3

data/.gitignore

@@ -1,4 +1,7 @@
+.DS_Store
+_site
 doc
 pkg
 *.rbc
 .*.sw?
+tmp

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+services: mongodb
 rvm:
   - 1.8.7
   - 1.9.3

data/Gemfile.lock

@@ -1,41 +1,46 @@
 PATH
   remote: .
   specs:
-    simple_enum (1.6.2)
+    simple_enum (1.6.3)
       activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.0)
-      activesupport (= 3.2.0)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
-    activerecord (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
-      arel (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.0)
+    activerecord-jdbc-adapter (1.2.2)
+    activerecord-jdbcsqlite3-adapter (1.2.2)
+      activerecord-jdbc-adapter (~> 1.2.2)
+      jdbc-sqlite3 (~> 3.7.2)
+    activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (3.0.0)
-    bson (1.5.2)
-    bson (1.5.2-java)
-    bson_ext (1.5.2)
-      bson (= 1.5.2)
+    arel (3.0.2)
+    bson (1.6.4)
+    bson (1.6.4-java)
+    bson_ext (1.6.4)
+      bson (~> 1.6.4)
     builder (3.0.0)
     i18n (0.6.0)
-    minitest (2.10.1)
-    mongo (1.5.2)
-      bson (= 1.5.2)
-    mongoid (2.4.1)
+    jdbc-sqlite3 (3.7.2)
+    minitest (3.3.0)
+    mongo (1.6.2)
+      bson (~> 1.6.2)
+    mongoid (2.4.12)
       activemodel (~> 3.1)
-      mongo (~> 1.3)
+      mongo (<= 1.6.2)
       tzinfo (~> 0.3.22)
-    multi_json (1.0.4)
+    multi_json (1.3.6)
     rake (0.9.2.2)
-    sqlite3 (1.3.5)
-    tzinfo (0.3.31)
+    sqlite3 (1.3.6)
+    tzinfo (0.3.33)
 
 PLATFORMS
   java

data/README.rdoc

@@ -276,6 +276,8 @@ or <em>b)</em> a custom method to convert an object to a symbolized form named +
 * @dbalatero - rails 2.3.5 bugfix & validator fixes
 * @johnthethird - feature for <tt>_for_select</tt> to return the values
 * @sinsiliux - ruby 1.9 fixes and removed AR dependency
+* @sled - mongoid support
+* and all others: https://github.com/lwe/simple_enum/graphs/contributors thanks
 
 == Licence & Copyright
 Copyright (c) 2011 by Lukas Westermann, Licenced under MIT Licence (see LICENCE file)

data/Rakefile

@@ -28,3 +28,9 @@ namespace :test do
 end
 
 task :test => [:'test:activerecord', :'test:mongoid']
+
+# Mongodb
+directory "tmp/mongodb.data"
+task :mongodb => [:'tmp/mongodb.data'] do |t|
+  system "mongod", "--dbpath", "tmp/mongodb.data"
+end

data/lib/simple_enum.rb

@@ -37,6 +37,7 @@ module SimpleEnum
     #   <tt>false</tt> no exception is thrown and the internal value is set to <tt>nil</tt> (default is <tt>true</tt>)
     # * <tt>:dirty</tt> - Boolean value which if set to <tt>true</tt> generates <tt>..._was</tt> and <tt>..._changed?</tt>
     #   methods for the enum, which delegate to the internal column.
+    # * <tt>:strings</tt> - Boolean value which if set to <tt>true</tt> defaults array values as strings instead of integers.
     def default_options
       @default_options ||= {
         :whiny => true,
@@ -154,16 +155,17 @@ module SimpleEnum
     #   <tt>false</tt> no exception is thrown and the internal value is set to <tt>nil</tt> (default is <tt>true</tt>)
     # * <tt>:dirty</tt> - Boolean value which if set to <tt>true</tt> generates <tt>..._was</tt> and <tt>..._changed?</tt>
     #   methods for the enum, which delegate to the internal column (default is <tt>false</tt>)
+    # * <tt>:strings</tt> - Boolean value which if set to <tt>true</tt> stores array values as strings instead of it's index.
     # * <tt>:field</tt> - Also allowed as valid key, for Mongoid integration + default options, see simple_enum#27.
     #
     def as_enum(enum_cd, values, options = {})
       options = SimpleEnum.default_options.merge({ :column => "#{enum_cd}_cd" }).merge(options)
-      options.assert_valid_keys(:column, :whiny, :prefix, :slim, :upcase, :dirty, :field)
+      options.assert_valid_keys(:column, :whiny, :prefix, :slim, :upcase, :dirty, :strings, :field)
 
       metaclass = (class << self; self; end)
 
-      # convert array to hash...
-      values = SimpleEnum::EnumHash.new(values)
+      # convert array to hash
+      values = SimpleEnum::EnumHash.new(values, options[:strings])
       values_inverted = values.invert
 
       # store info away

data/lib/simple_enum/enum_hash.rb

@@ -4,7 +4,6 @@ module SimpleEnum
   # Works like to original +Hash+ class, but with some added value,
   # like access to
   #
-  #
   class EnumHash < ::ActiveSupport::OrderedHash
 
     # Converts an entity to a symbol, uses to_enum_sym, if possible.
@@ -16,7 +15,7 @@ module SimpleEnum
       sym unless sym.blank?
     end
 
-    def initialize(args = [])
+    def initialize(args = [], strings = false)
       super()
 
       @reverse_sym_lookup = {}
@@ -28,7 +27,7 @@ module SimpleEnum
         ary = args.send(args.respond_to?(:enum_with_index) ? :enum_with_index : :each_with_index).to_a unless args.first.respond_to?(:map)
         ary = args.map { |e| [e, e.id] } if args.first.respond_to?(:map) && !args.first.is_a?(Array)
         ary ||= args
-        ary.each { |e| set_value_for_reverse_lookup(e[0], e[1]) }
+        ary.each { |e| set_value_for_reverse_lookup(e[0], strings ? e[0].to_s : e[1]) }
       end
     end
 
@@ -54,4 +53,4 @@ module SimpleEnum
         @sym_value_lookup[sym] = value
       end
   end
-end
+end

data/lib/simple_enum/version.rb

@@ -1,5 +1,5 @@
 module SimpleEnum
 
   # +SimpleEnum+ version string.
-  VERSION = "1.6.2"
+  VERSION = "1.6.3"
 end

data/simple_enum.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.authors  = ["Lukas Westermann"]
   s.email    = ["lukas.westermann@gmail.com"]
-  s.homepage = "http://github.com/lwe/simple_enum"
+  s.homepage = "http://lwe.github.com/simple_enum/"
 
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")

data/test/enum_hash_test.rb

@@ -2,10 +2,10 @@ require 'test_helper'
 require 'simple_enum/enum_hash'
 
 class EnumHashTest < MiniTest::Unit::TestCase
-  
+
   def test_create_new_enumhash_instance_from_array_of_symbols
     genders = SimpleEnum::EnumHash.new [:male, :female]
-    
+
     assert_same 0, genders[:male]
     assert_same 1, genders[:female]
     assert_same 0, genders.male
@@ -14,54 +14,60 @@ class EnumHashTest < MiniTest::Unit::TestCase
 
   def test_create_new_enumhash_instance_from_hash
     status = SimpleEnum::EnumHash.new :inactive => 0, :active => 1, :archived => 99
-    
+
     assert_same 0, status.inactive
     assert_same 1, status[:active]
   end
-  
+
   def test_create_new_enumhash_instance_from_query_results
     reload_db :genders => true
     genders = SimpleEnum::EnumHash.new Gender.all
-        
+
     assert_same 0, genders[@male]
     assert_same genders[@male], genders[:male]
     assert_same 1, genders.female
     assert_equal @male, genders.send(:male, true)
   end
-  
+
   def test_that_enumhash_keys_are_ordered
     ordered = SimpleEnum::EnumHash.new [:alpha, :beta, :gamma, :delta, :epsilon, :zeta, :eta]
     expected_keys = [:alpha, :beta, :gamma, :delta, :epsilon, :zeta, :eta]
     assert_equal expected_keys, ordered.keys
   end
-  
+
   def test_valid_key_value_association_when_simple_array_is_merged_into_enumhash
     a = [:a, :b, :c, :d]
     h = SimpleEnum::EnumHash.new(a)
-    
+
     assert_same 0, h[:a]
     assert_same 1, h[:b]
     assert_same 2, h[:c]
     assert_same 3, h[:d]
     assert_equal [:a, :b, :c, :d], h.keys
   end
-  
+
   def test_that_an_already_correct_looking_array_is_converted_to_hash
     a = [[:a, 5], [:b, 10]]
     h = SimpleEnum::EnumHash.new(a)
-    
+
     assert_same 5, h[:a]
     assert_same 10, h[:b]
     assert_equal [:a, :b], h.keys
   end
-  
+
   def test_that_an_array_of_query_results_are_converted_to_result_ids
     reload_db :genders => true # reload db
     a = Gender.all
-    
+
     h = SimpleEnum::EnumHash.new(a)
-    
+
     assert_same 0, h[@male]
     assert_same 1, h[@female]
-  end  
-end
+  end
+
+  def test_strings_option
+    h = SimpleEnum::EnumHash.new([:male, :female], true)
+    assert_equal "male", h[:male]
+    assert_equal "female", h[:female]
+  end
+end

data/test/mongoid_test.rb

@@ -1,13 +1,15 @@
 require 'test_helper'
 
 class MongoidTest < MiniTest::Unit::TestCase
-  @@default_options = SimpleEnum.default_options
-
   def setup
-    SimpleEnum.default_options.clear.merge(@@default_options)
+    @default_options = SimpleEnum.default_options
     reload_db
   end
 
+  def teardown
+    SimpleEnum.default_options.clear.update(@default_options)
+  end
+
   def test_creates_a_field_per_default
     skip('Only available in mongoid') unless mongoid?
     klass = anonymous_dummy do

data/test/orm/active_record.rb

@@ -28,6 +28,7 @@ def reload_db(options = {})
     t.column :name, :string
     t.column :gender_cd, :integer
     t.column :word_cd, :string, :limit => 5
+    t.column :role_cd, :string
     t.column :other, :integer
   end
 
@@ -81,6 +82,7 @@ class Dummy < ActiveRecord::Base
   as_enum :gender, [:male, :female]
   as_enum :word, { :alpha => 'alpha', :beta => 'beta', :gamma => 'gamma'}
   as_enum :didum, [ :foo, :bar, :foobar ], :column => 'other'
+  as_enum :role, [:admin, :member, :anon], :strings => true
 end
 
 class Gender < ActiveRecord::Base

data/test/orm/mongoid.rb

@@ -71,6 +71,7 @@ class Dummy
   as_enum :gender, [:male, :female]
   as_enum :word, { :alpha => 'alpha', :beta => 'beta', :gamma => 'gamma'}
   as_enum :didum, [ :foo, :bar, :foobar ], :column => 'other'
+  as_enum :role, [:admin, :member, :anon], :strings => true
 
   before_save :check_typed
 

data/test/simple_enum_test.rb

@@ -254,4 +254,16 @@ class SimpleEnumTest < MiniTest::Unit::TestCase
     d = Dummy.new
     assert_nil(d.human_gender)
   end
+
+  def test_strings_option
+    d = Dummy.new :role => :anon
+
+    assert_equal :anon, d.role
+    assert_equal 'anon', d.role_cd
+
+    d.role = :admin
+
+    assert_equal :admin, d.role
+    assert_equal 'admin', d.role_cd
+  end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_enum
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 9
+  prerelease: 
   segments: 
   - 1
   - 6
-  - 2
-  version: 1.6.2
+  - 3
+  version: 1.6.3
 platform: ruby
 authors: 
 - Lukas Westermann
@@ -14,78 +15,87 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-22 00:00:00 +02:00
-default_executable: 
+date: 2012-09-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
         - 0
         version: 3.0.0
-  name: activesupport
-  requirement: *id001
   prerelease: false
+  type: :runtime
+  name: activesupport
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 63
         segments: 
         - 0
         - 9
         - 2
         version: 0.9.2
-  name: rake
-  requirement: *id002
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: rake
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 3
         - 0
         version: 2.3.0
-  name: minitest
-  requirement: *id003
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: minitest
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
         - 0
         version: 3.0.0
-  name: activerecord
-  requirement: *id004
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: activerecord
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 0
         version: "2.0"
-  name: mongoid
-  requirement: *id005
   prerelease: false
+  type: :development
+  name: mongoid
+  version_requirements: *id005
 description: Provides enum-like fields for ActiveRecord, ActiveModel and Mongoid models.
 email: 
 - lukas.westermann@gmail.com
@@ -126,8 +136,7 @@ files:
 - test/simple_enum_test.rb
 - test/test_helper.rb
 - test/without_shortcuts_test.rb
-has_rdoc: true
-homepage: http://github.com/lwe/simple_enum
+homepage: http://lwe.github.com/simple_enum/
 licenses: 
 - MIT
 post_install_message: 
@@ -136,18 +145,22 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3
@@ -156,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple enum-like field support for models.