active_enum 0.6.3 → 0.6.4

data/lib/active_enum/extensions.rb

@@ -26,8 +26,6 @@ module ActiveEnum
       #     enumerate :to, :from, :with => Sex
       #
       def enumerate(*attributes, &block)
-        define_attribute_methods unless generated_methods?
-
 				options = attributes.extract_options!
 				attributes.each do |attribute|
 					begin
@@ -64,6 +62,8 @@ module ActiveEnum
       #   user.sex(:enum)
       #
       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
@@ -91,6 +91,8 @@ module ActiveEnum
       #   user.sex = :male
       #
       def define_active_enum_write_method(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)
@@ -102,7 +104,7 @@ module ActiveEnum
           end
         end
 
-        alias_method_chain "#{attribute}=".to_sym, :enum
+        alias_method_chain :"#{attribute}=", :enum
       end
 
       # Define question method to check enum value against attribute value
@@ -110,6 +112,8 @@ module ActiveEnum
       #   user.sex?(:male)
       #
       def define_active_enum_question_method(attribute)
+        define_question_method(attribute) unless instance_method_already_implemented?("#{attribute}?")
+
         old_method = "#{attribute}_without_enum?"
         define_method("#{attribute}_with_enum?") do |*arg|
           arg = arg.first
@@ -119,7 +123,7 @@ module ActiveEnum
             send(old_method)
           end
         end
-        alias_method_chain "#{attribute}?".to_sym, :enum
+        alias_method_chain :"#{attribute}?", :enum
       end
 
     end

data/lib/active_enum/version.rb

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

data/spec/spec_helper.rb

@@ -20,9 +20,10 @@ module SpecHelper
   def reset_class(klass, &block)
     name = klass.name.to_sym
     Object.send(:remove_const, name)
-    Object.const_set(name, Class.new(ActiveRecord::Base))
+    eval "class #{klass}#{' < ' + klass.superclass.to_s if klass.superclass != Class}; end", TOPLEVEL_BINDING
     new_klass = Object.const_get(name)
     new_klass.class_eval &block if block_given?
+    new_klass
   end
 end
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: active_enum
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Adam Meehan
@@ -9,7 +14,7 @@ autorequire: active_enum
 bindir: bin
 cert_chain: []
 
-date: 2010-03-18 00:00:00 +11:00
+date: 2010-04-26 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -51,18 +56,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: active_enum
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Define enum classes in Rails and use them to enumerate ActiveRecord attributes