classy_enum 2.0.2 → 2.0.3

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # ClassyEnum Changelog
 
+## 2.0.3
+
+* Fixes issue with validates_uniqueness_of when using an enum field as
+  the scope.
+
+## 2.0.1 & 2.0.2
+
+* Resolving gem release conflicts, no changes
+
 ## 2.0.0
 
 * Enum class definitions are no longer defined implicity and must be explicitly subclassed from children of ClassyEnum::Base

data/README.md

@@ -8,8 +8,7 @@ ClassyEnum is a Ruby on Rails gem that adds class-based enumerator functionality
 
 *Rails:*
 
-  * 3.0.x - 3.2.x: Fully tested in a production application. See below
-    for known issues.
+  * 3.0.x - 3.2.x: Fully tested in a production application.
   * 2.3.x: If you need support for Rails 2.3.x, please install [version 0.9.1](https://rubygems.org/gems/classy_enum/versions/0.9.1)
 
 *Ruby:* Ruby 1.8.7, 1.9.2, and 1.9.3 are tested and supported
@@ -30,9 +29,6 @@ generator, there are no changes to the existing structure.
 Built-in Formtastic support has been removed. See the note at the
 bottom of this readme for more information how how to enable it.
 
-validates_uniqueness_of will no longer work with Rails 3.0.x when using
-a scope that is the enum field.
-
 ## Example Usage
 
 The most common use for ClassyEnum is to replace database lookup tables where the content and behavior is mostly static and has multiple "types". In this example, I have an ActiveRecord model called `Alarm` with an attribute called `priority`. Priority is stored as a string (VARCHAR) type in the database and is converted to an enum value when requested.
@@ -81,10 +77,10 @@ class Priority < ClassyEnum::Base
   end
 end
 
-class prioritylow < priority
+class PriorityLow < priority
 end
 
-class prioritymedium < priority
+class PriorityMedium < priority
 end
 
 class PriorityHigh < Priority
@@ -148,10 +144,10 @@ class Priority < ClassyEnum::Base
   owner :alarm
 end
 
-class prioritylow < priority
+class PriorityLow < priority
 end
 
-class prioritymedium < priority
+class PriorityMedium < priority
 end
 
 class PriorityHigh < Priority
@@ -192,7 +188,7 @@ end
 @alarm.to_json.should == "{\"alarm\":{\"priority\":{}}}"
 ```
 
-## Special Cases and Known Issue
+## Special Cases
 
 What if your enum class name is not the same as your model's attribute name? No problem! Just use a second arugment in `classy_enum_attr` to declare the attribute name. In this case, the model's attribute is called *alarm_priority*.
 
@@ -205,11 +201,8 @@ end
 @alarm.alarm_priority  # => PriorityMedium
 ```
 
-There is an [issue](https://github.com/beerlington/classy_enum/issues/8)
-with Rails 3.0 and higher when using validates_uniqueness_of
-and a scope that is the enum field. This issue also occurs when using
-`composed_of` and is not a bug with ClassyEnum. As a workaround to this
-problem, you can use the reader suffix option when declaring your field:
+If you would like the default getter method to return a string, you can
+use the optional *:suffix* option for the enum getter:
 
 ```ruby
 class Alarm < ActiveRecord::Base

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.3

data/classy_enum.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "classy_enum"
-  s.version = "2.0.2"
+  s.version = "2.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Brown"]
-  s.date = "2012-04-22"
+  s.date = "2012-04-24"
   s.description = "A utility that adds class based enum functionality to ActiveRecord attributes"
   s.email = "github@lette.us"
   s.extra_rdoc_files = [

data/lib/classy_enum/class_methods.rb

@@ -33,6 +33,11 @@ module ClassyEnum
     def inherited(klass)
       return if self == ClassyEnum::Base
 
+      # Add visit_EnumMember methods to support validates_uniqueness_of with enum field
+      Arel::Visitors::ToSql.class_eval do
+        define_method "visit_#{klass.name}", lambda {|value| quote(value.to_s) }
+      end
+
       enum = klass.name.gsub(klass.base_class.name, '').underscore.to_sym
       index = self.enum_options.index(enum) + 1
 

data/spec/active_record_spec.rb

@@ -1,12 +1,23 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+class Color < ClassyEnum::Base
+  enum_classes :white, :black
+end
+
+class ColorWhite < Color; end;
+
+class ColorBlack < Color; end;
+
 class ActiveDog < ActiveRecord::Base
   classy_enum_attr :breed, :suffix => 'type'
+  classy_enum_attr :color
 
   validates :name,
     :presence => true,
     :uniqueness => { :scope => [:breed] }
 
+  validates_uniqueness_of :name, :scope => :color
+
   scope :goldens, where(:breed => 'golden_retriever')
 
 end
@@ -14,22 +25,35 @@ end
 describe ActiveDog do
 
   context 'valid instance' do
-    subject { ActiveDog.new(:name => 'sirius', :breed => :golden_retriever) }
+    subject { ActiveDog.new(:name => 'sirius', :breed => :golden_retriever, :color => :black) }
 
     it { should have(:no).errors_on(:breed) }
     its(:breed_type) { should be_a_golden_retriever }
     its(:breed) { should == 'golden_retriever' }
   end
 
+  context 'uniqueness on name' do
+    subject { ActiveDog.new(:name => 'Kitteh', :breed => :golden_retriever, :color => :black) }
+    it { should be_valid }
+
+    context 'with existing kitteh' do
+      before do
+        ActiveDog.create!(:name => 'Kitteh', :breed => :husky, :color => :black)
+      end
+
+      it { should have(1).error_on(:name) }
+    end
+  end
+
   context 'invalid instance' do
-    subject { ActiveDog.new(:name => 'sirius', :breed => :golden_retrievers) }
+    subject { ActiveDog.new(:name => 'sirius', :breed => :golden_retrievers, :color => :white) }
 
     it { should have(1).error_on(:breed) }
   end
 
   context 'scopes' do
-    let!(:golden) { ActiveDog.create!(:name => 'Sebastian', :breed => :golden_retriever) }
-    let!(:husky) { ActiveDog.create!(:name => 'Sirius', :breed => :husky) }
+    let!(:golden) { ActiveDog.create!(:name => 'Sebastian', :breed => :golden_retriever, :color => :white) }
+    let!(:husky) { ActiveDog.create!(:name => 'Sirius', :breed => :husky, :color => :black) }
 
     after { ActiveDog.destroy_all }
 

data/spec/spec_helper.rb

@@ -33,6 +33,7 @@ ActiveRecord::Schema.define(:version => 1) do
 
   create_table :active_dogs, :force => true do |t|
     t.string :breed
+    t.string :color
     t.string :name
     t.integer :age
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classy_enum
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-22 00:00:00.000000000Z
+date: 2012-04-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -141,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -624822224793334700
+      hash: 3374934930458401417
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: