spontaneous 0.2.0.beta1 → 0.2.0.beta2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/.gitignore +24 -0
- data/.locat +42 -0
- data/.travis/gemfiles/Gemfile.empty +7 -0
- data/.travis.yml +18 -0
- data/Gemfile +12 -8
- data/LICENSE +1 -1
- data/Rakefile +15 -157
- data/Readme.markdown +1 -1
- data/application/css/core.css.scss +22 -146
- data/application/css/definitions.css.scss +7 -3
- data/application/css/dialogue.css.scss +26 -1
- data/application/css/editing.css.scss +70 -28
- data/application/css/font.css.scss +1 -1
- data/application/css/popover.css.scss +2 -0
- data/application/css/top.css.scss +231 -0
- data/application/js/add_alias_dialogue.js +1 -1
- data/application/js/add_home_dialogue.js +1 -1
- data/application/js/ajax.js +61 -31
- data/application/js/box.js +4 -4
- data/application/js/conflicted_field_dialogue.js +1 -1
- data/application/js/content.js +5 -5
- data/application/js/dom.js +5 -0
- data/application/js/edit_panel.js +1 -0
- data/application/js/editing.js +1 -1
- data/application/js/extensions.js +8 -0
- data/application/js/field/boolean.js +31 -0
- data/application/js/field/file.js +32 -4
- data/application/js/field/image.js +24 -9
- data/application/js/field/markdown.js +87 -59
- data/application/js/field/select.js +1 -1
- data/application/js/field/webvideo.js +6 -1
- data/application/js/init.js +2 -2
- data/application/js/jquery-selection-position.js +130 -0
- data/application/js/location.js +4 -25
- data/application/js/meta_view/user_admin.js +2 -2
- data/application/js/metadata.js +2 -2
- data/application/js/page_browser.js +1 -1
- data/application/js/panel/root_menu.js +0 -1
- data/application/js/popover.js +27 -12
- data/application/js/popover_view.js +20 -4
- data/application/js/preview.js +31 -16
- data/application/js/progress.js +22 -21
- data/application/js/publish.js +18 -7
- data/application/js/sharded_upload.js +9 -6
- data/application/js/spontaneous.js +3 -1
- data/application/js/top_bar.js +264 -173
- data/application/js/upload.js +12 -5
- data/application/js/upload_manager.js +4 -3
- data/application/js/user.js +1 -2
- data/application/js/views/box_view.js +1 -1
- data/application/js/views/page_view.js +16 -5
- data/application/js/views/piece_view.js +5 -4
- data/application/static/font/fontawesome-webfont-1c66a4738b40ef0f6b1abca0ba9a796d.ttf +0 -0
- data/application/views/index.erb +6 -14
- data/application/views/login.erb +6 -25
- data/application/views/schema_modification_error.html.erb +3 -7
- data/db/migrations/20130114120000_create_revision_tables.rb +2 -2
- data/db/migrations/20130813111009_increase_path_length.rb +14 -0
- data/gem-public_cert.pem +20 -0
- data/lib/spontaneous/asset/app_compiler.rb +44 -0
- data/lib/spontaneous/asset/environment.rb +225 -0
- data/lib/spontaneous/asset.rb +2 -67
- data/lib/spontaneous/box.rb +0 -1
- data/lib/spontaneous/capistrano/deploy.rb +2 -2
- data/lib/spontaneous/capistrano/sync.rb +1 -1
- data/lib/spontaneous/cli/init.rb +36 -13
- data/lib/spontaneous/cli/server.rb +0 -1
- data/lib/spontaneous/cli/site.rb +2 -1
- data/lib/spontaneous/cli.rb +3 -1
- data/lib/spontaneous/collections/entry_set.rb +4 -12
- data/lib/spontaneous/collections/hash_with_fallback.rb +20 -0
- data/lib/spontaneous/collections/prototype_set.rb +6 -5
- data/lib/spontaneous/crypt.rb +2 -2
- data/lib/spontaneous/data_mapper/content_model/associations.rb +115 -63
- data/lib/spontaneous/data_mapper.rb +1 -1
- data/lib/spontaneous/errors.rb +6 -0
- data/lib/spontaneous/extensions/object_space.rb +6 -0
- data/lib/spontaneous/facet.rb +1 -0
- data/lib/spontaneous/field/base.rb +86 -13
- data/lib/spontaneous/field/boolean.rb +65 -0
- data/lib/spontaneous/field/file.rb +17 -6
- data/lib/spontaneous/field/html.rb +13 -0
- data/lib/spontaneous/field/image/size.rb +76 -0
- data/lib/spontaneous/field/image.rb +99 -414
- data/lib/spontaneous/field/tags.rb +36 -0
- data/lib/spontaneous/field/update.rb +1 -1
- data/lib/spontaneous/field/webvideo/fallback.rb +41 -0
- data/lib/spontaneous/field/webvideo/vimeo.rb +113 -0
- data/lib/spontaneous/field/webvideo/vine.rb +94 -0
- data/lib/spontaneous/field/webvideo/youtube.rb +133 -0
- data/lib/spontaneous/field/webvideo.rb +100 -250
- data/lib/spontaneous/field.rb +1 -1
- data/lib/spontaneous/generators/site/Gemfile.tt +5 -14
- data/lib/spontaneous/generators/site/assets/README.md +20 -0
- data/lib/spontaneous/generators/site/assets/css/site.scss +8 -0
- data/lib/spontaneous/generators/site/assets/js/site.js +6 -0
- data/lib/spontaneous/generators/site/config/deploy.rb.tt +9 -0
- data/lib/spontaneous/generators/site/config/user_levels.yml +14 -3
- data/lib/spontaneous/generators/site/public/README.md +12 -0
- data/lib/spontaneous/generators/site/templates/layouts/standard.html.cut.tt +2 -2
- data/lib/spontaneous/generators/site.rb +77 -35
- data/lib/spontaneous/layout.rb +6 -7
- data/lib/spontaneous/loader.rb +21 -13
- data/lib/spontaneous/media/file.rb +22 -9
- data/lib/spontaneous/media/image/attributes.rb +33 -0
- data/lib/spontaneous/media/image/format/gif.rb +4 -0
- data/lib/spontaneous/media/image/format/jpg.rb +17 -0
- data/lib/spontaneous/media/image/format/png.rb +4 -0
- data/lib/spontaneous/media/image/format/webp.rb +26 -0
- data/lib/spontaneous/media/image/format.rb +79 -0
- data/lib/spontaneous/media/image/optimizer.rb +69 -0
- data/lib/spontaneous/media/image/processor.rb +17 -0
- data/lib/spontaneous/media/image/renderable.rb +52 -0
- data/lib/spontaneous/media/image/skeptick.rb +70 -0
- data/lib/spontaneous/media/image.rb +50 -0
- data/lib/spontaneous/media/temp_file.rb +4 -0
- data/lib/spontaneous/media.rb +1 -0
- data/lib/spontaneous/model/core/aliases.rb +14 -8
- data/lib/spontaneous/model/core/boxes.rb +5 -2
- data/lib/spontaneous/model/core/entries.rb +4 -0
- data/lib/spontaneous/model/core/entry.rb +1 -0
- data/lib/spontaneous/model/core/fields.rb +5 -2
- data/lib/spontaneous/model/core/locks.rb +16 -0
- data/lib/spontaneous/model/core/media.rb +1 -15
- data/lib/spontaneous/model/core.rb +31 -1
- data/lib/spontaneous/model/page/controllers.rb +2 -2
- data/lib/spontaneous/model/page/formats.rb +1 -4
- data/lib/spontaneous/model/page/layouts.rb +6 -2
- data/lib/spontaneous/model/page/locks.rb +8 -2
- data/lib/spontaneous/model/page/page_tree.rb +2 -2
- data/lib/spontaneous/model/page/paths.rb +74 -9
- data/lib/spontaneous/model/page.rb +11 -3
- data/lib/spontaneous/model.rb +6 -6
- data/lib/spontaneous/output/context/render_cache.rb +23 -0
- data/lib/spontaneous/output/context.rb +56 -30
- data/lib/spontaneous/output/helpers/script_helper.rb +9 -53
- data/lib/spontaneous/output/helpers/stylesheet_helper.rb +8 -40
- data/lib/spontaneous/output/template/renderer.rb +17 -5
- data/lib/spontaneous/output.rb +0 -1
- data/lib/spontaneous/paths.rb +6 -2
- data/lib/spontaneous/permissions/access_key.rb +18 -0
- data/lib/spontaneous/permissions/user.rb +1 -1
- data/lib/spontaneous/permissions.rb +4 -1
- data/lib/spontaneous/plugins/application/state.rb +19 -12
- data/lib/spontaneous/prototypes/field_prototype.rb +14 -8
- data/lib/spontaneous/published_revision.rb +7 -0
- data/lib/spontaneous/publishing/immediate.rb +43 -34
- data/lib/spontaneous/publishing/revision.rb +9 -6
- data/lib/spontaneous/rack/asset_server.rb +20 -0
- data/lib/spontaneous/rack/back/alias.rb +46 -0
- data/lib/spontaneous/rack/back/application_assets.rb +28 -0
- data/lib/spontaneous/rack/back/base.rb +34 -0
- data/lib/spontaneous/rack/back/changes.rb +19 -0
- data/lib/spontaneous/rack/back/content.rb +54 -0
- data/lib/spontaneous/rack/back/events.rb +38 -0
- data/lib/spontaneous/rack/back/field.rb +37 -0
- data/lib/spontaneous/rack/back/file.rb +118 -0
- data/lib/spontaneous/rack/back/helpers.rb +71 -0
- data/lib/spontaneous/rack/back/index.rb +16 -0
- data/lib/spontaneous/rack/back/login.rb +47 -0
- data/lib/spontaneous/rack/back/map.rb +24 -0
- data/lib/spontaneous/rack/back/page.rb +46 -0
- data/lib/spontaneous/rack/back/preview.rb +43 -0
- data/lib/spontaneous/rack/back/schema.rb +30 -0
- data/lib/spontaneous/rack/back/site.rb +25 -0
- data/lib/spontaneous/rack/back/site_assets.rb +13 -0
- data/lib/spontaneous/rack/back/unsupported_browser.rb +7 -0
- data/lib/spontaneous/rack/{user_admin.rb → back/user_admin.rb} +2 -5
- data/lib/spontaneous/rack/back.rb +85 -764
- data/lib/spontaneous/rack/cacheable_file.rb +3 -3
- data/lib/spontaneous/rack/front.rb +16 -9
- data/lib/spontaneous/rack/middleware/authenticate.rb +65 -0
- data/lib/spontaneous/rack/middleware/csrf.rb +66 -0
- data/lib/spontaneous/rack/middleware/reloader.rb +52 -0
- data/lib/spontaneous/rack/middleware/scope.rb +60 -0
- data/lib/spontaneous/rack/middleware.rb +6 -0
- data/lib/spontaneous/rack/page_controller.rb +18 -5
- data/lib/spontaneous/rack/public.rb +17 -11
- data/lib/spontaneous/rack.rb +34 -24
- data/lib/spontaneous/revision.rb +29 -2
- data/lib/spontaneous/schema/uid.rb +4 -3
- data/lib/spontaneous/schema/uid_map.rb +5 -24
- data/lib/spontaneous/schema.rb +1 -0
- data/lib/spontaneous/search/database.rb +8 -0
- data/lib/spontaneous/search/field.rb +1 -1
- data/lib/spontaneous/search/index.rb +3 -5
- data/lib/spontaneous/server.rb +1 -1
- data/lib/spontaneous/simultaneous.rb +1 -1
- data/lib/spontaneous/site/features.rb +4 -5
- data/lib/spontaneous/site/helpers.rb +22 -5
- data/lib/spontaneous/site/instance.rb +2 -2
- data/lib/spontaneous/site/selectors.rb +22 -3
- data/lib/spontaneous/storage/cloud.rb +13 -9
- data/lib/spontaneous/storage/local.rb +11 -6
- data/lib/spontaneous/style.rb +40 -23
- data/lib/spontaneous/utils/database/mysql_dumper.rb +1 -1
- data/lib/spontaneous/utils/smush_it.rb +1 -1
- data/lib/spontaneous/version.rb +1 -1
- data/lib/spontaneous.rb +35 -33
- data/spontaneous.gemspec +53 -787
- data/test/experimental/test_crypt.rb +56 -56
- data/test/experimental/test_features.rb +16 -27
- data/test/fixtures/assets/public1/css/data.css.scss +3 -0
- data/test/fixtures/assets/public1/css/image1.css.scss +4 -0
- data/test/fixtures/assets/public1/css/import.css.scss +1 -0
- data/test/fixtures/assets/public1/css/urlhash.css.scss +3 -0
- data/test/fixtures/assets/public1/js/a.js +1 -1
- data/test/fixtures/assets/public1/js/all.js +4 -0
- data/test/fixtures/assets/public1/js/{m.coffee → m.js.coffee} +1 -0
- data/test/fixtures/assets/public1/x.js +1 -0
- data/test/fixtures/assets/public2/css/all.css +4 -0
- data/test/fixtures/assets/public2/css/missing.css.scss +3 -0
- data/test/fixtures/assets/public2/i/y.png +0 -0
- data/test/fixtures/assets/public2/js/b.js +1 -1
- data/test/fixtures/assets/public2/js/c.js +1 -1
- data/test/fixtures/images/size.extended.webp +0 -0
- data/test/fixtures/images/size.lossless.webp +0 -0
- data/test/fixtures/images/size.lossy.webp +0 -0
- data/test/fixtures/schema/before.yml +4 -4
- data/test/fixtures/schema/schema.yml +1 -1
- data/test/fixtures/templates/aliases/aaa.html.cut +0 -0
- data/test/fixtures/templates/extended/partial_with_renderer.html.cut +1 -0
- data/test/fixtures/templates/extended/with_includes_and_renderer.html.cut +2 -0
- data/test/functional/test_application.rb +108 -106
- data/test/functional/test_back.rb +924 -930
- data/test/functional/test_front.rb +285 -238
- data/test/functional/test_user_manager.rb +75 -100
- data/test/integration/test_installation.rb +1 -1
- data/test/support/matchers.rb +12 -0
- data/test/support/minitest.rb +121 -0
- data/test/support/rack.rb +45 -0
- data/test/support/test_start_finish.rb +103 -0
- data/test/test_helper.rb +21 -68
- data/test/test_integration_helper.rb +1 -3
- data/test/unit/test_alias.rb +432 -408
- data/test/unit/test_asset_bundler.rb +58 -58
- data/test/unit/test_assets.rb +485 -155
- data/test/unit/test_async.rb +16 -37
- data/test/unit/test_authentication.rb +425 -457
- data/test/unit/test_boxes.rb +191 -191
- data/test/unit/test_changesets.rb +244 -254
- data/test/unit/test_config.rb +128 -142
- data/test/unit/test_content.rb +313 -359
- data/test/unit/test_content_inheritance.rb +29 -30
- data/test/unit/test_datamapper.rb +1205 -1080
- data/test/unit/test_datamapper_content.rb +49 -51
- data/test/unit/test_extensions.rb +23 -23
- data/test/unit/test_fields.rb +1488 -1180
- data/test/unit/test_formats.rb +158 -158
- data/test/unit/test_generators.rb +98 -40
- data/test/unit/test_helpers.rb +73 -76
- data/test/unit/test_image_size.rb +53 -22
- data/test/unit/test_images.rb +164 -165
- data/test/unit/test_layouts.rb +133 -122
- data/test/unit/test_logger.rb +14 -17
- data/test/unit/test_media.rb +69 -84
- data/test/unit/test_modifications.rb +513 -525
- data/test/unit/test_page.rb +462 -361
- data/test/unit/test_permissions.rb +379 -364
- data/test/unit/test_piece.rb +67 -75
- data/test/unit/test_plugins.rb +82 -89
- data/test/unit/test_prototype_set.rb +215 -216
- data/test/unit/test_prototypes.rb +114 -124
- data/test/unit/test_publishing.rb +252 -289
- data/test/unit/test_render.rb +167 -115
- data/test/unit/test_revisions.rb +436 -444
- data/test/unit/test_schema.rb +339 -309
- data/test/unit/test_search.rb +577 -574
- data/test/unit/test_serialisation.rb +136 -147
- data/test/unit/test_site.rb +252 -227
- data/test/unit/test_skeptick.rb +130 -0
- data/test/unit/test_storage.rb +46 -40
- data/test/unit/test_structure.rb +57 -66
- data/test/unit/test_styles.rb +104 -104
- data/test/unit/test_templates.rb +72 -57
- data/test/unit/test_type_hierarchy.rb +15 -16
- data/test/unit/test_visibility.rb +239 -257
- metadata +455 -326
- data/application/js/vendor/JS.Class-2.1.5/CHANGELOG +0 -283
- data/application/js/vendor/JS.Class-2.1.5/MIT-LICENSE +0 -30
- data/application/js/vendor/JS.Class-2.1.5/README +0 -30
- data/application/js/vendor/JS.Class-2.1.5/min/command.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/comparable.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/constant_scope.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/decorator.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/enumerable.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/forwardable.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/hash.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/linked_list.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/loader.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/method_chain.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/observable.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/package.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/proxy.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/ruby.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/set.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/stack_trace.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/state.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/stdlib.js +0 -16
- data/application/js/vendor/jquery-1.6.2.min.js +0 -18
- data/application/js/vendor/jquery-ui-1.8.16.custom.min.js +0 -791
- data/application/js/vendor/jquery-ui-1.8.9.custom.min.js +0 -415
- data/application/static/font/fontawesome-webfont-5c5c21100a346972a82c34c5e96ffcfe.ttf +0 -0
- data/application/static/select-arrow-6e7dd3745b00e934b0d7a3250c46558b.png +0 -0
- data/bin/limit-upload +0 -5
- data/bin/unlimit-upload +0 -3
- data/lib/spontaneous/asset/file.rb +0 -25
- data/lib/spontaneous/asset/source.rb +0 -28
- data/lib/spontaneous/image_size.rb +0 -123
- data/lib/spontaneous/output/assets/compression.rb +0 -58
- data/lib/spontaneous/output/assets.rb +0 -32
- data/lib/spontaneous/rack/around_back.rb +0 -20
- data/lib/spontaneous/rack/around_front.rb +0 -27
- data/lib/spontaneous/rack/around_preview.rb +0 -22
- data/lib/spontaneous/rack/assets.rb +0 -126
- data/lib/spontaneous/rack/authentication.rb +0 -20
- data/lib/spontaneous/rack/cookie_authentication.rb +0 -38
- data/lib/spontaneous/rack/helpers.rb +0 -52
- data/lib/spontaneous/rack/http.rb +0 -18
- data/lib/spontaneous/rack/media.rb +0 -30
- data/lib/spontaneous/rack/query_authentication.rb +0 -35
- data/lib/spontaneous/rack/reloader.rb +0 -45
- data/lib/spontaneous/rack/user_helpers.rb +0 -28
- /data/{README → application/js/field/markdown/text_command.js} +0 -0
- /data/application/js/vendor/{JS.Class-2.1.5/min/core.js → js.class-2.1.5.min.js} +0 -0
- /data/test/fixtures/assets/public1/css/{a.scss → a.css.scss} +0 -0
- /data/{lib/spontaneous/generators/site/public/css/site.scss → test/fixtures/assets/public1/x.css} +0 -0
- /data/{lib/spontaneous/generators/site/public/js/.empty_directory → test/fixtures/assets/public1/x.png} +0 -0
- /data/test/fixtures/assets/public2/css/{b.scss → b.css.scss} +0 -0
- /data/test/fixtures/assets/public2/js/{n.coffee → n.js.coffee} +0 -0
- /data/test/fixtures/back/{public → assets}/css/sass_include.scss +0 -0
- /data/test/fixtures/back/{public → assets}/css/sass_template.scss +0 -0
- /data/test/fixtures/back/{public → assets}/js/coffeescript.coffee +0 -0
- /data/{lib/spontaneous/generators/site/public/js/site.js → test/fixtures/templates/aliases/aa_alias.html.cut} +0 -0
Binary file
|
Binary file
|
data/bin/limit-upload
DELETED
data/bin/unlimit-upload
DELETED
@@ -1,25 +0,0 @@
|
|
1
|
-
require 'pathname'
|
2
|
-
|
3
|
-
module Spontaneous::Asset
|
4
|
-
class File
|
5
|
-
def initialize(source, relative_path)
|
6
|
-
@source, @relative_path = source, relative_path
|
7
|
-
end
|
8
|
-
|
9
|
-
def load_path
|
10
|
-
[name, extensions.first].join(".")
|
11
|
-
end
|
12
|
-
|
13
|
-
def basename
|
14
|
-
@basename ||= ::File.basename(@relative_path)
|
15
|
-
end
|
16
|
-
|
17
|
-
def name
|
18
|
-
basename.split(".").first
|
19
|
-
end
|
20
|
-
|
21
|
-
def extensions
|
22
|
-
@extensions ||= basename.split(".")[1..-1]
|
23
|
-
end
|
24
|
-
end
|
25
|
-
end
|
@@ -1,28 +0,0 @@
|
|
1
|
-
require 'pathname'
|
2
|
-
|
3
|
-
module Spontaneous::Asset
|
4
|
-
class Source
|
5
|
-
def initialize(source_dir)
|
6
|
-
@source_dir = ::File.expand_path(source_dir)
|
7
|
-
end
|
8
|
-
|
9
|
-
def source_path
|
10
|
-
@source_path ||= Pathname.new(@source_dir)
|
11
|
-
end
|
12
|
-
|
13
|
-
def source_files
|
14
|
-
source_paths.map(&:to_s)
|
15
|
-
end
|
16
|
-
|
17
|
-
def source_paths
|
18
|
-
@source_files ||= find_source_paths
|
19
|
-
end
|
20
|
-
|
21
|
-
def find_source_paths
|
22
|
-
absolute_paths = Dir[@source_dir / "**/*.*"].map { |path| Pathname.new(path) }
|
23
|
-
source_path = self.source_path
|
24
|
-
absolute_paths.map { |path| path.relative_path_from(source_path) }
|
25
|
-
end
|
26
|
-
end
|
27
|
-
end
|
28
|
-
|
@@ -1,123 +0,0 @@
|
|
1
|
-
# encoding: UTF-8
|
2
|
-
|
3
|
-
module Spontaneous
|
4
|
-
module ImageSize
|
5
|
-
def self.read(file)
|
6
|
-
reader = ImageReader.new(file)
|
7
|
-
reader.size
|
8
|
-
end
|
9
|
-
|
10
|
-
class ImageReader
|
11
|
-
|
12
|
-
def initialize(file)
|
13
|
-
if file.kind_of? IO
|
14
|
-
read_size(file)
|
15
|
-
else
|
16
|
-
File.open(file, 'rb') { |io| read_size(io) }
|
17
|
-
end
|
18
|
-
end
|
19
|
-
|
20
|
-
def read_size(file)
|
21
|
-
klass = image_type(file)
|
22
|
-
@image = klass.new(file)
|
23
|
-
end
|
24
|
-
|
25
|
-
def image_type(file)
|
26
|
-
return Formats::EMPTY if file.size == 0
|
27
|
-
img_top = file.read(16)
|
28
|
-
bytes = img_top.unpack("C*")
|
29
|
-
file.seek(0,0)
|
30
|
-
if img_top =~ /^GIF8[7,9]a/
|
31
|
-
Formats::GIF
|
32
|
-
elsif bytes[0, 8] == [137, 80, 78, 71, 13, 10, 26, 10]
|
33
|
-
Formats::PNG
|
34
|
-
elsif bytes[0, 2] == [255, 216]
|
35
|
-
Formats::JPEG
|
36
|
-
else
|
37
|
-
Formats::OTHER
|
38
|
-
end
|
39
|
-
end
|
40
|
-
|
41
|
-
def size
|
42
|
-
@image.size
|
43
|
-
end
|
44
|
-
|
45
|
-
module Formats
|
46
|
-
class Abstract
|
47
|
-
def initialize(file)
|
48
|
-
@file = file
|
49
|
-
def @file.read_o(length = 1, offset = nil)
|
50
|
-
self.seek(offset, 0) if offset
|
51
|
-
ret = self.read(length)
|
52
|
-
raise "cannot read!!" unless ret
|
53
|
-
ret
|
54
|
-
end
|
55
|
-
# read size straight away so that if file is closed we don't raise an error
|
56
|
-
@size = read_size
|
57
|
-
end
|
58
|
-
def size
|
59
|
-
@size
|
60
|
-
end
|
61
|
-
|
62
|
-
def read_size
|
63
|
-
[0,0]
|
64
|
-
end
|
65
|
-
end
|
66
|
-
|
67
|
-
class EMPTY
|
68
|
-
def initialize(file)
|
69
|
-
end
|
70
|
-
def size
|
71
|
-
[0, 0]
|
72
|
-
end
|
73
|
-
end
|
74
|
-
class GIF < Abstract
|
75
|
-
def read_size
|
76
|
-
@file.read_o(6)
|
77
|
-
@file.read_o(4).unpack('vv')
|
78
|
-
end
|
79
|
-
end
|
80
|
-
|
81
|
-
class JPEG < Abstract
|
82
|
-
JPEGCodeCheck = [
|
83
|
-
"\xc0", "\xc1", "\xc2", "\xc3",
|
84
|
-
"\xc5", "\xc6", "\xc7",
|
85
|
-
"\xc9", "\xca", "\xcb",
|
86
|
-
"\xcd", "\xce", "\xcf",
|
87
|
-
].map { |c| c.unpack('C').first }
|
88
|
-
|
89
|
-
def read_size
|
90
|
-
c_marker = 255 # Section marker.
|
91
|
-
|
92
|
-
@file.read_o(2)
|
93
|
-
while(true)
|
94
|
-
marker, code, length = @file.read_o(4).unpack('CCn')
|
95
|
-
raise "JPEG marker not found!" if marker != c_marker
|
96
|
-
|
97
|
-
if JPEGCodeCheck.include?(code)
|
98
|
-
height, width = @file.read_o(5).unpack('xnn')
|
99
|
-
return([width, height])
|
100
|
-
end
|
101
|
-
@file.read_o(length - 2)
|
102
|
-
end
|
103
|
-
end
|
104
|
-
end
|
105
|
-
class PNG < Abstract
|
106
|
-
def read_size
|
107
|
-
@file.read_o(12)
|
108
|
-
raise "This file is not PNG." unless @file.read_o(4) == "IHDR"
|
109
|
-
@file.read_o(8).unpack('NN')
|
110
|
-
end
|
111
|
-
end
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
class OTHER < Abstract
|
116
|
-
def read_size
|
117
|
-
[0,0]
|
118
|
-
end
|
119
|
-
end
|
120
|
-
end
|
121
|
-
end
|
122
|
-
end
|
123
|
-
end
|
@@ -1,58 +0,0 @@
|
|
1
|
-
require 'shine'
|
2
|
-
require 'sass'
|
3
|
-
|
4
|
-
module Spontaneous
|
5
|
-
module Output
|
6
|
-
module Assets
|
7
|
-
module Compression
|
8
|
-
extend self
|
9
|
-
|
10
|
-
def compress_js(filelist, options={})
|
11
|
-
shine_compress_files(filelist, :js, options)
|
12
|
-
end
|
13
|
-
|
14
|
-
def compress_js_string(js, options={})
|
15
|
-
shine_compress_string(js, :js, options)
|
16
|
-
end
|
17
|
-
|
18
|
-
def compress_css(filelist, options={})
|
19
|
-
# compress_files(filelist, :css, options)
|
20
|
-
opts = {
|
21
|
-
:load_paths => [Spontaneous.css_dir],
|
22
|
-
# :filename => sass_template,
|
23
|
-
:cache => false,
|
24
|
-
:style => :compressed
|
25
|
-
}.merge(options)
|
26
|
-
css = filelist.map do |path|
|
27
|
-
Sass::Engine.for_file(path, opts).render
|
28
|
-
end.join("\n")
|
29
|
-
hash = digest(css)
|
30
|
-
[css, hash]
|
31
|
-
end
|
32
|
-
|
33
|
-
def shine_compress_string(string, format, options = {})
|
34
|
-
compressed = Shine::compress_string(string, format, options).force_encoding("UTF-8")
|
35
|
-
hash = digest(compressed)
|
36
|
-
[compressed, hash]
|
37
|
-
end
|
38
|
-
|
39
|
-
def shine_compress_files(filelist, format, options = {})
|
40
|
-
original_size = filesize(filelist)
|
41
|
-
compressed = Shine::compress_files(filelist, format, options).force_encoding("UTF-8")
|
42
|
-
logger.info("Compressed #{filelist.length} files. Original size #{original_size}, compressed size #{compressed.length}, ratio #{(100*compressed.length.to_f/original_size.to_f).round}%")
|
43
|
-
hash = digest(compressed)
|
44
|
-
[compressed, hash]
|
45
|
-
end
|
46
|
-
|
47
|
-
def digest(str)
|
48
|
-
hash = Digest::SHA1.new.update(str).hexdigest
|
49
|
-
end
|
50
|
-
|
51
|
-
|
52
|
-
def filesize(paths)
|
53
|
-
paths.compact.inject(0) { |sum, path| sum += File.size(path) }
|
54
|
-
end
|
55
|
-
end
|
56
|
-
end
|
57
|
-
end
|
58
|
-
end
|
@@ -1,32 +0,0 @@
|
|
1
|
-
module Spontaneous
|
2
|
-
module Output
|
3
|
-
module Assets
|
4
|
-
extend self
|
5
|
-
|
6
|
-
def compress_js(file_paths, options={})
|
7
|
-
Compression.compress_js(file_paths, options)
|
8
|
-
end
|
9
|
-
|
10
|
-
def url(file = nil)
|
11
|
-
Spontaneous::Output.asset_url(file)
|
12
|
-
end
|
13
|
-
|
14
|
-
def path_for(revision, path = nil)
|
15
|
-
File.join [Spontaneous::Output.asset_path(revision), path].compact
|
16
|
-
end
|
17
|
-
|
18
|
-
def find_file(*relative_paths)
|
19
|
-
relative_paths.flatten!
|
20
|
-
Spontaneous.instance.paths.expanded(:public).each do |root|
|
21
|
-
relative_paths.each do |relative_path|
|
22
|
-
path = root / relative_path
|
23
|
-
return path if ::File.exist?(path)
|
24
|
-
end
|
25
|
-
end
|
26
|
-
nil
|
27
|
-
end
|
28
|
-
|
29
|
-
autoload :Compression, "spontaneous/output/assets/compression"
|
30
|
-
end
|
31
|
-
end
|
32
|
-
end
|
@@ -1,20 +0,0 @@
|
|
1
|
-
# encoding: UTF-8
|
2
|
-
|
3
|
-
module Spontaneous
|
4
|
-
module Rack
|
5
|
-
class AroundBack
|
6
|
-
def initialize(app)
|
7
|
-
@app = app
|
8
|
-
end
|
9
|
-
|
10
|
-
|
11
|
-
def call(env)
|
12
|
-
response = nil
|
13
|
-
Spontaneous::Content.scope(nil, false) do
|
14
|
-
response = @app.call(env)
|
15
|
-
end
|
16
|
-
response
|
17
|
-
end
|
18
|
-
end
|
19
|
-
end
|
20
|
-
end
|
@@ -1,27 +0,0 @@
|
|
1
|
-
# encoding: UTF-8
|
2
|
-
|
3
|
-
module Spontaneous
|
4
|
-
module Rack
|
5
|
-
POWERED_BY = {
|
6
|
-
"X-Powered-By" => "Spontaneous CMS v#{Spontaneous::VERSION}"
|
7
|
-
}
|
8
|
-
|
9
|
-
class AroundFront
|
10
|
-
def initialize(app)
|
11
|
-
@app = app
|
12
|
-
@renderer = Spontaneous::Output.published_renderer
|
13
|
-
end
|
14
|
-
|
15
|
-
def call(env)
|
16
|
-
status = headers = body = nil
|
17
|
-
env[Rack::RENDERER] = @renderer
|
18
|
-
Spontaneous::Content.with_published do
|
19
|
-
status, headers, body = @app.call(env)
|
20
|
-
end
|
21
|
-
[status, headers.merge(POWERED_BY), body]
|
22
|
-
end
|
23
|
-
end
|
24
|
-
|
25
|
-
end
|
26
|
-
end
|
27
|
-
|
@@ -1,22 +0,0 @@
|
|
1
|
-
# encoding: UTF-8
|
2
|
-
|
3
|
-
module Spontaneous
|
4
|
-
module Rack
|
5
|
-
class AroundPreview
|
6
|
-
def initialize(app)
|
7
|
-
@app = app
|
8
|
-
@renderer = Spontaneous::Output.preview_renderer
|
9
|
-
Spontaneous::Output.renderer = @renderer
|
10
|
-
end
|
11
|
-
|
12
|
-
def call(env)
|
13
|
-
env[Rack::RENDERER] = @renderer
|
14
|
-
response = nil
|
15
|
-
Spontaneous::Content.scope(nil, true) do
|
16
|
-
response = @app.call(env)
|
17
|
-
end
|
18
|
-
response
|
19
|
-
end
|
20
|
-
end
|
21
|
-
end
|
22
|
-
end
|
@@ -1,126 +0,0 @@
|
|
1
|
-
# encoding: UTF-8
|
2
|
-
|
3
|
-
require 'shine'
|
4
|
-
require 'sass'
|
5
|
-
|
6
|
-
module Spontaneous
|
7
|
-
module Rack
|
8
|
-
module Assets
|
9
|
-
|
10
|
-
# module Bundling
|
11
|
-
# extend self
|
12
|
-
|
13
|
-
# def compress_js(filelist, options={})
|
14
|
-
# shine_compress_files(filelist, :js, options)
|
15
|
-
# end
|
16
|
-
|
17
|
-
# def compress_css(filelist, options={})
|
18
|
-
# # compress_files(filelist, :css, options)
|
19
|
-
# options = {
|
20
|
-
# :load_paths => [Spontaneous.css_dir],
|
21
|
-
# # :filename => sass_template,
|
22
|
-
# :cache => false,
|
23
|
-
# :style => :compressed
|
24
|
-
# }
|
25
|
-
# paths = paths(filelist)
|
26
|
-
# css = paths.map do |path|
|
27
|
-
# Sass::Engine.for_file(path, options).render
|
28
|
-
# end.join("\\n")
|
29
|
-
# hash = digest(css)
|
30
|
-
# [css, hash]
|
31
|
-
# end
|
32
|
-
|
33
|
-
# def shine_compress_files(filelist, format, options = {})
|
34
|
-
# paths = paths(filelist)
|
35
|
-
# original_size = filesize(paths)
|
36
|
-
# compressed = Shine::compress_files(paths, format, options)
|
37
|
-
# logger.info("Compressed #{filelist.length} files. Original size #{original_size}, compressed size #{compressed.length}, ratio #{(100*compressed.length.to_f/original_size.to_f).round}%")
|
38
|
-
# hash = digest(compressed)
|
39
|
-
# [compressed, hash]
|
40
|
-
# end
|
41
|
-
|
42
|
-
# def digest(str)
|
43
|
-
# hash = Digest::SHA1.new.update(str).hexdigest
|
44
|
-
# end
|
45
|
-
|
46
|
-
# def paths(filelist)
|
47
|
-
# filelist.map { |file| filepath(file) }.tap do |paths|
|
48
|
-
# logger.info("Bundling #{paths.length} files")
|
49
|
-
# end
|
50
|
-
# end
|
51
|
-
|
52
|
-
# def filepath(file)
|
53
|
-
# File.join(Spontaneous.application_dir, filetype, "#{file}.#{extension}")
|
54
|
-
# end
|
55
|
-
|
56
|
-
# def filesize(paths)
|
57
|
-
# paths.inject(0) { |sum, path| sum += File.size(path) }
|
58
|
-
# end
|
59
|
-
# end
|
60
|
-
module JavaScript
|
61
|
-
extend Spontaneous::Output::Assets::Compression
|
62
|
-
|
63
|
-
def self.filetype
|
64
|
-
"js"
|
65
|
-
end
|
66
|
-
|
67
|
-
def self.extension
|
68
|
-
"js"
|
69
|
-
end
|
70
|
-
|
71
|
-
def self.compress(filelist)
|
72
|
-
compress_js(paths(filelist))
|
73
|
-
end
|
74
|
-
|
75
|
-
def paths(filelist)
|
76
|
-
filelist.map { |file| filepath(file) }.tap do |paths|
|
77
|
-
logger.info("Bundling #{paths.length} files")
|
78
|
-
end
|
79
|
-
end
|
80
|
-
|
81
|
-
def filepath(file)
|
82
|
-
File.join(Spontaneous.application_dir, filetype, "#{file}.#{extension}")
|
83
|
-
end
|
84
|
-
|
85
|
-
# TODO: remove these
|
86
|
-
JQUERY = %w(vendor/jquery)
|
87
|
-
COMPATIBILITY = []#%w(compatibility)
|
88
|
-
REQUIRE = %w(require)
|
89
|
-
LOGIN_JS = %w(login)
|
90
|
-
EDITING_JS = %w(spontaneous)
|
91
|
-
end
|
92
|
-
|
93
|
-
module CSS
|
94
|
-
extend Spontaneous::Output::Assets::Compression
|
95
|
-
|
96
|
-
def self.filetype
|
97
|
-
"css"
|
98
|
-
end
|
99
|
-
def self.extension
|
100
|
-
"scss"
|
101
|
-
end
|
102
|
-
|
103
|
-
def self.compress(filelist)
|
104
|
-
compress_css(paths(filelist))
|
105
|
-
end
|
106
|
-
|
107
|
-
|
108
|
-
def paths(filelist)
|
109
|
-
filelist.map { |file| filepath(file) }.tap do |paths|
|
110
|
-
logger.info("Bundling #{paths.length} files")
|
111
|
-
end
|
112
|
-
end
|
113
|
-
|
114
|
-
def filepath(file)
|
115
|
-
File.join(Spontaneous.application_dir, filetype, "#{file}.#{extension}")
|
116
|
-
end
|
117
|
-
|
118
|
-
# TODO: remove these
|
119
|
-
LOGIN_CSS = %w(spontaneous) # login
|
120
|
-
EDITING_CSS = %w(spontaneous)
|
121
|
-
SCHEMA_MODIFICATION_CSS = %w(spontaneous) #schema_error
|
122
|
-
end
|
123
|
-
|
124
|
-
end # Assets
|
125
|
-
end # Rack
|
126
|
-
end # Spontaneous
|
@@ -1,20 +0,0 @@
|
|
1
|
-
# encoding: UTF-8
|
2
|
-
|
3
|
-
require 'rack'
|
4
|
-
|
5
|
-
module Spontaneous::Rack
|
6
|
-
module Authentication
|
7
|
-
|
8
|
-
def requires_authentication!(options = {})
|
9
|
-
first_level_exceptions = (options[:except_all] || []).concat(["#{NAMESPACE}/login", "#{NAMESPACE}/reauthenticate"] )
|
10
|
-
second_level_exceptions = (options[:except_key] || [])
|
11
|
-
before {
|
12
|
-
unless first_level_exceptions.any? { |e| e === request.path }
|
13
|
-
ignore_key = second_level_exceptions.any? { |e| e === request.path }
|
14
|
-
valid_key = ignore_key || Spontaneous::Permissions::AccessKey.valid?(params[KEY_PARAM], user)
|
15
|
-
show_login_page( :login => '' ) unless (user and valid_key)
|
16
|
-
end
|
17
|
-
}
|
18
|
-
end
|
19
|
-
end
|
20
|
-
end
|
@@ -1,38 +0,0 @@
|
|
1
|
-
# encoding: UTF-8
|
2
|
-
|
3
|
-
module Spontaneous
|
4
|
-
module Rack
|
5
|
-
class CookieAuthentication
|
6
|
-
def initialize(app)
|
7
|
-
@app = app
|
8
|
-
end
|
9
|
-
|
10
|
-
def access_key(env)
|
11
|
-
if login = Site.config.auto_login
|
12
|
-
user = Spontaneous::Permissions::User.login(login)
|
13
|
-
if user.access_keys.empty?
|
14
|
-
user.generate_access_key(env["REMOTE_ADDR"])
|
15
|
-
else
|
16
|
-
user.access_keys.first
|
17
|
-
end
|
18
|
-
else
|
19
|
-
request = ::Rack::Request.new(env)
|
20
|
-
api_key = request.cookies[Spontaneous::Rack::AUTH_COOKIE]
|
21
|
-
if api_key && key = Spontaneous::Permissions::AccessKey.authenticate(api_key, env["REMOTE_ADDR"])
|
22
|
-
key
|
23
|
-
else
|
24
|
-
nil
|
25
|
-
end
|
26
|
-
end
|
27
|
-
end
|
28
|
-
|
29
|
-
def call(env)
|
30
|
-
response = nil
|
31
|
-
key = env[S::Rack::ACTIVE_KEY] = access_key(env)
|
32
|
-
user = env[S::Rack::ACTIVE_USER] = key.user if key
|
33
|
-
response = @app.call(env)
|
34
|
-
response
|
35
|
-
end
|
36
|
-
end
|
37
|
-
end
|
38
|
-
end
|
@@ -1,52 +0,0 @@
|
|
1
|
-
# encoding: UTF-8
|
2
|
-
|
3
|
-
require 'sprockets'
|
4
|
-
|
5
|
-
module Spontaneous
|
6
|
-
module Rack
|
7
|
-
module Helpers
|
8
|
-
def json(response)
|
9
|
-
content_type 'application/json', :charset => 'utf-8'
|
10
|
-
response.serialise_http(user)
|
11
|
-
end
|
12
|
-
|
13
|
-
def application_assets
|
14
|
-
@application_assets_compiler ||= Spontaneous::Asset::AppCompiler.new(Spontaneous.gem_dir, Spontaneous.root)
|
15
|
-
end
|
16
|
-
|
17
|
-
def style_url(style)
|
18
|
-
asset_url(style, "css")
|
19
|
-
end
|
20
|
-
|
21
|
-
def script_url(script)
|
22
|
-
asset_url(script, "js")
|
23
|
-
end
|
24
|
-
|
25
|
-
def asset_url(file, type)
|
26
|
-
file = "#{file}.#{type}" unless file =~ /\.#{type}$/
|
27
|
-
|
28
|
-
if (compiled_asset = application_assets.manifest.assets[file])
|
29
|
-
return "#{NAMESPACE}/assets/#{compiled_asset}"
|
30
|
-
end
|
31
|
-
# TODO: use the sprockets environment to append a modification time to the non-compiled URL
|
32
|
-
"#{NAMESPACE}/#{type}/#{file}"
|
33
|
-
end
|
34
|
-
|
35
|
-
def script_list(scripts)
|
36
|
-
scripts.map do |script|
|
37
|
-
script = "#{script}.js" unless script =~ /\.js$/
|
38
|
-
src = script_url(script)
|
39
|
-
size = 0
|
40
|
-
if (asset = application_assets.manifest.files[File.basename(src)])
|
41
|
-
size = asset["size"]
|
42
|
-
else
|
43
|
-
src = "#{NAMESPACE}/js/#{script}"
|
44
|
-
path = Spontaneous.application_dir("/js/#{script}")
|
45
|
-
size = File.size(path)
|
46
|
-
end
|
47
|
-
[src, size]
|
48
|
-
end.to_json
|
49
|
-
end
|
50
|
-
end
|
51
|
-
end
|
52
|
-
end
|
@@ -1,18 +0,0 @@
|
|
1
|
-
# encoding: UTF-8
|
2
|
-
|
3
|
-
|
4
|
-
module Spontaneous
|
5
|
-
module Rack
|
6
|
-
module HTTP
|
7
|
-
METHOD_GET = "GET".freeze
|
8
|
-
METHOD_POST = "POST".freeze
|
9
|
-
METHOD_HEAD = "HEAD".freeze
|
10
|
-
HTTP_CONTENT_LENGTH = "Content-Length".freeze
|
11
|
-
HTTP_EXPIRES = "Expires".freeze
|
12
|
-
HTTP_CACHE_CONTROL = "Cache-Control".freeze
|
13
|
-
HTTP_LAST_MODIFIED = "Last-Modified".freeze
|
14
|
-
HTTP_NO_CACHE = "max-age=0, must-revalidate, no-cache, no-store".freeze
|
15
|
-
end
|
16
|
-
end
|
17
|
-
end
|
18
|
-
|
@@ -1,30 +0,0 @@
|
|
1
|
-
# encoding: UTF-8
|
2
|
-
|
3
|
-
require 'rack'
|
4
|
-
|
5
|
-
module Spontaneous::Rack
|
6
|
-
class XXX < ::Rack::File
|
7
|
-
include HTTP
|
8
|
-
|
9
|
-
TEN_YEARS = 10*365*24*3600
|
10
|
-
MAX_AGE = "max-age=#{TEN_YEARS}, public".freeze
|
11
|
-
|
12
|
-
def initialize(file_root)
|
13
|
-
super(file_root, 'public')
|
14
|
-
end
|
15
|
-
|
16
|
-
def call(env)
|
17
|
-
status, headers, body = super
|
18
|
-
[status, caching_headers(headers), body]
|
19
|
-
end
|
20
|
-
|
21
|
-
# media is never over-written so we can make sure clients
|
22
|
-
# never make the same request twice
|
23
|
-
def caching_headers(headers)
|
24
|
-
headers.merge({
|
25
|
-
HTTP_CACHE_CONTROL => MAX_AGE,
|
26
|
-
HTTP_EXPIRES => (Time.now + TEN_YEARS).httpdate
|
27
|
-
})
|
28
|
-
end
|
29
|
-
end
|
30
|
-
end
|
@@ -1,35 +0,0 @@
|
|
1
|
-
# encoding: UTF-8
|
2
|
-
|
3
|
-
module Spontaneous
|
4
|
-
module Rack
|
5
|
-
# Rack middleware that only allows access if the access key passed in the request query
|
6
|
-
# matches that used in the cookie
|
7
|
-
#
|
8
|
-
# Depends on CookieAuthentication being in the chain *before* this app to set up the current user in the env
|
9
|
-
class QueryAuthentication
|
10
|
-
def initialize(app)
|
11
|
-
@app = app
|
12
|
-
end
|
13
|
-
|
14
|
-
def call(env)
|
15
|
-
user = env[S::Rack::ACTIVE_USER]
|
16
|
-
if user.nil?
|
17
|
-
unauthorized!
|
18
|
-
else
|
19
|
-
request = ::Rack::Request.new(env)
|
20
|
-
key = request[S::Rack::KEY_PARAM]
|
21
|
-
if ::S::Permissions::AccessKey.valid?(key, user)
|
22
|
-
@app.call(env)
|
23
|
-
else
|
24
|
-
unauthorized!
|
25
|
-
end
|
26
|
-
end
|
27
|
-
end
|
28
|
-
|
29
|
-
def unauthorized!
|
30
|
-
[401, {}, "Unauthorized"]
|
31
|
-
end
|
32
|
-
end
|
33
|
-
end
|
34
|
-
end
|
35
|
-
|