active_enum 0.4.1 → 0.5.0

data/README.rdoc

@@ -35,6 +35,15 @@ Beware that if you change the order of values defined in an enum which don't hav
 This could corrupt your data if the enum values have been stored in a model record, as they will no longer map to
 the original enum.
 
+You can also define the sort order of returned values
+
+  class Sex < ActiveEnum::Base
+    order :desc
+
+    value :id => 1, :name => 'Male'
+    value :id => 2, :name => 'Female'
+  end
+
 Enum class usage
 
   Sex[1]        # => 'Male'

data/lib/active_enum/acts_as_enum.rb

@@ -14,7 +14,7 @@ module ActiveEnum
         named_scope :enum_values,
                       :select     => "#{primary_key}, #{active_enum_options[:name_column]}",
                       :conditions => active_enum_options[:conditions],
-                      :order      => active_enum_options[:order]
+                      :order      => "#{primary_key} #{active_enum_options[:order]}"
       end
 
       def ids

data/lib/active_enum/base.rb

@@ -19,9 +19,15 @@ module ActiveEnum
         check_duplicate(id, enum_value[:name])
 
         @values << [id, enum_value[:name]]
-        @values.sort! {|a,b| a[0] <=> b[0] }
+				sort_values!
       end
 
+      # order enum values using :asc or :desc
+      #
+			def order(order)
+				@order = order
+			end
+
       def all
         @values || []
       end
@@ -35,7 +41,7 @@ module ActiveEnum
       end
 
       def to_select
-        @values.map {|v| [v[1], v[0]] }
+				@values.map {|v| [v[1], v[0]] }
       end
 
       def [](index)
@@ -70,6 +76,15 @@ module ActiveEnum
         end
       end
 
+			def sort_values!
+				case (@order || :asc)
+				when :asc
+					@values.sort! {|a,b| a[0] <=> b[0] }
+				when :desc
+					@values.sort! {|a,b| b[0] <=> a[0] }
+				end
+			end
+
     end
 
   end

data/lib/active_enum/version.rb

@@ -1,3 +1,3 @@
 module ActiveEnum
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

data/spec/active_enum/acts_as_enum_spec.rb

@@ -6,23 +6,31 @@ end
 
 describe ActiveEnum::ActsAsEnum do
   before(:all) do
-    @person = Person.create!(:first_name => 'Dave', :last_name => 'Smith')
+    Person.create!(:first_name => 'Dave', :last_name => 'Smith')
+    Person.create!(:first_name => 'John', :last_name => 'Doe')
   end
 
   it 'return name column value when passing id to [] method' do
-    Person[@person.id].should == @person.first_name
+    Person[1].should == 'Dave'
   end
 
   it 'return id column value when passing string name to [] method' do
-    Person['Dave'].should == @person.id
-    Person['dave'].should == @person.id
+    Person['Dave'].should == 1
+    Person['dave'].should == 1
   end
 
   it 'return id column value when passing symbol name to [] method' do
-    Person[:dave].should == @person.id
+    Person[:dave].should == 1
   end
 
   it 'should return array for select helpers from to_select' do
-    Person.to_select.should == [[@person.first_name, @person.id]]
+    Person.to_select.should == [['Dave', 1], ['John', 2]]
+  end
+
+  it 'should return sorted array from order value for select helpers from to_select' do
+    Person.class_eval do
+      acts_as_enum :name_column => 'first_name', :order => :desc
+    end
+    Person.to_select.should == [['John', 2], ['Dave', 1]] 
   end
 end

data/spec/active_enum/base_spec.rb

@@ -60,6 +60,15 @@ describe ActiveEnum::Base do
     enum.all.first[0].should == 1
   end
 
+  it 'should return sorted values by id using order setting from :all' do
+    enum = define_enum do
+			order :desc
+      value :id => 1, :name => 'Name 1'
+      value :id => 2, :name => 'Name 2'
+    end
+    enum.all.first[0].should == 2
+  end
+
   it 'should return array of ids' do
     enum = define_enum do
       value :id => 1, :name => 'Name 1'
@@ -113,6 +122,15 @@ describe ActiveEnum::Base do
     enum.to_select.should == [['Name 1',1], ['Name 2',2]]
   end
 
+  it 'should return array sorted using order setting from to_select' do
+    enum = define_enum() do
+			order :desc
+      value :id => 1, :name => 'Name 1'
+      value :id => 2, :name => 'Name 2'
+    end
+    enum.to_select.should == [['Name 2',2], ['Name 1',1]]
+  end
+
   def define_enum(&block)
     Class.new(ActiveEnum::Base, &block)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_enum
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors: 
 - Adam Meehan
@@ -9,7 +9,7 @@ autorequire: active_enum
 bindir: bin
 cert_chain: []
 
-date: 2009-11-06 00:00:00 +11:00
+date: 2009-11-24 00:00:00 +11:00
 default_executable: 
 dependencies: []