simple_enum 1.1.0 → 1.2.0

data/Rakefile

@@ -2,6 +2,9 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
+# kinda ensure simple_enum is on load path
+$: << File.join(File.dirname(__FILE__), 'lib')
+
 desc 'Default: run unit tests.'
 task :default => :test
 
@@ -26,7 +29,8 @@ end
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
-    require File.join(File.dirname(__FILE__), 'lib', 'simple_enum')
+    require 'rubygems'
+    require 'simple_enum'
     
     gemspec.name = "simple_enum"
     gemspec.version = SimpleEnum::VERSION

data/init.rb

@@ -1 +1 @@
-require File.join(File.dirname(__FILE__), 'lib', 'simple_enum')
+require 'simple_enum'

data/lib/simple_enum.rb

@@ -8,6 +8,10 @@
 #
 # See the +as_enum+ documentation for more details.
 
+# because we depend on AR and i18n
+require 'active_record'
+require 'i18n'
+
 require 'simple_enum/enum_hash'
 require 'simple_enum/object_support'
 require 'simple_enum/validation'
@@ -17,7 +21,7 @@ require 'simple_enum/validation'
 module SimpleEnum
 
   # +SimpleEnum+ version string.
-  VERSION = "1.1.0".freeze
+  VERSION = "1.2.0".freeze
 
   class << self
     
@@ -223,7 +227,8 @@ module SimpleEnum
     include Validation
     
     def human_enum_name(enum, key, options = {})
-      defaults = ([self] + subclasses).map { |klass| :"#{klass.name.underscore}.#{enum}.#{key}" }
+      klasses = self.respond_to?(:descendants) ? descendants : ancestors
+      defaults = ([self] + klasses).map { |klass| :"#{klass.name.underscore}.#{enum}.#{key}" }
       defaults << :"#{enum}.#{key}"
       defaults << options.delete(:default) if options[:default]
       defaults << "#{key}".humanize
@@ -241,9 +246,7 @@ module SimpleEnum
 end
 
 # Tie stuff together and load translations if ActiveRecord is defined
-if Object.const_defined?('ActiveRecord')
-  Object.send(:include, SimpleEnum::ObjectSupport)
-    
-  ActiveRecord::Base.send(:include, SimpleEnum)
-  I18n.load_path << File.join(File.dirname(__FILE__), '..', 'locales', 'en.yml')
-end
+Object.send(:include, SimpleEnum::ObjectSupport)
+ 
+ActiveRecord::Base.send(:include, SimpleEnum)
+I18n.load_path << File.join(File.dirname(__FILE__), '..', 'locales', 'en.yml')

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_enum
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Lukas Westermann
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-10 00:00:00 +02:00
+date: 2010-08-30 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -58,23 +59,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple enum-like field support for ActiveRecord (including validations and i18n)