spontaneous 0.2.0.alpha7 → 0.2.0.beta1

data/test/experimental/test_crypt.rb

@@ -0,0 +1,158 @@
+# encoding: UTF-8
+
+require File.expand_path('../../test_helper', __FILE__)
+require 'benchmark'
+
+class CryptTest < MiniTest::Spec
+  Crypt = Spontaneous::Crypt
+
+  def setup
+    Crypt.default_version
+  end
+
+  context "versions" do
+    should "be listable" do
+      Crypt.versions.should == [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
+    end
+
+    should "be directly loadable" do
+      Crypt.version(201102).should == Crypt::Version::SHALegacy
+    end
+
+    should "be configurable" do
+      Crypt.force_version(0)
+      Crypt.current.should == Crypt::Version::Fake
+    end
+  end
+
+  context "fake version" do
+    setup do
+      @pass = "abcdef"
+    end
+    should "have a version of 0" do
+      Crypt::Version::SHALegacy.version.should == 201102
+    end
+    should "be creatable from a pasword" do
+      hash = Crypt::Version::Fake.create(@pass)
+      Crypt.new(@pass, hash).valid?.should be_true
+    end
+    should "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
+    end
+  end
+
+  context "legacy version" do
+    setup 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
+    end
+
+    should "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
+    end
+
+    should "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
+    end
+
+    should "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
+    end
+  end
+
+  context "password creation" do
+    setup do
+      @password = "abcdefg"
+    end
+
+    should "be verifiable" do
+      hash = Crypt::hash(@password)
+      Crypt.new(@password, hash).valid?.should be_true
+    end
+
+    should "use the latest version" do
+      hash = Crypt::hash(@password)
+      version, _ = Crypt.version_split(hash)
+      version.should == Crypt.current.version
+    end
+
+    should "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 { Crypt::valid?(@password, hash) }
+      bm.real.should >= 0.5
+    end
+  end
+  context "users" do
+    setup do
+      S::Permissions::User.delete
+      @pass = "abcdefghijklm"
+      @attrs = {:login => "test", :email => "test@example.com", :name => "Test User", :password => @pass}
+      @user = S::Permissions::User.new(@attrs)
+      @user.save
+    end
+
+    teardown do
+      S::Permissions::User.delete
+    end
+
+    should "use the current crypt implementation to hash their passwords" do
+      hash = @user.crypted_password
+
+      auth = Crypt.new(@pass, hash)
+      auth.valid?.should be_true
+    end
+
+    should "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
+      result = Spontaneous::Permissions::User.authenticate(@attrs[:login], @pass + "x")
+      result.should be_nil
+    end
+
+    should "transparently upgrade the auth version if outdated" do
+      salt = "aaaaaaaa"
+      sha  = Crypt::Version::SHALegacy.sha(salt, @pass)
+      hash = Crypt::Version::SHALegacy.create(sha, salt)
+      @user.model.filter(:id => @user.id).update(:crypted_password => hash)
+      @user.reload
+      auth = Crypt.new(@pass, @user.crypted_password)
+      assert auth.outdated?, "Auth should be outdated"
+      result = Spontaneous::Permissions::User.authenticate(@attrs[:login], @pass)
+      result.must_be_instance_of S::Permissions::AccessKey
+      @user.reload
+      auth = Crypt.new(@pass, @user.crypted_password)
+      assert !auth.outdated?, "Auth should have upgraded"
+      result = Spontaneous::Permissions::User.authenticate(@attrs[:login], @pass)
+      result.must_be_instance_of S::Permissions::AccessKey
+    end
+  end
+end

data/test/experimental/test_features.rb

@@ -9,9 +9,9 @@ class FeaturesTest < MiniTest::Spec
 
   def self.startup
     # make sure that S::Piece & S::Page are removed from the schema
-    @site = setup_site
-    *ids = S::Page.schema_id, S::Piece.schema_id
-    Object.const_set(:Site, Class.new(S::Site))
+    # @site = setup_site
+    # *ids = ::Page.schema_id, ::Piece.schema_id
+    # Object.const_set(:Site, Class.new(S::Site))
   end
 
   def setup

data/test/fixtures/example_application/config/environments/development.rb

@@ -10,7 +10,7 @@ front do
 end
 
 # can be one of :threaded, :immediate or :fire_and_forget
-publishing_method :threaded
+background_mode :threaded
 
 publishing_delay 10
 

data/test/fixtures/example_application/lib/content.rb

@@ -0,0 +1,5 @@
+
+class Content < Spontaneous::Model(:content)
+end
+
+Site = Spontaneous.site(Content)

data/test/fixtures/example_application/schema/page.rb

@@ -1,4 +1,5 @@
+require File.expand_path("../../lib/content", __FILE__)
 
-class Page < Spontaneous::Page
+class Page < Content::Page
   field :title, :string, :default => "New Page"
 end

data/test/fixtures/example_application/schema/piece.rb

@@ -1,3 +1,4 @@
-class Piece < Spontaneous::Piece
-end
+require File.expand_path("../../lib/content", __FILE__)
 
+class Piece < Content::Piece
+end

data/test/fixtures/serialisation/class_hash.yaml.erb

@@ -14,26 +14,26 @@
 :fields:
 - :name: title
   :schema_id: <%= @fp[:title].schema_id.to_s %>
-  :type: Spontaneous.FieldTypes.StringField
+  :type: Spontaneous.Field.String
   :title: Title
   :comment: ""
   :writable: true
 - :name: location
   :schema_id: <%= @fp[:location].schema_id.to_s %>
-  :type: Spontaneous.FieldTypes.StringField
+  :type: Spontaneous.Field.String
   :title: Where
   :comment: Fill in the address
   :writable: true
 - :name: date
   :schema_id: <%= @fp[:date].schema_id.to_s %>
-  :type: Spontaneous.FieldTypes.DateField
+  :type: Spontaneous.Field.Date
   :title: Date
   :comment: ""
   :writable: true
   :date_format: "%A, %-d %B, %Y"
 - :name: image
   :schema_id: <%= @fp[:image].schema_id.to_s %>
-  :type: Spontaneous.FieldTypes.ImageField
+  :type: Spontaneous.Field.Image
   :title: Image
   :comment: ""
   :writable: true
@@ -47,7 +47,7 @@
   :fields:
   - :name: title
     :schema_id: <%= SerialisedPiece.boxes[:things].field_prototypes[:title].schema_id.to_s %>
-    :type: Spontaneous.FieldTypes.StringField
+    :type: Spontaneous.Field.String
     :title: Title
     :comment: ""
     :writable: true

data/test/fixtures/serialisation/root_hash.yaml.erb

@@ -29,6 +29,8 @@
   :processed_value:
     :original:
       :src: /images/home.jpg
+    :__ui__:
+      :src: /images/home.jpg
 
 :boxes:
 - :id: <%= @root.insides.schema_id.to_s %>
@@ -72,6 +74,8 @@
           :src: ""
         :thumbnail:
           :src: ""
+        :__ui__:
+          :src: ""
 
     :style: <%= @freezing_style.to_s %>
     :hidden: true
@@ -121,6 +125,8 @@
           :processed_value:
             :original:
               :src: /images/thumb.jpg
+            :__ui__:
+              :src: /images/thumb.jpg
 
     :is_page: false
     :id: <%= @piece1.id %>
@@ -160,6 +166,8 @@
           :src: ""
         :thumbnail:
           :src: ""
+        :__ui__:
+          :src: ""
 
     :style: <%= @boiling_style.to_s %>
     :hidden: false

data/test/functional/test_application.rb

@@ -17,10 +17,20 @@ class ApplicationTest < MiniTest::Spec
     app_root = File.expand_path('../../fixtures/example_application', __FILE__)
     FileUtils.cp_r(app_root, @site_root)
     @site_root += "/example_application"
+    # Force loading of model in dev mode (where we have a db to introspect)
+    Spontaneous.init(:root => @site_root, :mode => :back, :environment => :development)
   end
 
   def self.shutdown
-    teardown_site
+    teardown_site(true)
+  end
+
+  def setup
+    # @site = setup_site(self.class.site_root, true)
+  end
+
+  def teardown
+    # teardown_site(false)
   end
 
   context "schema" do
@@ -103,6 +113,7 @@ class ApplicationTest < MiniTest::Spec
 
     setup do
       Spontaneous.init(:root => self.class.site_root, :mode => :front, :environment => :development)
+      Sequel::Migrator.apply(Spontaneous.database, 'db/migrations')
     end
 
     should "have the right mode setting" do