degu 0.1.3 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/degu.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = "degu"
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2012-07-30"
+  s.date = "2013-01-11"
   s.description = "Library that includes enums, and rails support for enums and bitfield sets."
   s.email = "dev@pkw.de"
-  s.extra_rdoc_files = ["README.rdoc", "lib/degu/has_enum.rb", "lib/degu/has_set.rb", "lib/degu/polite.rb", "lib/degu/renum/enumerated_value.rb", "lib/degu/renum/enumerated_value_type_factory.rb", "lib/degu/renum.rb", "lib/degu/rude.rb", "lib/degu/version.rb", "lib/degu.rb"]
+  s.extra_rdoc_files = ["README.rdoc", "lib/degu.rb", "lib/degu/has_enum.rb", "lib/degu/has_set.rb", "lib/degu/polite.rb", "lib/degu/renum.rb", "lib/degu/renum/enumerated_value.rb", "lib/degu/renum/enumerated_value_type_factory.rb", "lib/degu/rude.rb", "lib/degu/version.rb"]
   s.files = [".gitignore", ".travis.yml", "Gemfile", "README.rdoc", "Rakefile", "VERSION", "degu.gemspec", "lib/degu.rb", "lib/degu/has_enum.rb", "lib/degu/has_set.rb", "lib/degu/polite.rb", "lib/degu/renum.rb", "lib/degu/renum/enumerated_value.rb", "lib/degu/renum/enumerated_value_type_factory.rb", "lib/degu/rude.rb", "lib/degu/version.rb", "spec/renum_spec.rb", "spec/spec_helper.rb", "test/has_enum_test.rb", "test/has_set_test.rb", "test/test_helper.rb", "test_helper.rb"]
   s.homepage = "http://github.com/caroo/degu"
   s.rdoc_options = ["--title", "Degu - Library for enums and bitfield sets.", "--main", "README.rdoc"]

data/lib/degu/has_enum.rb

@@ -32,7 +32,7 @@ module Degu
 
         define_method("#{enum_name}") do
           begin
-            return self[enum_column].present? ? enum_class.const_get(self[enum_column]) : nil
+            return self[enum_column].present? ? enum_class[self[enum_column]] : nil
           rescue NameError => e
             return nil
           end
@@ -51,7 +51,13 @@ module Degu
           if enum_to_set.to_s.strip.empty?
             self[enum_column] = nil
           elsif enum_resolved
-            self[enum_column] = enum_resolved.name
+            column_type = ((column_definition = self.class.columns_hash[enum_column]) and column_definition.type)
+            self[enum_column] = case column_type
+            when :integer
+              enum_resolved.index
+            else
+              enum_resolved.name
+            end
           else
             raise ArgumentError, "could not resolve #{enum_to_set.inspect}"
           end
@@ -64,9 +70,7 @@ module Degu
 
         define_method("#{enum_column}_check_for_valid_type_of_enum") do
           return true if self[enum_column].nil? || self[enum_column].to_s.empty?
-          begin
-            enum_class.const_get(self[enum_column])
-          rescue NameError => e
+          unless enum_class[self[enum_column]].present?
             self.errors.add(enum_column.to_sym, "Wrong type '#{self[enum_column]}' for enum '#{enum_name}'")
             return false
           end

data/lib/degu/version.rb

@@ -1,6 +1,6 @@
 module Degu
   # Degu version
-  VERSION         = '0.1.3'
+  VERSION         = '0.2.0'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/test/has_enum_test.rb

@@ -181,4 +181,22 @@ class HasEnumTest < Test::Unit::TestCase
     assert enum_mixin.callback1_executed
   end
 
+  def test_should_be_able_to_use_integer_columns_for_enums
+    with_integer = ClassWithIntergerColumn.new
+    with_integer.product = Product::Titanium
+    assert_equal 2, with_integer[:product_type]
+
+    with_integer[:product_type] = 0
+    assert_equal Product::Silver, with_integer.product
+  end
+
+  def test_should_validate_integer_columns
+    with_integer = ClassWithIntergerColumn.new
+    with_integer.product = Product::Titanium
+    assert_equal true, with_integer.valid?
+
+    with_integer.product_type = 20
+    assert_equal false, with_integer.valid?
+  end
+
 end

data/test/test_helper.rb

@@ -22,6 +22,11 @@ def setup_db
         t.column :updated_at, :datetime
       end
 
+      create_table :class_with_interger_columns do |t|
+        t.column :title, :string
+        t.column :product_type, :integer
+      end
+
       create_table :class_with_custom_name_enums do |t|
         t.column :title, :string
         t.column :product_enum, :string
@@ -135,4 +140,8 @@ class Itunes < ActiveRecord::Base
   has_set :music, :enum_class => MusicStyles
 end
 
+class ClassWithIntergerColumn < ActiveRecord::Base
+  has_enum :product
+end
+
 teardown_db # And drop them right afterwards

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: degu
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-30 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -114,15 +114,15 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - README.rdoc
+- lib/degu.rb
 - lib/degu/has_enum.rb
 - lib/degu/has_set.rb
 - lib/degu/polite.rb
+- lib/degu/renum.rb
 - lib/degu/renum/enumerated_value.rb
 - lib/degu/renum/enumerated_value_type_factory.rb
-- lib/degu/renum.rb
 - lib/degu/rude.rb
 - lib/degu/version.rb
-- lib/degu.rb
 files:
 - .gitignore
 - .travis.yml
@@ -164,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1326534228350775604
+      hash: -273126236324992353
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: