active_enum 0.7.0 → 0.7.1

data/lib/active_enum/form_helpers/formtastic.rb

@@ -1,6 +1,14 @@
 module ActiveEnum
   module FormHelpers
     module Formtastic
+      def self.included(base)
+        base.alias_method_chain :default_input_type, :active_enum
+      end
+
+      def default_input_type_with_active_enum(method, options)
+        return :enum if @object.class.enum_for(method)
+        default_input_type_without_active_enum
+      end
 
       def enum_input(method, options)
         raise "Attribute '#{method}' has no enum class" unless enum = @object.class.enum_for(method)

data/lib/active_enum/form_helpers/simple_form.rb

@@ -1,18 +1,33 @@
 module ActiveEnum
   module FormHelpers
-    class SimpleForm < SimpleForm::Inputs::CollectionInput
+    module SimpleForm
+      module BuilderExtension
+        def self.included(base)
+          base.alias_method_chain :default_input_type, :active_enum
+        end
 
-      def initialize(builder)
-        super
-        raise "Attribute '#{attribute_name}' has no enum class" unless enum = object.class.enum_for(attribute_name)
-        builder.options[:collection] = enum.to_select
+        def default_input_type_with_active_enum
+          return :enum if @options[:as].nil? && object.class.enum_for(attribute_name)
+          default_input_type_without_active_enum
+        end
+      end
+
+      class EnumInput < ::SimpleForm::Inputs::CollectionInput
+
+        def initialize(builder)
+          super
+          raise "Attribute '#{attribute_name}' has no enum class" unless enum = object.class.enum_for(attribute_name)
+          builder.options[:collection] = enum.to_select
+        end
+        
       end
-      
     end
   end
 end
 
 SimpleForm::FormBuilder.class_eval do
-  map_type :enum, :to => ActiveEnum::FormHelpers::SimpleForm
+  include ActiveEnum::FormHelpers::SimpleForm::BuilderExtension
+
+  map_type :enum, :to => ActiveEnum::FormHelpers::SimpleForm::EnumInput
   alias_method :collection_enum, :collection_select
 end

data/lib/active_enum/version.rb

@@ -1,3 +1,3 @@
 module ActiveEnum
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/spec/active_enum/form_helpers/formtastic_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'formtastic'
 require 'active_enum/form_helpers/formtastic'
 
-describe ActiveEnum::FormHelpers::Formtastic do
+describe 'ActiveEnum::FormHelpers::Formtastic' do
   include RSpec::Rails::HelperExampleGroup
   include Formtastic::SemanticFormHelper
 
@@ -16,15 +16,22 @@ describe ActiveEnum::FormHelpers::Formtastic do
     end
   end
 
-  it "should use enum class for select option values for enum input type" do
+  it "should use enum input type for enumerated attribute" do
     output = semantic_form_for(Person.new, :url => people_path) do |f|
-      concat f.input(:sex, :as => :enum)
+      concat f.input(:sex)
     end
     output.should have_selector('select#person_sex')
     output.should have_xpath('//option[@value=1]', :content => 'Male')
     output.should have_xpath('//option[@value=2]', :content => 'Female')
   end
 
+  it "should not use enum input type if :as option indicates other type" do
+    output = semantic_form_for(Person.new, :url => people_path) do |f|
+      concat f.input(:sex, :as => :string)
+    end
+    output.should have_selector('input#person_sex')
+  end
+
   it "should raise error if attribute for enum input is not enumerated" do
     lambda {
       semantic_form_for(Person.new, :url => people_path) {|f| f.input(:attending, :as => :enum) }

data/spec/active_enum/form_helpers/simple_form_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'simple_form'
 require 'active_enum/form_helpers/simple_form'
 
-describe ActiveEnum::FormHelpers do
+describe 'ActiveEnum::FormHelpers::Simple' do
   include RSpec::Rails::HelperExampleGroup
   include SimpleForm::ActionViewExtensions::FormHelper
 
@@ -17,15 +17,22 @@ describe ActiveEnum::FormHelpers do
     end
   end
 
-  it "should use enum class for select option values for enum input type" do
+  it "should use enum input type for enumerated attribute" do
     output = simple_form_for(Person.new, :url => people_path) do |f|
-      concat f.input(:sex, :as => :enum)
+      concat f.input(:sex)
     end
     output.should have_selector('select#person_sex')
     output.should have_xpath('//option[@value=1]', :content => 'Male')
     output.should have_xpath('//option[@value=2]', :content => 'Female')
   end
 
+  it "should not use enum input type if :as option indicates other type" do
+    output = simple_form_for(Person.new, :url => people_path) do |f|
+      concat f.input(:sex, :as => :string)
+    end
+    output.should have_selector('input#person_sex')
+  end
+
   it "should raise error if attribute for enum input is not enumerated" do
     lambda {
       simple_form_for(Person.new, :url => people_path) {|f| f.input(:attending, :as => :enum) }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_enum
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 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-07-02 00:00:00 +10:00
 default_executable: 
 dependencies: []