spontaneous 0.2.0.beta4 → 0.2.0.beta5

data/test/unit/test_revisions.rb

@@ -102,8 +102,8 @@ describe "Revisions" do
     end
 
     it "understand with_published" do
-      S::Site.stubs(:published_revision).returns(99)
-      Content.with_published do
+      site.stubs(:published_revision).returns(99)
+      Content.with_published(site) do
         Content.mapper.current_revision.must_equal 99
       end
     end
@@ -130,7 +130,7 @@ describe "Revisions" do
 
     it "read revision from the environment if present" do
       ENV["SPOT_REVISION"] = '1001'
-      Content.with_published do
+      Content.with_published(site) do
         Content.mapper.current_revision.must_equal 1001
       end
       ENV.delete("SPOT_REVISION")
@@ -474,7 +474,7 @@ describe "Revisions" do
       first.first_published_at.must_be_nil
       Revision.create(Content, @revision)
       first.reload.first_published_at.to_i.must_equal @now.to_i
-      c = Content.create
+      c = Page.create
       c.first_published_at.must_be_nil
       stub_time(@now + 100)
       Revision.create(Content, @revision+1)

data/test/unit/test_schema.rb

@@ -150,19 +150,19 @@ describe "Schema" do
 
       describe "lookups" do
         it "return classes" do
-          Site.schema.to_class("xxxxxxxxxxxx").must_equal SchemaClass
+          @site.schema.to_class("xxxxxxxxxxxx").must_equal SchemaClass
         end
         it "return fields" do
-          Site.schema.to_class("ffffffffffff").must_equal SchemaClass.field_prototypes[:description]
+          @site.schema.to_class("ffffffffffff").must_equal SchemaClass.field_prototypes[:description]
         end
         it "return boxes" do
-          Site.schema.to_class("bbbbbbbbbbbb").must_equal SchemaClass.box_prototypes[:posts]
+          @site.schema.to_class("bbbbbbbbbbbb").must_equal SchemaClass.box_prototypes[:posts]
         end
         it "return styles" do
-          Site.schema.to_class("ssssssssssss").must_equal SchemaClass.style_prototypes[:simple]
+          @site.schema.to_class("ssssssssssss").must_equal SchemaClass.style_prototypes[:simple]
         end
         it "return layouts" do
-          Site.schema.to_class("llllllllllll").must_equal SchemaClass.layout_prototypes[:clean]
+          @site.schema.to_class("llllllllllll").must_equal SchemaClass.layout_prototypes[:clean]
         end
       end
 
@@ -769,30 +769,6 @@ describe "Schema" do
       end
 
 
-      it "be done automatically if only classes have been removed" do
-        uid = B.schema_id.to_s
-        Object.send(:remove_const, :B)
-        S.schema.stubs(:classes).returns([::A])
-        S.schema.reload!
-        S.schema.validate!
-        m = YAML.load_file(@map_file)
-        refute m.key?(uid)
-      end
-
-      it "be done automatically if only boxes have been removed" do
-        uid = A.boxes[:posts].schema_id.to_s
-        Object.send :remove_const, :A
-        class ::A < ::Page
-          field :title
-          field :introduction
-          layout :sparse
-        end
-        S.schema.stubs(:classes).returns([A, B])
-        S.schema.reload!
-        S.schema.validate!
-        m = YAML.load_file(@map_file)
-        refute m.key?(uid)
-      end
 
       it "be done automatically if only fields have been removed" do
         uid = A.fields[:title].schema_id.to_s
@@ -809,20 +785,6 @@ describe "Schema" do
         refute m.key?(uid)
       end
 
-      it "be done automatically in presence of independent addition inside type and of type" do
-        A.field :moose
-        uid = B.schema_id.to_s
-        Object.send(:remove_const, :B)
-        S.schema.stubs(:classes).returns([::A])
-        S.schema.reload!
-        S.schema.validate!
-        ::A.field_prototypes[:moose].schema_id.wont_be_nil
-
-        m = YAML.load_file(@map_file)
-        m[::A.field_prototypes[:moose].schema_id.to_s].must_equal ::A.field_prototypes[:moose].schema_name
-        refute m.key?(uid)
-      end
-
       it "be done automatically in presence of independent addition & removal of fields" do
         A.field :moose
         f1 = B.field_prototypes[:location]
@@ -840,46 +802,6 @@ describe "Schema" do
         refute m.key?(uid)
       end
 
-      it "be done automatically in presence of independent changes to boxes & fields" do
-        B.field :crisis
-        uid = A.boxes[:posts].schema_id.to_s
-        A.stubs(:box_prototypes).returns(S::Collections::PrototypeSet.new)
-        S.schema.stubs(:classes).returns([A, B])
-        S.schema.reload!
-        S.schema.validate!
-
-        ::B.field_prototypes[:crisis].schema_id.wont_be_nil
-        m = YAML.load_file(@map_file)
-        refute m.key?(uid)
-      end
-
-      it "be done automatically in presence of independent changes to classes, boxes & fields" do
-        class ::X < B; end
-        uid = A.boxes[:posts].schema_id.to_s
-        A.stubs(:box_prototypes).returns(S::Collections::PrototypeSet.new)
-        B.field :crisis
-        B.box :circus
-        A.field :crisis
-        S.schema.stubs(:classes).returns([::A, ::B, ::X])
-        S.schema.reload!
-        S.schema.validate!
-
-        ::A.field_prototypes[:crisis].schema_id.wont_be_nil
-        m = YAML.load_file(@map_file)
-
-        box = ::B.boxes[:circus]
-        m[box.schema_id.to_s].must_equal box.schema_name
-
-        field = ::A.field_prototypes[:crisis]
-        m[field.schema_id.to_s].must_equal field.schema_name
-
-        field = ::B.field_prototypes[:crisis]
-        m[field.schema_id.to_s].must_equal field.schema_name
-
-        refute m.key?(uid)
-      end
-
-
       # sanity check
       it "still raise error in case of addition & deletion" do
         A.field :added
@@ -902,6 +824,28 @@ describe "Schema" do
         lambda { S.schema.validate! }.must_raise(Spontaneous::SchemaModificationError)
       end
 
+      it "raise an error if classes have been removed" do
+        uid = B.schema_id.to_s
+        Object.send(:remove_const, :B)
+        S.schema.stubs(:classes).returns([::A])
+        S.schema.reload!
+
+        lambda { S.schema.validate! }.must_raise(Spontaneous::SchemaModificationError)
+      end
+
+      it "raise an error if boxes have been removed" do
+        uid = A.boxes[:posts].schema_id.to_s
+        Object.send :remove_const, :A
+        class ::A < ::Page
+          field :title
+          field :introduction
+          layout :sparse
+        end
+        S.schema.stubs(:classes).returns([A, B])
+        S.schema.reload!
+        lambda { S.schema.validate! }.must_raise(Spontaneous::SchemaModificationError)
+      end
+
       it "delete box content when a box is removed" do
         instance = A.new
         piece1 = B.new
@@ -916,11 +860,92 @@ describe "Schema" do
         A.stubs(:box_prototypes).returns(S::Collections::PrototypeSet.new)
         S.schema.stubs(:classes).returns([A, B])
         S.schema.reload!
-        S.schema.validate!
+
+        begin
+          S.schema.validate!
+          flunk("Validation should raise error when adding & deleting fields")
+        rescue Spontaneous::SchemaModificationError => e
+          @modification = e.modification
+        end
+        action = @modification.actions.first
+        S.schema.apply(action)
         Content.count.must_equal 1
         Content[instance.id].must_equal instance
       end
 
+      it "deletes type instances when a type is removed" do
+        Spontaneous::State.instance.update(must_publish_all: false)
+        @site.must_publish_all?.must_equal false
+        B.box :pages
+        A.box :pages
+        # a1
+        #  |- b2
+        #      |- a3
+        #  |- a2
+        #
+        # b1
+        #  |- a4
+        a1, a2, a3, a4 = A.create, A.create, A.create, A.create
+        b1, b2, b3     = B.create, B.create, B.create
+        a1.pages << b2
+        a1.pages << a2
+        b2.pages << a3
+        b1.pages << a4
+        [a1, a2, a3, a4, b1, b2, b3].each(&:save)
+        Content.count.must_equal 7
+        uid = B.schema_id.to_s
+        Object.send(:remove_const, :B)
+        S.schema.stubs(:classes).returns([::A])
+        S.schema.reload!
+        begin
+          S.schema.validate!
+          flunk("Validation should raise error when adding & deleting fields")
+        rescue Spontaneous::SchemaModificationError => e
+          @modification = e.modification
+        end
+        action = @modification.actions.first
+        S.schema.apply(action)
+        # The type filtering automatically filters out any instances belonging to the deleted type
+        # only a1 & a2 should be left
+        Content.count.must_equal 2
+        all = Content.order(:id).all
+        all.map(&:class).must_equal [A, A]
+        # to check that they're gone from the db i have to go a bit lower
+        content = S.database[:content].all
+        content.length.must_equal 2
+        content.map { |c| c[:type_sid] }.must_equal [A.schema_id.to_s, A.schema_id.to_s]
+        @site.must_publish_all?.must_equal true
+      end
+
+      it "doesn't mark the site as 'dirty' if no instances are deleted by the change in the schema" do
+        Spontaneous::State.instance.update(must_publish_all: false)
+        @site.must_publish_all?.must_equal false
+        A.box :pages
+        # a1
+        #  |- b2
+        #      |- a3
+        #  |- a2
+        #
+        # b1
+        #  |- a4
+        a = A.create
+        Content.count.must_equal 1
+        uid = B.schema_id.to_s
+        Object.send(:remove_const, :B)
+        S.schema.stubs(:classes).returns([::A])
+        S.schema.reload!
+        begin
+          S.schema.validate!
+          flunk("Validation should raise error when adding & deleting fields")
+        rescue Spontaneous::SchemaModificationError => e
+          @modification = e.modification
+        end
+        action = @modification.actions.first
+        S.schema.apply(action)
+        Content.count.must_equal 1
+        @site.must_publish_all?.must_equal false
+      end
+
       describe "conflict" do
         describe "-1 field" do
           before do

data/test/unit/test_search.rb

@@ -92,61 +92,61 @@ describe "Search" do
 
   describe "indexes" do
     it "be retrievable by name" do
-      index = S::Site.index :arthur
-      S::Site.indexes[:arthur].must_be_instance_of Spontaneous::Search::Index
-      S::Site.indexes[:arthur].name.must_equal :arthur
-      S::Site.indexes[:arthur].must_equal index
+      index = @site.index :arthur
+      @site.indexes[:arthur].must_be_instance_of Spontaneous::Search::Index
+      @site.indexes[:arthur].name.must_equal :arthur
+      @site.indexes[:arthur].must_equal index
     end
 
     it "default to indexing all content classes" do
-      index = S::Site.index :all
+      index = @site.index :all
       assert_has_elements (@all_classes), index.search_types
     end
 
     it "allow restriction to particular classes" do
-      index = S::Site.index :all do
+      index = @site.index :all do
         include_types ::PageClass1, "PageClass2", :PageClass3
       end
       assert_has_elements [::PageClass1, ::PageClass2, ::PageClass3], index.search_types
     end
 
     it "allow restriction to a class & its subclasses" do
-      index = S::Site.index :all do
+      index = @site.index :all do
         include_types ">= PageClass1"
       end
       assert_has_elements [::PageClass1, ::PageClass3, ::PageClass5, ::PageClass6], index.search_types
     end
 
     it "allow restriction to a class's subclasses" do
-      index = S::Site.index :all do
+      index = @site.index :all do
         include_types "> PageClass1"
       end
       assert_has_elements [::PageClass3, ::PageClass5, ::PageClass6], index.search_types
     end
 
     it "allow removal of particular classes" do
-      index = S::Site.index :all do
+      index = @site.index :all do
         exclude_types ::PageClass1, "PageClass2"
       end
       assert_has_elements (@all_classes - [PageClass1, PageClass2]), index.search_types
     end
 
     it "allow removal of a class and its subclasses" do
-      index = S::Site.index :all do
+      index = @site.index :all do
         exclude_types ">= PageClass1", PieceClass1
       end
       assert_has_elements (@all_classes - [::PageClass1, ::PageClass3, ::PageClass5, ::PageClass6, PieceClass1]), index.search_types
     end
 
     it "allow removal of a class's subclasses" do
-      index = S::Site.index :all do
+      index = @site.index :all do
         exclude_types "> PageClass1"
       end
       assert_has_elements (@all_classes - [::PageClass3, ::PageClass5, ::PageClass6]), index.search_types
     end
 
     it "default to including all content" do
