spontaneous 0.2.0.alpha7 → 0.2.0.beta1

data/test/unit/test_schema.rb

@@ -4,12 +4,11 @@ require File.expand_path('../../test_helper', __FILE__)
 
 
 class SchemaTest < MiniTest::Spec
-  include Spontaneous
-
-
   def setup
     @site = setup_site
     @site.schema_loader_class = Spontaneous::Schema::PersistentMap
+    S::Permissions::UserLevel.reset!
+    S::Permissions::UserLevel.stubs(:level_file).returns(File.expand_path('../../fixtures/permissions', __FILE__) / 'config/user_levels.yml')
   end
 
   def teardown
@@ -18,9 +17,9 @@ class SchemaTest < MiniTest::Spec
 
   context "Configurable names" do
     setup do
-      class ::FunkyContent < Content; end
+      class ::FunkyContent < Piece; end
       class ::MoreFunkyContent < FunkyContent; end
-      class ::ABCDifficultName < Content; end
+      class ::ABCDifficultName < Piece; end
 
       class ::CustomName < ABCDifficultName
         title "Some Name"
@@ -68,8 +67,10 @@ class SchemaTest < MiniTest::Spec
           layout :clean
           box :posts
         end
+        # force loading of map
+        @site.schema.map
         @instance = SchemaClass.new
-        @uids = @site.uid
+        @uids = @site.schema.uids
       end
 
       teardown do
@@ -81,7 +82,7 @@ class SchemaTest < MiniTest::Spec
       # end
 
       should "be unique" do
-        ids = (0..10000).map { Schema::UIDMap.generate }
+        ids = (0..10000).map { S::Schema::UIDMap.generate }
         ids.uniq.length.should == ids.length
       end
 
@@ -146,19 +147,19 @@ class SchemaTest < MiniTest::Spec
 
       context "lookups" do
         should "return classes" do
-          Site.schema["xxxxxxxxxxxx"].should == SchemaClass
+          Site.schema.to_class("xxxxxxxxxxxx").should == SchemaClass
         end
         should "return fields" do
-          Site.schema["ffffffffffff"].should == SchemaClass.field_prototypes[:description]
+          Site.schema.to_class("ffffffffffff").should == SchemaClass.field_prototypes[:description]
         end
         should "return boxes" do
-          Site.schema["bbbbbbbbbbbb"].should == SchemaClass.box_prototypes[:posts]
+          Site.schema.to_class("bbbbbbbbbbbb").should == SchemaClass.box_prototypes[:posts]
         end
         should "return styles" do
-          Site.schema["ssssssssssss"].should == SchemaClass.style_prototypes[:simple]
+          Site.schema.to_class("ssssssssssss").should == SchemaClass.style_prototypes[:simple]
         end
         should "return layouts" do
-          Site.schema["llllllllllll"].should == SchemaClass.layout_prototypes[:clean]
+          Site.schema.to_class("llllllllllll").should == SchemaClass.layout_prototypes[:clean]
         end
       end
 
@@ -167,12 +168,10 @@ class SchemaTest < MiniTest::Spec
     context "schema verification" do
       setup do
         @site.schema.schema_map_file = File.expand_path('../../fixtures/schema/before.yml', __FILE__)
-        class ::Page < Spontaneous::Page
-          field :title
-        end
+        Page.field :title
         class B < ::Page; end
-        class C < Content; end
-        class D < Content; end
+        class C < Piece; end
+        class D < Piece; end
         class O < Box; end
         B.field :description
         B.field :author
@@ -199,6 +198,7 @@ class SchemaTest < MiniTest::Spec
         #       between tests
         # Schema.stubs(:classes).returns([B, C, D, O])
         # Schema.classes.should == [B, C, D, O]
+        @site.schema.map
         @uids = @site.schema.uids
         ::Page.schema_id.should == @uids["tttttttttttt"]
         B.schema_id.should == @uids["bbbbbbbbbbbb"]
@@ -224,7 +224,7 @@ class SchemaTest < MiniTest::Spec
       end
 
       should "detect addition of classes" do
-        class E < Content; end
+        class E < ::Piece; end
         @site.schema.stubs(:classes).returns([B, C, D, E])
         exception = nil
         begin
@@ -477,8 +477,8 @@ class SchemaTest < MiniTest::Spec
   context "Transient (testing) maps" do
     setup do
       @site.schema.schema_loader_class = Spontaneous::Schema::TransientMap
-      class V < Spontaneous::Piece; end
-      class W < Spontaneous::Piece; end
+      class V < ::Piece; end
+      class W < ::Piece; end
     end
     teardown do
       self.class.send(:remove_const, :V)
@@ -503,7 +503,7 @@ class SchemaTest < MiniTest::Spec
 
     context "for inherited boxes" do
       setup do
-        class ::A < Spontaneous::Piece
+        class ::A < ::Piece
           box :a
         end
         class ::B < ::A
@@ -529,13 +529,13 @@ class SchemaTest < MiniTest::Spec
 
   context "Schema groups" do
     setup do
-      class ::A < Spontaneous::Page
+      class ::A < ::Page
         group :a, :b, :c
         box :cgroup do
           allow_group :c
         end
       end
-      class ::B < Spontaneous::Piece
+      class ::B < ::Piece
         group :b, :c
         style :fish
         style :frog
@@ -544,7 +544,7 @@ class SchemaTest < MiniTest::Spec
           allow_groups :a, :c
         end
       end
-      class ::C < Spontaneous::Piece
+      class ::C < ::Piece
         group :c
 
         box :bgroup do
@@ -571,10 +571,13 @@ class SchemaTest < MiniTest::Spec
 
     should "apply the options to all the included classes" do
       user = mock()
+      S::Permissions.stubs(:has_level?).with(user, S::Permissions::UserLevel.editor).returns(true)
       S::Permissions.stubs(:has_level?).with(user, S::Permissions::UserLevel.root).returns(true)
-      A.boxes.cgroup.allowed_types(user).should == [A, B, C]
+      C.boxes.cgroup.allowed_types(user).should == [A, B, C]
+      S::Permissions.stubs(:has_level?).with(user, S::Permissions::UserLevel.editor).returns(true)
       S::Permissions.stubs(:has_level?).with(user, S::Permissions::UserLevel.root).returns(false)
-      A.boxes.cgroup.allowed_types(user).should == []
+      C.boxes.cgroup.allowed_types(user).should == []
+      A.boxes.cgroup.allowed_types(user).should == [A, B, C]
     end
 
     should "allow for configuring styles" do
@@ -591,7 +594,7 @@ class SchemaTest < MiniTest::Spec
       @site.schema.delete(::B)
       Object.send(:remove_const, :B)
 
-      class ::B < Spontaneous::Piece
+      class ::B < ::Piece
         group :b
         style :fish
         style :frog
@@ -612,7 +615,7 @@ class SchemaTest < MiniTest::Spec
   context "Map writing" do
     context "Non-existant maps" do
       def expected_schema
-        classes = [ ::A, ::B]
+        classes = @site.schema.classes#[ Content::Page, Page, Content::Piece, Piece, ::A, ::B]
         expected = Hash[ classes.map { |klass| [ klass.schema_id.to_s, klass.schema_name ] } ]
         expected.merge!({
           A.field_prototypes[:title].schema_id.to_s => A.field_prototypes[:title].schema_name,
@@ -632,7 +635,7 @@ class SchemaTest < MiniTest::Spec
         ::FileUtils.rm_f(@map_file) if ::File.exists?(@map_file)
 
         @site.schema.schema_map_file = @map_file
-        class ::A < Spontaneous::Page
+        class ::A < ::Page
           field :title
           field :introduction
           layout :sparse
@@ -640,7 +643,7 @@ class SchemaTest < MiniTest::Spec
             field :description
           end
         end
-        class ::B < Spontaneous::Piece
+        class ::B < ::Piece
           field :location
           style :daring
         end
@@ -678,7 +681,7 @@ class SchemaTest < MiniTest::Spec
         FileUtils.mkdir_p(File.dirname(@map_file))
         FileUtils.cp(File.expand_path('../../fixtures/schema/resolvable.yml', __FILE__), @map_file)
         @site.schema.schema_map_file = @map_file
-        class ::A < Spontaneous::Page
+        class ::A < ::Page
           field :title
           field :introduction
           layout :sparse
@@ -686,7 +689,7 @@ class SchemaTest < MiniTest::Spec
             field :description
           end
         end
-        class ::B < Spontaneous::Piece
+        class ::B < ::Piece
           field :location
           field :duration
           style :daring
@@ -700,26 +703,10 @@ class SchemaTest < MiniTest::Spec
         Object.send(:remove_const, :B) rescue nil
         Object.send(:remove_const, :X) rescue nil
         Object.send(:remove_const, :Y) rescue nil
-        S::Content.delete
+        ::Content.delete
         FileUtils.rm(@map_file) if ::File.exists?(@map_file) rescue nil
       end
 
-      should "update the STI map after addition of classes" do
-        ::A.sti_subclasses_array.should == [::A.schema_id.to_s]
-        class ::X < ::A
-          field :wild
-          box :monkeys do
-            field :banana
-          end
-          layout :rich
-        end
-        S.schema.validate!
-        ::X.schema_id.should_not be_nil
-        ::X.sti_key_array.should == [::X.schema_id.to_s]
-        ::A.sti_subclasses_array.should == [::A.schema_id.to_s, ::X.schema_id.to_s]
-      end
-
-
       should "be done automatically if only additions are found" do
         A.field :moose
         class ::X < ::A
@@ -760,7 +747,12 @@ class SchemaTest < MiniTest::Spec
 
       should "be done automatically if only boxes have been removed" do
         uid = A.boxes[:posts].schema_id.to_s
-        A.stubs(:box_prototypes).returns(S::Collections::PrototypeSet.new)
+        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!
@@ -768,12 +760,15 @@ class SchemaTest < MiniTest::Spec
         m.key?(uid).should be_false
       end
 
-      should "be done automatically if only fields have been removed" do
-        f1 = A.field_prototypes[:title]
-        uid = f1.schema_id.to_s
-        f2 = A.field_prototypes[:introduction]
-        A.stubs(:field_prototypes).returns({:introduction => f2})
-        A.stubs(:fields).returns([f2])
+      should "be done automatically if only fields have been removed xxx" do
+        uid = A.fields[:title].schema_id.to_s
+        S.schema.delete(::A)
+        Object.send :remove_const, :A
+        class ::A < ::Page
+          field :introduction
+          layout :sparse
+          box(:posts) { field :description }
+        end
         S.schema.reload!
         S.schema.validate!
         m = YAML.load_file(@map_file)
@@ -880,7 +875,7 @@ class SchemaTest < MiniTest::Spec
         instance.posts << piece1
         instance.posts << piece2
         instance.save
-        instance = S::Content[instance.id]
+        instance = Content[instance.id]
         instance.posts.contents.length.should == 2
         Content.count.should == 3
         uid = A.boxes[:posts].schema_id.to_s
@@ -889,7 +884,7 @@ class SchemaTest < MiniTest::Spec
         S.schema.reload!
         S.schema.validate!
         Content.count.should == 1
-        S::Content[instance.id].should == instance
+        Content[instance.id].should == instance
       end
 
       context "which isn't automatically resolvable" do

data/test/unit/test_search.rb

@@ -27,13 +27,13 @@ class SearchTest < MiniTest::Spec
 
   def self.startup
     # make sure that S::Piece & S::Page are removed from the schema
-    setup_site
-    *ids = S::Page.schema_id, S::Piece.schema_id
-    Object.const_set(:Site, Class.new(S::Site))
+    # setup_site
+    # *ids = S::Page.schema_id, S::Piece.schema_id
+    # Object.const_set(:Site, Class.new(S::Site))
   end
 
   def self.shutdown
-    Object.send(:remove_const, :Site) rescue nil
+    # Object.send(:remove_const, :Site) rescue nil
   end
 
   def setup
@@ -49,8 +49,8 @@ class SearchTest < MiniTest::Spec
       Content.delete
 
 
-      class ::Piece < S::Piece; end
-      class ::Page < S::Page; end
+      # class ::Piece < S::Piece; end
+      # class ::Page < S::Page; end
       b = ::Page.box :pages
       # instantiate box instance class to it gets added to schema
       ::Page.boxes.pages.instance_class.schema_id
@@ -68,7 +68,7 @@ class SearchTest < MiniTest::Spec
 
       @all_page_classes = [::Page, ::PageClass1, ::PageClass2, ::PageClass3, ::PageClass4, ::PageClass5, ::PageClass6]
       @all_piece_classes = [::Piece, ::PieceClass1, ::PieceClass2, ::PieceClass3]
-      @all_box_classes = [ ::Page::PagesBox ]
+      @all_box_classes = [ ::Box, ::Page::PagesBox ]
       @all_classes = @all_page_classes + @all_piece_classes + @all_box_classes
 
       @root0 = ::Page.create(:uid => "root")
@@ -401,7 +401,7 @@ class SearchTest < MiniTest::Spec
         @l = ::PageClass1.boxes.pages.instance_class.field :l, :index => true
 
         @page1.a = "a value 1"
-        @page1.pages.first.a =  "a value 2"
+      @page1.pages.first.a =  "a value 2"
         @page1.pages.l =  "l value 1"
 
         @piece1 = PieceClass1.new(:g => "g value 1")
@@ -520,14 +520,14 @@ class SearchTest < MiniTest::Spec
         xapian.expects(:search).with('"value 2"', {}).returns(XapianFu::ResultSet.new(:mset => mset))
         xapian.expects(:flush)
 
-        XapianFu::XapianDb.expects(:new).with({
+        XapianFu::XapianDb.expects(:new).with(has_entries({
           :dir => db_path,
           :create => true,
           :overwrite => true,
           :language => :english,
           :fields => @index1.fields,
           :spelling => true
-        }).returns(xapian)
+        })).returns(xapian)
 
         db = @index1.create_db(@revision)
         assert File.directory?(db_path)
@@ -545,14 +545,14 @@ class SearchTest < MiniTest::Spec
           language :italian
         end
 
-        XapianFu::XapianDb.expects(:new).with({
+        XapianFu::XapianDb.expects(:new).with(has_entries({
           :dir => db_path,
           :create => true,
           :overwrite => true,
           :language => :italian,
           :fields => index.fields,
           :spelling => true
-        })
+        }))
 
         db = index.create_db(@revision)
 
@@ -562,7 +562,7 @@ class SearchTest < MiniTest::Spec
           stemmer  false
         end
 
-        XapianFu::XapianDb.expects(:new).with({
+        XapianFu::XapianDb.expects(:new).with(has_entries({
           :dir => db_path,
           :create => true,
           :overwrite => true,
@@ -571,7 +571,7 @@ class SearchTest < MiniTest::Spec
           :stopper => false,
           :fields => index.fields,
           :spelling => true
-        })
+        }))
 
         db = index.create_db(@revision)
 
@@ -580,7 +580,7 @@ class SearchTest < MiniTest::Spec
 
       should "return (reasonable) results to searches" do
         db_path = @site.revision_dir(@revision) / 'indexes' / 'one'
-        Site.stubs(:published_revision).returns(@revision)
+        S::Site.stubs(:published_revision).returns(@revision)
         db = @index1.create_db(@revision)
         db << @page1
         db << @page2
@@ -590,7 +590,7 @@ class SearchTest < MiniTest::Spec
         results = @index1.search('+valeu', :limit => 1, :autocorrect => true)
         results.must_be_instance_of S::Search::Results
         results.each do |result|
-          result.class.should < S::Page
+          result.class.should < Content::Page
         end
 
         results.corrected_query.should == '+value'
@@ -613,6 +613,54 @@ class SearchTest < MiniTest::Spec
         FileUtils.rm_r(db_path)
       end
 
+      should "respect weighting factors given to fields" do
+        db_path = @site.revision_dir(@revision) / 'indexes' / 'one'
+        S::Site.stubs(:published_revision).returns(@revision)
+        db = @index1.create_db(@revision)
+        @w = PieceClass1.field :w, :index => { :weight => 100 }
+        @page1.pages << PieceClass1.new(:w => "findme")
+        @page2.pages << PieceClass2.new(:h => "findme findme")
+        @page2.pages << PieceClass2.new(:h => "findme findme")
+        @page5.pages << PieceClass2.new(:h => "findme")
+        @page5.pages << PieceClass2.new(:h => "findme")
+
+        @page1.save
+        @page2.save
+        @page5.save
+        db << @page1
+        db << @page2
+        db << @page5
+        db.close
+        results = @index1.search('findme', :limit => 5)
+        results.map(&:id).should == [@page1.id, @page2.id, @page5.id]
+      end
+
+      should "use the weighting specific to a subclass" do
+        db_path = @site.revision_dir(@revision) / 'indexes' / 'one'
+        S::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
+        end
+        @page1.pages << WeightedPiece.new(:w => "findme")
+        @page2.pages << PieceClass2.new(:h => "findme findme")
+        @page2.pages << PieceClass2.new(:h => "findme findme")
+        @page5.pages << PieceClass2.new(:h => "findme")
+        @page5.pages << PieceClass2.new(:h => "findme")
+
+        @page1.save
+        @page2.save
+        @page5.save
+        db = index.create_db(@revision)
+        db << @page1
+        db << @page2
+        db << @page5
+        db.close
+        results = index.search('findme', :limit => 5)
+        results.map(&:id).should == [@page2.id, @page5.id, @page1.id]
+      end
+
       should "provide a convenient way to add documents to multiple indexes" do
         db1 = mock()
         db2 = mock()

data/test/unit/test_serialisation.rb

@@ -5,7 +5,6 @@ require 'erb'
 
 
 class SerialisationTest < MiniTest::Spec
-  include Spontaneous
 
   def setup
     @site = setup_site
@@ -18,13 +17,9 @@ class SerialisationTest < MiniTest::Spec
   context "Content" do
     setup do
       Content.delete
-      class ::Page < Spontaneous::Page
-        field :title, :string, :default => "New Page"
-      end
+      Page.field :title, :string, :default => "New Page"
 
-      class ::Piece < Spontaneous::Piece
-        style :tepid
-      end
+      Piece.style :tepid
 
       class ::SerialisedPage < ::Page
         field :direction, :title => "Pointing Direction", :comment => "NSEW" do
@@ -83,8 +78,6 @@ class SerialisationTest < MiniTest::Spec
     end
 
     teardown do
-      Object.send(:remove_const, :Page)
-      Object.send(:remove_const, :Piece)
       Object.send(:remove_const, :SerialisedPiece)
       Object.send(:remove_const, :SerialisedPage)
     end
@@ -95,7 +88,7 @@ class SerialisationTest < MiniTest::Spec
           pp SerialisedPiece.export; puts "="*60; pp @class_hash
         end
         # SerialisedPiece.export.should == @class_hash
-        assert_hashes_equal(SerialisedPiece.export, @class_hash)
+        assert_hashes_equal(@class_hash, SerialisedPiece.export)
       end
       should "serialise to JSON" do
         Spot::deserialise_http(SerialisedPiece.serialise_http).should == @class_hash
@@ -103,7 +96,7 @@ class SerialisationTest < MiniTest::Spec
       should "include the title field name in the serialisation of page types" do
         SerialisedPage.export(nil)[:title_field].should == 'title'
       end
-      should "use JS friendly names for type keys" do
+      should "use JS friendly names for type keys xxx" do
         class ::SerialisedPage
           class InnerClass < Piece
           end

data/test/unit/test_site.rb

@@ -4,7 +4,6 @@ require File.expand_path('../../test_helper', __FILE__)
 
 
 class SiteTest < MiniTest::Spec
-  include Spontaneous
 
   def setup
     @site = setup_site
@@ -17,16 +16,8 @@ class SiteTest < MiniTest::Spec
   context "Site" do
     setup do
       Content.delete
-      class ::Page < Spontaneous::Page
-        field :title
-        box :subpages
-      end
-      class ::Piece < Spontaneous::Piece; end
-    end
-
-    teardown do
-      Object.send(:remove_const, :Page)
-      Object.send(:remove_const, :Piece)
+      Page.field :title
+      Page.box   :subpages
     end
 
     context "contents" do
@@ -170,7 +161,7 @@ class SiteTest < MiniTest::Spec
 
     context "Structure modification times" do
       setup do
-        State.delete
+        S::State.delete
         # remove microseconds from time value
         @now = Time.at(Time.now.to_i)
       end
@@ -197,6 +188,14 @@ class SiteTest < MiniTest::Spec
         Site.modified_at.should == now
       end
 
+      should "be updated when a page's slug changes" do
+        root = ::Page.create
+        now = @now + 98
+        Time.stubs(:now).returns(now)
+        root.update(:slug => "updated-slug")
+        Site.modified_at.should == now
+      end
+
       should "not be updated when a piece is added" do
         now1 = @now + 24
         Time.stubs(:now).returns(now1)

data/test/unit/test_structure.rb

@@ -16,10 +16,7 @@ class StructureTest < MiniTest::Spec
   context "content building" do
     setup do
       Content.delete
-      class Page < Spot::Page
-        field :title
-      end
-      class Piece < Spot::Piece; end
+      Page.field :title
       class ProjectPage < Page; end
       class Image < Piece; end
       class Project < Piece
@@ -53,7 +50,7 @@ class StructureTest < MiniTest::Spec
     end
 
     teardown do
-      [:Page, :HomePage, :Project, :ProjectPage, :Image].each { |klass| StructureTest.send(:remove_const, klass) rescue nil }
+      [:HomePage, :Project, :ProjectPage, :Image].each { |klass| StructureTest.send(:remove_const, klass) rescue nil }
     end
 
     context "site content" do