spontaneous 0.1.0.alpha1 → 0.2.0.alpha1

data/test/slow/test_visibility.rb

@@ -1,14 +1,21 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
 
 class VisibilityTest < MiniTest::Spec
 
+
+  def setup
+    @site = setup_site
+  end
+
+  def teardown
+    teardown_site
+  end
+
   context "Content" do
     setup do
-      Spontaneous.database = DB
-      Spontaneous::Schema.reset!
       Content.delete
       class ::R < Page; end
       R.box :pages
@@ -30,13 +37,25 @@ class VisibilityTest < MiniTest::Spec
             2.times do |l|
               e.things << E.new(:uid => "#{i}.#{j}.#{k}.#{l}")
             end
-            d.save
+            e.save
           end
+          # puts "-->"
+          # puts d.id
+          # p [:things, d.class, d.pages.schema_id.to_s, P.boxes.things.schema_id.to_s]
+          # p c.unordered_children.map { |p| [p.parent_id, p.box_sid.to_s, p.uid] }
+          # p c.children.map { |p| p.box_sid.to_s }
+          # puts "--<"
+          # c.save
+          # d.save
         end
-        c.save
       end
       @root.save
       @root.reload
+      # puts "-->"
+      # p [:things, @root.pages.first.class, @root.pages.first.things.schema_id.to_s, P.boxes.things.schema_id.to_s]
+      # p @root.pages.first.unordered_children.map { |p| [p.box_sid.to_s, p.uid] }
+      # p @root.pages.first.children.map { |p| p.box_sid.to_s }
+      # puts "--<"
       @child = Page.uid("0")
     end
 
@@ -107,8 +126,8 @@ class VisibilityTest < MiniTest::Spec
 
     should "hide all descendents of page content" do
       piece = Content.first(:uid => "0.0")
-      f = Piece.new(:uid => "0.0.X")
-      piece << f
+      f = E.new(:uid => "0.0.X")
+      piece.pages << f
       piece.save
       piece.reload
       piece.hide!
@@ -163,8 +182,10 @@ class VisibilityTest < MiniTest::Spec
       piece1 = Content.first(:uid => "0.0.0.0")
       piece2 = Content.first(:uid => "0.0.0.1")
       parent = Content.first(:uid => "0.0.0")
-      piece1.container.should == parent
-      piece2.container.should == parent
+      piece1.owner.should == parent
+      piece2.owner.should == parent
+      piece1.container.should == parent.things
+      piece2.container.should == parent.things
       piece1.hide!
       parent.hide!
       parent.reload.visible?.should be_false
@@ -187,6 +208,12 @@ class VisibilityTest < MiniTest::Spec
       end
     end
 
+    context "top-level searches" do
+      should "return a list of visible pages" do
+        @root.pages.first.hide!
+        P.visible.count.should == 9
+      end
+    end
     context "visibility scoping" do
       setup do
         # S.database.logger = ::Logger.new($stdout)
@@ -214,6 +241,8 @@ class VisibilityTest < MiniTest::Spec
       should "only show visibile pieces" do
         page = Content.first(:uid => "1")
         page.pieces.length.should == 4
+        page.things.pieces.length.should == 4
+        page.things.count.should == 4
         page.pieces.first.hide!
         page.reload
         Content.with_visible do
@@ -228,8 +257,7 @@ class VisibilityTest < MiniTest::Spec
         Content.with_visible do
           # would like to make sure we're raising a predictable error
           # but 1.9 changes the typeerror to a runtime error
-          lambda { page.pieces << Piece.new }.must_raise(TypeError, RuntimeError)
-          lambda { page << Piece.new }.must_raise(TypeError, RuntimeError)
+          lambda { page.things << Piece.new }.must_raise(TypeError, RuntimeError)
         end
       end
 
@@ -237,13 +265,18 @@ class VisibilityTest < MiniTest::Spec
         @root.reload
         @root.children.first.children.length.should == 8
         @root.children.first.pieces.first.hide!
-        # p @root.children.first.children.map { |c| c.visible? }
         @root.reload
         Content.with_visible do
           @root.children.first.children.length.should == 6
         end
-        # p @root.children.map { |c| c.uid }
-        # p @root.children.first.children.length
+      end
+
+      should "hide pages without error" do
+        @root.pages.first.hide!
+        @root.reload
+        Content.with_visible do
+          pieces = @root.pages.pieces.map { |p| p }
+        end
       end
     end
   end

data/test/test_helper.rb

@@ -10,6 +10,12 @@ Bundler.setup(:default, :development)
 
 Bundler.require
 
+# include these paths to enable the direct running of a test file
+test_path = File.expand_path('..', __FILE__)
+spot_path = File.expand_path('../../lib', __FILE__)
+$:.unshift(test_path) if File.directory?(test_path) && !$:.include?(test_path)
+$:.unshift(spot_path) if File.directory?(spot_path) && !$:.include?(spot_path)
+
 require 'rack'
 require 'logger'
 
@@ -32,6 +38,9 @@ require 'shoulda'
 require 'timecop'
 require 'mocha'
 require 'pp'
+require 'tmpdir'
+require 'json'
+
 begin
   require 'leftright'
 rescue LoadError
@@ -69,9 +78,6 @@ class MiniTestWithHooks < MiniTest::Unit
 
   def _run_suite(suite, type)
     begin
-      Spontaneous::Schema.schema_loader_class = Spontaneous::Schema::TransientMap
-      Spontaneous::Schema.reset!
-      Spontaneous.logger.silent!
       unless exclude?(suite)
         print "\n#{suite.to_s.gsub(/Test$/, '').ljust(@max_name_length, " ")}  "
       end
@@ -106,6 +112,27 @@ class MiniTest::Spec
   attr_accessor :template_root
   alias :silence_stdout :silence_logger
 
+  def self.setup_site(root = nil)
+    root ||= Dir.mktmpdir
+    instance = Spontaneous::Site.instantiate(root, :test, :back)
+    instance.schema_loader_class = Spontaneous::Schema::TransientMap
+    instance.logger.silent!
+    instance.database = DB
+    instance
+  end
+
+  def self.teardown_site
+    FileUtils.rm_r(Spontaneous.instance.root) rescue nil
+  end
+
+  def setup_site(root = nil)
+    self.class.setup_site(root)
+  end
+
+  def teardown_site
+    self.class.teardown_site
+  end
+
   def template_root=(template_root)
     @template_root = template_root
     Spontaneous.stubs(:template_paths).returns([@template_root])

data/test/ui/test_page_editing.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 require 'ui_helper'
 
 

data/test/unit/test_alias.rb

@@ -1,13 +1,13 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
 class AliasTest < MiniTest::Spec
 
   def assert_same_content(c1, c2)
     assert_equal c1.length, c2.length
-    c1.sort! { |a, b| a.id <=> b.id }
-    c2.sort! { |a, b| a.id <=> b.id }
+    c1 = c1.dup.sort { |a, b| a.id <=> b.id }
+    c2 = c2.dup.sort { |a, b| a.id <=> b.id }
     c1.each_with_index do |a, i|
       b = c2[i]
       assert_equal a.id, b.id
@@ -17,13 +17,15 @@ class AliasTest < MiniTest::Spec
 
   context "Aliases:" do
     setup do
-      Spot::Schema.reset!
+      @site = setup_site
       Content.delete
 
       self.template_root = File.expand_path(File.join(File.dirname(__FILE__), "../fixtures/templates/aliases"))
 
       class ::Page < Spontaneous::Page
         field :title
+        box :box1
+        box :box2
       end
 
       class ::Piece < Spontaneous::Piece; end
@@ -59,6 +61,8 @@ class AliasTest < MiniTest::Spec
 
       class ::BB < ::B
         field :bb_field1
+
+        box :box1
       end
 
       class ::AAlias < ::Piece
@@ -79,6 +83,7 @@ class AliasTest < MiniTest::Spec
 
       class ::BAlias < ::Page
         alias_of :B
+        box :box1
       end
 
       class ::BBAlias < ::Piece
@@ -88,25 +93,31 @@ class AliasTest < MiniTest::Spec
       class ::MultipleAlias < ::Piece
         alias_of :AA, :B
       end
+
+      class ::ProcAlias < ::Piece
+        alias_of proc { Spontaneous::Site.root.children }
+      end
+
       @root = ::Page.create
       @aliases = ::Page.create(:slug => "aliases").reload
-      @root << @aliases
+      @root.box1 << @aliases
       @a = A.create(:a_field1 => "@a.a_field1").reload
       @aa = AA.create.reload
       @aaa1 = AAA.create(:aaa_field1 => "aaa1").reload
       @aaa2 = AAA.create.reload
       @b = B.new(:slug => "b")
-      @root << @b
+      @root.box1 << @b
       @bb = BB.new(:slug => "bb", :bb_field1 => "BB")
-      @root << @bb
-      @root.save
+      @root.box1 << @bb
+      @root.save.reload
     end
 
     teardown do
-      [:Page, :Piece, :A, :AA, :AAA, :B, :BB, :AAlias, :AAAlias, :AAAAlias, :BBAlias, :BAlias, :MultipleAlias].each do |c|
+      [:Page, :Piece, :A, :AA, :AAA, :B, :BB, :AAlias, :AAAlias, :AAAAlias, :BBAlias, :BAlias, :MultipleAlias, :ProcAlias].each do |c|
         Object.send(:remove_const, c) rescue nil
       end
-      # Content.delete
+      Content.delete
+      FileUtils.rm_r(@site.root)
     end
 
     context "All alias" do
@@ -131,6 +142,108 @@ class AliasTest < MiniTest::Spec
           instance2 = AAlias.create(:target => @a).reload
           assert_same_content @a.aliases, [instance1, instance2]
         end
+
+        should "accept a proc that returns an array as a target list generator" do
+          assert_same_content ProcAlias.targets, @root.children
+        end
+
+        context "with container options" do
+          setup do
+            @page = ::Page.new(:uid => "thepage")
+            4.times { |n|
+              @page.box1 << A.new
+              @page.box1 << AA.new
+              @page.box2 << A.new
+              @page.box2 << AA.new
+            }
+            @page.save.reload
+          end
+
+          teardown do
+            Object.send(:remove_const, 'X') rescue nil
+            Object.send(:remove_const, 'XX') rescue nil
+            Object.send(:remove_const, 'XXX') rescue nil
+          end
+
+          should "allow for selecting only content from within one box" do
+            class ::X < ::Piece
+              alias_of :A, :container => Proc.new { S::Site['#thepage'].box1 }
+            end
+            class ::XX < ::Piece
+              alias_of :AA, :container => Proc.new { S::Site['#thepage'].box1 }
+            end
+            X.targets.should == @page.box1.select { |p| A === p }
+            XX.targets.should == @page.box1.select { |p| AA === p }
+          end
+
+          should "allow for selecting only content from a range of boxes" do
+            class ::X < ::Piece
+              alias_of :A, :container => Proc.new { [S::Site['#thepage'].box1, S::Site['#thepage'].box2] }
+            end
+            class ::XX < ::Piece
+              alias_of :AA, :container => Proc.new { [S::Site['#thepage'].box1, S::Site['#thepage'].box2] }
+            end
+            assert_same_content X.targets, @page.box1.select { |p| A === p } + @page.box2.select { |p| A === p }
+            assert_same_content XX.targets, @page.box1.select { |p| AA === p } + @page.box2.select { |p| AA === p }
+          end
+
+          should "allow for selecting only content from within one page" do
+            class ::X < ::Piece
+              alias_of :A, :container => Proc.new { S::Site['#thepage'] }
+            end
+            class ::XX < ::Piece
+              alias_of :AA, :container => Proc.new { S::Site['#thepage'] }
+            end
+            assert_same_content X.targets, @page.content.select { |p| A === p }
+            assert_same_content XX.targets, @page.content.select { |p| AA === p }
+          end
+
+          should "allow for selecting only content from a range of pages & boxes" do
+            page2 = ::Page.new(:uid => "thepage2")
+            4.times { |n|
+              page2.box1 << A.new
+              page2.box1 << AA.new
+              page2.box2 << A.new
+              page2.box2 << AA.new
+            }
+            page2.save.reload
+            class ::X < ::Piece
+              alias_of :A, :AA, :container => Proc.new { [S::Site['#thepage'].box1, S::Site['#thepage2']] }
+            end
+            class ::XX < ::Piece
+              alias_of :AA, :container => Proc.new { [S::Site['#thepage'], S::Site['#thepage2'].box2] }
+            end
+            assert_same_content X.targets(@page, @page.box1), @page.box1.contents + page2.content
+            assert_same_content XX.targets, @page.content.select { |p| AA === p } + page2.box2.select { |p| AA === p }
+          end
+
+          should "allow for selecting content only from the content of the owner of the box" do
+            class ::X < ::Piece
+              alias_of proc { |owner| owner.box1.pieces }
+            end
+            class ::XX < ::Piece
+              alias_of proc { |owner, box| box.pieces }
+            end
+            class ::XXX < ::Piece
+              alias_of :A, :container => proc { |owner, box| box }
+            end
+            assert_same_content X.targets(@page), @page.box1.contents
+            assert_same_content XX.targets(@page, @page.box1), @page.box1.contents
+            assert_same_content XX.targets(@page, @page.box2), @page.box2.contents
+            assert_same_content XXX.targets(@page, @page.box1), @page.box1.contents.select { |p| A === p }
+          end
+
+          should "allow for filtering instances according to some arbitrary proc" do
+            pieces = [@page.box1.entries.first, @page.box2.entries.first]
+            _filter = lambda { |c|
+              pieces.map(&:id).include?(c.id)
+            }
+            ::X  = Class.new(::Piece) do
+              alias_of :A, :filter => _filter
+            end
+            assert_same_content pieces, X.targets
+          end
+        end
       end
 
       context "instances" do
@@ -177,7 +290,7 @@ class AliasTest < MiniTest::Spec
         end
 
         should "include target values in serialisation" do
-          @a_alias.export[:target].should == @a.shallow_export
+          @a_alias.export[:target].should == @a.shallow_export(nil)
         end
 
         should "include alias title & icon in serialisation" do
@@ -185,6 +298,8 @@ class AliasTest < MiniTest::Spec
           @a_alias.export[:alias_icon].should == @a.alias_icon_field.export
         end
       end
+
+
     end
 
     context "Piece aliases" do
@@ -195,10 +310,15 @@ class AliasTest < MiniTest::Spec
 
       should "not be loadable via their compound path when linked to a page" do
         a = BBAlias.create(:target => @bb)
-        @aliases << a
+        @aliases.box1 << a
         @aliases.save
         Site["/aliases/bb"].should be_nil
       end
+
+      should "have their target's path attribute if they alias to a page type" do
+        a = BBAlias.create(:target => @bb)
+        a.path.should == @bb.path
+      end
     end
 
     context "Page aliases" do
@@ -211,9 +331,15 @@ class AliasTest < MiniTest::Spec
         c = CAlias.new(:target => @aaa1)
         c.render.should == "aaa1\n"
       end
+
+      should "respond as a page" do
+        a = BAlias.create(:target => @b, :slug => "balias")
+        a.page?.should be_true
+      end
+
       should "be discoverable via their compound path" do
         a = BAlias.create(:target => @b, :slug => "balias")
-        @aliases << a
+        @aliases.box1 << a
         @aliases.save
         a.save
         a.reload
@@ -222,9 +348,57 @@ class AliasTest < MiniTest::Spec
         Site["/aliases/b"].should == a
       end
 
+      should "update their path if their target's slug changes" do
+        a = BAlias.create(:target => @b, :slug => "balias")
+        b = BAlias.create(:target => @b, :slug => "balias")
+        @aliases.box1 << a
+        a.box1 << b
+        @aliases.save
+
+        a.save
+        a.reload
+        a.path.should == "/aliases/b"
+        b.path.should == "/aliases/b/b"
+        @b.slug = "newb"
+        @b.save
+        a.reload
+        b.reload
+        a.path.should == "/aliases/newb"
+        b.path.should == "/aliases/newb/newb"
+      end
+
+      should "update their path if their parent's path changes" do
+        a = BAlias.create(:target => @b, :slug => "balias")
+        b = BAlias.create(:target => @b, :slug => "balias")
+        @aliases.box1 << a
+        a.box1 << b
+        @aliases.save
+        a.save
+        a.reload
+        a.path.should == "/aliases/b"
+        b.path.should == "/aliases/b/b"
+        @aliases.slug = "newaliases"
+        @aliases.save
+        a.reload
+        b.reload
+        a.path.should == "/newaliases/b"
+        b.path.should == "/newaliases/b/b"
+      end
+
+      should "show in the parent's list of children" do
+        a = BAlias.create(:target => @b, :slug => "balias")
+        @aliases.box1 << a
+        @aliases.save
+        a.save
+        a.reload
+        @aliases.reload
+        @aliases.children.should == [a]
+        a.parent.should == @aliases
+      end
+
       should "render the using target's layout when accessed via the path and no local layouts defined" do
         a = BAlias.create(:target => @b, :slug => "balias")
-        @aliases << a
+        @aliases.box1 << a
         @aliases.save
         a.reload
         a.render.should == @b.render
@@ -233,7 +407,7 @@ class AliasTest < MiniTest::Spec
       should "render with locally defined style when available" do
         BAlias.layout :b_alias
         a = BAlias.create(:target => @b, :slug => "balias")
-        @aliases << a
+        @aliases.box1 << a
         @aliases.save
         a.reload
         a.render.should == "alternate\n"
@@ -242,13 +416,23 @@ class AliasTest < MiniTest::Spec
       should "have access to their target's page styles" do
         BAlias.layout :b_alias
         a = BAlias.create(:target => @b, :slug => "balias")
-        @aliases << a
+        @aliases.box1 << a
         @aliases.save
         a.reload
         a.layout = :b
         a.render.should == @b.render
       end
     end
+
+    context "visibility" do
+      should "be linked to the target's visibility" do
+        a = BAlias.create(:target => @b, :slug => "balias")
+        @b.hide!
+        @b.reload
+        a.reload
+        a.visible?.should be_false
+      end
+    end
   end
 end