-      index = S::Site.index :all
+      index = @site.index :all
       @all_pages.each do |page|
         assert index.include?(page)
       end
@@ -155,7 +155,7 @@ describe "Search" do
     it "allow restriction to a set of specific pages" do
       id = @root0.id
       path = @page8.path
-      index = S::Site.index :all do
+      index = @site.index :all do
         include_pages id, "$page11", path
       end
 
@@ -164,7 +164,7 @@ describe "Search" do
     end
 
     it "allow restriction to a page and its children" do
-      index = S::Site.index :all do
+      index = @site.index :all do
         include_pages ">= $page8"
       end
 
@@ -173,7 +173,7 @@ describe "Search" do
     end
 
     it "allow restriction to a page's children" do
-      index = S::Site.index :all do
+      index = @site.index :all do
         include_pages "> $page8"
       end
 
@@ -182,7 +182,7 @@ describe "Search" do
     end
 
     it "allow removal of specific pages" do
-      index = S::Site.index :all do
+      index = @site.index :all do
         exclude_pages "$page8", "/page1"
       end
 
@@ -191,7 +191,7 @@ describe "Search" do
     end
 
     it "allow removal of a page and its children" do
-      index = S::Site.index :all do
+      index = @site.index :all do
         exclude_pages "/page1", ">= $page8"
       end
 
@@ -200,7 +200,7 @@ describe "Search" do
     end
 
     it "allow removal of a page's children" do
-      index = S::Site.index :all do
+      index = @site.index :all do
         exclude_pages "/page1", "> $page8"
       end
 
@@ -209,7 +209,7 @@ describe "Search" do
     end
 
     it "allow multiple, mixed, page restrictions" do
-      index = S::Site.index :all do
+      index = @site.index :all do
         include_pages "$page1", "> $page8"
       end
 
@@ -218,7 +218,7 @@ describe "Search" do
     end
 
     it "allow combining of class and page restrictions" do
-      index = S::Site.index :all do
+      index = @site.index :all do
         exclude_types PageClass3, PageClass4
         include_pages "$page1", "> $page8"
         exclude_pages "$page10"
@@ -281,9 +281,9 @@ describe "Search" do
     #
     #
     before do
-      @index1 = S::Site.index(:one)
-      @index2 = S::Site.index(:two)
-      @index3 = S::Site.index(:three) do
+      @index1 = @site.index(:one)
+      @index2 = @site.index(:two)
+      @index3 = @site.index(:three) do
         include_types PageClass1
       end
     end
@@ -304,7 +304,7 @@ describe "Search" do
       assert prototype_a.in_index?(@index2)
       assert prototype_a.in_index?(@index3)
       [:one, :two, :three].each do |name|
-        index = S::Site.indexes[name]
+        index = @site.indexes[name]
         index.fields[PageClass1.fields[:a].schema_id.to_s][:weight].must_equal 16
       end
     end
@@ -348,20 +348,20 @@ describe "Search" do
 
       h = ::PageClass1.boxes.pages.instance_class.field :h, :index => :two
 
-      S::Site.indexes[:one].fields.must_equal({
+      @site.indexes[:one].fields.must_equal({
         a.schema_id.to_s => { :type => String, :store => true, :index => false},
         b.schema_id.to_s => { :type => String, :store => true, :weight => 1, :index => true},
         c.schema_id.to_s => { :type => String, :store => true, :weight => 4, :index => true},
         g.schema_id.to_s => { :type => String, :store => true, :weight => 16, :index => true}
       })
 
-      S::Site.indexes[:two].fields.must_equal({
+      @site.indexes[:two].fields.must_equal({
         :a => { :type => String, :store => true, :weight => 2, :index => true},
         g.schema_id.to_s => { :type => String, :store => true, :weight => 16, :index => true},
         h.schema_id.to_s => { :type => String, :store => true, :weight => 1, :index => true}
       })
 
-      S::Site.indexes[:three].fields.must_equal({
+      @site.indexes[:three].fields.must_equal({
         e.schema_id.to_s => { :type => String, :store => true, :weight => 1, :index => true}
       })
     end
@@ -371,10 +371,10 @@ describe "Search" do
     before do
       @revision = 99
 
-      @index1 = S::Site.index :one do
+      @index1 = @site.index :one do
         exclude_types PageClass3
       end
-      @index2 = S::Site.index :two
+      @index2 = @site.index :two
 
       @a = PageClass1.field  :a, :index => true
       @b = PageClass2.field  :b, :index => true
@@ -430,7 +430,7 @@ describe "Search" do
     end
 
     it "only include specified pieces" do
-      index = S::Site.index :four do
+      index = @site.index :four do
         include_types PageClass1, PieceClass1
       end
 
@@ -442,7 +442,7 @@ describe "Search" do
     end
 
     it "allow for page types to append their own custom indexable values" do
-      index = S::Site.index :four do
+      index = @site.index :four do
         include_types PageClass1, PieceClass1
       end
       class ::PageClass1
@@ -461,7 +461,7 @@ describe "Search" do
     end
 
     it "deal with arrays of additional search index values" do
-      index = S::Site.index :four do
+      index = @site.index :four do
         include_types PageClass1, PieceClass1
       end
       class ::PageClass1
@@ -482,7 +482,7 @@ describe "Search" do
     end
 
     it "allow for pieces to append their own custom indexable values" do
-      index = S::Site.index :four do
+      index = @site.index :four do
         include_types PageClass1, PieceClass1
       end
       class ::PieceClass1
@@ -502,7 +502,7 @@ describe "Search" do
 
     it "create database in the right directory" do
       db_path = @site.revision_dir(@revision) / 'indexes' / 'one'
-      Site.stubs(:published_revision).returns(@revision)
+      @site.stubs(:published_revision).returns(@revision)
       mset = mock()
       mset.stubs(:matches).returns([])
       xapian = mock()
@@ -531,7 +531,7 @@ describe "Search" do
     it "pass on index configuration to the xapian db" do
       db_path = @site.revision_dir(@revision) / 'indexes' / 'name'
 
-      index = Site.index :name do
+      index = @site.index :name do
         language :italian
       end
 
@@ -546,7 +546,7 @@ describe "Search" do
 
       db = index.create_db(@revision)
 
-      index = Site.index :name do
+      index = @site.index :name do
         language :french
         stopper  false
         stemmer  false
@@ -570,7 +570,7 @@ describe "Search" do
 
     it "return (reasonable) results to searches" do
       db_path = @site.revision_dir(@revision) / 'indexes' / 'one'
-      S::Site.stubs(:published_revision).returns(@revision)
+      @site.stubs(:published_revision).returns(@revision)
       db = @index1.create_db(@revision)
       db << @page1
       db << @page2
@@ -605,7 +605,7 @@ describe "Search" do
 
     it "returns pages based on the contents of their boxes" do
       db_path = @site.revision_dir(@revision) / 'indexes' / 'one'
-      S::Site.stubs(:published_revision).returns(@revision)
+      @site.stubs(:published_revision).returns(@revision)
       db = @index1.create_db(@revision)
       db << @page1
       db << @page2
@@ -619,7 +619,7 @@ describe "Search" do
 
     it "respect weighting factors given to fields" do
       db_path = @site.revision_dir(@revision) / 'indexes' / 'one'
-      S::Site.stubs(:published_revision).returns(@revision)
+      @site.stubs(:published_revision).returns(@revision)
       db = @index1.create_db(@revision)
       @w = PieceClass1.field :w, :index => { :weight => 100 }
       @page1.pages << PieceClass1.new(:w => "findme")
@@ -641,11 +641,11 @@ describe "Search" do
 
     it "use the weighting specific to a subclass" do
       db_path = @site.revision_dir(@revision) / 'indexes' / 'one'
-      S::Site.stubs(:published_revision).returns(@revision)
+      @site.stubs(:published_revision).returns(@revision)
       @w = PieceClass1.field :w, :index => { :weight => 100 }
       WeightedPiece = Class.new(PieceClass1)
       WeightedPiece.field :w, :index => { :weight => 1}
-      index = Site.index :weighted do
+      index = @site.index :weighted do
       end
       @page1.pages << WeightedPiece.new(:w => "findme")
       @page2.pages << PieceClass2.new(:h => "findme findme")
@@ -674,7 +674,7 @@ describe "Search" do
       db2.expects(:<<).with(@page1)
       db1.expects(:close)
       db2.expects(:close)
-      S::Site.indexer(@revision) do |indexer|
+      @site.indexer(@revision) do |indexer|
         indexer.length.must_equal 2
         indexer << @page1
       end