active_enum 0.9.0 → 0.9.1

data/CHANGELOG

@@ -1,3 +1,6 @@
+[0.9.1] : 2011-01-12
+- Fix SimpleForm helper for v1.3.0 with backwards compat.
+
 [0.9.0] : 2010-08-11
 - Full ActiveModel support for enumerate extension. Use ActiveEnum.extend_classes array to indicate classes to extend.
 - Added generator for initializer config file with all settings.

data/README.rdoc

@@ -7,7 +7,7 @@ Enum values are stored in memory at the moment but I plan to add database and po
 
 == Install
 
-From version 0.7 onwards this plugin will only have Rails 3 support. If you need Rails 2 compatibility, check the 0.6 branch.
+From version 0.7 onwards this plugin will only have Rails 3 support. If you need Rails 2 compatibility, {check the 0.6 branch}[https://github.com/adzap/active_enum/tree/0.6].
 
   gem install active_enum 
 

data/Rakefile

@@ -20,9 +20,7 @@ spec = Gem::Specification.new do |s|
   s.author = "Adam Meehan"
   s.email = "adam.meehan@gmail.com"
   s.homepage = "http://github.com/adzap/active_enum"
-
   s.require_path = 'lib'
-  s.autorequire = GEM_NAME
   s.files = %w(active_enum.gemspec MIT-LICENSE CHANGELOG README.rdoc Rakefile) + Dir.glob("{lib,spec}/**/*")
 end
 

data/active_enum.gemspec

@@ -2,16 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_enum}
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   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-08-11}
+  s.date = %q{2011-01-12}
   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"]
