selectable_attr 0.3.16 → 0.3.17

data/VERSION

@@ -1 +1 @@
-0.3.16
+0.3.17

data/lib/selectable_attr/enum.rb

@@ -30,6 +30,28 @@ module SelectableAttr
       entries.each(&block)
     end
 
+    def ==(other)
+      return false unless length == other.length
+      other_entries = other.entries
+      # ruby-1.8系ではEnumeratir#with_indexが使えないので1.8でも使用可能な書き方に変更しました。
+      # entries.map.with_index{|e, i| e == other_entries[i]}.all? # for 1.9
+      entries.each_with_index do |e, i|
+        return false unless e == other_entries[i]
+      end
+      true
+    end
+
+    def ===(other)
+      return false unless length == other.length
+      other_entries = other.entries
+      # ruby-1.8系ではEnumeratir#with_indexが使えないので1.8でも使用可能な書き方に変更しました。
+      # entries.map.with_index{|e, i| e === other_entries[i]}.all?
+      entries.each_with_index do |e, i|
+        return false unless e === other_entries[i]
+      end
+      true
+    end
+
     def define(id, key, name, options = nil, &block)
       entry = Entry.new(self, id, key, name, options, &block)
       entry.instance_variable_set(:@defined_in_code, true)
@@ -123,7 +145,7 @@ module SelectableAttr
 
     class Entry
       BASE_ATTRS = [:id, :key, :name]
-      attr_reader :id, :key
+      attr_reader :id, :key, :options
       attr_reader :defined_in_code
       def initialize(enum, id, key, name, options = nil, &block)
         @enum = enum
@@ -149,6 +171,24 @@ module SelectableAttr
         @options === options
       end
 
+      def ==(other)
+        case other
+        when SelectableAttr::Enum::Entry
+          self.id == other.id
+        else
+          false
+        end
+      end
+
+      def ===(other)
+        case other
+        when SelectableAttr::Enum::Entry
+          (self.id == other.id) && (self.key == other.key)
+        else
+          false
+        end
+      end
+
       def null?
         false
       end

data/selectable_attr.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "selectable_attr"
-  s.version = "0.3.16"
+  s.version = "0.3.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takeshi Akima"]

data/spec/selectable_attr_enum_spec.rb

@@ -158,4 +158,107 @@ describe SelectableAttr::Enum do
     end
   end
 
+  describe "SelectableAttr::Enum::Entry#==" do
+    context "same enum entry" do
+      subject{ Enum1.entry_by_id(1) } # entry 1, :book, '書籍'
+      it{ should == subject}
+      it{ should === subject}
+      it{ should eql(subject)}
+      it{ should equal(subject)}
+    end
+
+    context "an enum entry which has same attributes" do
+      subject do
+        enum = SelectableAttr::Enum.new{ entry(1, :book, '書籍') }
+        enum.entry_by_id(1)
+      end
+      before{ @other = Enum1.entry_by_id(1) }
+      it{ should == @other}
+      it{ should === @other}
+      it{ should_not eql(@other)}
+      it{ should_not equal(@other)}
+    end
+
+    context "an enum entry which has same id and key" do
+      subject do
+        enum = SelectableAttr::Enum.new{ entry(1, :book, '料理') }
+        enum.entry_by_id(1)
+      end
+      before{ @other = Enum1.entry_by_id(1) }
+      it{ should == @other}
+      it{ should === @other}
+      it{ should_not eql(@other)}
+      it{ should_not equal(@other)}
+    end
+
+    context "an enum entry which has same id" do
+      subject do
+        enum = SelectableAttr::Enum.new{ entry(1, :cook, '料理') }
+        enum.entry_by_id(1)
+      end
+      before{ @other = Enum1.entry_by_id(1) }
+      it{ should == @other}
+      it{ should_not === @other}
+      it{ should_not eql(@other)}
+      it{ should_not equal(@other)}
+    end
+  end
+
+  describe "SelectableAttr::Enum#==" do
+    context "same enum object" do
+      subject{ Enum1 }
+      it{ should == Enum1}
+      it{ should === Enum1}
+      it{ should eql(Enum1)}
+      it{ should equal(Enum1)}
+    end
+
+    context "an object which has same entries" do
+      subject do
+        SelectableAttr::Enum.new do
+          entry 1, :book, '書籍'
+          entry 2, :dvd, 'DVD'
+          entry 3, :cd, 'CD'
+          entry 4, :vhs, 'VHS'
+        end
+      end
+
+      it{ should == Enum1}
+      it{ should === Enum1}
+      it{ should_not eql(Enum1)}
+      it{ should_not equal(Enum1)}
+    end
+
+    context "an object which has entries with same id" do
+      subject do
+        SelectableAttr::Enum.new do
+          entry 1, :cook, '料理'
+          entry 2, :blueray, 'BD'
+          entry 3, :mv, 'Move Directory'
+          entry 4, :UHF, 'Ultra High Frequency'
+        end
+      end
+
+      it{ should == Enum1}
+      it{ should_not === Enum1}
+      it{ should_not eql(Enum1)}
+      it{ should_not equal(Enum1)}
+    end
+
+    context "an object which has same entries with different order" do
+      subject do
+        SelectableAttr::Enum.new do
+          entry 1, :book, '書籍'
+          entry 3, :cd, 'CD'
+          entry 4, :vhs, 'VHS'
+          entry 2, :dvd, 'DVD'
+        end
+      end
+
+      it{ should_not == Enum1}
+      it{ should_not === Enum1}
+      it{ should_not eql(Enum1)}
+      it{ should_not equal(Enum1)}
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selectable_attr
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.3.17
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2154121020 !ruby/object:Gem::Requirement
+  requirement: &2158590640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154121020
+  version_requirements: *2158590640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154120540 !ruby/object:Gem::Requirement
+  requirement: &2158590160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2154120540
+  version_requirements: *2158590160
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2154120060 !ruby/object:Gem::Requirement
+  requirement: &2158589680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2154120060
+  version_requirements: *2158589680
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2154119580 !ruby/object:Gem::Requirement
+  requirement: &2158589200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *2154119580
+  version_requirements: *2158589200
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2154119100 !ruby/object:Gem::Requirement
+  requirement: &2158588720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2154119100
+  version_requirements: *2158588720
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2154118620 !ruby/object:Gem::Requirement
+  requirement: &2158588240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *2154118620
+  version_requirements: *2158588240
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &2154118140 !ruby/object:Gem::Requirement
+  requirement: &2158587760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154118140
+  version_requirements: *2158587760
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2154117660 !ruby/object:Gem::Requirement
+  requirement: &2158587280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154117660
+  version_requirements: *2158587280
 description: selectable_attr generates extra methods dynamically for attribute which
   has options
 email: akm2000@gmail.com
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3113713205006860534
+      hash: 4102483643633265272
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: