classy_enum 3.4.0 → 3.5.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0edf622ed777a5bba8d7bd326cabf8ff8668e4c2
-  data.tar.gz: 030e7d4db73ee839162bea545e9c6410a87edea9
+  metadata.gz: e52f5ea1617ac0e9a89994cfab27f12faec5d1ce
+  data.tar.gz: 37e5e8fac14f20a572df511fa7403f031b0b93c7
 SHA512:
-  metadata.gz: c4afa5c866b4cf3fa6729c1025ba5a5d34b2b9afadcce1819fefafd5be89cce916598427c4bc3b85f4df11a6d786480419b6886c5d27e2bcc80904820c0a28e0
-  data.tar.gz: 9b4810bf50ee3a76121dd18e617d0309cabc986487161b2e3431742b54ad2a97ace3eae56f62b25b49f5ebdb9e002854a1488e34ddf4ebe94c214745a86aebe4
+  metadata.gz: e60ebb8312ab9245e951785798023ad5b21583da87382b5f0da025e08757deb7626ef7c5f2248e72f9d44aaf2f90fe0731092ff82e617122bcdd7386f6aa0dfc
+  data.tar.gz: 79ede4de8ff0e03de2e41fe9f77ad4e5fcc35fea0db19af23ccd92915d692df10d50d1458a98dfea13e9298fd0d38560ecedf776e73dc1962e3da9c5c133bc01

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1.1
 gemfile:
   - gemfiles/Gemfile.rails-3.0.x
   - gemfiles/Gemfile.rails-3.1.x
@@ -11,4 +11,4 @@ gemfile:
 matrix:
   exclude:
     - rvm: 1.8.7
-      gemfile: gemfiles/Gemfile.rails-4.0.x
+      gemfile: gemfiles/Gemfile.rails-4.0.x

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # ClassyEnum Changelog
 
+## 3.5.0
+
+* Fixes long standing issue with default values not being persisted to
+  the database. See issue #37.
+
 ## 3.4.0
 
 * Removes full Rails gem dependency in favor of ActiveRecord

data/classy_enum.gemspec

@@ -20,6 +20,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rspec', '>= 2.11')
   gem.add_development_dependency('sqlite3', '>= 1.3')
   gem.add_development_dependency('json', '>= 1.6')
-  gem.add_development_dependency('debugger')
 
 end

data/lib/classy_enum/active_record.rb

@@ -67,10 +67,7 @@ module ClassyEnum
 
       # Define getter method that returns a ClassyEnum instance
       define_method attribute do
-        value = read_attribute(attribute)
-        value ||= default unless allow_nil
-
-        enum.build(value,
+        enum.build(read_attribute(attribute),
                    :owner             => self,
                    :serialize_as_json => serialize_as_json,
                    :allow_blank       => (allow_blank || allow_nil)
@@ -82,6 +79,20 @@ module ClassyEnum
         value = ClassyEnum._normalize_value(value, default, (allow_nil || allow_blank))
         super(value)
       end
+
+      # Initialize the object with the default value if it is present
+      # because this will let you store the default value in the
+      # database and make it searchable.
+      if default.present?
+        after_initialize do
+          value = read_attribute(attribute)
+
+          if (value.blank? && !(allow_blank || allow_nil)) || (value.nil? && !allow_nil)
+            send("#{attribute}=", default)
+          end
+        end
+      end
+
     end
 
   end

data/lib/classy_enum/version.rb

@@ -1,3 +1,3 @@
 module ClassyEnum
-  VERSION = "3.4.0"
+  VERSION = "3.5.0.beta"
 end

data/spec/classy_enum/active_record_spec.rb

@@ -226,15 +226,20 @@ describe DefaultCat do
     persian.breed_color { should eql('white Persian') }
   end
 
+  it 'persists the default, when set to nil' do
+    cat = DefaultCat.create(:breed => :abyssian)
+    expect(DefaultCat.where(:other_breed => 'persian')).to include(cat)
+  end
+
   it 'uses the default if explictly set to nil and does not allow nil' do
     abyssian.update_attributes!(:other_breed => nil)
-    DefaultCat.where(:other_breed => nil).count.should be_zero
+    DefaultCat.where(:other_breed => 'persian').should include(abyssian)
     DefaultCat.last.other_breed.should == 'persian'
   end
 
   it 'uses the default if explictly set to blank and does not allow blank' do
     abyssian.update_attributes!(:other_breed => '')
-    DefaultCat.where(:other_breed => '').count.should be_zero
+    DefaultCat.where(:other_breed => 'persian').should include(abyssian)
     DefaultCat.last.other_breed.should == 'persian'
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: classy_enum
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0.beta
 platform: ruby
 authors:
 - Peter Brown
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A utility that adds class based enum functionality to ActiveRecord attributes
 email:
 - github@lette.us
@@ -138,12 +124,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A class based enumerator utility for Ruby on Rails