spontaneous 0.2.0.alpha7 → 0.2.0.beta1

data/test/unit/test_styles.rb

@@ -20,26 +20,24 @@ class StylesTest < MiniTest::Spec
   context "styles for" do
 
     setup do
-
-      class ::Page < Spontaneous::Page; end
-      class ::Piece < Spontaneous::Piece; end
-      class ::Box < Spontaneous::Box; end
+      ::Content.delete
 
       ::Page.box :box1
 
-      class ::MissingClass < Piece; end
-      class ::TemplateClass < Piece; end
+      class ::MissingClass < ::Piece; end
+      class ::TemplateClass < ::Piece; end
       class ::TemplateSubClass1 < TemplateClass; end
       class ::TemplateSubClass2 < TemplateClass; end
-      class ::InvisibleClass < Piece; end
+      class ::InvisibleClass < ::Piece; end
     end
 
     teardown do
-      Object.send(:remove_const, :Page)
-      Object.send(:remove_const, :MissingClass)
-      Object.send(:remove_const, :TemplateClass)
-      Object.send(:remove_const, :TemplateSubClass1)
-      Object.send(:remove_const, :TemplateSubClass2)
+      ::Content.delete
+      Object.send(:remove_const, :MissingClass) rescue nil
+      Object.send(:remove_const, :TemplateClass) rescue nil
+      Object.send(:remove_const, :TemplateSubClass1) rescue nil
+      Object.send(:remove_const, :TemplateSubClass2) rescue nil
+      Object.send(:remove_const, :InvisibleClass) rescue nil
     end
 
     context "pieces" do
@@ -286,14 +284,14 @@ class StylesTest < MiniTest::Spec
         end
 
         teardown do
-          Object.send(:remove_const, :InlineTemplateClass)
+          Object.send(:remove_const, :InlineTemplateClass) rescue nil
         end
 
         should "be used to render the content" do
           @a.render.should ==  "html: Total Title"
         end
 
-        should "be used to render the content with the right format xxx" do
+        should "be used to render the content with the right format" do
           @a.render(:pdf).should ==  "pdf: Total Title"
         end
       end
@@ -344,13 +342,13 @@ class StylesTest < MiniTest::Spec
 
     context "boxes" do
       setup do
-        class ::BoxA < Spontaneous::Box; end
-        class ::BoxB < Spontaneous::Box; end
+        class ::BoxA < ::Box; end
+        class ::BoxB < ::Box; end
       end
 
       teardown do
-        Object.send(:remove_const, :BoxA)
-        Object.send(:remove_const, :BoxB)
+        Object.send(:remove_const, :BoxA) rescue nil
+        Object.send(:remove_const, :BoxB) rescue nil
       end
 
       context "anonymous boxes" do
@@ -372,7 +370,7 @@ class StylesTest < MiniTest::Spec
           @piece.entities << TemplateClass.new
           @piece.entities << TemplateClass.new
           @piece.entities.render.should == "template_class.html.cut\n\ntemplate_class.html.cut\n"
-          @piece.entities.style.template.call.should == '#{ render_content }'
+          @piece.entities.style.template.call.should == '${ render_content }'
         end
 
 
@@ -394,7 +392,7 @@ class StylesTest < MiniTest::Spec
           @piece.dongles.render.should == "named2.html.cut\n"
         end
 
-        should "use styles assigned in a subclass" do
+        should "use styles assigned in a subclass xxx" do
           ::TemplateSubClass = Class.new(TemplateClass)
           ::TemplateSubSubClass = Class.new(TemplateSubClass)
 
@@ -432,8 +430,8 @@ class StylesTest < MiniTest::Spec
           end
 
 
-          Object.send(:remove_const, :TemplateSubClass)
-          Object.send(:remove_const, :TemplateSubSubClass)
+          Object.send(:remove_const, :TemplateSubClass) rescue nil
+          Object.send(:remove_const, :TemplateSubSubClass) rescue nil
         end
       end
 
@@ -466,8 +464,8 @@ class StylesTest < MiniTest::Spec
           piece = TemplateSubClass.new
           @page.box1 << piece
           assert_correct_template(piece.lastly, @template_root / 'box_a')
