spontaneous 0.2.0.beta1 → 0.2.0.beta2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c30bcb8452abe1751ba10d109eae7ac5e35cc041
+  data.tar.gz: ac6cd7ce1fc89dcdd02b7a61e7ddb5a45ed8f7a2
+SHA512:
+  metadata.gz: 6d220983cefbb9510f76ae41b23a777d63e9e0c6edd9206a68fc12428a4870575ea0ff2521ad1a30b700cdbc7fa2537659ed26446cd97e296661bbb834d81f84
+  data.tar.gz: 760fbab63d0a18311a8fe71df6402a70c6edec1e4600a04b7c08092b8b63da6c7e1a633ac6a832ced6ace6c88ee2e260ac89185b9c79a588ca14dd9c57b53513

data/.gitignore

@@ -0,0 +1,24 @@
+.bundle
+.irb_history
+*.rbc
+.rake_tasks
+test/fixtures/example_application/public/media/*
+test/fixtures/media/*
+test/fixtures/permissions/media/*
+test/fixtures/revisions/*
+test/fixtures/example_application/log/*
+# cached templates
+*.html.rb
+*.pdf.rb
+*.epub.rb
+tmp
+todo.taskpaper
+.rvmrc
+
+Gemfile.lock
+pkg
+.rbx
+.travis/gemfiles/*.lock
+.ruby-gemset
+.ruby-version
+.tags

data/.locat

@@ -0,0 +1,42 @@
+match 'lib/**.rb' do |file, line|
+  case line
+  when /^\s*#/
+    'Comment'
+  when /^\s*$/
+    'Blank'
+  else
+    'Ruby'
+  end
+end
+
+match 'test/**.rb' do |file, line|
+  case file
+  when /fixtures/i
+    nil
+  else
+    case line
+    when /^\s*#/
+      'Comment'
+    when /^\s*$/
+      'Blank'
+    else
+      'Test'
+    end
+  end
+end
+
+match 'application/js/*.js' do |file, line|
+  case file
+  when /vendor/i
+    nil
+  else
+    case line
+    when /^\s*\/\//
+      'Comment'
+    when /^\s*$/
+      'Blank'
+    else
+      'JavaScript'
+    end
+  end
+end

data/.travis/gemfiles/Gemfile.empty

@@ -0,0 +1,7 @@
+source :rubygems
+
+# An empty Gemfile to stop Travis from installing anything
+# this way I can test the installation process itself
+
+gem "rake"
+gem "minitest"

data/.travis.yml

@@ -0,0 +1,18 @@
+language: ruby
+rvm:
+  - "1.9.3"
+  - "2.0.0"
+  # - jruby-19mode # JRuby in 1.9 mode
+  # - rbx-19mode
+# uncomment this line if your project needs to run something other than `rake`:
+env:
+  global:
+    - DB_HOST=127.0.0.1
+  matrix:
+  # - GEM_SOURCE=rubygems DB=postgres   DB_USER=postgres
+  # - GEM_SOURCE=rubygems DB=mysql      DB_USER=root
+    - GEM_SOURCE=git      DB=postgres   DB_USER=postgres
+    - GEM_SOURCE=git      DB=mysql      DB_USER=root
+before_install: gem install rake
+gemfile: .travis/gemfiles/Gemfile.empty
+script: rake test:integration

data/Gemfile

@@ -1,12 +1,15 @@
-source :rubygems
+source "https://rubygems.org"
 
 gemspec
 
-group :development do
-  gem 'shoulda', '~> 2.11.3', :git => 'https://github.com/dasch/shoulda.git', :branch => 'minitest'
-  gem 'selenium-client', '~> 1.2.18', :platforms => [:mri_18]
-  # gem 'Selenium', '~> 1.1.14'
-end
+gem 'selenium-client', '~> 1.2.18', :platforms => [:mri_18]
+gem 'mocha', :require => false
+
+gem 'therubyracer',    '~> 0.11.1'
+
+# group :development do
+#   # gem 'Selenium', '~> 1.1.14'
+# end
 
 platforms :jruby do
   gem 'jruby-openssl'
@@ -15,6 +18,7 @@ platforms :jruby do
 end
 
 platforms :mri do
-  gem 'xapian-ruby', "~> 1.2.12"
-  gem 'xapian-fu', "~> 1.3"
+  gem 'mysql2',      '~> 0.3.11'
+  gem 'pg',          '~> 0.14.1'
+  gem 'xapian-ruby', '~> 1.2.12'
 end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Garry Hill <garry@magnetised.net>
+Copyright (c) 2011-2013 Garry Hill <garry@magnetised.net>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,62 +1,18 @@
 Encoding.default_internal = Encoding.default_external = Encoding::UTF_8 if defined?(Encoding)
 
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'spontaneous/version'
+
 require 'rubygems'
 require 'rake'
-require 'date'
-
-#############################################################################
-#
-# Helper functions
-#
-#############################################################################
 
 def name
   "spontaneous"
 end
 
 def version
-  line = File.read("lib/#{name}/version.rb")[/^\s*VERSION\s*=\s*.*/]
-  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
-end
-
-def date
-  Date.today.to_s
-end
-
-def rubyforge_project
-  name
-end
-
-def gemspec_file
-  "#{name}.gemspec"
-end
-
-def gem_gemspec_file
-  "#{name}.tmp.gemspec"
-end
-
-def gem_file
-  "#{name}-#{version}.gem"
-end
-
-def replace_header(head, header_name)
-  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
-end
-
-def generate_gemspec(spec, files)
-  head, manifest, tail = spec.split("  # = MANIFEST =\n")
-  # replace name version and date
-  replace_header(head, :name)
-  replace_header(head, :version)
-  replace_header(head, :date)
-  #comment this out if your rubyforge_project has a different name
-  filelist = files.sort.
-      map { |file| "    #{file}" }.
-      join("\n")
-  replace_header(head, :rubyforge_project)
-  manifest = "  s.files = %w[\n#{filelist}\n  ]\n"
-  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
-  spec
+  Spontaneous::VERSION
 end
 
 #############################################################################
@@ -138,41 +94,23 @@ task :coverage do
   sh "open coverage/index.html"
 end
 
-require 'rdoc/task'
-
-RDoc::Task.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "#{name} #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-desc "Open an irb session preloaded with this library"
-task :console do
-  sh "irb -rubygems -r ./lib/#{name}.rb"
-end
-
-#############################################################################
-#
-# Custom tasks (add your own tasks here)
-#
-#############################################################################
-
-
-
 #############################################################################
 #
 # Packaging tasks
 #
 #############################################################################
 
-require 'tmpdir'
-@project_dir = Dir.pwd
+def gemspec_file
+  "#{name}.gemspec"
+end
+
+def gem_file
+  "#{name}-#{version}.gem"
+end
 
 namespace :gem do
   desc "Create tag v#{version} and build and push #{gem_file} to Rubygems"
   task :release => :build do
-    Dir.chdir(@project_dir)
     unless `git branch` =~ /^\* master$/
       puts "You must be on the master branch to release!"
       exit!
@@ -181,95 +119,15 @@ namespace :gem do
     sh "git tag v#{version}"
     sh "git push origin master"
     sh "git push origin v#{version}"
-    sh "gem push #{@build_dir}/pkg/#{name}-#{version}.gem"
+    sh "gem push pkg/#{gem_file}"
   end
 
   desc "Build #{gem_file} into the pkg directory"
-  task :build => :gemspec do
+  task :build do
+    sh "gem build #{gemspec_file}"
     sh "mkdir -p pkg"
-    sh "gem build #{gem_gemspec_file}"
-    sh "mkdir -p #{@project_dir}/pkg"
-    sh "cp #{gem_file} #{@project_dir}/pkg"
     sh "mv #{gem_file} pkg"
   end
-
-
-  desc "Generate #{gemspec_file}"
-  task :gemspec => :working_copy do
-    # read spec file and split out manifest section
-    spec = File.read(gemspec_file)
-    # head, manifest, tail = spec.split("  # = MANIFEST =\\n")
-    # # replace name version and date
-    # replace_header(head, :name)
-    # replace_header(head, :version)
-    # replace_header(head, :date)
-    # #comment this out if your rubyforge_project has a different name
-    # replace_header(head, :rubyforge_project)
-
-    # determine file list from git ls-files
-    files = `git ls-files`.
-      split("\n").
-      reject { |file| file =~ /^\./ }.
-      reject { |file| file =~ /^(rdoc|pkg)/ }
-
-    File.open(gemspec_file, 'w') { |io| io.write(generate_gemspec(spec, files)) }
-
-    compressed_assets = Dir["application/{css,js}/min/*.*"]
-
-    File.open(gem_gemspec_file, 'w') { |io| io.write(generate_gemspec(spec, files.concat(compressed_assets))) }
-
-    # piece file back together and write
-    # manifest = "  s.files = %w[\\n#{files}\\n  ]\\n"
-    # spec = [head, manifest, tail].join("  # = MANIFEST =\\n")
-    # File.open(gemspec_file, 'w') { |io| io.write(spec) }
-    puts "Updated #{gemspec_file}"
-    FileUtils.cp(gemspec_file, @project_dir)
-  end
-
-  task :working_copy => :validate do
-    # @working_dir = Dir.mktmpdir
-  end
-
-  desc "Validate #{gemspec_file}"
-  task :validate => :generate do
-    libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
-    unless libfiles.empty?
-      puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
-      # exit!
-    end
-    unless Dir['VERSION*'].empty?
-      puts "A `VERSION` file at root level violates Gem best practices."
-      # exit!
-    end
-  end
-
-  desc "Generate the gemspec file from a template"
-  task :generate => :setup do
-    # template = File.read('spontaneous.gemspec.tmpl')
-    # require 'bundler'
-
-    # File.open('spontaneous.gemspec', 'w') do |gemspec|
-      # bundler = Bundler.load
-      # dependencies = bundler.dependencies_for(:default, :runtime).map do |dependency|
-      #   %{s.add_dependency('#{dependency.name}', [#{dependency.requirement.as_list.map { |d| d.inspect }.join(', ')}])}
-      # end
-      # development_dependencies = bundler.dependencies_for(:development).map do |dependency|
-      #   %{s.add_development_dependency('#{dependency.name}', [#{dependency.requirement.as_list.map { |d| d.inspect }.join(', ')}])}
-      # end
-    #   gemspec.write(template)
-    # end
-  end
-
-
-  task :setup do
-    @build_dir = Dir.tmpdir + "/spontaneous"
-    FileUtils.rm_r(@build_dir) if File.directory?(@build_dir)
-    FileUtils.mkdir_p(@build_dir)
-    FileUtils.cp_r(@project_dir+"/.", @build_dir)
-    Dir.chdir(@build_dir)
-    $:.unshift(@build_dir + "/lib")
-    # require File.expand_path(@build_dir + '/lib/spontaneous')
-  end
 end
 
 namespace :asset do

data/Readme.markdown

@@ -2,7 +2,7 @@
 
 Spontaneous is a revolutionary new content management system that brings the best of Ruby and the best of HTML5 together in one elegant package.
 
