simple_enum 1.0.0 → 1.0.1

data/.gitignore

@@ -1,3 +1,2 @@
 doc
 pkg
-*.gemspec

data/Rakefile

@@ -26,15 +26,20 @@ end
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
+    require File.join(File.dirname(__FILE__), 'lib', 'simple_enum')
+    
     gemspec.name = "simple_enum"
+    gemspec.version = SimpleEnum::VERSION
     gemspec.summary = "Simple enum-like field support for ActiveRecord (including validations and i18n)"
     gemspec.email = "lukas.westermann@gmail.com"
     gemspec.homepage = "http://github.com/lwe/simple_enum"
-    gemspec.authors = ["Lukas Westermann"]
+    gemspec.authors = ["Lukas Westermann"] # ask & add "Dmitry Polushkin"
+    
+    gemspec.files.reject! { |file| file =~ /\.gemspec$/ } # kinda redundant
   end
   Jeweler::GemcutterTasks.new  
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end
 
 namespace :metrics do
@@ -67,4 +72,4 @@ desc 'Clean up generated files.'
 task :clean do |t|
   FileUtils.rm_rf "doc"
   FileUtils.rm_rf "pkg"  
-end
+end

data/lib/simple_enum.rb

@@ -12,12 +12,14 @@ require 'simple_enum/array_support'
 require 'simple_enum/enum_hash'
 require 'simple_enum/object_support'
 require 'simple_enum/validation'
-require 'simple_enum/version'
 
 # Base module which gets included in <tt>ActiveRecord::Base</tt>. See documentation
 # of +SimpleEnum::ClassMethods+ for more details.
 module SimpleEnum
 
+  # +SimpleEnum+ version string.
+  VERSION = "1.0.1".freeze
+
   class << self
     
     # Provides configurability to SimpleEnum, allows to override some defaults which are
@@ -165,26 +167,28 @@ module SimpleEnum
     
       # generate setter
       define_method("#{enum_cd}=") do |new_value|
-        v = new_value.nil? ? nil : values[new_value.to_sym]        
-        raise(ArgumentError, "Invalid enumeration value: #{new_value}") if (options[:whiny] and v.nil? and !new_value.nil?)
+        v = new_value.blank? ? nil : values[new_value.to_sym]
+        raise(ArgumentError, "Invalid enumeration value: #{new_value}") if (options[:whiny] and v.nil? and !new_value.blank?)
         write_attribute options[:column], v
       end
     
       # allow access to defined values hash, e.g. in a select helper or finder method.      
       self_name = enum_cd.to_s.pluralize   
       self_name.upcase! if options[:upcase]   
-      class_variable_set :"@@SE_#{self_name.upcase}", values
+      
       class_eval(<<-EOM, __FILE__, __LINE__ + 1)
+        @#{self_name} = values
+
         def self.#{self_name}(*args)
-          return @@SE_#{self_name.upcase} if args.first.nil?          
-          return @@SE_#{self_name.upcase}[args.first] if args.size == 1
-          args.inject([]) { |ary, sym| ary << @@SE_#{self_name.upcase}[sym]; ary }
+          return @#{self_name} if args.first.nil?          
+          return @#{self_name}[args.first] if args.size == 1
+          args.inject([]) { |ary, sym| ary << @#{self_name}[sym]; ary }
         end
         
         def self.#{self_name}_for_select(&block)
-          self.#{self_name}.map do |k,v| 
-            [block_given? ? yield(k,v) : self.human_enum_name(#{self_name.inspect}, k), v]
-          end.sort { |a,b| a[1] <=> b[1] }
+          self.#{self_name}.map do |k,v|
+            [block_given? ? yield(k,v) : self.human_enum_name(#{self_name.inspect}, k), k]
+          end.sort
         end
       EOM
     

data/test/class_methods_test.rb

@@ -11,7 +11,12 @@ class ClassMethodsTest < ActiveSupport::TestCase
     assert_nil Dummy.genders(:inexistent)
     assert_nil Dummy.genders[:inexistent]
   end
-  
+
+  test "GENDERS constant created" do
+    assert_equal [0, 1], Dummy.genders.values.sort
+    assert_equal %w{female male}, Dummy.genders.keys.map(&:to_s).sort
+  end
+
   test "that Klass.genders(:sym_a, :sym_b) returns an array of values, useful for IN clauses" do
     assert_equal [0, 1], Dummy.genders(:male, :female)
     assert_equal [1, 0], Dummy.genders(:female, :male)
@@ -103,4 +108,10 @@ class ClassMethodsTest < ActiveSupport::TestCase
     assert_equal "Foo", Dummy.human_enum_name(:didums, :foo)
     assert_equal "Foos", Dummy.human_enum_name(:didums, :foo, :count => 5)
   end
+
+  test "enum_for_select class method" do
+    for_select = Dummy.genders_for_select
+    assert_equal ["Girl", :female], for_select.first
+    assert_equal ["Male", :male], for_select.last
+  end
 end

data/test/simple_enum_test.rb

@@ -77,6 +77,8 @@ class SimpleEnumTest < ActiveSupport::TestCase
     
     d = not_whiny.new :gender => :foo
     assert_nil(d.gender)
+    d.gender = ''
+    assert_nil(d.gender)
   end
   
   test "ensure that setting to 'nil' works if :whiny => true and :whiny => false" do
@@ -84,6 +86,8 @@ class SimpleEnumTest < ActiveSupport::TestCase
     assert_equal(:male, d.gender)
     d.gender = nil
     assert_nil(d.gender)
+    d.gender = ''
+    assert_nil(d.gender)
     
     not_whiny_again = Class.new(Dummy) do
       as_enum :gender, [:male, :female], :whiny => false
@@ -92,6 +96,8 @@ class SimpleEnumTest < ActiveSupport::TestCase
     d = not_whiny_again.new :gender => :male
     assert_equal(:male, d.gender)
     d.gender = nil
-    assert_nil(d.gender)    
+    assert_nil(d.gender)
+    d.gender = ''
+    assert_nil(d.gender)
   end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: simple_enum
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Lukas Westermann
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-07 00:00:00 +01:00
+date: 2010-04-06 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -26,14 +31,12 @@ files:
 - LICENCE
 - README.rdoc
 - Rakefile
-- VERSION.yml
 - init.rb
 - lib/simple_enum.rb
 - lib/simple_enum/array_support.rb
 - lib/simple_enum/enum_hash.rb
 - lib/simple_enum/object_support.rb
 - lib/simple_enum/validation.rb
-- lib/simple_enum/version.rb
 - locales/en.yml
 - test/array_conversions_test.rb
 - test/class_methods_test.rb
@@ -60,18 +63,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: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Simple enum-like field support for ActiveRecord (including validations and i18n)

data/VERSION.yml

@@ -1,5 +0,0 @@
---- 
-:patch: 0
-:major: 1
-:build: 
-:minor: 0

data/lib/simple_enum/version.rb

@@ -1,14 +0,0 @@
-module SimpleEnum
-  module VERSION #:nodoc:
-    def self.version
-      @VERSION_PARTS ||= YAML.load_file File.join(File.dirname(__FILE__), '..', '..', 'VERSION.yml')
-    end
-    
-    def self.to_s
-      @VERSION ||= [version[:major], version[:minor], version[:patch]].join('.').freeze
-    end
-  end
-  
-  NAME = "simple_enum".freeze
-  ABOUT = "#{NAME} #{VERSION}".freeze
-end