enumerize 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.1 (May 21, 2012) ##
+
+### bug fix
+  * Call super in attribute accessors if available (by [@lest](https://github.com/lest))
+
 ## 0.2.0 (March 29, 2012) ##
 
 ### enhancements

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake'
-gem 'minitest', '~> 2.11.0'
+gem 'minitest', '~> 2.12.0'
 gem 'mocha'
 
 gem 'activerecord', '~> 3.2.0'

data/gemfiles/Gemfile-ar-3.1.x

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem 'enumerize', :path => '..'
 
 gem 'rake'
-gem 'minitest', '~> 2.11.0'
+gem 'minitest', '~> 2.12.0'
 gem 'mocha'
 
 gem 'activerecord', '~> 3.1.0'

data/lib/enumerize/base.rb

@@ -58,7 +58,9 @@ module Enumerize
       def _define_enumerize_attribute(attr)
         _enumerize_module.module_eval <<-RUBY, __FILE__, __LINE__ + 1
           def #{attr.name}
-            if respond_to?(:read_attribute, true)
+            if defined?(super)
+              self.class.enumerized_attributes[:#{attr.name}].find_value(super)
+            elsif respond_to?(:read_attribute, true)
               self.class.enumerized_attributes[:#{attr.name}].find_value(read_attribute(:#{attr.name}))
             else
               if defined?(@#{attr.name})
@@ -75,7 +77,9 @@ module Enumerize
             allowed_value_or_nil = self.class.enumerized_attributes[:#{attr.name}].find_value(new_value)
             allowed_value_or_nil = allowed_value_or_nil.to_s unless allowed_value_or_nil.nil?
 
-            if respond_to?(:write_attribute, true)
+            if defined?(super)
+              super allowed_value_or_nil
+            elsif respond_to?(:write_attribute, true)
               write_attribute :#{attr.name}, allowed_value_or_nil
             else
               @#{attr.name} = allowed_value_or_nil

data/lib/enumerize/version.rb

@@ -1,3 +1,3 @@
 module Enumerize
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/test/base_test.rb

@@ -136,4 +136,35 @@ describe Enumerize::Base do
     object.foo = nil
     object.read_attribute_for_validation(:foo).must_equal nil
   end
+
+  it 'calls super in the accessor method' do
+    accessors = Module.new do
+      def attributes
+        @attributes ||= {}
+      end
+
+      def foo
+        attributes[:foo]
+      end
+
+      def foo=(v)
+        attributes[:foo] = v
+      end
+    end
+
+    klass = Class.new do
+      include accessors
+      include Enumerize
+
+      enumerize :foo, :in => %w[test]
+    end
+
+    object = klass.new
+    object.foo.must_be_nil
+    object.attributes.must_equal({:foo => nil})
+
+    object.foo = 'test'
+    object.foo.must_equal 'test'
+    object.attributes.must_equal(:foo => 'test')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enumerize
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-29 00:00:00.000000000 Z
+date: 2012-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &6744160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *6744160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.3
 description: Enumerated attributes with I18n and ActiveRecord/Mongoid support
 email: info@twinslash.com
 executables: []
@@ -73,7 +78,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1144009341206974926
+      hash: 2467597256699098975
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -82,10 +87,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1144009341206974926
+      hash: 2467597256699098975
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Enumerated attributes with I18n and ActiveRecord/Mongoid support