spontaneous 0.2.0.beta4 → 0.2.0.beta5

data/test/functional/test_user_manager.rb

@@ -22,7 +22,7 @@ describe "UserAdmin" do
   end
 
   def app
-    Spontaneous::Rack::Back.application
+    Spontaneous::Rack::Back.application(@site)
   end
 
   def api_key

data/test/test_helper.rb

@@ -21,6 +21,10 @@ require 'logger'
 
 Sequel.extension :migration
 
+# http://sequel.jeremyevans.net/rdoc-plugins/index.html
+# The scissors plugin adds class methods for update, delete, and destroy
+Sequel::Model.plugin :scissors
+
 # for future integration with travis
 ENV["SPOT_ADAPTER"] ||= "postgres"
 
@@ -95,13 +99,13 @@ class MiniTest::Spec
 
   def self.setup_site(root = nil, define_models = true)
     root ||= Dir.mktmpdir
-    instance = Spontaneous::Site.instantiate(root, :test, :back)
-    instance.schema_loader_class = Spontaneous::Schema::TransientMap
-    instance.logger.silent!
-    instance.database = DB
-    Spontaneous::Site.background_mode = :immediate
+    site = Spontaneous::Site.instantiate(root, :test, :back)
+    site.schema_loader_class = Spontaneous::Schema::TransientMap
+    site.logger.silent!
+    site.database = DB
+    site.background_mode = :immediate
     unless Object.const_defined?(:Content)
-      content_class = Class.new(Spontaneous::Model(:content, DB, instance.schema))
+      content_class = Class.new(Spontaneous::Model!(:content, DB, site.schema))
       Object.const_set :Content, content_class
       if define_models
         Object.const_set :Page, Class.new(::Content::Page)
@@ -109,10 +113,10 @@ class MiniTest::Spec
         Object.const_set :Box, Class.new(::Content::Box)
       end
     end
-    Object.const_set :Site,  Spontaneous.site!(::Content)
+    site.model = ::Content
     # Use the fast version of the password hashing algorithm
     Spontaneous::Crypt.force_version(0)
-    instance
+    site
   end
 
   def self.teardown_site(clear_disk = true, clear_const = true)
@@ -120,7 +124,7 @@ class MiniTest::Spec
       FileUtils.rm_r(Spontaneous.instance.root) rescue nil
     end
     return unless clear_const
-    %w(Piece Page Box Content Site).each do |klass|
+    %w(Piece Page Box Content).each do |klass|
       Object.send :remove_const, klass if Object.const_defined?(klass)
     end
     Spontaneous.send :remove_const, :Content rescue nil
@@ -174,8 +178,8 @@ class MiniTest::Spec
     self.class.teardown_site(clear_disk, clear_const)
   end
 
-  def assert_correct_template(content, expected_path, format = :html)
-    assert_equal(expected_path, content.template(format))
+  def assert_correct_template(content, expected_path, renderer, format = :html)
+    assert_equal(expected_path, content.template(format, renderer))
   end
 
   def assert_file_exists(*path)

data/test/unit/test_alias.rb

@@ -9,8 +9,9 @@ describe "Alias" do
     template_root = File.expand_path(File.join(File.dirname(__FILE__), "../fixtures/templates/aliases"))
     let(:template_root) { template_root }
     site.paths.add(:templates, template_root)
-    renderer = S::Output::Template::Renderer.new(false)
-    S::Output.renderer = renderer
+    renderer = S::Output::Template::Renderer.new(site, false)
+    let(:renderer) { renderer }
+    let(:site) { site }
 
     Content.delete
 
@@ -125,6 +126,7 @@ describe "Alias" do
   end
 
   before do
+    @site = site
   end
 
   after do
@@ -183,11 +185,12 @@ describe "Alias" do
         end
 
         it "allow for selecting only content from within one box" do
-          class ::X < ::Piece
-            alias_of :A, :container => Proc.new { S::Site['$thepage'].box1 }
+          container_proc = Proc.new { site['$thepage'].box1 }
+          ::X = Class.new(::Piece) do
+            alias_of :A, :container => container_proc
           end
-          class ::XX < ::Piece
-            alias_of :AA, :container => Proc.new { S::Site['$thepage'].box1 }
+          ::XX = Class.new(::Piece) do
+            alias_of :AA, :container => container_proc
           end
           targets = lambda { |a, target|
             [(a.targets), @page.box1.select { |p| target === p }].map { |a| Set.new(a) }
@@ -199,22 +202,24 @@ describe "Alias" do
         end
 
         it "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] }
+          container_proc = Proc.new { [site['$thepage'].box1, site['$thepage'].box2] }
+          ::X = Class.new(::Piece) do
+            alias_of :A, :container => container_proc
           end
-          class ::XX < ::Piece
-            alias_of :AA, :container => Proc.new { [S::Site['$thepage'].box1, S::Site['$thepage'].box2] }
+          ::XX = Class.new(::Piece) do
+            alias_of :AA, :container => container_proc
           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
 
         it "allow for selecting only content from within one page" do
-          class ::X < ::Piece
-            alias_of :A, :container => Proc.new { S::Site['$thepage'] }
+          container_proc = Proc.new { site['$thepage'] }
+          ::X = Class.new(::Piece) do
+            alias_of :A, :container => container_proc
           end
-          class ::XX < ::Piece
-            alias_of :AA, :container => Proc.new { S::Site['$thepage'] }
+          ::XX = Class.new(::Piece) do
+            alias_of :AA, :container => container_proc
           end
           assert_same_content X.targets, @page.content.select { |p| A === p }
           assert_same_content XX.targets, @page.content.select { |p| AA === p }
@@ -229,11 +234,13 @@ describe "Alias" do
             page2.box2 << AA.new
           }
           page2.save.reload
-          class ::X < ::Piece
-            alias_of :A, :AA, :container => Proc.new { [S::Site['$thepage'].box1, S::Site['$thepage2']] }
+          container_proc = Proc.new { [site['$thepage'].box1, site['$thepage2']] }
+          ::X = Class.new(::Piece) do
+            alias_of :A, :AA, :container => container_proc
           end
-          class ::XX < ::Piece
-            alias_of :AA, :container => Proc.new { [S::Site['$thepage'], S::Site['$thepage2'].box2] }
+          container_proc = Proc.new { [site['$thepage'], site['$thepage2'].box2] }
+          ::XX = Class.new(::Piece) do
+            alias_of :AA, :container => container_proc
           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 }
@@ -327,21 +334,21 @@ describe "Alias" do
       end
 
       it "have their own styles" do
-        assert_correct_template(@a_alias,  template_root / 'a_alias/a_alias_style')
+        assert_correct_template(@a_alias,  template_root / 'a_alias/a_alias_style', renderer)
       end
 
       it "present their target's styles as their own" do
         @a_alias.style = :a_style
 
-        assert_correct_template(@a_alias,  template_root / 'a/a_style')
+        assert_correct_template(@a_alias,  template_root / 'a/a_style', renderer)
       end
 
       it "should use templates belonging to the alias class if they exist" do
-        assert_correct_template(@aa_alias,  template_root / 'aa_alias')
+        assert_correct_template(@aa_alias,  template_root / 'aa_alias', renderer)
       end
 
       it "should fallback to the targets default style if no alias template is present" do
-        assert_correct_template(@aaa_alias,  aaa1.template)
+        assert_correct_template(@aaa_alias,  aaa1.template, renderer)
       end
 
       # should "have an independent style setting"
@@ -410,7 +417,7 @@ describe "Alias" do
       a = BBAlias.create(:target => bb)
       aliases.box1 << a
       aliases.save
-      Site["/aliases/bb"].must_be_nil
+      site["/aliases/bb"].must_be_nil
     end
 
     it "have their target's path attribute if they alias to a page type" do
@@ -447,8 +454,8 @@ describe "Alias" do
       a.save
       a.reload
       a.path.must_equal "/aliases/b"
-      Site["/aliases/balias"].must_be_nil
-      Site["/aliases/b"].must_equal a
+      site["/aliases/balias"].must_be_nil
+      site["/aliases/b"].must_equal a
     end
 
     it "update their path if their target's slug changes" do

data/test/unit/test_asset_bundler.rb

@@ -6,7 +6,7 @@ describe "AssetBundler" do
   include RackTestMethods
 
   def app
-    Spontaneous::Rack::Back.application
+    Spontaneous::Rack::Back.application(@site)
   end
 
   def fixture_dir

data/test/unit/test_assets.rb

@@ -7,7 +7,7 @@ describe "Assets" do
   include RackTestMethods
 
   def app
-    Spontaneous::Rack::Back.application
+    Spontaneous::Rack::Back.application(site)
   end
 
   module LiveSimulation
@@ -24,12 +24,12 @@ describe "Assets" do
 
   def new_context(live, content = @page, format = :html, params = {})
     renderer = if live
-                 Spontaneous::Output::Template::PublishRenderer.new
+                 Spontaneous::Output::Template::PublishRenderer.new(site)
                else
-                 Spontaneous::Output::Template::PreviewRenderer.new
+                 Spontaneous::Output::Template::PreviewRenderer.new(site)
                end
     output = content.output(format)
-    context = renderer.context(output, params)
+    context = renderer.context(output, params, nil)
     context.extend LiveSimulation if live
     context.class_eval do
       # Force us into production environment
@@ -67,6 +67,7 @@ describe "Assets" do
     site.config.tap do |c|
       c.auto_login = 'root'
     end
+    site.output_store(:Memory)
     Spontaneous::Permissions::User.delete
     user = Spontaneous::Permissions::User.create(:email => "root@example.com", :login => "root", :name => "root name", :password => "rootpass")
     user.update(:level => Spontaneous::Permissions[:editor])
@@ -177,7 +178,7 @@ describe "Assets" do
   end
 
   describe "preview" do
-    let(:app) { Spontaneous::Rack::Back.application }
+    let(:app) { Spontaneous::Rack::Back.application(site) }
     let(:context) { preview_context }
 
     describe "javascript" do
@@ -308,19 +309,19 @@ describe "Assets" do
         get "/assets/css/data.css"
         assert last_response.ok?, "Recieved #{last_response.status} not 200"
         result = last_response.body
-        result.must_match /background-image: url\(data:image\/png;base64,/
+        result.must_match %r{background-image: url\(data:image\/png;base64,}
       end
 
       it "can include other assets" do
         get "/assets/css/import.css"
         assert last_response.ok?, "Recieved #{last_response.status} not 200"
         result = last_response.body
-        result.must_match /width: 8px;/
+        result.must_match %r{width: 8px;}
       end
     end
 
     describe "templates" do
-      let(:renderer)  { Spontaneous::Output::Template::PreviewRenderer.new }
+      let(:renderer)  { Spontaneous::Output::Template::PreviewRenderer.new(site) }
 
       it "should allow for embedding asset images into templates" do
         result = renderer.render_string("${ asset_path 'i/y.png' }", @page.output(:html))
@@ -334,7 +335,7 @@ describe "Assets" do
   end
 
   describe "publishing" do
-    let(:app) { Spontaneous::Rack::Front.application }
+    let(:app) { Spontaneous::Rack::Front.application(site) }
     let(:context) { live_context }
     let(:revision) { S::Revision.new(context.revision) }
 
@@ -352,22 +353,22 @@ describe "Assets" do
       it "bundles & fingerprints local scripts" do
         result = context.scripts('js/all', 'js/m.js', 'js/c.js', 'x')
         result.must_equal [
-          '<script type="text/javascript" src="/assets/js/all-41bda6efdd3c1871f11cac5d32a92884.js"></script>',
-          '<script type="text/javascript" src="/assets/js/m-13002c7b4bf04e2e9ab087632f91e008.js"></script>',
-          '<script type="text/javascript" src="/assets/js/c-27c1b15107f5e860c78f41cc6f382e71.js"></script>',
-          '<script type="text/javascript" src="/assets/x-2eef76c5977a151671b9e202e75f7fc4.js"></script>'
+          '<script type="text/javascript" src="/assets/js/all-ceb12af81123a85bc4d15f23c2cf1069.js"></script>',
+          '<script type="text/javascript" src="/assets/js/m-262ca357844c1eeaee7688fe5bafa4ca.js"></script>',
+          '<script type="text/javascript" src="/assets/js/c-e405b6a6ea9a29a46905bd10627a53a8.js"></script>',
+          '<script type="text/javascript" src="/assets/x-e613ff07e2bd683e0c9f519c94abcb00.js"></script>'
         ].join("\n")
       end
 
       it "writes bundled assets to the revision directory" do
         result = context.scripts('js/all')
-        asset_path = revision.path("assets/js/all-41bda6efdd3c1871f11cac5d32a92884.js")
+        asset_path = revision.path("assets/js/all-ceb12af81123a85bc4d15f23c2cf1069.js")
         assert asset_path.exist?
       end
 
       it "compresses local scripts" do
         result = context.scripts('js/all')
-        asset_path = revision.path("assets/js/all-41bda6efdd3c1871f11cac5d32a92884.js")
+        asset_path = revision.path("assets/js/all-ceb12af81123a85bc4d15f23c2cf1069.js")
         js = asset_path.read
         js.index("\n").must_be_nil
       end
@@ -375,23 +376,23 @@ describe "Assets" do
       it "bundles locals scripts and includes remote ones" do
         result = context.scripts('js/all', '//use.typekit.com/abcde', 'http://cdn.google.com/jquery.js', 'x')
         result.must_equal [
-          '<script type="text/javascript" src="/assets/js/all-41bda6efdd3c1871f11cac5d32a92884.js"></script>',
+          '<script type="text/javascript" src="/assets/js/all-ceb12af81123a85bc4d15f23c2cf1069.js"></script>',
           '<script type="text/javascript" src="//use.typekit.com/abcde"></script>',
           '<script type="text/javascript" src="http://cdn.google.com/jquery.js"></script>',
-          '<script type="text/javascript" src="/assets/x-2eef76c5977a151671b9e202e75f7fc4.js"></script>'
+          '<script type="text/javascript" src="/assets/x-e613ff07e2bd683e0c9f519c94abcb00.js"></script>'
         ].join("\n")
       end
 
       it "makes bundled scripts available under /assets" do
         context.scripts('js/all')
-        get "/assets/js/all-41bda6efdd3c1871f11cac5d32a92884.js"
-        asset_path = revision.path("assets/js/all-41bda6efdd3c1871f11cac5d32a92884.js")
+        get "/assets/js/all-ceb12af81123a85bc4d15f23c2cf1069.js"
+        asset_path = revision.path("assets/js/all-ceb12af81123a85bc4d15f23c2cf1069.js")
         last_response.body.must_equal asset_path.read
       end
 
       it "only bundles & compresses once" do
         context.scripts('js/all')
-        asset_path = revision.path("assets/js/all-41bda6efdd3c1871f11cac5d32a92884.js")
+        asset_path = revision.path("assets/js/all-ceb12af81123a85bc4d15f23c2cf1069.js")
         assert asset_path.exist?
         asset_path.open("w") do |file|
           file.write("var cached = true;")
@@ -405,16 +406,16 @@ describe "Assets" do
       it "bundles & fingerprints local stylesheets" do
         result = context.stylesheets('css/all', 'css/a.css', 'x')
         result.must_equal [
-          '<link rel="stylesheet" href="/assets/css/all-1025f1a33ab09fa179fa17e59003c540.css" />',
-          '<link rel="stylesheet" href="/assets/css/a-8722cd5f8622cb619f4359ef2b61ff68.css" />',
-          '<link rel="stylesheet" href="/assets/x-a5f93540463324ea08e956befded6cbf.css" />'
+          '<link rel="stylesheet" href="/assets/css/all-c80e50bd55af79647f771d421c0e732a.css" />',
+          '<link rel="stylesheet" href="/assets/css/a-2709bcba844511c3afc19fa1805e5834.css" />',
+          '<link rel="stylesheet" href="/assets/x-6c1e7ede5bbe3a4ff80314f43fd6ef57.css" />'
         ].join("\n")
       end
 
       it "ignores missing stylesheets" do
         result = context.stylesheets('css/all', '/css/notfound', 'css/notfound')
         result.must_equal [
-          '<link rel="stylesheet" href="/assets/css/all-1025f1a33ab09fa179fa17e59003c540.css" />',
+          '<link rel="stylesheet" href="/assets/css/all-c80e50bd55af79647f771d421c0e732a.css" />',
           '<link rel="stylesheet" href="/css/notfound" />',
           '<link rel="stylesheet" href="css/notfound" />'
         ].join("\n")
@@ -423,10 +424,10 @@ describe "Assets" do
       it "bundles locals scripts and includes remote ones" do
         result = context.stylesheets('css/all.css', '//stylesheet.com/responsive', 'http://cdn.google.com/normalize.css', 'x')
         result.must_equal [
-          '<link rel="stylesheet" href="/assets/css/all-1025f1a33ab09fa179fa17e59003c540.css" />',
+          '<link rel="stylesheet" href="/assets/css/all-c80e50bd55af79647f771d421c0e732a.css" />',
           '<link rel="stylesheet" href="//stylesheet.com/responsive" />',
           '<link rel="stylesheet" href="http://cdn.google.com/normalize.css" />',
-          '<link rel="stylesheet" href="/assets/x-a5f93540463324ea08e956befded6cbf.css" />'
+          '<link rel="stylesheet" href="/assets/x-6c1e7ede5bbe3a4ff80314f43fd6ef57.css" />'
         ].join("\n")
       end
 
@@ -478,9 +479,9 @@ describe "Assets" do
         get path
         assert last_response.ok?, "Recieved #{last_response.status} not 200"
         result = last_response.body
-        result.must_match %r{background:url\(/assets/i/y-d5ca7c01801a5a9985b92aa2d6a81c91\.png\)}
+        result.must_match %r{background:url\(/assets/i/y-e75e0b52344f0e16c0564a3a7b0b8ace\.png\)}
 
-        asset_path = revision.path("/assets/i/y-d5ca7c01801a5a9985b92aa2d6a81c91.png")
+        asset_path = revision.path("/assets/i/y-e75e0b52344f0e16c0564a3a7b0b8ace.png")
         assert asset_path.exist?
       end
 
@@ -497,22 +498,22 @@ describe "Assets" do
         get path
         assert last_response.ok?, "Recieved #{last_response.status} not 200"
         result = last_response.body
-        result.must_match %r{background:url\(/assets/i/y-d5ca7c01801a5a9985b92aa2d6a81c91\.png\?query=true#hash\)}
-        asset_path = revision.path("/assets/i/y-d5ca7c01801a5a9985b92aa2d6a81c91.png")
+        result.must_match %r{background:url\(/assets/i/y-e75e0b52344f0e16c0564a3a7b0b8ace\.png\?query=true#hash\)}
+        asset_path = revision.path("/assets/i/y-e75e0b52344f0e16c0564a3a7b0b8ace.png")
         assert asset_path.exist?
       end
     end
 
     describe "templates" do
-      let(:renderer)  { Spontaneous::Output::Template::PublishRenderer.new }
+      let(:renderer)  { Spontaneous::Output::Template::PublishRenderer.new(site) }
 
       it "should allow for embedding asset images into templates" do
         result = renderer.render_string("${ asset_path 'i/y.png' }", @page.output(:html))
-        result.must_equal "/assets/i/y-d5ca7c01801a5a9985b92aa2d6a81c91.png"
+        result.must_equal "/assets/i/y-e75e0b52344f0e16c0564a3a7b0b8ace.png"
       end
       it "should allow for embedding asset urls into templates" do
         result = renderer.render_string("${ asset_url 'i/y.png' }", @page.output(:html))
-        result.must_equal "url(/assets/i/y-d5ca7c01801a5a9985b92aa2d6a81c91.png)"
+        result.must_equal "url(/assets/i/y-e75e0b52344f0e16c0564a3a7b0b8ace.png)"
       end
     end
   end

data/test/unit/test_authentication.rb

@@ -150,7 +150,7 @@ describe "Authentication" do
   end
 
   def app
-    Spontaneous::Rack::Back.application
+    Spontaneous::Rack::Back.application(site)
   end
 
 

data/test/unit/test_boxes.rb

@@ -410,11 +410,13 @@ describe "Boxes" do
         allow_subclasses :Allowed1
       end
 
-
+      class ::AllowedAs < Box
+        allow :Allowed1, as: "Something Else"
+      end
     end
 
     after do
-      [:Parent, :Allowed1, :Allowed11, :Allowed111, :Allowed2, :Allowed3, :Allowed4, :ChildClass, :Allowable, :Mixed].each { |k| Object.send(:remove_const, k) } rescue nil
+      [:Parent, :Allowed1, :Allowed11, :Allowed111, :Allowed2, :Allowed3, :Allowed4, :ChildClass, :Allowable, :Mixed, :AllowedAs].each { |k| Object.send(:remove_const, k) } rescue nil
     end
 
     it "have a list of allowed types" do
@@ -523,6 +525,18 @@ describe "Boxes" do
       end
       assert @site.schema.classes.map(&:to_s).include?("ChildClass::InlineType"), "#{@site.schema.classes} does not include ChildClass::InlineType"
     end
+
+    it "lets you define the name of the allowed type in the interface using 'as'" do
+      Page.box :as, class: :AllowedAs
+      page_schema = @site.schema.export['Page']
+      box_schema = page_schema[:boxes].first
+      allowed = box_schema[:allowed_types]
+      allowed.length.must_equal 1
+      defn = allowed.first
+      defn.must_be_instance_of Hash
+      defn[:type].must_equal "Allowed1"
+      defn[:as].must_equal "Something Else"
+    end
   end
 
   describe "Box groups" do