active_enum 0.8.1 → 0.8.2

data/CHANGELOG

@@ -1,3 +1,10 @@
+[0.8.2] : 2010-08-01
+- Fix method name clash of enum_for which is defined on Object
+- Refactor extension method definitions
+
+[0.8.1] : 2010-07-19
+- Enumerated attribute read method can access meta data using key as argument
+
 [0.8.0] : 2010-07-19
 - Added pluggable storage API
 - Added memory store as default storage

data/README.rdoc

@@ -3,7 +3,7 @@
 Define enum classes in Rails and use them to enumerate ActiveRecord attributes. Brings together some ideas
 of similar plugins that I liked and does it they way I prefer.
 
-Enum values are stored in memory at the moment but I plan to add database and yaml.
+Enum values are stored in memory at the moment but I plan to add database and possibly others.
 
 == Install
 
@@ -135,7 +135,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
 
@@ -163,15 +163,15 @@ All defined enum classes are stored in ActiveEnum.enum_classes array if you need
 
 You can make an existing model class behave like an enum class with acts_as_enum
 
-  class User < ActiveRecord::Base
-    acts_as_enum :name_column => 'first_name'
+  class Country < ActiveRecord::Base
+    acts_as_enum :name_column => 'short_name'
   end
 
 Giving you the familiar enum methods
 
-  User[1]
-  User['Dave']
-  User.to_select
+  Country[1]
+  Country['Australia']
+  Country.to_select
 
 
 === Form Helpers

data/active_enum.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_enum}
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Meehan"]
   s.autorequire = %q{active_enum}
-  s.date = %q{2010-07-19}
+  s.date = %q{2010-08-01}
   s.description = %q{Define enum classes in Rails and use them to enumerate ActiveRecord attributes}
   s.email = %q{adam.meehan@gmail.com}
   s.extra_rdoc_files = ["README.rdoc"]

data/lib/active_enum.rb

@@ -17,11 +17,7 @@ module ActiveEnum
   class Configuration
     def enum(name, &block)
       class_name = name.to_s.camelize
-      class_def = <<-end_eval
-        class #{class_name} < ActiveEnum::Base
-        end
-      end_eval
-      eval(class_def, TOPLEVEL_BINDING)
+      eval("class #{class_name} < ActiveEnum::Base; end", TOPLEVEL_BINDING)
       new_enum = Module.const_get(class_name)
       new_enum.class_eval(&block)
     end

data/lib/active_enum/base.rb

@@ -21,9 +21,9 @@ module ActiveEnum
 
       # Order enum values. Allowed values are :asc, :desc or :as_defined
       #
-			def order(order)
-				@order = order
-			end
+      def order(order)
+        @order = order
+      end
 
       def all
         store.values

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,24 +63,26 @@ module ActiveEnum
       #   user.sex(:meta_key)
       #
       def define_active_enum_read_method(attribute)
-        define_method("#{attribute}") do |*arg|
-          arg   = arg.first
-          value = super()
-          enum  = self.class.enum_for(attribute)
+        class_eval <<-DEF
+          def #{attribute}(arg=nil)
+            value = super()
+            return if value.nil? && arg.nil?
 
-          case arg
-          when :id
-            value if enum[value]
-          when :name
-            enum[value]
-          when :enum
-            enum
-          when Symbol
-            (enum.meta(value) || {})[arg]
-          else
-            ActiveEnum.use_name_as_value ? enum[value] : value
+            enum  = self.class.active_enum_for(:#{attribute})
+            case arg
+            when :id
+              value if enum[value]
+            when :name
+              enum[value]
+            when :enum
+              enum
+            when Symbol
+              (enum.meta(value) || {})[arg]
+            else
+              #{ActiveEnum.use_name_as_value ? 'enum[value]' : 'value' }
+            end
           end
-        end
+        DEF
       end
 
       # Define write method to also handle enum value
@@ -89,15 +91,16 @@ module ActiveEnum
       #   user.sex = :male
       #
       def define_active_enum_write_method(attribute)
-        define_method("#{attribute}=") do |arg|
-          enum = self.class.enum_for(attribute)
-          if arg.is_a?(Symbol)
-            value = enum[arg]
-            super(value)
-          else
-            super(arg)
+        class_eval <<-DEF
+          def #{attribute}=(arg)
+            if arg.is_a?(Symbol)
+              value = self.class.active_enum_for(:#{attribute})[arg]
+              super(value)
+            else
+              super(arg)
+            end
           end
-        end
+        DEF
       end
 
       # Define question method to check enum value against attribute value
@@ -108,7 +111,7 @@ module ActiveEnum
         define_method("#{attribute}?") 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
             super
           end

data/lib/active_enum/form_helpers/formtastic.rb

@@ -6,12 +6,12 @@ module ActiveEnum
       end
 
       def default_input_type_with_active_enum(method, options)
-        return :enum if @object.class.enum_for(method)
-        default_input_type_without_active_enum
+        return :enum if @object.class.respond_to?(:active_enum_for) && @object.class.active_enum_for(method)
+        default_input_type_without_active_enum(method, options)
       end
 
       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/form_helpers/simple_form.rb

@@ -7,7 +7,9 @@ module ActiveEnum
         end
 
         def default_input_type_with_active_enum
-          return :enum if @options[:as].nil? && object.class.enum_for(attribute_name)
+          return :enum if @options[:as].nil? &&
+            object.class.respond_to?(:active_enum_for) &&
+            object.class.active_enum_for(attribute_name)
           default_input_type_without_active_enum
         end
       end
@@ -16,7 +18,7 @@ module ActiveEnum
 
         def initialize(builder)
           super
-          raise "Attribute '#{attribute_name}' has no enum class" unless enum = object.class.enum_for(attribute_name)
+          raise "Attribute '#{attribute_name}' has no enum class" unless enum = object.class.active_enum_for(attribute_name)
           builder.options[:collection] = enum.to_select
         end
         

data/lib/active_enum/version.rb

@@ -1,3 +1,3 @@
 module ActiveEnum
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 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
@@ -198,6 +198,13 @@ describe ActiveEnum::Extensions do
         ActiveEnum.use_name_as_value = true
       end
 
+      before do
+        reset_class Person do
+          enumerate :sex, :with => Sex
+        end
+        @person = Person.new(:sex =>1)
+      end
+
       it 'should return text name value for attribute' do
         @person.sex.should == 'Male'
       end

data/spec/active_enum/form_helpers/formtastic_spec.rb

@@ -38,6 +38,13 @@ describe 'ActiveEnum::FormHelpers::Formtastic' do
     }.should raise_error "Attribute 'attending' has no enum class"
   end
 
+  it "should not use enum input type if class does not support ActiveEnum" do
+    output = semantic_form_for(:not_active_record, NotActiveRecord.new, :url => people_path) do |f|
+      concat f.input(:name)
+    end
+    output.should have_selector('input#not_active_record_name')
+  end
+
   def people_path
     '/people'
   end

data/spec/active_enum/form_helpers/simple_form_spec.rb

@@ -39,6 +39,13 @@ describe 'ActiveEnum::FormHelpers::Simple' do
     }.should raise_error(StandardError, "Attribute 'attending' has no enum class")
   end
 
+  it "should not use enum input type if class does not support ActiveEnum" do
+    output = simple_form_for(:not_active_record, NotActiveRecord.new, :url => people_path) do |f|
+      concat f.input(:name)
+    end
+    output.should have_selector('input#not_active_record_name')
+  end
+
   def people_path
     '/people'
   end

data/spec/spec_helper.rb

@@ -23,6 +23,11 @@ require 'schema'
 
 class Person < ActiveRecord::Base; end
 
+class NotActiveRecord
+  include ActiveModel::Validations
+  attr_accessor :name
+end
+
 module SpecHelper
   def reset_class(klass, &block)
     name = klass.name.to_sym

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_enum
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: false
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Adam Meehan
@@ -15,7 +15,7 @@ autorequire: active_enum
 bindir: bin
 cert_chain: []
 
-date: 2010-07-19 00:00:00 +10:00
+date: 2010-08-01 00:00:00 +10:00
 default_executable: 
 dependencies: []