-          Object.send(:remove_const, :BoxASubclass)
-          Object.send(:remove_const, :TemplateSubClass)
+          Object.send(:remove_const, :BoxASubclass) rescue nil
+          Object.send(:remove_const, :TemplateSubClass) rescue nil
         end
 
         context "with configured styles" do

data/test/unit/test_type_hierarchy.rb

@@ -5,7 +5,6 @@ require File.expand_path('../../test_helper', __FILE__)
 
 class TypeHierarchyTest < MiniTest::Spec
 
-
   def setup
     @site = setup_site
   end
@@ -16,17 +15,20 @@ class TypeHierarchyTest < MiniTest::Spec
 
   context "Content" do
     should "have an empty supertype" do
-      S::Content.supertype.should be_nil
-      S::Content.supertype?.should be_false
+      ::Content.supertype.should be_nil
+      ::Content.supertype?.should be_false
     end
   end
   context "Schema classes" do
     setup do
-      class SchemaClass < Spontaneous::Piece
+      class SchemaClass < ::Piece
       end
     end
+    teardown do
+      self.class.send :remove_const, :SchemaClass
+    end
     should "have a reference to their super type" do
-      SchemaClass.supertype.should == Spontaneous::Piece
+      SchemaClass.supertype.should == ::Piece
     end
 
     should "know what file they were defined in" do

data/test/unit/test_visibility.rb

@@ -6,52 +6,79 @@ require File.expand_path('../../test_helper', __FILE__)
 class VisibilityTest < MiniTest::Spec
 
 
-  def setup
+
+  def self.startup
     @site = setup_site
+    Object.const_set :R, Class.new(Page)
+    Object.const_set :P, Class.new(Page)
+    Object.const_set :E, Class.new(Piece)
+    Object.const_set :MyAlias, Class.new(Piece)
+    ::R.box :pages
+    # class ::R < Page; end
+    # class ::P < Page; end
+    P.box :things
+    # class ::E < Piece; end
+    E.box :pages
+    MyAlias.alias_of ::E
+
+    Content.delete
+
+    @root = R.new(:uid => 'root')
+    2.times do |i|
+      c = P.new(:uid => i, :slug => "#{i}")
+      @root.pages << c
+      4.times do |j|
+        d = E.new(:uid => "#{i}.#{j}")
+        c.things << d
+        2.times do |k|
+          e = P.new(:uid => "#{i}.#{j}.#{k}", :slug => "#{i}-#{j}-#{k}")
+          d.pages << e
+          2.times do |l|
+            e.things << E.new(:uid => "#{i}.#{j}.#{k}.#{l}")
+          end
+          e.save
+        end
+      end
+    end
+    @root.save
+    @root.reload
+  end
+
+  def self.shutdown
+    Content.delete
+    Object.send(:remove_const, :R)
+    Object.send(:remove_const, :P)
+    Object.send(:remove_const, :E)
+    Object.send(:remove_const, :MyAlias)
+    teardown_site(true, true)
+  end
+
+  def self.site
+    @site
+  end
+
+  def setup
+     Content.count.should == 59
+    @site = self.class.site
+    @root = Content.root
+    @child = Page.uid("0")
   end
 
   def teardown
-    teardown_site
+    Content.update(:hidden => false, :hidden_origin => nil)
+    teardown_site(false, false)
   end
 
   context "Content" do
     setup do
-      Content.delete
-      class ::R < Page; end
-      R.box :pages
-      class ::P < Page; end
-      P.box :things
-      class ::E < Piece; end
-      E.box :pages
-
-      @root = R.new(:uid => 'root')
-      2.times do |i|
-        c = P.new(:uid => i, :slug => "#{i}")
-        @root.pages << c
-        4.times do |j|
-          d = E.new(:uid => "#{i}.#{j}")
-          c.things << d
-          2.times do |k|
-            e = P.new(:uid => "#{i}.#{j}.#{k}", :slug => "#{i}-#{j}-#{k}")
-            d.pages << e
-            2.times do |l|
-              e.things << E.new(:uid => "#{i}.#{j}.#{k}.#{l}")
-            end
-            e.save
-          end
-        end
-      end
-      @root.save
-      @root.reload
-      @child = Page.uid("0")
     end
 
     teardown do
