spontaneous 0.2.0.beta5 → 0.2.0.beta6

data/test/unit/test_context.rb

@@ -109,7 +109,7 @@ describe "Context" do
       result.must_equal [["/area1-page1", false], ["/area1-page2", true]]
     end
 
-    it "allows for limiting the navigation to a particular box" do
+    it "allows for excluding a particular box" do
       @target = Page.new
       @area1_page2.area2 << @target
       @target.save.reload
@@ -135,5 +135,32 @@ describe "Context" do
       result = @context.navigation(exclude: Page).map { |p, a| [p.path, a]}
       result.must_equal [["/area1-page2", true], ["/area2-page2", false]]
     end
+
+    it "shows children of the public root when rendering a private root" do
+      @target = Page.create_root "error"
+      @context = @context_class.new(@target)
+      result = @context.navigation.map { |p, a| [p.path, a]}
+      result.must_equal [["/area1-page1", false], ["/area1-page2", false], ["/area2-page1", false], ["/area2-page2", false]]
+    end
+
+    it "shows children of the public root when rendering a private page" do
+      root = Page.create_root "error"
+      @target = Page.new
+      root.area2 << @target
+      @target.save.reload
+      @context = @context_class.new(@target)
+      result = @context.navigation.map { |p, a| [p.path, a]}
+      result.must_equal [["/area1-page1", false], ["/area1-page2", false], ["/area2-page1", false], ["/area2-page2", false]]
+    end
+
+    it "doesn't throw errors when attempting to render from a non-existant parent" do
+      root = Page.create_root "error"
+      @target = Page.new
+      root.area2 << @target
+      @target.save.reload
+      @context = @context_class.new(@target)
+      result = @context.navigation(depth: 2).map { |p, a| [p.path, a]}
+      result.must_equal []
+    end
   end
 end

data/test/unit/test_controllers.rb

@@ -119,19 +119,33 @@ describe "Controllers" do
   end
 
   describe "PageController" do
-    let(:owner) { SubPage.new(uid: "owner") }
-    let(:other) { SubPage.new(uid: "other") }
+    let(:owner) { OwnerPage.create(uid: "the_owner") }
+    let(:other) { OtherPage.create(uid: "the_other") }
     let(:ctrl)  { Spontaneous::Rack::PageController.new!(@site, owner, :html) }
     let(:env)   { {Spontaneous::Rack::RENDERER => Spontaneous::Output.published_renderer(@site) } }
 
     before do
+      class ::OwnerPage < SubPage
+        singleton :owner
+      end
+      class ::OtherPage < SubPage
+        singleton :other
+      end
       ctrl.env = env
       ctrl.request = Rack::Request.new(env)
       ctrl.response = Rack::Response.new
-      SubPage.layout { "${uid}:{{success}}" }
-      SubPage.add_output :xml
-      @site.stubs(:by_uid).with('other').returns(other)
-      @site.stubs(:by_uid).with(:other).returns(other)
+      [OwnerPage, OtherPage].each do |type|
+        type.layout { "${uid}:{{success}}" }
+        type.add_output :xml
+      end
+      @site.stubs(:other).returns(other)
+    end
+
+    after do
+      owner.destroy
+      other.destroy
+      Object.send :remove_const, :OwnerPage rescue nil
+      Object.send :remove_const, :OtherPage rescue nil
     end
 
     it "allows setting the output format" do
@@ -143,7 +157,7 @@ describe "Controllers" do
     it "allows changing the rendered page" do
       ctrl.page(other)
       ctrl.render
-      ctrl.body.must_equal "other:"
+      ctrl.body.must_equal "the_other:"
     end
 
     # show allows changing the page, output, status & locals without calling #render
@@ -161,76 +175,76 @@ describe "Controllers" do
         ctrl.output.must_equal :xml
         ctrl.body.must_equal []
         ctrl.render success: "yes"
-        ctrl.body.must_equal "other:yes"
+        ctrl.body.must_equal "the_other:yes"
         ctrl.content_type.must_equal "application/xml;charset=utf-8"
       end
 
       it "allows render to overwrite the settings" do
         ctrl.show(other, :xml, 403)
         ctrl.render owner, success: "no"
-        ctrl.body.must_equal "owner:no"
+        ctrl.body.must_equal "the_owner:no"
         ctrl.content_type.must_equal "application/xml;charset=utf-8"
       end
 
-      it "accepts uid (string), format, status" do
+      it "accepts singleton name (symbol), format, status" do
         ctrl.show('other', :xml, 403)
         ctrl.status.must_equal 403
         ctrl.output.must_equal :xml
         ctrl.body.must_equal []
       end
 
-      it "accepts uid (symbol), format, status" do
-        ctrl.show(:other, :xml, 403)
+      it "accepts singleton class, format, status" do
+        ctrl.show(OtherPage, :xml, 403)
         ctrl.status.must_equal 403
         ctrl.output.must_equal :xml
         ctrl.body.must_equal []
       end
 
-      it "accepts uid (string), status" do
+      it "accepts singleton name (string), status" do
         ctrl.show('other', 403)
         ctrl.status.must_equal 403
         ctrl.output.must_equal :html
         ctrl.body.must_equal []
       end
 
-      it "accepts uid (symbol), status" do
+      it "accepts singleton name (symbol), status" do
         ctrl.show(:other, 403)
         ctrl.status.must_equal 403
         ctrl.output.must_equal :html
         ctrl.body.must_equal []
       end
 
-      it "accepts uid (string)" do
-        ctrl.show('other')
-        ctrl.status.must_equal 200
+      it "accepts singleton class, status" do
+        ctrl.show(OtherPage, 410)
+        ctrl.status.must_equal 410
         ctrl.output.must_equal :html
         ctrl.body.must_equal []
       end
 
-      it "accepts uid (symbol)" do
-        ctrl.show(:other)
+      it "accepts singleton name" do
+        ctrl.show('other')
         ctrl.status.must_equal 200
         ctrl.output.must_equal :html
         ctrl.body.must_equal []
       end
 
-      it "accepts instance (Content)" do
-        ctrl.show(other)
+      it "accepts singleton name" do
+        ctrl.show(:other)
         ctrl.status.must_equal 200
         ctrl.output.must_equal :html
         ctrl.body.must_equal []
       end
 
-      it "accepts uid (string), status" do
-        ctrl.show('other', 409)
-        ctrl.status.must_equal 409
+      it "accepts singleton class" do
+        ctrl.show(OtherPage)
+        ctrl.status.must_equal 200
         ctrl.output.must_equal :html
         ctrl.body.must_equal []
       end
 
-      it "accepts uid (symbol), status" do
-        ctrl.show(:other, 410)
-        ctrl.status.must_equal 410
+      it "accepts instance (Content)" do
+        ctrl.show(other)
+        ctrl.status.must_equal 200
         ctrl.output.must_equal :html
         ctrl.body.must_equal []
       end
@@ -255,119 +269,140 @@ describe "Controllers" do
         ctrl.render
         ctrl.status.must_equal 200
         ctrl.output.must_equal :html
-        ctrl.body.must_equal "owner:"
+        ctrl.body.must_equal "the_owner:"
       end
 
       it "accepts instance, format, status, locals" do
         ctrl.render(other, :xml, 403, success: "yes")
         ctrl.status.must_equal 403
         ctrl.output.must_equal :xml
-        ctrl.body.must_equal "other:yes"
+        ctrl.body.must_equal "the_other:yes"
       end
 
-      it "accepts uid (string), format, status, locals" do
+      it "accepts singleton name (string), format, status, locals" do
         ctrl.render('other', :xml, 403, success: "yes")
         ctrl.status.must_equal 403
         ctrl.output.must_equal :xml
-        ctrl.body.must_equal "other:yes"
+        ctrl.body.must_equal "the_other:yes"
       end
 
-      it "accepts uid (symbol), format, status, locals" do
+      it "accepts singleton name (symbol), format, status, locals" do
         ctrl.render(:other, :xml, 403, success: "yes")
         ctrl.status.must_equal 403
         ctrl.output.must_equal :xml