-  s.files = ["active_enum.gemspec", "MIT-LICENSE", "CHANGELOG", "README.rdoc", "Rakefile", "lib/active_enum", "lib/active_enum/acts_as_enum.rb", "lib/active_enum/base.rb", "lib/active_enum/extensions.rb", "lib/active_enum/form_helpers", "lib/active_enum/form_helpers/formtastic.rb", "lib/active_enum/form_helpers/simple_form.rb", "lib/active_enum/storage", "lib/active_enum/storage/abstract_store.rb", "lib/active_enum/storage/active_record_store.rb", "lib/active_enum/storage/memory_store.rb", "lib/active_enum/version.rb", "lib/active_enum.rb", "lib/generators", "lib/generators/active_enum", "lib/generators/active_enum/install_generator.rb", "lib/generators/active_enum/templates", "lib/generators/active_enum/templates/active_enum.rb", "spec/active_enum", "spec/active_enum/acts_as_enum_spec.rb", "spec/active_enum/base_spec.rb", "spec/active_enum/extensions_spec.rb", "spec/active_enum/form_helpers", "spec/active_enum/form_helpers/formtastic_spec.rb", "spec/active_enum/form_helpers/simple_form_spec.rb", "spec/active_enum/storage", "spec/active_enum/storage/active_record_store_spec.rb", "spec/active_enum/storage/memory_store_spec.rb", "spec/active_enum_spec.rb", "spec/schema.rb", "spec/spec_helper.rb"]
+  s.files = ["active_enum.gemspec", "MIT-LICENSE", "CHANGELOG", "README.rdoc", "Rakefile", "lib/active_enum", "lib/active_enum/acts_as_enum.rb", "lib/active_enum/base.rb", "lib/active_enum/extensions.rb", "lib/active_enum/form_helpers", "lib/active_enum/form_helpers/formtastic.rb", "lib/active_enum/form_helpers/simple_form.rb", "lib/active_enum/storage", "lib/active_enum/storage/abstract_store.rb", "lib/active_enum/storage/memory_store.rb", "lib/active_enum/version.rb", "lib/active_enum.rb", "lib/generators", "lib/generators/active_enum", "lib/generators/active_enum/install_generator.rb", "lib/generators/active_enum/templates", "lib/generators/active_enum/templates/active_enum.rb", "spec/active_enum", "spec/active_enum/acts_as_enum_spec.rb", "spec/active_enum/base_spec.rb", "spec/active_enum/extensions_spec.rb", "spec/active_enum/form_helpers", "spec/active_enum/form_helpers/formtastic_spec.rb", "spec/active_enum/form_helpers/simple_form_spec.rb", "spec/active_enum/storage", "spec/active_enum/storage/memory_store_spec.rb", "spec/active_enum_spec.rb", "spec/schema.rb", "spec/spec_helper.rb"]
   s.homepage = %q{http://github.com/adzap/active_enum}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{active_enum}

data/lib/active_enum.rb

@@ -1,10 +1,11 @@
 require 'active_enum/base'
 require 'active_enum/extensions'
-require 'active_enum/acts_as_enum'
+require 'active_enum/acts_as_enum' if defined?(ActiveRecord)
 require 'active_enum/storage/abstract_store'
-require 'active_enum/version'
 
 module ActiveEnum
+  autoload :VERSION, 'active_enum/version'
+
   mattr_accessor :enum_classes
   @@enum_classes = []
 
@@ -15,7 +16,7 @@ module ActiveEnum
   @@storage = :memory
 
   mattr_accessor :extend_classes
-  @@extend_classes = []
+  @@extend_classes = [ defined?(ActiveRecord) && ActiveRecord::Base ].compact
 
   def self.extend_classes=(klasses)
     @@extend_classes = klasses

data/lib/active_enum/acts_as_enum.rb

@@ -1,11 +1,6 @@
 module ActiveEnum
-
   module ActsAsEnum
 
-    def self.included(base)
-      base.extend MacroMethods
-    end
-
     module MacroMethods
 
       def acts_as_enum(options={})
@@ -58,4 +53,4 @@ module ActiveEnum
   end
 end
 
-ActiveRecord::Base.send :include, ActiveEnum::ActsAsEnum
+ActiveRecord::Base.extend ActiveEnum::ActsAsEnum::MacroMethods

data/lib/active_enum/base.rb

@@ -11,15 +11,19 @@ module ActiveEnum
         ActiveEnum.enum_classes << subclass
       end
 
-      # :id => 1, :name => 'Foo'
-      # :name => 'Foo'
-      # 1 => 'Foo'
+      # Define enum values.
+      #
+      # Examples:
+      #   value :id => 1, :name => 'Foo'
+      #   value :name => 'Foo' # implicit id, incrementing from 1.
+      #   value 1 => 'Foo'
       #
       def value(enum_value)
         store.set *id_and_name_and_meta(enum_value)
       end
 
-      # Order enum values. Allowed values are :asc, :desc or :as_defined
+      # Specify order enum values are returned. 
+      # Allowed values are :asc, :desc or :as_defined
       #
       def order(order)
         @order = order
@@ -29,18 +33,23 @@ module ActiveEnum
         store.values
       end
 
+      # Array of all enum id values
       def ids
         store.values.map {|v| v[0] }
       end
 
+      # Array of all enum name values
       def names
         store.values.map {|v| v[1] }
       end
 
+      # Return enum values in an array suitable to pass to a Rails form select helper.
       def to_select
 				store.values.map {|v| [v[1], v[0]] }
       end
 
+      # Access id or name value. Pass an id number to retrieve the name or
+      # a symbol or string to retrieve the matching id.
       def [](index)
         if index.is_a?(Fixnum)
           row = store.get_by_id(index)
@@ -51,6 +60,7 @@ module ActiveEnum
         end
       end
 
+      # Access any meta data defined for a given id or name. Returns a hash.
       def meta(index)
         row = if index.is_a?(Fixnum)
           store.get_by_id(index)

data/lib/active_enum/extensions.rb

@@ -13,6 +13,7 @@ module ActiveEnum
 
       # Declare an attribute to be enumerated by an enum class
       #
+      # Example:
       #   class Person < ActiveRecord::Base
       #     enumerate :sex, :with => Sex
       #     enumerate :sex # implies a Sex enum class exists
@@ -26,6 +27,7 @@ module ActiveEnum
       #     enumerate :to, :from, :with => Sex
       #
       def enumerate(*attributes, &block)
+        self.enumerated_attributes ||= {}
 				options = attributes.extract_options!
 				attributes.each do |attribute|
 					begin
@@ -51,11 +53,12 @@ module ActiveEnum
       end
 
       def active_enum_for(attribute)
-        self.enumerated_attributes[attribute.to_sym]
+        self.enumerated_attributes && self.enumerated_attributes[attribute.to_sym]
       end
 
       # Define read method to allow an argument for the enum component
       #
+      # Examples:
       #   user.sex
       #   user.sex(:id)
       #   user.sex(:name)
@@ -87,6 +90,7 @@ module ActiveEnum
 
       # Define write method to also handle enum value
       #
+      # Examples:
       #   user.sex = 1
       #   user.sex = :male
       #
@@ -105,6 +109,7 @@ module ActiveEnum
 
       # Define question method to check enum value against attribute value
       #
+      # Example:
       #   user.sex?(:male)
       #
       def define_active_enum_question_method(attribute)

data/lib/active_enum/form_helpers/formtastic.rb

@@ -1,10 +1,6 @@
 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.respond_to?(:active_enum_for) && @object.class.active_enum_for(method)
         default_input_type_without_active_enum(method, options)
@@ -19,4 +15,7 @@ module ActiveEnum
   end
 end
 
-Formtastic::SemanticFormBuilder.send :include, ActiveEnum::FormHelpers::Formtastic
+Formtastic::SemanticFormBuilder.class_eval do
+  include ActiveEnum::FormHelpers::Formtastic
+  alias_method_chain :default_input_type, :active_enum
+end

data/lib/active_enum/form_helpers/simple_form.rb

@@ -2,24 +2,26 @@ module ActiveEnum
   module FormHelpers
     module SimpleForm
       module BuilderExtension
-        def self.included(base)
-          base.alias_method_chain :default_input_type, :active_enum
-        end
 
-        def default_input_type_with_active_enum
-          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
+        def default_input_type_with_active_enum(*args, &block)
+          return :enum if (args.last.is_a?(Hash) ? args.last[:as] : @options[:as]).nil? &&
+                          object.class.respond_to?(:active_enum_for) &&
+                          object.class.active_enum_for(args.first || @attribute_name)
+          default_input_type_without_active_enum(*args, &block)
         end
+
       end
 
       class EnumInput < ::SimpleForm::Inputs::CollectionInput
 
-        def initialize(builder)
+        def initialize(*args)
           super
           raise "Attribute '#{attribute_name}' has no enum class" unless enum = object.class.active_enum_for(attribute_name)
-          builder.options[:collection] = enum.to_select
+          if respond_to?(:input_options)
+            input_options[:collection] = enum.to_select
+          else
+            @builder.options[:collection] = enum.to_select
+          end
         end
         
       end
@@ -32,4 +34,5 @@ SimpleForm::FormBuilder.class_eval do
 
   map_type :enum, :to => ActiveEnum::FormHelpers::SimpleForm::EnumInput
   alias_method :collection_enum, :collection_select
+  alias_method_chain :default_input_type, :active_enum
 end

data/lib/active_enum/version.rb

@@ -1,3 +1,3 @@
 module ActiveEnum
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/lib/generators/active_enum/templates/active_enum.rb

@@ -4,8 +4,8 @@
 
 ActiveEnum.setup do |config|
 
-  # Extend classes to add enumerate method 
-  config.extend_classes = [ ActiveRecord::Base ]
+  # Extend classes to add enumerate method
+  # config.extend_classes = [ ActiveRecord::Base ]
 
   # Return name string as value for attribute method
   # config.use_name_as_value = false

data/spec/active_enum/acts_as_enum_spec.rb

@@ -1,18 +1,18 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-class Person < ActiveRecord::Base
-  acts_as_enum :name_column => 'first_name'
-end
+describe ActiveEnum::ActsAsEnum do
+  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
+  class TestPerson < ActiveRecord::Base
+    def self.extended_modules
+      class << self
+        self.included_modules
+      end
     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')
@@ -42,9 +42,7 @@ describe ActiveEnum::ActsAsEnum do
   end
 
   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.acts_as_enum :name_column => 'first_name', :order => :desc
     Person.to_select.should == [['John', 2], ['Dave', 1]]
   end
 end

data/spec/active_enum/base_spec.rb

@@ -2,13 +2,13 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe ActiveEnum::Base do
 
-  context ".store" do
+  describe ".store" do
     it 'should load the storage class instance using the storage setting' do
       ActiveEnum::Base.send(:store).should be_instance_of(ActiveEnum::Storage::MemoryStore)
     end
   end
 
-  context ".enum_classes" do
+  describe ".enum_classes" do
     it 'should return all enum classes defined use class definition' do
       ActiveEnum.enum_classes = []
       class NewEnum < ActiveEnum::Base; end
@@ -24,13 +24,21 @@ describe ActiveEnum::Base do
     end
   end
 
-  context ".all" do
+  describe ".all" do
     it 'should return an empty array when no values defined' do
       define_enum.all.should == []
     end
+
+    it 'should return an array of arrays with all values defined as [id, name]' do
+      enum = define_enum do
+        value :name => 'Name 1'
+        value :name => 'Name 2'
+      end
+      enum.all.should == [[1,'Name 1'], [2, 'Name 2']]
+    end
   end
 
-  context ".value" do
+  describe ".value" do
     it 'should allow me to define a value with an id and name' do
       enum = define_enum do
         value :id => 1, :name => 'Name'
@@ -86,7 +94,7 @@ describe ActiveEnum::Base do
     end
   end
 
-  context ".meta" do
+  describe ".meta" do
     it 'should return meta values hash for a given index value' do
       enum = define_enum do
         value :id => 1, :name => 'Name', :description => 'extra'
@@ -132,7 +140,7 @@ describe ActiveEnum::Base do
     end
   end
 
-  context ".ids" do
+  describe ".ids" do
     it 'should return array of ids' do
       enum = define_enum do
         value :id => 1, :name => 'Name 1'
@@ -142,7 +150,7 @@ describe ActiveEnum::Base do
     end
   end
 
-  context ".names" do
+  describe ".names" do
     it 'should return array of names' do
       enum = define_enum do
         value :id => 1, :name => 'Name 1'
@@ -181,7 +189,7 @@ describe ActiveEnum::Base do
 
   end
 
-  context ".to_select" do
+  describe ".to_select" do
     it 'should return array for select helpers' do
       enum = define_enum do
         value :id => 1, :name => 'Name 1'

data/spec/active_enum/extensions_spec.rb

@@ -1,17 +1,16 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-class Sex < ActiveEnum::Base
-  value :id => 1, :name => 'Male'
-  value :id => 2, :name => 'Female'
-end
-
-class Accepted < ActiveEnum::Base
-  value :id => 0, :name => 'No'
-  value :id => 1, :name => 'Definitely'
-  value :id => 2, :name => 'Maybe'
-end
-
 describe ActiveEnum::Extensions do
+  class Sex < ActiveEnum::Base
+    value :id => 1, :name => 'Male'
+    value :id => 2, :name => 'Female'
+  end
+
+  class Accepted < ActiveEnum::Base
+    value :id => 0, :name => 'No'
+    value :id => 1, :name => 'Definitely'
+    value :id => 2, :name => 'Maybe'
+  end
 
   it 'should add class :enumerate method to ActiveRecord' do
     ActiveRecord::Base.should respond_to(:enumerate)
@@ -22,109 +21,99 @@ describe ActiveEnum::Extensions do
   end
 
   it 'should allow multiple attributes to be enumerated with same enum' do
-    Person.class_eval do
-      enumerate :attending, :staying, :with => Accepted
-    end
+    Person.enumerate :attending, :staying, :with => 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.enumerate :sex
     Person.active_enum_for(:sex).should == Sex
   end
 
   it 'should create enum namespaced enum class from block' do
-    Person.class_eval do
-      enumerate :sex do
-        value :id => 1, :name => 'Male'
-      end
+    Person.enumerate :sex do
+      value :id => 1, :name => 'Male'
     end
     Person.active_enum_for(:sex).should == ::Person::Sex
   end
 
   it 'should raise error if implicit enumeration class cannot be found' do
-    lambda do
-      Person.class_eval { enumerate :first_name }
-    end.should raise_error(ActiveEnum::EnumNotFound)
+    expect {
+      Person.enumerate :first_name
+    }.should raise_error(ActiveEnum::EnumNotFound)
   end
 
-  describe "attribute" do
+  context "attribute" do
+    let(:person) { Person.new(:sex => 1) }
+
     before(:all) do
       reset_class Person do
         enumerate :sex, :with => Sex
       end
     end
 
-    before do
-      @person = Person.new(:sex =>1)
-    end
-
-    describe "with value" do
+    context "with value" do
       it 'should return value with no arg' do
-        @person.sex.should == 1
+        person.sex.should == 1
       end
 
       it 'should return enum id for value' do
-        @person.sex(:id).should == 1
+        person.sex(:id).should == 1
       end
 
       it 'should return enum name for value' do
-        @person.sex(:name).should == 'Male'
+        person.sex(:name).should == 'Male'
       end
 
       it 'should return enum class for attribute' do
-        @person.sex(:enum).should == Sex
+        person.sex(:enum).should == Sex
       end
     end
 
-    describe "with nil value" do
-      before do
-        @person.sex = nil
-      end
+    context "with nil value" do
+      let(:person) { Person.new(:sex => nil) }
 
       it 'should return nil with no arg' do
-        @person.sex.should be_nil
+        person.sex.should be_nil
       end
 
       it 'should return nil enum id' do
-        @person.sex(:id).should be_nil
+        person.sex(:id).should be_nil
       end
 
       it 'should return nil enum name' do
-        @person.sex(:name).should be_nil
+        person.sex(:name).should be_nil
       end
 
       it 'should return enum class for attribute' do
-        @person.sex(:enum).should == Sex
+        person.sex(:enum).should == Sex
       end
     end
 
-    describe "with undefined value" do
-      before do
-        @person.sex = -1
-      end
+    context "with undefined value" do
+      let(:person) { Person.new(:sex => -1) }
 
       it 'should return value with no arg' do
-        @person.sex.should == -1
+        person.sex.should == -1
       end
 
       it 'should return nil enum id' do
-        @person.sex(:id).should be_nil
+        person.sex(:id).should be_nil
       end
 
       it 'should return nil enum name' do
-        @person.sex(:name).should be_nil
+        person.sex(:name).should be_nil
       end
 
       it 'should return enum class for attribute' do
-        @person.sex(:enum).should == Sex
+        person.sex(:enum).should == Sex
       end
     end
 
-    describe "with meta data" do
+    context "with meta data" do
+      let(:person) { Person.new(:sex =>1) }
+
       before(:all) do
         reset_class Person do
           enumerate :sex do
@@ -134,84 +123,72 @@ describe ActiveEnum::Extensions do
         end
       end
 
-      before do
-        @person = Person.new(:sex =>1)
-      end
-
       it 'should return meta value for existing key' do
-        @person.sex(:description).should == 'Man'
+        person.sex(:description).should == 'Man'
       end
 
       it 'should return nil for missing meta value' do
-        @person.sex(:nonexistent).should be_nil
+        person.sex(:nonexistent).should be_nil
       end
 
       it 'should return nil for missing index' do
-        @person.sex = nil
-        @person.sex(:description).should be_nil
+        person.sex = nil
+        person.sex(:description).should be_nil
       end
     end
 
-    describe "question method" do
-      before do
-        @person.sex = 1
-      end
-
+    context "question method" do
       it 'should return normal value without arg' do
-        @person.sex?.should be_true
-        @person.sex = nil
-        @person.sex?.should be_false
+        person.sex?.should be_true
+        person.sex = nil
+        person.sex?.should be_false
       end
 
       it 'should return true if string name matches for id value' do
-        @person.sex?("Male").should be_true
+        person.sex?("Male").should be_true
       end
 
       it 'should return true if symbol name matches for id value' do
-        @person.sex?(:male).should be_true
-        @person.sex?(:Male).should be_true
+        person.sex?(:male).should be_true
+        person.sex?(:Male).should be_true
       end
 
       it 'should return false if name does not match for id value' do
-        @person.sex?("Female").should be_false
-        @person.sex?(:female).should be_false
-        @person.sex?(:Female).should be_false
+        person.sex?("Female").should be_false
+        person.sex?(:female).should be_false
+        person.sex?(:Female).should be_false
       end
     end
 
-    describe "with value as enum name symbol" do
+    context "with value as enum name symbol" do
 
       it 'should store id value when valid enum name' do
-        @person.sex = :female
-        @person.sex.should == 2
+        person.sex = :female
+        person.sex.should == 2
       end
 
       it 'should store nil value when invalid enum name' do
-        @person.sex = :invalid
-        @person.sex.should == nil
+        person.sex = :invalid
+        person.sex.should == nil
       end
 
     end
 
-    describe "with value as enum name" do
-      before(:all) do
-        ActiveEnum.use_name_as_value = true
-      end
+    context "with value as enum name" do
+      before(:all) { ActiveEnum.use_name_as_value = true }
+      let(:person) { Person.new(:sex =>1) }
 
-      before do
+      before do 
         reset_class Person do
           enumerate :sex, :with => Sex
         end
-        @person = Person.new(:sex =>1)
-      end
+      end 
 
       it 'should return text name value for attribute' do
-        @person.sex.should == 'Male'
+        person.sex.should == 'Male'
       end
 
-      after(:all) do
-        ActiveEnum.use_name_as_value = false
-      end
+      after(:all) { ActiveEnum.use_name_as_value = false }
     end
 
   end

data/spec/active_enum/form_helpers/formtastic_spec.rb

@@ -3,8 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'formtastic'
 require 'active_enum/form_helpers/formtastic'
 
-describe 'ActiveEnum::FormHelpers::Formtastic' do
-  include RSpec::Rails::HelperExampleGroup
+describe ActiveEnum::FormHelpers::Formtastic, :type => :helper do
   include Formtastic::SemanticFormHelper
 
   before do
@@ -25,6 +24,15 @@ describe 'ActiveEnum::FormHelpers::Formtastic' do
     output.should have_xpath('//option[@value=2]', :content => 'Female')
   end
 
+  it "should use explicit :enum input type" do
+    output = semantic_form_for(Person.new, :url => people_path) do |f|
+      concat f.input(:sex, :as => :enum)
+    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)
@@ -33,18 +41,27 @@ describe 'ActiveEnum::FormHelpers::Formtastic' do
   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) }
+    expect {
+      semantic_form_for(Person.new, :url => people_path) do |f|
+        f.input(:attending, :as => :enum)
+      end
     }.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|
+    output = semantic_form_for(NotActiveRecord.new, :as => :not_active_record, :url => people_path) do |f|
       concat f.input(:name)
     end
     output.should have_selector('input#not_active_record_name')
   end
 
+  it "should allow non-enum fields to use default input determination" do
+    output = semantic_form_for(Person.new, :url => people_path) do |f|
+      concat f.input(:first_name)
+    end
+    output.should have_selector('input#person_first_name')
+  end
+
   def people_path
     '/people'
   end

data/spec/active_enum/form_helpers/simple_form_spec.rb

@@ -3,8 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'simple_form'
 require 'active_enum/form_helpers/simple_form'
 
-describe 'ActiveEnum::FormHelpers::Simple' do
-  include RSpec::Rails::HelperExampleGroup
+describe ActiveEnum::FormHelpers::SimpleForm, :type => :helper do
   include SimpleForm::ActionViewExtensions::FormHelper
 
   before do
@@ -26,6 +25,15 @@ describe 'ActiveEnum::FormHelpers::Simple' do
     output.should have_xpath('//option[@value=2]', :content => 'Female')
   end
 
+  it "should use explicit :enum input type" do
+    output = simple_form_for(Person.new, :url => people_path) do |f|
+      concat f.input(:sex, :as => :enum)
+    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)
@@ -34,18 +42,27 @@ describe 'ActiveEnum::FormHelpers::Simple' do
   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) }
-    }.should raise_error(StandardError, "Attribute 'attending' has no enum class")
+    expect {
+      simple_form_for(Person.new, :url => people_path) do |f|
+        f.input(:attending, :as => :enum)
+      end
+    }.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 = simple_form_for(:not_active_record, NotActiveRecord.new, :url => people_path) do |f|
+    output = simple_form_for(NotActiveRecord.new, :as => :not_active_record, :url => people_path) do |f|
       concat f.input(:name)
     end
     output.should have_selector('input#not_active_record_name')
   end
 
+  it "should allow non-enum fields to use default input determination" do
+    output = simple_form_for(Person.new, :url => people_path) do |f|
+      concat f.input(:first_name)
+    end
+    output.should have_selector('input#person_first_name')
+  end
+
   def people_path
     '/people'
   end

data/spec/active_enum/storage/memory_store_spec.rb

@@ -6,7 +6,7 @@ class TestOtherAREnum < ActiveEnum::Base; end
 describe ActiveEnum::Storage::MemoryStore do
   attr_accessor :store
 
-  context '#set' do
+  describe '#set' do
     it 'should store value of id and name' do
       store.set 1, 'test name'
       store.values.should == [[1, 'test name']]
@@ -18,28 +18,28 @@ describe ActiveEnum::Storage::MemoryStore do
     end
 
     it 'should raise error if duplicate id' do
-      lambda {
+      expect {
         store.set 1, 'Name 1'
         store.set 1, 'Other Name'
       }.should raise_error(ActiveEnum::DuplicateValue)
     end
 
     it 'should raise error if duplicate name' do
-      lambda {
+      expect {
         store.set 1, 'Name 1'
         store.set 2, 'Name 1'
       }.should raise_error(ActiveEnum::DuplicateValue)
     end
 
     it 'should raise error if duplicate name matches title-case name' do
-      lambda {
+      expect {
         store.set 1, 'Name 1'
         store.set 2, 'name 1'
       }.should raise_error(ActiveEnum::DuplicateValue)
     end
   end
 
-  context "#values" do
+  describe "#values" do
     it 'should return array of stored values' do
       store.set 1, 'Name 1'
       store.values.should == [[1, 'Name 1']]
@@ -52,7 +52,7 @@ describe ActiveEnum::Storage::MemoryStore do
     end
   end
 
-  context "#get_by_id" do
+  describe "#get_by_id" do
     it 'should return the value for a given id' do
       store.set 1, 'test name'
       store.get_by_id(1).should == [1, 'test name']
@@ -63,7 +63,7 @@ describe ActiveEnum::Storage::MemoryStore do
     end
   end
 
-  context "#get_by_name" do
+  describe "#get_by_name" do
     it 'should return the value for a given name' do
       store.set 1, 'test name'
       store.get_by_name('test name').should == [1, 'test name']
@@ -79,7 +79,7 @@ describe ActiveEnum::Storage::MemoryStore do
     end
   end
 
-  context "sort!" do
+  describe "#sort!" do
     it 'should sort values ascending when passed :asc' do
       @order = :asc
       store.set 2, 'Name 2'

data/spec/active_enum_spec.rb

@@ -1,8 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "Bulk enum definitions" do
+describe ActiveEnum do
 
-  context ".define" do
+  describe ".define" do
     it 'should define enum constants using block' do
       ActiveEnum.define do
         enum(:foo) do
@@ -18,7 +18,7 @@ describe "Bulk enum definitions" do
     end
   end
 
-  context ".setup" do
+  describe ".setup" do
     before :all do
       @original = ActiveEnum.use_name_as_value
     end
@@ -34,9 +34,8 @@ describe "Bulk enum definitions" do
     end
   end
 
-  context ".extend_classes" do
+  describe ".extend_classes" do
     it 'should add enumerate extensions to given classes' do
-      ActiveEnum.extend_classes = [ActiveRecord::Base, NotActiveRecord]
       ActiveRecord::Base.should respond_to(:enumerate)
       NotActiveRecord.should respond_to(:enumerate)
     end

data/spec/schema.rb

@@ -1,5 +1,4 @@
 ActiveRecord::Schema.define(:version => 1) do
-
   create_table :people, :force => true do |t|    
     t.string   :first_name
     t.string   :last_name
@@ -11,16 +10,4 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table :sexes, :force => true do |t|
     t.string :name
   end
-
-  create_table :enums, :force => true do |t|
-    t.integer :enum_id
-    t.string :name
-    t.string :enum_type
-    t.string :meta
-    t.datetime :modified_at
-  end
-  add_index :enums, [:enum_id, :enum_type], :unique => true
-  add_index :enums, [:name, :enum_type]
-  add_index :enums, [:modified_at, :enum_type]
-
 end

data/spec/spec_helper.rb

@@ -1,9 +1,6 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'spec'))
-
-require 'rubygems'
-require 'rspec/autorun'
+require 'rspec'
 
+require 'rails'
 require 'active_record'
 require 'action_controller'
 require 'action_view'
@@ -11,15 +8,19 @@ require 'action_mailer'
 
 require 'active_enum'
 
-RAILS_ROOT = File.dirname(__FILE__)
+module Config
+  class Application < Rails::Application
+    config.generators do |g|
+      g.orm             :active_record
+      g.test_framework  :rspec, :fixture => false
+    end
+  end
+end
 
 require 'rspec/rails'
 
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.establish_connection({:adapter => 'sqlite3', :database => ':memory:'})
-ActiveRecord::Base.logger = Logger.new('/dev/null')
-
-ActiveEnum.extend_classes = [ActiveRecord::Base]
 
 require 'schema'
 
@@ -30,6 +31,8 @@ class NotActiveRecord
   attr_accessor :name
 end
 
+ActiveEnum.extend_classes = [ActiveRecord::Base, NotActiveRecord]
+
 module SpecHelper
   def reset_class(klass, &block)
     name = klass.name.to_sym

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: active_enum
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Adam Meehan
-autorequire: active_enum
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 +10:00
+date: 2011-01-12 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -39,7 +39,6 @@ files:
 - lib/active_enum/form_helpers/formtastic.rb
 - lib/active_enum/form_helpers/simple_form.rb
 - lib/active_enum/storage/abstract_store.rb
-- lib/active_enum/storage/active_record_store.rb
 - lib/active_enum/storage/memory_store.rb
 - lib/active_enum/version.rb
 - lib/active_enum.rb
@@ -50,7 +49,6 @@ files:
 - spec/active_enum/extensions_spec.rb
 - spec/active_enum/form_helpers/formtastic_spec.rb
 - spec/active_enum/form_helpers/simple_form_spec.rb
-- spec/active_enum/storage/active_record_store_spec.rb
 - spec/active_enum/storage/memory_store_spec.rb
 - spec/active_enum_spec.rb
 - spec/schema.rb

data/lib/active_enum/storage/active_record_store.rb

@@ -1,64 +0,0 @@
-module ActiveEnum
-  class Model < ActiveRecord::Base
-    set_table_name 'enums'
-    serialize :meta, Hash
-  end
-
-  module Storage
-    class ActiveRecordStore < AbstractStore
-      def initialize(enum_class, order)
-        super
-        @values = values_from_db
-      end
-
-      def set(id, name)
-        check_duplicate id, name
-        values << [id, name]
-        sort!
-      end
-
-      def get_by_id(id)
-        values.assoc(id)
-      end
-
-      def get_by_name(name)
-        values.rassoc(name.to_s) || values.rassoc(name.to_s.titleize)
-      end
-
-      def values
-        @values
-      end
-
-      def check_duplicate(id, name)
-        if get_by_id(id) || get_by_name(name)
-          raise ActiveEnum::DuplicateValue
-        end
-      end
-
-      def sort!
-        return if @order == :as_defined
-				case @order
-				when :asc
-					values.sort! {|a,b| a[0] <=> b[0] }
-				when :desc
-					values.sort! {|a,b| b[0] <=> a[0] }
-				end
-      end
-
-      def order_clause
-        @order_clause ||= case @order
-        when :asc
-          'enum_id ASC'
-        when :desc
-          'enum_id DESC'
-        else
-          'modified_at ASC'
-        end
-      end
-
-      def values_from_db
-        ActiveEnum::Model.all(:conditions => {:enum_type => @enum.to_s}, :order => order_clause).map {|r| [r.enum_id, r.name] }
-      end
-    end
-  end
-end

data/spec/active_enum/storage/active_record_store_spec.rb

@@ -1,133 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-require 'active_enum/storage/active_record_store'
-
-class TestARStoreEnum < ActiveEnum::Base; end
-class TestOtherAREnum < ActiveEnum::Base; end
-
-describe ActiveEnum::Storage::ActiveRecordStore do
-  attr_accessor :store
-
-  context '#set' do
-    it 'should store value of id and name' do
-      store.set 1, 'Name 1'
-      store.values.should == [[1, 'Name 1']]
-    end
-
-    it 'should raise error if duplicate id' do
-      lambda {
-        store.set 1, 'Name 1'
-        store.set 1, 'Other Name'
-      }.should raise_error(ActiveEnum::DuplicateValue)
-    end
-
-    it 'should raise error if duplicate name' do
-      lambda {
-        store.set 1, 'Name 1'
-        store.set 2, 'Name 1'
-      }.should raise_error(ActiveEnum::DuplicateValue)
-    end
-
-    it 'should raise error if duplicate name matches title-case name' do
-      lambda {
-        store.set 1, 'Name 1'
-        store.set 2, 'name 1'
-      }.should raise_error(ActiveEnum::DuplicateValue)
-    end
-
-    it 'should create a record for values' do
-      store.set 1, 'Name 1'
-      ActiveEnum::Model.count.should == 1
-      r = ActiveEnum::Model.first
-      r.enum_id.should == 1
-      r.name.should == 'Name 1'
-    end
-  end
-
-  context "#values" do
-    it 'should return array of stored values' do
-      store.set 1, 'Name 1'
-      store.values.should == [[1, 'Name 1']]
-    end
-
-    it 'should return values for set enum only' do
-      alt_store.set 1, 'Other Name 1'
-      store.set 1, 'Name 1'
-      store.values.should == [[1, 'Name 1']]
-    end
-  end
-
-  context "#get_by_id" do
-    it 'should return the value for a given id' do
-      store.set 1, 'Name 1'
-      store.get_by_id(1).should == [1, 'Name 1']
-    end
-
-    it 'should return nil when id not found' do
-      store.get_by_id(1).should be_nil
-    end
-
-    it 'should return value for correct enum' do
-      alt_store.set 1, 'Other Name 1'
-      store.set 1, 'Name 1'
-      store.get_by_id(1).should == [1, 'Name 1']
-    end
-  end
-
-  context "#get_by_name" do
-    it 'should return the value for a given name' do
-      store.set 1, 'Name 1'
-      store.get_by_name('Name 1').should == [1, 'Name 1']
-    end
-
-    it 'should return the value with title-cased name for a given lowercase name' do
-      store.set 1, 'Name 1'
-      store.get_by_name('name 1').should == [1, 'Name 1']
-    end
-
-    it 'should return nil when name not found' do
-      store.get_by_name('test name').should be_nil
-    end
-    
-    it 'should return value for correct enum' do
-      alt_store.set 1, 'Other Name 1'
-      store.set 1, 'Name 1'
-      store.get_by_name('Name 1').should == [1, 'Name 1']
-    end
-  end
-
-  context "sort!" do
-    it 'should sort values ascending when passed :asc' do
-      @order = :asc
-      store.set 2, 'Name 2'
-      store.set 1, 'Name 1'
-      store.values.should == [[1,'Name 1'], [2, 'Name 2']]
-    end
-
-    it 'should sort values descending when passed :desc' do
-      @order = :desc
-      store.set 1, 'Name 1'
-      store.set 2, 'Name 2'
-      store.values.should == [[2, 'Name 2'], [1,'Name 1']]
-    end
-
-    it 'should not sort values when passed :as_defined' do
-      @order = :as_defined
-      store.set 1, 'Name 1'
-      store.set 3, 'Name 3'
-      store.set 2, 'Name 2'
-      store.values.should == [[1,'Name 1'], [3,'Name 3'], [2, 'Name 2']]
-    end
-  end
-
-  after do
-    ActiveEnum::Model.delete_all
-  end
-
-  def store
-    @store ||= ActiveEnum::Storage::ActiveRecordStore.new(TestARStoreEnum, @order)
-  end
-
-  def alt_store
-    @alt_store ||= ActiveEnum::Storage::ActiveRecordStore.new(TestOtherAREnum, :asc)
-  end
-end