active_enum 0.5.0 → 0.5.1

data/lib/active_enum/acts_as_enum.rb

@@ -3,12 +3,13 @@ module ActiveEnum
   module ActsAsEnum
 
     def self.included(base)
-      base.extend ClassMethods
+      base.extend MacroMethods
     end
 
-    module ClassMethods
+    module MacroMethods
 
       def acts_as_enum(options={})
+        extend ClassMethods
         class_inheritable_accessor :active_enum_options
         self.active_enum_options = options.reverse_merge(:name_column => 'name')
         named_scope :enum_values,
@@ -17,6 +18,10 @@ module ActiveEnum
                       :order      => "#{primary_key} #{active_enum_options[:order]}"
       end
 
+    end
+
+    module ClassMethods
+
       def ids
         enum_values.map {|v| v.id }
       end

data/lib/active_enum/version.rb

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

data/spec/active_enum/acts_as_enum_spec.rb

@@ -4,33 +4,47 @@ class Person < ActiveRecord::Base
   acts_as_enum :name_column => 'first_name'
 end
 
+class TestPerson < ActiveRecord::Base
+  def self.extended_modules
+    class << self
+      self.included_modules
+    end
+  end
+end
+
 describe ActiveEnum::ActsAsEnum do
   before(:all) do
     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
+  it "should mixin enum class methods only when act_as_enum defined" do
+    TestPerson.extended_modules.should_not include(ActiveEnum::ActsAsEnum::ClassMethods)
+    TestPerson.acts_as_enum
+    TestPerson.extended_modules.should include(ActiveEnum::ActsAsEnum::ClassMethods)
+  end
+
+  it "should return name column value when passing id to [] method" do
     Person[1].should == 'Dave'
   end
 
-  it 'return id column value when passing string name to [] method' do
+  it "should return id column value when passing string name to [] method" do
     Person['Dave'].should == 1
     Person['dave'].should == 1
   end
 
-  it 'return id column value when passing symbol name to [] method' do
+  it "should return id column value when passing symbol name to [] method" do
     Person[:dave].should == 1
   end
 
-  it 'should return array for select helpers from to_select' do
+  it "should return array for select helpers from to_select" do
     Person.to_select.should == [['Dave', 1], ['John', 2]]
   end
 
-  it 'should return sorted array from order value for select helpers from to_select' do
+  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]] 
+    Person.to_select.should == [['John', 2], ['Dave', 1]]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_enum
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Adam Meehan
@@ -9,7 +9,7 @@ autorequire: active_enum
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 +11:00
+date: 2009-12-15 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -25,17 +25,17 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- lib/active_enum.rb
+- lib/active_enum/acts_as_enum.rb
 - lib/active_enum/base.rb
-- lib/active_enum/version.rb
 - lib/active_enum/extensions.rb
-- lib/active_enum/acts_as_enum.rb
-- spec/schema.rb
-- spec/active_enum_spec.rb
-- spec/spec_helper.rb
+- lib/active_enum/version.rb
+- lib/active_enum.rb
 - spec/active_enum/acts_as_enum_spec.rb
-- spec/active_enum/extensions_spec.rb
 - spec/active_enum/base_spec.rb
+- spec/active_enum/extensions_spec.rb
+- spec/active_enum_spec.rb
+- spec/schema.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/adzap/active_enum
 licenses: []
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: active_enum
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Define enum classes in Rails and use them to enumerate ActiveRecord attributes