spontaneous 0.2.0.beta1 → 0.2.0.beta2

data/test/unit/test_storage.rb

@@ -3,40 +3,41 @@
 require File.expand_path('../../test_helper', __FILE__)
 require 'fog'
 
-class StorageTest < MiniTest::Spec
-  def setup
+describe "Storage" do
+  before do
     @site = setup_site
     @config_dir = File.expand_path("../../fixtures/storage", __FILE__)
   end
 
-  def teardown
+  after do
     teardown_site
   end
 
-  context "local storage" do
-    setup do
+  describe "local" do
+    before do
       @site.paths.add :config, File.expand_path(@config_dir / "default", __FILE__)
       @site.load_config!
       # sanity check
-      @site.config.test_setting.should be_true
+      assert @site.config.test_setting
       @storage = @site.storage
     end
-    should "be the default" do
+    it "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"
+    it "have the right base url" do
+      @storage.public_url("test.jpg").must_equal "/media/test.jpg"
     end
-    should "test for locality" do
-      @storage.local?.should be_true
+    it "test for locality" do
+      assert @storage.local?
     end
 
-    should "provide a list of local storage backends" do
-      @site.local_storage.should == [@storage]
+    it "provide a list of local storage backends" do
+      @site.local_storage.must_equal [@storage]
     end
   end
-  context "cloud storage" do
-    setup do
+
+  describe "cloud" do
+    before do
       @bucket_name = "media.example.com"
       @aws_credentials = {
         :provider=>"AWS",
@@ -45,69 +46,74 @@ class StorageTest < MiniTest::Spec
       }
       ::Fog.mock!
       @connection = Fog::Storage.new(@aws_credentials)
-      @connection.directories.create(:key => @bucket_name)
+      @bucket = @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
+      assert @site.config.test_setting
       @storage = @site.storage
     end
 
-    should "be detected by configuration" do
+    it "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"
+    it "have the correct bucket name" do
+      @storage.bucket_name.must_equal "media.example.com"
     end
 
-    should "not test as local" do
-      @storage.local?.should be_false
+    it "not test as local" do
+      refute @storage.local?
     end
 
-    context "remote files" do
-      setup do
+    describe "remote files" do
+      before do
         @existing_file = File.expand_path("../../fixtures/images/rose.jpg", __FILE__)
         @media_path = %w(0003 0567 rose.jpg)
       end
-      should "have the correct mimetype" do
-        file = @storage.copy(@existing_file, @media_path, "image/jpeg")
-        file.content_type.should == "image/jpeg"
+
+      it "have the correct mimetype" do
+        file = @storage.copy(@existing_file, @media_path, { content_type: "image/jpeg" })
+        file.content_type.must_equal "image/jpeg"
       end
 
-      should "be given a far future expiry" do
+      it "is given a far future cache value" do
         now = DateTime.now
         DateTime.stubs(:now).returns(now)
-        file = @storage.copy(@existing_file, @media_path, "image/jpeg")
-        file.expires.should == (now + 20.years).to_s(:rfc822)
+        file = @storage.copy(@existing_file, @media_path, { content_type: "image/jpeg" })
+        file.cache_control.must_equal "max-age=31557600, public"
       end
 
-      should "be set as publicly visible" do
-        file = @storage.copy(@existing_file, @media_path, "image/jpeg")
+      it "be set as publicly visible" do
+        file = @storage.copy(@existing_file, @media_path, { content_type: "image/jpeg" })
         acl = file.connection.get_object_acl(file.directory.key, file.key).body['AccessControlList']
         perms = acl.detect {|grant| grant['Grantee']['URI'] == 'http://acs.amazonaws.com/groups/global/AllUsers' }
-        perms["Permission"].should == "READ"
+        perms["Permission"].must_equal "READ"
       end
 
+      it "sets any additional headers passed to the copy method" do
+        file = @storage.copy(@existing_file, @media_path, { content_type: "image/jpeg", content_disposition: "attachment; filename='something.jpg'" })
+        file.content_disposition.must_equal "attachment; filename='something.jpg'"
+      end
     end
 
-    context "public urls" do
-      setup do
+    describe "public urls" do
+      before 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")
+        @storage.copy(existing_file, @media_path, { content_type: "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"
+      it "have the correct base url" do
+        @storage.public_url(@media_path).must_equal "https://media.example.com.s3.amazonaws.com/0003/0567/rose.jpg"
       end
 
 
-      should "use custom urls if configured" do
+      it "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"
+        storage.public_url(@media_path).must_equal "http://media.example.com/0003/0567/rose.jpg"
       end
     end
   end

data/test/unit/test_structure.rb

@@ -3,86 +3,77 @@
 require File.expand_path('../../test_helper', __FILE__)
 
 
-class StructureTest < MiniTest::Spec
+describe "Structure" do
 
-  def setup
+  before do
     @site = setup_site
+    Content.delete
+    Page.field :title
+    class ProjectPage < Page; end
+    class Image < Piece; end
+    class Project < Piece
+      field :title
+      box :images do
+        allow Image
+      end
+    end
+    class HomePage < Page
+      box :projects do
+        allow ProjectPage
+      end
+      box :in_progress do
+        allow Project
+      end
+    end
+    @home = HomePage.new(:title => "Home")
+    @project1 = ProjectPage.new(:title => "Project 1")
+    @project2 = Project.new(:title => "Project 2")
+    @project3 = Project.new(:title => "Project 3")
+    @image1 = Image.new
+
+    @project2.images << @image1
+    @home.projects << @project1
+    @home.in_progress << @project2
+    @home.in_progress << @project3
+
+    @home.save
+    @home = Content[@home.id]
+    @project1 = Content[@project1.id]
   end
 
-  def teardown
+  after do
+    [:HomePage, :Project, :ProjectPage, :Image].each { |klass| Object.send(:remove_const, klass) rescue nil }
     teardown_site
   end
 
-  context "content building" do
-    setup do
-      Content.delete
-      Page.field :title
-      class ProjectPage < Page; end
-      class Image < Piece; end
-      class Project < Piece
-        field :title
-        box :images do
-          allow Image
-        end
-      end
-      class HomePage < Page
-        box :projects do
-          allow ProjectPage
-        end
-        box :in_progress do
-          allow Project
-        end
-      end
-      @home = HomePage.new(:title => "Home")
-      @project1 = ProjectPage.new(:title => "Project 1")
-      @project2 = Project.new(:title => "Project 2")
-      @project3 = Project.new(:title => "Project 3")
-      @image1 = Image.new
+  describe "site content" do
+    it "contain references to their owning page" do
+      @home.in_progress.page.must_equal @home
 
-      @project2.images << @image1
-      @home.projects << @project1
-      @home.in_progress << @project2
-      @home.in_progress << @project3
-
-      @home.save
-      @home = Content[@home.id]
-      @project1 = Content[@project1.id]
+      @home.in_progress.contents.first.page.must_equal @home
+      @home.in_progress.contents.first.images.page.must_equal @home
     end
-
-    teardown do
-      [:HomePage, :Project, :ProjectPage, :Image].each { |klass| StructureTest.send(:remove_const, klass) rescue nil }
+    it "have the right depth" do
+      @home.in_progress.depth.must_equal 0
+      @home.in_progress.last.depth.must_equal 1
+      @home.in_progress.last.images.depth.must_equal 1
+      @home.depth.must_equal 0
+      @project1.depth.must_equal 1
+      @project1.reload.depth.must_equal 1
     end
+  end
 
-    context "site content" do
-      should "contain references to their owning page" do
-        @home.in_progress.page.should == @home
-
-        @home.in_progress.contents.first.page.should == @home
-        @home.in_progress.contents.first.images.page.should == @home
-      end
-      should "have the right depth" do
-        @home.in_progress.depth.should == 0
-        @home.in_progress.last.depth.should == 1
-        @home.in_progress.last.images.depth.should == 1
-        @home.depth.should == 0
-        @project1.depth.should == 1
-        @project1.reload.depth.should == 1
-      end
+  describe "pages" do
+    it "have references back to their parent" do
+      @project1.parent.must_equal @home
     end
 
-    context "pages" do
-      should "have references back to their parent" do
-        @project1.parent.should == @home
-      end
-
-      should "have links to their children" do
-        @home.children.should == [@project1]
-      end
-
-      should "have a correct ancestor list" do
-        @project1.ancestors.should == [@home]
-      end
+    it "have links to their children" do
+      @home.children.must_equal [@project1]
     end
 
+    it "have a correct ancestor list" do
+      @project1.ancestors.must_equal [@home]
+    end
   end
 end