spontaneous 0.2.0.beta1 → 0.2.0.beta2

data/test/experimental/test_crypt.rb

@@ -3,113 +3,113 @@
 require File.expand_path('../../test_helper', __FILE__)
 require 'benchmark'
 
-class CryptTest < MiniTest::Spec
+describe "Crypt" do
   Crypt = Spontaneous::Crypt
 
-  def setup
+  before do
     Crypt.default_version
   end
 
-  context "versions" do
-    should "be listable" do
-      Crypt.versions.should == [Crypt::Version::Fake, Crypt::Version::SHALegacy, Crypt::Version::BCrypt201301]
+  describe "versions" do
+    it "be listable" do
+      Crypt.versions.must_equal [Crypt::Version::Fake, Crypt::Version::SHALegacy, Crypt::Version::BCrypt201301]
     end
 
-    should "choose the most up-to-date as the current" do
-      Crypt.current.should == Crypt::Version::BCrypt201301
+    it "choose the most up-to-date as the current" do
+      Crypt.current.must_equal Crypt::Version::BCrypt201301
     end
 
-    should "be directly loadable" do
-      Crypt.version(201102).should == Crypt::Version::SHALegacy
+    it "be directly loadable" do
+      Crypt.version(201102).must_equal Crypt::Version::SHALegacy
     end
 
-    should "be configurable" do
+    it "be configurable" do
       Crypt.force_version(0)
-      Crypt.current.should == Crypt::Version::Fake
+      Crypt.current.must_equal Crypt::Version::Fake
     end
   end
 
-  context "fake version" do
-    setup do
+  describe "fake version" do
+    before do
       @pass = "abcdef"
     end
-    should "have a version of 0" do
-      Crypt::Version::SHALegacy.version.should == 201102
+    it "have a version of 0" do
+      Crypt::Version::SHALegacy.version.must_equal 201102
     end
-    should "be creatable from a pasword" do
+    it "be creatable from a pasword" do
       hash = Crypt::Version::Fake.create(@pass)
-      Crypt.new(@pass, hash).valid?.should be_true
+      assert Crypt.new(@pass, hash).valid?
     end
-    should "not report that it should be upgraded" do
+    it "not report that it should be upgraded" do
       hash = Crypt::Version::Fake.create(@pass)
       auth = Crypt.new(@pass, hash)
-      auth.valid?.should be_true
-      auth.outdated?.should be_false
-      auth.needs_upgrade?.should be_false
+      assert auth.valid?
+      refute auth.outdated?
+      refute auth.needs_upgrade?
     end
   end
 
-  context "legacy version" do
-    setup do
+  describe "legacy version" do
+    before do
       @pass = "abcdef"
       @salt = "aaaaaa"
       @sha  = Crypt::Version::SHALegacy.sha(@salt, @pass)
     end
 
-    should "have a version of 201102" do
-      Crypt::Version::SHALegacy.version.should == 201102
+    it "have a version of 201102" do
+      Crypt::Version::SHALegacy.version.must_equal 201102
     end
 
-    should "be creatable from a pasword & salt" do
+    it "be creatable from a pasword & salt" do
       hash = Crypt::Version::SHALegacy.create(@sha, @salt)
-      hash.should =~ /^201102%aaaaaa:\$2a\$13\$/
-      Crypt.new(@pass, hash).valid?.should be_true
+      hash.must_match /^201102%aaaaaa:\$2a\$13\$/
+      assert Crypt.new(@pass, hash).valid?
     end
 
-    should "report that it should be upgraded" do
+    it "report that it should be upgraded" do
       hash = Crypt::Version::SHALegacy.create(@sha, @salt)
       auth = Crypt.new(@pass, hash)
-      auth.valid?.should be_true
-      auth.outdated?.should be_true
-      auth.needs_upgrade?.should be_true
+      assert auth.valid?
+      assert auth.outdated?
+      assert auth.needs_upgrade?
     end
 
-    should "upgrade to the current implementation" do
+    it "upgrade to the current implementation" do
       hash = Crypt::Version::SHALegacy.create(@sha, @salt)
       auth = Crypt.new(@pass, hash)
       new_hash  = auth.upgrade
       new_auth = Crypt.new(@pass, new_hash)
-      new_auth.outdated?.should be_false
-      new_auth.valid?.should be_true
+      refute new_auth.outdated?
+      assert new_auth.valid?
     end
   end
 
-  context "password creation" do
-    setup do
+  describe "password creation" do
+    before do
       @password = "abcdefg"
     end
 
-    should "be verifiable" do
-      hash = Crypt::hash(@password)
-      Crypt.new(@password, hash).valid?.should be_true
+    it "be verifiable" do
+      hash = Crypt::hash_password(@password)
+      assert Crypt.new(@password, hash).valid?
     end
 
-    should "use the latest version" do
-      hash = Crypt::hash(@password)
+    it "use the latest version" do
+      hash = Crypt::hash_password(@password)
       version, _ = Crypt.version_split(hash)
-      version.should == Crypt.current.version
+      version.must_equal Crypt.current.version
     end
 
-    should "take at least half a second to compute" do
+    it "take at least half a second to compute" do
       hash = nil
-      bm = Benchmark.measure { hash = Crypt::hash(@password) }
-      bm.real.should >= 0.5
+      bm = Benchmark.measure { hash = Crypt::hash_password(@password) }
+      bm.real.must_be :>=, 0.5
       bm = Benchmark.measure { Crypt::valid?(@password, hash) }
-      bm.real.should >= 0.5
+      bm.real.must_be :>=, 0.5
     end
   end
-  context "users" do
-    setup do
+  describe "users" do
+    before do
       S::Permissions::User.delete
       @pass = "abcdefghijklm"
       @attrs = {:login => "test", :email => "test@example.com", :name => "Test User", :password => @pass}
@@ -117,28 +117,28 @@ class CryptTest < MiniTest::Spec
       @user.save
     end
 
-    teardown do
+    after do
       S::Permissions::User.delete
     end
 
-    should "use the current crypt implementation to hash their passwords" do
+    it "use the current crypt implementation to hash their passwords" do
       hash = @user.crypted_password
 
       auth = Crypt.new(@pass, hash)
-      auth.valid?.should be_true
+      assert auth.valid?
     end
 
-    should "authenticate successfully" do
+    it "authenticate successfully" do
       result = Spontaneous::Permissions::User.authenticate(@attrs[:login], @pass)
       result.must_be_instance_of S::Permissions::AccessKey
     end
 
-    should "fail to authenticate with incorrect password" do
+    it "fail to authenticate with incorrect password" do
       result = Spontaneous::Permissions::User.authenticate(@attrs[:login], @pass + "x")
-      result.should be_nil
+      result.must_be_nil
     end
 
-    should "transparently upgrade the auth version if outdated" do
+    it "transparently upgrade the auth version if outdated" do
       salt = "aaaaaaaa"
       sha  = Crypt::Version::SHALegacy.sha(salt, @pass)
       hash = Crypt::Version::SHALegacy.create(sha, salt)

data/test/experimental/test_features.rb

@@ -4,21 +4,14 @@ require File.expand_path('../../test_helper', __FILE__)
 
 require 'sinatra/base'
 
-class FeaturesTest < MiniTest::Spec
-  include ::Rack::Test::Methods
-
-  def self.startup
-    # make sure that S::Piece & S::Page are removed from the schema
-    # @site = setup_site
-    # *ids = ::Page.schema_id, ::Piece.schema_id
-    # Object.const_set(:Site, Class.new(S::Site))
-  end
+describe "Features" do
+  include RackTestMethods
 
-  def setup
+  before do
     @site = setup_site
   end
 
-  def teardown
+  after do
     teardown_site
   end
 
@@ -26,16 +19,12 @@ class FeaturesTest < MiniTest::Spec
     Spontaneous::Rack.application
   end
 
-  def auth_post(path, params={})
-    post(path, params.merge("__key" => @key))
-  end
-
-  def auth_get(path, params={})
-    get(path, params.merge("__key" => @key))
+  def api_key
+    @key
   end
 
-  context "Feature" do
-    setup do
+  describe "Feature" do
+    before do
       Content.delete
       Spontaneous::Permissions::User.delete
 
@@ -45,6 +34,7 @@ class FeaturesTest < MiniTest::Spec
       config.stubs(:auto_login).returns('root')
       config.stubs(:default_charset).returns('utf-8')
       config.stubs(:publishing_method).returns(:immediate)
+      config.stubs(:simultaneous_connection).returns("")
       config.stubs(:site_domain).returns('example.org')
       config.stubs(:site_id).returns('example_org')
       @site.stubs(:config).returns(config)
@@ -52,8 +42,7 @@ class FeaturesTest < MiniTest::Spec
       @user = Spontaneous::Permissions::User.create(:email => "root@example.com", :login => "root", :name => "root", :password => "rootpass")
       @user.update(:level => Spontaneous::Permissions.root)
       @user.save
-      @key = "c5AMX3r5kMHX2z9a5ExLKjAmCcnT6PFf22YQxzb4Codj"
-      @key.stubs(:user).returns(@user)
+      @key = @user.generate_access_key("127.0.0.1")
 
       Spontaneous::Permissions::User.stubs(:[]).with(:login => 'root').returns(@user)
       Spontaneous::Permissions::AccessKey.stubs(:authenticate).with(@key).returns(@key)
@@ -62,15 +51,15 @@ class FeaturesTest < MiniTest::Spec
       Spontaneous::Permissions::AccessKey.stubs(:valid?).with(@key, @user).returns(true)
     end
 
-    teardown do
+    after do
       # (@all_classes.map { |k| k.name.to_sym }).each { |klass|
       #   Object.send(:remove_const, klass) rescue nil
       # } rescue nil
       Content.delete
     end
 
-    context "controllers" do
-      setup do
+    describe "controllers" do
+      before do
         class ::FeatureBackController < ::Sinatra::Base
           get '/hello' do
             'Editor'
@@ -89,12 +78,12 @@ class FeaturesTest < MiniTest::Spec
         end
       end
 
-      teardown do
+      after do
         Object.send(:remove_const, :FeatureBackController) rescue nil
         Object.send(:remove_const, :FeatureFrontController) rescue nil
       end
 
-      should "be able to injectable into the back application" do
+      it "be able to injectable into the back application" do
         Spontaneous.mode = :back
         Spontaneous.register_back_controller(:myfeature, FeatureBackController)
 
@@ -113,7 +102,7 @@ class FeaturesTest < MiniTest::Spec
         assert last_response.body == "Cruel Editor"
       end
 
-      should "be able to inject controllers into the front application" do
+      it "be able to inject controllers into the front application" do
         Spontaneous.mode = :front
         Spontaneous.register_front_controller(:myfeature, FeatureFrontController)
         get "/@myfeature/hello"

data/test/fixtures/assets/public1/css/data.css.scss

@@ -0,0 +1,3 @@
+div {
+	background-image: url(asset-data-uri("i/y.png"));
+}

data/test/fixtures/assets/public1/css/image1.css.scss

@@ -0,0 +1,4 @@
+div {
+	background: asset-url("i/y.png");
+}
+

data/test/fixtures/assets/public1/css/import.css.scss

@@ -0,0 +1 @@
+@import "css/a.css.scss"

data/test/fixtures/assets/public1/css/urlhash.css.scss

@@ -0,0 +1,3 @@
+div {
+  background: asset-url("i/y.png?query=true#hash");
+}

data/test/fixtures/assets/public1/js/a.js

@@ -1 +1 @@
-var A;
+var a = 1;

data/test/fixtures/assets/public1/js/all.js

@@ -0,0 +1,4 @@
+//= require js/a
+//= require js/b
+//= require js/n
+var all = 1;

data/test/fixtures/assets/public1/js/{m.coffee → m.js.coffee}

@@ -1 +1,2 @@
+m = 1
 square = (x) -> x * x

data/test/fixtures/assets/public1/x.js

@@ -0,0 +1 @@
+var x = 1;

data/test/fixtures/assets/public2/css/all.css

@@ -0,0 +1,4 @@
+/*
+ *= require css/b
+ *= require css/a
+ */

data/test/fixtures/assets/public2/css/missing.css.scss

@@ -0,0 +1,3 @@
+div {
+	background: asset-url("i/missing.png");
+}

data/test/fixtures/assets/public2/js/b.js

@@ -1 +1 @@
-var B;
+var b = 2;

data/test/fixtures/assets/public2/js/c.js

@@ -1 +1 @@
-var C;
+var c = 2;

data/test/fixtures/schema/before.yml

@@ -1,7 +1,7 @@
 ---
 tttttttttttt: type//Page
 pagetitle000: field/tttttttttttt/title
-bbbbbbbbbbbb: type//SchemaTest::B
+bbbbbbbbbbbb: type//B
 ffffffffffff: field/bbbbbbbbbbbb/description
 author000000: field/bbbbbbbbbbbb/author
 promotions00: box/bbbbbbbbbbbb/promotions
@@ -10,13 +10,13 @@ inline000000: style/bbbbbbbbbbbb/inline
 outline00000: style/bbbbbbbbbbbb/outline
 thinlayout00: layout/bbbbbbbbbbbb/thin
 fatlayout000: layout/bbbbbbbbbbbb/fat
-cccccccccccc: type//SchemaTest::C
-dddddddddddd: type//SchemaTest::D
+cccccccccccc: type//C
+dddddddddddd: type//D
 boxfield0100: field/promotions00/field1
 boxfield0200: field/promotions00/field2
 boxstyle0100: style/promotions00/style1
 boxstyle0200: style/promotions00/style2
-oooooooooooo: type//SchemaTest::O
+oooooooooooo: type//O
 boxfield0300: field/oooooooooooo/ofield1
 boxfield0400: field/oooooooooooo/ofield2
 boxstyle0300: style/oooooooooooo/ostyle1

data/test/fixtures/schema/schema.yml

@@ -1,5 +1,5 @@
 ---
-xxxxxxxxxxxx: type//SchemaTest::SchemaClass
+xxxxxxxxxxxx: type//SchemaClass
 ffffffffffff: field/xxxxxxxxxxxx/description
 bbbbbbbbbbbb: box/xxxxxxxxxxxx/posts
 ssssssssssss: style/xxxxxxxxxxxx/simple

data/test/fixtures/templates/extended/partial_with_renderer.html.cut

@@ -0,0 +1 @@
+${ _renderer }

data/test/fixtures/templates/extended/with_includes_and_renderer.html.cut

@@ -0,0 +1,2 @@
+${ _renderer }
+%{ include 'partial_with_renderer', :newtitle => "local title" -}