-This is version 2 of an existing (closed source) CMS that has been in active production use for over 6 years. For more information about that, and to see the sites that it powers, please go to [magnetised's homepage](http://magnetised.info/spontaneous).
+This is version 2 of an existing (closed source) CMS that has been in active production use for over 6 years. For more information about that, and to see the sites that it powers, please go to http://spontaneous.io
 
 ## INTRODUCTION
 

data/application/css/core.css.scss

@@ -48,148 +48,6 @@ img.missing {
 }
 
 
-#top {
-	@extend .container-padding;
-	@extend .controls-gradient;
-	@extend .clearfix;
-	@include display-box;
-	@include box-align(center);
-	position: fixed;
-	height: 31px;
-	top: 0;
-	right: 0;
-	left: 0;
-	#navigation {
-		@include box-flex;
-		font-size: 11px;
-		font-weight: bold;
-		color: #999999;
-		width: 100%;
-		li {
-      @include no-select;
-			padding-left: 10px;
-			padding-right: 15px;
-			background: url("/@spontaneous/static/location-arrow-c1c1d3ca472481c61a0a5f8cb289d743.png") right 0 no-repeat;
-			float: left;
-			display: block;
-			font-weight: bold;
-			select {
-				@include box-sizing;
-				@include interface;
-				text-transform: none;
-				font-size: 11px;
-        line-height: 13px;
-				-webkit-appearance: none;
-				cursor: pointer;
-				display: block;
-				background: url("/@spontaneous/static/select-arrow-6e7dd3745b00e934b0d7a3250c46558b.png") 95% 50% no-repeat;
-				border: none;
-				outline: none;
-				position: relative;
-				padding-top: 0px;
-				padding-right: 25px;
-				height: 31px;
-				color: #ccc;
-				font-weight: bold;
-				width: 100%;
-			}
-			select.unselected {
-				color: #888;
-				font-weight: normal;
-				font-style: italic;
-				max-width: 80px;
-			}
-			a {
-				@include box-sizing;
-				cursor: pointer;
-				// color: #888888;
-				color: #ddd;
-				height: 31px;
-				padding-top: 9px;
-				display: block;
-				background: url("/@spontaneous/static/select-arrow-6e7dd3745b00e934b0d7a3250c46558b.png") right 50% no-repeat;
-				padding-right: 20px;
-			}
-			a:hover, select:hover {
-				color: white;
-			}
-		}
-		li.root a {
-			background-image: none;
-			padding-right: 5px;
-		}
-	}
-  #spontaneous-root {
-    background-image: url("/@spontaneous/static/spontaneous-states-e91ec89db525c62da0105b97cdd781ce.png"), url("/@spontaneous/static/location-arrow-c1c1d3ca472481c61a0a5f8cb289d743.png");
-    background-position: 0 5px, right 0;
-    background-repeat: no-repeat;
-    padding-right: 12px;
-    cursor: pointer;
-    height: 31px;
-
-    span {
-      padding-right: 28px;
-    }
-    &:hover {
-      background-position: 0 -83px, right 0;
-
-    }
-
-    &.active {
-      background-position: 0 -39px, right 0;
-    }
-  }
-  #service-outer {
-		@include box-flex;
-  }
-  #cms-navigation-view {
-    @include display-box;
-    @include box-align(center);
-  }
-  #service-navigation {
-    @include display-box;
-    @include box-align(center);
-    h2 {
-      @include box-flex;
-      @include interface;
-      text-transform: none;
-      font-size: 11px;
-      padding-left: $unit;
-      color: #fff;
-      font-weight: bold;
-    }
-    a {
-      display: block;
-      width: 64px;
-    }
-  }
-	#switch-mode, #open-publish {
-		@include button;
-		@include display-box;
-		@include box-orient(vertical);
-		@include box-align(center);
-		margin: 0;
-		width: 70px;
-	}
-	#open-publish {
-		position: relative;
-		margin-right: $unit;
-		#publish-progress {
-			position: absolute;
-			left: 4px;
-			top: 1px;
-		}
-		&.disabled {
-		}
-	}
-	#open-publish.progress {
-		padding-left: 20px;
-		padding-right: 20px;
-		width: 124px;
-		@include button-color(#666666);
-		color: #999999;
-	}
-}
 
 #content-outer {
 	background: url(/@spontaneous/static/texture-03f7627e8264b1d607113ab32c593a58.png) repeat;
@@ -228,18 +86,23 @@ img.missing {
 	#page-info {
 		@extend .container-padding;
 		@include vertical-gradient(#3a3a3a, #222222);
-		height: 64px - 10px;
+		min-height: 64px - 10;
+		height: auto;
 		padding-top: 10px;
+		padding-bottom: 0px;
 		position: relative;
 		h1, h3 {
 			position: relative;
 		}
 		h1 {
+			// position: absolute;
+			// top: 0;
 			font-family: $headline-font-family;
 			font-weight: 100;
 			color: white;
 			font-size: 24px;
-			line-height: 21px;
+			line-height: 100%;
+			padding-bottom: 30px;
 			span {
 				color: #888888;
 			}
@@ -265,7 +128,7 @@ img.missing {
 		& > .path {
 			@include display-box;
 			position: absolute;
-			bottom: 12px;
+			bottom: 10px;
 		}
     .path .titlesync {
       margin-left: $unit;
@@ -713,15 +576,22 @@ img.missing {
 			display: none;
 		}
 	}
+	// highlight filename when hovering over filedrop area
+	// too confusing to have the filenames active though as it
+	// would interfere with the 'click to edit' thing
+	// .file-drop:hover + .filename {
+	// 	color: $action;
+	// }
 }
 
-.editing-panel .field-group .fieldtypes-filefield {
+.editing-panel .field-group .field.field-file {
 	.value {
 		// padding: 0;
 	}
 	.file-field {
 		// height: 36px;
 		cursor: pointer;
+		line-height: 1.3em;
 
 		.file-drop:hover {
 			// border-color: $action;
@@ -741,6 +611,10 @@ img.missing {
 			padding-left: 6px;
 			padding-right: 6px;
 		}
+		.choose + .filename,
+		.choose + .filename + .filesize {
+			position:relative;
+		}
 		&:hover .choose {
 			@include button;
 		}
@@ -1677,6 +1551,8 @@ img.missing {
     color: rgba(0, 0, 0, 0.5);
   }
 }
+
+@import "top.css.scss";
 @import "dialogue.css.scss";
 @import "popover.css.scss";
 @import "editing.css.scss";

data/application/css/definitions.css.scss

@@ -90,9 +90,13 @@ $target-name-size: 14px;
   -moz-border-radius: $radius 0 0 $radius;
   border-radius: $radius 0 0 $radius; }
 
+@mixin shadow {
+	-webkit-box-shadow: 0px 3px 30px #cccccc;
+	-moz-box-shadow: 0px 3px 30px #cccccc;
+}
 .shadow {
-  -webkit-box-shadow: 0px 3px 30px #cccccc;
-  -moz-box-shadow: 0px 3px 30px #cccccc; }
+	@include shadow;
+}
 
 .clearfix:after {
   content: ".";
@@ -144,6 +148,7 @@ $target-name-size: 14px;
 }
 
 @mixin interface {
+	@include no-select;
   font-family: $interface-font-family;
   -webkit-font-smoothing: antialiased;
   text-transform: uppercase;
@@ -151,7 +156,6 @@ $target-name-size: 14px;
   line-height: 13px;
   //font-weight: bold;
   font-weight: 600;
-  @extend .no-select;
 }
 
 @mixin button($background-color: $action) {

data/application/css/dialogue.css.scss

@@ -146,6 +146,31 @@ $dialogue-title-height: 32px;
 	@include display-box;
 	@include box-orient(horizontal);
 
+	.spinner {
+		position: absolute;
+		width: 48px;
+		height: 48px;
+		left: 50%;
+		top: 40%;
+		canvas {
+			position: relative;
+			left: -50%;
+		}
+		div {
+			left: -50%;
+			width: 100%;
+			p {
+				@include interface;
+				width: 200px;
+				position: relative;
+				left: -100px;
+				top: 10px;
+				text-align: center;
+				color: #ccc;
+				margin: 0;
+			}
+		}
+	}
 	.change-list {
 		@include box-flex;
 		position: absolute;
@@ -209,7 +234,7 @@ $dialogue-title-height: 32px;
 	// padding-bottom: $container-padding / 2;
 	.publish-up-to-date {
 		@include rounded;
-		@extend shadow;
+		@extend .shadow;
 		position: absolute;
 		left: 0;
 		right: 0;