Make EntryIndex a unique index (don't add the same entry twice)

Thibaut committed 11 years ago

Commit 7de19cf1 parent cb0b2e03 files · +32 −14Browse files

Unified · Split

3 files

lib/docs/core/entry_index.rb +5 −2
test/lib/docs/core/doc_test.rb +5 −2
test/lib/docs/core/entry_index_test.rb +22 −10

     def initialize
       @entries = []
+      @index = Set.new
       @types = Hash.new { |hash, key| hash[key] = Type.new key }
     end
     private
     def add_entry(entry)
-      @entries << entry.dup
+      if @index.add?(entry.as_json.to_s)
-      @types[entry.type].count += 1 if entry.type
+        @entries << entry.dup
+        @types[entry.type].count += 1 if entry.type
+      end
     end
     def entries_as_json

test/lib/docs/core/doc_test.rb+5−2

     context "when pages are built successfully" do
       let :pages do
-        [page.dup, page.dup]
+        [
+          page.deep_dup.tap { |p| page[:entries].first.tap { |e| e.name = 'one' } },
+          page.deep_dup.tap { |p| page[:entries].first.tap { |e| e.name = 'two' } }
+        ]
       end
       before do
           mock(store).write('index.json', anything) do |path, json|
             json = JSON.parse(json)
             assert_equal pages.length, json['entries'].length
-            assert_includes json['entries'], entry.as_json.stringify_keys
+            assert_includes json['entries'], Docs::Entry.new('one').as_json.stringify_keys
           end
           doc.store_pages(store)
         end

test/lib/docs/core/entry_index_test.rb+22−10

 class DocsEntryIndexTest < MiniTest::Spec
   let :entry do
-    Docs::Entry.new 'name', 'type', 'path'
+    Docs::Entry.new 'name', 'path', 'type'
   end
   let :index do
     end
     it "stores an array of entries" do
-      entries = [entry, entry]
+      entries = [
+        Docs::Entry.new('one', 'path', 'type'),
+        Docs::Entry.new('two', 'path', 'type')
+      ]
       index.add(entries)
       assert_equal entries, index.entries
     end
       assert_empty index.types
     end
+    it "doesn't store the same entry twice" do
+      2.times { index.add(entry.dup) }
+      assert_equal [entry], index.entries
+    end
     it "creates and indexes the type" do
-      entry.type = 'one'; index.add(entry)
+      index.add Docs::Entry.new('one', 'path', 'a')
-      entry.type = 'two'; 2.times { index.add(entry) }
+      index.add Docs::Entry.new('two', 'path', 'b')
-      assert_equal ['one', 'two'], index.types.keys
+      index.add Docs::Entry.new('three', 'path', 'b')
-      assert_instance_of Docs::Type, index.types['one']
+      assert_equal ['a', 'b'], index.types.keys
+      assert_instance_of Docs::Type, index.types['a']
     end
     it "doesn't index the nil type" do
     end
     it "increments the type's count" do
-      2.times { index.add(entry) }
+      index.add Docs::Entry.new('one', 'path', 'type')
-      assert_equal 2, index.types[entry.type].count
+      index.add Docs::Entry.new('two', 'path', 'type')
+      assert_equal 2, index.types['type'].count
     end
   end
       end
       it "includes the json representation of the #entries" do
-        index.add [entry, entry]
+        index.add one = Docs::Entry.new('one', 'path', 'type')
-        assert_equal [entry.as_json, entry.as_json], index.as_json[:entries]
+        index.add two = Docs::Entry.new('two', 'path', 'type')
+        assert_equal [one.as_json, two.as_json], index.as_json[:entries]
       end
       it "is sorted by name, case-insensitive" do