html5-boilerplate 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/app/helpers/html5_boilerplate_helper.rb

@@ -23,11 +23,11 @@ module Html5BoilerplateHelper
   end
 
   def google_account_id
-    ENV['GOOGLE_ACCOUNT_ID'] || google_config(:google_account_id) || ''
+    ENV['GOOGLE_ACCOUNT_ID'] || google_config(:google_account_id)
   end
 
   def google_api_key
-    ENV['GOOGLE_API_KEY'] || google_config(:google_api_key) || ''
+    ENV['GOOGLE_API_KEY'] || google_config(:google_api_key)
   end
 
 private

data/templates/project/_flashes.html.haml

@@ -1,5 +1,4 @@
 #flash
   - flash.each do |key, value|
     %div{ :title => key.to_s.humanize, :class => key }
-      %p
-        = h value
+      %p= value

data/templates/project/_javascripts.html.haml

@@ -25,12 +25,13 @@
 
 -# asynchronous google analytics: mathiasbynens.be/notes/async-analytics-snippet
 -# Looks for google_account_id first in ENV['GOOGLE_ACCOUNT_ID'] then in config/google.yml
-:javascript
-  var _gaq = [['_setAccount', '#{google_account_id}'], ['_trackPageview']];
-  (function(d, t) {
-   var g = d.createElement(t),
-       s = d.getElementsByTagName(t)[0];
-   g.async = true;
-   g.src = ('https:' == location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-   s.parentNode.insertBefore(g, s);
-  })(document, 'script');
+- if !google_account_id.blank?
+  :javascript
+    var _gaq = [['_setAccount', '#{google_account_id}'], ['_trackPageview']];
+    (function(d, t) {
+     var g = d.createElement(t),
+         s = d.getElementsByTagName(t)[0];
+     g.async = true;
+     g.src = ('https:' == location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+     s.parentNode.insertBefore(g, s);
+    })(document, 'script');

data/templates/project/files/google.yml

@@ -1,9 +1,13 @@
-# Html5BoilerplateHelper will first check your ENV
-# for each key before using the these yml values
-# e.g. ENV['GOOGLE_ACCOUNT_ID'] || :google_account_id
+# Html5BoilerplateHelper will first check your ENV and
+# then this yml file for these values. If they are both
+# empty, the google code block will not be used.
+#
+# e.g. ENV['GOOGLE_ACCOUNT_ID'] || yml[:google_account_id]
+# e.g. ENV['GOOGLE_API_KEY'] || yml[:google_api_key]
+#
 defaults: &defaults
-  :google_account_id: 'UA-XXXXX-X'  # ENV['GOOGLE_ACCOUNT_ID']
-  :google_api_key: ''               # ENV['GOOGLE_API_KEY']
+  :google_account_id: ''
+  :google_api_key: ''
 
 :development:
   <<: *defaults

data/templates/project/files/htaccess

@@ -18,8 +18,9 @@
 
 # Because X-UA-Compatible isn't sent to non-IE (to save header bytes),
 #   We need to inform proxies that content changes based on UA
-Header append Vary User-Agent
-
+<IfModule mod_headers.c>
+  Header append Vary User-Agent
+</IfModule>
 
 # hacks.mozilla.org/2009/07/cross-site-xmlhttprequest-with-cors/
 # Disabled. Uncomment to serve cross-domain ajax requests
@@ -141,7 +142,8 @@ AddType text/x-component              htc
   ExpiresByType video/webm                "access plus 1 month"
   
 # webfonts
-  ExpiresByType font/ttf                  "access plus 1 month"
+  ExpiresByType font/truetype             "access plus 1 month"
+  ExpiresByType font/opentype             "access plus 1 month"
   ExpiresByType font/woff                 "access plus 1 month"
   ExpiresByType image/svg+xml             "access plus 1 month"
   ExpiresByType application/vnd.ms-fontobject "access plus 1 month"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Peter Gumeson
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-29 00:00:00 -07:00
+date: 2010-09-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency