active_enum 0.6.2 → 0.6.3

data/README.rdoc

@@ -24,6 +24,13 @@ Define an enum class with values
     value :id => 2, :name => 'Female'
   end
 
+Define with id as the key
+
+  class Sex < ActiveEnum::Base
+    value 1 => 'Male'
+    value 2 => 'Female'
+  end
+
 Define using implicit id values
 
   class Sex < ActiveEnum::Base

data/lib/active_enum.rb

@@ -10,9 +10,6 @@ module ActiveEnum
   mattr_accessor :use_name_as_value
   self.use_name_as_value = false
 
-  mattr_accessor :raise_error_for_not_defined
-  self.raise_error_for_not_defined = false
-
   class Configuration
     def enum(name, &block)
       class_name = name.to_s.camelize

data/lib/active_enum/base.rb

@@ -1,6 +1,6 @@
 module ActiveEnum
   class DuplicateValue < StandardError; end
-  class ValueNotDefined < StandardError; end
+  class InvalidValue < StandardError; end
 
   class Base
 
@@ -10,16 +10,17 @@ module ActiveEnum
         ActiveEnum.enum_classes << subclass
       end
 
-      # :id => 1, :title => 'Foo'
-      # :title => 'Foo'
+      # :name => 'Foo', implicit ID
+      # :id => 1, :name => 'Foo'
+      # 1 => 'Foo'
       #
-      def value(enum_value={})
+      def value(enum_value)
         @values ||= []
 
-        id = enum_value[:id] || next_id
-        check_duplicate(id, enum_value[:name])
+        id, name = id_and_name(enum_value)
+        check_duplicate(id, name)
 
-        @values << [id, enum_value[:name]]
+        @values << [id, name]
 				sort_values! unless @order == :as_defined
       end
 
@@ -48,11 +49,9 @@ module ActiveEnum
       def [](index)
         if index.is_a?(Fixnum)
           row = lookup_by_id(index)
-          raise(ActiveEnum::ValueNotDefined, "The id value #{index} is not defined for #{self} enum.") if row.nil? && ActiveEnum.raise_error_for_not_defined
           row[1] if row
         else
           row = lookup_by_name(index)
-          raise(ActiveEnum::ValueNotDefined, "The name value #{index} is not defined for #{self} enum.") if row.nil? && ActiveEnum.raise_error_for_not_defined
           row[0] if row
         end
       end
@@ -67,6 +66,16 @@ module ActiveEnum
         @values.rassoc(index.to_s) || @values.rassoc(index.to_s.titleize)
       end
 
+      def id_and_name(hash)
+        if hash.has_key?(:id) || hash.has_key?(:name)
+          return (hash[:id] || next_id), hash[:name]
+        elsif hash.keys.first.is_a?(Fixnum)
+          return *Array(hash).first
+        else
+          raise ActiveEnum::InvalidValue, "The value supplied, #{hash}, is not a valid format."
+        end
+      end
+
       def next_id
         (ids.max || 0) + 1
       end

data/lib/active_enum/version.rb

@@ -1,3 +1,3 @@
 module ActiveEnum
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 end

data/spec/active_enum/base_spec.rb

@@ -26,6 +26,13 @@ describe ActiveEnum::Base do
     enum.all.should == [[1,'Name']]
   end
 
+  it 'should allow me to define a value as hash with id as key and name as value' do
+    enum = define_enum do
+      value 1 => 'Name'
+    end
+    enum.all.should == [[1,'Name']]
+  end
+
   it 'should increment value ids when defined without ids' do
     enum = define_enum do
       value :name => 'Name 1'
@@ -132,32 +139,6 @@ describe ActiveEnum::Base do
       enum[:name_1].should == 1
     end
 
-    context "when raise_error_for_not_defined" do
-      before(:all) do
-        ActiveEnum.raise_error_for_not_defined = true
-      end
-
-      it 'should raise error when id value not defined' do
-        enum = define_enum do
-          value :id => 1, :name => 'Name 1'
-          value :id => 2, :name => 'Name 2'
-        end
-        lambda { enum[-1] }.should raise_exception(ActiveEnum::ValueNotDefined)
-      end
-
-      it 'should raise error when name value not defined' do
-        enum = define_enum do
-          value :id => 1, :name => 'Name 1'
-          value :id => 2, :name => 'Name 2'
-        end
-        lambda { enum['Name 3'] }.should raise_exception(ActiveEnum::ValueNotDefined)
-      end
-
-      after(:all) do
-        ActiveEnum.raise_error_for_not_defined = false
-      end
-    end
-
   end
 
   it 'should return array for select helpers from to_select' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_enum
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - Adam Meehan
@@ -9,7 +9,7 @@ autorequire: active_enum
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 +11:00
+date: 2010-03-18 00:00:00 +11:00
 default_executable: 
 dependencies: []