simple_enum 1.6.8 → 1.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6a68b2d21b025bcb22c251918ff51b412be8ab6
-  data.tar.gz: bbe02918d4165d9bca1917c7dc38981bc0127136
+  metadata.gz: 18d5bbe70d30e114c220f17681c172597163bfd0
+  data.tar.gz: e9ae250d080b7f6efa78928005df4b9f36ca9ffb
 SHA512:
-  metadata.gz: 4ce5b6271ff2a6b391819e544901d2ddfcfd64ff5c6c253b5f28cdafa94e169f9d2baa6ea7bfd0e35e03e270a63c36d8c4fa6c4f878f8926861d67f63fea0a4d
-  data.tar.gz: 91ad1ead6ee168f5fdcd08f82f004a232dcd1d48a8406a08f3b7597f000d8c96f0d2b7f10099f1ef0a00d4a099d32c19516fa81310aa532a43db8cd62d938e62
+  metadata.gz: 9150ad6487da910c1b6319030102a2e8504f0775e995f2e4cc8ca09e6198e91176e08d6fa8b9aca468aa0de43cdb5a4168d7b802c0ca159d2a98b860810666a7
+  data.tar.gz: 14577d002d9996148f4e321624ecaba8cf705de2ff8162f06c5aca7940b620dfbf1cda88c3c182aa10eed11ce8257d129e4cc4f870a77f123c0b996a86f97205

data/.gitignore

@@ -6,3 +6,4 @@ pkg
 .*.sw?
 tmp
 Gemfile.lock
+:memory*

data/Gemfile

@@ -2,8 +2,10 @@ source "http://rubygems.org"
 
 gemspec
 
+# Fix at 1.9.x, because 1.10 errors on jruby
+gem 'mongo', '~> 1.9.0', :platform => :jruby
+
 # some development deps
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-
 gem 'sqlite3', :platform => :ruby
 gem 'bson_ext', :platform => :ruby

data/README.rdoc

@@ -85,7 +85,7 @@ useful when creating queries, displaying option elements or similar:
 * You can use string values instead of integer values if your database column has the type +string+ or +text+:
 
        class User < ActiveRecord::Base
-         as_eum :status, [:deleted, :active, :dsiabled], :strings => true
+         as_enum :status, [:deleted, :active, :disabled], :strings => true
        end
 
        User.create!(status: :active) #=> #<User id: 1, status_cd: "active">

data/lib/simple_enum.rb

@@ -182,17 +182,23 @@ module SimpleEnum
 
       # generate setter
       define_method("#{enum_cd}=") do |new_value|
-        new_value = new_value.to_s if options[:strings] && new_value
-        real = new_value.blank? ? nil : values[EnumHash.symbolize(new_value)]
-        real = new_value if real.nil? && values_inverted[new_value].present?
-        raise(ArgumentError, "Invalid enumeration value: #{new_value}") if (options[:whiny] and real.nil? and !new_value.blank?)
+        return send("#{options[:column]}=", nil) if new_value.blank?
+
+        new_value = new_value.to_s if options[:strings]
+        real = nil
+        if values.contains?(new_value)
+          real = values[EnumHash.symbolize(new_value)]
+          real = new_value if real.nil? && values_inverted[new_value].present?
+        end
+
+        raise ArgumentError, "Invalid enumeration value: #{new_value}" if options[:whiny] && !real
         send("#{options[:column]}=", real)
       end
 
       # generate checker
       define_method("#{enum_cd}?") do |*args|
         current = send(enum_cd)
-        return current == EnumHash.symbolize(args.first) if args.length > 0
+        return current.to_s == args.first.to_s if args.length > 0
 
         !!current
       end

data/lib/simple_enum/enum_hash.rb

@@ -29,6 +29,14 @@ module SimpleEnum
         ary ||= args
         ary.each { |e| set_value_for_reverse_lookup(e[0], strings ? e[0].to_s : e[1]) }
       end
+
+      @stringified_keys = keys.map(&:to_s)
+
+      freeze
+    end
+
+    def contains?(value)
+      @stringified_keys.include?(value.to_s) || values.include?(value)
     end
 
     def default(k = nil)

data/lib/simple_enum/version.rb

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

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: simple_enum
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.6.9
 platform: ruby
 authors:
 - Lukas Westermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 description: Provides enum-like fields for ActiveRecord, ActiveModel and Mongoid models.
@@ -87,22 +87,24 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- Rakefile
+- ".gitignore"
 - Gemfile
-- README.rdoc
 - LICENSE
-- simple_enum.gemspec
+- README.rdoc
+- Rakefile
+- lib/simple_enum.rb
 - lib/simple_enum/enum_hash.rb
 - lib/simple_enum/mongoid.rb
 - lib/simple_enum/validation.rb
 - lib/simple_enum/version.rb
-- lib/simple_enum.rb
+- locales/en.yml
+- simple_enum.gemspec
 - test/array_conversions_test.rb
 - test/class_methods_test.rb
 - test/dirty_attributes_test.rb
 - test/enum_hash_test.rb
 - test/finders_test.rb
+- test/locales.yml
 - test/mongoid_test.rb
 - test/object_backed_test.rb
 - test/orm/active_record.rb
@@ -113,8 +115,6 @@ files:
 - test/simple_enum_test.rb
 - test/test_helper.rb
 - test/without_shortcuts_test.rb
-- locales/en.yml
-- test/locales.yml
 homepage: http://lwe.github.com/simple_enum/
 licenses:
 - MIT
@@ -125,26 +125,28 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Simple enum-like field support for models.
 test_files:
+- locales/en.yml
 - test/array_conversions_test.rb
 - test/class_methods_test.rb
 - test/dirty_attributes_test.rb
 - test/enum_hash_test.rb
 - test/finders_test.rb
+- test/locales.yml
 - test/mongoid_test.rb
 - test/object_backed_test.rb
 - test/orm/active_record.rb
@@ -155,5 +157,3 @@ test_files:
 - test/simple_enum_test.rb
 - test/test_helper.rb
 - test/without_shortcuts_test.rb
-- locales/en.yml
-- test/locales.yml