spontaneous 0.1.0.alpha1 → 0.2.0.alpha1

data/test/unit/test_authentication.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
 # set :environment, :test
 
@@ -9,9 +9,6 @@ class AuthenticationTest < MiniTest::Spec
   include ::Rack::Test::Methods
 
 
-  def self.startup
-  end
-
   def create_user(name, level)
     user = Permissions::User.create({
       :name => "#{name.capitalize}",
@@ -24,9 +21,6 @@ class AuthenticationTest < MiniTest::Spec
     user
   end
 
-  def self.shutdown
-  end
-
   @@version = 0
 
   def version
@@ -65,8 +59,8 @@ class AuthenticationTest < MiniTest::Spec
     @disabled_user
   end
 
-  def login_user(user)
-    post "/@spontaneous/login", "user[login]" => user.login, "user[password]" => user.password
+  def login_user(user, params={})
+    post "/@spontaneous/login", {"user[login]" => user.login, "user[password]" => user.password}.merge(params)
     @user = user
   end
 
@@ -74,21 +68,30 @@ class AuthenticationTest < MiniTest::Spec
     key = @user.access_keys.first
     post(path, params.merge("__key" => key.key_id))
   end
+
   def auth_get(path, params={})
     key = @user.access_keys.first
     get(path, params.merge("__key" => key.key_id))
   end
 
   def setup
-    instance = Spontaneous::Site.instantiate(Spontaneous.root, :test, :back)
-    Site.config.publishing_delay nil
-    Site.database = DB
-    Site.instance.paths.add :templates, File.expand_path("../../fixtures/public/templates", __FILE__)
+    @site = setup_site
+
+    @site.config.publishing_delay nil
+    @site.config.site_domain "example.com"
+    @site.config.site_id "example_com"
+
+    # Site.database = DB
+    @site.paths.add :templates, File.expand_path("../../fixtures/public/templates", __FILE__)
     # see http://benprew.posterous.com/testing-sessions-with-sinatra
-    app.send(:set, :sessions, false)
-    Spontaneous.media_dir = File.expand_path('../../fixtures/permissions/media', __FILE__)
+    # app.send(:set, :sessions, false)
+    S::Rack::Back::EditingInterface.set :sessions, false
+    Spontaneous.stubs(:media_dir).returns(File.expand_path('../../fixtures/permissions/media', __FILE__))
   end
 
+  def teardown
+    teardown_site
+  end
   def assert_login_page(path = nil, method = "GET")
     assert last_response.status == 401, "#{method} #{path} should have status 401 but has #{last_response.status}"
     last_response.body.should =~ %r{<form.+action="/@spontaneous/login"}
@@ -107,7 +110,7 @@ class AuthenticationTest < MiniTest::Spec
 
   context "Authentication:" do
     setup do
-      Spontaneous::Schema.reset!
+      # Spontaneous::Schema.reset!
 
       class C < Spontaneous::Piece
         field :photo, :image, :write_level => :root
@@ -180,12 +183,7 @@ class AuthenticationTest < MiniTest::Spec
       Permissions::User.delete
       Permissions::AccessKey.delete
       Spontaneous.environment = :test
-      Permissions::UserLevel.level_file = File.expand_path('../../fixtures/permissions', __FILE__) / 'config/user_levels.yml'
-
-      @saved_root = Spontaneous.root
-      Spontaneous.root = File.expand_path('../../fixtures/example_application', __FILE__)
-
-      # Spontaneous.template_root = File.expand_path("../../fixtures/public/templates", __FILE__)
+      Permissions::UserLevel.stubs(:level_file).returns(File.expand_path('../../fixtures/permissions', __FILE__) / 'config/user_levels.yml')
 
       @root = SitePage.create
       @root.save
@@ -207,11 +205,10 @@ class AuthenticationTest < MiniTest::Spec
     end
 
     teardown do
-      [:C, :D, :SitePage].each { |k| AuthenticationTest.send(:remove_const, k)}
+      [:C, :D, :SitePage].each { |k| AuthenticationTest.send(:remove_const, k) rescue nil }
       Content.delete
       Permissions::User.delete
       Permissions::AccessKey.delete
-      Spontaneous.root = @saved_root
     end
 
     context "Unauthorised sessions" do
@@ -289,9 +286,9 @@ class AuthenticationTest < MiniTest::Spec
 
         should "succeed and redirect to /@spontaneous for correct login & password" do
           # post "/@spontaneous/login", "user[login]" => "admin", "user[password]" => "admin_password"
-          login_user(@admin_user)
+          login_user(@admin_user, "origin" => "/103/preview")
           assert last_response.status == 302, "Status was #{last_response.status} not 302"
-          last_response.headers["Location"].should =~ %r{/@spontaneous$}
+          last_response.headers["Location"].should =~ %r{/@spontaneous/103/preview$}
         end
 
         should "succeed and return an api key value for correct login over XHR" do
@@ -306,9 +303,9 @@ class AuthenticationTest < MiniTest::Spec
 
         should "accept a valid API key for re-authentication" do
           key = @admin_user.logged_in!
-          post "/@spontaneous/reauthenticate", "api_key" => key.key_id
+          post "/@spontaneous/reauthenticate", "api_key" => key.key_id, "origin" => "/99/edit"
           assert last_response.status == 302, "Status was #{last_response.status} not 302"
-          last_response.headers["Location"].should =~ %r{/@spontaneous$}
+          last_response.headers["Location"].should =~ %r{/@spontaneous/99/edit$}
         end
 
         should "reject invalid API key" do
@@ -430,6 +427,7 @@ class AuthenticationTest < MiniTest::Spec
           # post "/@spontaneous/add/#{root.id}/admin_level/AuthenticationTest::C"
           assert last_response.ok?
         end
+
         should "not be able to update fields from root level box" do
           value = "Updated #{version}"
           field = root.fields[:editor_level]

data/test/unit/test_boxes.rb

@@ -1,13 +1,21 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
 
 class BoxesTest < MiniTest::Spec
 
+  def setup
+    @site = setup_site
+  end
+
+  def teardown
+    teardown_site
+  end
+
   context "Box definitions" do
     setup do
-      S::Schema.reset!
+
       class ::Piece < Spontaneous::Piece; end
       class ::MyBoxClass < Box; end
       class ::MyContentClass < Piece; end
@@ -37,6 +45,14 @@ class BoxesTest < MiniTest::Spec
       MyContentClass.has_boxes?.should be_true
     end
 
+    should "have a boolean test for emptiness" do
+      MyContentClass.box :images0
+      instance = MyContentClass.new
+      instance.images0.empty?.should be_true
+      instance.images0 << MyContentClass.new
+      instance.images0.empty?.should be_false
+    end
+
     should "always return a symbol for the name" do
       MyContentClass.box 'images0'
       MyContentClass.boxes.first.name.should == :images0
@@ -111,6 +127,36 @@ class BoxesTest < MiniTest::Spec
       instance.boxes.length.should == 2
     end
 
+    should "know their ordering in the container" do
+      MyContentClass.box :box1
+      MyContentClass.box :box2
+      MyContentClass.box :box3
+      MyContentClass.box_order :box3, :box2, :box1
+      MyContentClass.boxes.box3.position.should == 0
+      MyContentClass.boxes.box2.position.should == 1
+      MyContentClass.boxes.box1.position.should == 2
+      instance = MyContentClass.new
+      instance.box3.position.should == 0
+      instance.box2.position.should == 1
+      instance.box1.position.should == 2
+    end
+
+    context "instances" do
+      should "have a connection to their owner" do
+        MyContentClass.box :box1
+        instance = MyContentClass.new
+        instance.box1.owner.should == instance
+        instance.box1.parent.should == instance
+      end
+
+      should "have a link to their container (which is their owner)" do
+        MyContentClass.box :box1
+        instance = MyContentClass.new
+        instance.box1.container.should == instance
+        instance.box1.container.should == instance
+      end
+    end
+
     context "ranges" do
       setup do
         MyContentClass.box :images1
@@ -187,8 +233,7 @@ class BoxesTest < MiniTest::Spec
 
   context "Box classes" do
     setup do
-      Schema.reset!
-      Spontaneous.template_root = File.expand_path('../../fixtures/templates/boxes', __FILE__)
+      @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
@@ -237,7 +282,7 @@ class BoxesTest < MiniTest::Spec
         field :description, :string
       end
       instance = MyContentClass.new
-      instance.partners.name.must_be_instance_of(Spontaneous::FieldTypes::StringField)
+      assert instance.partners.name.class < Spontaneous::FieldTypes::StringField
       instance.partners.name = "Howard"
       instance.partners.description = "Here is Howard"
       instance.save
@@ -246,75 +291,8 @@ class BoxesTest < MiniTest::Spec
       instance.partners.description.value.should == "Here is Howard"
     end
 
-    should "default to template in root with the same name" do
-    end
-
-    # context "with styles" do
-    #   setup do
-    #     MyBoxClass.field :title, :string
-    #     MyBoxClass.style :christy
-    #     class ::InheritedStyleBox < MyBoxClass; end
-    #     class ::WithTemplateBox < Box; end
-    #     class ::WithoutTemplateBox < Box; end
-    #     class ::BlankContent < Content; end
-    #     @content = MyContentClass.new
-    #     @content.images.title = "whisty"
-    #   end
-
-    #   teardown do
-    #     Object.send(:remove_const, :InheritedStyleBox)
-    #     Object.send(:remove_const, :WithTemplateBox)
-    #     Object.send(:remove_const, :WithoutTemplateBox)
-    #     Object.send(:remove_const, :BlankContent)
-    #   end
-
-    #   should "render using explicit styles" do
-    #     @content.images.render.should == "christy: whisty\\n"
-    #   end
-
-    #   should_eventually "allow defining style in definition" do
-    #     BlankContent.box :images do
-    #       style :inline_style
-    #     end
-    #     instance = BlankContent.new
-    #     instance.images.style.filename.should == "inline_style.html.cut"
-    #   end
-
-    #   should "render using default template style" do
-    #     BlankContent.box :images, :class => :WithTemplateBox
-    #     instance = BlankContent.new
-    #     instance.images.render.should == "with_template_box.html.cut\\n"
-    #   end
-
-    #   should "render using global default box styles" do
-    #     entry = Object.new
-    #     entry.stubs(:render).returns("<entry>")
-    #     BlankContent.box :images, :class => :WithoutTemplateBox
-    #     instance = BlankContent.new
-    #     instance.images.stubs(:pieces).returns([entry])
-    #     instance.images.render.should == "<entry>"
-    #   end
-
-    #   should "find templates named after box in owning classes template dir" do
-    #     BlankContent.box :things
-    #     instance = BlankContent.new
-    #     instance.things.render.should == "blank_content/things.html.cut\\n"
-    #   end
-
-    #   should "not use templates with box name found in root template dir" do
-    #     BlankContent.box :thangs
-    #     instance = BlankContent.new
-    #     instance.thangs.render.should == ""
-    #   end
-
-    #   should "inherit styles from their superclass" do
-    #     BlankContent.box :images, :class => :InheritedStyleBox
-    #     instance = BlankContent.new
-    #     instance.images.title = "ytsirhc"
-    #     instance.images.render.should == "christy: ytsirhc\\n"
-    #   end
-    # end
-
+    # true?
+    should "default to template in root with the same name"
   end
 
   context "Box content" do
@@ -359,7 +337,9 @@ class BoxesTest < MiniTest::Spec
       child1.save
       @parent = Content[@parent.id]
       child1.reload; child2.reload; child3.reload
+      @parent.images.contents.should == [child1]
       @parent.images.pieces.should == [child1]
+      @parent.words.contents.should == [child2]
       @parent.words.pieces.should == [child2]
       @parent.pieces.should == [child1, child2]
       child1.images.pieces.should == [child3]
@@ -383,9 +363,25 @@ class BoxesTest < MiniTest::Spec
       styled.two.pieces.first.style.name.should == :blank3
     end
 
-    should "allow selection of subclasses" do
+    should "be insertable at any position" do
+      BlankContent.box :box3
+      BlankContent.box :box4
+      instance = BlankContent.new
+      count = 4
+      [:images, :words, :box3, :box4].map { |name| instance.boxes[name] }.each do |box|
+        count.times { |n| box << StyledContent.new(:label => n)}
+      end
+      instance.box4.insert(1, StyledContent.new(:label => "a"))
+      instance.box4.contents.map { |e| e.label }.should == ["0", "a", "1", "2", "3"]
+      instance.box4.insert(5, StyledContent.new(:label => "b"))
+      instance.box4.contents.map { |e| e.label }.should == ["0", "a", "1", "2", "3", "b"]
+      instance.box3.insert(2, StyledContent.new(:label => "c"))
+      instance.box3.contents.map { |e| e.label }.should == ["0", "1", "c", "2", "3"]
     end
+
+    should "allow selection of subclasses"
   end
+
   context "Allowed types" do
     setup do
       class ::Allowed1 < Content
@@ -423,6 +419,8 @@ class BoxesTest < MiniTest::Spec
       class ::Mixed < Box
         allow_subclasses :Allowed1
       end
+
+
     end
 
     teardown do
@@ -477,6 +475,24 @@ class BoxesTest < MiniTest::Spec
 
     should "inherit allowed types from superclass" do
       ChildClass.allowed.should == Parent.allowed
+      Allowable.boxes.parents.allowed_types(nil).should == [Allowed1, Allowed2, Allowed3]
+      class ::AChild < Allowable
+        box :parents do
+          allow :Allowed11
+        end
+      end
+      class ::AChild2 < AChild
+        box :parents, :title => "Things" do
+          allow :Allowed111
+        end
+      end
+      box = AChild.boxes.parents
+      box.allowed_types(nil).should == [Allowed1, Allowed2, Allowed3, Allowed11]
+      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)
     end
 
     should "include a subtype's allowed list as well as the supertype's" do
@@ -493,5 +509,60 @@ class BoxesTest < MiniTest::Spec
       Mixed.allowed_types.should == [Allowed11, Allowed111]
     end
   end
+
+  context "Box groups" do
+    setup do
+      class ::A < S::Piece
+        box_group :inner do
+          box :a
+          box :b
+        end
+        box_group :outer do
+          box :c
+          box :d
+        end
+      end
+
+      class ::B < ::A
+        box_group :outer do
+          box :e
+        end
+      end
+
+      class ::C < ::B
+        box :f, :group => :inner
+      end
+
+      @a = ::A.new
+      @b = ::B.new
+      @c = ::C.new
+      [@a, @b, @c].each do |instance|
+        instance.boxes[:a].stubs(:render).with(anything).returns("[a]")
+        instance.boxes[:b].stubs(:render).with(anything).returns("[b]")
+        instance.boxes[:c].stubs(:render).with(anything).returns("[c]")
+        instance.boxes[:d].stubs(:render).with(anything).returns("[d]")
+      end
+      @b.boxes[:e].stubs(:render).with(anything).returns("[e]")
+      @c.boxes[:e].stubs(:render).with(anything).returns("[e]")
+      @c.boxes[:f].stubs(:render).with(anything).returns("[f]")
+    end
+
+    teardown do
+      Object.send(:remove_const, :A)
+      Object.send(:remove_const, :B)
+      Object.send(:remove_const, :C)
+    end
+
+    should "successfully allocate boxes" do
+      @a.boxes.inner.render.should == "[a][b]"
+      @a.boxes.outer.render.should == "[c][d]"
+
+      @b.boxes.inner.render.should == "[a][b]"
+      @b.boxes.outer.render.should == "[c][d][e]"
+
+      @c.boxes.inner.render.should == "[a][b][f]"
+      @c.boxes.outer.render.should == "[c][d][e]"
+    end
+  end
 end
 

data/test/unit/test_config.rb

@@ -1,21 +1,21 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
 class ConfigTest < MiniTest::Spec
   include CustomMatchers
   def setup
+    @site = setup_site
+  end
+
+  def teardown
+    teardown_site
   end
 
   context "Config" do
     setup do
-      # Spontaneous.send(:remove_const, :Config) rescue nil
-      # @lib_dir = File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
-      # load @lib_dir + '/spontaneous/config.rb'
-      Config ||= ::Spontaneous::Config
-      @pwd = Dir.pwd
-      Dir.chdir(File.expand_path("../../fixtures/config", __FILE__))
-      Spontaneous.root = Dir.pwd
+      @config_dir = File.expand_path("../../fixtures/config/config", __FILE__)
+
       class ::TopLevel
         def self.parameter=(something)
           @parameter = something
@@ -26,22 +26,44 @@ class ConfigTest < MiniTest::Spec
         end
       end
     end
+
     teardown do
-      Object.send(:remove_const, :TopLevel)
-      Dir.chdir(@pwd)
-      # self.class.send(:remove_const, :Config) rescue nil
+      Object.send(:remove_const, :TopLevel) rescue nil
     end
 
     context "Config" do
       setup do
         @config = Config.new(:development)
-        @config.load(Spontaneous.root / 'config')
+        @config.load(@config_dir)
       end
       should "load the first time its accessed" do
         @config.over_ridden.should == :development_value
       end
     end
 
+    context "containing blocks" do
+      setup do
+        @settings = {}
+        @config = Config::Loader.new(@settings)
+      end
+      should "add a hash to the settings under the defined key" do
+        @config.storage :key1 do |config|
+          config[:a] = "a"
+          config[:b] = "b"
+        end
+        @config.storage :key2 do |config|
+          config[:c] = "c"
+          config[:d] = "d"
+        end
+        @config.storage :key1 do |config|
+          config[:e] = "e"
+        end
+        @config.settings[:storage].should == {
+          :key1 => { :a => "a", :b => "b", :e => "e" },
+          :key2 => { :c => "c", :d => "d" }
+        }
+      end
+    end
     context "Independent configuration loading" do
       setup do
         # defined?(Spontaneous).should be_nil
@@ -50,7 +72,7 @@ class ConfigTest < MiniTest::Spec
         # require @lib_dir + '/spontaneous/config.rb'
         # Config.environment = :development
         @config = Config.new(:development)
-        @config.load(Spontaneous.root / 'config')
+        @config.load(@config_dir)
       end
 
       teardown do
@@ -77,10 +99,10 @@ class ConfigTest < MiniTest::Spec
       should "overwrite values depending on environment" do
         @config.over_ridden.should == :development_value
         config = Config.new(:production)
-        config.load(Spontaneous.root / 'config')
+        config.load(@config_dir)
         config.over_ridden.should == :production_value
         config = Config.new(:staging)
-        config.load(Spontaneous.root / 'config')
+        config.load(@config_dir)
         config.over_ridden.should == :environment_value
       end
 
@@ -99,10 +121,10 @@ class ConfigTest < MiniTest::Spec
       should "dynamically switch values according to the configured env" do
         @config.over_ridden.should == :development_value
         config = Config.new(:production)
-        config.load(Spontaneous.root / 'config')
+        config.load(@config_dir)
         config.over_ridden.should == :production_value
         config = Config.new(:staging)
-        config.load(Spontaneous.root / 'config')
+        config.load(@config_dir)
         config.over_ridden.should == :environment_value
       end
 
@@ -131,12 +153,12 @@ class ConfigTest < MiniTest::Spec
       end
 
       teardown do
-        Dir.chdir(@pwd)
       end
+
       context "Spontaneous :back" do
         setup do
           @config = Config.new(:development, :back)
-          @config.load(Spontaneous.root / 'config')
+          @config.load(@config_dir)
         end
         should "read the correct configuration values" do
           @config.port.should == 9001
@@ -145,7 +167,7 @@ class ConfigTest < MiniTest::Spec
       context "Spontaneous :front" do
         setup do
           @config = Config.new(:development, :front)
-          @config.load(Spontaneous.root / 'config')
+          @config.load(@config_dir)
         end
         should "read the correct configuration values" do
           @config.port.should == 9002