middleman 2.0.9.pre.2 → 2.0.9.pre.3

data/lib/middleman/templates/mobile/source/tools/wspl/simplenotes/styles.css

@@ -0,0 +1,66 @@
+/*
+  Copyright 2009 Google Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+body {
+  background-color: #efefef;
+  font: medium "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
+}
+
+.status-bar {
+  background-color: #ffd21d;
+  display: none;
+  -webkit-border-radius: 6.0px;
+  -moz-border-radius: 6.0px;
+  border-style: solid;
+  border-width: 1px;
+  padding: 3px;
+  text-align: center;
+}
+
+.screen {
+  border: thin solid #939393;
+  padding: 2px 2px 2px 2px;
+}
+
+.command-bar {
+  background-color: #275390;
+}
+
+.title-bar {
+  font-weight: bold;
+  background-color: #4b4b4b;
+  text-align: center;
+  padding: 3px;
+  color: #aaa;
+}
+
+textarea {
+  font-size: 16pt;
+}
+
+button {
+  text-align:center;
+  font-family: Helvetica;
+  font-weight: bold;
+  font-size: 20px;
+  text-decoration: none;
+  text-shadow: #fff 0px 2px 2px;
+  padding: 3px;
+  -webkit-border-radius: 6.0px;
+  -moz-border-radius: 6.0px;
+  margin-right: 4px;
+  margin-left: 4px;
+}

data/lib/middleman/templates/mobile/source/tools/wspl/simplenotes/template.js

@@ -0,0 +1,75 @@
+/*
+  Copyright 2009 Google Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+/**
+ * @fileoverview template.js contains the implementation for a simple template
+ * scheme. Templates are fragments of HTML containing patterns into which
+ * arguments will be substituted.
+ */
+
+google.wspl.simplenotes = google.wspl.simplenotes || {};
+
+/**
+ * Template class constructor. A template is an object which will
+ * substitute provided parameters into a marked-up string.
+ * @param {string} template
+ * @constructor
+*/
+google.wspl.simplenotes.Template = function(template) {
+  this.template_ = template;
+  this.res_ = null;
+};
+
+/**
+ * Returns the template expanded with the given args where args
+ * is an object (acting as an associative array) binding keys (found
+ * in the template wrapped with % symbols) to the associated
+ * values.
+ *
+ * Template substitution symbols without corresponding arguments
+ * will be passed through unchanged to the output.
+ *
+ * We assume that in typical use, the same template will be expanded
+ * repeatedly with different values. In this case, storing and re-using
+ * previously generated regular expressions will provide a performance
+ * improvement.
+ * @param {Object} args associates names with values
+ * @param {boolean} opt_rebuild set to true to force re-building the
+ *     the regular epxression.
+*/
+google.wspl.simplenotes.Template.prototype.process = function(args,
+    opt_rebuild) {
+  var rebuild = opt_rebuild || false;
+
+  if (rebuild || this.res_ == null) {
+    var accumulatedRe = [];
+    this.res_ = null;
+    for (var a in args) {
+      accumulatedRe.push('%' + String(a) + '%');
+    }
+    if (accumulatedRe.length > 0) {
+      this.res_ = new RegExp(accumulatedRe.join('|'), 'g');
+    }
+  }
+  if (this.res_ != null) {
+    return this.template_.replace(this.res_, function(match) {
+          var keyName = match.slice(1,-1);
+          return args[keyName];
+    });
+  } else {
+    return this.template_;
+  }
+};

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.9.pre.2"
+  VERSION = "2.0.9.pre.3"
 end

data/middleman-x86-mingw32.gemspec

@@ -61,7 +61,6 @@ eos
     s.add_dependency("rb-fchange")
   # else
   #   s.add_dependency("rb-fsevent", ["~> 0.4.2"])
-  #   s.add_dependency("therubyracer", ["~> 0.9.4"])
   # end
   
   s.add_dependency("guard", ["~> 0.6.2"])

data/middleman.gemspec

@@ -43,6 +43,7 @@ eos
   s.add_dependency("tilt", ["~> 1.3.1"])
   s.add_dependency("maruku", ["~> 0.6.0"])
   s.add_dependency("sinatra", ["~> 1.2.6"])
+  # s.add_dependency("sinatra-synchrony", ["~> 0.2.1"])
   s.add_dependency("rack-test", ["~> 0.6.1"])
   s.add_dependency("uglifier", ["~> 1.0.0"])
   s.add_dependency("slim", ["~> 1.0.1"])
@@ -60,8 +61,8 @@ eos
   #   s.add_dependency("win32-process", ["~> 0.6.5"])
   #   s.add_dependency("rb-fchange")
   # else
-    s.add_dependency("rb-fsevent", ["~> 0.4.2"])
-    s.add_dependency("therubyracer", ["~> 0.9.4"])
+    # s.add_dependency("rb-fsevent", ["~> 0.4.2"])
+    # s.add_dependency("therubyracer", ["~> 0.9.4"])
   # end
   
   s.add_dependency("guard", ["~> 0.6.2"])

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 1923831973
+  hash: 1923831975
   prerelease: 6
   segments: 
   - 2
   - 0
   - 9
   - pre
-  - 2
-  version: 2.0.9.pre.2
+  - 3
+  version: 2.0.9.pre.3
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-11 00:00:00 -07:00
+date: 2011-09-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -278,38 +278,6 @@ dependencies:
   type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id017 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 4
-        - 2
-        version: 0.4.2
-  version_requirements: *id017
-  name: rb-fsevent
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id018 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 9
-        - 4
-        version: 0.9.4
-  version_requirements: *id018
-  name: therubyracer
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -320,12 +288,12 @@ dependencies:
         - 6
         - 2
         version: 0.6.2
-  version_requirements: *id019
+  version_requirements: *id017
   name: guard
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -336,12 +304,12 @@ dependencies:
         - 2
         - 0
         version: 0.2.0
-  version_requirements: *id020
+  version_requirements: *id018
   name: middleman-livereload
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -352,12 +320,12 @@ dependencies:
         - 1
         - 1
         version: 0.1.1
-  version_requirements: *id021
+  version_requirements: *id019
   name: coffee-filter
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -368,12 +336,12 @@ dependencies:
         - 2
         - 0
         version: 2.2.0
-  version_requirements: *id022
+  version_requirements: *id020
   name: liquid
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -384,12 +352,12 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
-  version_requirements: *id023
+  version_requirements: *id021
   name: cucumber
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id024 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -400,12 +368,12 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  version_requirements: *id024
+  version_requirements: *id022
   name: rake
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id025 !ruby/object:Gem::Requirement 
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -416,7 +384,7 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  version_requirements: *id025
+  version_requirements: *id023
   name: rspec
   prerelease: false
   type: :development
@@ -453,6 +421,7 @@ files:
 - features/data.feature
 - features/directory_index.feature
 - features/dynamic_pages.feature
+- features/fonts.feature
 - features/front-matter.feature
 - features/generator.feature
 - features/helpers_auto_javascript_include_tag.feature
@@ -477,6 +446,16 @@ files:
 - features/step_definitions/page_layout_steps.rb
 - features/support/env.rb
 - features/tiny_src.feature
+- fixtures/data-app/config.rb
+- fixtures/data-app/data/pages.yml
+- fixtures/data-app/source/index.html.haml
+- fixtures/data-app/source/layout.haml
+- fixtures/fonts-app/config.rb
+- fixtures/fonts-app/source/fonts/StMarie-Thin.otf
+- fixtures/fonts-app/source/stylesheets/fonts.css.sass
+- fixtures/glob-app/config.rb
+- fixtures/glob-app/source/index.html.haml
+- fixtures/glob-app/source/stylesheets/site.css.sass
 - fixtures/indexable-app/config.rb
 - fixtures/indexable-app/source/a_folder/needs_index.html
 - fixtures/indexable-app/source/leave_me_alone.html
@@ -491,6 +470,7 @@ files:
 - fixtures/sprockets-app/source/library/javascripts/sprockets_sub.js
 - fixtures/test-app/config.rb
 - fixtures/test-app/data/test.yml
+- fixtures/test-app/data/test2.json
 - fixtures/test-app/source/_liquid_partial.liquid
 - fixtures/test-app/source/_partial.haml
 - fixtures/test-app/source/a_folder/needs_index.html
@@ -509,6 +489,7 @@ files:
 - fixtures/test-app/source/custom-layout.html.haml
 - fixtures/test-app/source/data.html.erb
 - fixtures/test-app/source/data2.html.liquid
+- fixtures/test-app/source/data3.html.erb
 - fixtures/test-app/source/front-matter.html.erb
 - fixtures/test-app/source/images/Child folder/regular_file(example).txt
 - fixtures/test-app/source/images/Read me (example).txt
@@ -563,7 +544,6 @@ files:
 - lib/middleman/base.rb
 - lib/middleman/builder.rb
 - lib/middleman/cli.rb
-- lib/middleman/config.ru
 - lib/middleman/core_extensions/assets.rb
 - lib/middleman/core_extensions/builder.rb
 - lib/middleman/core_extensions/compass.rb
@@ -584,7 +564,6 @@ files:
 - lib/middleman/features/minify_css.rb
 - lib/middleman/features/minify_javascript.rb
 - lib/middleman/features/relative_assets.rb
-- lib/middleman/features/tiny_src.rb
 - lib/middleman/guard.rb
 - lib/middleman/renderers/coffee_script.rb
 - lib/middleman/renderers/haml.rb
@@ -623,6 +602,79 @@ files:
 - lib/middleman/templates/html5/source/test/qunit/qunit.js
 - lib/middleman/templates/html5/source/test/tests.js
 - lib/middleman/templates/local.rb
+- lib/middleman/templates/mobile.rb
+- lib/middleman/templates/mobile/source/404.html
+- lib/middleman/templates/mobile/source/README.markdown
+- lib/middleman/templates/mobile/source/crossdomain.xml
+- lib/middleman/templates/mobile/source/css/style.css
+- lib/middleman/templates/mobile/source/default.appcache
+- lib/middleman/templates/mobile/source/humans.txt
+- lib/middleman/templates/mobile/source/img/h/apple-touch-icon.png
+- lib/middleman/templates/mobile/source/img/h/splash.png
+- lib/middleman/templates/mobile/source/img/l/apple-touch-icon-precomposed.png
+- lib/middleman/templates/mobile/source/img/l/apple-touch-icon.png
+- lib/middleman/templates/mobile/source/img/l/splash.png
+- lib/middleman/templates/mobile/source/img/m/apple-touch-icon.png
+- lib/middleman/templates/mobile/source/index.html
+- lib/middleman/templates/mobile/source/js/libs/jquery-1.5.1.js
+- lib/middleman/templates/mobile/source/js/libs/jquery-1.5.1.min.js
+- lib/middleman/templates/mobile/source/js/libs/modernizr-custom.js
+- lib/middleman/templates/mobile/source/js/libs/respond.min.js
+- lib/middleman/templates/mobile/source/js/mylibs/helper.js
+- lib/middleman/templates/mobile/source/js/script.js
+- lib/middleman/templates/mobile/source/robots.txt
+- lib/middleman/templates/mobile/source/sitemap.xml
+- lib/middleman/templates/mobile/source/test/index.html
+- lib/middleman/templates/mobile/source/test/qunit/qunit.css
+- lib/middleman/templates/mobile/source/test/qunit/qunit.js
+- lib/middleman/templates/mobile/source/test/tests.js
+- lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/Readme.PDF
+- lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx1.snippet
+- lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx2.snippet
+- lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/aspx/ga.aspx
+- lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/aspx/sample.aspx
+- lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/jsp/ga.jsp
+- lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp1.snippet
+- lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp2.snippet
+- lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/jsp/sample.jsp
+- lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/php/ga.php
+- lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/php/php1.snippet
+- lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/php/php2.snippet
+- lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/php/sample.php
+- lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/pl/ga.pl
+- lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/pl/perl1.snippet
+- lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/pl/perl2.snippet
+- lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/pl/sample.pl
+- lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/COPYING
+- lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/bookmark_bubble.js
+- lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/example/example.html
+- lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/example/example.js
+- lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/images/arrow.png
+- lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/images/close.png
+- lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/images/generate_base64_images
+- lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/images/icon_calendar.png
+- lib/middleman/templates/mobile/source/tools/wspl/README
+- lib/middleman/templates/mobile/source/tools/wspl/databasefactory.js
+- lib/middleman/templates/mobile/source/tools/wspl/dbworker.js
+- lib/middleman/templates/mobile/source/tools/wspl/dbworker_test.html
+- lib/middleman/templates/mobile/source/tools/wspl/dbworkerstarter.js
+- lib/middleman/templates/mobile/source/tools/wspl/dbwrapper_gears.js
+- lib/middleman/templates/mobile/source/tools/wspl/dbwrapper_gears_test.html
+- lib/middleman/templates/mobile/source/tools/wspl/dbwrapper_html5.js
+- lib/middleman/templates/mobile/source/tools/wspl/dbwrapper_html5_test.html
+- lib/middleman/templates/mobile/source/tools/wspl/dbwrapperapi.js
+- lib/middleman/templates/mobile/source/tools/wspl/dbwrapperapi_test.html
+- lib/middleman/templates/mobile/source/tools/wspl/gears_resultset.js
+- lib/middleman/templates/mobile/source/tools/wspl/gears_resultset_test.html
+- lib/middleman/templates/mobile/source/tools/wspl/gears_transaction.js
+- lib/middleman/templates/mobile/source/tools/wspl/gears_transaction_test.html
+- lib/middleman/templates/mobile/source/tools/wspl/gearsutils.js
+- lib/middleman/templates/mobile/source/tools/wspl/gearsutils_test.html
+- lib/middleman/templates/mobile/source/tools/wspl/global_functions.js
+- lib/middleman/templates/mobile/source/tools/wspl/simplenotes/index.html
+- lib/middleman/templates/mobile/source/tools/wspl/simplenotes/simplenotes.js
+- lib/middleman/templates/mobile/source/tools/wspl/simplenotes/styles.css
+- lib/middleman/templates/mobile/source/tools/wspl/simplenotes/template.js
 - lib/middleman/templates/shared/Gemfile.tt
 - lib/middleman/templates/shared/config.ru
 - lib/middleman/templates/shared/config.tt
@@ -688,6 +740,7 @@ test_files:
 - features/data.feature
 - features/directory_index.feature
 - features/dynamic_pages.feature
+- features/fonts.feature
 - features/front-matter.feature
 - features/generator.feature
 - features/helpers_auto_javascript_include_tag.feature
@@ -712,6 +765,16 @@ test_files:
 - features/step_definitions/page_layout_steps.rb
 - features/support/env.rb
 - features/tiny_src.feature
+- fixtures/data-app/config.rb
+- fixtures/data-app/data/pages.yml
+- fixtures/data-app/source/index.html.haml
+- fixtures/data-app/source/layout.haml
+- fixtures/fonts-app/config.rb
+- fixtures/fonts-app/source/fonts/StMarie-Thin.otf
+- fixtures/fonts-app/source/stylesheets/fonts.css.sass
+- fixtures/glob-app/config.rb
+- fixtures/glob-app/source/index.html.haml
+- fixtures/glob-app/source/stylesheets/site.css.sass
 - fixtures/indexable-app/config.rb
 - fixtures/indexable-app/source/a_folder/needs_index.html
 - fixtures/indexable-app/source/leave_me_alone.html
@@ -726,6 +789,7 @@ test_files:
 - fixtures/sprockets-app/source/library/javascripts/sprockets_sub.js
 - fixtures/test-app/config.rb
 - fixtures/test-app/data/test.yml
+- fixtures/test-app/data/test2.json
 - fixtures/test-app/source/_liquid_partial.liquid
 - fixtures/test-app/source/_partial.haml
 - fixtures/test-app/source/a_folder/needs_index.html
@@ -744,6 +808,7 @@ test_files:
 - fixtures/test-app/source/custom-layout.html.haml
 - fixtures/test-app/source/data.html.erb
 - fixtures/test-app/source/data2.html.liquid
+- fixtures/test-app/source/data3.html.erb
 - fixtures/test-app/source/front-matter.html.erb
 - fixtures/test-app/source/images/Child folder/regular_file(example).txt
 - fixtures/test-app/source/images/Read me (example).txt