active_enum 0.6.5 → 0.6.6

data/README.rdoc

@@ -124,7 +124,7 @@ You can check if the attribute value matches a particular enum value by passing
 
 A convenience method on the class is available to the enum class of any enumerated attribute
 
-  User.enum_for(:sex) # => Sex
+  User.active_enum_for(:sex) # => Sex
 
 === Bulk definition
 

data/lib/active_enum/extensions.rb

@@ -50,7 +50,7 @@ module ActiveEnum
 				end
       end
 
-      def enum_for(attribute)
+      def active_enum_for(attribute)
         self.enumerated_attributes[attribute.to_sym]
       end
 
@@ -63,13 +63,12 @@ module ActiveEnum
       #
       def define_active_enum_read_method(attribute)
         define_read_method(attribute, attribute.to_s, columns_hash[attribute.to_s]) unless instance_method_already_implemented?(attribute.to_s)
-
         old_method = "#{attribute}_without_enum"
         define_method("#{attribute}_with_enum") do |*arg|
           arg = arg.first
           value = send(old_method)
 
-          enum = self.class.enum_for(attribute)
+          enum = self.class.active_enum_for(attribute)
           case arg
           when :id
             value if enum[value]
@@ -91,11 +90,10 @@ module ActiveEnum
       #   user.sex = :male
       #
       def define_active_enum_write_method(attribute)
-				define_write_method(attribute) unless instance_method_already_implemented?("#{attribute}=")
-
+        define_write_method(attribute) unless instance_method_already_implemented?("#{attribute}")
         old_method = "#{attribute}_without_enum="
         define_method("#{attribute}_with_enum=") do |arg|
-          enum = self.class.enum_for(attribute)
+          enum = self.class.active_enum_for(attribute)
           if arg.is_a?(Symbol)
             value = enum[arg]
             send(old_method, value)
@@ -118,7 +116,7 @@ module ActiveEnum
         define_method("#{attribute}_with_enum?") do |*arg|
           arg = arg.first
           if arg
-            send(attribute) == self.class.enum_for(attribute)[arg]
+            send(attribute) == self.class.active_enum_for(attribute)[arg]
           else
             send(old_method)
           end

data/lib/active_enum/formtastic.rb

@@ -2,7 +2,7 @@ module ActiveEnum
   module Formtastic
 
     def enum_input(method, options)
-      raise "Attribute '#{method}' has no enum class" unless enum = @object.class.enum_for(method)
+      raise "Attribute '#{method}' has no enum class" unless enum = @object.class.active_enum_for(method)
       select_input(method, options.merge(:collection => enum.to_select))
     end
 

data/lib/active_enum/version.rb

@@ -1,3 +1,3 @@
 module ActiveEnum
-  VERSION = '0.6.5'
+  VERSION = '0.6.6'
 end

data/spec/active_enum/extensions_spec.rb

@@ -17,23 +17,23 @@ describe ActiveEnum::Extensions do
     ActiveRecord::Base.should respond_to(:enumerate)
   end
 
-  it 'should add class :enum_for method to ActiveRecord' do
-    ActiveRecord::Base.should respond_to(:enum_for)
+  it 'should add class :active_enum_for method to ActiveRecord' do
+    ActiveRecord::Base.should respond_to(:active_enum_for)
   end
 
   it 'should allow multiple attributes to be enumerated with same enum' do
     Person.class_eval do
       enumerate :attending, :staying, :with => Accepted
     end
-    Person.enum_for(:attending).should == Accepted
-    Person.enum_for(:staying).should == Accepted
+    Person.active_enum_for(:attending).should == Accepted
+    Person.active_enum_for(:staying).should == Accepted
   end
 
   it 'should allow implicit enumeration class from attribute name' do
     Person.class_eval do
       enumerate :sex
     end
-    Person.enum_for(:sex).should == Sex
+    Person.active_enum_for(:sex).should == Sex
   end
 
   it 'should create enum namespaced enum class from block' do
@@ -42,7 +42,7 @@ describe ActiveEnum::Extensions do
         value :id => 1, :name => 'Male'
       end
     end
-    Person.enum_for(:sex).should == Person::Sex
+    Person.active_enum_for(:sex).should == ::Person::Sex
   end
 
   it 'should raise error if implicit enumeration class cannot be found' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_enum
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Adam Meehan
@@ -15,7 +15,7 @@ autorequire: active_enum
 bindir: bin
 cert_chain: []
 
-date: 2010-06-24 00:00:00 +10:00
+date: 2010-08-06 00:00:00 +10:00
 default_executable: 
 dependencies: []