ricordami 0.0.3 → 0.0.4

data/CHANGELOG.md

@@ -1,16 +1,22 @@
 # Changelog #
 
-## 0.0.3 (March 12th, 2011)
+## 0.0.4 (March 13th, 2011) ##
+
+  - add a scope option to validates_uniqueness_of validation macro
+  - allow to pass nil when creating a new instance
+  - added a spec for update_attributes with an invalid model
+
+## 0.0.3 (March 12th, 2011) ##
 
   - added serialization (use: "model\_can :be_serialized") to have
     access to Model#to_json and Model#to_xml
 
-## 0.0.2 (March 5th, 2011)
+## 0.0.2 (March 5th, 2011) ##
 
   - added examples and fixed README
   - created a basic Ricordami::Model#to_s method
 
-## 0.0.1 (March 5th, 2011)
+## 0.0.1 (March 5th, 2011) ##
 
 Initial release.
 

data/lib/ricordami/has_attributes.rb

@@ -36,6 +36,7 @@ module Ricordami
       attr_reader :attributes
 
       def initialize(attrs = {})
+        attrs = {} if attrs.nil?
         @attributes = {}.with_indifferent_access
         @reloading = false
         update_mem_attributes(attrs) unless attrs.empty?

data/lib/ricordami/has_indices.rb

@@ -12,8 +12,7 @@ module Ricordami
       end
 
       def index(options = {})
-        # for now we can only create unique indices
-        options.assert_valid_keys(:unique, :get_by, :value)
+        options.assert_valid_keys(:unique, :get_by, :value, :scope)
         fields = options.delete(:unique)
         return unique_index(fields, options) if fields.present?
         field = options.delete(:value)

data/lib/ricordami/unique_index.rb

@@ -4,13 +4,17 @@ module Ricordami
   class UniqueIndex
     SEPARATOR = "_-::-_"
 
-    attr_reader :model, :fields, :name, :need_get_by
+    attr_reader :model, :fields, :name, :need_get_by, :scope
 
     def initialize(model, fields, options = {})
       @model = model
-      @fields = [fields].flatten.map(&:to_sym)
-      @need_get_by = options[:get_by] && @fields != [:id]
+      @fields = normalize_array(fields)
       @name = @fields.join("_").to_sym
+      @need_get_by = options[:get_by] && @fields != [:id]
+      if options.has_key?(:scope)
+        @scope = normalize_array(options[:scope])
+        @fields.push(*@scope)
+      end
     end
 
     def uidx_key_name
@@ -22,7 +26,7 @@ module Ricordami
     end
 
     def add(id, value)
-      value = value.join(SEPARATOR) if value.is_a?(Array)
+      value = normalize_value(value)
       @model.redis.sadd(uidx_key_name, value)
       @model.redis.hset(ref_key_name, value, id) if @need_get_by
     end
@@ -35,7 +39,7 @@ module Ricordami
         return commands
       end
       @model.redis.hdel(ref_key_name, id) if @need_get_by
-      value = value.join(SEPARATOR) if value.is_a?(Array)
+      value = normalize_value(value)
       @model.redis.srem(uidx_key_name, value)
     end
 
@@ -55,5 +59,16 @@ module Ricordami
     def include?(value)
       @model.redis.sismember(uidx_key_name, value)
     end
+
+    def normalize_value(value)
+      value.is_a?(Array) ? value.join(SEPARATOR) : value
+    end
+
+    private
+
+    def normalize_array(array)
+      return [] if array.nil?
+      [array].flatten.map(&:to_sym)
+    end
   end
 end

data/lib/ricordami/unique_validator.rb

@@ -6,6 +6,10 @@ module Ricordami
       return true unless record.new_record? || record.send(:attribute_changed?, attribute)
       index_name = attribute.to_sym
       index = record.class.indices[index_name]
+      if index.scope
+        scope_values = index.scope.map { |field| record.send(field) }
+        value = index.normalize_value([value].push(*scope_values))
+      end
       if index.include?(value)
         attr_def = record.class.attributes[attribute]
         unless record.persisted? && attr_def.read_only?
@@ -15,7 +19,7 @@ module Ricordami
     end
 
     def setup(klass)
-      attributes.each { |attribute| klass.index :unique => attribute }
+      attributes.each { |attribute| klass.index :unique => attribute, :scope => options[:scope] }
     end
   end
 end

data/lib/ricordami/version.rb

