spontaneous 0.1.0.alpha1 → 0.2.0.alpha1

data/test/{experimental → unit}/test_formats.rb

@@ -1,15 +1,21 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
 class FormatsTest < MiniTest::Spec
   context "Pages" do
     setup do
-      class FPage < Spontaneous::Page; end
+      @site = setup_site
+      class Page < Spontaneous::Page; end
+      class FPage < Page; end
     end
+
     teardown do
-      self.class.send(:remove_const, :FPage)
+      self.class.send(:remove_const, :Page) rescue nil
+      self.class.send(:remove_const, :FPage) rescue nil
+      teardown_site
     end
+
     should "default to a single :html format" do
       FPage.formats.should == [:html]
     end
@@ -28,6 +34,7 @@ class FormatsTest < MiniTest::Spec
       FPage.mime_type(:atom).should == "application/atom+xml"
     end
 
+
     context "instances" do
       setup do
         @page = FPage.new
@@ -66,6 +73,11 @@ class FormatsTest < MiniTest::Spec
       should "accept new formats when accompanied by a mime-type" do
         FPage.formats [{:xyz => "application/xyz"}]
       end
+
+      should "allow addition of a single format" do
+        FPage.add_format :atom
+        FPage.formats.should == [:rss, :html, :json, :atom]
+      end
     end
 
     context "with custom mime-types" do
@@ -87,6 +99,33 @@ class FormatsTest < MiniTest::Spec
         page = FPage.new
         page.mime_type(:html).should == "application/xhtml+xml"
       end
+
+      should "allow addition of a single custom format" do
+        FPage.add_format :ddd => "application/ddd"
+        FPage.formats.should == [:html, :js, :ddd]
+        page = FPage.new
+        page.mime_type(:ddd).should == "application/ddd"
+      end
+    end
+
+    context "with subclasses" do
+      setup do
+        FPage.formats :html, :rss, { :xxx => "application/xxx" }
+        class FSubPage < FPage
+        end
+      end
+
+      teardown do
+        self.class.send(:remove_const, :FSubPage) rescue nil
+      end
+
+      should "inherit the list of provided formats" do
+        FSubPage.formats.should == FPage.formats
+      end
+      should "inherit any custom mimetypes" do
+        FPage.mime_type(:xxx).should == "application/xxx"
+        FSubPage.mime_type(:xxx).should == "application/xxx"
+      end
     end
   end
 end

data/test/unit/test_generators.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
 # borrowed from Padrino
 class GeneratorsTest < MiniTest::Spec
@@ -46,7 +46,7 @@ class GeneratorsTest < MiniTest::Spec
       %w(development.rb production.rb).each do |f|
         assert_file_exists(site_root, 'config/environments', f)
       end
-      %w(back.ru front.ru boot.rb database.yml deploy.rb environment.rb user_levels.yml).each do |f|
+      %w(back.ru front.ru boot.rb database.yml deploy.rb environment.rb user_levels.yml indexes.rb).each do |f|
         assert_file_exists(site_root, 'config', f)
       end
       %w(favicon.ico robots.txt).each do |f|
@@ -59,6 +59,7 @@ class GeneratorsTest < MiniTest::Spec
       assert_file_exists(site_root, 'schema/page.rb')
       assert File.read(site_root / 'schema/page.rb') =~ /class Page < Spontaneous::Page/
       assert_file_exists(site_root, 'schema/piece.rb')
+      assert_file_exists(site_root, 'schema/box.rb')
       assert File.read(site_root / 'schema/piece.rb') =~ /class Piece < Spontaneous::Piece/
       assert_file_exists(site_root, 'public/js')
       assert_file_exists(site_root, 'public/css')

data/test/unit/test_helpers.rb

@@ -0,0 +1,54 @@
+# encoding: UTF-8
+
+require File.expand_path('../../test_helper', __FILE__)
+
+class HelpersTest < MiniTest::Spec
+
+  context "HTML helper" do
+    setup do
+      @helper = Spontaneous::Render::Helpers::HTMLHelper
+    end
+    should "enable easy addition of classes" do
+      classes = @helper.classes("a", "b", "c", :active => false, :invisible => true)
+      classes.should == %(class="a b c invisible")
+
+      classes = @helper.classes("a", "b", "c")
+      classes.should == %(class="a b c")
+
+      classes = @helper.classes(%w(a b c))
+      classes.should == %(class="a b c")
+
+      classes = @helper.classes(%w(a b c), "active" => false, "invisible" => true)
+      classes.should == %(class="a b c invisible")
+
+
+      classes = @helper.classes("a b c")
+      classes.should == %(class="a b c")
+
+      classes = @helper.classes("a b c", :active => false, :invisible => true)
+      classes.should == %(class="a b c invisible")
+    end
+
+    should "provide a wrapper around IE conditional comments" do
+      @helper.ie_only.should == "<!--[if IE]>"
+      @helper.ie_only(6).should == "<!--[if IE 6]>"
+      @helper.ie_only(7).should == "<!--[if IE 7]>"
+      @helper.ie_only_gt(7).should == "<!--[if gt IE 7]>"
+      @helper.ie_only_gte(7).should == "<!--[if gte IE 7]>"
+      @helper.ie_only_gte(8).should == "<!--[if gte IE 8]>"
+      @helper.ie_only_lt(7).should == "<!--[if lt IE 7]>"
+      @helper.ie_only_lte(9).should == "<!--[if lte IE 9]>"
+      @helper.ie_only_end.should == "<![endif]-->"
+    end
+
+    should "enable targeting a range of ie versions using ranges" do
+      @helper.ie_only(6..8).should == "<!--[if (gte IE 6)&(lte IE 8)]>"
+      @helper.ie_only(6...8).should == "<!--[if (gte IE 6)&(lte IE 7)]>"
+    end
+
+    should "provide a wrapper around only comments excluding IE" do
+      @helper.not_ie.should == "<!--[if !IE]> -->"
+      @helper.not_ie_end.should == "<!-- <![endif]-->"
+    end
+  end
+end

data/test/unit/test_image_size.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
 class ImageSizeTest < MiniTest::Spec
   context "Image size parser" do

data/test/unit/test_images.rb

@@ -1,11 +1,18 @@
 # encoding: UTF-8
 
 
-require 'test_helper'
-# require 'openssl'
+require File.expand_path('../../test_helper', __FILE__)
+require 'fog'
 
 class ImagesTest < MiniTest::Spec
   include Spontaneous
+  def setup
+    @site = setup_site
+  end
+
+  def teardown
+    teardown_site
+  end
 
   context "Image fields set using absolute values" do
     setup do
@@ -30,8 +37,8 @@ class ImagesTest < MiniTest::Spec
 
   context "Image fields" do
     setup do
-      tmp = File.join(File.dirname(__FILE__), "../../tmp/media")
-      Spontaneous.media_dir = tmp
+      tmp = File.join(@site.root, "tmp/media")
+      # Spontaneous.media_dir = tmp
       @tmp_dir = Pathname.new(tmp)
       @upload_dir = @tmp_dir + "tmp/1234"
       @upload_dir.mkpath
@@ -44,8 +51,6 @@ class ImagesTest < MiniTest::Spec
       # @origin_image.make_link(@src_image.to_s) unless @origin_image.exist?
       FileUtils.cp(@src_image.to_s, @origin_image.to_s)
       @origin_image = @origin_image.realpath.to_s
-      # @digest = OpenSSL::Digest::MD5.new.file(@origin_image).hexdigest
-      # p @digest
 
       class ::ResizingImageField < FieldTypes::ImageField
         size :preview do
@@ -65,6 +70,9 @@ class ImagesTest < MiniTest::Spec
           greyscale
           gaussian_blur 10
         end
+        size :reformatted do
+          format 'png'
+        end
       end
 
       ResizingImageField.register
@@ -79,15 +87,14 @@ class ImagesTest < MiniTest::Spec
       @instance.stubs(:id).returns(@content_id)
       @image = @instance.photo
       @image.owner.should == @instance
-      # silence_logger {
-        @image.value = @origin_image.to_s
-      # }
+      @image.value = @origin_image.to_s
+
+      @instance.save
     end
 
     teardown do
-      Object.send(:remove_const, :ContentWithImage)
-      Object.send(:remove_const, :ResizingImageField)
-      (@tmp_dir + "..").rmtree
+      Object.send(:remove_const, :ContentWithImage) rescue nil
+      Object.send(:remove_const, :ResizingImageField) rescue nil
     end
 
     context "with defined sizes" do
@@ -101,6 +108,10 @@ class ImagesTest < MiniTest::Spec
         ImageSize.read(@image.icon.filepath).should == [50, 50]
         ImageSize.read(@image.greyscale.filepath).should == [38, 50]
       end
+
+      should "preserve new format if processing has altered it" do
+        @image.reformatted.src.should =~ /\.png$/
+      end
     end
     context "in templates" do
 
@@ -166,7 +177,7 @@ class ImagesTest < MiniTest::Spec
 
 
       should "have a 'sizes' config option that generates resized versions" do
-        assert_same_elements ResizingImageField.size_definitions.keys, [:preview, :thumbnail, :icon, :tall, :greyscale]
+        assert_same_elements ResizingImageField.size_definitions.keys, [:preview, :thumbnail, :icon, :tall, :greyscale, :reformatted]
       end
 
       should "serialise attributes" do
@@ -181,7 +192,6 @@ class ImagesTest < MiniTest::Spec
         serialised[:thumbnail][:height].should == 50
         serialised[:icon][:width].should == 50
         serialised[:icon][:height].should == 50
-        # pp serialised
       end
 
       should "persist attributes" do
@@ -199,29 +209,6 @@ class ImagesTest < MiniTest::Spec
     end
 
     context "defined anonymously" do
-      setup do
-        # class ::ContentWithImage < Content
-        #   field :photo, :image do
-        #     sizes :preview => { :width => 200 },
-        #       :tall => { :height => 200 },
-        #       :thumbnail => { :fit => [50, 50] },
-        #       :icon => { :crop => [50, 50] }
-        #   end
-        # end
-        # @instance = ContentWithImage.new
-
-        # @content_id = 234
-        # @instance.stubs(:id).returns(@content_id)
-        # @image = @instance.photo
-        # @image.owner.should == @instance
-        # @image.value = @origin_image.to_s
-      end
-
-      teardown do
-        # Object.send(:remove_const, :ContentWithImage)
-        # (@tmp_dir + "..").rmtree
-      end
-
       should "have image dimension and filesize information" do
         @image.src.should == "/media/00234/0010/rose.jpg"
         @image.filesize.should == 54746
@@ -235,8 +222,8 @@ class ImagesTest < MiniTest::Spec
         @image.original.filesize.should == @image.filesize
       end
       should "have a 'sizes' config option that generates resized versions" do
-        assert_same_elements @image.class.size_definitions.keys, [:preview, :thumbnail, :icon, :tall, :greyscale]
-        assert_same_elements @image.class.sizes.keys, [:preview, :thumbnail, :icon, :tall, :greyscale]
+        assert_same_elements @image.class.size_definitions.keys, [:preview, :thumbnail, :icon, :tall, :greyscale, :reformatted]
+        assert_same_elements @image.class.sizes.keys, [:preview, :thumbnail, :icon, :tall, :greyscale, :reformatted]
       end
 
       should "serialise attributes" do
@@ -251,15 +238,39 @@ class ImagesTest < MiniTest::Spec
         serialised[:thumbnail][:height].should == 50
         serialised[:icon][:width].should == 50
         serialised[:icon][:height].should == 50
-        # pp serialised
       end
+
       should "persist attributes" do
         @instance.save
         @instance = ContentWithImage[@instance[:id]]
         @instance.photo.thumbnail.src.should == "/media/00234/0010/rose.thumbnail.jpg"
         @instance.photo.original.src.should == "/media/00234/0010/rose.jpg"
       end
+    end
+
+    context "with 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",
+          :public_host => "http://media.example.com"
+        }
+        ::Fog.mock!
+        @storage = Spontaneous::Storage::Cloud.new(@aws_credentials, 'media.example.com')
+        @storage.backend.directories.create(:key => @bucket_name)
+        @site.stubs(:storage).with(anything).returns(@storage)
+        @image.value = @origin_image.to_s
+      end
+      teardown do
+        ::Fog::Mock.reset
+      end
 
+      should "have full urls for all the src attributes" do
+        @image.original.src.should == "http://media.example.com/00234-0010-rose.jpg"
+        @image.thumbnail.src.should == "http://media.example.com/00234-0010-rose.thumbnail.jpg"
+      end
     end
   end
 end

data/test/unit/test_layouts.rb

@@ -1,18 +1,22 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
 class LayoutsTest < MiniTest::Spec
 
   def setup
     Spontaneous::Render.use_development_renderer
     self.template_root = ::File.expand_path('../../fixtures/layouts', __FILE__)
+    @site = setup_site
+  end
+
+  def teardown
+    teardown_site
   end
 
   context "layouts" do
 
     setup do
-      Spontaneous::Schema.reset!
       class ::LayoutPage < Spontaneous::Page; end
       class ::ABoxClass < Spontaneous::Box; end
       class ::SubPage < LayoutPage; end
@@ -79,15 +83,28 @@ class LayoutsTest < MiniTest::Spec
         # page.layout.template.should == 'layouts/custom2'
       end
 
-      should "allow setting of layout in sub-classes" do
+      should "use the last definied layout in sub-classes" do
         LayoutPage.layout :custom1
         LayoutPage.layout :custom2
-        SubPage.layout :custom3, :default => true
+        SubPage.layout :custom3
+        SubPage.layout :custom4
         page = SubPage.new
         assert_correct_template(page, 'layouts/custom3')
         page.layout = :custom2
         assert_correct_template(page, 'layouts/custom2')
       end
+
+      should "allow defining of default layout in sub-classes" do
+        LayoutPage.layout :custom1
+        LayoutPage.layout :custom2, :default => true
+        SubPage.layout :custom3
+        SubPage.layout :custom4, :default => true
+        page = SubPage.new
+        assert_correct_template(page, 'layouts/custom4')
+        page.layout = :custom3
+        assert_correct_template(page, 'layouts/custom3')
+      end
+
       # should "raise error when setting unknown layout" do
       #   LayoutPage.layout :custom1
       #   LayoutPage.layout :custom2

data/test/unit/test_logger.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 
-require 'test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
 # borrowed from Padrino
 class LoggerTest < MiniTest::Spec

data/test/unit/test_media.rb

@@ -1,31 +1,189 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require File.expand_path('../../test_helper', __FILE__)
+require 'fog'
 
 class MediaTest < MiniTest::Spec
-  context "Utilitity methods" do
+  def setup
+    @site = setup_site
+  end
+
+  def teardown
+    teardown_site
+    S::Content.delete
+  end
+
+  context "Utility methods" do
     should "be able to sanitise filenames" do
       filename = "Something with-dodgy 'characters'.many.jpg"
       Media.to_filename(filename).should == "Something-with-dodgy-characters.many.jpg"
     end
   end
+
+  context "All media files" do
+    should "know their mimetype" do
+      file = Spontaneous::Media::File.new(@content, "file name.txt")
+      file.mimetype.should == "text/plain"
+      file = Spontaneous::Media::File.new(@content, "file name.jpg")
+      file.mimetype.should == "image/jpeg"
+      file = Spontaneous::Media::File.new(@content, "file name.jpg", "text/html")
+      file.mimetype.should == "text/html"
+    end
+
+  end
+
+  context "cloud media files" do
+    setup do
+      Fog.mock!
+      @bucket_name = "media.example.com"
+      @aws_credentials = {
+        :provider=>"AWS",
+        :aws_secret_access_key=>"SECRET_ACCESS_KEY",
+        :aws_access_key_id=>"ACCESS_KEY_ID",
+        :public_host => "http://media.example.com"
+      }
+      @storage = Spontaneous::Storage::Cloud.new(@aws_credentials, 'media.example.com')
+      @storage.backend.directories.create(:key => @bucket_name)
+      @site.stubs(:storage).with(anything).returns(@storage)
+      @content = S::Content.create
+      @content.stubs(:id).returns(99)
+      Spontaneous::State.stubs(:revision).returns(853)
+    end
+    should "return an absolute path for the url" do
+      file = Spontaneous::Media::File.new(@content, "file name.txt")
+      file.url.should == "http://media.example.com/00099-0853-file-name.txt"
+    end
+
+    should "create a new instance with a different name" do
+      file1 = Spontaneous::Media::File.new(@content, "file name.txt")
+      file2 = file1.rename("another.jpg")
+      file2.owner.should == file1.owner
+      file2.mimetype.should == "image/jpeg"
+      file2.url.should == "http://media.example.com/00099-0853-another.jpg"
+    end
+
+    should "be able to copy a file into place if passed the path of an existing file" do
+      @storage.bucket.files.expects(:create).with{ |args|
+        args[:key] == "00099-0853-file-name.txt" &&
+          args[:body].is_a?(File) &&
+          args[:public] == true
+      }
+      existing_file = File.expand_path("../../fixtures/images/rose.jpg", __FILE__)
+      ::File.exist?(existing_file).should be_true
+      file = Spontaneous::Media::File.new(@content, "file name.txt")
+      file.copy(existing_file)
+    end
+
+    should "be able to copy a file into place if passed the file handle of an existing file" do
+      @storage.bucket.files.expects(:create).with{ |args|
+        args[:key] == "00099-0853-file-name.txt" &&
+          args[:body].is_a?(File) &&
+          args[:public] == true
+      }
+      existing_file = File.expand_path("../../fixtures/images/rose.jpg", __FILE__)
+      ::File.exist?(existing_file).should be_true
+      file = Spontaneous::Media::File.new(@content, "file name.txt")
+      File.open(existing_file, 'rb') do |f|
+        file.copy(f)
+      end
+    end
+
+    should "provide an open method that writes files to the correct location" do
+      @storage.bucket.files.expects(:create).with() { |args|
+        args[:key] == "00099-0853-file-name.txt" &&
+          (args[:body].is_a?(File) || args[:body].is_a?(Tempfile)) &&
+          args[:public] == true
+      }
+
+      file = Spontaneous::Media::File.new(@content, "file name.txt")
+      content_string = "Hello"
+      file.open do |f|
+        f.write(content_string)
+      end
+    end
+  end
+
+  context "Local media files" do
+    setup do
+      @media_dir = Dir.mktmpdir
+      @storage = Spontaneous::Storage::Local.new(@media_dir, '/media')
+      @site.stubs(:storage).with(anything).returns(@storage)
+      @content = S::Content.create
+      @content.stubs(:id).returns(99)
+      Spontaneous::State.stubs(:revision).returns(853)
+    end
+
+    should "return an absolute path for the url" do
+      file = Spontaneous::Media::File.new(@content, "file name.txt")
+      file.url.should == "/media/00099/0853/file-name.txt"
+    end
+
+    should "place files into its configured root" do
+      file = Spontaneous::Media::File.new(@content, "file name.txt")
+      file.path.should == File.join(@media_dir, "/00099/0853/file-name.txt")
+    end
+
+    should "create a new instance with a different name" do
+      file1 = Spontaneous::Media::File.new(@content, "file name.txt")
+      file2 = file1.rename("another.jpg")
+      file2.owner.should == file1.owner
+      file2.mimetype.should == "image/jpeg"
+      file2.url.should == "/media/00099/0853/another.jpg"
+    end
+
+    should "be able to copy a file into place if passed the path of an existing file" do
+      file_path = File.join(@media_dir, "/00099/0853/file-name.txt")
+      existing_file = File.expand_path("../../fixtures/images/rose.jpg", __FILE__)
+      ::File.exist?(file_path).should be_false
+      ::File.exist?(existing_file).should be_true
+      file = Spontaneous::Media::File.new(@content, "file name.txt")
+      file.copy(existing_file)
+      ::File.exist?(file_path).should be_true
+      file.source.should == existing_file
+    end
+
+    should "be able to copy a file into place if passed the handle of an existing file" do
+      file_path = File.join(@media_dir, "/00099/0853/file-name.txt")
+      existing_file = File.expand_path("../../fixtures/images/rose.jpg", __FILE__)
+      ::File.exist?(file_path).should be_false
+      ::File.exist?(existing_file).should be_true
+      file = Spontaneous::Media::File.new(@content, "file name.txt")
+      File.open(existing_file, 'rb') do |f|
+        file.copy(f)
+      end
+      ::File.exist?(file_path).should be_true
+      file.source.should == existing_file
+    end
+
+    should "provide an open method that writes files to the correct location" do
+      file_path = File.join(@media_dir, "/00099/0853/file-name.txt")
+      ::File.exist?(file_path).should be_false
+      file = Spontaneous::Media::File.new(@content, "file name.txt")
+      content_string = "Hello"
+      file.open do |f|
+        f.write(content_string)
+      end
+      File.read(file_path).should == content_string
+    end
+  end
+
   context "Content items" do
     setup do
-      @media_dir = File.expand_path(File.join(File.dirname(__FILE__), "../../tmp/media"))
-      Spontaneous.media_dir = @media_dir
+      # @media_dir = File.expand_path(File.join(File.dirname(__FILE__), "../../tmp/media"))
+      # Spontaneous.media_dir = @media_dir
       Site.stubs(:working_revision).returns(74)
       @instance = Content.new
       @instance.stubs(:id).returns(101)
     end
 
     should "be able to generate a revision and id based media path" do
-      @instance.media_filepath("something.jpg").should == File.join(@media_dir, "00101/0074/something.jpg")
+      @instance.media_filepath("something.jpg").should == File.join(@site.media_dir, "00101/0074/something.jpg")
       @instance.media_urlpath("something.jpg").should == "/media/00101/0074/something.jpg"
     end
 
     context "file manipulation" do
       setup do
-        @tmp_dir = Pathname.new(@media_dir)
+        @tmp_dir = Pathname.new(Spontaneous.media_dir)
         @src_image =  Pathname.new(File.join(File.dirname(__FILE__), "../fixtures/images/rose.jpg")).realpath
         @upload_dir = @tmp_dir + "tmp/1234"
         @upload_dir.mkpath
@@ -34,7 +192,7 @@ class MediaTest < MiniTest::Spec
       end
 
       teardown do
-        (@tmp_dir + "..").rmtree
+        # (@tmp_dir + "..").rmtree
       end
 
       should "be able to move a file into the media path" do