spontaneous 0.2.0.alpha7 → 0.2.0.beta1

data/test/test_helper.rb

@@ -18,7 +18,6 @@ $:.unshift(spot_path) if File.directory?(spot_path) && !$:.include?(spot_path)
 
 require 'rack'
 require 'logger'
-require 'pg'
 
 
 Sequel.extension :migration
@@ -26,14 +25,37 @@ Sequel.extension :migration
 # for future integration with travis
 ENV["SPOT_ADAPTER"] ||= "postgres"
 
-connection_string = case ENV["SPOT_ADAPTER"]
-                    when "postgres"
-                      'postgres:///spontaneous2_test'
-                    when "mysql"
-                      'mysql2://root@localhost/spontaneous2_test'
-                    end
+jruby = case RUBY_PLATFORM
+           when "java"
+             true
+           else
+             false
+           end
+
+
+connection_string = \
+  case ENV["SPOT_ADAPTER"]
+  when "postgres"
+    if jruby
+      require 'jdbc/postgres'
+      Jdbc::Postgres.load_driver
+      "jdbc:postgresql:///spontaneous2_test"
+    else
+      require 'pg'
+      "postgres:///spontaneous2_test"
+    end
+  when "mysql"
+    if jruby
+      require 'jdbc/mysql'
+      Jdbc::MySQL.load_driver
+      "jdbc:mysql://localhost/spontaneous2_test?user=root"
+    else
+      require 'mysql2'
+      "mysql2://root@localhost/spontaneous2_test"
+    end
+  end
 
-p connection_string
+puts "DB Connection: #{connection_string}"
 DB = Sequel.connect(connection_string) unless defined?(DB)
 # DB.logger = Logger.new($stdout)
 
@@ -49,7 +71,7 @@ require 'rack/test'
 require 'matchy'
 require 'shoulda'
 require 'timecop'
-require 'mocha'
+require 'mocha/setup'
 require 'pp'
 require 'tmpdir'
 require 'json'
@@ -80,7 +102,7 @@ class MiniTestWithHooks < MiniTest::Unit
 
   def _run_suites(suites, type)
     names = suites.reject { |s| exclude?(s) }.map { |s| s.to_s.gsub(/Test$/, '') }
-    @max_name_length = names.inject(-1) { |max, name| [name.length, max].max }
+    @max_name_length = names.map(&:length).max
     begin
       before_suites
       super(suites, type)
@@ -119,23 +141,42 @@ def silence_logger(&block)
 end
 
 class MiniTest::Spec
-  include Spontaneous
   include CustomMatchers
 
   attr_accessor :template_root
   alias :silence_stdout :silence_logger
 
-  def self.setup_site(root = nil)
+  def self.setup_site(root = nil, define_models = true)
     root ||= Dir.mktmpdir
     instance = Spontaneous::Site.instantiate(root, :test, :back)
     instance.schema_loader_class = Spontaneous::Schema::TransientMap
     instance.logger.silent!
     instance.database = DB
+    Spontaneous::Site.background_mode = :immediate
+    unless Object.const_defined?(:Content)
+      content_class = Class.new(Spontaneous::Model(:content, DB, instance.schema))
+      Object.const_set :Content, content_class
+      if define_models
+        Object.const_set :Page, Class.new(::Content::Page)
+        Object.const_set :Piece, Class.new(::Content::Piece)
+        Object.const_set :Box, Class.new(::Content::Box)
+      end
+    end
+    Object.const_set :Site,  Spontaneous.site!(::Content)
+    # Use the fast version of the password hashing algorithm
+    Spontaneous::Crypt.force_version(0)
     instance
   end
 
-  def self.teardown_site
-    FileUtils.rm_r(Spontaneous.instance.root) rescue nil
+  def self.teardown_site(clear_disk = true, clear_const = true)
+    if clear_disk
+      FileUtils.rm_r(Spontaneous.instance.root) rescue nil
+    end
+    return unless clear_const
+    %w(Piece Page Box Content Site).each do |klass|
+      Object.send :remove_const, klass if Object.const_defined?(klass)
+    end
+    Spontaneous.send :remove_const, :Content rescue nil
   end
 
   def self.stub_time(time)
@@ -146,9 +187,9 @@ class MiniTest::Spec
     self.class.stub_time(time)
   end
 
-  def assert_content_equal(result, compare)
+  def assert_content_equal(result, compare, *ignore_columns)
     serialised_columns = [:field_store, :entry_store]
-    columns = Content.columns - serialised_columns
+    columns = Content.columns - serialised_columns - ignore_columns
     columns.each do |col|
       assert_equal(result[col], compare[col], "Column '#{col}' should be equal")
     end
@@ -157,19 +198,33 @@ class MiniTest::Spec
     end
   end
 
+  def assert_content_unequal(result, compare, *ignore_columns)
+    serialised_columns = [:field_store, :entry_store]
+    columns = Content.columns - serialised_columns - ignore_columns
+    columns.each do |col|
+      return true unless result[col] == compare[col]
+    end
+    serialised_columns.each do |col|
+      return true unless result.send(col) == compare.send(col)
+    end
+    flunk("#{result} & #{compare} are equal")
+  end
+
+
   def log_sql(&block)
-    logger = S::Content.db.logger
-    S::Content.db.logger = ::Logger.new($stdout)
+    logger = ::Content.mapper.logger
+    ::Content.mapper.logger = ::Logger.new($stdout)
     yield
   ensure
-    S::Content.db.logger = logger
+    ::Content.mapper.logger = logger
   end
-  def setup_site(root = nil)
-    self.class.setup_site(root)
+
+  def setup_site(root = nil, define_models = true)
+    self.class.setup_site(root, define_models)
   end
 
-  def teardown_site
-    self.class.teardown_site
+  def teardown_site(clear_disk = true, clear_const = true)
+    self.class.teardown_site(clear_disk, clear_const)
   end
 
   def assert_correct_template(content, expected_path, format = :html)

data/test/unit/test_alias.rb

@@ -5,13 +5,13 @@ require File.expand_path('../../test_helper', __FILE__)
 class AliasTest < MiniTest::Spec
 
   def assert_same_content(c1, c2)
-    assert_equal c1.length, c2.length
+    assert_equal c2.length, c1.length
     c1 = c1.dup.sort { |a, b| a.id <=> b.id }
     c2 = c2.dup.sort { |a, b| a.id <=> b.id }
     c1.each_with_index do |a, i|
       b = c2[i]
-      assert_equal a.id, b.id
-      assert_equal a.class, b.class
+      assert_equal b.id, a.id
+      assert_equal b.class, a.class
     end
   end
 
@@ -25,13 +25,13 @@ class AliasTest < MiniTest::Spec
 
       Content.delete
 
-      class ::Page < Spontaneous::Page
-        field :title
-        box :box1
-        box :box2
-      end
+      Page.field :title
+      Page.box :box1
+      Page.box :box2
+      # class ::Page < Spontaneous::Page
+      # end
 
-      class ::Piece < Spontaneous::Piece; end
+      # class ::Piece < Spontaneous::Piece; end
 
       class ::A < ::Piece
         field :a_field1
@@ -98,7 +98,7 @@ class AliasTest < MiniTest::Spec
       end
 
       class ::ProcAlias < ::Piece
-        alias_of proc { Spontaneous::Site.root.children }
+        alias_of proc { Content.root.children }
       end
 
       @root = ::Page.create
@@ -116,11 +116,11 @@ class AliasTest < MiniTest::Spec
     end
 
     teardown do
-      [:Page, :Piece, :A, :AA, :AAA, :B, :BB, :AAlias, :AAAlias, :AAAAlias, :BBAlias, :BAlias, :MultipleAlias, :ProcAlias].each do |c|
+      [:A, :AA, :AAA, :B, :BB, :AAlias, :AAAlias, :AAAAlias, :BBAlias, :BAlias, :MultipleAlias, :ProcAlias].each do |c|
         Object.send(:remove_const, c) rescue nil
       end
       Content.delete
-      FileUtils.rm_r(@site.root)
+      teardown_site
     end
 
     context "All alias" do
@@ -159,7 +159,7 @@ class AliasTest < MiniTest::Spec
               @page.box2 << A.new
               @page.box2 << AA.new
             }
-            @page.save.reload
+            @page = @page.save.reload
           end
 
           teardown do
@@ -175,8 +175,13 @@ class AliasTest < MiniTest::Spec
             class ::XX < ::Piece
               alias_of :AA, :container => Proc.new { S::Site['#thepage'].box1 }
             end
-            Set.new(X.targets).should == Set.new(@page.box1.select { |p| A === p })
-            Set.new(XX.targets).should == Set.new(@page.box1.select { |p| AA === p })
+            targets = lambda { |a, target|
+              [(a.targets), @page.box1.select { |p| target === p }].map { |a| Set.new(a) }
+            }
+            expected, actual = targets.call(X, A)
+            actual.should == expected
+            expected, actual = targets.call(XX, AA)
+            actual.should == expected
           end
 
           should "allow for selecting only content from a range of boxes" do
@@ -322,6 +327,7 @@ class AliasTest < MiniTest::Spec
           @a_alias.destroy
           Content[@a.id].should == @a
         end
+
         should "be deleted when target deleted" do
           @a.destroy
           Content[@a_alias.id].should be_nil

data/test/unit/test_asset_bundler.rb

@@ -74,7 +74,7 @@ class AssetBundler < MiniTest::Spec
 
   context "Development mode editing app" do
     setup do
-      @page = ::S::Content.create
+      @page = Content.create
     end
 
     teardown do
@@ -122,7 +122,7 @@ class AssetBundler < MiniTest::Spec
     setup do
       @compiler = Spontaneous::Asset::AppCompiler.new(fixture_dir, @site.root)
       @compiler.compile
-      @page = ::S::Content.create
+      @page = Content.create
     end
 
     teardown do
@@ -169,7 +169,7 @@ class AssetBundler < MiniTest::Spec
         config.stubs(:reload_classes).returns(false)
         config.stubs(:auto_login).returns('test')
         config.stubs(:default_charset).returns('utf-8')
-        config.stubs(:publishing_method).returns(:immediate)
+        config.stubs(:background_mode).returns(:immediate)
         config.stubs(:services).returns(nil)
         config.stubs(:site_domain).returns('example.org')
         config.stubs(:site_id).returns('example_org')

data/test/unit/test_assets.rb

@@ -29,11 +29,11 @@ class AssetTest < MiniTest::Spec
     @site = setup_site
     @fixture_root = File.expand_path("../../fixtures/assets", __FILE__)
     @site.paths.add :public, @fixture_root / "public1", @fixture_root / "public2"
-    @page = S::Page.create
+    @page = Page.create
   end
 
   def teardown
-    S::Content.delete
+    Content.delete
     teardown_site
   end
 

data/test/unit/test_async.rb

@@ -28,10 +28,9 @@ class AsyncTest < MiniTest::Spec
 
     should "use fibers to simulate sync code if running in a fiber" do
       EM.run do
-        Fiber.new {
-          result = Spontaneous.system("touch #{@filepath}")
+        result = Spontaneous.system("touch #{@filepath}") {
           File.exist?(@filepath).should be_true
-        }.resume
+        }
         EM.stop
       end
     end
@@ -47,9 +46,11 @@ class AsyncTest < MiniTest::Spec
 
 
     should "run synchronously outside of EM reactor" do
-      result = Spontaneous.system("touch #{@filepath}")
-      File.exist?(@filepath).should be_true
-      result.should be_true
+      Spontaneous.system("touch #{@filepath}") { |result|
+        File.exist?(@filepath).should be_true
+        result.should be_true
+
+      }
     end
   end
 end

data/test/unit/test_authentication.rb

@@ -8,6 +8,7 @@ require File.expand_path('../../test_helper', __FILE__)
 class AuthenticationTest < MiniTest::Spec
   include ::Rack::Test::Methods
 
+  Permissions = Spontaneous::Permissions
 
   def create_user(name, level)
     user = Permissions::User.create({
@@ -104,12 +105,12 @@ class AuthenticationTest < MiniTest::Spec
     setup do
       # Spontaneous::Schema.reset!
 
-      class C < Spontaneous::Piece
+      class C < Piece
         field :photo, :image, :write_level => :root
       end
-      class D < Spontaneous::Piece; end
+      class D < Piece; end
 
-      class SitePage < Spontaneous::Page
+      class SitePage < Page
         # page_style :default
         field :editor_level, :user_level => :editor
           field :admin_level, :user_level => :admin
@@ -178,23 +179,25 @@ class AuthenticationTest < MiniTest::Spec
       Permissions::UserLevel.reset!
       Permissions::UserLevel.stubs(:level_file).returns(File.expand_path('../../fixtures/permissions', __FILE__) / 'config/user_levels.yml')
 
-      @root = SitePage.create
-      @root.save
-
-      @about = SitePage.create(:uid => 'about', :slug => "about")
-      @root.pages << @about
-      piece = C.new
-      @root.boxes[:root_level] << piece
-      piece = C.new
-      @root.boxes[:root_level] << piece
-      @root.save
-
-      @root_user = create_user('root', Permissions::UserLevel.root)
-      @admin_user = create_user('admin', Permissions::UserLevel.admin)
-      @editor_user = create_user('editor', Permissions::UserLevel.editor)
-      @guest_user = create_user('guest', Permissions::UserLevel.none)
-      @disabled_user = create_user('disabled', Permissions::UserLevel.admin)
-      @disabled_user.update(:disabled => true)
+      ::Content.scope do
+        @root = SitePage.create
+        @root.save
+
+        @about = SitePage.create(:uid => 'about', :slug => "about")
+        @root.pages << @about
+        piece = C.new
+        @root.boxes[:root_level] << piece
+        piece = C.new
+        @root.boxes[:root_level] << piece
+        @root.save
+
+        @root_user = create_user('root', Permissions::UserLevel.root)
+        @admin_user = create_user('admin', Permissions::UserLevel.admin)
+        @editor_user = create_user('editor', Permissions::UserLevel.editor)
+        @guest_user = create_user('guest', Permissions::UserLevel.none)
+        @disabled_user = create_user('disabled', Permissions::UserLevel.admin)
+        @disabled_user.update(:disabled => true)
+      end
     end
 
     teardown do
@@ -389,7 +392,7 @@ class AuthenticationTest < MiniTest::Spec
 
         should "be able to update root level fields" do
           field = root.fields.root_level
-          auth_post "/@spontaneous/save/#{root.id}", "field[#{field.schema_id}][unprocessed_value]" => "Updated"
+          auth_post "/@spontaneous/save/#{root.id}", "field[#{field.schema_id}]" => "Updated"
           assert last_response.ok?
           root.reload.fields[:root_level].value.should == "Updated"
         end
@@ -410,18 +413,28 @@ class AuthenticationTest < MiniTest::Spec
           clear_cookies
         end
 
-        should "not be able to update root level fields" do
-          value = "Updated #{version}"
-          field = root.fields[:root_level]
-          auth_post "/@spontaneous/save/#{root.id}", "field[#{field.schema_id}][unprocessed_value]" => value
-          assert last_response.status == 403, "Should have a permissions error 403 not #{last_response.status}"
-          root.reload.fields[:root_level].value.should == @root_copy.root_level.value
-        end
+        # DISABLED: The ui should ensure that forbidden fields don't appear
+        # the async update system simply ignores fields that the user can't
+        # modify (see test_fields.rb).
+        # should "not be able to update root level fields" do
+        #   value = "Updated #{version}"
+        #   field = root.fields[:root_level]
+        #   auth_post "/@spontaneous/save/#{root.id}", "field[#{field.schema_id}]" => value
+        #   assert last_response.status == 403, "Should have a permissions error 403 not #{last_response.status}"
+        #   root.reload.fields[:root_level].value.should == @root_copy.root_level.value
+        # end
+
+        # should "not be able to update root level fields from admin level box" do
+        #   value = "Updated #{version}"
+        #   field = root.boxes[:admin_level].fields[:root_level]
+        #   auth_post "/@spontaneous/savebox/#{root.id}/#{root.boxes[:admin_level].schema_id}", "field[#{field.schema_id}]" => value
+        #   assert last_response.status == 403, "Should have a permissions error 403 not #{last_response.status}"
+        # end
 
         should "be able to update admin level fields" do
           value = "Updated #{version}"
           field = root.fields[:admin_level]
-          auth_post "/@spontaneous/save/#{root.id}", "field[#{field.schema_id}][unprocessed_value]" => value
+          auth_post "/@spontaneous/save/#{root.id}", "field[#{field.schema_id}]" => value
           assert last_response.ok?
           root.reload.fields[:admin_level].value.should == value
         end
@@ -445,14 +458,7 @@ class AuthenticationTest < MiniTest::Spec
         should "not be able to update fields from root level box" do
           value = "Updated #{version}"
           field = root.fields[:editor_level]
-          auth_post "/@spontaneous/savebox/#{root.id}/#{root.boxes[:root_level].schema_id}", "field[#{field.schema_id}][unprocessed_value]" => value
-          assert last_response.status == 403, "Should have a permissions error 403 not #{last_response.status}"
-        end
-
-        should "not be able to update root level fields from admin level box" do
-          value = "Updated #{version}"
-          field = root.boxes[:admin_level].fields[:root_level]
-          auth_post "/@spontaneous/savebox/#{root.id}/#{root.boxes[:admin_level].schema_id}", "field[#{field.schema_id}][unprocessed_value]" => value
+          auth_post "/@spontaneous/savebox/#{root.id}/#{root.boxes[:root_level].schema_id}", "field[#{field.schema_id}]" => value
           assert last_response.status == 403, "Should have a permissions error 403 not #{last_response.status}"
         end
 

data/test/unit/test_boxes.rb

@@ -16,7 +16,6 @@ class BoxesTest < MiniTest::Spec
   context "Box definitions" do
     setup do
 
-      class ::Piece < Spontaneous::Piece; end
       class ::MyBoxClass < Box; end
       class ::MyContentClass < Piece; end
       class ::MyContentClass2 < MyContentClass; end
@@ -24,10 +23,9 @@ class BoxesTest < MiniTest::Spec
     end
 
     teardown do
-      Object.send(:remove_const, :Piece)
-      Object.send(:remove_const, :MyContentClass2)
-      Object.send(:remove_const, :MyContentClass)
-      Object.send(:remove_const, :MyBoxClass)
+      Object.send(:remove_const, :MyContentClass2) rescue nil
+      Object.send(:remove_const, :MyContentClass) rescue nil
+      Object.send(:remove_const, :MyBoxClass) rescue nil
     end
 
     should "start empty" do
@@ -155,6 +153,12 @@ class BoxesTest < MiniTest::Spec
         instance.box1.container.should == instance
         instance.box1.container.should == instance
       end
+
+      should "return their owner as content_instance" do
+        MyContentClass.box :box1
+        instance = MyContentClass.new
+        instance.box1.content_instance.should == instance
+      end
     end
 
     context "ranges" do
@@ -234,7 +238,6 @@ class BoxesTest < MiniTest::Spec
   context "Box classes" do
     setup do
       @site.stubs(:template_root).returns(File.expand_path('../../fixtures/templates/boxes', __FILE__))
-      class ::Piece < Spontaneous::Piece; end
       class ::MyContentClass < ::Piece; end
       class ::MyBoxClass < Box; end
       MyBoxClass.field :title, :string
@@ -247,9 +250,8 @@ class BoxesTest < MiniTest::Spec
     end
 
     teardown do
-      Object.send(:remove_const, :Piece)
-      Object.send(:remove_const, :MyContentClass)
-      Object.send(:remove_const, :MyBoxClass)
+      Object.send(:remove_const, :MyContentClass) rescue nil
+      Object.send(:remove_const, :MyBoxClass) rescue nil
     end
 
     should "have fields" do
@@ -282,7 +284,7 @@ class BoxesTest < MiniTest::Spec
         field :description, :string
       end
       instance = MyContentClass.new
-      assert instance.partners.name.class < Spontaneous::FieldTypes::StringField
+      assert instance.partners.name.class < Spontaneous::Field::String
       instance.partners.name = "Howard"
       instance.partners.description = "Here is Howard"
       instance.save
@@ -297,7 +299,6 @@ class BoxesTest < MiniTest::Spec
 
   context "Box content" do
     setup do
-      class ::Piece < Spontaneous::Piece; end
       class ::BlankContent < ::Piece; end
       class ::StyledContent < ::Piece; end
 
@@ -319,9 +320,8 @@ class BoxesTest < MiniTest::Spec
     end
 
     teardown do
-      Object.send(:remove_const, :Piece)
-      Object.send(:remove_const, :BlankContent)
-      Object.send(:remove_const, :StyledContent)
+      Object.send(:remove_const, :BlankContent) rescue nil
+      Object.send(:remove_const, :StyledContent) rescue nil
     end
 
     should "be addable" do
@@ -358,7 +358,7 @@ class BoxesTest < MiniTest::Spec
       styled.one << child1
       styled.two << child2
       styled.save
-      styled = Content.first :id => styled.id
+      styled = Content.get styled.id
 
       styled.one.contents.first.style.name.should == :blank2
       styled.two.contents.first.style.name.should == :blank3
@@ -492,8 +492,8 @@ class BoxesTest < MiniTest::Spec
       box = AChild2.boxes.parents
       box.title.should == "Things"
       box.allowed_types(nil).should == [Allowed1, Allowed2, Allowed3, Allowed11, Allowed111]
-      Object.send(:remove_const, :AChild)
-      Object.send(:remove_const, :AChild2)
+      Object.send(:remove_const, :AChild) rescue nil
+      Object.send(:remove_const, :AChild2) rescue nil
     end
 
     should "include a subtype's allowed list as well as the supertype's" do
@@ -509,11 +509,36 @@ class BoxesTest < MiniTest::Spec
     should "correctly allow addition of subclasses" do
       Mixed.allowed_types.should == [Allowed11, Allowed111]
     end
+
+    should "create inline classes if passed a definition block" do
+      allowed = ChildClass.allow :InlineType do
+        field :title
+      end
+      inline_type = allowed.instance_class
+      inline_type.fields.length.should == 1
+      inline_type.fields.first.name.should == :title
+      inline_type.name.should == "ChildClass::InlineType"
+    end
+
+    should "use the given supertype for inline classes" do
+      allowed = ChildClass.allow :InlineType, :supertype => :Allowed1 do
+        field :title
+      end
+      inline_type = allowed.instance_class
+      inline_type.ancestors[0..1].should == [ChildClass::InlineType, Allowed1]
+    end
+
+    should "add the created class to the schema immediately" do
+      allowed = ChildClass.allow :InlineType, :supertype => :Allowed1 do
+        field :title
+      end
+      assert @site.schema.classes.map(&:to_s).include?("ChildClass::InlineType"), "#{@site.schema.classes} does not include ChildClass::InlineType"
+    end
   end
 
   context "Box groups" do
     setup do
-      class ::A < S::Piece
+      class ::A < ::Piece
         box_group :inner do
           box :a
           box :b
@@ -549,9 +574,9 @@ class BoxesTest < MiniTest::Spec
     end
 
     teardown do
-      Object.send(:remove_const, :A)
-      Object.send(:remove_const, :B)
-      Object.send(:remove_const, :C)
+      Object.send(:remove_const, :A) rescue nil
+      Object.send(:remove_const, :B) rescue nil
+      Object.send(:remove_const, :C) rescue nil
     end
 
     should "successfully allocate boxes" do