spontaneous 0.2.0.beta5 → 0.2.0.beta6

data/lib/spontaneous/tasks/database.rake

@@ -11,25 +11,20 @@ end
 namespace :db do
   desc "Make a dump of the current database"
   task :dump do
-    dumpfilename = ENV['dumpfile']
-    if dumpfilename.nil?
-      dumpfilename = "#{Time.now.to_i}.mysql.gz"
-    end
-    dump_file = "tmp/#{dumpfilename}"
     dumper = Spontaneous::Utils::Database.dumper_for_database
-    # Spontaneous::Cli::Site::MySQL.new(Spontaneous.database)
-    dumper.dump(dump_file)
+    dumpfilename = ENV['dumpfile'] || dumper.dumpfilename
+    dumpfile = "tmp/#{dumpfilename}"
+    dumper.dump(dumpfile)
   end
 
   desc "Load a database dump into the local database"
   task :load do
     dumpfile = ENV['dumpfile']
+    dumper = Spontaneous::Utils::Database.dumper_for_database
     if dumpfile.nil?
-      $stderr.puts "Usage: rake spot:database:load dumpfile=/path/to/dump.mysql.gz"
+      $stderr.puts "Usage: rake spot:database:load dumpfile=/path/to/dump.#{dumper.name}.gz"
       exit 1
     end
-    dumper = Spontaneous::Utils::Database.dumper_for_database
-    # dumper = Spontaneous::Cli::Site::MySQL.new(Spontaneous.database)
     dumper.load(dumpfile)
   end
 end

data/lib/spontaneous/utils/database/mysql_dumper.rb

@@ -72,10 +72,14 @@ module Spontaneous
           [database_name, revision_archive_table].join(".")
         end
 
+        def dumpfilename(time = Time.now)
+          "#{time.strftime('%Y%m%d%H%M%S')}.#{name}.gz"
+        end
+
         # The whole point of this table's existance is to reduce the
         # size of the db dump for syncing
         def revision_archive_table
-          Spontaneous::Content.archive_dataset.first_source.to_s
+          Spontaneous::instance.model.archive_dataset.first_source.to_s
         end
 
         def option(option, add_if_nil=false)

data/lib/spontaneous/version.rb

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

data/spontaneous.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'spontaneous/version'
 
 Gem::Specification.new do |s|
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.0.0'
 
   s.name          = 'spontaneous'
   s.version       = Spontaneous::VERSION
@@ -28,8 +28,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency('activesupport',   ['~> 4.0'])
   s.add_dependency('coffee-script',   ['~> 2.2'])
-  s.add_dependency('bcrypt-ruby',     ['~> 3.0'])
-  s.add_dependency('bundler',         ['>  1.0'])
+  s.add_dependency('bcrypt',          ['~> 3.1'])
+  s.add_dependency('bundler',         ['~> 1.5'])
   s.add_dependency('cutaneous',       ['~> 0.2'])
   s.add_dependency('erubis',          ['~> 2.6'])
   s.add_dependency('fog',             ['~> 1.17'])
@@ -57,6 +57,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('minitest',  ['~> 4.7.0'])
   s.add_development_dependency('minitest-colorize', ['~> 0.0.5'])
+  s.add_development_dependency('timecop',   ['~> 0.7'])
   s.add_development_dependency('mocha',     ['~> 0.13.2'])
   s.add_development_dependency('rack-test', ['~> 0.5'])
 end

data/test/fixtures/example_application/config/initializers/initializer1.rb

@@ -0,0 +1 @@
+INITIALIZER1_RUN=true

data/test/fixtures/example_application/config/initializers/initializer2.rb

@@ -0,0 +1 @@
+INITIALIZER2_RUN=true

data/test/fixtures/example_application/config/initializers/publishing.rb

@@ -0,0 +1,13 @@
+
+Site.output_store(:File, dir: Site.revision_root)
+
+Site.publish do
+  run :create_revision_directory
+  run :render_revision
+  run :generate_search_indexes
+  run :copy_static_files
+  run :generate_rackup_file
+  run :activate_revision
+  run :write_revision_file
+  run :archive_old_revisions
+end

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

@@ -6,7 +6,9 @@
 :uid: home
 :path: /
 :hidden: false
+:private: false
 :is_page: true
+:page_id: <%= @root.id %>
 :slug: ""
 :type_id: <%= SerialisedPage.schema_id.to_s %>
 :fields:
@@ -22,7 +24,7 @@
   :id: <%= SerialisedPage.field_prototypes[:direction].schema_id.to_s %>
   :name: direction
 
-- :unprocessed_value: /images/home.jpg
+- :unprocessed_value: "[\"/images/home.jpg\",\"\"]"
   :version: 1
   :id: <%= SerialisedPage.field_prototypes[:thumbnail].schema_id.to_s %>
   :name: thumbnail
@@ -65,7 +67,7 @@
       :id: <%= SerialisedPiece.field_prototypes[:date].schema_id.to_s %>
       :name: date
 
-    - :unprocessed_value: ""
+    - :unprocessed_value: "[\"\",\"\"]"
       :version: 0
       :id: <%= SerialisedPiece.field_prototypes[:image].schema_id.to_s %>
       :name: image
@@ -100,9 +102,11 @@
         :uid: about
         :style: <%= @sitting_style.to_s %>
         :hidden: true
+        :private: false
         :is_page: true
         :slug: about
         :id: <%= @child.id %>
+        :page_id: <%= @child.id %>
         :type_id: <%= SerialisedPage.schema_id.to_s %>
         :path: /about
         :depth: 2
@@ -123,7 +127,7 @@
           :id: <%= SerialisedPage.field_prototypes[:direction].schema_id.to_s %>
           :name: direction
 
-        - :unprocessed_value: /images/thumb.jpg
+        - :unprocessed_value: "[\"/images/thumb.jpg\",\"\"]"
           :version: 1
           :id: <%= SerialisedPage.field_prototypes[:thumbnail].schema_id.to_s %>
           :name: thumbnail
@@ -135,6 +139,7 @@
 
     :is_page: false
     :id: <%= @piece1.id %>
+    :page_id: <%= @root.id %>
   - :type: SerialisedPiece
     :type_id: <%= SerialisedPiece.schema_id.to_s %>
     :label: label2
@@ -162,7 +167,7 @@
       :id: <%= SerialisedPiece.field_prototypes[:date].schema_id.to_s %>
       :name: date
 
-    - :unprocessed_value: ""
+    - :unprocessed_value: "[\"\",\"\"]"
       :version: 0
       :id: <%= SerialisedPiece.field_prototypes[:image].schema_id.to_s %>
       :name: image
@@ -183,6 +188,7 @@
     :hidden: false
     :is_page: false
     :id: <%= @piece2.id %>
+    :page_id: <%= @root.id %>
     :boxes:
     - :entries: []
 

data/test/functional/test_application.rb

@@ -56,6 +56,16 @@ describe "Application" do
     end
   end
 
+
+  describe "initializers" do
+    it "all run" do
+      defined?(INITIALIZER1_RUN).must_equal "constant"
+      INITIALIZER1_RUN.must_equal true
+      defined?(INITIALIZER2_RUN).must_equal "constant"
+      INITIALIZER2_RUN.must_equal true
+    end
+  end
+
   describe "back, development" do
 
     before do

data/test/functional/test_back.rb

@@ -896,7 +896,7 @@ describe "Back" do
 
       it "adds an alias to a box" do
         home.featured_jobs.contents.length.must_equal 0
-        auth_post "/@spontaneous/alias/#{home.id}/#{HomePage.boxes[:featured_jobs].schema_id.to_s}", 'alias_id' => LinkedJob.schema_id.to_s, 'target_id' => Job.first.id, "position" => 0
+        auth_post "/@spontaneous/alias/#{home.id}/#{HomePage.boxes[:featured_jobs].schema_id.to_s}", 'alias_id' => LinkedJob.schema_id.to_s, 'target_ids' => Job.first.id, "position" => 0
         assert last_response.ok?, "Recieved #{last_response.status} not 200"
         last_response.content_type.must_equal "application/json;charset=utf-8"
         home.reload
@@ -908,7 +908,25 @@ describe "Back" do
           :position => 0,
           :entry => home.featured_jobs.contents.first.export(user)
         }
-        Spot::JSON.parse(last_response.body).must_equal required_response
+        Spot::JSON.parse(last_response.body).first.must_equal required_response
+      end
+
+      it "allows for adding multiple aliases to a box" do
+        home.featured_jobs.contents.length.must_equal 0
+        jobs = Job.all[0..1]
+        auth_post "/@spontaneous/alias/#{home.id}/#{HomePage.boxes[:featured_jobs].schema_id.to_s}", 'alias_id' => LinkedJob.schema_id.to_s, 'target_ids' => jobs.map(&:id), "position" => 0
+        assert last_response.ok?, "Recieved #{last_response.status} not 200"
+        home.reload
+        home.featured_jobs.contents.length.must_equal 2
+        home.featured_jobs.each_with_index do |a, i|
+          assert a.alias?
+          a.target.must_equal jobs[i]
+        end
+        response = Spot::JSON.parse(last_response.body)
+        response[0][:position].must_equal 0
+        response[1][:position].must_equal 1
+        response[0][:entry].must_equal home.featured_jobs[0].export(user)
+        response[1][:entry].must_equal home.featured_jobs[1].export(user)
       end
 
       it "adds an alias to a box at any position" do
@@ -917,7 +935,7 @@ describe "Back" do
         home.featured_jobs << Job.new
         home.save.reload
         home.featured_jobs.contents.length.must_equal 3
-        auth_post "/@spontaneous/alias/#{home.id}/#{HomePage.boxes[:featured_jobs].schema_id.to_s}", 'alias_id' => LinkedJob.schema_id.to_s, 'target_id' => Job.first.id, "position" => 2
+        auth_post "/@spontaneous/alias/#{home.id}/#{HomePage.boxes[:featured_jobs].schema_id.to_s}", 'alias_id' => LinkedJob.schema_id.to_s, 'target_ids' => Job.first.id, "position" => 2
         assert last_response.ok?, "Recieved #{last_response.status} not 200"
         last_response.content_type.must_equal "application/json;charset=utf-8"
         home.reload
@@ -929,7 +947,7 @@ describe "Back" do
           :position => 2,
           :entry => home.featured_jobs[2].export(user)
         }
-        Spot::JSON.parse(last_response.body).must_equal required_response
+        Spot::JSON.parse(last_response.body).first.must_equal required_response
       end
 
 
@@ -951,7 +969,7 @@ describe "Back" do
           end
           box = home.boxes[:featured_jobs]
           box._prototype.allow LinkedSomething
-          auth_post "/@spontaneous/alias/#{home.id}/#{box.schema_id.to_s}", 'alias_id' => LinkedSomething.schema_id.to_s, 'target_id' => @target_id, "position" => 0
+          auth_post "/@spontaneous/alias/#{home.id}/#{box.schema_id.to_s}", 'alias_id' => LinkedSomething.schema_id.to_s, 'target_ids' => @target_id, "position" => 0
           assert last_response.status == 200, "Expected a 200 but got #{last_response.status}"
           home.reload
           a = home.featured_jobs[0]

data/test/functional/test_cli.rb

@@ -1,4 +1,5 @@
 require 'foreman/engine/cli'
+require 'thor'
 
 
 
@@ -9,15 +10,35 @@ describe "CLI" do
   let(:cli) { Spontaneous::Cli }
   let(:root) { cli::Root }
 
+  def run_command(cmd)
+    quietly do
+      root.start(cmd)
+    end
+  end
+
+  def set_expectation(method, cmd = cmd)
+    quietly do
+      cmd.any_instance.expects(method)
+    end
+  end
+
+  describe "Init" do
+    let(:cmd) { cli::Init }
+    it "maps 'spot init' to Init#init" do
+      set_expectation(:initialize_size)
+      run_command(["init"])
+    end
+  end
+
   describe "Console" do
     let(:cmd) { cli::Console }
     it "maps 'spot console' to Console#open" do
-      cmd.any_instance.expects(:open_console)
-      root.start(["console"])
+      set_expectation(:open_console)
+      run_command(["console"])
     end
     it "maps 'spot c' to Console#open" do
-      cmd.any_instance.expects(:open_console)
-      root.start(["c"])
+      set_expectation(:open_console)
+      run_command(["c"])
     end
   end
 
@@ -34,59 +55,59 @@ describe "CLI" do
     end
 
     it "maps 'spot server' to Server#start" do
-      cmd.any_instance.expects(:start)
-      root.start(["server"])
+      set_expectation(:start)
+      run_command(["server"])
     end
 
     it "'spot server' launches front & back" do
       expect_subcommand_launch
-      root.start(["server"])
+      run_command(["server"])
     end
 
     it "'spot s' launches front & back" do
       expect_subcommand_launch
-      root.start(["s"])
+      run_command(["s"])
     end
 
     it "maps 'spot server back' to Server#back" do
       silence_logger do
-        cmd.any_instance.expects(:start_server).with(:back)
-        root.start(["server", "back"])
+        set_expectation(:start_server).with(:back)
+        run_command(["server", "back"])
       end
     end
 
     it "maps 'spot s back' to Server#back" do
       silence_logger do
-        cmd.any_instance.expects(:start_server).with(:back)
-        root.start(["s", "back"])
+        set_expectation(:start_server).with(:back)
+        run_command(["s", "back"])
       end
     end
 
     it "maps 'spot server front' to Server#front" do
       silence_logger do
-        cmd.any_instance.expects(:start_server).with(:front)
-        root.start(["server", "front"])
+        set_expectation(:start_server).with(:front)
+        run_command(["server", "front"])
       end
     end
 
     it "maps 'spot s front' to Server#front" do
       silence_logger do
-        cmd.any_instance.expects(:start_server).with(:front)
-        root.start(["s", "front"])
+        set_expectation(:start_server).with(:front)
+        run_command(["s", "front"])
       end
     end
 
     it "maps 'spot server tasks' to Server#tasks" do
       silence_logger do
-        cmd.any_instance.expects(:start_simultaneous)
-        root.start(["server", "tasks"])
+        set_expectation(:start_simultaneous)
+        run_command(["server", "tasks"])
       end
     end
 
     it "maps 'spot s tasks' to Server#tasks" do
       silence_logger do
-        cmd.any_instance.expects(:start_simultaneous)
-        root.start(["s", "tasks"])
+        set_expectation(:start_simultaneous)
+        run_command(["s", "tasks"])
       end
     end
   end
@@ -94,36 +115,37 @@ describe "CLI" do
   describe "User" do
     let(:cmd) { cli::User }
     it "maps 'spot user' to User#add" do
-      cmd.any_instance.expects(:add_user)
-      root.start(["user"])
+      set_expectation(:add_user)
+      run_command(["user"])
     end
 
     it "maps 'spot user add' to User#add" do
-      cmd.any_instance.expects(:add_user)
-      root.start(["user", "add"])
+      set_expectation(:add_user)
+      run_command(["user", "add"])
     end
 
     it "maps 'spot user list' to User#list" do
-      cmd.any_instance.expects(:list_users)
-      root.start(["user", "list"])
+      set_expectation(:list_users)
+      run_command(["user", "list"])
     end
 
     it "maps 'spot user authenticate' to User#authenticate" do
-      cmd.any_instance.expects(:authenticate_user).with("garry", "fishingrod")
-      root.start(["user", "authenticate", "garry", "fishingrod"])
+      set_expectation(:authenticate_user).with("garry", "fishingrod")
+      run_command(["user", "authenticate", "garry", "fishingrod"])
     end
   end
+
   describe "Generate" do
     let(:cmd) { cli::Generate }
     let(:generator) { ::Spontaneous::Generators::Site }
     it "maps 'generate site' to Generate#site" do
       generator.expects(:start).with([])
-      root.start(["generate", "site"])
+      run_command(["generate", "site"])
     end
 
     it "maps 'generate example.com' to Generate#site" do
       generator.expects(:start).with(['example.com'])
-      root.start(["generate", "example.com"])
+      run_command(["generate", "example.com"])
     end
 
   end
@@ -131,16 +153,58 @@ describe "CLI" do
   describe "Assets" do
     let(:cmd) { cli::Assets }
     it "maps 'spot assets compile' to Assets#compile" do
-      cmd.any_instance.expects(:compile_assets)
-      root.start(["assets", "compile", "--destination=/tmp/destination"])
+      set_expectation(:compile_assets)
+      run_command(["assets", "compile", "--destination=/tmp/destination"])
     end
   end
 
   describe "Content" do
     let(:cmd) { cli::Content }
     it "maps 'spot content clean' to Content#clean" do
-      cmd.any_instance.expects(:clean_content)
-      root.start(["content", "clean"])
+      set_expectation(:clean_content)
+      run_command(["content", "clean"])
     end
   end
+
+  describe "Fields" do
+    let(:cmd) { cli::Fields }
+    it "maps 'spot fields update' to Fields#update" do
+      set_expectation(:update_fields)
+      run_command(["fields", "update"])
+    end
+  end
+
+  describe "Site" do
+    let(:cmd) { cli::Site }
+    it "maps 'spot site dump' to Site#dump" do
+      set_expectation(:dump_site_data)
+      run_command(["site", "dump"])
+    end
+
+    it "maps 'spot site load' to Site#load" do
+      set_expectation(:load_site_data)
+      run_command(["site", "load"])
+    end
+
+    it "maps 'spot site publish' to Site#publish" do
+      set_expectation(:publish_site)
+      run_command(["site", "publish"])
+    end
+
+    it "maps 'spot site render' to Site#render" do
+      set_expectation(:render_site)
+      run_command(["site", "render"])
+    end
+
+    it "maps 'spot site revision' to Site#revision" do
+      set_expectation(:show_site_revision)
+      run_command(["site", "revision"])
+    end
+
+    it "maps 'spot site browse' to Site#browse" do
+      set_expectation(:browse_site)
+      run_command(["site", "browse"])
+    end
+  end
+
 end