enumerative 1.4.0 → 1.5.0

data/lib/enumerative/enumeration.rb

@@ -30,11 +30,19 @@
 
      end
 
-     def initialize( key_or_hash )
-       key = key_or_hash.is_a?( Hash ) ?
-               (key_or_hash['key'] || key_or_hash[:key]) :
-               key_or_hash
-       @key = key.to_s.try( :dup ).try( :freeze )
+     def initialize( key_hash_or_enum )
+       key = nil
+       if key_hash_or_enum.is_a?( Hash )
+         key = key_hash_or_enum['key'] || key_hash_or_enum[:key]
+       elsif key_hash_or_enum.is_a?( Enumerative::Enumeration )
+         key = key_hash_or_enum.key
+       else
+         key = key_hash_or_enum
+       end
+
+       @key = (key.nil? || key.empty?) ?
+                nil :
+                key.to_s.try( :dup ).try( :freeze )
      end
 
      def ==( other )

data/lib/enumerative/version.rb

@@ -1,5 +1,5 @@
 module Enumerative
 
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enumerative
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport