spontaneous 0.2.0.beta1 → 0.2.0.beta2

data/application/js/upload_manager.js

@@ -8,13 +8,14 @@ Spontaneous.UploadManager = (function($, S) {
 		start: function() {
 			var form = new FormData();
 			form.append('file', this.file);
-			this.post(["/file/wrap", this.target_id].join('/'), form);
+			this.post(["/file", this.target_id].join('/'), form);
 		}
 	});
 	var ShardedWrapUpload = new JS.Class(S.ShardedUpload, {
 		path: function() {
-			return ["/shard/wrap", this.target_id].join('/');
+			return ["/shard", this.target_id].join('/');
 		},
+		method: "POST"
 	});
 	var FormUpload = new JS.Class(Upload, {
 		initialize: function(manager, target, form_data, size) {
@@ -24,7 +25,7 @@ Spontaneous.UploadManager = (function($, S) {
 			this.name = "Saving...";
 		},
 		start: function() {
-			this.post(this.target.save_path(), this.form_data);
+			this.put(this.target.save_path(), this.form_data);
 		}
 	});
 	var UploadManager = {

data/application/js/user.js

@@ -35,10 +35,9 @@ Spontaneous.User = (function($, S) {
 			this.set('user', this.user);
 		},
 		logout: function() {
-			ajax.post("/logout", {}, function() {
+			ajax.del("/logout", {}, function() {
 				// S.Ajax.unauthorized();
 			});
-			S.Auth.Key.remove(S.site_id);
 		},
 		name: function() { return this.user.name(); },
 		email: function() { return this.user.email(); },

data/application/js/views/box_view.js

@@ -233,7 +233,7 @@ Spontaneous.Views.BoxView = (function($, S) {
 		},
 
 		save_path: function() {
-			return ['/savebox', this.id()].join('/');
+			return ['/content', this.id()].join('/');
 		},
 
 		add_content: function(content_type, position) {

data/application/js/views/page_view.js

@@ -29,7 +29,7 @@ Spontaneous.Views.PageView = (function($, S) {
 
 			if (!self.page.is_root()) {
 				var resync = dom.a({ "title":"Sync the path to the page title"}).click(function() {
-					Spontaneous.Ajax.post(['/slug', self.page.id(), "titlesync"].join("/"), {}, self.save_complete.bind(self));
+					Spontaneous.Ajax.put(['/page', self.page.id(), "slug/sync"].join("/"), {}, self.save_complete.bind(self));
 				});
 				path_wrap.append( dom.h3('.titlesync').append(resync));
 			}
@@ -54,11 +54,22 @@ Spontaneous.Views.PageView = (function($, S) {
 			return this.panel;
 		},
 		set_title: function(title) {
+			var self = this;
 			title = title || this.page.title();
 			this.title.html(title);
 			if (this.page.content.hidden) {
-				this.title.append(dom.span().text(' (hidden)'));
+				self.title.append(dom.span().text(' (hidden)'));
 			}
+			var maxHeight = 36;
+			window.setTimeout(function()  {
+				var t = self.title
+				, height = function() { return t.height();  }
+				, fs =  window.parseInt(t.css('font-size'), 10);
+				;
+				while (height() > maxHeight && fs > 10) {
+					t.css('font-size', --fs);
+				}
+			}, 0);
 		},
 		unavailable_loaded: function(response) {
 			var u = {};
@@ -107,7 +118,7 @@ Spontaneous.Views.PageView = (function($, S) {
 			}.bind(this));
 		},
 		save_uid: function(uid) {
-			Spontaneous.Ajax.post('/uid/'+this.page.id(), {'uid':uid}, this.uid_save_complete.bind(this));
+			Spontaneous.Ajax.put(['/page',this.page.id(), "uid"].join("/"), {'uid':uid}, this.uid_save_complete.bind(this));
 		},
 		uid_save_complete: function(response, status, xhr) {
 			if (status === 'success') {
@@ -121,7 +132,7 @@ Spontaneous.Views.PageView = (function($, S) {
 		open_url_editor: function() {
 			this.unavailable = false;
 			this.url_editor_open = true;
-			Spontaneous.Ajax.get(['/slug', this.page.id(), 'unavailable'].join('/'), this.unavailable_loaded.bind(this));
+			Spontaneous.Ajax.get(['/page', this.page.id(), 'slug/unavailable'].join('/'), this.unavailable_loaded.bind(this));
 			this.panel.animate({'height': '+=14'}, 200, function() {
 				var view = $('h3', this.panel), edit = $('.edit', this.panel);
 				view.hide();
@@ -211,7 +222,7 @@ Spontaneous.Views.PageView = (function($, S) {
 			if (this.input && this.input.hasClass('error')) { this.input.removeClass('error'); }
 		},
 		save: function(slug) {
-			Spontaneous.Ajax.post('/slug/'+this.page.id(), {'slug':slug}, this.save_complete.bind(this));
+			Spontaneous.Ajax.put(['/page',this.page.id(), "slug"].join("/"), {'slug':slug}, this.save_complete.bind(this));
 		},
 
 		save_complete: function(response, status, xhr) {

data/application/js/views/piece_view.js

@@ -19,9 +19,9 @@ Spontaneous.Views.PieceView = (function($, S) {
 		title: function() {
 			return "Delete this " + (this.parent_view.content.is_page() ? "Page?" : "Piece?");
 		},
-		position_from_event: function(event) {
-			return this.position_from_element(event);
-		},
+		// position_from_event: function(event) {
+		// 	return this.position_from_element(event);
+		// },
 		view: function() {
 			var __entry = this.parent_view;
 			var w = dom.div('#popover-delete').click(function() {
@@ -36,7 +36,8 @@ Spontaneous.Views.PieceView = (function($, S) {
 			var cancel = dom.a('.cancel').text("Cancel");
 			w.append(cancel, ok)
 			return w;
-		}
+		},
+		scroll: true
 	});
 
 	var PieceView = new JS.Class(S.Views.View, {

data/application/views/index.erb

@@ -7,15 +7,8 @@
 		<title>Spontaneous: Loading...</title>
 		<link REL="SHORTCUT ICON" HREF="/@spontaneous/static/favicon.ico" />
 
-	<% Spontaneous::Rack::Assets::CSS::EDITING_CSS.each do |css_file| %>
-		<link rel="stylesheet" href="<%= style_url(css_file) %>" type="text/css" media="screen" charset="utf-8" />
-	<% end %>
-    <% Spontaneous::Rack::Assets::JavaScript::JQUERY.each do |js_file| %>
-      <script type="text/javascript" charset="utf-8" src="<%= script_url(js_file) %>"></script>
-    <% end %>
-	<% Spontaneous::Rack::Assets::JavaScript::COMPATIBILITY.each do |js_file| %>
-		<script type="text/javascript" charset="utf-8" src="<%= script_url(js_file) %>"></script>
-	<% end %>
+		<link rel="stylesheet" href="<%= style_url("spontaneous") %>" type="text/css" media="screen" charset="utf-8" />
+    <script type="text/javascript" charset="utf-8" src="<%= script_url("vendor/jquery") %>"></script>
 		<script type="text/javascript" charset="utf-8">
 			Spontaneous = {
 				site_domain: '<%= Spontaneous::Site.config.site_domain %>',
@@ -24,24 +17,23 @@
 				development: <%= Spontaneous.development? %>,
 				asynchronous: <%= Spontaneous.production? %>,
 				editor_protocol: 'mvim',
+				csrf_header: '<%= Spontaneous::Rack::CSRF_HEADER %>',
+				csrf_token: '<%= env[Spontaneous::Rack::CSRF_TOKEN] %>',
 				<% if Spontaneous.config.auto_login; %>
 				auto_login: '<%= Spontaneous.config.auto_login %>',
-				user_key: '<%= env[Spontaneous::Rack::ACTIVE_KEY].key_id %>',
 				<% end %>
 				onload: function() {
 					jQuery.noConflict();
 				}
 			};
 		</script>
-	<% Spontaneous::Rack::Assets::JavaScript::REQUIRE.each do |js_file| %>
-		<script type="text/javascript" charset="utf-8" src="<%= script_url(js_file) %>"></script>
-	<% end %>
+		<script type="text/javascript" charset="utf-8" src="<%= script_url("require") %>"></script>
 	</head>
 	<body id="spontaneous">
 		<script type="text/javascript" charset="utf-8">
 			Spontaneous.Require.init(Spontaneous.asynchronous);
 			<%# list of scripts to append, in order %>
-			var sources = <%= script_list(Spontaneous::Rack::Assets::JavaScript::EDITING_JS)  %>;
+			var sources = <%= script_list(["spontaneous"])  %>;
 			for (var i = 0, ii = sources.length; i < ii; i++) {
 				Spontaneous.require(sources[i]);
 			}

data/application/views/login.erb

@@ -5,36 +5,21 @@
     <title><%= Spontaneous::Site.config.site_domain %>: Please Login</title>
     <link REL="SHORTCUT ICON" HREF="/@spontaneous/static/favicon.ico" />
     <link rel="apple-touch-icon" href="/@spontaneous/static/spot-71fab1d2f065034f5fc15e7bea2ad36c.png" />
-    <% Spontaneous::Rack::Assets::CSS::LOGIN_CSS.each do |css_file| %>
-      <link rel="stylesheet" href="<%= style_url(css_file) %>" type="text/css" media="screen" charset="utf-8" />
-    <% end %>
-    <% Spontaneous::Rack::Assets::JavaScript::JQUERY.each do |js_file| %>
-      <script type="text/javascript" charset="utf-8" src="<%= script_url(js_file) %>"></script>
-    <% end %>
+      <link rel="stylesheet" href="<%= style_url("spontaneous") %>" type="text/css" media="screen" charset="utf-8" />
+      <script type="text/javascript" charset="utf-8" src="<%= script_url("vendor/jquery") %>"></script>
     <script type="text/javascript">
       var Spontaneous = {
         site_domain: '<%= Spontaneous::Site.config.site_domain %>',
         site_id: '<%= Spontaneous::Site.config.site_id %>',
       };
     </script>
-    <% Spontaneous::Rack::Assets::JavaScript::LOGIN_JS.each do |js_file| %>
-      <script type="text/javascript" charset="utf-8" src="<%= script_url(js_file) %>"></script>
-    <% end %>
+    <script type="text/javascript" charset="utf-8" src="<%= script_url("login") %>"></script>
     <script type="text/javascript">
       (function($) {
         $(function() {
-          <% if locals[:invalid_key] %>
-            var key = Spontaneous.Auth.Key.remove(Spontaneous.site_id);
-          <% else %>
-            var key = Spontaneous.Auth.Key.load(Spontaneous.site_id);
-          <% end %>
-          if (key) {
-            $('#reauthenticate-key').val(key).parent('form')[0].submit();
-          } else {
-            $('#outer').fadeIn(function() {
-              $('#login-form input#user-login').focus();
-            });
-          }
+          $('#outer').fadeIn(function() {
+            $('#login-form input#user-login').focus();
+          });
         });
       }(jQuery));
     </script>
@@ -61,9 +46,5 @@
         </form>
       </div>
     </div>
-      <form action="/@spontaneous/reauthenticate" method="post" accept-charset="UTF-8">
-        <input type="hidden" id="reauthenticate-key" name="api_key" value="" />
-        <input type="hidden" id="reauthenticate-origin" name="origin" value="<%= locals[:origin] || request.path_info %>" />
-      </form>
   </body>
 </html>

data/application/views/schema_modification_error.html.erb

@@ -7,12 +7,8 @@
     <title>Spontaneous: Loading...</title>
 		<link REL="SHORTCUT ICON" HREF="/@spontaneous/static/favicon.ico" />
 
-    <% Spontaneous::Rack::Assets::CSS::SCHEMA_MODIFICATION_CSS.each do |css_file| %>
-      <link rel="stylesheet" href="<%= style_url(css_file) %>" type="text/css" media="screen" charset="utf-8" />
-    <% end %>
-    <% Spontaneous::Rack::Assets::JavaScript::JQUERY.each do |js_file| %>
-      <script type="text/javascript" charset="utf-8" src="<%= script_url(js_file) %>"></script>
-    <% end %>
+      <link rel="stylesheet" href="<%= style_url("spontaneous") %>" type="text/css" media="screen" charset="utf-8" />
+      <script type="text/javascript" charset="utf-8" src="<%= script_url("vendor/jquery") %>"></script>
     <script type="text/javascript">
       var Spontaneous = {};
     </script>
@@ -50,7 +46,7 @@
     <li>
     <form action="/@spontaneous/schema/<%= action.action %>" method="post">
       <input type="hidden" name="origin" value="<%= env['SCRIPT_NAME'] %>" />
-      <input type="hidden" name="__key" value="<%= env[S::Rack::ACTIVE_KEY].key_id %>" />
+      <input type="hidden" name="__token" value="<%= env[S::Rack::CSRF_TOKEN] %>" />
       <input type="hidden" name="uid" value="<%= action.source.to_s %>" />
       <% if action.dest %>
         <input type="hidden" name="ref" value="<%= action.dest.schema_name %>" />

data/db/migrations/20130114120000_create_revision_tables.rb

@@ -4,7 +4,7 @@ require 'spontaneous'
 require 'benchmark'
 
 Sequel.migration do
-  ContentTable = S::DataMapper::ContentTable
+  ::ContentTable = S::DataMapper::ContentTable unless defined?(::ContentTable)
   revision_table = :spontaneous_content_revisions
   archive_table  = :spontaneous_content_archive
   content_table  = :content
@@ -30,7 +30,7 @@ Sequel.migration do
     tables = self.tables
     revisions = tables.select { |t| ContentTable.revision_table?(content_table, t)}.sort
 
-    revisions = revisions.map { |name| [name, ContentTable.revision_number(content_table, name)] }
+    revisions = revisions.map { |name| [name, ContentTable.revision_from_table(content_table, name)] }
 
     unless revisions.empty?
 

data/db/migrations/20130813111009_increase_path_length.rb

@@ -0,0 +1,14 @@
+Sequel.migration do
+  up do
+    [:content, :spontaneous_content_archive, :spontaneous_content_history].each do |table|
+      set_column_type table, :path, 'varchar(2048)'
+    end
+  end
+
+  down do
+    [:content, :spontaneous_content_archive, :spontaneous_content_history].each do |table|
+      set_column_type table, :path, 'varchar(255)'
+    end
+  end
+end
+

data/gem-public_cert.pem

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMQ4wDAYDVQQDDAVnYXJy
+eTEaMBgGCgmSJomT8ixkARkWCm1hZ25ldGlzZWQxEzARBgoJkiaJk/IsZAEZFgNu
+ZXQwHhcNMTMwMzE5MTUyNjU5WhcNMTQwMzE5MTUyNjU5WjBBMQ4wDAYDVQQDDAVn
+YXJyeTEaMBgGCgmSJomT8ixkARkWCm1hZ25ldGlzZWQxEzARBgoJkiaJk/IsZAEZ
+FgNuZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKM3kWbO2fxZQd
+ni+mHL+pw82T7WhKvTHM6paEzYwmMiS988ezEeC8KapthzYeOti1GT6utprQQE6K
+3an/hmeMkxIpOOkHQCp9ztrROr2DSJGWp1pNvdtMZqeim9yyR4+A/znW9lBJDLYm
+HUrYNrtv3cfffScmJfSvRa/7if2+uIq8MA+qhhBHgiU46ZQuRkr5Y0MogOZ2M41L
+oRSc1SiejC+fp9ShRRDrNSYPLM81BQm418pw0nbwlOgQDJXbiDkmbD3EPXmYupEb
+UKyqzP1m84mtibnkWIm+NYEgaOFrWU4jHuRXRDlBIejB+DpGtrl3NgHCDpx+S5PE
+6QzAm7JjAgMBAAGjOTA3MAkGA1UdEwQCMAAwHQYDVR0OBBYEFElanH76RAW4xjiB
+zbhSb78664DmMAsGA1UdDwQEAwIEsDANBgkqhkiG9w0BAQUFAAOCAQEAcXnU920f
+J2BpKQJULph0A/r5mkR4GRfQY+vbEJVyfV9te6tROzZAe87zqImmns16AYVC/TZ+
+PUrat/zSJp8L7fmOuqD6rKrysa22eQveRivKtGnpKpJPbS93nGhYikM1lDROC0Qd
+2pokOnvTGdhZNOxrEuwKnqXE+fdGgK4K03UkazVPF3Emsg2oOcP7Ihe4QxzP2FKt
+kqVsrH6nBplzJhol1DaOS7oQpKF+8IEynjPDSHfqoRqjhyyfWuwSdX76FEJWSE3m
+/8q3/tl0XjLJMzaI8e48vclQ4aF1o6oyPrRMGgOeRgP0+E7coMAl4j5mihrJYwl2
+hjebdHUMaT4ndQ==
+-----END CERTIFICATE-----

data/lib/spontaneous/asset/app_compiler.rb

@@ -0,0 +1,44 @@
+require 'sprockets'
+require 'uglifier'
+require 'sass'
+
+module Spontaneous::Asset
+  # Takes assets from a source directory & compiles them to some destination directory.
+  # This is deliberatly dumb about the path to the gem and destination
+  class AppCompiler
+    attr_reader :environment, :manifest
+
+    def initialize(gem_path, dest_path, options = {})
+      @options     = {:compress => true}.merge(options)
+      @gem_path    = gem_path
+      @dest_path   = dest_path
+      @environment = Sprockets::Environment.new(gem_path / "application" )
+      @manifest    = Sprockets::Manifest.new(@environment, @dest_path / "public/@spontaneous/assets")
+
+      @environment.append_path(gem_path / "application/js")
+      @environment.append_path(gem_path / "application/css")
+
+      if @options[:compress]
+        @environment.register_bundle_processor "application/javascript", :uglifier do |context, data|
+          Uglifier.compile(data)
+        end
+
+        @environment.register_bundle_processor "text/css", :sass_compressor do |context, css|
+          # By this point the SCSS has already been compiled, so SASS is merely a CSS compressor
+          # and I can ignore crap around loadpaths or filenames.
+          engine = ::Sass::Engine.new(css, :style => :compressed, :syntax => :scss, :quiet => true, :custom => { :resolver => self })
+          engine.render
+        end
+      end
+    end
+
+
+    def compile
+      @manifest.compile("spontaneous.js", "login.js", "require.js", "vendor/jquery.js", "spontaneous.css")
+    end
+
+    def image_path(path)
+      path
+    end
+  end
+end

data/lib/spontaneous/asset/environment.rb

@@ -0,0 +1,225 @@
+require 'sprockets'
+require 'uri'
+
+module Spontaneous::Asset
+  module Environment
+    def self.new(context)
+      if context.publishing?
+        Publish.new(context.site, context.revision)
+      else
+        Preview.new(context.site)
+      end
+    end
+
+    def self.preview(site = Spontaneous::Site.instance)
+      Preview.new(site)
+    end
+
+    # takes a path that has optional hash & query parts and splits
+    # out the real asset path.
+    def self.split_asset_path(path)
+      uri = URI(path)
+      [uri.path, uri.query, uri.fragment]
+    end
+
+
+    # takes a path that has optional hash & query parts and splits
+    # out the real asset path.
+    def self.join_asset_path(path, query, hash)
+      joined = path.dup
+      joined << "?#{query}" if query
+      joined << "##{hash}"  if hash
+      joined
+    end
+
+    module SassFunctions
+      def asset_data_uri(path)
+        Sass::Script::String.new(sprockets_context.asset_data_uri(path.value))
+      end
+    end
+
+    ::Sass::Script::Functions.send :include, SassFunctions
+
+
+    class Preview
+      attr_reader :environment
+
+      def initialize(site)
+        @site = site
+        asset_paths.each do |path|
+          environment.append_path(path)
+        end
+      end
+
+      def asset_paths
+        @site.paths.expanded(:assets)
+      end
+
+      def environment
+        @environment ||= build_environment(@site)
+      end
+
+      def build_environment(site)
+        environment = ::Sprockets::Environment.new(site.root)
+        environment.context_class.class_eval(&context_extension)
+        environment.context_class.asset_mount_point = asset_mount_point
+        environment
+      end
+
+      def context_extension
+        proc {
+          class << self
+            attr_accessor :asset_mount_point
+          end
+
+          def asset_path(path, options = {})
+            asset_path, query, fragment = Spontaneous::Asset::Environment.split_asset_path(path)
+            asset = environment[asset_path]
+            return path if asset.nil?
+            Spontaneous::Asset::Environment.join_asset_path(make_absolute(asset.logical_path), query, fragment)
+          end
+
+          def make_absolute(logical)
+            "/" << self.class.asset_mount_point << "/" << logical
+          end
+        }
+      end
+
+      # The preview environment converts logical paths to a list of URLs
+      #
+      # Because I want to support using absolute paths in my asset lists
+      # I have to convert from URL paths to relative paths first to avoid
+      # confusing sprockets (which treats a path starting with / as an
+      # absolute file path and will fail to locate assets that have one.)
+      #
+      #   - sources: a list of `logical paths`
+      #   - options:
+      #     - :type => either :js or :css
+      #
+      # Returns a list of URLs
+      def find(sources, options)
+        paths   = normalise_sources(sources, options)
+        if options[:development]
+          assets = paths.flat_map { |path| a = environment[path, bundle: true].to_a ; a.empty? ? [path] : a }
+        else
+          assets = paths.map { |path| environment[path] || path }
+        end
+        assets.map { |asset| to_url(asset, options[:development]) }
+      end
+
+      def normalise_sources(sources, options)
+        Array(sources).map { |path| to_logical(path, options[:type]) }
+      end
+
+      def js(sources, options = {})
+        find(sources, options.merge(type: :js))
+      end
+
+      def css(sources, options = {})
+        find(sources, options.merge(type: :css))
+      end
+
+      def call(env)
+        environment.call(env)
+      end
+
+      def to_url(asset, body = false)
+        return asset if asset.is_a?(String)
+        path = asset.logical_path
+        path = "#{path}?body=1" if body
+        "/" << asset_mount_point << "/" << path
+      end
+
+      def asset_mount_point
+        "assets"
+      end
+
+      ABSOLUTE_URL  = /^(https?:)?\/\//
+
+      def is_absolute_url?(path)
+        ABSOLUTE_URL === path
+      end
+
+      def to_logical(path, type)
+        return path if is_absolute_url?(path)
+        filename_with_extension(path, type)
+      end
+
+      EXTENSIONS = {
+        js: ".js",
+        javascript: ".js",
+        css: ".css",
+        stylesheet: ".css"
+      }
+
+      def filename_with_extension(base, type)
+        ext = EXTENSIONS[type]
+        return base if File.extname(base) == ext
+        "#{base}#{ext}"
+      end
+    end
+
+    class Publish < Preview
+      def initialize(site, revision)
+        super(site)
+        @revision = Spontaneous.revision(revision)
+        environment.css_compressor = :scss
+        environment.js_compressor  = :uglifier
+        environment.context_class.manifest = manifest
+        environment.context_class.asset_mount_point = asset_mount_point
+      end
+
+      def manifest
+        @manifest ||= Sprockets::Manifest.new(environment, manifest_file)
+      end
+
+      def manifest_file
+        File.join(bundle_dir, "manifest.json")
+      end
+
+      def find(sources, options)
+        paths   = normalise_sources(sources, options)
+        paths   = paths.each_with_index.map { |p, i| [p, i] }
+        remote, local = paths.partition { |p, i| is_absolute_url?(p) }
+        manifest.compile(*local.map(&:first))
+        assets  = local.map { |p, i| [manifest.assets[p], i]}
+        assets  = assets.map { |asset, i| [to_url(asset), i] }
+        # Pass through any sources that don't exist
+        assets  = assets.map { |p, i| p.nil? ? [sources[i], i] : [p, i] }
+        assets.concat(remote).sort { |a, b| a[1] <=> b[1] }.map(&:first)
+      end
+
+      def bundle_dir
+        @revision.path(asset_mount_point)
+      end
+
+      def to_url(asset)
+        return nil if asset.nil?
+        "/" << asset_mount_point << "/" << asset
+      end
+
+      def context_extension
+        Proc.new {
+
+          class << self
+            attr_accessor :manifest, :asset_mount_point
+          end
+
+          # Too easy to be right
+          def asset_path(path, options = {})
+            asset_path, query, fragment = Spontaneous::Asset::Environment.split_asset_path(path)
+            manifest = self.class.manifest
+            manifest.compile(asset_path)
+            asset = manifest.assets[asset_path]
+            return path if asset.nil?
+            Spontaneous::Asset::Environment.join_asset_path(make_absolute(asset), query, fragment)
+          end
+
+          def make_absolute(logical)
+            "/" << self.class.asset_mount_point << "/" << logical
+          end
+        }
+      end
+    end
+  end
+end

data/lib/spontaneous/asset.rb

@@ -4,72 +4,7 @@ require 'sass'
 
 module Spontaneous
   module Asset
-    autoload :Source, "spontaneous/asset/source"
-    autoload :File,   "spontaneous/asset/file"
-
-    # Takes assets from a source directory & compiles them to some destination directory.
-    # This is deliberatly dumb about the path to the
-    class AppCompiler
-      attr_reader :environment, :manifest
-
-      def initialize(gem_path, dest_path, options = {})
-        @options     = {:compress => true}.merge(options)
-        @gem_path    = gem_path
-        @dest_path   = dest_path
-        @environment = Sprockets::Environment.new(gem_path / "application" )
-        @manifest    = Sprockets::Manifest.new(@environment, @dest_path / "public/@spontaneous/assets")
-
-        @environment.append_path(gem_path / "application/js")
-        @environment.append_path(gem_path / "application/css")
-
-        if @options[:compress]
-          @environment.register_bundle_processor "application/javascript", :uglifier do |context, data|
-            Uglifier.compile(data)
-          end
-
-          @environment.register_bundle_processor "text/css", :sass_compressor do |context, css|
-            # By this point the SCSS has already been compiled, so SASS is merely a CSS compressor
-            # and I can ignore crap around loadpaths or filenames.
-            engine = ::Sass::Engine.new(css, :style => :compressed, :syntax => :scss, :quiet => true, :custom => { :resolver => self })
-            engine.render
-          end
-        end
-      end
-
-
-      def compile
-        # @environment.each_logical_path.select { |path| path =~ /^static/ }.each do |path|
-        #   puts path
-        #   # @manifest.compile(path)
-        # end
-
-        @manifest.compile("spontaneous.js", "login.js", "require.js", "vendor/jquery.js", "spontaneous.css")
-      end
-
-      def image_path(path)
-        path
-      end
-    end
+    autoload :AppCompiler, "spontaneous/asset/app_compiler"
+    autoload :Environment, "spontaneous/asset/environment"
   end
 end
-# module Spontaneous
-#   module Sass
-#     module Helpers
-#       def image_url(asset)
-#         ::Sass::Script::String.new "url(" + resolver.image_path(asset.value) + ")"
-#       end
-#
-#       def resolver
-#         p options#[:quiet]
-#         options[:custom][:resolver]
-#       end
-#     end
-#   end
-# end
-# module Sass
-#   module Script
-#     module Functions
-#       include Spontaneous::Sass::Helpers
-#     end
-#   end
-# end

data/lib/spontaneous/box.rb

@@ -345,5 +345,4 @@ module Spontaneous
       super or (obj.is_a?(Box) && (self._prototype == obj._prototype) && (self.owner == obj.owner))
     end
   end
-
 end