dm-enum 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/dm-enum.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-enum}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Potapov Sergey"]

data/lib/dm/enum.rb

@@ -21,10 +21,15 @@ module DataMapper
       end
 
       def [](name)
-        if model = @enums_cache[name.to_sym]
-          model
-        elsif !@cache_update_flag
+        unless @cache_update_flag
           raise RuntimeError.new("Looks like you forgot to call `#{self}.update_enums_cache!` before using `#{self}[#{name.inspect}]`")
+        end
+
+        case name
+        when String, Symbol
+          @enums_cache[name.to_sym]
+        when self
+          name
         else
           nil
         end

data/spec/dm/enum_spec.rb

@@ -48,5 +48,22 @@ describe DataMapper::Enum do
         expect { City[:Kharkov] }.to raise_error(RuntimeError, error_message)
       end
     end
+
+
+    context "same kind of object is passed" do
+      it "return passed model" do
+        german = Language.new(:code => "de", :name => "German")
+        Language[german].should == german
+      end
+    end
+
+    context "unexpected kind of object is passed" do
+      it "returns nil" do
+        [nil, 1, 2.0, Object.new, Country.new].each do |key|
+          Language[key].should be_nil
+        end
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-enum
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
-  requirement: &8560280 !ruby/object:Gem::Requirement
+  requirement: &14814220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8560280
+  version_requirements: *14814220
 - !ruby/object:Gem::Dependency
   name: dm-migrations
-  requirement: &8559660 !ruby/object:Gem::Requirement
+  requirement: &14813540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8559660
+  version_requirements: *14813540
 - !ruby/object:Gem::Dependency
   name: dm-sqlite-adapter
-  requirement: &8559060 !ruby/object:Gem::Requirement
+  requirement: &14812840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8559060
+  version_requirements: *14812840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &8558340 !ruby/object:Gem::Requirement
+  requirement: &14812140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *8558340
+  version_requirements: *14812140
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &8557680 !ruby/object:Gem::Requirement
+  requirement: &14811460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *8557680
+  version_requirements: *14811460
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &8557080 !ruby/object:Gem::Requirement
+  requirement: &14810780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *8557080
+  version_requirements: *14810780
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &8543860 !ruby/object:Gem::Requirement
+  requirement: &14678180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +88,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8543860
+  version_requirements: *14678180
 description: Enumerated models for DataMapper to cache enumerated values in memory
 email: blake131313@gmail.com
 executables: []
@@ -124,6 +124,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4464449425942422353
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: