spontaneous 0.2.0.beta1 → 0.2.0.beta2

data/test/unit/test_generators.rb

@@ -3,15 +3,15 @@
 require File.expand_path('../../test_helper', __FILE__)
 
 # borrowed from Padrino
-class GeneratorsTest < MiniTest::Spec
+describe "Generators" do
   include Spontaneous
 
-  def setup
+  before do
     @tmp = "#{Dir.tmpdir}/spontaneous-tests/#{Time.now.to_i}"
     `mkdir -p #{@tmp}`
   end
 
-  def teardown
+  after do
     conn = Sequel.mysql2(:user => "root")
     %w(example_com example_com_test).each do |db|
       conn.run("DROP DATABASE `#{db}`") rescue nil
@@ -33,10 +33,10 @@ class GeneratorsTest < MiniTest::Spec
 
   attr_reader :site_root
 
-  context "Site generator" do
-    teardown do
+  describe "Site generator" do
+    after do
     end
-    should "create a site using passed parameters" do
+    it "create a site using passed parameters" do
       # puts @tmp
       generate(:site, "example.com", "--root=#{@tmp}")
       # Have moved db creation into separate step (spot init) so this no longer applies
@@ -66,8 +66,12 @@ class GeneratorsTest < MiniTest::Spec
       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 < Content::Piece/
-      assert_file_exists(site_root, 'public/js')
-      assert_file_exists(site_root, 'public/css')
+      assert_file_exists(site_root, 'assets')
+      assert_file_exists(site_root, 'assets/README.md')
+      assert_file_exists(site_root, 'assets/css/site.scss')
+      assert_file_exists(site_root, 'assets/js/site.js')
+      assert_file_exists(site_root, 'public/favicon.ico')
+      assert_file_exists(site_root, 'public/robots.txt')
       content_rb =  File.read(site_root / 'lib/content.rb')
       assert content_rb =~ /class Content < Spontaneous::Model\(:content\)/
       assert content_rb =~ /^Site = Spontaneous\.site\(Content\)/
@@ -81,71 +85,125 @@ class GeneratorsTest < MiniTest::Spec
       assert File.read(site_root / '.gitignore') =~ /cache\/\*/
     end
 
-    should "specify the current version of spontaneous as the dependency" do
+    it "specify the current version of spontaneous as the dependency" do
       generate(:site, "example.com", "--root=#{@tmp}")
       site_root = File.join(@tmp, 'example_com')
       gemfile = File.read(File.join(site_root, "Gemfile"))
-      gemfile.should =~ /^gem 'spontaneous', +'~> *#{Spontaneous::VERSION}'$/
+      gemfile.must_match /^gem 'spontaneous', +'~> *#{Spontaneous::VERSION}'$/
     end
 
-    should "correctly configure the site for a 'mysql' database" do
+    it "correctly configure the site for a 'mysql' database" do
       site_root = File.join(@tmp, 'example_com')
       generate(:site, "example.com", "--root=#{@tmp}", "--database=mysql", "--host=127.0.0.1")
       gemfile = File.read(File.join(site_root, "Gemfile"))
-      gemfile.should =~ /^gem 'mysql2'/
+      gemfile.must_match /^gem 'mysql2'/
       config = database_config("example_com")
       [:development, :test, :production].each do |environment|
-        config[environment][:adapter].should == "mysql2"
-        config[environment][:database].should =~ /^example_com(_test)?/
+        config[environment][:adapter].must_equal "mysql2"
+        config[environment][:database].must_match /^example_com(_test)?/
         # db connections seem to work if you exclude the host
-        config[environment][:host].should == "127.0.0.1"
+        config[environment][:host].must_equal "127.0.0.1"
       end
     end
 
-    should "correctly configure the site for a 'postgresql' database" do
-      site_root = File.join(@tmp, 'example_com')
-      generate(:site, "example.com", "--root=#{@tmp}", "--database=postgresql", "--host=")
-      gemfile = File.read(File.join(site_root, "Gemfile"))
-      gemfile.should =~ /^gem 'pg'/
-      config = database_config("example_com")
-      [:development, :test, :production].each do |environment|
-        config[environment][:adapter].should == "postgres"
-        config[environment][:database].should =~ /^example_com(_test)?/
-        config[environment].key?(:host).should be_false
+    describe "configured for a postgres database" do
+      before do
+        @site_root = File.join(@tmp, 'example_com')
+      end
+
+      it "define the correct adapter" do
+        generate(:site, "example.com", "--root=#{@tmp}", "--database=postgres")
+        config = database_config("example_com")
+        [:development, :test, :production].each do |environment|
+          config[environment][:adapter].must_equal "postgres"
+        end
+      end
+
+      it "configure the correct gem" do
+        generate(:site, "example.com", "--root=#{@tmp}", "--database=postgresql")
+        gemfile = File.read(File.join(@site_root, "Gemfile"))
+        gemfile.must_match /^gem 'pg'/
+      end
+
+      it "setup the right db parameters" do
+        generate(:site, "example.com", "--root=#{@tmp}", "--database=postgresql")
+        config = database_config("example_com")
+        [:development, :test].each do |environment|
+          config[environment][:adapter].must_equal "postgres"
+          config[environment][:user].must_be_nil
+          config[environment][:database].must_match /^example_com(_test)?/
+          refute config[environment].key?(:host)
+        end
+      end
+
+      it "honor the user parameter" do
+        generate(:site, "example.com", "--root=#{@tmp}", "--database=postgresql", "--user=fred")
+        config = database_config("example_com")
+        [:development, :test].each do |environment|
+          config[environment][:user].must_equal "fred"
+        end
       end
     end
 
-    should "correctly configure the site for a 'postgres' database" do
-      site_root = File.join(@tmp, 'example_com')
-      generate(:site, "example.com", "--root=#{@tmp}", "--database=postgres")
-      gemfile = File.read(File.join(site_root, "Gemfile"))
-      gemfile.should =~ /^gem 'pg'/
-      config = database_config("example_com")
-      [:development, :test, :production].each do |environment|
-        config[environment][:adapter].should == "postgres"
+    describe "configured for a mysql database" do
+      before do
+        @site_root = File.join(@tmp, 'example_com')
+      end
+
+      it "define the correct adapter" do
+        generate(:site, "example.com", "--root=#{@tmp}", "--database=mysql")
+        config = database_config("example_com")
+        [:development, :test, :production].each do |environment|
+          config[environment][:adapter].must_equal "mysql2"
+        end
+      end
+
+      it "configure the correct gem" do
+        generate(:site, "example.com", "--root=#{@tmp}", "--database=mysql")
+        gemfile = File.read(File.join(@site_root, "Gemfile"))
+        gemfile.must_match /^gem 'mysql2'/
+      end
+
+      it "setup the right db parameters" do
+        generate(:site, "example.com", "--root=#{@tmp}", "--database=mysql")
+        config = database_config("example_com")
+        [:development, :test].each do |environment|
+          config[environment][:user].must_equal "root"
+          config[environment][:database].must_match /^example_com(_test)?/
+          refute config[environment].key?(:host)
+        end
+      end
+
+      it "honor the user parameter" do
+        generate(:site, "example.com", "--root=#{@tmp}", "--database=mysql", "--user=fred")
+        config = database_config("example_com")
+        [:development, :test].each do |environment|
+          config[environment][:user].must_equal "fred"
+        end
       end
     end
 
-    should "include specified connection params in the generated database config" do
+
+    it "include specified connection params in the generated database config" do
       site_root = File.join(@tmp, 'example_com')
       generate(:site, "example.com", "--root=#{@tmp}", "--database=postgres", "--user=spontaneous", "--password=s3cret")
       gemfile = File.read(File.join(site_root, "Gemfile"))
-      gemfile.should =~ /^gem 'pg'/
+      gemfile.must_match /^gem 'pg'/
       config = database_config("example_com")
       [:development, :test].each do |environment|
-        config[environment][:user].should == "spontaneous"
-        config[environment][:password].should == "s3cret"
+        config[environment][:user].must_equal "spontaneous"
+        config[environment][:password].must_equal "s3cret"
       end
     end
   end
 
-  context "Page generator" do
-    setup do
+  describe "Page generator" do
+    before do
       generate(:site, "example.com", "--root=#{@tmp}")
       @site_root = File.join(@tmp, 'example_com')
     end
 
-    should "create a page class and associated templates" do
+    it "create a page class and associated templates" do
       %w(large_page LargePage).each do |name|
         generate(:page, name, "--root=#{site_root}")
         assert_file_exists(site_root, 'schema/large_page.rb')

data/test/unit/test_helpers.rb

@@ -2,130 +2,127 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class HelpersTest < MiniTest::Spec
+describe "ContextHelpers" do
 
-  def setup
+  before do
     @site = setup_site
     @site.paths.add :templates, File.expand_path("../../fixtures/helpers/templates", __FILE__)
     @renderer = S::Output::Template::Renderer.new(false)
     S::Output.renderer = @renderer
-
   end
 
-  def teardown
+  after do
     teardown_site
   end
 
-  context "Helpers" do
-    should "be assignable to a particular format" do
-      CustomHelper1 = Site.helper :html do
-        def here_is_my_custom_helper1; end
-      end
+  it "be assignable to a particular format" do
+    CustomHelper1 = Site.helper :html do
+      def here_is_my_custom_helper1; end
+    end
 
-      included_helpers = [
-        CustomHelper1,
-        Spontaneous::Output::Helpers::ConditionalCommentHelper,
-        Spontaneous::Output::Helpers::ClassesHelper,
-        Spontaneous::Output::Helpers::ScriptHelper,
-        Spontaneous::Output::Helpers::StylesheetHelper
-      ]
-      helper_module = Site.context :html
-      join = included_helpers & helper_module.ancestors
-      Set.new(join).should == Set.new(included_helpers)
-      helper_module.respond_to?(:here_is_my_custom_helper1).should be_true
+    included_helpers = [
+      CustomHelper1,
+      Spontaneous::Output::Helpers::ConditionalCommentHelper,
+      Spontaneous::Output::Helpers::ClassesHelper,
+      Spontaneous::Output::Helpers::ScriptHelper,
+      Spontaneous::Output::Helpers::StylesheetHelper
+    ]
+    helper_module = Site.context :html
+    join = included_helpers & helper_module.ancestors
+    Set.new(join).must_equal Set.new(included_helpers)
+    assert helper_module.respond_to?(:here_is_my_custom_helper1)
+  end
+
+  it "be assigned to all formats if none given" do
+    CustomHelper2 = Site.helper do
+      extend self
+      def here_is_my_custom_helper2; end
     end
 
-    should "be assigned to all formats if none given" do
-      CustomHelper2 = Site.helper do
-        extend self
-        def here_is_my_custom_helper2; end
-      end
+    assert CustomHelper2.respond_to?(:here_is_my_custom_helper2)
 
-      assert CustomHelper2.respond_to?(:here_is_my_custom_helper2)
+    helper_module = Site.context :html
+    assert helper_module.ancestors.include?(CustomHelper2)
 
-      helper_module = Site.context :html
-      helper_module.ancestors.include?(CustomHelper2).should be_true
+    helper_module = Site.context :pdf
+    assert helper_module.ancestors.include?(CustomHelper2)
+  end
 
-      helper_module = Site.context :pdf
-      helper_module.ancestors.include?(CustomHelper2).should be_true
+  it "be available during the render step" do
+    class Page < Content::Page
+      add_output :mobile
     end
 
-    should "be available during the render step" do
-      class Page < Content::Page
-        add_output :mobile
-      end
-
-      Site.helper :html do
-        def here_is_my_custom_helper3
-          "here_is_my_custom_helper3"
-        end
-        extend self
+    Site.helper :html do
+      def here_is_my_custom_helper3
+        "here_is_my_custom_helper3"
       end
+      extend self
+    end
 
-      Site.helper :mobile do
-        def here_is_my_custom_helper4
-          "here_is_my_custom_helper4"
-        end
-        extend self
+    Site.helper :mobile do
+      def here_is_my_custom_helper4
+        "here_is_my_custom_helper4"
       end
-
-      page = Page.new
-      page.render(:html).should == "<here_is_my_custom_helper3>\n"
-      page.render(:mobile).should == "<here_is_my_custom_helper4>\n"
+      extend self
     end
+
+    page = Page.new
+    page.render(:html).must_equal "<here_is_my_custom_helper3>\n"
+    page.render(:mobile).must_equal "<here_is_my_custom_helper4>\n"
   end
 
-  context "Classes helper" do
-    setup do
+  describe "Classes helper" do
+    before do
       @helper = Spontaneous::Output::Helpers::ClassesHelper
     end
-    should "enable easy addition of classes" do
+    it "enable easy addition of classes" do
       classes = @helper.classes("a", "b", "c", :active => false, :invisible => true)
-      classes.should == %(class="a b c invisible")
+      classes.must_equal %(class="a b c invisible")
 
       classes = @helper.classes("a", "b", "c")
-      classes.should == %(class="a b c")
+      classes.must_equal %(class="a b c")
 
       classes = @helper.classes(%w(a b c))
-      classes.should == %(class="a b c")
+      classes.must_equal %(class="a b c")
 
       classes = @helper.classes(%w(a b c), "active" => false, "invisible" => true)
-      classes.should == %(class="a b c invisible")
+      classes.must_equal %(class="a b c invisible")
 
 
       classes = @helper.classes("a b c")
-      classes.should == %(class="a b c")
+      classes.must_equal %(class="a b c")
 
       classes = @helper.classes("a b c", :active => false, :invisible => true)
-      classes.should == %(class="a b c invisible")
+      classes.must_equal %(class="a b c invisible")
     end
   end
 
-  context "ConditionalComment helper" do
-    setup do
+  describe "ConditionalComment helper" do
+    before do
       @helper = Spontaneous::Output::Helpers::ConditionalCommentHelper
     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]-->"
+    it "provide a wrapper around IE conditional comments" do
+      @helper.ie_only.must_equal "<!--[if IE]>"
+      @helper.ie_only(6).must_equal "<!--[if IE 6]>"
+      @helper.ie_only(7).must_equal "<!--[if IE 7]>"
+      @helper.ie_only_gt(7).must_equal "<!--[if gt IE 7]>"
+      @helper.ie_only_gte(7).must_equal "<!--[if gte IE 7]>"
+      @helper.ie_only_gte(8).must_equal "<!--[if gte IE 8]>"
+      @helper.ie_only_lt(7).must_equal "<!--[if lt IE 7]>"
+      @helper.ie_only_lte(9).must_equal "<!--[if lte IE 9]>"
+      @helper.ie_only_end.must_equal "<![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)]>"
+    it "enable targeting a range of ie versions using ranges" do
+      @helper.ie_only(6..8).must_equal "<!--[if (gte IE 6)&(lte IE 8)]>"
+      @helper.ie_only(6...8).must_equal "<!--[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]-->"
+    it "provide a wrapper around only comments excluding IE" do
+      @helper.not_ie.must_equal "<!--[if !IE]> -->"
+      @helper.not_ie_end.must_equal "<!-- <![endif]-->"
     end
   end
 end

data/test/unit/test_image_size.rb

@@ -2,29 +2,60 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class ImageSizeTest < MiniTest::Spec
-  context "Image size parser" do
-    setup do
-      @base_dir = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/images'))
-      @dimensions = [50, 67]
-    end
+describe "Identify" do
+  before do
+    @base_dir = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/images'))
+    @dimensions = [50, 67]
+  end
 
-    should "work for PNG24" do
-      S::ImageSize.read(File.join(@base_dir, "size.png24")).should == @dimensions
-    end
-    should "work for PNG8" do
-      S::ImageSize.read(File.join(@base_dir, "size.png8")).should == @dimensions
-    end
-    should "work for JPG" do
-      S::ImageSize.read(File.join(@base_dir, "size.jpg")).should == @dimensions
-    end
-    should "work for GIF" do
-      S::ImageSize.read(File.join(@base_dir, "size.gif")).should == @dimensions
-    end
-    should "return 0x0 for empty files" do
-      Tempfile.open("imagesize") do |file|
-      S::ImageSize.read(file).should == [0,0]
-      end
+  it "works for PNG24" do
+    i = S::Media::Image.new(File.join(@base_dir, "size.png24"))
+    i.format.must_equal :png
+    i.dimensions.must_equal @dimensions
+  end
+
+  it "works for PNG8" do
+    i = S::Media::Image.new(File.join(@base_dir, "size.png8"))
+    i.format.must_equal :png
+    i.dimensions.must_equal @dimensions
+  end
+
+  it "works for JPG" do
+    i = S::Media::Image.new(File.join(@base_dir, "size.jpg"))
+    i.format.must_equal :jpg
+    i.dimensions.must_equal @dimensions
+  end
+
+  it "works for GIF" do
+    i = S::Media::Image.new(File.join(@base_dir, "size.gif"))
+    i.format.must_equal :gif
+    i.dimensions.must_equal @dimensions
+  end
+
+  it "works for lossy WEBP" do
+    i = S::Media::Image.new(File.join(@base_dir, "size.lossy.webp"))
+    i.format.must_equal :webp
+    i.dimensions.must_equal @dimensions
+  end
+
+  it "works for lossless WEBP" do
+    i = S::Media::Image.new(File.join(@base_dir, "size.lossless.webp"))
+    i.format.must_equal :webp
+    i.dimensions.must_equal [386, 395]
+  end
+
+
+  it "works for extended WEBP" do
+    i = S::Media::Image.new(File.join(@base_dir, "size.extended.webp"))
+    i.format.must_equal :webp
+    i.dimensions.must_equal [50, 38]
+  end
+
+  it "returns 0x0 for empty files" do
+    Tempfile.open("emptyimagesize") do |file|
+      i = S::Media::Image.new(file)
+      i.dimensions.must_equal [0, 0]
+      i.format.must_be_nil
     end
   end
 end