-        ctrl.body.must_equal "other:yes"
+        ctrl.body.must_equal "the_other:yes"
       end
 
-      it "accepts uid (string), status, locals" do
+      it "accepts singleton class, format, status, locals" do
+        ctrl.render(OtherPage, :xml, 403, success: "yes")
+        ctrl.status.must_equal 403
+        ctrl.output.must_equal :xml
+        ctrl.body.must_equal "the_other:yes"
+      end
+
+      it "accepts singleton name (string), status, locals" do
         ctrl.render('other', 403, success: "yes")
         ctrl.status.must_equal 403
         ctrl.output.must_equal :html
-        ctrl.body.must_equal "other:yes"
+        ctrl.body.must_equal "the_other:yes"
       end
 
-      it "accepts uid (symbol), status, locals" do
+      it "accepts singleton name (symbol), status, locals" do
         ctrl.render(:other, 403, success: "yes")
         ctrl.status.must_equal 403
         ctrl.output.must_equal :html
-        ctrl.body.must_equal "other:yes"
+        ctrl.body.must_equal "the_other:yes"
+      end
+
+      it "accepts singleton class, status, locals" do
+        ctrl.render(OtherPage, 403, success: "yes")
+        ctrl.status.must_equal 403
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal "the_other:yes"
       end
 
-      it "accepts uid (string)" do
+      it "accepts singleton name (string)" do
         ctrl.render('other')
         ctrl.status.must_equal 200
         ctrl.output.must_equal :html
-        ctrl.body.must_equal "other:"
+        ctrl.body.must_equal "the_other:"
       end
 
-      it "accepts uid (symbol)" do
+      it "accepts singleton name (symbol)" do
         ctrl.render(:other)
         ctrl.status.must_equal 200
         ctrl.output.must_equal :html
-        ctrl.body.must_equal "other:"
+        ctrl.body.must_equal "the_other:"
       end
 
-      it "accepts instance (Content)" do
-        ctrl.render(other)
+      it "accepts singleton class" do
+        ctrl.render(OtherPage)
         ctrl.status.must_equal 200
         ctrl.output.must_equal :html
-        ctrl.body.must_equal "other:"
+        ctrl.body.must_equal "the_other:"
       end
 
-      it "accepts uid (string), status" do
+      it "accepts singleton name (string), status" do
         ctrl.render('other', 409)
         ctrl.status.must_equal 409
         ctrl.output.must_equal :html
-        ctrl.body.must_equal "other:"
+        ctrl.body.must_equal "the_other:"
       end
 
-      it "accepts uid (symbol), status" do
+      it "accepts singleton name (symbol), status" do
         ctrl.render(:other, 410)
         ctrl.status.must_equal 410
         ctrl.output.must_equal :html
-        ctrl.body.must_equal "other:"
+        ctrl.body.must_equal "the_other:"
+      end
+
+      it "accepts singleton class, status" do
+        ctrl.render(OtherPage, 410)
+        ctrl.status.must_equal 410
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal "the_other:"
+      end
+
+      it "accepts instance (Content)" do
+        ctrl.render(other)
+        ctrl.status.must_equal 200
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal "the_other:"
       end
 
       it "accepts instance (Content), status" do
         ctrl.render(other, 411)
         ctrl.status.must_equal 411
         ctrl.output.must_equal :html
-        ctrl.body.must_equal "other:"
+        ctrl.body.must_equal "the_other:"
       end
 
       it "accepts locals" do
         ctrl.render(success: "yes")
         ctrl.status.must_equal 200
         ctrl.output.must_equal :html
-        ctrl.body.must_equal "owner:yes"
-      end
-
-      it "accepts uid (string), locals" do
-        ctrl.render('$other', success: "yes")
-        ctrl.status.must_equal 200
-        ctrl.output.must_equal :html
-        ctrl.body.must_equal "other:yes"
+        ctrl.body.must_equal "the_owner:yes"
       end
 
