enumify 0.0.2 → 0.0.3

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.0.3
+* Fixed bug in not_ scopes
+
 ## v0.0.2
 * Added support for not_ scopes
 * Improved the tests

data/lib/enumify/model.rb

@@ -18,6 +18,7 @@ module Enumify
       self.class_eval do
 
         private
+
         define_method "_set_#{parameter.to_s}" do |value, should_save|
 
           value = value.to_sym
@@ -27,6 +28,7 @@ module Enumify
           send("#{parameter.to_s}_changed", old, value) if respond_to?("#{parameter.to_s}_changed", true) and old != value and !old.nil?
           return value
         end
+
       end
 
       opts.each do |opt|
@@ -40,15 +42,22 @@ module Enumify
             send("_set_#{parameter.to_s}", opt, true)
         end
 
-
         scope opt.to_sym, where(parameter.to_sym => opt.to_s)
+      end
+
+      # We want to first define all the "positive" scopes and only then define
+      # the "negation scopes", to make sure they don't override previous scopes
+      opts.each do |opt|
         # We need to prefix the field with the table name since if this scope will
         # be used in a joined query with other models that have the same enum field then
         # it will fail on ambiguous column name.
-        scope "not_#{opt}".to_sym, where("#{self.table_name}.#{parameter} != ?", opt.to_s)
+        unless respond_to?("not_#{opt}")
+          scope "not_#{opt}", where("#{self.table_name}.#{parameter} != ?", opt.to_s)
+        end
       end
 
     end
 
   end
+
 end

data/lib/enumify/version.rb

@@ -1,3 +1,3 @@
 module Enumify
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/enumify/enum_spec.rb

@@ -11,7 +11,7 @@ class OtherModel < ActiveRecord::Base
 
   belongs_to :model
 
-  enum :status, [:active, :expired]
+  enum :status, [:active, :expired, :not_expired]
 end
 
 describe :Enumify do
@@ -26,6 +26,7 @@ describe :Enumify do
 
     @active_obj = OtherModel.create!(:status => :active, :model => @obj)
     @expired_obj = OtherModel.create!(:status => :expired, :model => @canceled_obj)
+    @not_expired_obj = OtherModel.create!(:status => :not_expired, :model => @canceled_obj)
   end
 
   describe "short hand methods" do
@@ -126,8 +127,16 @@ describe :Enumify do
       end
 
       it "should return objects that do not have the given value when joined with models who have the same enum field" do
-        OtherModel.joins(:model).not_active.should == [@expired_obj]
+        OtherModel.joins(:model).not_active.should include(@expired_obj, @not_expired_obj)
       end
+
+      it "should not override positive scopes" do
+        # We want here to verify that the not_expired scope return only the models with
+        # status == "not_expired" and not all the models with status != "expired",
+        # since negation scopes should not override the "positive" scopes.
+        OtherModel.not_expired.should == [@not_expired_obj]
+      end
+
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: enumify
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - yon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-18 00:00:00 Z
+date: 2012-06-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake