spontaneous 0.2.0.beta4 → 0.2.0.beta5

data/db/migrations/20131104101935_site_must_publish_all.rb

@@ -0,0 +1,14 @@
+# encoding: UTF-8
+
+Sequel.migration do
+  up do
+    add_column  :spontaneous_state, :must_publish_all, TrueClass, default: true
+    # although we want new state instances to set the force publish all flag it
+    # would be wrong for existing sites to have this flag set
+    self[:spontaneous_state].update(must_publish_all: false)
+  end
+
+  down do
+    drop_column :spontaneous_state, :must_publish_all, TrueClass
+  end
+end

data/lib/spontaneous.rb

@@ -69,7 +69,6 @@ module Spontaneous
   autoload :Simultaneous,       "spontaneous/simultaneous"
   autoload :Site,               "spontaneous/site"
   autoload :State,              "spontaneous/state"
-  autoload :Storage,            "spontaneous/storage"
   autoload :Style,              "spontaneous/style"
   autoload :Utils,              "spontaneous/utils"
 

data/lib/spontaneous/box_style.rb

@@ -5,12 +5,6 @@ module Spontaneous
   class BoxStyle < Style
     attr_reader :box
 
-    def self.excluded_classes
-      [Spontaneous::Box, Spontaneous::Content::Box].tap do |classes|
-        classes.push(::Box) if defined?(::Box)
-      end
-    end
-
     def self.to_directory_name(klass)
       return nil if excluded_classes.include?(klass)
       super
@@ -25,7 +19,7 @@ module Spontaneous
       nil
     end
 
-    def try_supertype_styles
+    def try_supertype_styles(renderer)
       []
     end
 
@@ -64,9 +58,21 @@ module Spontaneous
 
     def box_directory_names
       box_class = box._prototype.box_base_class
-      box_supertypes = [box_class].concat(class_ancestors(box_class)).reject { |type| self.class.excluded_classes.include?(type) }
+      box_supertypes = [box_class].concat(class_ancestors(box_class)).reject { |type| excluded_classes.include?(type) }
       return [nil] if box_supertypes.empty?
-      box_supertypes.map { |type| self.class.to_directory_name(type) }
+      box_supertypes.map { |type| to_directory_name(type) }
+    end
+
+    def excluded_classes
+      model = box.model.content_model
+      [Spontaneous::Box, model::Box].tap do |classes|
+        classes.push(::Box) if defined?(::Box)
+      end
+    end
+
+    def to_directory_name(klass)
+      return nil if excluded_classes.include?(klass)
+      super
     end
 
     def box_directory_paths(name)

data/lib/spontaneous/capistrano/deploy.rb

@@ -15,7 +15,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :spot do
     task :symlink_cache do
       cache_dir = File.join(latest_release, 'cache')
-      run "mkdir #{cache_dir}; ln -s #{deploy_to}/media #{cache_dir}; ln -s #{deploy_to}/revisions #{cache_dir}; ln -s #{deploy_to}/uploadcache #{cache_dir}/tmp"
+      run "if [[ -d #{cache_dir} ]]; then rm -r #{cache_dir}; fi ; mkdir #{cache_dir}; ln -s #{deploy_to}/media #{cache_dir}; ln -s #{deploy_to}/revisions #{cache_dir}; ln -s #{deploy_to}/uploadcache #{cache_dir}/tmp"
     end
 
     task :symlink_application do
@@ -31,6 +31,16 @@ Capistrano::Configuration.instance(:must_exist).load do
     task :bundle_assets do
       run "cd #{release_path} && ./bin/spot assets compile --destination=#{release_path}"
     end
+
+    task :migrate, :roles => :db do
+      spot_env = fetch(:spot_env, "production")
+      run "cd #{release_path} && SPOT_ENV=#{spot_env} ./bin/spot migrate"
+    end
+
+    task :content_clean, :roles => :db do
+      spot_env = fetch(:spot_env, "production")
+      run "cd #{release_path} && SPOT_ENV=#{spot_env} ./bin/spot content clean"
+    end
   end
 
   namespace :deploy do
@@ -44,4 +54,6 @@ Capistrano::Configuration.instance(:must_exist).load do
   after 'deploy:finalize_update', 'spot:symlink_tmpdir'
   after 'bundle:install', 'spot:symlink_application'
   after 'bundle:install', 'spot:bundle_assets'
+  after 'bundle:install', 'spot:migrate'
+  after 'bundle:install', 'spot:content_clean'
 end

data/lib/spontaneous/change.rb

@@ -2,22 +2,20 @@
 
 module Spontaneous
   class Change
-
-
     class << self
-      def outstanding
-        outstanding = { :published_revision => Spontaneous::Site.published_revision,
-          :changes => unpublished_changes }
+      def outstanding(site)
+        outstanding = { :published_revision => site.published_revision, :must_publish_all => site.must_publish_all?,
+          :changes => unpublished_changes(site) }
         outstanding[:first_publish] = true if outstanding[:published_revision] == 0
         outstanding
       end
 
-      def unpublished_changes
-        changes = unpublished_pages.map { |page| Change.new(page) }
+      def unpublished_changes(site)
+        changes = unpublished_pages(site).map { |page| Change.new(page) }
       end
 
-      def unpublished_pages
-        Spontaneous::Content::Page.filter { (modified_at > last_published_at) | {:first_published_at => nil} }.order(:modified_at.desc).all
+      def unpublished_pages(site)
+        site.model::Page.filter { (modified_at > last_published_at) | {:first_published_at => nil} }.order(Sequel.desc(:modified_at)).all
       end
 
       def include_dependencies(page_list)
@@ -26,9 +24,9 @@ module Spontaneous
         pages
       end
 
-      def export
+      def export(site)
         exported = {}
-        outstanding.each do |k, v|
+        outstanding(site).each do |k, v|
           case k
           when :changes
             exported[k] = v.map { |change_set| change_set.export }
@@ -39,8 +37,8 @@ module Spontaneous
         exported
       end
 
-      def serialise_http(user = nil)
-        Spontaneous.serialise_http(export)
+      def serialise_http(site)
+        Spontaneous.serialise_http(export(site))
       end
     end
 

data/lib/spontaneous/cli.rb

@@ -66,6 +66,7 @@ module Spontaneous
       def boot!
         begin
           require File.expand_path('config/boot.rb')
+          Spontaneous::Site.instance
         rescue Spontaneous::SchemaModificationError => error
           fix_schema(error)
         end
@@ -94,6 +95,7 @@ module Spontaneous
     autoload :Site,     "spontaneous/cli/site"
     autoload :Sync,     "spontaneous/cli/sync"
     autoload :User,     "spontaneous/cli/user"
+    autoload :Content,  "spontaneous/cli/content"
 
     class Root < ::Thor
       register Spontaneous::Cli::Console,  "console",  "console",           "Gives you console access to the current site"
@@ -104,11 +106,12 @@ module Spontaneous
       register Spontaneous::Cli::Init,     "init",     "init",              "Creates databases and initialises a new Spontaneous site"
       register Spontaneous::Cli::Server,   "server",   "server [ACTION]",   "Launch development server(s)"
       register Spontaneous::Cli::Server,   "s",   "s [ACTION]",   "Launch development server(s)"
-      register Spontaneous::Cli::Media,    "media",    "media [ACTION]",    "Manage site media"
-      register Spontaneous::Cli::Sync,     "sync",     "sync [DIRECTION]",  "Sync database and media to and from the production server"
+      # register Spontaneous::Cli::Media,    "media",    "media [ACTION]",    "Manage site media"
+      # register Spontaneous::Cli::Sync,     "sync",     "sync [DIRECTION]",  "Sync database and media to and from the production server"
       register Spontaneous::Cli::Migrate,  "migrate",  "migrate",           "Runs Spontaneous migrations"
       register Spontaneous::Cli::Assets,   "assets",   "assets [ACTION]",   "Manage Spontaneous assets"
       register Spontaneous::Cli::Fields,   "fields",   "fields [ACTION]",   "Manage Spontaneous fields"
+      register Spontaneous::Cli::Content,  "content",  "content [ACTION]",   "Manage Spontaneous content"
 
       desc :browse, "Launces a browser pointing to the current development CMS"
       def browse

data/lib/spontaneous/cli/assets.rb

@@ -11,7 +11,13 @@ module Spontaneous
 
       method_option :destination, :type => :string, :aliases => "-d", :required => true, :desc => "Compile assets into DESTINATION"
 
-      def compile
+      def compile(*args)
+        compile_assets
+      end
+
+      protected
+
+      def compile_assets
         prepare(:compile)
         # options[:mode] = :console
         # Find path to install of Spontaneous using bundler and then

data/lib/spontaneous/cli/console.rb

@@ -11,7 +11,13 @@ module ::Spontaneous::Cli
     default_task :open
 
     desc "open", "Gives you console access to the current site"
-    def open
+    def open(*args)
+      open_console
+    end
+
+    protected
+
+    def open_console
       prepare! :console
 
       ARGV.clear

data/lib/spontaneous/cli/content.rb

@@ -0,0 +1,35 @@
+module Spontaneous
+  module Cli
+    class Content < ::Thor
+      include Spontaneous::Cli::TaskUtils
+
+      namespace :content
+
+      desc "clean", "Cleans up the content after schema migration(s) by deleting instances belonging to deleted types and their children"
+
+      def clean(*args)
+        clean_content
+      end
+
+      protected
+
+      def clean_content
+        prepare!(:clean)
+        say "==> Cleaning content table..."
+        say ""
+        result = Spontaneous::Model::Action::Clean.run(Spontaneous::instance)
+        say "----> Deleted ", :bold
+        say "#{result[:invalid]} ", [:red, :bold]
+        say "entries with invalid schema types"
+        say "----> Deleted ", :bold
+        say "#{result[:orphans]} ", [:red, :bold]
+        say "orphaned entries"
+        say ""
+        if result[:publish]
+          say("====> Site is configured to force a full publish", [:red, :bold])
+          say ""
+        end
+      end
+    end
+  end
+end

data/lib/spontaneous/cli/fields.rb

@@ -11,8 +11,9 @@ module Spontaneous
       method_option :fields, :type => :array, :desc => "List of field IDs to update"
       def update
         prepare! :update, :console
-        fields = Spontaneous::Field.find(*options.fields)
-        updater = Spontaneous::Field::Update::Immediate.new(fields)
+        site = Spontaneous::Site.instance
+        fields = Spontaneous::Field.find(site.model, *options.fields)
+        updater = Spontaneous::Field::Update::Immediate.new(site, fields)
         updater.run
         send_completion_event(updater)
       end

data/lib/spontaneous/cli/generate.rb

@@ -18,8 +18,7 @@ module Spontaneous::Cli
     method_option :password, :type => :string, :default => "", :aliases => "-p", :desc => "Database admin user"
 
     def site(*args)
-      # require "spontaneous"
-      ::Spontaneous::Generators::Site.start(ARGV.drop_while { |e| %w(generate site).include?(e) })
+      generate_site(args)
     end
 
     def method_missing(method, *args)
@@ -32,6 +31,10 @@ module Spontaneous::Cli
         super
       end
     end
+
+    def generate_site(args)
+      ::Spontaneous::Generators::Site.start(args.drop_while { |e| %w(generate site).include?(e) })
+    end
   end # Generate
 end # Spontaneous::Cli
 

data/lib/spontaneous/cli/server.rb

@@ -23,7 +23,7 @@ module Spontaneous
       # method_option :adapter, :type => :string,  :aliases => "-a", :desc => "Rack Handler (default: autodetect)"
       method_option :host, :type => :string,  :aliases => "-h", :desc => "Bind to HOST address"
       method_option :port, :type => :numeric, :aliases => "-p", :desc => "Use PORT"
-      def front
+      def front(*args)
         start_server(:front)
       end
 
@@ -31,16 +31,14 @@ module Spontaneous
       # method_option :adapter, :type => :string,  :aliases => "-a", :desc => "Rack Handler (default: autodetect)"
       method_option :host, :type => :string,  :aliases => "-h", :desc => "Bind to HOST address"
       method_option :port, :type => :numeric, :aliases => "-p", :desc => "Use PORT"
-      def back
+      def back(*args)
         start_server(:back)
       end
 
       desc "simultaneous", "Launches the Simultaneous server"
       method_option :connection, :type => :string, :aliases => "-c", :desc => "Use CONNECTION"
-      def simultaneous
-        prepare! :start
-        connection = options[:connection] || ::Spontaneous.config.simultaneous_connection
-        exec({"BUNDLE_GEMFILE" => nil}, "#{::Simultaneous.server_binary} -c #{connection} --debug")
+      def simultaneous(*args)
+        start_simultaneous
       end
 
       # A shorter name for the 'simultaneous' task is useful (Foreman appends
@@ -65,8 +63,14 @@ module Spontaneous
       end
 
       def start_server(mode)
-        prepare! :server, mode
-        Spontaneous::Server.run!(options)
+        site = prepare! :server, mode
+        Spontaneous::Server.run!(site, options)
+      end
+
+      def start_simultaneous
+        prepare! :start
+        connection = options[:connection] || ::Spontaneous.config.simultaneous_connection
+        exec({"BUNDLE_GEMFILE" => nil}, "#{::Simultaneous.server_binary} -c #{connection} --debug")
       end
     end
   end

data/lib/spontaneous/cli/site.rb

@@ -117,16 +117,16 @@ module Spontaneous
       method_option :pages, :type => :array, :desc => "List of pages to publish"
       method_option :logfile, :type => :string, :desc => "Location of logfile"
       def publish
-        prepare! :publish
-        Spontaneous::Site.background_mode = :immediate
+        site = prepare! :publish
+        site.background_mode = :immediate
         ::Spontaneous::Logger.setup(:logfile => options.logfile) if options.logfile
-        say "Creating revision #{Spontaneous::Site.revision}", :green, true
+        say "Creating revision #{site.revision}", :green, true
         if options.pages
           say ">  Publishing pages #{options.pages.inspect}", :green, true
-          Spontaneous::Site.publish_pages(options.pages)
+          site.publish_pages(options.pages)
         else
           say ">  Publishing all", :green, true
-          Spontaneous::Site.publish_all
+          site.publish_all
         end
         # Rescue all errors to feed back to the UI
       rescue => e
@@ -136,23 +136,23 @@ module Spontaneous
 
       desc "render", "Re-renders the current content"
       def render
-        prepare! :render
-        Spontaneous::Site.background_mode = :immediate
-        Spontaneous::Site.rerender
+        site = prepare! :render
+        site.background_mode = :immediate
+        site.rerender
       end
 
       desc "revision", "Shows the site status"
       def revision
-        prepare! :revision
-        say "Site is at revision #{Spontaneous::Site.revision}", :green
+        site = prepare! :revision
+        say "Site is at revision #{site.revision}", :green
       end
 
       desc "browse", "Launches a browser pointing to the current development CMS"
       def browse
-        prepare :browse
+        site = prepare :browse
         require 'launchy'
         boot!
-        ::Launchy.open("http://localhost:#{Spontaneous::Site.config.port}/@spontaneous")
+        ::Launchy.open("http://localhost:#{site.config.port}/@spontaneous")
       end
 
       private

data/lib/spontaneous/cli/user.rb

@@ -20,7 +20,32 @@ module ::Spontaneous
       method_option :level, :type => :string, :aliases => "-a",
         :desc => "The user's access level"
 
-      def add
+      def add(*args)
+        add_user
+      end
+
+
+      desc "list", "List the current users"
+      method_option :bare, :type => :boolean, :default => false, :aliases => %w(-b),
+        :desc => "Remove descriptive text from result"
+      def list(*args)
+        list_users
+      end
+
+
+      desc "authenticate LOGIN PASSWORD", "Test a user/password combination"
+      method_option :bare, :type => :boolean, :default => false, :aliases => %w(-b),
+        :desc => "Remove descriptive text from result"
+
+      def authenticate(*args)
+        args.shift if args.first == "authenticate"
+        login, password = args[0], args[1]
+        authenticate_user(login, password)
+      end
+
+      protected
+
+      def add_user
         prepare! :adduser, :console
 
         users = ::Spontaneous::Permissions::User.count
@@ -45,21 +70,12 @@ module ::Spontaneous
         end
       end
 
-
-      desc "list", "List the current users"
-      method_option :bare, :type => :boolean, :default => false, :aliases => %w(-b),
-        :desc => "Remove descriptive text from result"
-      def list
+      def list_users
         prepare! :listusers, :console
         user_table(::Spontaneous::Permissions::User.all, options.bare)
       end
 
-
-      desc "authenticate LOGIN PASSWORD", "Test a user/password combination"
-      method_option :bare, :type => :boolean, :default => false, :aliases => %w(-b),
-        :desc => "Remove descriptive text from result"
-
-      def authenticate(login, password)
+      def authenticate_user(login, password)
         prepare! :user_authenticate, :console
         key = Spontaneous::Permissions::User.authenticate login, password
         if key
@@ -71,8 +87,6 @@ module ::Spontaneous
         end
       end
 
-      protected
-
       def user_table(users, hide_headers = false)
         columns = [:login, :name, :email, :level]
         users = ::Spontaneous::Permissions::User.all.map { |user|