@@ -1,3 +1,3 @@
 module Ricordami
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/ricordami/can_be_validated_spec.rb

@@ -50,7 +50,7 @@ describe Ricordami::CanBeValidated do
     end
   end
 
-  describe "#save" do
+  describe "#save and #update_attributes" do
     uses_constants("Post")
 
     before(:each) do
@@ -69,6 +69,11 @@ describe Ricordami::CanBeValidated do
     it "can save if it is not valid but passed :validate => false" do
       Post.new.save(:validate => false).should be_true
     end
+
+    it "can't #update_attributes if it is not valid" do
+      post = Post.create(:title => "blah")
+      post.update_attributes(:title => "").should be_false
+    end
   end
 
   describe "validate attribute uniqueness" do
@@ -111,5 +116,13 @@ describe Ricordami::CanBeValidated do
       fred.should have(1).error
       fred.errors[:wife].should == ["is already used"]
     end
+
+    it "allows to validate the uniqueness using a scope" do
+      User.validates_uniqueness_of(:wife, :scope => :username)
+      serge = User.create(:id => "serge", :username => "Gainsbourg", :wife => "Rita")
+      fred = User.new(:username => "Chichin", :wife => "Rita")
+      fred.should be_valid
+      fred.should have(0).errors
+    end
   end
 end

data/spec/ricordami/has_attributes_spec.rb

@@ -38,6 +38,12 @@ describe Ricordami::HasAttributes do
       attribute.initial_value.should == "2"
       attribute.initial_value.should == "3"
     end
+
+    it "can create a new instance without parameters, with nil or an empty hash" do
+      Boat.new.attributes.should == {"id" => nil}
+      Boat.new(nil).attributes.should == {"id" => nil}
+      Boat.new({}).attributes.should == {"id" => nil}
+    end
   end
 
   describe "an instance" do

data/spec/ricordami/has_indices_spec.rb

@@ -27,6 +27,13 @@ describe Ricordami::HasIndices do
         Car.indices[:model].should == index
       end
 
+      it "can give a scope to a unique index with :scope option" do
+        Car.attribute :brand
+        index = Car.index :unique => :model, :scope => :brand
+        Car.indices[:model].scope.should == [:brand]
+        Car.indices[:model].fields.should == [:model, :brand]
+      end
+
       it "discards the subsequent declarations if the same index is created more than once" do
         Car.index :unique => :model, :get_by => true
         Car.indices[:model].need_get_by.should be_true

data/spec/ricordami/model_spec.rb

@@ -28,9 +28,6 @@ describe Ricordami::Model do
       user.to_model.should == user
     end
 
-    it "has a simple to_s method" do
-    end
-
     describe "#to_key" do
       before(:each) do
         @user = User.new

data/spec/ricordami/unique_index_spec.rb

@@ -6,6 +6,7 @@ describe Ricordami::UniqueIndex do
   before(:each) do
     create_constant("DataSource")
     DataSource.attribute :name
+    DataSource.attribute :owner
     @index = subject.new(DataSource, :id)
   end
 
@@ -15,6 +16,12 @@ describe Ricordami::UniqueIndex do
     @index.name.should == :id
   end
 
+  it "can have a scope" do
+    index = subject.new(DataSource, :id, :scope => :owner)
+    index.scope.should == [:owner]
+    index.fields.should == [:id, :owner]
+  end
+
   it "returns its internal index name with #uidx_key_name" do
     @index.uidx_key_name.should == "DataSource:udx:id"
   end

data/spec/ricordami/unique_validator_spec.rb

@@ -38,4 +38,18 @@ describe Ricordami::UniqueValidator do
     validator.validate_each(sophie, :name, record.name)
     sophie.errors[:name].should == ["come on, man!"]
   end
+
+  it "accepts a scope option to limit the unicity constraint" do
+    Call.attribute :family
+    validator = Ricordami::UniqueValidator.new(:attributes => [:name], :scope => :family)
+    validator.setup(Call)
+    Call.create(:name => "john", :family => "jones")
+    john = Call.new(:name => "john", :family => "jones")
+    validator.validate_each(john, :name, john.name)
+    john.should have(1).error
+    john.family = "doe"
+    john.errors.clear
+    validator.validate_each(john, :name, john.name)
+    john.should have(0).errors
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: ricordami
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Mathieu Lajugie
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-12 00:00:00 -08:00
+date: 2011-03-12 23:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency