active_enum 0.9.9 → 0.9.11

data/CHANGELOG

@@ -1,3 +1,9 @@
+[0.9.11] : 2012-08-18
+- Use the name key as default value for the name in I18n storage. [kengos]
+
+[0.9.10] : 2012-07-18
+- Fix I18n storage for meta data. [kengos]
+
 [0.9.9] : 2012-07-08
 - Really fix Railtie issue this time.
 

data/README.rdoc

@@ -108,6 +108,20 @@ Multiple attributes with same enum
     enumerate :to, :from, :with => Sex
   end
 
+
+=== Validations
+
+You can use an enum in a validation of inclusion like so
+
+  class User < ActiveRecord::Base
+    enumerate :sex, :with => Sex
+
+    validates_inclusion_of :sex, :in => Sex
+  end
+
+This works because an enum class responds to #include?().
+
+
 === Attribute value lookup
 
 Access the enum values and the enum class using the attribute method with a symbol for the enum component you want

data/lib/active_enum/base.rb

@@ -54,7 +54,7 @@ module ActiveEnum
 
       # Access id or name value. Pass an id number to retrieve the name or
       # a symbol or string to retrieve the matching id.
-      def [](index)
+      def get(index)
         if index.is_a?(Fixnum)
           row = store.get_by_id(index)
           row[1] if row
@@ -63,9 +63,10 @@ module ActiveEnum
           row[0] if row
         end
       end
+      alias_method :[], :get
 
       def include?(value)
-        !self[value].nil?
+        !get(value).nil?
       end
 
       # Access any meta data defined for a given id or name. Returns a hash.
@@ -81,11 +82,11 @@ module ActiveEnum
       private
 
       def id_and_name_and_meta(hash)
-        if hash.has_key?(:id) || hash.has_key?(:name)
+        if hash.has_key?(:name)
           id   = hash.delete(:id) || next_id
           name = hash.delete(:name)
           meta = hash
-          return id, name, (meta.blank? ? nil : meta)
+          return id, name, (meta.empty? ? nil : meta)
         elsif hash.keys.first.is_a?(Fixnum)
           return *Array(hash).first
         else

data/lib/active_enum/extensions.rb

@@ -85,6 +85,8 @@ module ActiveEnum
 
             enum = self.class.active_enum_for(:#{attribute})
             case arg
+            when nil
+              #{ActiveEnum.use_name_as_value ? 'enum[value]' : 'value' }
             when :id
               value if enum[value]
             when :name
@@ -93,8 +95,6 @@ module ActiveEnum
               enum
             when Symbol
               (enum.meta(value) || {})[arg]
-            else
-              #{ActiveEnum.use_name_as_value ? 'enum[value]' : 'value' }
             end
           end
         DEF
@@ -110,10 +110,9 @@ module ActiveEnum
         class_eval <<-DEF
           def #{attribute}=(arg)
             if arg.is_a?(Symbol)
-              value = self.class.active_enum_for(:#{attribute})[arg]
-              super(value)
+              super self.class.active_enum_for(:#{attribute})[arg]
             else
-              super(arg)
+              super arg
             end
           end
         DEF
@@ -126,9 +125,9 @@ module ActiveEnum
       #
       def define_active_enum_question_method(attribute)
         class_eval <<-DEF
-          def #{attribute}?(*args)
-            if args.first
-              #{attribute} == self.class.active_enum_for(:#{attribute})[args.first]
+          def #{attribute}?(arg=nil)
+            if arg
+              self.#{attribute} == self.class.active_enum_for(:#{attribute})[arg]
             else
               super()
             end

data/lib/active_enum/storage/i18n_store.rb

@@ -5,12 +5,12 @@ module ActiveEnum
     class I18nStore < MemoryStore
       def get_by_id(id)
         row = _values.assoc(id)
-        [ id, translate(row[1]) ] if row
+        [ id, translate(row[1]), row[2] ].compact if row
       end
 
       def get_by_name(name)
         row = _values.rassoc(name.to_s)
-        [ row[0], translate(row[1]) ] if row
+        [ row[0], translate(row[1]), row[2] ].compact if row
       end
 
       def values
@@ -28,7 +28,7 @@ module ActiveEnum
       end
 
       def translate(key)
-        I18n.translate key, :scope => i18n_scope
+        I18n.translate key, :scope => i18n_scope, :default => key
       end
 
     end

data/lib/active_enum/version.rb

@@ -1,3 +1,3 @@
 module ActiveEnum
-  VERSION = '0.9.9'
+  VERSION = '0.9.11'
 end

data/spec/active_enum/storage/i18n_store_spec.rb

@@ -78,23 +78,34 @@ describe ActiveEnum::Storage::I18nStore do
   describe "#get_by_id" do
     before do
       I18n.backend.store_translations :en, :active_enum => { enum_key => { 'test' => 'Testing' } }
+      I18n.locale = :en
     end
 
     it 'should return the value for a given id' do
-      I18n.locale = :en
-
       store.set 1, 'test'
       store.get_by_id(1).should == [1, 'Testing']
     end
 
+    it 'should return the value with meta for a given id' do
+      store.set 1, 'test', :description => 'meta'
+      store.get_by_id(1).should == [1, 'Testing', { :description => 'meta' }]
+    end
+
     it 'should return nil when id not found' do
       store.get_by_id(1).should be_nil
     end
+
+    it 'should return key when translation missing' do
+      I18n.locale = :ja
+      store.set 1, 'test'
+      store.get_by_id(1).should == [1, 'test']
+    end
   end
 
   describe "#get_by_name" do
     before do
       I18n.backend.store_translations :en, :active_enum => { enum_key => { 'test' => 'Testing' } }
+      I18n.locale = :en
     end
 
     it 'should return the value for a given name' do
@@ -102,6 +113,11 @@ describe ActiveEnum::Storage::I18nStore do
       store.get_by_name('test').should == [1, 'Testing']
     end
 
+    it 'should return the value with meta for a given name' do
+      store.set 1, 'test', :description => 'meta'
+      store.get_by_name('test').should == [1, 'Testing', { :description => 'meta' }]
+    end
+
     it 'should return nil when name not found' do
       store.get_by_name('test').should be_nil
     end

data/spec/active_enum/storage/memory_store_spec.rb

@@ -54,8 +54,8 @@ describe ActiveEnum::Storage::MemoryStore do
 
   describe "#get_by_id" do
     it 'should return the value for a given id' do
-      store.set 1, 'test name'
-      store.get_by_id(1).should == [1, 'test name']
+      store.set 1, 'test name', :description => 'meta'
+      store.get_by_id(1).should == [1, 'test name', {:description => "meta"}]
     end
 
     it 'should return nil when id not found' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_enum
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 45
   prerelease: 
   segments: 
   - 0
   - 9
-  - 9
-  version: 0.9.9
+  - 11
+  version: 0.9.11
 platform: ruby
 authors: 
 - Adam Meehan
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-08 00:00:00 +10:00
+date: 2012-08-18 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,6 +29,8 @@ dependencies:
         - 3
         - 0
         version: "3.0"
+  name: activesupport
+  prerelease: false
   type: :runtime
   version_requirements: *id001
 description: Define enum classes in Rails and use them to enumerate ActiveRecord attributes