-      [:R, :P, :E].each do |k|
-        Object.send(:remove_const, k)
-      end
-      Spontaneous.database.logger = nil
-      Content.delete
+      # [:R, :P, :E].each do |k|
+      #   Object.send(:remove_const, k)
+      # end
+      # Spontaneous.database.logger = nil
+      # Content.delete
     end
 
     should "be visible by default" do
@@ -83,10 +110,10 @@ class VisibilityTest < MiniTest::Spec
       end
     end
 
-    should "hide page content" do
+    should "hide page content xxx" do
       @child.hide!
       @child.reload
-      Piece.all.select { |f| f.visible? }.length.should == 20
+      Content::Piece.all.select { |f| f.visible? }.length.should == 20
       Piece.all.select do |f|
         f.page.ancestors.include?(@child) || f.page == @child
       end.each do |f|
@@ -134,7 +161,7 @@ class VisibilityTest < MiniTest::Spec
           c.hidden_origin.should be_nil
         end
       end
-
+      f.destroy
     end
 
     should "re-show all descendents of page content" do
@@ -198,6 +225,7 @@ class VisibilityTest < MiniTest::Spec
       piece.hidden?.should be_true
       page.show!
       piece.reload.hidden?.should be_false
+      piece.destroy
     end
 
     context "root" do
@@ -216,20 +244,11 @@ class VisibilityTest < MiniTest::Spec
       end
     end
     context "visibility scoping" do
-      setup do
-        # S.database.logger = ::Logger.new($stdout)
-      end
-
-      teardown do
-        # S.database.logger = nil
-      end
-
       should "prevent inclusion of hidden content" do
         @uid = '0'
         @page = Page.uid(@uid)
         @page.hide!
         @page.reload
-        # Spontaneous.database.logger = ::Logger.new($stdout)
         Page.path("/0").should == @page
         Content.with_visible do
           Content.visible_only?.should be_true
@@ -258,7 +277,9 @@ 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.things << Piece.new }.must_raise(TypeError, RuntimeError)
+          p = Piece.new
+          lambda { page.things << p }.must_raise(TypeError, RuntimeError)
+          p.destroy
         end
       end
 
@@ -283,16 +304,15 @@ class VisibilityTest < MiniTest::Spec
 
     context "aliases" do
       setup do
-        class ::MyAlias < Piece; end
-        MyAlias.alias_of ::E
       end
 
       teardown do
-        Object.send(:remove_const, :MyAlias)
+        MyAlias.delete
       end
 
       should "be initalized as invisible if their target is invisible" do
-        target = E.find(:uid => "1.1")
+        target = E.create(:uid => "X")
+        target.destroy
         target.hide!
         al = MyAlias.create(:target => target)
         al.visible?.should be_false
@@ -300,7 +320,7 @@ class VisibilityTest < MiniTest::Spec
 
 
       should "be made visible along with their target if added when target is hidden" do
-        target = E.find(:uid => "1.1")
+        target = E.first(:uid => "1.1")
         target.hide!
         al = MyAlias.create(:target => target)
         al.reload.visible?.should be_false
@@ -310,7 +330,7 @@ class VisibilityTest < MiniTest::Spec
 
       should "be filtered by visibility when doing reverse lookup" do
         page = P.first(:uid => "1")
-        target = E.find(:uid => "1.1")
+        target = E.first(:uid => "1.1")
         al1 = MyAlias.create(:target => target)
         page.things << al1
         al2 = MyAlias.create(:target => target).reload
@@ -318,6 +338,9 @@ class VisibilityTest < MiniTest::Spec
         al1.hide!
         al1.reload
         al2.reload
+        target.reload
+        sort = proc { |e1, e2| e1.id <=> e2.id }
+        al = target.aliases.sort(&sort)
         Set.new(target.aliases).should == Set.new([al1, al2])
         target.reload
         Content.with_visible do
@@ -326,13 +349,14 @@ class VisibilityTest < MiniTest::Spec
       end
 
       should "show as 'hidden' if their target is deleted" do
-        parent = E.find(:uid => "1.1")
+        parent = E.first(:uid => "1.1")
         target = P.new
         parent.pages << target
         parent.save
         al1 = MyAlias.create(:target => target)
         P.filter(:id => target.id).delete
         al1.reload.visible?.should be_false
+        target.destroy
       end
     end
   end