spontaneous 0.2.0.beta9 → 0.2.0.beta10

data/lib/spontaneous/version.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
 module Spontaneous
-  VERSION = "0.2.0.beta9"
+  VERSION = "0.2.0.beta10"
   GEM = false
 end

data/spontaneous.gemspec

@@ -3,13 +3,14 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'spontaneous/version'
 
 Gem::Specification.new do |s|
-  s.required_ruby_version = '>= 2.0.0'
-
   s.name          = 'spontaneous'
   s.version       = Spontaneous::VERSION
+  s.license       = "MIT"
+
+  s.required_ruby_version = '>= 2.0.0'
 
-  s.summary       = "Spontaneous is a next-generation Ruby CMS"
-  s.description   = "Spontaneous is a next-generation Ruby CMS"
+  s.summary       = "Next-generation Ruby CMS and web framework."
+  s.description   = "Spontaneous is a content management framework that allows the easy development of sophisticated & beautiful websites with powerful developer tools & an elegant editing interface."
 
   s.authors       = ['Garry Hill']
   s.email         = 'garry@spontaneous.io'
@@ -20,12 +21,6 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^test/})
   s.require_paths = %w[lib]
 
-  s.rdoc_options  = ['--charset=UTF-8']
-  s.extra_rdoc_files = %w[LICENSE]
-
-  # s.signing_key   = '/Volumes/Keys/rubygems-garry-magnetised-net-private_key.pem'
-  # s.cert_chain    = ['gem-public_cert.pem']
-
   s.add_dependency('activesupport',   ['~> 4.0'])
   s.add_dependency('coffee-script',   ['~> 2.2'])
   s.add_dependency('bcrypt',          ['~> 3.1'])
@@ -46,14 +41,14 @@ Gem::Specification.new do |s|
   s.add_dependency('sequel',          ['~> 4.8'])
   s.add_dependency('simultaneous',    ['~> 0.4.2'])
   s.add_dependency('sinatra',         ['~> 1.3'])
-  s.add_dependency('skeptick',        ['~> 0.1'])
+  s.add_dependency('skeptick',        ['~> 0.1.1'])
   s.add_dependency('sprockets',       ['~> 2.9'])
   s.add_dependency('stringex',        ['=  1.3'])
   s.add_dependency('thin',            ['~> 1.2'])
   s.add_dependency('thor',            ['~> 0.16'])
   s.add_dependency('uglifier',        ['~> 1.3'])
   s.add_dependency('xapian-fu',       ['~> 1.5'])
-  s.add_dependency('yajl-ruby',       ['~> 1.1'])
+  s.add_dependency('oj',              ['~> 2.11'])
 
   s.add_development_dependency('minitest',  ['~> 4.7.0'])
   s.add_development_dependency('minitest-colorize', ['~> 0.0.5'])

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

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

data/test/functional/test_application.rb

@@ -196,4 +196,19 @@ describe "Application" do
       Spontaneous::Rack.port.must_equal 3002
     end
   end
+
+  describe 'ENV["DATABASE_URL"]' do
+    before do
+      ENV['DATABASE_URL'] = 'sqlite:///production.db'
+      @site = Spontaneous.init(:root => site_root, :mode => :front, :environment => :production)
+    end
+
+    after do
+      ENV.delete('DATABASE_URL')
+    end
+
+    it 'should override settings in database.yml' do
+      @site.config.db.must_equal 'sqlite:///production.db'
+    end
+  end
 end

data/test/functional/test_cli.rb

@@ -16,18 +16,124 @@ describe "CLI" do
     end
   end
 
-  def set_expectation(method, cmd = cmd)
+  def set_expectation(method, _cmd = cmd)
     quietly do
-      cmd.any_instance.expects(method)
+      _cmd.any_instance.expects(method)
     end
   end
 
   describe "Init" do
     let(:cmd) { cli::Init }
+
+    after do
+      teardown_site
+    end
+
     it "maps 'spot init' to Init#init" do
-      set_expectation(:initialize_size)
+      set_expectation(:initialize_site)
       run_command(["init"])
     end
+
+    describe 'DatabaseInitializer' do
+      let(:site) { setup_site }
+      let(:create_user) { false }
+      let(:env) { :development }
+      let(:cli) { mock }
+
+      def yaml_config(adapter)
+        { production: {adapter: adapter, database: 'spontaneous_db_production'}, development: {adapter: adapter, database: 'spontaneous_db'}, test: {adapter: adapter, database: 'spontaneous_db_test'} }
+      end
+
+      def with_yaml_config(adapter)
+        begin
+          site.stubs(:db_config_file).returns(yaml_config(adapter))
+          yield
+        ensure
+          site.unstub(:db_config_file)
+        end
+      end
+
+      def with_db_url(url)
+        begin
+          ENV['DATABASE_URL'] = url
+          yield
+        ensure
+          ENV.delete 'DATABASE_URL'
+        end
+      end
+
+      def init
+        Spontaneous::Cli::Init::DatabaseInitializer.new(cli, site)
+      end
+
+      it "runs a database initializer for development & test environments in development mode" do
+        init.database_environments(:development).must_equal [:development, :test]
+      end
+
+      it "runs a database initializer for only production in production mode" do
+        init.database_environments(:production).must_equal [:production]
+      end
+
+      describe 'DATABASE_URL' do
+        it "gets the db config from the ENV" do
+          with_db_url('mysql://localhost/something') do
+            init.database_config(:development).must_equal('mysql://localhost/something')
+            init.database_config(:test).must_equal('mysql://localhost/something')
+          end
+        end
+
+        it 'uses the right db initialization class for the adapter' do
+          with_db_url('mysql2://localhost/something') do
+            init.database_initializer(:development).must_be_instance_of Spontaneous::Cli::Init::MySQL
+          end
+          with_db_url('postgres://localhost/something') do
+            init.database_initializer(:development).must_be_instance_of Spontaneous::Cli::Init::Postgresql
+          end
+          with_db_url('sqlite://localhost/something') do
+            init.database_initializer(:development).must_be_instance_of Spontaneous::Cli::Init::Sqlite
+          end
+        end
+
+        it 'instantiates & calls #run on a db initializer for each env' do
+          with_db_url('sqlite://localhost/something') do
+            db_initializer = mock
+            db_initializer.expects(:run).once
+            Spontaneous::Cli::Init::Sqlite.expects(:new).with(cli, instance_of(Sequel::SQLite::Database)).returns(db_initializer).once
+            init.run(:development)
+          end
+        end
+      end
+
+      describe 'YAML' do
+        it "gets db settings from a config file if no ENV setting" do
+          with_yaml_config('postgres') do
+            init.database_config(:development).must_equal({adapter: 'postgres', database: 'spontaneous_db'})
+            init.database_config(:test).must_equal({adapter: 'postgres', database: 'spontaneous_db_test'})
+          end
+        end
+
+        it 'uses the right db initialization class for the adapter' do
+          with_yaml_config('mysql2') do
+            init.database_initializer(:development).must_be_instance_of Spontaneous::Cli::Init::MySQL
+          end
+          with_yaml_config('postgres') do
+            init.database_initializer(:development).must_be_instance_of Spontaneous::Cli::Init::Postgresql
+          end
+          with_yaml_config('sqlite') do
+            init.database_initializer(:development).must_be_instance_of Spontaneous::Cli::Init::Sqlite
+          end
+        end
+
+        it 'instantiates & calls #run on a db initializer for each env' do
+          with_yaml_config('mysql2') do
+            db_initializer = mock
+            db_initializer.expects(:run).once
+            Spontaneous::Cli::Init::MySQL.expects(:new).with(cli, instance_of(Sequel::Mysql2::Database)).returns(db_initializer).once
+            init.run(:production)
+          end
+        end
+      end
+    end
   end
 
   describe "Console" do

data/test/functional/test_front.rb

@@ -15,6 +15,17 @@ describe "Front" do
     Spontaneous::Output.write_compiled_scripts = true
 
 
+    class ::PageController < S::Rack::PageController
+      # Define a per-site base controller for all controller classes here so
+      # that we can test it's use later on.
+      # If I define it only in the test where it's used then it's too late as
+      # the controller hierarchy will have already been built upon some other
+      # base class.
+      #
+      # (Another argument for replacing these [start..finish] blocks with
+      # [before..after] ones)
+    end
+
     site = setup_site(site_root)
     let(:site) { site  }
     S::State.delete
@@ -75,6 +86,11 @@ describe "Front" do
       layout { "${ path }.${ __format }" }
     end
 
+    class ::TakeItPage < ::Page
+      layout(:html) { "take it ${id} {{ splat }}" }
+      box :pages
+    end
+
     root = ::SitePage.create
     about = ::SitePage.create(:slug => "about", :uid => "about")
     feed = ::FeedPage.create(:slug => "feed", :uid => "feed")
@@ -83,6 +99,8 @@ describe "Front" do
     dynamic_request_params = ::DynamicRequestParams.create(slug: "dynamic-request-params", uid: "dynamic_request_params")
     dynamic_render_params = ::DynamicRenderParams.create(slug: "dynamic-render-params", uid: "dynamic_render_params")
     commentable = ::CommentablePage.create(slug:"commentable", uid: "commentable")
+    take_it =  TakeItPage.create(slug: 'takeit', uid: 'takeit')
+    take_it_again =  TakeItPage.create(slug: 'again', uid: 'again')
     root.pages << about
     root.pages << feed
     root.pages << news
@@ -90,12 +108,17 @@ describe "Front" do
     root.pages << dynamic_render_params
     root.pages << static
     root.pages << commentable
+    root.pages << take_it
+    take_it.pages << take_it_again
     root.save
+    take_it.save
 
     let(:root_id) { root.id }
     let(:about_id) { about.id }
     let(:feed_id) { feed.id }
     let(:news_id) { news.id }
+    let(:take_it_id) { take_it.id }
+    let(:take_it_again_id) { take_it_again.id }
     let(:dynamic_request_params_id) { dynamic_request_params.id }
     let(:dynamic_render_params_id) { dynamic_render_params.id }
     let(:static_id) { static.id }
@@ -111,7 +134,7 @@ describe "Front" do
   end
 
   finish do
-    [:SitePage, :StaticPage, :DynamicRequestParams, :DynamicRenderParams, :CommentablePage, :FeedPage].each do |const|
+    [:SitePage, :StaticPage, :DynamicRequestParams, :DynamicRenderParams, :CommentablePage, :FeedPage, :TakeItPage, :PageController].each do |const|
       Object.send(:remove_const, const) rescue nil
     end
     if defined?(Content)
@@ -128,6 +151,8 @@ describe "Front" do
   let(:about) { Content[about_id] }
   let(:feed) { Content[feed_id] }
   let(:news) { Content[news_id] }
+  let(:take_it) { Content[take_it_id] }
+  let(:take_it_again) { Content[take_it_again_id] }
   let(:dynamic_request_params) { Content[dynamic_request_params_id] }
   let(:dynamic_render_params) { Content[dynamic_render_params_id] }
   let(:static) { Content[static_id] }
@@ -596,7 +621,7 @@ describe "Front" do
 
       after do
         Object.send(:remove_const, :SubPage) rescue nil
-        CommentablePage.instance_variable_set(:@request_blocks, {})
+        CommentablePage.instance_variable_set(:@controllers, nil)
         CommentablePage.send(:remove_const, :StatusController) rescue nil
         CommentablePage.send(:remove_const, :TestController) rescue nil
         CommentablePage.send(:remove_const, :Test2Controller) rescue nil
@@ -711,10 +736,8 @@ describe "Front" do
 
       describe "overriding base controller class" do
         before do
-          class ::PageController < S::Rack::PageController
-            get '/nothing' do
-              'Something'
-            end
+          ::PageController.get '/nothing' do
+            'Something'
           end
 
           CommentablePage.controller :drummer do
@@ -724,10 +747,6 @@ describe "Front" do
           end
         end
 
-        after do
-          Object.send(:remove_const, :PageController)
-        end
-
         it "affect all controller actions" do
           get "/commentable/@drummer/nothing"
           assert last_response.ok?, "Expected 200 got #{last_response.status}"
@@ -736,6 +755,85 @@ describe "Front" do
       end
     end
 
+    describe 'wildcard paths' do
+      let(:page) { take_it }
+      let(:again) { take_it_again }
+
+      after do
+        root.class.instance_variable_set(:@controllers, nil)
+        TakeItPage.instance_variable_set(:@controllers, nil)
+      end
+
+      it 'renders a url that resolves to a page accepting the path' do
+        TakeItPage.controller do
+          get '*' do
+            render splat: params[:splat].first
+          end
+        end
+        [
+          ["/something", page],
+          ["/something/else", page],
+          ["/really/something/else/entirely", page],
+          ["/something/else/entirely", again]
+        ].each do |path, expected|
+          get "#{expected.path}#{path}"
+          assert last_response.ok?, "Expected 200 got #{last_response.status}"
+          last_response.body.must_equal "take it #{expected.id} #{path}"
+        end
+      end
+
+      it 'returns 404 if the requested path doesn’t match the controller’s route' do
+        TakeItPage.controller do
+          get '/womble/?:where?' do
+            render splat: params[:where]
+          end
+        end
+        get "#{page.path}/womble/around"
+        assert last_response.ok?, "Expected 200 got #{last_response.status}"
+        last_response.body.must_equal "take it #{page.id} around"
+
+        get "#{page.path}/womble"
+        assert last_response.ok?, "Expected 200 got #{last_response.status}"
+        last_response.body.must_equal "take it #{page.id} "
+
+        get "#{page.path}/wimble/around"
+        assert last_response.status == 404
+      end
+
+      it 'returns 404 if the controller is only configured to match the root' do
+        TakeItPage.controller do
+          get do
+            render splat: 'root'
+          end
+        end
+        get page.path
+        assert last_response.ok?, "Expected 200 got #{last_response.status}"
+        last_response.body.must_equal "take it #{page.id} root"
+
+        get "#{page.path}/womble"
+        assert last_response.status == 404, "Expected 404 but got #{last_response.status}"
+      end
+
+      it 'can fall back to controllers defined on the site homepage' do
+        root.class.controller do
+          get '/' do
+            "ow"
+          end
+          get '/slimy/:who' do
+            "<#{params[:who]}>"
+          end
+        end
+
+        get '/slimy/monster'
+        assert last_response.ok?, "Expected 200 got #{last_response.status}"
+        last_response.body.must_equal "<monster>"
+
+        get '/'
+        assert last_response.ok?, "Expected 200 got #{last_response.status}"
+        last_response.body.must_equal "ow"
+      end
+    end
+
     describe "Static files" do
       before do
         @revision_dir = Spontaneous.instance.revision_dir(1)

data/test/test_helper.rb

@@ -35,6 +35,9 @@ else
   false
 end
 
+require 'mysql2'
+require 'pg'
+require 'sqlite3'
 
 connection_string = \
 case ENV["SPOT_ADAPTER"]
@@ -44,7 +47,6 @@ when "postgres"
     Jdbc::Postgres.load_driver
     "jdbc:postgresql:///spontaneous2_test"
   else
-    require 'pg'
     "postgres:///spontaneous2_test"
   end
 when "mysql"
@@ -53,7 +55,6 @@ when "mysql"
     Jdbc::MySQL.load_driver
     "jdbc:mysql://localhost/spontaneous2_test?user=root"
   else
-    require 'mysql2'
     "mysql2://root@localhost/spontaneous2_test"
   end
 when "sqlite"
@@ -62,7 +63,6 @@ when "sqlite"
     Jdbc::SQLite3.load_driver
     "jdbc:sqlite::memory:"
   else
-    require 'sqlite3'
     "sqlite:/" # in-memory
   end
 end

data/test/unit/fields/test_boolean_fields.rb

@@ -0,0 +1,80 @@
+# encoding: UTF-8
+
+require File.expand_path('../../../test_helper', __FILE__)
+
+describe "Boolean fields" do
+
+  before do
+    @site = setup_site
+    @now = Time.now
+    stub_time(@now)
+    Spontaneous::State.delete
+    @site.background_mode = :immediate
+    @content_class = Class.new(::Piece)
+    @prototype = @content_class.field :switch
+    @content_class.stubs(:name).returns("ContentClass")
+    @instance = @content_class.create
+    @field = @instance.switch
+  end
+
+  it "has a distinct editor class" do
+    @prototype.instance_class.editor_class.must_equal "Spontaneous.Field.Boolean"
+  end
+
+  it "adopts any field called 'switch'" do
+    assert @field.is_a?(Spontaneous::Field::Boolean), "Field should be an instance of Boolean but instead has the following ancestors #{ @prototype.instance_class.ancestors }"
+  end
+
+  it "defaults to true" do
+    @field.value.must_equal true
+    @field.value(:html).must_equal "Yes"
+    @field.value(:string).must_equal "Yes"
+  end
+
+  it "changes string value to 'No'" do
+    @field.value = false
+    @field.value(:string).must_equal "No"
+  end
+
+  it "flags itself as 'empty' if false" do # I think...
+    @field.empty?.must_equal false
+    @field.value = false
+    @field.empty?.must_equal true
+  end
+
+  it "uses the given state labels" do
+    prototype = @content_class.field :boolean, true: "Enabled", false: "Disabled"
+    field = prototype.to_field(@instance)
+    field.value.must_equal true
+    field.value(:string).must_equal "Enabled"
+    field.value = false
+    field.value(:string).must_equal "Disabled"
+    field.value(:html).must_equal "Disabled"
+  end
+
+  it "uses the given default" do
+    prototype = @content_class.field :boolean, default: false, true: "On", false: "Off"
+    field = prototype.to_field(@instance)
+    field.value.must_equal false
+    field.value(:string).must_equal "Off"
+  end
+
+  it "returns the string value from #to_s" do
+    prototype = @content_class.field :boolean, default: false, true: "On", false: "Off"
+    field = prototype.to_field(@instance)
+    field.to_s.must_equal "Off"
+  end
+
+  it "has shortcut accessors" do
+    state = @field.value(:boolean)
+    @field.on?.must_equal state
+    @field.checked?.must_equal state
+    @field.enabled?.must_equal state
+  end
+
+  it "exports the labels to the interface" do
+    prototype = @content_class.field :boolean, default: false, true: "Yes Please", false: "No Thanks"
+    exported = prototype.instance_class.export(nil)
+    exported.must_equal({:labels=>{:true=>"Yes Please", :false=>"No Thanks"}})
+  end
+end