-      it "accepts uid (symbol), locals" do
+      it "accepts singleton name (symbol), locals" do
         ctrl.render(:other, success: "yes")
         ctrl.status.must_equal 200
         ctrl.output.must_equal :html
-        ctrl.body.must_equal "other:yes"
+        ctrl.body.must_equal "the_other:yes"
       end
 
       it "accepts status" do
         ctrl.render(403)
         ctrl.status.must_equal 403
         ctrl.output.must_equal :html
-        ctrl.body.must_equal "owner:"
+        ctrl.body.must_equal "the_owner:"
       end
 
       it "accepts status, locals" do
         ctrl.render(403, success: "no")
         ctrl.status.must_equal 403
         ctrl.output.must_equal :html
-        ctrl.body.must_equal "owner:no"
+        ctrl.body.must_equal "the_owner:no"
       end
     end
   end

data/test/unit/test_crypt.rb

@@ -99,15 +99,8 @@ describe "Crypt" do
       version, _ = Crypt.version_split(hash)
       version.must_equal Crypt.current.version
     end
-
-    it "take at least half a second to compute" do
-      hash = nil
-      bm = Benchmark.measure { hash = Crypt::hash_password(@password) }
-      bm.real.must_be :>=, 0.5
-      bm = Benchmark.measure { Crypt::valid?(@password, hash) }
-      bm.real.must_be :>=, 0.5
-    end
   end
+
   describe "users" do
     before do
       S::Permissions::User.delete

data/test/unit/test_datamapper.rb

@@ -158,6 +158,15 @@ describe "DataMapper" do
       end
     end
 
+    it "knows if the scope is editable" do
+      @mapper.revision(10) do
+        @mapper.editable?.must_equal false
+      end
+      @mapper.editable do
+        @mapper.editable?.must_equal true
+      end
+    end
+
     it "allow for retrieval of rows from a specific revision" do
       @database.fetch = { id:1, label:"column1", type_sid:"MockContent2" }
       instance = @mapper.revision(20).get(1)
@@ -347,9 +356,9 @@ describe "DataMapper" do
         end
       end
       @database.sqls.must_equal [
-        "SELECT * FROM content WHERE ((type_sid IN ('MockContent2', 'MockContent3')) AND (hidden IS FALSE) AND (id = 1)) LIMIT 1",
+        "SELECT * FROM content WHERE ((hidden IS FALSE) AND (type_sid IN ('MockContent2', 'MockContent3')) AND (id = 1)) LIMIT 1",
         "SELECT * FROM content WHERE ((type_sid IN ('MockContent2', 'MockContent3')) AND (id = 1)) LIMIT 1",
-        "SELECT * FROM content WHERE ((type_sid IN ('MockContent2', 'MockContent3')) AND (hidden IS FALSE) AND (id = 1)) LIMIT 1",
+        "SELECT * FROM content WHERE ((hidden IS FALSE) AND (type_sid IN ('MockContent2', 'MockContent3')) AND (id = 1)) LIMIT 1",
       ]
     end
 
@@ -361,7 +370,7 @@ describe "DataMapper" do
         end
       end
       @database.sqls.must_equal [
-        "SELECT * FROM __r00025_content WHERE ((type_sid IN ('MockContent2', 'MockContent3')) AND (hidden IS FALSE) AND (id = 1)) LIMIT 1",
+        "SELECT * FROM __r00025_content WHERE ((hidden IS FALSE) AND (type_sid IN ('MockContent2', 'MockContent3')) AND (id = 1)) LIMIT 1",
       ]
     end
 
@@ -397,6 +406,29 @@ describe "DataMapper" do
     end
   end
 
+  describe "prepared statements" do
+    it "allows for defining the same prepared statements in multiple scopes" do
+      sqls = []
+      ps0 = @mapper.prepare(:select, :something) { @mapper.filter(MockContent2, label: :$label) }
+      @mapper.visible do
+        ps1 = @mapper.prepare(:select, :something) { @mapper.filter(MockContent2, label: :$label) }
+        ps2 = @mapper.prepare(:select, :something) { @mapper.filter(MockContent2, label: :$label) }
+        ps1.object_id.must_equal ps2.object_id
+        ps0.object_id.wont_equal ps1.object_id
+        @mapper.scope(23, true) do
+          ps3 = @mapper.prepare(:select, :something) { @mapper.filter(MockContent2, label: :$label) }
+          ps1.object_id.wont_equal ps3.object_id
+          ps0.object_id.wont_equal ps3.object_id
+        end
+      end
+      @database.prepared_statements.values.map(&:sql).must_equal [
+        "SELECT * FROM content WHERE ((type_sid IN ('MockContent2')) AND (label = $label))",
+        "SELECT * FROM content WHERE ((hidden IS FALSE) AND (type_sid IN ('MockContent2')) AND (label = $label))",
+        "SELECT * FROM __r00023_content WHERE ((hidden IS FALSE) AND (type_sid IN ('MockContent2')) AND (label = $label))"
+      ]
+    end
+  end
+
   describe "models" do
     it "can clean the db completely" do
       def MockContent.types
@@ -941,27 +973,27 @@ describe "DataMapper" do
       before do
         @time = @table.dataset.send :format_timestamp, @now
         @database.columns = @expected_columns + [:created_at, :modified_at]
-        TimestampedContent = Spontaneous::DataMapper::Model(:content, @database, @schema)
+        ::TimestampedContent = Spontaneous::DataMapper::Model(:content, @database, @schema)
         @database.sqls
       end
 
       after do
-        DataMapperTest.send :remove_const, :TimestampedContent rescue nil
+        Object.send :remove_const, :TimestampedContent rescue nil
       end
 
       it "set created_at timestamp on creation" do
         instance = TimestampedContent.create label: "something"
-        @database.sqls.first.must_equal "INSERT INTO content (label, created_at, type_sid) VALUES ('something', #{@time}, 'TimestampedContent')"
+        @database.sqls.first.must_equal "INSERT INTO content (label, created_at, modified_at, type_sid) VALUES ('something', #{@time}, #{@time}, 'TimestampedContent')"
       end
 
-      # it "update the modified_at value on update" do
-      #   @database.fetch = { id: 1, type_sid:"TimestampedContent" }
-      #   instance = TimestampedContent.create label: "something"
-      #   @database.sqls
-      #   instance.set label: "changed"
-      #   instance.save
-      #   @database.sqls.first.must_equal "UPDATE content SET label = 'changed', modified_at = #{@time} WHERE (id = 1)"
-      # end
+      it "update the modified_at value on update" do
+        @database.fetch = { id: 1, type_sid:"TimestampedContent" }
+        instance = TimestampedContent.create label: "something"
+        @database.sqls
+        instance.set label: "changed"
+        instance.save
+        @database.sqls.first.must_equal "UPDATE content SET label = 'changed', modified_at = #{@time} WHERE (id = 1)"
+      end
     end
 
     describe "schema" do
@@ -1015,6 +1047,7 @@ describe "DataMapper" do
       @database.fetch = { id: 7, type_sid:"AssocContent" }
       @parent = AssocContent.first
       @database.sqls
+      @database.columns = nil
     end
 
     after do
@@ -1189,7 +1222,8 @@ describe "DataMapper" do
 
   describe "belongs_to associations" do
     before do
-      @database.columns = @expected_columns + [:parent_id]
+      @columns = @expected_columns + [:parent_id]
+      @database.columns = @columns
       AssocContent = Spontaneous::DataMapper::Model(:content, @database, @schema)
       AssocContent.has_many_content   :children, key: :parent_id, reciprocal: :parent
       AssocContent.belongs_to_content :parent,   key: :parent_id, reciprocal: :children
@@ -1197,6 +1231,8 @@ describe "DataMapper" do
 
       @child = AssocContent.first
       @database.sqls
+      # reset the columns because it messes up prepared statments in the mock adapter
+      @database.columns = nil
     end
 
     after do
@@ -1206,23 +1242,34 @@ describe "DataMapper" do
     it "load the owner" do
       @database.fetch = { id: 7, type_sid:"AssocContent", parent_id: nil }
       parent = @child.parent
-      @database.sqls.must_equal ["SELECT * FROM content WHERE ((type_sid IN ('MockContent2', 'MockContent3')) AND (id = 7)) LIMIT 1"]
+      @database.sqls.must_equal ["SELECT * FROM content WHERE ((type_sid IN ('MockContent2', 'MockContent3')) AND (content.id = 7)) LIMIT 1"]
+      parent.must_be_instance_of AssocContent
+      parent.id.must_equal 7
+    end
+
+    it "loads the owner in a revision" do
+      @database.fetch = { id: 7, type_sid:"AssocContent", parent_id: nil }
+      parent = nil
+      @mapper.scope(23, true) do
+        parent = @child.parent
+      end
+      @database.sqls.must_equal ["SELECT * FROM __r00023_content WHERE ((hidden IS FALSE) AND (type_sid IN ('MockContent2', 'MockContent3')) AND (__r00023_content.id = 7)) LIMIT 1"]
       parent.must_be_instance_of AssocContent
       parent.id.must_equal 7
     end
 
     it "cache the result" do
       parent = @child.parent
-      @database.sqls.must_equal ["SELECT * FROM content WHERE ((type_sid IN ('MockContent2', 'MockContent3')) AND (id = 7)) LIMIT 1"]
+      @database.sqls.must_equal ["SELECT * FROM content WHERE ((type_sid IN ('MockContent2', 'MockContent3')) AND (content.id = 7)) LIMIT 1"]
       parent = @child.parent
       @database.sqls.must_equal [ ]
     end
 
     it "reload the result if asked" do
       parent = @child.parent
-      @database.sqls.must_equal ["SELECT * FROM content WHERE ((type_sid IN ('MockContent2', 'MockContent3')) AND (id = 7)) LIMIT 1"]
+      @database.sqls.must_equal ["SELECT * FROM content WHERE ((type_sid IN ('MockContent2', 'MockContent3')) AND (content.id = 7)) LIMIT 1"]
       parent = @child.parent(reload: true)
-      @database.sqls.must_equal ["SELECT * FROM content WHERE ((type_sid IN ('MockContent2', 'MockContent3')) AND (id = 7)) LIMIT 1"]
+      @database.sqls.must_equal ["SELECT * FROM content WHERE ((type_sid IN ('MockContent2', 'MockContent3')) AND (content.id = 7)) LIMIT 1"]
     end
 
     it "allow access to the relation dataset" do
@@ -1257,6 +1304,7 @@ describe "DataMapper" do
 
     describe "sequel models" do
       before do
+        @database.columns = @columns
         ::Other = Class.new(Sequel::Model(:other)) do ; end
         Other.db = @database
         AssocContent.many_to_one :other, class: Other, key: :parent_id
@@ -1422,6 +1470,34 @@ describe "DataMapper" do
       assert a.object_id == b.object_id, "Mappers it be same object"
     end
 
+    it "allows for passing any dataset to base a scope on" do
+      ds = @database[:something].filter(socks: "green")
+      @mapper.with(ds) do
+        @mapper.get(23)
+      end
+      @database.sqls.must_equal [
+        "SELECT * FROM something WHERE ((socks = 'green') AND (type_sid IN ('MockContent2', 'MockContent3')) AND (id = 23)) LIMIT 1"
+      ]
+    end
+
+    it "gives an empty revision & visibility setting for dataset scopes" do
+      ds = @database[:something].filter(socks: "green")
+      @mapper.scope(23, true) do
+        @mapper.with(ds) do
+          refute @mapper.visible_only?
+          @mapper.current_revision.must_be_nil
+        end
+      end
+    end
+
+    it "allows for separate configuration of revision & visibility" do
+      ds = @database[:something].filter(socks: "green")
+      @mapper.scope!(23, true, ds) do
+        assert @mapper.visible_only?
+        @mapper.current_revision.must_equal 23
+      end
+    end
+
     it "allow for using a custom cache key" do
       @database.fetch = [
         { id: 20, type_sid:"MockContent", parent_id: 7 }