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.
Files changed (507) hide show
  1. checksums.yaml +4 -4
  2. data/{fixtures/asciidoc-app/config.rb → .gemtest} +0 -0
  3. data/.yardopts +2 -6
  4. data/Rakefile +5 -1
  5. data/features/asset_hash.feature +32 -61
  6. data/features/asset_host.feature +11 -23
  7. data/features/builder.feature +2 -0
  8. data/features/cache_buster.feature +1 -1
  9. data/features/chained_templates.feature +2 -92
  10. data/features/clean_build.feature +0 -18
  11. data/features/cli_init.feature +17 -111
  12. data/features/content_type.feature +2 -5
  13. data/features/custom_layouts.feature +24 -20
  14. data/features/data.feature +0 -28
  15. data/features/directory_index.feature +9 -9
  16. data/features/front-matter-neighbor.feature +0 -32
  17. data/features/front-matter.feature +0 -17
  18. data/features/helpers_content_tag.feature +2 -2
  19. data/features/helpers_form_tag.feature +4 -4
  20. data/features/helpers_link_to.feature +11 -29
  21. data/features/helpers_url_for.feature +11 -11
  22. data/features/i18n_builder.feature +5 -5
  23. data/features/i18n_preview.feature +8 -8
  24. data/features/markdown_kramdown.feature +1 -1
  25. data/features/markdown_kramdown_in_haml.feature +1 -2
  26. data/features/markdown_redcarpet.feature +23 -23
  27. data/features/minify_css.feature +9 -75
  28. data/features/minify_javascript.feature +12 -65
  29. data/features/mount_rack.feature +2 -4
  30. data/features/multiple-sources.feature +27 -0
  31. data/features/proxy_pages.feature +0 -10
  32. data/features/redirects.feature +6 -7
  33. data/features/relative_assets.feature +21 -66
  34. data/features/slim.feature +11 -7
  35. data/features/stylus.feature +1 -1
  36. data/features/support/env.rb +4 -4
  37. data/fixtures/asset-hash-app/config.rb +0 -2
  38. data/fixtures/asset-hash-app/source/index.html.erb +1 -1
  39. data/fixtures/asset-hash-host-app/config.rb +1 -3
  40. data/fixtures/asset-host-app/source/asset_host.html.erb +20 -1
  41. data/fixtures/asset-host-app/source/stylesheets/asset_host.css.sass +47 -2
  42. data/fixtures/auto-css-app/config.rb +8 -10
  43. data/fixtures/auto-js-app/config.rb +8 -10
  44. data/fixtures/basic-data-app/config.rb +2 -4
  45. data/fixtures/cache-buster-app/source/stylesheets/relative_assets.css.sass +0 -1
  46. data/fixtures/cache-buster-app/source/stylesheets/site.css.sass +3 -1
  47. data/fixtures/capture-html-app/config.rb +3 -5
  48. data/fixtures/clean-app/config-complications.rb +4 -6
  49. data/fixtures/clean-app/config.rb +4 -6
  50. data/fixtures/content-for-app/config.rb +3 -5
  51. data/fixtures/custom-layout-app/config.rb +1 -1
  52. data/fixtures/data-app/config.rb +1 -1
  53. data/fixtures/dynamic-pages-app/config.rb +20 -42
  54. data/fixtures/dynamic-pages-app/source/real/index.html.erb +3 -3
  55. data/fixtures/ember-cli-app/config.rb +5 -0
  56. data/fixtures/{compass-sprites-app/config.rb → ember-cli-app/source/javascripts/file.js} +0 -0
  57. data/fixtures/ember-cli-app/test-app/.bowerrc +3 -0
  58. data/fixtures/ember-cli-app/test-app/.gitignore +17 -0
  59. data/fixtures/ember-cli-app/test-app/.jshintrc +32 -0
  60. data/fixtures/ember-cli-app/test-app/Brocfile.js +20 -0
  61. data/fixtures/ember-cli-app/test-app/README.md +25 -0
  62. data/fixtures/ember-cli-app/test-app/app/app.js +14 -0
  63. data/fixtures/{implied-extensions-app/config.rb → ember-cli-app/test-app/app/components/.gitkeep} +0 -0
  64. data/fixtures/{javascript-app/config.rb → ember-cli-app/test-app/app/controllers/.gitkeep} +0 -0
  65. data/fixtures/{more-implied-extensions-app/config.rb → ember-cli-app/test-app/app/helpers/.gitkeep} +0 -0
  66. data/fixtures/ember-cli-app/test-app/app/index.html +26 -0
  67. data/fixtures/{partial-chained_templates-app/config.rb → ember-cli-app/test-app/app/models/.gitkeep} +0 -0
  68. data/fixtures/ember-cli-app/test-app/app/router.js +10 -0
  69. data/fixtures/{preview-server-app/config-empty.rb → ember-cli-app/test-app/app/routes/.gitkeep} +0 -0
  70. data/fixtures/{request-app/config.rb → ember-cli-app/test-app/app/styles/.gitkeep} +0 -0
  71. data/fixtures/ember-cli-app/test-app/app/styles/app.css +3 -0
  72. data/fixtures/{traversal-app/source/.htaccess → ember-cli-app/test-app/app/templates/.gitkeep} +0 -0
  73. data/fixtures/ember-cli-app/test-app/app/templates/application.hbs +3 -0
  74. data/{lib/middleman-core/templates/html5/source/img/.gitignore → fixtures/ember-cli-app/test-app/app/templates/components/.gitkeep} +0 -0
  75. data/{lib/middleman-core/templates/mobile/source/js/script.js → fixtures/ember-cli-app/test-app/app/views/.gitkeep} +0 -0
  76. data/fixtures/ember-cli-app/test-app/bower.json +16 -0
  77. data/fixtures/ember-cli-app/test-app/config/environment.js +38 -0
  78. data/fixtures/ember-cli-app/test-app/package.json +31 -0
  79. data/fixtures/ember-cli-app/test-app/public/.gitkeep +0 -0
  80. data/fixtures/ember-cli-app/test-app/testem.json +6 -0
  81. data/fixtures/ember-cli-app/test-app/tests/.jshintrc +73 -0
  82. data/fixtures/ember-cli-app/test-app/tests/helpers/resolver.js +9 -0
  83. data/fixtures/ember-cli-app/test-app/tests/helpers/start-app.js +30 -0
  84. data/fixtures/ember-cli-app/test-app/tests/index.html +50 -0
  85. data/fixtures/ember-cli-app/test-app/tests/test-helper.js +6 -0
  86. data/fixtures/ember-cli-app/test-app/tests/unit/.gitkeep +0 -0
  87. data/fixtures/env-app/config.rb +0 -0
  88. data/fixtures/env-app/environments/development.rb +1 -0
  89. data/fixtures/env-app/environments/production.rb +2 -0
  90. data/fixtures/env-app/source/index.html.erb +3 -0
  91. data/fixtures/env-app/source/stylesheets/site.css.scss +3 -0
  92. data/fixtures/external-helpers/config.rb +1 -1
  93. data/fixtures/feature-params-app/config.rb +10 -6
  94. data/fixtures/feature-params-app/source/index.html.erb +2 -3
  95. data/fixtures/fonts-app/source/stylesheets/fonts.css.scss +6 -0
  96. data/fixtures/frontmatter-neighbor-app/config.rb +30 -0
  97. data/fixtures/frontmatter-settings-app/config.rb +2 -2
  98. data/fixtures/frontmatter-settings-neighbor-app/config.rb +33 -3
  99. data/fixtures/generator-test/config.rb +5 -10
  100. data/fixtures/glob-app/config.rb +1 -1
  101. data/fixtures/i18n-force-locale/config.rb +2 -4
  102. data/fixtures/i18n-force-locale/source/{index.haml → index.html.haml} +0 -0
  103. data/fixtures/i18n-test-app/source/localizable/{one.en.md → one.en.html.md} +0 -0
  104. data/fixtures/i18n-test-app/source/localizable/{one.es.md → one.es.html.md} +0 -0
  105. data/fixtures/indexable-app/config.rb +2 -2
  106. data/fixtures/indexable-app/source/evil spaces.html +1 -1
  107. data/fixtures/large-build-app/config.rb +1 -5
  108. data/fixtures/large-build-app/source/spaces in file.html.erb +1 -1
  109. data/fixtures/manual-layout-override/config.rb +1 -1
  110. data/fixtures/markdown-app/config.rb +1 -1
  111. data/fixtures/markdown-frontmatter-options-app/config.rb +1 -1
  112. data/fixtures/minify-css-app/source/stylesheets/site.css.sass +3 -1
  113. data/fixtures/more-frontmatter-settings-app/config.rb +1 -1
  114. data/fixtures/more-markdown-app/source/{with_layout.markdown → with_layout.html.markdown} +0 -0
  115. data/fixtures/more-markdown-app/source/{with_layout_erb.markdown.erb → with_layout_erb.html.markdown.erb} +0 -0
  116. data/fixtures/more-traversal-app/config.rb +4 -4
  117. data/fixtures/more-traversal-app/source/layout.erb +1 -1
  118. data/fixtures/multiple-data-sources-app/config.rb +3 -0
  119. data/fixtures/multiple-data-sources-app/data/data.yml +1 -0
  120. data/fixtures/multiple-data-sources-app/data/two.yml +1 -0
  121. data/fixtures/multiple-data-sources-app/data0/one.yml +1 -0
  122. data/fixtures/multiple-data-sources-app/data1/data1.yml +1 -0
  123. data/fixtures/multiple-data-sources-app/data1/one.yml +1 -0
  124. data/fixtures/multiple-data-sources-app/data2/data2.yml +1 -0
  125. data/fixtures/multiple-data-sources-app/data2/two.yml +1 -0
  126. data/fixtures/multiple-data-sources-app/source/index.html.erb +10 -0
  127. data/fixtures/multiple-sources-app/config.rb +3 -0
  128. data/fixtures/multiple-sources-app/source/index.html.erb +1 -0
  129. data/fixtures/multiple-sources-app/source/override-in-two.html.erb +1 -0
  130. data/fixtures/multiple-sources-app/source0/override-in-one.html.erb +1 -0
  131. data/fixtures/multiple-sources-app/source1/index1.html.erb +1 -0
  132. data/fixtures/multiple-sources-app/source1/override-in-one.html.erb +1 -0
  133. data/fixtures/multiple-sources-app/source2/index2.html.erb +1 -0
  134. data/fixtures/multiple-sources-app/source2/override-in-two.html.erb +1 -0
  135. data/fixtures/padrino-helpers-app/source/former_padrino_test.html.erb +3 -3
  136. data/fixtures/page-classes-app/config.rb +2 -4
  137. data/fixtures/page-classes-app/source/2-starts-with-numeric-custom.html.erb +1 -1
  138. data/fixtures/page-helper-layout-block-app/config.rb +1 -1
  139. data/fixtures/partials-app/source/locals.html.erb +1 -1
  140. data/fixtures/partials-app/source/shared/{snippet.erb → _snippet.html.erb} +0 -0
  141. data/fixtures/partials-app/source/sub/index.html.erb +1 -1
  142. data/fixtures/passthrough-app/source/stylesheets/site.css.sass +5 -1
  143. data/fixtures/proxy-pages-app/config.rb +12 -15
  144. data/fixtures/relative-app/source/stylesheets/relative_assets.css.sass +1 -2
  145. data/fixtures/relative-assets-app/source/javascripts/application.js +8 -0
  146. data/fixtures/relative-assets-app/source/relative_image.html.erb +0 -1
  147. data/fixtures/relative-assets-app/source/stylesheets/relative_assets.css.sass +1 -2
  148. data/fixtures/scss-app/source/stylesheets/site_scss.css.scss +3 -1
  149. data/fixtures/stylus-preview-app/source/content.html.erb +4 -0
  150. data/fixtures/traversal-app/config.rb +4 -4
  151. data/fixtures/traversal-app/source/layout.erb +1 -1
  152. data/fixtures/v4-extension-callbacks/config.rb +21 -5
  153. data/fixtures/wildcard-app/config.rb +1 -1
  154. data/fixtures/wildcard-directory-index-app/config.rb +1 -1
  155. data/lib/middleman-core.rb +5 -2
  156. data/lib/middleman-core/application.rb +212 -131
  157. data/lib/middleman-core/builder.rb +255 -0
  158. data/lib/middleman-core/config_context.rb +103 -0
  159. data/lib/middleman-core/configuration.rb +15 -92
  160. data/lib/middleman-core/contracts.rb +149 -0
  161. data/lib/middleman-core/core_extensions.rb +86 -45
  162. data/lib/middleman-core/core_extensions/data.rb +82 -72
  163. data/lib/{middleman-more → middleman-core}/core_extensions/default_helpers.rb +34 -140
  164. data/lib/middleman-core/core_extensions/external_helpers.rb +23 -27
  165. data/lib/middleman-core/core_extensions/file_watcher.rb +59 -169
  166. data/lib/middleman-core/core_extensions/front_matter.rb +72 -131
  167. data/lib/middleman-core/core_extensions/i18n.rb +186 -0
  168. data/lib/middleman-core/core_extensions/rendering.rb +45 -533
  169. data/lib/middleman-core/core_extensions/routing.rb +53 -51
  170. data/lib/middleman-core/core_extensions/show_exceptions.rb +11 -18
  171. data/lib/middleman-core/extension.rb +183 -56
  172. data/lib/middleman-core/extension_manager.rb +80 -0
  173. data/lib/middleman-core/extensions.rb +96 -67
  174. data/lib/middleman-core/extensions/asset_hash.rb +92 -0
  175. data/lib/middleman-core/extensions/asset_host.rb +37 -0
  176. data/lib/{middleman-more → middleman-core}/extensions/automatic_alt_tags.rb +6 -5
  177. data/lib/{middleman-more → middleman-core}/extensions/automatic_image_sizes.rb +9 -13
  178. data/lib/middleman-core/extensions/cache_buster.rb +27 -0
  179. data/lib/{middleman-more → middleman-core}/extensions/directory_indexes.rb +9 -7
  180. data/lib/middleman-core/extensions/external_pipeline.rb +37 -0
  181. data/lib/{middleman-more → middleman-core}/extensions/gzip.rb +10 -3
  182. data/lib/{middleman-more → middleman-core}/extensions/lorem.rb +2 -2
  183. data/lib/middleman-core/extensions/minify_css.rb +86 -0
  184. data/lib/middleman-core/extensions/minify_javascript.rb +93 -0
  185. data/lib/middleman-core/extensions/relative_assets.rb +38 -0
  186. data/lib/middleman-core/file_renderer.rb +139 -0
  187. data/lib/middleman-core/load_paths.rb +21 -28
  188. data/lib/middleman-core/meta_pages.rb +9 -9
  189. data/lib/middleman-core/meta_pages/sitemap_resource.rb +3 -6
  190. data/lib/middleman-core/meta_pages/sitemap_tree.rb +1 -1
  191. data/lib/middleman-core/middleware/inline_url_rewriter.rb +96 -0
  192. data/lib/middleman-core/preview_server.rb +65 -196
  193. data/lib/middleman-core/profiling.rb +14 -15
  194. data/lib/middleman-core/rack.rb +138 -0
  195. data/lib/middleman-core/renderers/coffee_script.rb +10 -13
  196. data/lib/middleman-core/renderers/erb.rb +3 -15
  197. data/lib/middleman-core/renderers/haml.rb +33 -18
  198. data/lib/middleman-core/renderers/kramdown.rb +6 -4
  199. data/lib/middleman-core/renderers/less.rb +12 -18
  200. data/lib/middleman-core/renderers/liquid.rb +22 -18
  201. data/lib/middleman-core/renderers/markdown.rb +36 -49
  202. data/lib/middleman-core/renderers/redcarpet.rb +11 -4
  203. data/lib/middleman-core/renderers/sass.rb +36 -27
  204. data/lib/middleman-core/renderers/sass_functions.rb +116 -0
  205. data/lib/middleman-core/renderers/slim.rb +19 -26
  206. data/lib/middleman-core/renderers/stylus.rb +4 -14
  207. data/lib/middleman-core/sitemap/extensions/ignores.rb +35 -73
  208. data/lib/middleman-core/sitemap/extensions/on_disk.rb +29 -48
  209. data/lib/middleman-core/sitemap/extensions/proxies.rb +111 -133
  210. data/lib/middleman-core/sitemap/extensions/redirects.rb +68 -102
  211. data/lib/middleman-core/sitemap/extensions/request_endpoints.rb +59 -83
  212. data/lib/middleman-core/sitemap/extensions/traversal.rb +14 -15
  213. data/lib/middleman-core/sitemap/resource.rb +99 -71
  214. data/lib/middleman-core/sitemap/store.rb +79 -132
  215. data/lib/middleman-core/sources.rb +310 -0
  216. data/lib/middleman-core/sources/source_watcher.rb +268 -0
  217. data/lib/middleman-core/step_definitions.rb +2 -3
  218. data/lib/middleman-core/step_definitions/builder_steps.rb +15 -13
  219. data/lib/middleman-core/step_definitions/middleman_steps.rb +2 -18
  220. data/lib/middleman-core/step_definitions/server_steps.rb +43 -77
  221. data/lib/middleman-core/template_context.rb +181 -0
  222. data/lib/middleman-core/template_renderer.rb +213 -0
  223. data/lib/middleman-core/util.rb +319 -241
  224. data/lib/middleman-core/util/hash_with_indifferent_access.rb +103 -0
  225. data/lib/middleman-core/version.rb +1 -1
  226. data/lib/middleman/rack.rb +0 -1
  227. data/middleman-core.gemspec +36 -28
  228. data/spec/middleman-core/path_match_spec.rb +37 -0
  229. data/spec/spec_helper.rb +2 -25
  230. metadata +237 -454
  231. data/bin/middleman +0 -18
  232. data/cucumber.yml +0 -2
  233. data/features/asciidoc.feature +0 -155
  234. data/features/cli/preview_server-hook.feature +0 -17
  235. data/features/cli/preview_server.feature +0 -532
  236. data/features/compass-sprites.feature +0 -6
  237. data/features/console.feature +0 -10
  238. data/features/current_page_request_path_backwards.feature +0 -6
  239. data/features/fonts.feature +0 -15
  240. data/features/i18n_link_to.feature +0 -209
  241. data/features/image_srcset_paths.feature +0 -7
  242. data/features/implied_extensions.feature +0 -69
  243. data/features/instance_vars.feature +0 -9
  244. data/features/javascript-testing.feature +0 -18
  245. data/features/more-implied_extensions.feature +0 -44
  246. data/features/partials_dir.feature +0 -30
  247. data/features/queryable.feature +0 -35
  248. data/features/request_params.feature +0 -6
  249. data/features/static_server.feature +0 -6
  250. data/features/step_definitions/page_layout_steps.rb +0 -15
  251. data/features/step_definitions/queryable_steps.rb +0 -212
  252. data/features/support/preserve_mime_types.rb +0 -7
  253. data/features/v3_extensions.feature +0 -20
  254. data/features/working_directory.feature +0 -33
  255. data/fixtures/asciidoc-app/source/_include.adoc +0 -1
  256. data/fixtures/asciidoc-app/source/code.adoc +0 -3
  257. data/fixtures/asciidoc-app/source/custom-attribute.adoc +0 -3
  258. data/fixtures/asciidoc-app/source/gallery.adoc +0 -1
  259. data/fixtures/asciidoc-app/source/hello-no-layout.adoc +0 -2
  260. data/fixtures/asciidoc-app/source/hello-with-front-matter.adoc +0 -5
  261. data/fixtures/asciidoc-app/source/hello-with-layout.adoc +0 -2
  262. data/fixtures/asciidoc-app/source/hello-with-title.adoc +0 -5
  263. data/fixtures/asciidoc-app/source/hello.adoc +0 -4
  264. data/fixtures/asciidoc-app/source/images/tiger.gif +0 -0
  265. data/fixtures/asciidoc-app/source/layouts/default.erb +0 -9
  266. data/fixtures/asciidoc-app/source/master.adoc +0 -3
  267. data/fixtures/asset-hash-app/source/api.json.erb +0 -1
  268. data/fixtures/asset-hash-app/source/fonts/fontawesome-webfont.woff +0 -0
  269. data/fixtures/asset-hash-app/source/fonts/fontawesome-webfont.woff2 +0 -0
  270. data/fixtures/asset-hash-app/source/images/200px.jpg +0 -0
  271. data/fixtures/asset-hash-app/source/images/300px.jpg +0 -0
  272. data/fixtures/asset-hash-app/source/slim.html.slim +0 -8
  273. data/fixtures/asset-hash-app/source/stylesheets/uses_fonts.css +0 -4
  274. data/fixtures/asset-hash-app/source/subdir/api.json.erb +0 -1
  275. data/fixtures/chained-app/source/test.erb.combobreaker.str.erb +0 -8
  276. data/fixtures/clean-app/config-hidden-dir-after.rb +0 -5
  277. data/fixtures/clean-app/config-hidden-dir-before.rb +0 -1
  278. data/fixtures/compass-sprites-app/source/images/icon/arrow_down.png +0 -0
  279. data/fixtures/compass-sprites-app/source/images/icon/arrow_left.png +0 -0
  280. data/fixtures/compass-sprites-app/source/images/icon/arrow_right.png +0 -0
  281. data/fixtures/compass-sprites-app/source/images/icon/arrow_up.png +0 -0
  282. data/fixtures/compass-sprites-app/source/stylesheets/site.css.scss +0 -3
  283. data/fixtures/content-type-app/source/index.php +0 -1
  284. data/fixtures/current-page-app/config.rb +0 -3
  285. data/fixtures/current-page-app/source/request-path.html.erb +0 -1
  286. data/fixtures/default-partials-dir-app/source/_partial.html.erb +0 -1
  287. data/fixtures/default-partials-dir-app/source/index.html.erb +0 -2
  288. data/fixtures/fonts-app/source/stylesheets/fonts.css.sass +0 -5
  289. data/fixtures/frontmatter-app/source/front-matter-auto.erb +0 -6
  290. data/fixtures/frontmatter-app/source/front-matter-pandoc.html.md.erb +0 -13
  291. data/fixtures/frontmatter-app/source/json-front-matter-auto.erb +0 -6
  292. data/fixtures/frontmatter-neighbor-app/source/front-matter-auto.erb +0 -1
  293. data/fixtures/frontmatter-neighbor-app/source/front-matter-auto.erb.frontmatter +0 -4
  294. data/fixtures/frontmatter-neighbor-app/source/json-front-matter-auto.erb +0 -1
  295. data/fixtures/frontmatter-neighbor-app/source/json-front-matter-auto.erb.frontmatter +0 -4
  296. data/fixtures/image-srcset-paths-app/image-srcset-paths.html.erb +0 -1
  297. data/fixtures/image-srcset-paths-app/images/blank.gif +0 -0
  298. data/fixtures/implied-extensions-app/source/index.erb +0 -1
  299. data/fixtures/instance-vars-app/config.rb +0 -7
  300. data/fixtures/instance-vars-app/source/content.html.erb +0 -2
  301. data/fixtures/instance-vars-app/source/layout.erb +0 -1
  302. data/fixtures/javascript-app/source/index.html +0 -17
  303. data/fixtures/minify-css-app/source/inline-css.php +0 -8
  304. data/fixtures/minify-css-app/source/stylesheets/site.xcss.sass +0 -5
  305. data/fixtures/minify-js-app/source/inline-js.php +0 -22
  306. data/fixtures/minify-js-app/source/javascripts/js_test.xjs +0 -8
  307. data/fixtures/more-implied-extensions-app/source/javascripts/app.coffee +0 -1
  308. data/fixtures/more-implied-extensions-app/source/layouts/layout.erb +0 -3
  309. data/fixtures/more-implied-extensions-app/source/stylesheets/style.scss +0 -3
  310. data/fixtures/more-implied-extensions-app/source/stylesheets/style2.sass +0 -3
  311. data/fixtures/more-implied-extensions-app/source/test.haml +0 -4
  312. data/fixtures/more-implied-extensions-app/source/test2.markdown +0 -3
  313. data/fixtures/more-implied-extensions-app/source/test3.slim +0 -3
  314. data/fixtures/more-implied-extensions-app/source/test4.liquid +0 -1
  315. data/fixtures/partials-dir-app/source/index.html.erb +0 -2
  316. data/fixtures/partials-dir-app/source/nested/partials/_partial.html.erb +0 -1
  317. data/fixtures/partials-dir-app/source/partials/_partial.html.erb +0 -1
  318. data/fixtures/plain-app/index.html +0 -1
  319. data/fixtures/preview-server-app/bin/dns_server.rb +0 -33
  320. data/fixtures/preview-server-app/config-complications.rb +0 -11
  321. data/fixtures/preview-server-app/config.rb +0 -11
  322. data/fixtures/preview-server-app/source/index.html.erb +0 -1
  323. data/fixtures/preview-server-app/source/layout.erb +0 -9
  324. data/fixtures/preview-server-app/source/layouts/custom.erb +0 -8
  325. data/fixtures/preview-server-app/source/real.html +0 -1
  326. data/fixtures/preview-server-app/source/real/index.html.erb +0 -5
  327. data/fixtures/preview-server-app/source/should_be_ignored.html +0 -1
  328. data/fixtures/preview-server-app/source/should_be_ignored2.html +0 -1
  329. data/fixtures/preview-server-app/source/should_be_ignored3.html +0 -1
  330. data/fixtures/preview-server-app/source/static.html +0 -1
  331. data/fixtures/preview-server-hook-app/config.rb +0 -19
  332. data/fixtures/preview-server-hook-app/source/index.html.erb +0 -9
  333. data/fixtures/proxy-pages-app/source/real/index-ivars.html.erb +0 -6
  334. data/fixtures/relative-assets-app/source/absolute_image_relative_css.html.erb +0 -9
  335. data/fixtures/relative-assets-app/source/javascripts/app.js +0 -3
  336. data/fixtures/relative-assets-app/source/relative_image_absolute_css.html.erb +0 -9
  337. data/fixtures/request-app/source/index.html.erb +0 -3
  338. data/fixtures/stylus-preview-app/source/layout.erb +0 -1
  339. data/lib/middleman-core/cli.rb +0 -88
  340. data/lib/middleman-core/cli/build.rb +0 -300
  341. data/lib/middleman-core/cli/bundler.rb +0 -39
  342. data/lib/middleman-core/cli/console.rb +0 -52
  343. data/lib/middleman-core/cli/extension.rb +0 -47
  344. data/lib/middleman-core/cli/init.rb +0 -71
  345. data/lib/middleman-core/cli/server.rb +0 -99
  346. data/lib/middleman-core/core_extensions/data/file_loader.rb +0 -71
  347. data/lib/middleman-core/core_extensions/extensions.rb +0 -197
  348. data/lib/middleman-core/core_extensions/request.rb +0 -312
  349. data/lib/middleman-core/dns_resolver.rb +0 -73
  350. data/lib/middleman-core/dns_resolver/basic_network_resolver.rb +0 -52
  351. data/lib/middleman-core/dns_resolver/hosts_resolver.rb +0 -63
  352. data/lib/middleman-core/dns_resolver/local_link_resolver.rb +0 -44
  353. data/lib/middleman-core/dns_resolver/network_resolver.rb +0 -42
  354. data/lib/middleman-core/preview_server/checks.rb +0 -81
  355. data/lib/middleman-core/preview_server/information.rb +0 -273
  356. data/lib/middleman-core/preview_server/network_interface_inventory.rb +0 -65
  357. data/lib/middleman-core/preview_server/server_hostname.rb +0 -39
  358. data/lib/middleman-core/preview_server/server_information.rb +0 -153
  359. data/lib/middleman-core/preview_server/server_information_callback_proxy.rb +0 -35
  360. data/lib/middleman-core/preview_server/server_information_validator.rb +0 -18
  361. data/lib/middleman-core/preview_server/server_ip_address.rb +0 -55
  362. data/lib/middleman-core/preview_server/server_url.rb +0 -63
  363. data/lib/middleman-core/preview_server/tcp_port_prober.rb +0 -29
  364. data/lib/middleman-core/renderers/asciidoc.rb +0 -58
  365. data/lib/middleman-core/sitemap.rb +0 -76
  366. data/lib/middleman-core/sitemap/extensions/content_type.rb +0 -16
  367. data/lib/middleman-core/sitemap/queryable.rb +0 -151
  368. data/lib/middleman-core/step_definitions/commandline_steps.rb +0 -88
  369. data/lib/middleman-core/templates.rb +0 -101
  370. data/lib/middleman-core/templates/default.rb +0 -37
  371. data/lib/middleman-core/templates/default/source/images/background.png +0 -0
  372. data/lib/middleman-core/templates/default/source/images/middleman.png +0 -0
  373. data/lib/middleman-core/templates/default/source/index.html.erb +0 -10
  374. data/lib/middleman-core/templates/default/source/javascripts/all.js +0 -1
  375. data/lib/middleman-core/templates/default/source/layouts/layout.erb +0 -19
  376. data/lib/middleman-core/templates/default/source/stylesheets/all.css +0 -55
  377. data/lib/middleman-core/templates/default/source/stylesheets/normalize.css +0 -375
  378. data/lib/middleman-core/templates/empty.rb +0 -22
  379. data/lib/middleman-core/templates/empty/Gemfile.tt +0 -6
  380. data/lib/middleman-core/templates/extension/Gemfile +0 -18
  381. data/lib/middleman-core/templates/extension/Rakefile +0 -14
  382. data/lib/middleman-core/templates/extension/features/support/env.rb +0 -4
  383. data/lib/middleman-core/templates/extension/gemspec +0 -24
  384. data/lib/middleman-core/templates/extension/gitignore +0 -5
  385. data/lib/middleman-core/templates/extension/lib/lib.rb +0 -38
  386. data/lib/middleman-core/templates/extension/lib/middleman_extension.rb +0 -1
  387. data/lib/middleman-core/templates/html5.rb +0 -29
  388. data/lib/middleman-core/templates/html5/source/.htaccess +0 -542
  389. data/lib/middleman-core/templates/html5/source/404.html +0 -157
  390. data/lib/middleman-core/templates/html5/source/LICENSE.md +0 -19
  391. data/lib/middleman-core/templates/html5/source/README.md +0 -63
  392. data/lib/middleman-core/templates/html5/source/apple-touch-icon-114x114-precomposed.png +0 -0
  393. data/lib/middleman-core/templates/html5/source/apple-touch-icon-144x144-precomposed.png +0 -0
  394. data/lib/middleman-core/templates/html5/source/apple-touch-icon-57x57-precomposed.png +0 -0
  395. data/lib/middleman-core/templates/html5/source/apple-touch-icon-72x72-precomposed.png +0 -0
  396. data/lib/middleman-core/templates/html5/source/apple-touch-icon-precomposed.png +0 -0
  397. data/lib/middleman-core/templates/html5/source/apple-touch-icon.png +0 -0
  398. data/lib/middleman-core/templates/html5/source/crossdomain.xml +0 -15
  399. data/lib/middleman-core/templates/html5/source/css/main.css +0 -298
  400. data/lib/middleman-core/templates/html5/source/css/normalize.css +0 -504
  401. data/lib/middleman-core/templates/html5/source/favicon.ico +0 -0
  402. data/lib/middleman-core/templates/html5/source/humans.txt +0 -15
  403. data/lib/middleman-core/templates/html5/source/index.html.erb +0 -6
  404. data/lib/middleman-core/templates/html5/source/js/main.js +0 -1
  405. data/lib/middleman-core/templates/html5/source/js/plugins.js +0 -14
  406. data/lib/middleman-core/templates/html5/source/js/vendor/jquery-1.8.0.min.js +0 -2
  407. data/lib/middleman-core/templates/html5/source/js/vendor/modernizr-2.6.1.min.js +0 -4
  408. data/lib/middleman-core/templates/html5/source/layouts/layout.erb +0 -40
  409. data/lib/middleman-core/templates/html5/source/robots.txt +0 -3
  410. data/lib/middleman-core/templates/local.rb +0 -27
  411. data/lib/middleman-core/templates/mobile.rb +0 -24
  412. data/lib/middleman-core/templates/mobile/source/404.html +0 -37
  413. data/lib/middleman-core/templates/mobile/source/README.markdown +0 -21
  414. data/lib/middleman-core/templates/mobile/source/crossdomain.xml +0 -25
  415. data/lib/middleman-core/templates/mobile/source/css/style.css +0 -315
  416. data/lib/middleman-core/templates/mobile/source/humans.txt +0 -43
  417. data/lib/middleman-core/templates/mobile/source/img/h/apple-touch-icon.png +0 -0
  418. data/lib/middleman-core/templates/mobile/source/img/h/splash.png +0 -0
  419. data/lib/middleman-core/templates/mobile/source/img/l/apple-touch-icon-precomposed.png +0 -0
  420. data/lib/middleman-core/templates/mobile/source/img/l/apple-touch-icon.png +0 -0
  421. data/lib/middleman-core/templates/mobile/source/img/l/splash.png +0 -0
  422. data/lib/middleman-core/templates/mobile/source/img/m/apple-touch-icon.png +0 -0
  423. data/lib/middleman-core/templates/mobile/source/index.html +0 -92
  424. data/lib/middleman-core/templates/mobile/source/js/libs/modernizr-custom.js +0 -14
  425. data/lib/middleman-core/templates/mobile/source/js/libs/respond.min.js +0 -7
  426. data/lib/middleman-core/templates/mobile/source/js/mylibs/helper.js +0 -171
  427. data/lib/middleman-core/templates/mobile/source/js/plugins.js +0 -20
  428. data/lib/middleman-core/templates/mobile/source/robots.txt +0 -4
  429. data/lib/middleman-core/templates/mobile/source/sitemap.xml +0 -9
  430. data/lib/middleman-core/templates/mobile/source/test/index.html +0 -31
  431. data/lib/middleman-core/templates/mobile/source/test/qunit/qunit.css +0 -148
  432. data/lib/middleman-core/templates/mobile/source/test/qunit/qunit.js +0 -1265
  433. data/lib/middleman-core/templates/mobile/source/test/tests.js +0 -21
  434. data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/Readme.PDF +0 -0
  435. data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx1.snippet +0 -31
  436. data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx2.snippet +0 -2
  437. data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/ga.aspx +0 -195
  438. data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/sample.aspx +0 -44
  439. data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/ga.jsp +0 -225
  440. data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp1.snippet +0 -35
  441. data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp2.snippet +0 -2
  442. data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/sample.jsp +0 -51
  443. data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/ga.php +0 -176
  444. data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/php1.snippet +0 -30
  445. data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/php2.snippet +0 -4
  446. data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/sample.php +0 -44
  447. data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/ga.pl +0 -195
  448. data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/perl1.snippet +0 -27
  449. data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/perl2.snippet +0 -1
  450. data/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/sample.pl +0 -38
  451. data/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/COPYING +0 -202
  452. data/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/bookmark_bubble.js +0 -559
  453. data/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/example/example.html +0 -43
  454. data/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/example/example.js +0 -57
  455. data/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/arrow.png +0 -0
  456. data/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/close.png +0 -0
  457. data/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/generate_base64_images +0 -33
  458. data/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/icon_calendar.png +0 -0
  459. data/lib/middleman-core/templates/mobile/source/tools/wspl/README +0 -27
  460. data/lib/middleman-core/templates/mobile/source/tools/wspl/databasefactory.js +0 -45
  461. data/lib/middleman-core/templates/mobile/source/tools/wspl/dbworker.js +0 -324
  462. data/lib/middleman-core/templates/mobile/source/tools/wspl/dbworker_test.html +0 -393
  463. data/lib/middleman-core/templates/mobile/source/tools/wspl/dbworkerstarter.js +0 -32
  464. data/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_gears.js +0 -595
  465. data/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_gears_test.html +0 -404
  466. data/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_html5.js +0 -203
  467. data/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_html5_test.html +0 -468
  468. data/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapperapi.js +0 -202
  469. data/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapperapi_test.html +0 -51
  470. data/lib/middleman-core/templates/mobile/source/tools/wspl/gears_resultset.js +0 -71
  471. data/lib/middleman-core/templates/mobile/source/tools/wspl/gears_resultset_test.html +0 -86
  472. data/lib/middleman-core/templates/mobile/source/tools/wspl/gears_transaction.js +0 -196
  473. data/lib/middleman-core/templates/mobile/source/tools/wspl/gears_transaction_test.html +0 -221
  474. data/lib/middleman-core/templates/mobile/source/tools/wspl/gearsutils.js +0 -94
  475. data/lib/middleman-core/templates/mobile/source/tools/wspl/gearsutils_test.html +0 -84
  476. data/lib/middleman-core/templates/mobile/source/tools/wspl/global_functions.js +0 -72
  477. data/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/index.html +0 -347
  478. data/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/simplenotes.js +0 -503
  479. data/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/styles.css +0 -66
  480. data/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/template.js +0 -75
  481. data/lib/middleman-core/templates/shared/Gemfile.tt +0 -14
  482. data/lib/middleman-core/templates/shared/config.ru +0 -3
  483. data/lib/middleman-core/templates/shared/config.tt +0 -87
  484. data/lib/middleman-core/templates/shared/gitignore +0 -21
  485. data/lib/middleman-more/core_extensions/compass.rb +0 -75
  486. data/lib/middleman-more/core_extensions/i18n.rb +0 -312
  487. data/lib/middleman-more/extensions/asset_hash.rb +0 -128
  488. data/lib/middleman-more/extensions/asset_host.rb +0 -50
  489. data/lib/middleman-more/extensions/cache_buster.rb +0 -55
  490. data/lib/middleman-more/extensions/minify_css.rb +0 -112
  491. data/lib/middleman-more/extensions/minify_javascript.rb +0 -120
  492. data/lib/middleman-more/extensions/relative_assets.rb +0 -24
  493. data/lib/middleman-more/templates/smacss.rb +0 -29
  494. data/lib/middleman-more/templates/smacss/source/_footer.haml +0 -1
  495. data/lib/middleman-more/templates/smacss/source/index.html.haml +0 -1
  496. data/lib/middleman-more/templates/smacss/source/layouts/layout.haml +0 -13
  497. data/lib/middleman-more/templates/smacss/source/stylesheets/base/README.markdown +0 -11
  498. data/lib/middleman-more/templates/smacss/source/stylesheets/base/base.scss +0 -1
  499. data/lib/middleman-more/templates/smacss/source/stylesheets/base/normalize.scss +0 -375
  500. data/lib/middleman-more/templates/smacss/source/stylesheets/layout/README.markdown +0 -9
  501. data/lib/middleman-more/templates/smacss/source/stylesheets/modules/README.markdown +0 -9
  502. data/lib/middleman-more/templates/smacss/source/stylesheets/states/README.markdown +0 -12
  503. data/lib/middleman-more/templates/smacss/source/stylesheets/style.css.scss +0 -12
  504. data/lib/vendored-middleman-deps/fastimage.rb +0 -287
  505. data/spec/middleman-core/dns_resolver_spec.rb +0 -118
  506. data/spec/middleman-core/preview_server/server_hostname_spec.rb +0 -39
  507. data/spec/middleman-core/preview_server/server_ip_address_spec.rb +0 -43
