spontaneous 0.1.0.alpha1 → 0.2.0.alpha1

data/test/unit/test_serialisation.rb

@@ -1,15 +1,23 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 require 'erb'
 
 
 class SerialisationTest < MiniTest::Spec
   include Spontaneous
+
+  def setup
+    @site = setup_site
+  end
+
+  def teardown
+    teardown_site
+  end
+
   context "Content" do
     setup do
       Content.delete
-      Spot::Schema.reset!
       class ::Page < Spontaneous::Page
         field :title, :string, :default => "New Page"
       end
@@ -93,7 +101,14 @@ class SerialisationTest < MiniTest::Spec
         Spot::deserialise_http(SerialisedPiece.serialise_http).should == @class_hash
       end
       should "include the title field name in the serialisation of page types" do
-        SerialisedPage.export[:title_field].should == 'title'
+        SerialisedPage.export(nil)[:title_field].should == 'title'
+      end
+      should "use JS friendly names for type keys" do
+        class ::SerialisedPage
+          class InnerClass < Piece
+          end
+        end
+        Site.schema.export['SerialisedPage.InnerClass'].should ==  ::SerialisedPage::InnerClass.export
       end
     end
 
@@ -138,10 +153,10 @@ class SerialisationTest < MiniTest::Spec
         @child.direction = "N"
         @child.uid = "about"
 
-        @root.pieces[0].style = :freezing
-        @root.insides.pieces[0].visible = false
-        @root.pieces[1].style = :boiling
-        @root.pieces[0].pieces[0].style = :sitting
+        @root.insides[0].style = :freezing
+        @root.insides[0].visible = false
+        @root.insides[1].style = :boiling
+        @root.insides.first.first.style = :sitting
 
         @child.path.should == "/about"
 
@@ -166,14 +181,15 @@ class SerialisationTest < MiniTest::Spec
         # hard to test this as the serialisation order appears to change
         Spot.deserialise_http(@root.serialise_http).should == @root.export
       end
+
     end
   end
 
   context "Publishing" do
     setup do
-      Spot::Schema.reset!
       class ::Page < Spontaneous::Page
         field :title, :string, :default => "New Page"
+        box   :box1
       end
       @now = Time.now
       Time.stubs(:now).returns(@now)
@@ -181,7 +197,7 @@ class SerialisationTest < MiniTest::Spec
       Change.delete
       @page1 = ::Page.create
       @page2 = ::Page.create(:slug => "page2")
-      @page1 << @page2
+      @page1.box1 << @page2
       @page2.save
       @c1 = Change.new
       @c1.push(@page1)
@@ -194,7 +210,7 @@ class SerialisationTest < MiniTest::Spec
     end
 
     teardown do
-      Object.send(:remove_const, :Page)
+      Object.send(:remove_const, :Page) rescue nil
       Content.delete
       Change.delete
     end

data/test/unit/test_site.rb

@@ -1,18 +1,25 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
 
 class SiteTest < MiniTest::Spec
   include Spontaneous
+
   def setup
+    @site = setup_site
+  end
+
+  def teardown
+    teardown_site
   end
+
   context "Site:" do
     setup do
       Content.delete
-      Spot::Schema.reset!
       class ::Page < Spontaneous::Page
         field :title
+        box :subpages
       end
       Content.delete
       @root = ::Page.new
@@ -29,17 +36,17 @@ class SiteTest < MiniTest::Spec
       @page3_2.title = "Page 3 2"
       @page3_2.uid = "page3_2"
 
-      @root << @page1_1
-      @root << @page1_2
-      @page1_1 << @page2_1
-      @page2_1 << @page3_1
-      @page2_1 << @page3_2
-      @root.save
-      @page1_1.save
-      @page1_2.save
-      @page2_1.save
-      @page3_1.save
-      @page3_2.save
+      @root.subpages << @page1_1
+      @root.subpages << @page1_2
+      @page1_1.subpages << @page2_1
+      @page2_1.subpages << @page3_1
+      @page2_1.subpages << @page3_2
+      @root.save.reload
+      @page1_1.save.reload
+      @page1_2.save.reload
+      @page2_1.save.reload
+      @page3_1.save.reload
+      @page3_2.save.reload
     end
     teardown do
       Object.send(:remove_const, :Page)
@@ -70,18 +77,19 @@ class SiteTest < MiniTest::Spec
           :id => @page3_2.id,
           :title => "Page 3 2",
           :path => '/page1-1/page2-1/page3-2',
+          :slug => 'page3-2',
           :type => 'Page',
           :type_id => ::Page.schema_id,
           :depth => 3,
           :children => [],
           :ancestors => [
-            { :id => @root.id, :title => "Homepage", :path => '/', :type => 'Page', :type_id => ::Page.schema_id, :depth => 0, :children => 2 },
-            { :id => @page1_1.id, :title => "Page 1 1", :path => '/page1-1', :type => 'Page', :type_id => ::Page.schema_id, :depth => 1, :children => 1 },
-            { :id => @page2_1.id, :title => "Page 2 1", :path => '/page1-1/page2-1', :type => 'Page', :type_id => ::Page.schema_id, :depth => 2, :children => 2 }
+            { :id => @root.id, :title => "Homepage", :path => '/', :slug => '', :type => 'Page', :type_id => ::Page.schema_id, :depth => 0, :children => 2 },
+            { :id => @page1_1.id, :title => "Page 1 1", :path => '/page1-1', :slug => 'page1-1', :type => 'Page', :type_id => ::Page.schema_id, :depth => 1, :children => 1 },
+            { :id => @page2_1.id, :title => "Page 2 1", :path => '/page1-1/page2-1', :slug => 'page2-1', :type => 'Page', :type_id => ::Page.schema_id, :depth => 2, :children => 2 }
         ],
           :generation => [
-            { :id => @page3_1.id, :title => "Page 3 1", :path => '/page1-1/page2-1/page3-1', :type => 'Page', :type_id => ::Page.schema_id, :depth => 3, :children => 0 },
-            { :id => @page3_2.id, :title => "Page 3 2", :path => '/page1-1/page2-1/page3-2', :type => 'Page', :type_id => ::Page.schema_id, :depth => 3, :children => 0 }
+            { :id => @page3_1.id, :title => "Page 3 1", :path => '/page1-1/page2-1/page3-1', :slug => 'page3-1', :type => 'Page', :type_id => ::Page.schema_id, :depth => 3, :children => 0 },
+            { :id => @page3_2.id, :title => "Page 3 2", :path => '/page1-1/page2-1/page3-2', :slug => 'page3-2', :type => 'Page', :type_id => ::Page.schema_id, :depth => 3, :children => 0 }
         ],
           :children => []
         }
@@ -90,34 +98,36 @@ class SiteTest < MiniTest::Spec
           :id => @page2_1.id,
           :title => "Page 2 1",
           :path => '/page1-1/page2-1',
+          :slug => 'page2-1',
           :type => 'Page',
-          :type_id => ::Page.schema_id,
+          :type_id => ::Page.schema_id.to_s,
           :depth => 2,
           :children => [{:depth=>3,
                          :type=>"Page",
-          :type_id => ::Page.schema_id,
+          :type_id => ::Page.schema_id.to_s,
                          :children=>0,
                          :path=>"/page1-1/page2-1/page3-1",
+                          :slug => 'page3-1',
                          :title=>"Page 3 1",
                          :id=>@page3_1.id},
                          {:depth=>3,
                           :type=>"Page",
-          :type_id => ::Page.schema_id,
+          :type_id => ::Page.schema_id.to_s,
                           :children=>0,
                           :path=>"/page1-1/page2-1/page3-2",
+                          :slug => 'page3-2',
                           :title=>"Page 3 2",
                           :id=>@page3_2.id}],
                           :ancestors => [
-                            { :id => @root.id, :title => "Homepage", :path => '/', :type => 'Page', :type_id => ::Page.schema_id, :depth => 0, :children => 2 },
-                            { :id => @page1_1.id, :title => "Page 1 1", :path => '/page1-1', :type => 'Page', :type_id => ::Page.schema_id, :depth => 1, :children => 1 }
+                            { :id => @root.id, :title => "Homepage", :path => '/', :slug => '',:type => 'Page', :type_id => ::Page.schema_id, :depth => 0, :children => 2 },
+                            { :id => @page1_1.id, :title => "Page 1 1", :path => '/page1-1', :slug => 'page1-1',:type => 'Page', :type_id => ::Page.schema_id, :depth => 1, :children => 1 }
         ],
           :generation => [
-            { :id => @page2_1.id, :title => "Page 2 1", :path => '/page1-1/page2-1', :type => 'Page', :type_id => ::Page.schema_id, :depth => 2, :children => 2 }
+            { :id => @page2_1.id, :title => "Page 2 1", :path => '/page1-1/page2-1', :slug => 'page2-1',:type => 'Page', :type_id => ::Page.schema_id, :depth => 2, :children => 2 }
         ]
         }
       end
 
-      should ""
 
       should "retrieve details of the root by default" do
         Site.map.should == Page.root.map_entry
@@ -140,6 +150,13 @@ class SiteTest < MiniTest::Spec
       should "have a shortcut direct method on Site" do
         Site.page3_2.should == @page3_2.reload
       end
+
+      should "return section pages in the right order" do
+        Site.at_depth(0).should == @root
+        Site.at_depth(:root).should == @root
+        Site.at_depth(1).should == [@page1_1, @page1_2]
+        Site.at_depth(:section).should == [@page1_1, @page1_2]
+      end
     end
   end
 end

data/test/unit/test_storage.rb

@@ -0,0 +1,88 @@
+# encoding: UTF-8
+
+require File.expand_path('../../test_helper', __FILE__)
+require 'fog'
+
+class StorageTest < MiniTest::Spec
+  def setup
+    @site = setup_site
+    @config_dir = File.expand_path("../../fixtures/storage", __FILE__)
+  end
+
+  def teardown
+    teardown_site
+  end
+
+  context "local storage" do
+    setup do
+      @site.paths.add :config, File.expand_path(@config_dir / "default", __FILE__)
+      @site.load_config!
+      # sanity check
+      @site.config.test_setting.should be_true
+      @storage = @site.storage
+    end
+    should "be the default" do
+      @storage.must_be_instance_of Spontaneous::Storage::Local
+    end
+    should "have the right base url" do
+      @storage.public_url("test.jpg").should == "/media/test.jpg"
+    end
+    should "test for locality" do
+      @storage.local?.should be_true
+    end
+
+    should "provide a list of local storage backends" do
+      @site.local_storage.should == [@storage]
+    end
+  end
+  context "cloud storage" do
+    setup do
+      @bucket_name = "media.example.com"
+      @aws_credentials = {
+        :provider=>"AWS",
+        :aws_secret_access_key=>"SECRET_ACCESS_KEY",
+        :aws_access_key_id=>"ACCESS_KEY_ID"
+      }
+      ::Fog.mock!
+      @connection = Fog::Storage.new(@aws_credentials)
+      @connection.directories.create(:key => @bucket_name)
+      @site.paths.add :config, File.expand_path(@config_dir / "cloud", __FILE__)
+      @site.load_config!
+      # sanity check
+      @site.config.test_setting.should be_true
+      @storage = @site.storage
+    end
+
+    should "be detected by configuration" do
+      @storage.must_be_instance_of Spontaneous::Storage::Cloud
+    end
+
+    should "have the correct bucket name" do
+      @storage.bucket_name.should == "media.example.com"
+    end
+
+    should "not test as local" do
+      @storage.local?.should be_false
+    end
+
+    context "public urls" do
+      setup do
+        existing_file = File.expand_path("../../fixtures/images/rose.jpg", __FILE__)
+        @media_path = %w(0003 0567 rose.jpg)
+        @storage.copy(existing_file, @media_path, "image/jpeg")
+      end
+
+      should "have the correct base url" do
+        @storage.public_url(@media_path).should == "https://media.example.com.s3.amazonaws.com/0003-0567-rose.jpg"
+      end
+
+
+      should "use custom urls if configured" do
+        storage = Spontaneous::Storage::Cloud.new(@aws_credentials.merge({
+          :public_host => "http://media.example.com",
+        }), @bucket_name)
+        storage.public_url(@media_path).should == "http://media.example.com/0003-0567-rose.jpg"
+      end
+    end
+  end
+end

data/test/unit/test_structure.rb

@@ -1,13 +1,21 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
 
 class StructureTest < MiniTest::Spec
+
+  def setup
+    @site = setup_site
+  end
+
+  def teardown
+    teardown_site
+  end
+
   context "content building" do
     setup do
       Content.delete
-      Spot::Schema.reset!
       class Page < Spot::Page
         field :title
       end
@@ -78,8 +86,6 @@ class StructureTest < MiniTest::Spec
         @project1.ancestors.should == [@home]
       end
     end
+
   end
 end
-
-
-

data/test/unit/test_styles.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
 
 class StylesTest < MiniTest::Spec
@@ -14,7 +14,13 @@ class StylesTest < MiniTest::Spec
   #   end
   # end
 
+
+  def teardown
+    teardown_site
+  end
+
   def setup
+    @site = setup_site
     self.template_root = File.expand_path(File.join(File.dirname(__FILE__), "../fixtures/styles"))
     Spontaneous::Render.use_development_renderer
   end
@@ -22,7 +28,11 @@ class StylesTest < MiniTest::Spec
   context "styles for" do
 
     setup do
-      Spot::Schema.reset!
+
+      class ::Page < Spontaneous::Page; end
+      class ::Piece < Spontaneous::Piece; end
+      class ::Box < Spontaneous::Box; end
+
       class ::MissingClass < Piece; end
       class ::TemplateClass < Piece; end
       class ::TemplateSubClass1 < TemplateClass; end
@@ -357,7 +367,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
 
 
@@ -376,6 +386,44 @@ class StylesTest < MiniTest::Spec
           assert_correct_template(piece.dongles, 'named2')
           piece.dongles.render.should == "named2.html.cut\n"
         end
+
+        should "use styles assigned in a subclass" do
+          saved_template_root = self.template_root
+          self.template_root = Spontaneous.template_root
+          ::TemplateSubClass = Class.new(TemplateClass)
+          ::TemplateSubSubClass = Class.new(TemplateSubClass)
+
+          TemplateSubClass.box :bananas
+          TemplateSubClass.box :apples, :style => :apples
+          TemplateSubClass.box :oranges do
+            style :oranges
+          end
+
+          # FileUtils.mkdir_p(Spontaneous.template_root)
+
+          piece = TemplateSubSubClass.new
+          assert Proc === piece.bananas.template
+
+          [[piece.bananas, %w(template_sub_sub_class/bananas template_sub_class/bananas)],
+           [piece.apples, %w(template_sub_sub_class/apples template_sub_class/apples apples)],
+           [piece.oranges, %w(template_sub_sub_class/oranges template_sub_class/oranges oranges)]
+          ].each do |box, test_templates|
+            test_templates.each do |test_template|
+              FileUtils.mkdir_p(File.dirname(Spontaneous.template_root(test_template)))
+              FileUtils.touch(Spontaneous.template_root(test_template) + '.html.cut')
+
+              assert_correct_template(box, test_template)
+
+              FileUtils.rm_r(::File.dirname(Spontaneous.template_root(test_template)))
+            end
+          end
+
+
+          Object.send(:remove_const, :TemplateSubClass)
+          Object.send(:remove_const, :TemplateSubSubClass)
+          FileUtils.rm_r(Spontaneous.template_root) rescue nil
+          self.template_root = saved_template_root
+        end
       end
 
       context "boxes with a specified class" do
@@ -396,6 +444,19 @@ class StylesTest < MiniTest::Spec
           piece.entities.render.should == "box_a.html.cut\n"
         end
 
+        should "find templates for box subclasses with specified types defined in a supertype" do
+          Object.send(:remove_const, :TemplateSubClass) rescue nil
+          Object.send(:remove_const, :BoxASubclass) rescue nil
+          class ::BoxASubclass < BoxA; end
+          TemplateClass.box :lastly, :type => :BoxASubclass
+          class ::TemplateSubClass < TemplateClass
+          end
+          piece = TemplateSubClass.new
+          assert_correct_template(piece.lastly, 'box_a')
+          Object.send(:remove_const, :BoxASubclass)
+          Object.send(:remove_const, :TemplateSubClass)
+        end
+
         context "with configured styles" do
           setup do
             BoxA.style :runny