yeti 0.3.7 → 0.3.9

data/lib/yeti/editor.rb

@@ -81,6 +81,11 @@ module Yeti
         other.id==id
       )
     end
+    alias_method :eql?, :==
+
+    def hash
+      id.hash
+    end
 
   protected
 

data/lib/yeti/version.rb

@@ -1,3 +1,3 @@
 module Yeti
-  VERSION = "0.3.7"
+  VERSION = "0.3.9"
 end

data/lib/yeti/viewer.rb

@@ -16,6 +16,11 @@ module Yeti
     def ==(other)
       other.equal?(self) || (other.instance_of?(self.class) && other.id==id)
     end
+    alias_method :eql?, :==
+
+    def hash
+      id.hash
+    end
 
   protected
 

data/spec/yeti/editor_spec.rb

@@ -288,7 +288,7 @@ describe ::Yeti::Editor do
       subject.mandatory?(:invalid).should be false
     end
   end
-  describe "#==" do
+  describe "equality" do
     let(:existing){ mock :object, id: 1, persisted?: true }
     let(:another){ mock :object, id: 2, persisted?: true }
     subject{ described_class.from_id context, 1 }
@@ -296,21 +296,33 @@ describe ::Yeti::Editor do
       described_class.stub(:find_by_id).with(context, 1).and_return existing
       described_class.stub(:find_by_id).with(context, 2).and_return another
       described_class.stub(:new_object).with(context).and_return do
-        mock persisted?: false
+        mock persisted?: false, id: nil
       end
     end
     it "two new editors are not equal" do
       subject = described_class.new context
-      subject.should_not == described_class.new(context)
+      other = described_class.new context
+      subject.should_not == other
+      subject.should_not eql other
+      subject.hash.should == other.hash
     end
     it "two editors of the same class with the same id are equal" do
-      subject.should == described_class.from_id(context, 1)
+      other = described_class.from_id context, 1
+      subject.should == other
+      subject.should eql other
+      subject.hash.should == other.hash
     end
     it "two editors of the same class with different ids are not equal" do
-      subject.should_not == described_class.from_id(context, 2)
+      other = described_class.from_id context, 2
+      subject.should_not == other
+      subject.should_not eql other
+      subject.hash.should_not == other.hash
     end
     it "two editors of different classes with the same id are not equal" do
-      subject.should_not == Class.new(described_class).from_id(context, 1)
+      other = Class.new(described_class).from_id context, 1
+      subject.should_not == other
+      subject.should_not eql other
+      subject.hash.should == other.hash
     end
   end
 end

data/spec/yeti/viewer_spec.rb

@@ -2,7 +2,6 @@ require "spec_helper"
 
 describe ::Yeti::Viewer do
   let(:context){ mock :context }
-  subject{ described_class.new context }
   it ".find_by_id is virtual" do
     lambda do
       described_class.find_by_id context, 1
@@ -37,7 +36,7 @@ describe ::Yeti::Viewer do
       subject.decorated.should be existing_object
     end
   end
-  describe "#==" do
+  describe "equality" do
     let(:existing){ mock :object, id: 1 }
     let(:another){ mock :object, id: 2 }
     subject{ described_class.from_id context, 1 }
@@ -46,13 +45,22 @@ describe ::Yeti::Viewer do
       described_class.stub(:find_by_id).with(context, 2).and_return another
     end
     it "two viewers of the same class with the same id are equal" do
-      subject.should == described_class.from_id(context, 1)
+      other = described_class.from_id context, 1
+      subject.should == other
+      subject.should eql other
+      subject.hash.should == other.hash
     end
     it "two viewers of the same class with different ids are not equal" do
-      subject.should_not == described_class.from_id(context, 2)
+      other = described_class.from_id context, 2
+      subject.should_not == other
+      subject.should_not eql other
+      subject.hash.should_not == other.hash
     end
     it "two viewers of different classes with the same id are not equal" do
-      subject.should_not == Class.new(described_class).from_id(context, 1)
+      other = Class.new(described_class).from_id context, 1
+      subject.should_not == other
+      subject.should_not eql other
+      subject.hash.should == other.hash
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yeti
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4028484294120140186
+      hash: 8619314941788214
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4028484294120140186
+      hash: 8619314941788214
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23