middleman-core 3.4.1 → 4.0.0.alpha.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/{fixtures/asciidoc-app/config.rb → .gemtest} +0 -0
- data/.yardopts +2 -6
- data/Rakefile +5 -1
- data/features/asset_hash.feature +32 -61
- data/features/asset_host.feature +11 -23
- data/features/builder.feature +2 -0
- data/features/cache_buster.feature +1 -1
- data/features/chained_templates.feature +2 -92
- data/features/clean_build.feature +0 -18
- data/features/cli_init.feature +17 -111
- data/features/content_type.feature +2 -5
- data/features/custom_layouts.feature +24 -20
- data/features/data.feature +0 -28
- data/features/directory_index.feature +9 -9
- data/features/front-matter-neighbor.feature +0 -32
- data/features/front-matter.feature +0 -17
- data/features/helpers_content_tag.feature +2 -2
- data/features/helpers_form_tag.feature +4 -4
- data/features/helpers_link_to.feature +11 -29
- data/features/helpers_url_for.feature +11 -11
- data/features/i18n_builder.feature +5 -5
- data/features/i18n_preview.feature +8 -8
- data/features/markdown_kramdown.feature +1 -1
- data/features/markdown_kramdown_in_haml.feature +1 -2
- data/features/markdown_redcarpet.feature +23 -23
- data/features/minify_css.feature +9 -75
- data/features/minify_javascript.feature +12 -65
- data/features/mount_rack.feature +2 -4
- data/features/multiple-sources.feature +27 -0
- data/features/proxy_pages.feature +0 -10
- data/features/redirects.feature +6 -7
- data/features/relative_assets.feature +21 -66
- data/features/slim.feature +11 -7
- data/features/stylus.feature +1 -1
- data/features/support/env.rb +4 -4
- data/fixtures/asset-hash-app/config.rb +0 -2
- data/fixtures/asset-hash-app/source/index.html.erb +1 -1
- data/fixtures/asset-hash-host-app/config.rb +1 -3
- data/fixtures/asset-host-app/source/asset_host.html.erb +20 -1
- data/fixtures/asset-host-app/source/stylesheets/asset_host.css.sass +47 -2
- data/fixtures/auto-css-app/config.rb +8 -10
- data/fixtures/auto-js-app/config.rb +8 -10
- data/fixtures/basic-data-app/config.rb +2 -4
- data/fixtures/cache-buster-app/source/stylesheets/relative_assets.css.sass +0 -1
- data/fixtures/cache-buster-app/source/stylesheets/site.css.sass +3 -1
- data/fixtures/capture-html-app/config.rb +3 -5
- data/fixtures/clean-app/config-complications.rb +4 -6
- data/fixtures/clean-app/config.rb +4 -6
- data/fixtures/content-for-app/config.rb +3 -5
- data/fixtures/custom-layout-app/config.rb +1 -1
- data/fixtures/data-app/config.rb +1 -1
- data/fixtures/dynamic-pages-app/config.rb +20 -42
- data/fixtures/dynamic-pages-app/source/real/index.html.erb +3 -3
- data/fixtures/ember-cli-app/config.rb +5 -0
- data/fixtures/{compass-sprites-app/config.rb → ember-cli-app/source/javascripts/file.js} +0 -0
- data/fixtures/ember-cli-app/test-app/.bowerrc +3 -0
- data/fixtures/ember-cli-app/test-app/.gitignore +17 -0
- data/fixtures/ember-cli-app/test-app/.jshintrc +32 -0
- data/fixtures/ember-cli-app/test-app/Brocfile.js +20 -0
- data/fixtures/ember-cli-app/test-app/README.md +25 -0
- data/fixtures/ember-cli-app/test-app/app/app.js +14 -0
- data/fixtures/{implied-extensions-app/config.rb → ember-cli-app/test-app/app/components/.gitkeep} +0 -0
- data/fixtures/{javascript-app/config.rb → ember-cli-app/test-app/app/controllers/.gitkeep} +0 -0
- data/fixtures/{more-implied-extensions-app/config.rb → ember-cli-app/test-app/app/helpers/.gitkeep} +0 -0
- data/fixtures/ember-cli-app/test-app/app/index.html +26 -0
- data/fixtures/{partial-chained_templates-app/config.rb → ember-cli-app/test-app/app/models/.gitkeep} +0 -0
- data/fixtures/ember-cli-app/test-app/app/router.js +10 -0
- data/fixtures/{preview-server-app/config-empty.rb → ember-cli-app/test-app/app/routes/.gitkeep} +0 -0
- data/fixtures/{request-app/config.rb → ember-cli-app/test-app/app/styles/.gitkeep} +0 -0
- data/fixtures/ember-cli-app/test-app/app/styles/app.css +3 -0
- data/fixtures/{traversal-app/source/.htaccess → ember-cli-app/test-app/app/templates/.gitkeep} +0 -0
- data/fixtures/ember-cli-app/test-app/app/templates/application.hbs +3 -0
- data/{lib/middleman-core/templates/html5/source/img/.gitignore → fixtures/ember-cli-app/test-app/app/templates/components/.gitkeep} +0 -0
- data/{lib/middleman-core/templates/mobile/source/js/script.js → fixtures/ember-cli-app/test-app/app/views/.gitkeep} +0 -0
- data/fixtures/ember-cli-app/test-app/bower.json +16 -0
- data/fixtures/ember-cli-app/test-app/config/environment.js +38 -0
- data/fixtures/ember-cli-app/test-app/package.json +31 -0
- data/fixtures/ember-cli-app/test-app/public/.gitkeep +0 -0
- data/fixtures/ember-cli-app/test-app/testem.json +6 -0
- data/fixtures/ember-cli-app/test-app/tests/.jshintrc +73 -0
- data/fixtures/ember-cli-app/test-app/tests/helpers/resolver.js +9 -0
- data/fixtures/ember-cli-app/test-app/tests/helpers/start-app.js +30 -0
- data/fixtures/ember-cli-app/test-app/tests/index.html +50 -0
- data/fixtures/ember-cli-app/test-app/tests/test-helper.js +6 -0
- data/fixtures/ember-cli-app/test-app/tests/unit/.gitkeep +0 -0
- data/fixtures/env-app/config.rb +0 -0
- data/fixtures/env-app/environments/development.rb +1 -0
- data/fixtures/env-app/environments/production.rb +2 -0
- data/fixtures/env-app/source/index.html.erb +3 -0
- data/fixtures/env-app/source/stylesheets/site.css.scss +3 -0
- data/fixtures/external-helpers/config.rb +1 -1
- data/fixtures/feature-params-app/config.rb +10 -6
- data/fixtures/feature-params-app/source/index.html.erb +2 -3
- data/fixtures/fonts-app/source/stylesheets/fonts.css.scss +6 -0
- data/fixtures/frontmatter-neighbor-app/config.rb +30 -0
- data/fixtures/frontmatter-settings-app/config.rb +2 -2
- data/fixtures/frontmatter-settings-neighbor-app/config.rb +33 -3
- data/fixtures/generator-test/config.rb +5 -10
- data/fixtures/glob-app/config.rb +1 -1
- data/fixtures/i18n-force-locale/config.rb +2 -4
- data/fixtures/i18n-force-locale/source/{index.haml → index.html.haml} +0 -0
- data/fixtures/i18n-test-app/source/localizable/{one.en.md → one.en.html.md} +0 -0
- data/fixtures/i18n-test-app/source/localizable/{one.es.md → one.es.html.md} +0 -0
- data/fixtures/indexable-app/config.rb +2 -2
- data/fixtures/indexable-app/source/evil spaces.html +1 -1
- data/fixtures/large-build-app/config.rb +1 -5
- data/fixtures/large-build-app/source/spaces in file.html.erb +1 -1
- data/fixtures/manual-layout-override/config.rb +1 -1
- data/fixtures/markdown-app/config.rb +1 -1
- data/fixtures/markdown-frontmatter-options-app/config.rb +1 -1
- data/fixtures/minify-css-app/source/stylesheets/site.css.sass +3 -1
- data/fixtures/more-frontmatter-settings-app/config.rb +1 -1
- data/fixtures/more-markdown-app/source/{with_layout.markdown → with_layout.html.markdown} +0 -0
- data/fixtures/more-markdown-app/source/{with_layout_erb.markdown.erb → with_layout_erb.html.markdown.erb} +0 -0
- data/fixtures/more-traversal-app/config.rb +4 -4
- data/fixtures/more-traversal-app/source/layout.erb +1 -1
- data/fixtures/multiple-data-sources-app/config.rb +3 -0
- data/fixtures/multiple-data-sources-app/data/data.yml +1 -0
- data/fixtures/multiple-data-sources-app/data/two.yml +1 -0
- data/fixtures/multiple-data-sources-app/data0/one.yml +1 -0
- data/fixtures/multiple-data-sources-app/data1/data1.yml +1 -0
- data/fixtures/multiple-data-sources-app/data1/one.yml +1 -0
- data/fixtures/multiple-data-sources-app/data2/data2.yml +1 -0
- data/fixtures/multiple-data-sources-app/data2/two.yml +1 -0
- data/fixtures/multiple-data-sources-app/source/index.html.erb +10 -0
- data/fixtures/multiple-sources-app/config.rb +3 -0
- data/fixtures/multiple-sources-app/source/index.html.erb +1 -0
- data/fixtures/multiple-sources-app/source/override-in-two.html.erb +1 -0
- data/fixtures/multiple-sources-app/source0/override-in-one.html.erb +1 -0
- data/fixtures/multiple-sources-app/source1/index1.html.erb +1 -0
- data/fixtures/multiple-sources-app/source1/override-in-one.html.erb +1 -0
- data/fixtures/multiple-sources-app/source2/index2.html.erb +1 -0
- data/fixtures/multiple-sources-app/source2/override-in-two.html.erb +1 -0
- data/fixtures/padrino-helpers-app/source/former_padrino_test.html.erb +3 -3
- data/fixtures/page-classes-app/config.rb +2 -4
- data/fixtures/page-classes-app/source/2-starts-with-numeric-custom.html.erb +1 -1
- data/fixtures/page-helper-layout-block-app/config.rb +1 -1
- data/fixtures/partials-app/source/locals.html.erb +1 -1
- data/fixtures/partials-app/source/shared/{snippet.erb → _snippet.html.erb} +0 -0
- data/fixtures/partials-app/source/sub/index.html.erb +1 -1
- data/fixtures/passthrough-app/source/stylesheets/site.css.sass +5 -1
- data/fixtures/proxy-pages-app/config.rb +12 -15
- data/fixtures/relative-app/source/stylesheets/relative_assets.css.sass +1 -2
- data/fixtures/relative-assets-app/source/javascripts/application.js +8 -0
- data/fixtures/relative-assets-app/source/relative_image.html.erb +0 -1
- data/fixtures/relative-assets-app/source/stylesheets/relative_assets.css.sass +1 -2
- data/fixtures/scss-app/source/stylesheets/site_scss.css.scss +3 -1
- data/fixtures/stylus-preview-app/source/content.html.erb +4 -0
- data/fixtures/traversal-app/config.rb +4 -4
- data/fixtures/traversal-app/source/layout.erb +1 -1
- data/fixtures/v4-extension-callbacks/config.rb +21 -5
- data/fixtures/wildcard-app/config.rb +1 -1
- data/fixtures/wildcard-directory-index-app/config.rb +1 -1
- data/lib/middleman-core.rb +5 -2
- data/lib/middleman-core/application.rb +212 -131
- data/lib/middleman-core/builder.rb +255 -0
- data/lib/middleman-core/config_context.rb +103 -0
- data/lib/middleman-core/configuration.rb +15 -92
- data/lib/middleman-core/contracts.rb +149 -0
- data/lib/middleman-core/core_extensions.rb +86 -45
- data/lib/middleman-core/core_extensions/data.rb +82 -72
- data/lib/{middleman-more → middleman-core}/core_extensions/default_helpers.rb +34 -140
- data/lib/middleman-core/core_extensions/external_helpers.rb +23 -27
- data/lib/middleman-core/core_extensions/file_watcher.rb +59 -169
- data/lib/middleman-core/core_extensions/front_matter.rb +72 -131
- data/lib/middleman-core/core_extensions/i18n.rb +186 -0
- data/lib/middleman-core/core_extensions/rendering.rb +45 -533
- data/lib/middleman-core/core_extensions/routing.rb +53 -51
- data/lib/middleman-core/core_extensions/show_exceptions.rb +11 -18
- data/lib/middleman-core/extension.rb +183 -56
- data/lib/middleman-core/extension_manager.rb +80 -0
- data/lib/middleman-core/extensions.rb +96 -67
- data/lib/middleman-core/extensions/asset_hash.rb +92 -0
- data/lib/middleman-core/extensions/asset_host.rb +37 -0
- data/lib/{middleman-more → middleman-core}/extensions/automatic_alt_tags.rb +6 -5
- data/lib/{middleman-more → middleman-core}/extensions/automatic_image_sizes.rb +9 -13
- data/lib/middleman-core/extensions/cache_buster.rb +27 -0
- data/lib/{middleman-more → middleman-core}/extensions/directory_indexes.rb +9 -7
- data/lib/middleman-core/extensions/external_pipeline.rb +37 -0
- data/lib/{middleman-more → middleman-core}/extensions/gzip.rb +10 -3
- data/lib/{middleman-more → middleman-core}/extensions/lorem.rb +2 -2
- data/lib/middleman-core/extensions/minify_css.rb +86 -0
- data/lib/middleman-core/extensions/minify_javascript.rb +93 -0
- data/lib/middleman-core/extensions/relative_assets.rb +38 -0
- data/lib/middleman-core/file_renderer.rb +139 -0
- data/lib/middleman-core/load_paths.rb +21 -28
- data/lib/middleman-core/meta_pages.rb +9 -9
- data/lib/middleman-core/meta_pages/sitemap_resource.rb +3 -6
- data/lib/middleman-core/meta_pages/sitemap_tree.rb +1 -1
- data/lib/middleman-core/middleware/inline_url_rewriter.rb +96 -0
- data/lib/middleman-core/preview_server.rb +65 -196
- data/lib/middleman-core/profiling.rb +14 -15
- data/lib/middleman-core/rack.rb +138 -0
- data/lib/middleman-core/renderers/coffee_script.rb +10 -13
- data/lib/middleman-core/renderers/erb.rb +3 -15
- data/lib/middleman-core/renderers/haml.rb +33 -18
- data/lib/middleman-core/renderers/kramdown.rb +6 -4
- data/lib/middleman-core/renderers/less.rb +12 -18
- data/lib/middleman-core/renderers/liquid.rb +22 -18
- data/lib/middleman-core/renderers/markdown.rb +36 -49
- data/lib/middleman-core/renderers/redcarpet.rb +11 -4
- data/lib/middleman-core/renderers/sass.rb +36 -27
- data/lib/middleman-core/renderers/sass_functions.rb +116 -0
- data/lib/middleman-core/renderers/slim.rb +19 -26
- data/lib/middleman-core/renderers/stylus.rb +4 -14
- data/lib/middleman-core/sitemap/extensions/ignores.rb +35 -73
- data/lib/middleman-core/sitemap/extensions/on_disk.rb +29 -48
- data/lib/middleman-core/sitemap/extensions/proxies.rb +111 -133
- data/lib/middleman-core/sitemap/extensions/redirects.rb +68 -102
- data/lib/middleman-core/sitemap/extensions/request_endpoints.rb +59 -83
- data/lib/middleman-core/sitemap/extensions/traversal.rb +14 -15
- data/lib/middleman-core/sitemap/resource.rb +99 -71
- data/lib/middleman-core/sitemap/store.rb +79 -132
- data/lib/middleman-core/sources.rb +310 -0
- data/lib/middleman-core/sources/source_watcher.rb +268 -0
- data/lib/middleman-core/step_definitions.rb +2 -3
- data/lib/middleman-core/step_definitions/builder_steps.rb +15 -13
- data/lib/middleman-core/step_definitions/middleman_steps.rb +2 -18
- data/lib/middleman-core/step_definitions/server_steps.rb +43 -77
- data/lib/middleman-core/template_context.rb +181 -0
- data/lib/middleman-core/template_renderer.rb +213 -0
- data/lib/middleman-core/util.rb +319 -241
- data/lib/middleman-core/util/hash_with_indifferent_access.rb +103 -0
- data/lib/middleman-core/version.rb +1 -1
- data/lib/middleman/rack.rb +0 -1
- data/middleman-core.gemspec +36 -28
- data/spec/middleman-core/path_match_spec.rb +37 -0
- data/spec/spec_helper.rb +2 -25
- metadata +237 -454
- data/bin/middleman +0 -18
- data/cucumber.yml +0 -2
- data/features/asciidoc.feature +0 -155
- data/features/cli/preview_server-hook.feature +0 -17
- data/features/cli/preview_server.feature +0 -532
- data/features/compass-sprites.feature +0 -6
- data/features/console.feature +0 -10
- data/features/current_page_request_path_backwards.feature +0 -6
- data/features/fonts.feature +0 -15
- data/features/i18n_link_to.feature +0 -209
- data/features/image_srcset_paths.feature +0 -7
- data/features/implied_extensions.feature +0 -69
- data/features/instance_vars.feature +0 -9
- data/features/javascript-testing.feature +0 -18
- data/features/more-implied_extensions.feature +0 -44
- data/features/partials_dir.feature +0 -30
- data/features/queryable.feature +0 -35
- data/features/request_params.feature +0 -6
- data/features/static_server.feature +0 -6
- data/features/step_definitions/page_layout_steps.rb +0 -15
- data/features/step_definitions/queryable_steps.rb +0 -212
- data/features/support/preserve_mime_types.rb +0 -7
- data/features/v3_extensions.feature +0 -20
- data/features/working_directory.feature +0 -33
- data/fixtures/asciidoc-app/source/_include.adoc +0 -1
- data/fixtures/asciidoc-app/source/code.adoc +0 -3
- data/fixtures/asciidoc-app/source/custom-attribute.adoc +0 -3
- data/fixtures/asciidoc-app/source/gallery.adoc +0 -1
- data/fixtures/asciidoc-app/source/hello-no-layout.adoc +0 -2
- data/fixtures/asciidoc-app/source/hello-with-front-matter.adoc +0 -5
- data/fixtures/asciidoc-app/source/hello-with-layout.adoc +0 -2
- data/fixtures/asciidoc-app/source/hello-with-title.adoc +0 -5
- data/fixtures/asciidoc-app/source/hello.adoc +0 -4
- data/fixtures/asciidoc-app/source/images/tiger.gif +0 -0
- data/fixtures/asciidoc-app/source/layouts/default.erb +0 -9
- data/fixtures/asciidoc-app/source/master.adoc +0 -3
- data/fixtures/asset-hash-app/source/api.json.erb +0 -1
- data/fixtures/asset-hash-app/source/fonts/fontawesome-webfont.woff +0 -0
- data/fixtures/asset-hash-app/source/fonts/fontawesome-webfont.woff2 +0 -0
- data/fixtures/asset-hash-app/source/images/200px.jpg +0 -0
- data/fixtures/asset-hash-app/source/images/300px.jpg +0 -0
- data/fixtures/asset-hash-app/source/slim.html.slim +0 -8
- data/fixtures/asset-hash-app/source/stylesheets/uses_fonts.css +0 -4
- data/fixtures/asset-hash-app/source/subdir/api.json.erb +0 -1
- data/fixtures/chained-app/source/test.erb.combobreaker.str.erb +0 -8
- data/fixtures/clean-app/config-hidden-dir-after.rb +0 -5
- data/fixtures/clean-app/config-hidden-dir-before.rb +0 -1
- data/fixtures/compass-sprites-app/source/images/icon/arrow_down.png +0 -0
- data/fixtures/compass-sprites-app/source/images/icon/arrow_left.png +0 -0
- data/fixtures/compass-sprites-app/source/images/icon/arrow_right.png +0 -0
- data/fixtures/compass-sprites-app/source/images/icon/arrow_up.png +0 -0
- data/fixtures/compass-sprites-app/source/stylesheets/site.css.scss +0 -3
- data/fixtures/content-type-app/source/index.php +0 -1
- data/fixtures/current-page-app/config.rb +0 -3
- data/fixtures/current-page-app/source/request-path.html.erb +0 -1
- data/fixtures/default-partials-dir-app/source/_partial.html.erb +0 -1
- data/fixtures/default-partials-dir-app/source/index.html.erb +0 -2
- data/fixtures/fonts-app/source/stylesheets/fonts.css.sass +0 -5
- data/fixtures/frontmatter-app/source/front-matter-auto.erb +0 -6
- data/fixtures/frontmatter-app/source/front-matter-pandoc.html.md.erb +0 -13
- data/fixtures/frontmatter-app/source/json-front-matter-auto.erb +0 -6
- data/fixtures/frontmatter-neighbor-app/source/front-matter-auto.erb +0 -1
- data/fixtures/frontmatter-neighbor-app/source/front-matter-auto.erb.frontmatter +0 -4
- data/fixtures/frontmatter-neighbor-app/source/json-front-matter-auto.erb +0 -1
- data/fixtures/frontmatter-neighbor-app/source/json-front-matter-auto.erb.frontmatter +0 -4
- data/fixtures/image-srcset-paths-app/image-srcset-paths.html.erb +0 -1
- data/fixtures/image-srcset-paths-app/images/blank.gif +0 -0
- data/fixtures/implied-extensions-app/source/index.erb +0 -1
- data/fixtures/instance-vars-app/config.rb +0 -7
- data/fixtures/instance-vars-app/source/content.html.erb +0 -2
- data/fixtures/instance-vars-app/source/layout.erb +0 -1
- data/fixtures/javascript-app/source/index.html +0 -17
- data/fixtures/minify-css-app/source/inline-css.php +0 -8
- data/fixtures/minify-css-app/source/stylesheets/site.xcss.sass +0 -5
- data/fixtures/minify-js-app/source/inline-js.php +0 -22
- data/fixtures/minify-js-app/source/javascripts/js_test.xjs +0 -8
- data/fixtures/more-implied-extensions-app/source/javascripts/app.coffee +0 -1
- data/fixtures/more-implied-extensions-app/source/layouts/layout.erb +0 -3
- data/fixtures/more-implied-extensions-app/source/stylesheets/style.scss +0 -3
- data/fixtures/more-implied-extensions-app/source/stylesheets/style2.sass +0 -3
- data/fixtures/more-implied-extensions-app/source/test.haml +0 -4
- data/fixtures/more-implied-extensions-app/source/test2.markdown +0 -3
- data/fixtures/more-implied-extensions-app/source/test3.slim +0 -3
- data/fixtures/more-implied-extensions-app/source/test4.liquid +0 -1
- data/fixtures/partials-dir-app/source/index.html.erb +0 -2
- data/fixtures/partials-dir-app/source/nested/partials/_partial.html.erb +0 -1
- data/fixtures/partials-dir-app/source/partials/_partial.html.erb +0 -1
- data/fixtures/plain-app/index.html +0 -1
- data/fixtures/preview-server-app/bin/dns_server.rb +0 -33
- data/fixtures/preview-server-app/config-complications.rb +0 -11
- data/fixtures/preview-server-app/config.rb +0 -11
- data/fixtures/preview-server-app/source/index.html.erb +0 -1
- data/fixtures/preview-server-app/source/layout.erb +0 -9
- data/fixtures/preview-server-app/source/layouts/custom.erb +0 -8
- data/fixtures/preview-server-app/source/real.html +0 -1
- data/fixtures/preview-server-app/source/real/index.html.erb +0 -5
- data/fixtures/preview-server-app/source/should_be_ignored.html +0 -1
- data/fixtures/preview-server-app/source/should_be_ignored2.html +0 -1
- data/fixtures/preview-server-app/source/should_be_ignored3.html +0 -1
- data/fixtures/preview-server-app/source/static.html +0 -1
- data/fixtures/preview-server-hook-app/config.rb +0 -19
- data/fixtures/preview-server-hook-app/source/index.html.erb +0 -9
- data/fixtures/proxy-pages-app/source/real/index-ivars.html.erb +0 -6
- data/fixtures/relative-assets-app/source/absolute_image_relative_css.html.erb +0 -9
- data/fixtures/relative-assets-app/source/javascripts/app.js +0 -3
- data/fixtures/relative-assets-app/source/relative_image_absolute_css.html.erb +0 -9
- data/fixtures/request-app/source/index.html.erb +0 -3
- data/fixtures/stylus-preview-app/source/layout.erb +0 -1
- data/lib/middleman-core/cli.rb +0 -88
- data/lib/middleman-core/cli/build.rb +0 -300
- data/lib/middleman-core/cli/bundler.rb +0 -39
- data/lib/middleman-core/cli/console.rb +0 -52
- data/lib/middleman-core/cli/extension.rb +0 -47
- data/lib/middleman-core/cli/init.rb +0 -71
- data/lib/middleman-core/cli/server.rb +0 -99
- data/lib/middleman-core/core_extensions/data/file_loader.rb +0 -71
- data/lib/middleman-core/core_extensions/extensions.rb +0 -197
- data/lib/middleman-core/core_extensions/request.rb +0 -312
- data/lib/middleman-core/dns_resolver.rb +0 -73
- data/lib/middleman-core/dns_resolver/basic_network_resolver.rb +0 -52
- data/lib/middleman-core/dns_resolver/hosts_resolver.rb +0 -63
- data/lib/middleman-core/dns_resolver/local_link_resolver.rb +0 -44
- data/lib/middleman-core/dns_resolver/network_resolver.rb +0 -42
- data/lib/middleman-core/preview_server/checks.rb +0 -81
- data/lib/middleman-core/preview_server/information.rb +0 -273
- data/lib/middleman-core/preview_server/network_interface_inventory.rb +0 -65
- data/lib/middleman-core/preview_server/server_hostname.rb +0 -39
- data/lib/middleman-core/preview_server/server_information.rb +0 -153
- data/lib/middleman-core/preview_server/server_information_callback_proxy.rb +0 -35
- data/lib/middleman-core/preview_server/server_information_validator.rb +0 -18
- data/lib/middleman-core/preview_server/server_ip_address.rb +0 -55
- data/lib/middleman-core/preview_server/server_url.rb +0 -63
- data/lib/middleman-core/preview_server/tcp_port_prober.rb +0 -29
- data/lib/middleman-core/renderers/asciidoc.rb +0 -58
- data/lib/middleman-core/sitemap.rb +0 -76
- data/lib/middleman-core/sitemap/extensions/content_type.rb +0 -16
- data/lib/middleman-core/sitemap/queryable.rb +0 -151
- data/lib/middleman-core/step_definitions/commandline_steps.rb +0 -88
- data/lib/middleman-core/templates.rb +0 -101
- data/lib/middleman-core/templates/default.rb +0 -37
- data/lib/middleman-core/templates/default/source/images/background.png +0 -0
- data/lib/middleman-core/templates/default/source/images/middleman.png +0 -0
- data/lib/middleman-core/templates/default/source/index.html.erb +0 -10
- data/lib/middleman-core/templates/default/source/javascripts/all.js +0 -1
- data/lib/middleman-core/templates/default/source/layouts/layout.erb +0 -19
- data/lib/middleman-core/templates/default/source/stylesheets/all.css +0 -55
- data/lib/middleman-core/templates/default/source/stylesheets/normalize.css +0 -375
- data/lib/middleman-core/templates/empty.rb +0 -22
- data/lib/middleman-core/templates/empty/Gemfile.tt +0 -6
- data/lib/middleman-core/templates/extension/Gemfile +0 -18
- data/lib/middleman-core/templates/extension/Rakefile +0 -14
- data/lib/middleman-core/templates/extension/features/support/env.rb +0 -4
- data/lib/middleman-core/templates/extension/gemspec +0 -24
- data/lib/middleman-core/templates/extension/gitignore +0 -5
- data/lib/middleman-core/templates/extension/lib/lib.rb +0 -38
- data/lib/middleman-core/templates/extension/lib/middleman_extension.rb +0 -1
- data/lib/middleman-core/templates/html5.rb +0 -29
- data/lib/middleman-core/templates/html5/source/.htaccess +0 -542
- data/lib/middleman-core/templates/html5/source/404.html +0 -157
- data/lib/middleman-core/templates/html5/source/LICENSE.md +0 -19
- data/lib/middleman-core/templates/html5/source/README.md +0 -63
- data/lib/middleman-core/templates/html5/source/apple-touch-icon-114x114-precomposed.png +0 -0
- data/lib/middleman-core/templates/html5/source/apple-touch-icon-144x144-precomposed.png +0 -0
- data/lib/middleman-core/templates/html5/source/apple-touch-icon-57x57-precomposed.png +0 -0
- data/lib/middleman-core/templates/html5/source/apple-touch-icon-72x72-precomposed.png +0 -0
- data/lib/middleman-core/templates/html5/source/apple-touch-icon-precomposed.png +0 -0
- data/lib/middleman-core/templates/html5/source/apple-touch-icon.png +0 -0
- data/lib/middleman-core/templates/html5/source/crossdomain.xml +0 -15
- data/lib/middleman-core/templates/html5/source/css/main.css +0 -298
- data/lib/middleman-core/templates/html5/source/css/normalize.css +0 -504
- data/lib/middleman-core/templates/html5/source/favicon.ico +0 -0
- data/lib/middleman-core/templates/html5/source/humans.txt +0 -15
- data/lib/middleman-core/templates/html5/source/index.html.erb +0 -6
- data/lib/middleman-core/templates/html5/source/js/main.js +0 -1
- data/lib/middleman-core/templates/html5/source/js/plugins.js +0 -14
- data/lib/middleman-core/templates/html5/source/js/vendor/jquery-1.8.0.min.js +0 -2
- data/lib/middleman-core/templates/html5/source/js/vendor/modernizr-2.6.1.min.js +0 -4
- data/lib/middleman-core/templates/html5/source/layouts/layout.erb +0 -40
- data/lib/middleman-core/templates/html5/source/robots.txt +0 -3
- data/lib/middleman-core/templates/local.rb +0 -27
- data/lib/middleman-core/templates/mobile.rb +0 -24
- data/lib/middleman-core/templates/mobile/source/404.html +0 -37
- data/lib/middleman-core/templates/mobile/source/README.markdown +0 -21
- data/lib/middleman-core/templates/mobile/source/crossdomain.xml +0 -25
- data/lib/middleman-core/templates/mobile/source/css/style.css +0 -315
- data/lib/middleman-core/templates/mobile/source/humans.txt +0 -43
- data/lib/middleman-core/templates/mobile/source/img/h/apple-touch-icon.png +0 -0
- data/lib/middleman-core/templates/mobile/source/img/h/splash.png +0 -0
- data/lib/middleman-core/templates/mobile/source/img/l/apple-touch-icon-precomposed.png +0 -0
- data/lib/middleman-core/templates/mobile/source/img/l/apple-touch-icon.png +0 -0
- data/lib/middleman-core/templates/mobile/source/img/l/splash.png +0 -0
- data/lib/middleman-core/templates/mobile/source/img/m/apple-touch-icon.png +0 -0
- data/lib/middleman-core/templates/mobile/source/index.html +0 -92
- data/lib/middleman-core/templates/mobile/source/js/libs/modernizr-custom.js +0 -14
- data/lib/middleman-core/templates/mobile/source/js/libs/respond.min.js +0 -7
- data/lib/middleman-core/templates/mobile/source/js/mylibs/helper.js +0 -171
- data/lib/middleman-core/templates/mobile/source/js/plugins.js +0 -20
- data/lib/middleman-core/templates/mobile/source/robots.txt +0 -4
- data/lib/middleman-core/templates/mobile/source/sitemap.xml +0 -9
- data/lib/middleman-core/templates/mobile/source/test/index.html +0 -31
- data/lib/middleman-core/templates/mobile/source/test/qunit/qunit.css +0 -148
- data/lib/middleman-core/templates/mobile/source/test/qunit/qunit.js +0 -1265
- data/lib/middleman-core/templates/mobile/source/test/tests.js +0 -21
- data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/Readme.PDF +0 -0
- data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx1.snippet +0 -31
- data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx2.snippet +0 -2
- data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/ga.aspx +0 -195
- data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/sample.aspx +0 -44
- data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/ga.jsp +0 -225
- data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp1.snippet +0 -35
- data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp2.snippet +0 -2
- data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/sample.jsp +0 -51
- data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/ga.php +0 -176
- data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/php1.snippet +0 -30
- data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/php2.snippet +0 -4
- data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/sample.php +0 -44
- data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/ga.pl +0 -195
- data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/perl1.snippet +0 -27
- data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/perl2.snippet +0 -1
- data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/sample.pl +0 -38
- data/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/COPYING +0 -202
- data/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/bookmark_bubble.js +0 -559
- data/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/example/example.html +0 -43
- data/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/example/example.js +0 -57
- data/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/arrow.png +0 -0
- data/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/close.png +0 -0
- data/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/generate_base64_images +0 -33
- data/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/icon_calendar.png +0 -0
- data/lib/middleman-core/templates/mobile/source/tools/wspl/README +0 -27
- data/lib/middleman-core/templates/mobile/source/tools/wspl/databasefactory.js +0 -45
- data/lib/middleman-core/templates/mobile/source/tools/wspl/dbworker.js +0 -324
- data/lib/middleman-core/templates/mobile/source/tools/wspl/dbworker_test.html +0 -393
- data/lib/middleman-core/templates/mobile/source/tools/wspl/dbworkerstarter.js +0 -32
- data/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_gears.js +0 -595
- data/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_gears_test.html +0 -404
- data/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_html5.js +0 -203
- data/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_html5_test.html +0 -468
- data/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapperapi.js +0 -202
- data/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapperapi_test.html +0 -51
- data/lib/middleman-core/templates/mobile/source/tools/wspl/gears_resultset.js +0 -71
- data/lib/middleman-core/templates/mobile/source/tools/wspl/gears_resultset_test.html +0 -86
- data/lib/middleman-core/templates/mobile/source/tools/wspl/gears_transaction.js +0 -196
- data/lib/middleman-core/templates/mobile/source/tools/wspl/gears_transaction_test.html +0 -221
- data/lib/middleman-core/templates/mobile/source/tools/wspl/gearsutils.js +0 -94
- data/lib/middleman-core/templates/mobile/source/tools/wspl/gearsutils_test.html +0 -84
- data/lib/middleman-core/templates/mobile/source/tools/wspl/global_functions.js +0 -72
- data/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/index.html +0 -347
- data/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/simplenotes.js +0 -503
- data/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/styles.css +0 -66
- data/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/template.js +0 -75
- data/lib/middleman-core/templates/shared/Gemfile.tt +0 -14
- data/lib/middleman-core/templates/shared/config.ru +0 -3
- data/lib/middleman-core/templates/shared/config.tt +0 -87
- data/lib/middleman-core/templates/shared/gitignore +0 -21
- data/lib/middleman-more/core_extensions/compass.rb +0 -75
- data/lib/middleman-more/core_extensions/i18n.rb +0 -312
- data/lib/middleman-more/extensions/asset_hash.rb +0 -128
- data/lib/middleman-more/extensions/asset_host.rb +0 -50
- data/lib/middleman-more/extensions/cache_buster.rb +0 -55
- data/lib/middleman-more/extensions/minify_css.rb +0 -112
- data/lib/middleman-more/extensions/minify_javascript.rb +0 -120
- data/lib/middleman-more/extensions/relative_assets.rb +0 -24
- data/lib/middleman-more/templates/smacss.rb +0 -29
- data/lib/middleman-more/templates/smacss/source/_footer.haml +0 -1
- data/lib/middleman-more/templates/smacss/source/index.html.haml +0 -1
- data/lib/middleman-more/templates/smacss/source/layouts/layout.haml +0 -13
- data/lib/middleman-more/templates/smacss/source/stylesheets/base/README.markdown +0 -11
- data/lib/middleman-more/templates/smacss/source/stylesheets/base/base.scss +0 -1
- data/lib/middleman-more/templates/smacss/source/stylesheets/base/normalize.scss +0 -375
- data/lib/middleman-more/templates/smacss/source/stylesheets/layout/README.markdown +0 -9
- data/lib/middleman-more/templates/smacss/source/stylesheets/modules/README.markdown +0 -9
- data/lib/middleman-more/templates/smacss/source/stylesheets/states/README.markdown +0 -12
- data/lib/middleman-more/templates/smacss/source/stylesheets/style.css.scss +0 -12
- data/lib/vendored-middleman-deps/fastimage.rb +0 -287
- data/spec/middleman-core/dns_resolver_spec.rb +0 -118
- data/spec/middleman-core/preview_server/server_hostname_spec.rb +0 -39
- data/spec/middleman-core/preview_server/server_ip_address_spec.rb +0 -43
@@ -1,404 +0,0 @@
|
|
1
|
-
<!DOCTYPE html>
|
2
|
-
<!--
|
3
|
-
Copyright 2009 Google Inc.
|
4
|
-
|
5
|
-
Licensed under the Apache License, Version 2.0 (the "License");
|
6
|
-
you may not use this file except in compliance with the License.
|
7
|
-
You may obtain a copy of the License at
|
8
|
-
|
9
|
-
http://www.apache.org/licenses/LICENSE-2.0
|
10
|
-
|
11
|
-
Unless required by applicable law or agreed to in writing, software
|
12
|
-
distributed under the License is distributed on an "AS IS" BASIS,
|
13
|
-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
14
|
-
See the License for the specific language governing permissions and
|
15
|
-
limitations under the License.
|
16
|
-
-->
|
17
|
-
|
18
|
-
<html>
|
19
|
-
<head>
|
20
|
-
<title>Gears database wrapper tests</title>
|
21
|
-
<script type="text/javascript" src="../jsunit/app/jsUnitCore.js"></script>
|
22
|
-
<script type="text/javascript" src="jsmock.js"></script>
|
23
|
-
<script type="text/javascript" src="global_functions.js"></script>
|
24
|
-
<script type="text/javascript" src="gearsutils.js"></script>
|
25
|
-
<script type="text/javascript" src="dbwrapperapi.js"></script>
|
26
|
-
<script type="text/javascript" src="gears_resultset.js"></script>
|
27
|
-
<script type="text/javascript" src="gears_transaction.js"></script>
|
28
|
-
<script type="text/javascript" src="dbworker.js"></script>
|
29
|
-
<script type="text/javascript" src="dbwrapper_gears.js"></script>
|
30
|
-
</head>
|
31
|
-
<body>
|
32
|
-
<script type='text/javascript'>
|
33
|
-
|
34
|
-
var mockControl;
|
35
|
-
var callbackMock;
|
36
|
-
var dbMock;
|
37
|
-
var wp;
|
38
|
-
var workerId = 123;
|
39
|
-
var transMock;
|
40
|
-
|
41
|
-
function setUp() {
|
42
|
-
mockControl = new MockControl();
|
43
|
-
|
44
|
-
callbackMock = mockControl.createMock({
|
45
|
-
onSuccess: function(){},
|
46
|
-
onFailure: function(){}
|
47
|
-
});
|
48
|
-
|
49
|
-
transMock = mockControl.createMock({
|
50
|
-
success: function(){},
|
51
|
-
failure: function(){}
|
52
|
-
});
|
53
|
-
|
54
|
-
wp = mockControl.createMock({
|
55
|
-
allowCrossOrigin: function(){},
|
56
|
-
createWorkerFromUrl: function(){},
|
57
|
-
sendMessage: function(){}
|
58
|
-
});
|
59
|
-
|
60
|
-
dbMock = mockControl.createMock({
|
61
|
-
execute: function(){},
|
62
|
-
open: function(){},
|
63
|
-
close: function(){},
|
64
|
-
remove: function(){}
|
65
|
-
});
|
66
|
-
|
67
|
-
google.wspl.GearsUtils.resultSetToObjectArray = function(rs) {
|
68
|
-
return rs;
|
69
|
-
};
|
70
|
-
}
|
71
|
-
|
72
|
-
function buildSyncDatabase() {
|
73
|
-
var database = new google.wspl.gears.Database(true);
|
74
|
-
database.userId_ = 'userId';
|
75
|
-
database.name_ = 'name';
|
76
|
-
database.db_ = dbMock;
|
77
|
-
return database;
|
78
|
-
}
|
79
|
-
|
80
|
-
function buildDatabase() {
|
81
|
-
var database = buildSyncDatabase();
|
82
|
-
|
83
|
-
var type = google.wspl.gears.DbWorker.CommandTypes.OPEN;
|
84
|
-
wp.expects().createWorkerFromUrl('workerUrl').andReturn(workerId);
|
85
|
-
wp.expects().sendMessage(TypeOf.isA(Object), workerId).andStub(function() {
|
86
|
-
assertEquals('Wrong message type.', type, arguments[0].type);
|
87
|
-
assertEquals('Incorrect name.', 'name', arguments[0].name);
|
88
|
-
assertEquals('Incorrect user id.', 'userId', arguments[0].userId);
|
89
|
-
});
|
90
|
-
|
91
|
-
database.startWorker(wp, 'workerUrl', 0);
|
92
|
-
database.handleStarted_();
|
93
|
-
database.handleOpenSuccessful_();
|
94
|
-
database.useWorker_ = true;
|
95
|
-
return database;
|
96
|
-
}
|
97
|
-
|
98
|
-
function testConstructor() {
|
99
|
-
var db = buildSyncDatabase();
|
100
|
-
mockControl.verify();
|
101
|
-
}
|
102
|
-
|
103
|
-
function testStartWorker() {
|
104
|
-
var db = buildDatabase();
|
105
|
-
assertTrue('Expected worker to be ready.', db.workerReady_);
|
106
|
-
mockControl.verify();
|
107
|
-
}
|
108
|
-
|
109
|
-
function testCreateTransaction() {
|
110
|
-
var db = buildDatabase();
|
111
|
-
var tx;
|
112
|
-
var populateMock = function(txa) {
|
113
|
-
tx = txa;
|
114
|
-
var transactions = db.transactions_;
|
115
|
-
assertEquals('missing transaction', tx, transactions[tx.id_].transaction);
|
116
|
-
assertEquals('missing callback', callbackMock,
|
117
|
-
transactions[tx.id_].callback);
|
118
|
-
assertEquals('database not saved', db, tx.db_);
|
119
|
-
assertTrue('database should be locked', db.locked_);
|
120
|
-
};
|
121
|
-
|
122
|
-
callbackMock.expects().onSuccess();
|
123
|
-
|
124
|
-
var transactions = db.transactions_;
|
125
|
-
db.createTransaction(populateMock, callbackMock);
|
126
|
-
assertEquals('failed to clean up transaction', undefined,
|
127
|
-
transactions[tx.id_]);
|
128
|
-
assertFalse('database should not be locked', db.locked_);
|
129
|
-
|
130
|
-
mockControl.verify();
|
131
|
-
}
|
132
|
-
|
133
|
-
function testMultipleTransactions() {
|
134
|
-
var db = buildDatabase();
|
135
|
-
var handler = mockControl.createMock();
|
136
|
-
handler.addMockMethod('populate');
|
137
|
-
handler.addMockMethod('onSuccess');
|
138
|
-
handler.addMockMethod('onFailure');
|
139
|
-
|
140
|
-
var trans;
|
141
|
-
handler.expects().populate(TypeOf.isA(google.wspl.gears.Transaction)).andStub(
|
142
|
-
function(tx) {
|
143
|
-
trans = tx;
|
144
|
-
tx.numActiveExecutes_ = 1;
|
145
|
-
});
|
146
|
-
|
147
|
-
db.createTransaction(handler.populate, handler);
|
148
|
-
db.createTransaction(handler.populate, handler);
|
149
|
-
mockControl.verify();
|
150
|
-
|
151
|
-
handler.expects().onSuccess();
|
152
|
-
handler.expects().populate(TypeOf.isA(google.wspl.gears.Transaction)).andStub(
|
153
|
-
function(tx) {
|
154
|
-
trans = tx;
|
155
|
-
tx.numActiveExecutes_ = 1;
|
156
|
-
});
|
157
|
-
|
158
|
-
db.handleCommit_(trans.id_);
|
159
|
-
mockControl.verify();
|
160
|
-
|
161
|
-
handler.expects().onFailure(undefined).andStub(function() {
|
162
|
-
db.createTransaction(handler.populate, handler);
|
163
|
-
});
|
164
|
-
handler.expects().populate(TypeOf.isA(google.wspl.gears.Transaction)).andStub(
|
165
|
-
function(tx) {
|
166
|
-
trans = tx;
|
167
|
-
tx.numActiveExecutes_ = 1;
|
168
|
-
});
|
169
|
-
|
170
|
-
db.handleRollback_(trans.id_);
|
171
|
-
mockControl.verify();
|
172
|
-
|
173
|
-
handler.expects().onSuccess();
|
174
|
-
|
175
|
-
db.handleCommit_(trans.id_);
|
176
|
-
mockControl.verify();
|
177
|
-
}
|
178
|
-
|
179
|
-
function testDoBegin() {
|
180
|
-
var db = buildDatabase();
|
181
|
-
var transactionId = 10;
|
182
|
-
var type = google.wspl.gears.DbWorker.CommandTypes.BEGIN;
|
183
|
-
wp.expects().sendMessage(TypeOf.isA(Object), workerId).andStub(function() {
|
184
|
-
assertEquals('wrong message type', type, arguments[0].type);
|
185
|
-
assertNotUndefined('Missing transaction id.', arguments[0].transactionId);
|
186
|
-
});
|
187
|
-
db.doBegin(transactionId);
|
188
|
-
mockControl.verify();
|
189
|
-
}
|
190
|
-
|
191
|
-
function testSynchronousBegin() {
|
192
|
-
var db = buildSyncDatabase();
|
193
|
-
dbMock.expects().execute('BEGIN IMMEDIATE');
|
194
|
-
db.doBegin(1);
|
195
|
-
mockControl.verify();
|
196
|
-
}
|
197
|
-
|
198
|
-
function testDoExecute() {
|
199
|
-
var statements = [{sql: 's1', params: 'p1'},
|
200
|
-
{sql: 's2', params: 'p2'},
|
201
|
-
{sql: 's3', params: 'p3'}];
|
202
|
-
var callbackId = 5;
|
203
|
-
var transactionId = 10;
|
204
|
-
var db = buildDatabase();
|
205
|
-
var type = google.wspl.gears.DbWorker.CommandTypes.EXECUTE;
|
206
|
-
wp.expects().sendMessage(TypeOf.isA(Object), workerId).andStub(function() {
|
207
|
-
assertEquals('wrong message type', type, arguments[0].type);
|
208
|
-
assertEquals('statements do not match', statements.length,
|
209
|
-
arguments[0].statements.length);
|
210
|
-
for (var i = 0; i < statements.length; i++) {
|
211
|
-
assertEquals('a statement sql does not match', statements[i].sql,
|
212
|
-
arguments[0].statements[i].sql);
|
213
|
-
assertEquals('a statement params does not match', statements[i].params,
|
214
|
-
arguments[0].statements[i].params);
|
215
|
-
}
|
216
|
-
assertEquals('missing callback id', callbackId, arguments[0].callbackId);
|
217
|
-
assertEquals('missing trans id', transactionId, arguments[0].transactionId);
|
218
|
-
});
|
219
|
-
db.doExecute(statements, callbackId, transactionId);
|
220
|
-
mockControl.verify();
|
221
|
-
}
|
222
|
-
|
223
|
-
function testSynchronousExecute() {
|
224
|
-
var statements = [{sql: 's1', params: 'p1'},
|
225
|
-
{sql: 's2', params: 'p2'},
|
226
|
-
{sql: 's3', params: 'p3'}];
|
227
|
-
var callbackId = 5;
|
228
|
-
var transactionId = 10;
|
229
|
-
var db = buildSyncDatabase();
|
230
|
-
|
231
|
-
for (var i = 0; i < 3; i++) {
|
232
|
-
var stat = statements[i];
|
233
|
-
dbMock.expects().execute(stat.sql, stat.params).andReturn('result' + i);
|
234
|
-
}
|
235
|
-
|
236
|
-
var handler = mockControl.createMock();
|
237
|
-
handler.addMockMethod('handleResult_');
|
238
|
-
db.handleResult_ = handler.handleResult_;
|
239
|
-
handler.expects().handleResult_(
|
240
|
-
TypeOf.isA(Array), callbackId, transactionId).andStub(function(results) {
|
241
|
-
var expected = ['result0', 'result1', 'result2'];
|
242
|
-
assertArrayEquals('Wrong results.', expected, results);
|
243
|
-
});
|
244
|
-
|
245
|
-
db.doExecute(statements, callbackId, transactionId);
|
246
|
-
mockControl.verify();
|
247
|
-
}
|
248
|
-
|
249
|
-
function testSynchronousExecute_failure() {
|
250
|
-
var statements = [{sql: 's1', params: 'p1'},
|
251
|
-
{sql: 's2', params: 'p2'},
|
252
|
-
{sql: 's3', params: 'p3'}];
|
253
|
-
var callbackId = 5;
|
254
|
-
var transactionId = 10;
|
255
|
-
var db = buildSyncDatabase();
|
256
|
-
|
257
|
-
dbMock.expects().execute('s1', 'p1').andReturn('result0');
|
258
|
-
dbMock.expects().execute('s2', 'p2').andThrow(Error('db error'));
|
259
|
-
|
260
|
-
var handler = mockControl.createMock();
|
261
|
-
handler.addMockMethod('handleFailure_');
|
262
|
-
db.handleFailure_ = handler.handleFailure_;
|
263
|
-
handler.expects().handleFailure_(
|
264
|
-
TypeOf.isA(Error), callbackId, transactionId);
|
265
|
-
|
266
|
-
db.doExecute(statements, callbackId, transactionId);
|
267
|
-
mockControl.verify();
|
268
|
-
}
|
269
|
-
|
270
|
-
function testDoCommit() {
|
271
|
-
var transactionId = 10;
|
272
|
-
var db = buildDatabase();
|
273
|
-
var type = google.wspl.gears.DbWorker.CommandTypes.COMMIT;
|
274
|
-
wp.expects().sendMessage(TypeOf.isA(Object), workerId).andStub(function() {
|
275
|
-
assertEquals('wrong message type', type, arguments[0].type);
|
276
|
-
assertEquals('missing trans id', transactionId, arguments[0].transactionId);
|
277
|
-
});
|
278
|
-
db.doCommit(transactionId);
|
279
|
-
mockControl.verify();
|
280
|
-
}
|
281
|
-
|
282
|
-
function testSynchronousCommit() {
|
283
|
-
var db = buildSyncDatabase();
|
284
|
-
dbMock.expects().execute('COMMIT');
|
285
|
-
db.doCommit(1);
|
286
|
-
mockControl.verify();
|
287
|
-
}
|
288
|
-
|
289
|
-
function testDoRollback() {
|
290
|
-
var transactionId = 10;
|
291
|
-
var db = buildDatabase();
|
292
|
-
var type = google.wspl.gears.DbWorker.CommandTypes.ROLLBACK;
|
293
|
-
wp.expects().sendMessage(TypeOf.isA(Object), workerId).andStub(function() {
|
294
|
-
assertEquals('wrong message type', type, arguments[0].type);
|
295
|
-
assertEquals('missing trans id', transactionId, arguments[0].transactionId);
|
296
|
-
});
|
297
|
-
db.doRollback(transactionId);
|
298
|
-
mockControl.verify();
|
299
|
-
}
|
300
|
-
|
301
|
-
function testSynchronousRollback() {
|
302
|
-
var db = buildSyncDatabase();
|
303
|
-
dbMock.expects().execute('ROLLBACK');
|
304
|
-
db.doRollback(1);
|
305
|
-
mockControl.verify();
|
306
|
-
}
|
307
|
-
|
308
|
-
function testHandleCommit() {
|
309
|
-
var db = buildDatabase();
|
310
|
-
db.transactions_[5] = {transaction: 'tx', callback: callbackMock};
|
311
|
-
callbackMock.expects().onSuccess();
|
312
|
-
db.handleCommit_(5);
|
313
|
-
assertUndefined('failed to remove transaction', db.transactions_[5]);
|
314
|
-
mockControl.verify();
|
315
|
-
}
|
316
|
-
|
317
|
-
function testHandleRollback() {
|
318
|
-
var db = buildDatabase();
|
319
|
-
db.transactions_[5] = {
|
320
|
-
transaction: 'tx',
|
321
|
-
callback: callbackMock,
|
322
|
-
error: Error('error')
|
323
|
-
};
|
324
|
-
callbackMock.expects().onFailure(TypeOf.isA(Error)).andStub(function() {
|
325
|
-
assertEquals('did not pass error', 'error', arguments[0].message);
|
326
|
-
});
|
327
|
-
db.handleRollback_(5);
|
328
|
-
assertUndefined('failed to remove transaction', db.transactions_[5]);
|
329
|
-
mockControl.verify();
|
330
|
-
}
|
331
|
-
|
332
|
-
function testHandleResult() {
|
333
|
-
var db = buildDatabase();
|
334
|
-
transMock.expects().success(TypeOf.isA(google.wspl.gears.ResultSet),
|
335
|
-
22).andStub(function() {
|
336
|
-
assertEquals('result not set', 'result1', arguments[0].resultArray_);
|
337
|
-
});
|
338
|
-
transMock.expects().success(TypeOf.isA(google.wspl.gears.ResultSet),
|
339
|
-
22).andStub(function() {
|
340
|
-
assertEquals('result not set', 'result2', arguments[0].resultArray_);
|
341
|
-
});
|
342
|
-
db.transactions_[5] = {transaction: transMock, callback: 'cb'};
|
343
|
-
|
344
|
-
db.handleResult_(['result1', 'result2'], 22, 5);
|
345
|
-
mockControl.verify();
|
346
|
-
}
|
347
|
-
|
348
|
-
function testHandleFailure() {
|
349
|
-
var db = buildDatabase();
|
350
|
-
transMock.expects().failure(TypeOf.isA(Error), 22).andStub(function() {
|
351
|
-
assertEquals('error not set', 'error', arguments[0].message);
|
352
|
-
});
|
353
|
-
db.transactions_[5] = {transaction: transMock, callback: 'cb'};
|
354
|
-
|
355
|
-
db.handleFailure_(Error('error'), 22, 5);
|
356
|
-
assertEquals('failed to save error', 'error',
|
357
|
-
db.transactions_[5].error.message);
|
358
|
-
mockControl.verify();
|
359
|
-
}
|
360
|
-
|
361
|
-
function testHandleStarted() {
|
362
|
-
var db = buildDatabase();
|
363
|
-
var type = google.wspl.gears.DbWorker.CommandTypes.OPEN;
|
364
|
-
wp.expects().sendMessage(TypeOf.isA(Object), workerId).andStub(function() {
|
365
|
-
assertEquals('wrong message type', type, arguments[0].type);
|
366
|
-
assertEquals('wrong db userId', 'userId', arguments[0].userId);
|
367
|
-
assertEquals('wrong db name', 'name', arguments[0].name);
|
368
|
-
});
|
369
|
-
db.handleStarted_();
|
370
|
-
mockControl.verify();
|
371
|
-
}
|
372
|
-
|
373
|
-
function testHandleStarted_afterTimeout() {
|
374
|
-
var db = buildDatabase();
|
375
|
-
db.handleTimeout_();
|
376
|
-
|
377
|
-
// This should do nothing.
|
378
|
-
db.handleStarted_();
|
379
|
-
|
380
|
-
mockControl.verify();
|
381
|
-
}
|
382
|
-
|
383
|
-
function testHandleTimeout() {
|
384
|
-
var db = buildDatabase();
|
385
|
-
db.handleTimeout_();
|
386
|
-
mockControl.verify();
|
387
|
-
}
|
388
|
-
|
389
|
-
function testHandleOpenSuccessful() {
|
390
|
-
var db = buildDatabase();
|
391
|
-
db.handleOpenSuccessful_();
|
392
|
-
assertTrue('Worker should be ready.', db.workerReady_);
|
393
|
-
mockControl.verify();
|
394
|
-
}
|
395
|
-
|
396
|
-
function testHandleOpenFailed() {
|
397
|
-
var db = buildDatabase();
|
398
|
-
db.handleOpenFailed_('error');
|
399
|
-
mockControl.verify();
|
400
|
-
}
|
401
|
-
|
402
|
-
</script>
|
403
|
-
</body>
|
404
|
-
</html>
|
@@ -1,203 +0,0 @@
|
|
1
|
-
/*
|
2
|
-
Copyright 2009 Google Inc.
|
3
|
-
|
4
|
-
Licensed under the Apache License, Version 2.0 (the "License");
|
5
|
-
you may not use this file except in compliance with the License.
|
6
|
-
You may obtain a copy of the License at
|
7
|
-
|
8
|
-
http://www.apache.org/licenses/LICENSE-2.0
|
9
|
-
|
10
|
-
Unless required by applicable law or agreed to in writing, software
|
11
|
-
distributed under the License is distributed on an "AS IS" BASIS,
|
12
|
-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
13
|
-
See the License for the specific language governing permissions and
|
14
|
-
limitations under the License.
|
15
|
-
*/
|
16
|
-
|
17
|
-
/**
|
18
|
-
* @fileoverview Generic Database API.
|
19
|
-
*
|
20
|
-
* A small set of classes to define how we interact with databases that
|
21
|
-
* can easily be implemented on top of HTML5.
|
22
|
-
*/
|
23
|
-
|
24
|
-
google.wspl.html5 = google.wspl.html5 || {};
|
25
|
-
|
26
|
-
/**
|
27
|
-
* Specification's default largest database size in HTML5 databases.
|
28
|
-
* @type{number}
|
29
|
-
*/
|
30
|
-
google.wspl.LARGEST_SUPPORTED_DATABASE = 1024 * 1024 * 4;
|
31
|
-
|
32
|
-
/**
|
33
|
-
* Creates an HTML5 Transaction object.
|
34
|
-
* @see google.wspl.Transaction#Transaction
|
35
|
-
*
|
36
|
-
* @constructor
|
37
|
-
* @extends google.wspl.Transaction
|
38
|
-
*
|
39
|
-
* @param {SQLTransaction} html5tx The HTML5 implementation of transactions.
|
40
|
-
*/
|
41
|
-
google.wspl.html5.Transaction = function(html5tx) {
|
42
|
-
this.tx_ = html5tx;
|
43
|
-
};
|
44
|
-
google.inherits(google.wspl.html5.Transaction, google.wspl.Transaction);
|
45
|
-
|
46
|
-
/**
|
47
|
-
* Runs an array of statements in a single database transaction.
|
48
|
-
* Invokes the onSuccess callback once for each succeesfully executed
|
49
|
-
* statement and
|
50
|
-
* once for the first failed statement.
|
51
|
-
*
|
52
|
-
* @param {Array.<google.wspl.Statement>} statements The statements to
|
53
|
-
* execute.
|
54
|
-
* @param {Object?} opt_callback An object containing onSuccess and onFailure
|
55
|
-
* handlers.
|
56
|
-
*/
|
57
|
-
google.wspl.html5.Transaction.prototype.executeAll = function(statements,
|
58
|
-
opt_callback) {
|
59
|
-
if (statements.length == 0) {
|
60
|
-
throw Error('Possibly silly attempt to execute empty statement list.');
|
61
|
-
}
|
62
|
-
|
63
|
-
var self = this;
|
64
|
-
for (var i = 0; i < statements.length; ++i) {
|
65
|
-
var statement = statements[i];
|
66
|
-
google.logger('SQL: ' + statement.sql + ' PARAMS: ' + statement.params);
|
67
|
-
this.tx_.executeSql(statement.sql, statement.params,
|
68
|
-
function(tx, result) {
|
69
|
-
if (opt_callback && opt_callback.onSuccess) {
|
70
|
-
var resultSet = new google.wspl.html5.ResultSet(result);
|
71
|
-
opt_callback.onSuccess(self, resultSet);
|
72
|
-
}
|
73
|
-
},
|
74
|
-
function(tx, error) {
|
75
|
-
if (opt_callback && opt_callback.onFailure) {
|
76
|
-
opt_callback.onFailure(error);
|
77
|
-
}
|
78
|
-
// fail the whole transaction if any step fails
|
79
|
-
return true;
|
80
|
-
});
|
81
|
-
}
|
82
|
-
};
|
83
|
-
|
84
|
-
/**
|
85
|
-
* @see google.wspl.Database#Database
|
86
|
-
* @param {string} name The name for this database.
|
87
|
-
* @param {window} opt_window A window object for dependency injection.
|
88
|
-
* @constructor
|
89
|
-
* @extends google.wspl.Database
|
90
|
-
*/
|
91
|
-
google.wspl.html5.Database = function(name, opt_window) {
|
92
|
-
/**
|
93
|
-
* Sequence number for transactions.
|
94
|
-
* @type {number}
|
95
|
-
* @private
|
96
|
-
*/
|
97
|
-
this.sequenceNum_ = 1;
|
98
|
-
|
99
|
-
/**
|
100
|
-
* Map of transactionIds -> transaction start time in millis.
|
101
|
-
* @type {Object}
|
102
|
-
* @private
|
103
|
-
*/
|
104
|
-
this.inflightTransactions_ = {};
|
105
|
-
|
106
|
-
var win = opt_window || window;
|
107
|
-
this.db_ = win.openDatabase(name, '',
|
108
|
-
name, google.wspl.LARGEST_SUPPORTED_DATABASE);
|
109
|
-
if (this.db_ == null) {
|
110
|
-
throw Error('The returned database was null.');
|
111
|
-
}
|
112
|
-
};
|
113
|
-
google.inherits(google.wspl.html5.Database, google.wspl.Database);
|
114
|
-
|
115
|
-
/**
|
116
|
-
* @see google.wspl.Database#createTransaction
|
117
|
-
*/
|
118
|
-
google.wspl.html5.Database.prototype.createTransaction = function(populate,
|
119
|
-
opt_callback) {
|
120
|
-
var transactionCallback = opt_callback || {
|
121
|
-
onSuccess: function() {},
|
122
|
-
onFailure: function() {}
|
123
|
-
};
|
124
|
-
|
125
|
-
var transactionId = this.sequenceNum_++;
|
126
|
-
var inflightTransactions = this.inflightTransactions_;
|
127
|
-
inflightTransactions[transactionId] = this.getCurrentTime();
|
128
|
-
this.db_.transaction(
|
129
|
-
function(tx) {
|
130
|
-
// Delete the transaction before the executing it because our
|
131
|
-
// definition of an 'in-flight' transaction is the time between
|
132
|
-
// when the request was made and when the database starts to
|
133
|
-
// execute the transaction.
|
134
|
-
delete inflightTransactions[transactionId];
|
135
|
-
populate(new google.wspl.html5.Transaction(tx));
|
136
|
-
},
|
137
|
-
function(error) {transactionCallback.onFailure(error);},
|
138
|
-
function() {transactionCallback.onSuccess();});
|
139
|
-
};
|
140
|
-
|
141
|
-
/**
|
142
|
-
* Determine if there is an in-flight database transaction that's older than
|
143
|
-
* the given time period.
|
144
|
-
* @param {number} olderThanMillis The time period.
|
145
|
-
* @return {boolean} True if the database has an in-flight transaction older
|
146
|
-
* than the given time period, false otherwise.
|
147
|
-
*/
|
148
|
-
google.wspl.html5.Database.prototype.hasInflightTransactions =
|
149
|
-
function(olderThanMillis) {
|
150
|
-
for (var transactionId in this.inflightTransactions_) {
|
151
|
-
var startTime = this.inflightTransactions_[transactionId];
|
152
|
-
if (this.getCurrentTime() - startTime > olderThanMillis) {
|
153
|
-
return true;
|
154
|
-
}
|
155
|
-
}
|
156
|
-
return false;
|
157
|
-
};
|
158
|
-
|
159
|
-
/**
|
160
|
-
* Returns the current time.
|
161
|
-
* @return {number} The current time in millis.
|
162
|
-
*/
|
163
|
-
google.wspl.html5.Database.prototype.getCurrentTime = function() {
|
164
|
-
// The iPhone does not support Date.now()
|
165
|
-
var d = new Date();
|
166
|
-
return d.getTime();
|
167
|
-
};
|
168
|
-
|
169
|
-
/**
|
170
|
-
* Creates an HTML5 ResultSet object.
|
171
|
-
* @see google.wspl.ResultSet#ResultSet
|
172
|
-
*
|
173
|
-
* @constructor
|
174
|
-
* @extends google.wspl.ResultSet
|
175
|
-
*
|
176
|
-
* @param {Object} html5_result The HTML5 implementation of result set.
|
177
|
-
*/
|
178
|
-
google.wspl.html5.ResultSet = function(html5_result) {
|
179
|
-
this.result_ = html5_result;
|
180
|
-
this.index_ = 0;
|
181
|
-
};
|
182
|
-
google.inherits(google.wspl.html5.ResultSet, google.wspl.ResultSet);
|
183
|
-
|
184
|
-
/**
|
185
|
-
* @see google.wspl.ResultSet#isValidRow
|
186
|
-
*/
|
187
|
-
google.wspl.html5.ResultSet.prototype.isValidRow = function() {
|
188
|
-
return this.index_ >= 0 && this.index_ < this.result_.rows.length;
|
189
|
-
};
|
190
|
-
|
191
|
-
/**
|
192
|
-
* @see google.wspl.ResultSet#next
|
193
|
-
*/
|
194
|
-
google.wspl.html5.ResultSet.prototype.next = function() {
|
195
|
-
this.index_ ++;
|
196
|
-
};
|
197
|
-
|
198
|
-
/**
|
199
|
-
* @see google.wspl.ResultSet#getRow
|
200
|
-
*/
|
201
|
-
google.wspl.html5.ResultSet.prototype.getRow = function() {
|
202
|
-
return this.result_.rows.item(this.index_);
|
203
|
-
};
|