@@ -1,393 +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 worker 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="dbworker.js"></script>
26
- </head>
27
- <body>
28
- <script type='text/javascript'>
29
-
30
- var mockControl;
31
- var db;
32
- var wp;
33
- var factory;
34
- var callbackId = 10;
35
- var transactionId = 15;
36
- var name = 'name';
37
- var userId = 'userId';
38
- var utils;
39
-
40
- function setUp() {
41
- mockControl = new MockControl();
42
-
43
- // Mock the Gears factory.
44
- factory = mockControl.createMock();
45
- factory.addMockMethod('create');
46
-
47
- // Mock Google Gears.
48
- google.gears = {};
49
- google.gears.factory = {};
50
- google.gears.factory.create = factory.create;
51
-
52
- // Mock the Gears workerpool object.
53
- wp = mockControl.createMock({
54
- allowCrossOrigin: function(){},
55
- sendMessage: function(){}
56
- });
57
-
58
- // Mock the Gears database object.
59
- db = mockControl.createMock({
60
- execute: function(){},
61
- open: function(){},
62
- close: function(){},
63
- remove: function(){}
64
- });
65
-
66
- // Mock the Gears utility classes
67
- utils = mockControl.createMock({
68
- openDatabase: function(){},
69
- });
70
-
71
- google.wspl = google.wspl || {};
72
- google.wspl.GearsUtils = google.wspl.GearsUtils || {};
73
- google.wspl.GearsUtils.openDatabase = utils.openDatabase;
74
- google.wspl.GearsUtils.resultSetToObjectArray = function(rs) {
75
- return rs;
76
- };
77
- }
78
-
79
- function buildWorker() {
80
- wp.expects().sendMessage(TypeOf.isA(Object), 0).andStub(
81
- function() {
82
- var msg = arguments[0];
83
- assertEquals('Wrong message type.',
84
- google.wspl.gears.DbWorker.ReplyTypes.STARTED, msg.type);
85
- });
86
- var worker = new google.wspl.gears.DbWorker(wp);
87
- worker.db_ = db;
88
- worker.log_ = function() {};
89
-
90
- return worker;
91
- }
92
-
93
- function testConstruction() {
94
- var worker = buildWorker();
95
- mockControl.verify();
96
- }
97
-
98
- function testHandleExecute_success() {
99
- var worker = buildWorker();
100
- var stat1 = {sql: 'sql1', params: [1, 2]};
101
- var stat2 = {sql: 'sql2', params: [3, 4]};
102
- var statements = [stat1, stat2];
103
- var type = google.wspl.gears.DbWorker.ReplyTypes.RESULT;
104
-
105
- db.expects().execute(stat1.sql, stat1.params).andReturn('result1');
106
- db.expects().execute(stat2.sql, stat2.params).andReturn('result2');
107
- wp.expects().sendMessage(TypeOf.isA(Object), worker.senderId_).andStub(
108
- function() {
109
- var msg = arguments[0];
110
- assertEquals('Wrong message type.', type, msg.type);
111
- assertEquals('Wrong results.length', 2, msg.results.length);
112
- assertEquals('Wrong results[0].', 'result1', msg.results[0]);
113
- assertEquals('Wrong results[1].', 'result2', msg.results[1]);
114
- assertEquals('Wrong callbackId.', callbackId, msg.callbackId);
115
- assertEquals('Wrong transactionId.', transactionId, msg.transactionId);
116
- });
117
-
118
- worker.handleExecute_(statements, callbackId, transactionId);
119
- mockControl.verify();
120
- }
121
-
122
- function testHandleExecute_failure() {
123
- var worker = buildWorker();
124
- var stat1 = {sql: 'sql1', params: [1, 2]};
125
- var stat2 = {sql: 'sql2', params: [3, 4]};
126
- var stat3 = {sql: 'sql3', params: [5, 6]};
127
- var statements = [stat1, stat2, stat3];
128
- var type1 = google.wspl.gears.DbWorker.ReplyTypes.RESULT;
129
- var type2 = google.wspl.gears.DbWorker.ReplyTypes.FAILURE;
130
- var error = 'sql error';
131
-
132
- db.expects().execute(stat1.sql, stat1.params).andReturn('result1');
133
- db.expects().execute(stat2.sql, stat2.params).andThrow(error);
134
- wp.expects().sendMessage(TypeOf.isA(Object), worker.senderId_).andStub(
135
- function() {
136
- var msg = arguments[0];
137
- assertEquals('Wrong message type.', type2, msg.type);
138
- assertEquals('Wrong result.', error, msg.error.message);
139
- assertEquals('Wrong callbackId.', callbackId, msg.callbackId);
140
- assertEquals('Wrong transactionId.', transactionId, msg.transactionId);
141
- });
142
-
143
- worker.handleExecute_(statements, callbackId, transactionId);
144
- mockControl.verify();
145
- }
146
-
147
- function testHandleBegin() {
148
- var worker = buildWorker();
149
-
150
- // Expecting two transactions to begin.
151
- db.expects().execute('BEGIN IMMEDIATE');
152
- db.expects().execute('BEGIN IMMEDIATE');
153
-
154
- worker.handleBegin_(transactionId);
155
- worker.handleBegin_(22);
156
-
157
- assertEquals('Did not save first transaction id', transactionId,
158
- worker.transactions_[0]);
159
- assertEquals('Did not save second transaction id', 22,
160
- worker.transactions_[1]);
161
-
162
- mockControl.verify();
163
- }
164
-
165
- function testHandleCommit() {
166
- var worker = buildWorker();
167
- db.expects().execute('COMMIT');
168
- worker.handleCommit_(transactionId);
169
- mockControl.verify();
170
- }
171
-
172
- function testHandleRollback() {
173
- var worker = buildWorker();
174
- db.expects().execute('ROLLBACK');
175
- worker.handleRollback_(transactionId);
176
- mockControl.verify();
177
- }
178
-
179
- function testHandleOpen_success() {
180
- var worker = buildWorker();
181
- worker.db_ = null;
182
-
183
- factory.expects().create('beta.database', '1.0').andReturn(db);
184
- utils.expects().openDatabase(userId, name, db, worker.log_).andReturn(db);
185
- wp.expects().sendMessage(TypeOf.isA(Object), worker.senderId_).andStub(
186
- function(msg) {
187
- assertEquals('Type not set correctly.',
188
- google.wspl.gears.DbWorker.ReplyTypes.OPEN_SUCCESSFUL, msg.type);
189
- });
190
-
191
- worker.handleOpen_(userId, name);
192
- assertEquals('Database wrongly set', db, worker.db_);
193
- mockControl.verify();
194
- }
195
-
196
- function testHandleOpen_failure_gearsfactory() {
197
- var worker = buildWorker();
198
- worker.db_ = null;
199
-
200
- factory.expects().create('beta.database', '1.0').andThrow('blah!');
201
- wp.expects().sendMessage(TypeOf.isA(Object), worker.senderId_).andStub(
202
- function(msg) {
203
- assertEquals('Type not set correctly.',
204
- google.wspl.gears.DbWorker.ReplyTypes.OPEN_FAILED, msg.type);
205
- });
206
-
207
- worker.handleOpen_(userId, name);
208
- mockControl.verify();
209
- }
210
-
211
- function testHandleOpen_failure_dbopen() {
212
- var worker = buildWorker();
213
- worker.db_ = null;
214
-
215
- factory.expects().create('beta.database', '1.0').andReturn(null);
216
- utils.expects().openDatabase(userId, name, null, worker.log_).andThrow('blah!');
217
- wp.expects().sendMessage(TypeOf.isA(Object), worker.senderId_).andStub(
218
- function(msg) {
219
- assertEquals('Type not set correctly.',
220
- google.wspl.gears.DbWorker.ReplyTypes.OPEN_FAILED, msg.type);
221
- });
222
-
223
- worker.handleOpen_(userId, name);
224
- mockControl.verify();
225
- }
226
-
227
- function testPostCommit() {
228
- var worker = buildWorker();
229
- worker.transactions_ = [4, 5];
230
-
231
- wp.expects().sendMessage(TypeOf.isA(Object), worker.senderId_).andStub(
232
- function() {
233
- var msg = arguments[0];
234
- assertEquals('Type not set correctly.',
235
- google.wspl.gears.DbWorker.ReplyTypes.COMMIT, msg.type);
236
- assertEquals('Transaction id not set correctly.',
237
- 5, msg.transactionId);
238
- });
239
-
240
- wp.expects().sendMessage(TypeOf.isA(Object), worker.senderId_).andStub(
241
- function() {
242
- var msg = arguments[0];
243
- assertEquals('Type not set correctly.',
244
- google.wspl.gears.DbWorker.ReplyTypes.COMMIT, msg.type);
245
- assertEquals('Transaction id not set correctly.',
246
- 4, msg.transactionId);
247
- });
248
-
249
- worker.postCommit_();
250
- assertEquals('Did not clear the transactions.', 0,
251
- worker.transactions_.length);
252
- mockControl.verify();
253
- }
254
-
255
- function testPostRollback() {
256
- var worker = buildWorker();
257
- worker.transactions_ = [4, 5];
258
-
259
- wp.expects().sendMessage(TypeOf.isA(Object), worker.senderId_).andStub(
260
- function() {
261
- var msg = arguments[0];
262
- assertEquals('Type not set correctly.',
263
- google.wspl.gears.DbWorker.ReplyTypes.ROLLBACK, msg.type);
264
- assertEquals('Transaction id not set correctly.',
265
- 5, msg.transactionId);
266
- });
267
-
268
- wp.expects().sendMessage(TypeOf.isA(Object), worker.senderId_).andStub(
269
- function() {
270
- var msg = arguments[0];
271
- assertEquals('Type not set correctly.',
272
- google.wspl.gears.DbWorker.ReplyTypes.ROLLBACK, msg.type);
273
- assertEquals('Transaction id not set correctly.',
274
- 4, msg.transactionId);
275
- });
276
-
277
- worker.postRollback_();
278
- assertEquals('Did not clear the transactions.', 0,
279
- worker.transactions_.length);
280
- mockControl.verify();
281
- }
282
-
283
- function testOnmessage() {
284
- var messageObject = {sender: 123, body: {}};
285
- var worker = buildWorker();
286
- worker.onMessage_(null, null, messageObject);
287
-
288
- assertEquals('Wrong sender ID.', 123, worker.senderId_);
289
-
290
- mockControl.verify();
291
- }
292
-
293
- function testOnmessage_open() {
294
- var messageObject = {sender: 123, body: {
295
- type: google.wspl.gears.DbWorker.CommandTypes.OPEN,
296
- name: name,
297
- userId: userId
298
- }};
299
-
300
- var worker = buildWorker();
301
- var handler = mockControl.createMock();
302
- handler.addMockMethod('open');
303
- worker.handleOpen_ = handler.open;
304
- handler.expects().open(userId, name);
305
-
306
- worker.onMessage_(null, null, messageObject);
307
- mockControl.verify();
308
- }
309
-
310
- function testOnmessage_execute() {
311
- var worker = buildWorker();
312
- var statements = ['stat1', 'stat2'];
313
- var messageObject = {sender: 123, body: {
314
- type: google.wspl.gears.DbWorker.CommandTypes.EXECUTE,
315
- statements: statements,
316
- callbackId: callbackId,
317
- transactionId: transactionId
318
- }};
319
- var called = false;
320
-
321
- worker.handleExecute_ = function(stat, call, trans) {
322
- called = true;
323
- assertEquals('Wrong statements.', statements, stat);
324
- assertEquals('Wrong callback id.', callbackId, call);
325
- assertEquals('Wrong transaction id.', transactionId, trans);
326
- };
327
-
328
- worker.onMessage_(null, null, messageObject);
329
- assertTrue('handleExecute_ not called.', called);
330
-
331
- mockControl.verify();
332
- }
333
-
334
- function testOnmessage_begin() {
335
- var worker = buildWorker();
336
- var messageObject = {sender: 123, body: {
337
- type: google.wspl.gears.DbWorker.CommandTypes.BEGIN,
338
- transactionId: transactionId
339
- }};
340
- var called = false;
341
-
342
- worker.handleBegin_ = function(trans) {
343
- called = true;
344
- assertEquals('Wrong transaction id.', transactionId, trans);
345
- };
346
-
347
- worker.onMessage_(null, null, messageObject);
348
- assertTrue('handleBegin_ not called.', called);
349
-
350
- mockControl.verify();
351
- }
352
-
353
- function testOnmessage_commit() {
354
- var worker = buildWorker();
355
- var messageObject = {sender: 123, body: {
356
- type: google.wspl.gears.DbWorker.CommandTypes.COMMIT,
357
- transactionId: transactionId
358
- }};
359
- var called = false;
360
-
361
- worker.handleCommit_ = function(trans) {
362
- called = true;
363
- assertEquals('Wrong transaction id.', transactionId, trans);
364
- };
365
-
366
- worker.onMessage_(null, null, messageObject);
367
- assertTrue('handleCommit_ not called.', called);
368
-
369
- mockControl.verify();
370
- }
371
-
372
- function testOnmessage_rollback() {
373
- var worker = buildWorker();
374
- var messageObject = {sender: 123, body: {
375
- type: google.wspl.gears.DbWorker.CommandTypes.ROLLBACK,
376
- transactionId: transactionId
377
- }};
378
- var called = false;
379
-
380
- worker.handleRollback_ = function(trans) {
381
- called = true;
382
- assertEquals('Wrong transaction id.', transactionId, trans);
383
- };
384
-
385
- worker.onMessage_(null, null, messageObject);
386
- assertTrue('handleRollback_ not called.', called);
387
-
388
- mockControl.verify();
389
- }
390
-
391
- </script>
392
- </body>
393
- </html>
@@ -1,32 +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 Starts the dbworker.
19
- *
20
- * When constructing the worker for execution, this needs to be the last
21
- * file. The worker consists of the following source files combined together.
22
- *
23
- * globalfunctions.js
24
- * gearsutils.js
25
- * dbworker.js
26
- * dbworkerstarter.js
27
- *
28
- * and then loaded into a Gears worker process as implemented in
29
- * databasefactory.js
30
- */
31
-
32
- google.wspl.gears.DbWorker.start();
@@ -1,595 +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 A Gears implementation of dbwrapperapi Database.
19
- *
20
- * This implementation locks database access upon invoking the transaction's
21
- * populate callback. Statements are then asynchronously sent to a worker
22
- * thread for execution.
23
- */
24
-
25
- /**
26
- * @see google.wspl.Database#Database
27
- * @param {boolean} opt_sync Perform all callbacks synchronously.
28
- * @constructor
29
- * @extends google.wspl.Database
30
- */
31
- google.wspl.gears.Database = function(opt_sync) {
32
- google.wspl.Database.call(this);
33
-
34
- /**
35
- * Begin transactions synchronously.
36
- * @type {boolean}
37
- * @private
38
- */
39
- this.synchronous_ = !!opt_sync;
40
- };
41
- google.inherits(google.wspl.gears.Database, google.wspl.Database);
42
-
43
- /**
44
- * The time to wait for the dbworker to reply with STARTED.
45
- * @type {number}
46
- */
47
- google.wspl.gears.Database.TIMEOUT = 60000;
48
-
49
- /**
50
- * Whether the gears worker failed to reply with STARTED before TIMEOUT.
51
- * @type {boolean}
52
- * @private
53
- */
54
- google.wspl.gears.Database.prototype.workerTimeout_ = false;
55
-
56
- /**
57
- * Flag set when the worker is ready with an open database connection.
58
- * @type {boolean}
59
- * @private
60
- */
61
- google.wspl.gears.Database.prototype.workerReady_ = false;
62
-
63
- /**
64
- * Flag set when this database should use the worker to process transactions.
65
- * @type {boolean}
66
- * @private
67
- */
68
- google.wspl.gears.Database.prototype.useWorker_ = false;
69
-
70
- /**
71
- * The user for this database.
72
- * @type {string}
73
- * @private
74
- */
75
- google.wspl.gears.Database.prototype.userId_;
76
-
77
- /**
78
- * The name for this database.
79
- * @type {string}
80
- * @private
81
- */
82
- google.wspl.gears.Database.prototype.name_;
83
-
84
- /**
85
- * A map of open transactions and their callbacks.
86
- * @type {Object}
87
- * @private
88
- */
89
- google.wspl.gears.Database.prototype.transactions_ = {};
90
-
91
- /**
92
- * An array of transaction ids that should be executed in order as the lock
93
- * becomes available.
94
- * @type {Array.<number>}
95
- * @private
96
- */
97
- google.wspl.gears.Database.prototype.queuedTransactions_ = [];
98
-
99
- /**
100
- * The transaction lock for this database.
101
- * @type {boolean}
102
- * @private
103
- */
104
- google.wspl.gears.Database.prototype.locked_ = false;
105
-
106
- /**
107
- * The number of transactions to be used as an index.
108
- * @type {number}
109
- * @private
110
- */
111
- google.wspl.gears.Database.prototype.transCount_ = 1;
112
-
113
- /**
114
- * The id of the transaction being executed.
115
- * @type {number}
116
- * @private
117
- */
118
- google.wspl.gears.Database.prototype.currentTransactionId_;
119
-
120
- /**
121
- * The Gears worker pool.
122
- * @type {GearsWorkerPool}
123
- * @private
124
- */
125
- google.wspl.gears.Database.prototype.wp_;
126
-
127
- /**
128
- * The worker ID.
129
- * @type {number}
130
- * @private
131
- */
132
- google.wspl.gears.Database.prototype.workerId_;
133
-
134
- /**
135
- * The Gears database object.
136
- * @type {GearsDatabase}
137
- * @private
138
- */
139
- google.wspl.gears.Database.prototype.db_;
140
-
141
- /**
142
- * Opens a new Gears database. This operation can only be performed once.
143
- * @param {string} userId The user for this database.
144
- * @param {string} name The name for this database.
145
- * @param {GearsDatabase} gearsDb The gears database.
146
- */
147
- google.wspl.gears.Database.prototype.openDatabase = function(userId, name,
148
- gearsDb) {
149
- if (!this.db_) {
150
- this.db_ = gearsDb;
151
- this.userId_ = userId;
152
- this.name_ = name;
153
- google.wspl.GearsUtils.openDatabase(userId, name, this.db_,
154
- google.logger);
155
- } else {
156
- google.logger('openDatabase already invoked.');
157
- }
158
- };
159
-
160
- /**
161
- * Starts a worker to handle the database interactions. The worker will be
162
- * asynchronously started after the specified delay and will not be used until
163
- * the completion of any pending transaction.
164
- * @param {GearsWorkerPool} wp The Gears worker pool.
165
- * @param {string} workerUrl The URL to find the gears database worker.
166
- * @return {number} The worker ID.
167
- */
168
- google.wspl.gears.Database.prototype.startWorker = function(wp, workerUrl) {
169
- this.wp_ = wp;
170
-
171
- google.logger('Starting dbworker thread.');
172
-
173
- this.workerId_ = wp.createWorkerFromUrl(workerUrl);
174
-
175
- this.timeoutId_ = window.setTimeout(google.bind(this.handleTimeout_, this),
176
- google.wspl.gears.Database.TIMEOUT);
177
-
178
- return this.workerId_;
179
- };
180
-
181
- /**
182
- * @see google.wspl.Transaction#createTransaction
183
- * @inheritDoc
184
- */
185
- google.wspl.gears.Database.prototype.createTransaction = function(populate,
186
- opt_callback) {
187
- var transactionCallback = opt_callback || {
188
- onSuccess : function() {},
189
- onFailure : function() {}
190
- };
191
-
192
- var id = this.transCount_++;
193
- var transaction = new google.wspl.gears.Transaction(id, this);
194
-
195
- this.saveTransaction_(transaction, transactionCallback, populate);
196
-
197
- this.queuedTransactions_.push(transaction.id_);
198
- this.nextTransaction_();
199
- };
200
-
201
- /**
202
- * Saves the transaction and transaction callback to be accessed later when a
203
- * commit or rollback is performed.
204
- *
205
- * @param {google.wspl.gears.Transaction} transaction The transaction that the
206
- * callback belongs to.
207
- * @param {Object} callback A transaction callback with onSuccess and onFailure
208
- * @private
209
- */
210
- google.wspl.gears.Database.prototype.saveTransaction_ = function(
211
- transaction, callback, populate) {
212
- this.transactions_[transaction.id_] = {
213
- transaction: transaction,
214
- callback: callback,
215
- populate: populate
216
- };
217
- };
218
-
219
- /**
220
- * Handles incomming messages.
221
- * @param {string} a Deprecated.
222
- * @param {number} b Deprecated.
223
- * @param {Object} messageObject The message object.
224
- * @private
225
- */
226
- google.wspl.gears.Database.prototype.onMessage_ =
227
- function(a, b, messageObject) {
228
- var message = messageObject.body;
229
-
230
- try {
231
- switch(message['type']) {
232
- case google.wspl.gears.DbWorker.ReplyTypes.RESULT:
233
- this.handleResult_(message['results'], message['callbackId'],
234
- message['transactionId']);
235
- break;
236
- case google.wspl.gears.DbWorker.ReplyTypes.FAILURE:
237
- this.handleFailure_(message['error'], message['callbackId'],
238
- message['transactionId']);
239
- break;
240
- case google.wspl.gears.DbWorker.ReplyTypes.COMMIT:
241
- this.handleCommit_(message['transactionId']);
242
- break;
243
- case google.wspl.gears.DbWorker.ReplyTypes.ROLLBACK:
244
- this.handleRollback_(message['transactionId']);
245
- break;
246
- case google.wspl.gears.DbWorker.ReplyTypes.STARTED:
247
- this.handleStarted_();
248
- break;
249
- case google.wspl.gears.DbWorker.ReplyTypes.OPEN_SUCCESSFUL:
250
- this.handleOpenSuccessful_();
251
- break;
252
- case google.wspl.gears.DbWorker.ReplyTypes.OPEN_FAILED:
253
- this.handleOpenFailed_(message['error']);
254
- break;
255
- case google.wspl.gears.DbWorker.ReplyTypes.LOG:
256
- google.logger(message['msg']);
257
- break;
258
- }
259
- } catch (ex) {
260
- google.logger('Gears database failed: ' + ex.message, ex);
261
- }
262
- };
263
-
264
- /**
265
- * Opens a new Gears database.
266
- *
267
- * @param {string} userId The user to which the database belongs.
268
- * @param {string} name The name of the database.
269
- */
270
- google.wspl.gears.Database.prototype.doOpen = function(userId, name) {
271
- this.sendMessageToWorker_({
272
- 'type': google.wspl.gears.DbWorker.CommandTypes.OPEN,
273
- 'name': name,
274
- 'userId': userId
275
- });
276
- };
277
-
278
- /**
279
- * Begins a new transaction on the Gears database.
280
- *
281
- * @param {number} transactionId The id of the transaction being committed.
282
- */
283
- google.wspl.gears.Database.prototype.doBegin = function(transactionId) {
284
- if (!this.useWorker_) {
285
- this.db_.execute('BEGIN IMMEDIATE');
286
- return;
287
- }
288
-
289
- this.sendMessageToWorker_({
290
- 'type': google.wspl.gears.DbWorker.CommandTypes.BEGIN,
291
- 'transactionId': transactionId
292
- });
293
- };
294
-
295
- /**
296
- * Commits the current transaction on the Gears database. The transactionId
297
- * is used to invoke the callback associated with the transaction.
298
- *
299
- * @param {number} transactionId The id of the transaction being committed.
300
- */
301
- google.wspl.gears.Database.prototype.doCommit = function(transactionId) {
302
- if (!this.useWorker_) {
303
- this.db_.execute('COMMIT');
304
- this.postCommit_();
305
- return;
306
- }
307
-
308
- this.sendMessageToWorker_({
309
- 'type': google.wspl.gears.DbWorker.CommandTypes.COMMIT,
310
- 'transactionId': transactionId
311
- });
312
- };
313
-
314
- /**
315
- * Rolls the current transaction back on the Gears database. The transactionId
316
- * is used to invoke the callback associated with the transaction.
317
- *
318
- * @param {number} transactionId The id of the transaction being rolled back.
319
- */
320
- google.wspl.gears.Database.prototype.doRollback = function(transactionId) {
321
- if (!this.useWorker_) {
322
- this.db_.execute('ROLLBACK');
323
- this.postRollback_();
324
- return;
325
- }
326
-
327
- this.sendMessageToWorker_({
328
- 'type': google.wspl.gears.DbWorker.CommandTypes.ROLLBACK,
329
- 'transactionId': transactionId
330
- });
331
- };
332
-
333
- /**
334
- * Executes an array of statements on the Gears database. The transactionId and
335
- * callbackId are used to identify the callback that should be invoked when
336
- * handleResult or handleFailure is called.
337
- *
338
- * @param {Array.<google.wspl.Statement>} statements The group of statements to
339
- * execute
340
- * @param {number} callbackId The callback to invoke for each statement
341
- * @param {number} transactionId The transaction that the statements belong to
342
- */
343
- google.wspl.gears.Database.prototype.doExecute = function(statements,
344
- callbackId,
345
- transactionId) {
346
- if (!this.useWorker_) {
347
- this.doExecuteSynchronously_(statements, callbackId, transactionId);
348
- return;
349
- }
350
-
351
- var newStatements = [];
352
- for (var i = 0; i < statements.length; i++) {
353
- newStatements[i] = {
354
- 'sql': statements[i].sql,
355
- 'params': statements[i].params
356
- };
357
- }
358
-
359
- this.sendMessageToWorker_({
360
- 'type': google.wspl.gears.DbWorker.CommandTypes.EXECUTE,
361
- 'statements': newStatements,
362
- 'callbackId': callbackId,
363
- 'transactionId': transactionId
364
- });
365
- };
366
-
367
- /**
368
- * Executes an array of statements on the synchronous Gears databse.
369
- * @param {Array.<google.wspl.Statement>} statements
370
- * @param {number} callbackId
371
- * @param {number} transactionId
372
- * @private
373
- */
374
- google.wspl.gears.Database.prototype.doExecuteSynchronously_ =
375
- function(statements, callbackId, transactionId) {
376
- var db = this;
377
- var results = [];
378
- for (var i = 0; i < statements.length; i++) {
379
- try {
380
- var resultset = this.db_.execute(statements[i].sql, statements[i].params);
381
- var result = google.wspl.GearsUtils.resultSetToObjectArray(resultset);
382
- results.push(result);
383
- } catch (e) {
384
- var error = e;
385
- function failureCallback() {
386
- db.handleFailure_(error, callbackId, transactionId);
387
- };
388
- this.setTimeout_(failureCallback, 0);
389
- return;
390
- }
391
- }
392
-
393
- function resultCallback() {
394
- db.handleResult_(results, callbackId, transactionId);
395
- };
396
- this.setTimeout_(resultCallback, 0);
397
- };
398
-
399
- /**
400
- * Handles a RESULT message from the worker thread.
401
- *
402
- * @param {!Array.<!Array.<Object>>} results A Gears result set.
403
- * @param {number} callbackId The callback to invoke.
404
- * @param {number} transactionId The transaction that the statement is executing
405
- * in.
406
- * @private
407
- */
408
- google.wspl.gears.Database.prototype.handleResult_ = function(results,
409
- callbackId, transactionId) {
410
- var transInfo = this.transactions_[transactionId];
411
- if (transInfo) {
412
- for (var i = 0, l = results.length; i < l; i++) {
413
- var resultSet = new google.wspl.gears.ResultSet(results[i]);
414
- transInfo.transaction.success(resultSet, callbackId);
415
- }
416
- }
417
- };
418
-
419
- /**
420
- * Handles a FAILURE message from the worker thread.
421
- *
422
- * @param {Error} error An error produced by the Gears database
423
- * @param {number} callbackId The callback to invoke
424
- * @param {number} transactionId The transaction that the statement is executing
425
- * in
426
- * @private
427
- */
428
- google.wspl.gears.Database.prototype.handleFailure_ = function(error,
429
- callbackId, transactionId) {
430
- var transInfo = this.transactions_[transactionId];
431
- if (transInfo) {
432
- transInfo.error = error;
433
- transInfo.transaction.failure(error, callbackId);
434
- }
435
- };
436
-
437
- /**
438
- * Handles a COMMIT message from the worker thread.
439
- *
440
- * @param {number} id The transaction id.
441
- * @private
442
- */
443
- google.wspl.gears.Database.prototype.handleCommit_ = function(id) {
444
- var transaction = this.removeTransaction_(id);
445
- if (transaction) {
446
- transaction.callback.onSuccess();
447
- }
448
-
449
- this.nextTransaction_();
450
- };
451
-
452
- /**
453
- * Handles the completion of a commit from the synchronous database.
454
- * @private
455
- */
456
- google.wspl.gears.Database.prototype.postCommit_ = function() {
457
- this.handleCommit_(this.currentTransactionId_);
458
- };
459
-
460
- /**
461
- * Handles a ROLLBACK message from the worker thread.
462
- *
463
- * @param {number} id The transaction id
464
- * @private
465
- */
466
- google.wspl.gears.Database.prototype.handleRollback_ = function(id) {
467
- var transaction = this.removeTransaction_(id);
468
- if (transaction) {
469
- transaction.callback.onFailure(transaction.error);
470
- }
471
-
472
- this.nextTransaction_();
473
- };
474
-
475
- /**
476
- * Handles the completion of a rollback from the synchronous database.
477
- * @private
478
- */
479
- google.wspl.gears.Database.prototype.postRollback_ = function() {
480
- this.handleRollback_(this.currentTransactionId_);
481
- };
482
-
483
- /**
484
- * Handles a STARTED message from the worker thread.
485
- *
486
- * @private
487
- */
488
- google.wspl.gears.Database.prototype.handleStarted_ = function() {
489
- if (!this.workerTimeout_) {
490
- google.logger('Dbworker started.');
491
- window.clearTimeout(this.timeoutId_);
492
- this.timeoutId_ = 0;
493
- this.doOpen(this.userId_, this.name_);
494
- }
495
- };
496
-
497
- /**
498
- * Handles a timeout of waiting for a STARTED message from the worker thread.
499
- *
500
- * @private
501
- */
502
- google.wspl.gears.Database.prototype.handleTimeout_ = function() {
503
- this.workerTimeout_ = true;
504
- google.logger('Timed out while waiting for the dbworker to start.');
505
- };
506
-
507
- /**
508
- * Handles a OPEN_SUCCESSFUL message from the worker thread.
509
- *
510
- * @private
511
- */
512
- google.wspl.gears.Database.prototype.handleOpenSuccessful_ = function() {
513
- this.workerReady_ = true;
514
- };
515
-
516
- /**
517
- * Handles a OPEN_FAILED message from the worker thread.
518
- * @param {string} error
519
- * @private
520
- */
521
- google.wspl.gears.Database.prototype.handleOpenFailed_ = function(error) {
522
- google.logger('Worker failed to open Gears database.');
523
- };
524
-
525
- /**
526
- * Executes the next transaction if there is one queued.
527
- *
528
- * @private
529
- */
530
- google.wspl.gears.Database.prototype.nextTransaction_ = function() {
531
- if (this.queuedTransactions_.length && !this.locked_) {
532
- this.locked_ = true;
533
-
534
- if (this.workerReady_ && !this.useWorker_) {
535
- this.useWorker_ = true;
536
- google.logger('Switching to asynchronous database interface.');
537
- }
538
-
539
- var id = this.queuedTransactions_.shift();
540
- this.currentTransactionId_ = id;
541
- var transactionData = this.transactions_[id];
542
-
543
- var db = this;
544
- function populate() {
545
- transactionData.populate(transactionData.transaction);
546
-
547
- // If populate did not execute statements on the database, invoke the
548
- // success callback and process the next transaction.
549
- if (!transactionData.transaction.isExecuting()) {
550
- db.handleCommit_(id);
551
- }
552
- };
553
-
554
- this.setTimeout_(populate, 0);
555
- }
556
- };
557
-
558
- /**
559
- * Cleans up the transaction and transaction callback for the id specified.
560
- *
561
- * @param {number} id The transaction id.
562
- * @return {google.wspl.Transaction} The transaction and callback in an object.
563
- * @private
564
- */
565
- google.wspl.gears.Database.prototype.removeTransaction_ = function(id) {
566
- this.locked_ = false;
567
- var transaction = this.transactions_[id];
568
- if (transaction) {
569
- delete this.transactions_[id];
570
- }
571
- return transaction;
572
- };
573
-
574
- /**
575
- * Execute a function using window's setTimeout.
576
- * @param {Function} func The function to execute.
577
- * @param {number} time The time delay before invocation.
578
- * @private
579
- */
580
- google.wspl.gears.Database.prototype.setTimeout_ = function(func, time) {
581
- if (this.synchronous_) {
582
- func();
583
- } else {
584
- window.setTimeout(func, time);
585
- }
586
- };
587
-
588
- /**
589
- * Sends a message to the database worker thread.
590
- * @param {Object} msg The message object to send.
591
- * @private
592
- */
593
- google.wspl.gears.Database.prototype.sendMessageToWorker_ = function(msg) {
594
- this.wp_.sendMessage(msg, this.workerId_);
595
- };