html5-rails 0.0.2 → 0.0.3

data/lib/generators/html5/partial/templates/_header.html.erb

@@ -0,0 +1,3 @@
+<header id="header">
+  <h1><%= application_name %></h1>
+</header>

data/lib/generators/html5/partial/templates/_header.html.haml

@@ -0,0 +1,2 @@
+%header#header
+  %h1 <%= application_title %>

data/lib/generators/html5/partial/templates/_javascripts.html.erb

@@ -0,0 +1,24 @@
+<%%= javascript_include_tag "application" %>
+
+<%%# Append your own using content_for :javascripts %>
+<%%= yield :javascripts %>
+
+<%%# asynchronous google analytics: mathiasbynens.be/notes/async-analytics-snippet %>
+<%%# Looks for google_account_id first in ENV['GOOGLE_ACCOUNT_ID'] then in config/html5_rails.yml %>
+<%% if !google_account_id.blank? %>
+  <script>
+    //<![CDATA[
+      var _gaq=[['_setAccount','<%%= google_account_id %>'],['_trackPageview']];
+      (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
+      g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
+      s.parentNode.insertBefore(g,s)}(document,'script'));
+    //]]>
+  </script>
+<%% end %>
+
+<%%# Prompt IE 6 users to install Chrome Frame. Remove this if you want to support IE 6. %>
+<%%# chromium.org/developers/how-tos/chrome-frame-getting-started %>
+<!--[if lt IE 7 ]>
+  <script defer src='//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js'></script>
+  <script defer>window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})</script>
+<![endif]-->

data/lib/generators/html5/partial/templates/_javascripts.html.haml

@@ -0,0 +1,19 @@
+= javascript_include_tag "application"
+
+-#  Append your own using content_for :javascripts
+= yield :javascripts
+
+-# asynchronous google analytics: mathiasbynens.be/notes/async-analytics-snippet
+-# Looks for google_account_id first in ENV['GOOGLE_ACCOUNT_ID'] then in config/html5_rails.yml
+- 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.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
+    s.parentNode.insertBefore(g,s)}(document,'script'));
+
+-# Prompt IE 6 users to install Chrome Frame. Remove this if you want to support IE 6.
+-# chromium.org/developers/how-tos/chrome-frame-getting-started
+/[if lt IE 7 ]
+  %script{ :defer => true, :src => "//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js" }
+  %script{ :defer => true } window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})

data/lib/generators/html5/partial/templates/_stylesheets.html.erb

@@ -0,0 +1,4 @@
+<%%= stylesheet_link_tag 'application', :media => nil %>
+
+<%%# Append your own using content_for :stylesheets %>
+<%%= yield :stylesheets %>

data/lib/generators/html5/partial/templates/_stylesheets.html.haml

@@ -0,0 +1,4 @@
+= stylesheet_link_tag 'application', :media => nil
+
+-# Append your own using content_for :stylesheets
+= yield :stylesheets

data/lib/html5/rails.rb

@@ -3,6 +3,6 @@ require "html5/rails/engine"
 
 module Html5
   module Rails
-    autoload :BoilerplateHelper, 'html5/rails/boilerplate_helper'
+    autoload :Helpers, 'html5/rails/helpers'
   end
 end

data/lib/html5/rails/engine.rb

@@ -4,7 +4,7 @@ module Html5
 
       # Extend application_helper
       initializer 'html5_rails_engine.helper' do |app|
-        ActionController::Base.helper(Html5::Rails::BoilerplateHelper)
+        ActionController::Base.helper(Html5::Rails::Helpers)
       end
 
       # Extend application_controller

data/lib/html5/rails/{boilerplate_helper.rb → helpers.rb}

@@ -1,14 +1,14 @@
 module Html5
   module Rails
-    module BoilerplateHelper
+    module Helpers
 
       # Create a named haml tag to wrap IE conditional around a block
       # http://paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither
       def ie_tag(name=:body, attrs={}, &block)
         attrs.symbolize_keys!
-        haml_concat("<!--[if lt IE 7]> #{ tag(name, add_class('ie6', attrs), true) } <![endif]-->".html_safe)
-        haml_concat("<!--[if IE 7]>    #{ tag(name, add_class('ie7', attrs), true) } <![endif]-->".html_safe)
-        haml_concat("<!--[if IE 8]>    #{ tag(name, add_class('ie8', attrs), true) } <![endif]-->".html_safe)
+        haml_concat("<!--[if lt IE 7]> #{ tag(name, add_class('lt-ie9 lt-ie8 lt-ie7', attrs), true) } <![endif]-->".html_safe)
+        haml_concat("<!--[if IE 7]>    #{ tag(name, add_class('lt-ie9 lt-ie8', attrs), true) } <![endif]-->".html_safe)
+        haml_concat("<!--[if IE 8]>    #{ tag(name, add_class('lt-ie9', attrs), true) } <![endif]-->".html_safe)
         haml_concat("<!--[if gt IE 8]><!-->".html_safe)
         haml_tag name, attrs do
           haml_concat("<!--<![endif]-->".html_safe)
@@ -25,14 +25,15 @@ module Html5
       end
 
       def google_account_id
-        ENV['GOOGLE_ACCOUNT_ID'] || google_config(:google_account_id)
+        ENV['GOOGLE_ACCOUNT_ID'] || html5_rails_config(:google_account_id)
       end
 
       def google_api_key
-        ENV['GOOGLE_API_KEY'] || google_config(:google_api_key)
+        ENV['GOOGLE_API_KEY'] || html5_rails_config(:google_api_key)
       end
 
       def remote_jquery(version)
+        warn "[DEPRECATION] 'remote_jquery' is deprecated."
         if ::Rails.env == 'development'
           "'jquery', '#{version}', {uncompressed:true}"
         else
@@ -41,6 +42,7 @@ module Html5
       end
 
       def local_jquery(version)
+        warn "[DEPRECATION] 'local_jquery' is deprecated."
         if ::Rails.env == 'development'
           "#{version}/jquery.js"
         else
@@ -51,15 +53,15 @@ module Html5
       private
 
       def add_class(name, attrs)
-        classes = attrs[:class] || ''
+        classes = attrs[:class] || ""
         classes.strip!
-        classes = ' ' + classes if !classes.blank?
+        classes = " " + classes if !classes.blank?
         classes = name + classes
         attrs.merge(:class => classes)
       end
 
-      def google_config(key)
-        configs = YAML.load_file(File.join(::Rails.root, 'config', 'google.yml'))[::Rails.env.to_sym] rescue {}
+      def html5_rails_config(key)
+        configs = YAML.load_file(File.join(::Rails.root, 'config', 'html5_rails.yml'))[::Rails.env.to_sym] rescue {}
         configs[key]
       end
 

data/lib/html5/rails/version.rb

@@ -1,9 +1,7 @@
 module Html5
   module Rails
-    VERSION = "0.0.2"
-    COMPASS_HTML5_VERSION = "0.0.2"
-    JQUERY_VERSION = "1.6.1"
-    MODERNIZER_VERSION = "2.0"
-    RESPOND_VERSION  = "625d77dc1aed97baf0ae"
+    VERSION = "0.0.3"
+    COMPASS_H5BP_VERSION = "0.0.2"
+    MODERNIZER_VERSION = "2.0.6"
   end
 end

data/test/dummy/.gitignore

@@ -1,5 +1,15 @@
-.bundle
-db/*.sqlite3
-log/*.log
-tmp/
-.sass-cache/
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile ~/.gitignore_global
+
+# Ignore bundler config
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp

data/test/dummy/app/assets/javascripts/application.js

@@ -1,2 +1,9 @@
-//= require html5/boilerplate
-//= require_tree .
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .

data/test/dummy/app/assets/stylesheets/application.css

@@ -0,0 +1,7 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require_self
+ *= require_tree . 
+*/

data/test/dummy/app/views/layouts/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag    "application" %>
+  <%= javascript_include_tag "application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/test/dummy/app/views/pages/home.html.erb

@@ -0,0 +1 @@
+<h1>Ohai</h1>

data/test/dummy/config/application.rb

@@ -2,10 +2,12 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-# If you have a Gemfile, require the default gems, the ones in the
-# current environment and also include :assets gems if in development
-# or test environments.
-Bundler.require *Rails.groups(:assets) if defined?(Bundler)
+if defined?(Bundler)
+  # If you precompile assets before deploying to production, use this line
+  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  # If you want your assets lazily compiled in production, use this line
+  # Bundler.require(:default, :assets, Rails.env)
+end
 
 require "html5-rails"
 
@@ -41,5 +43,8 @@ module Dummy
 
     # Enable the asset pipeline
     config.assets.enabled = true
+
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
   end
 end

data/test/dummy/config/environments/development.rb

@@ -24,4 +24,7 @@ Dummy::Application.configure do
 
   # Do not compress assets
   config.assets.compress = false
+
+  # Expands the lines which load the assets
+  config.assets.debug = true
 end

data/test/dummy/config/environments/production.rb

@@ -14,9 +14,18 @@ Dummy::Application.configure do
   # Compress JavaScripts and CSS
   config.assets.compress = true
 
+  # Don't fallback to assets pipeline if a precompiled asset is missed
+  config.assets.compile = false
+
+  # Generate digests for assets URLs
+  config.assets.digest = true
+
+  # Defaults to Rails.root.join("public/assets")
+  # config.assets.manifest = YOUR_PATH
+
   # Specifies the header that your server uses for sending files
-  # (comment out if your front-end server doesn't support this)
-  config.action_dispatch.x_sendfile_header = "X-Sendfile" # Use 'X-Accel-Redirect' for nginx
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true

data/test/dummy/config/initializers/wrap_parameters.rb

@@ -4,9 +4,11 @@
 # is enabled by default.
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
-ActionController::Base.wrap_parameters format: [:json]
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters format: [:json]
+end
 
 # Disable root element in JSON by default.
-if defined?(ActiveRecord)
-  ActiveRecord::Base.include_root_in_json = false
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
 end

data/test/dummy/config/routes.rb

@@ -54,5 +54,5 @@ Dummy::Application.routes.draw do
 
   # This is a legacy wild controller route that's not recommended for RESTful applications.
   # Note: This route will make all actions in every controller accessible via GET requests.
-  # match ':controller(/:action(/:id))(.:format)'
+  # match ':controller(/:action(/:id(.:format)))'
 end

data/test/dummy/db/seeds.rb

@@ -0,0 +1,7 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# Examples:
+#
+#   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
+#   Mayor.create(name: 'Emanuel', city: cities.first)

data/test/dummy/doc/README_FOR_APP

@@ -0,0 +1,2 @@
+Use this README file to introduce your application and point to useful places in the API for learning more.
+Run "rake doc:app" to generate API documentation for your models, controllers, helpers, and libraries.

data/test/generators/assets_generator_test.rb

@@ -0,0 +1,60 @@
+require "test_helper"
+require "generators/html5/assets/assets_generator"
+
+class AssetsGeneratorTest < Rails::Generators::TestCase
+  include GeneratorTestHelper
+  tests Html5::Generators::AssetsGenerator
+
+  test "html5:assets should make changes to application.js" do
+    run_generator
+
+    assert_file "app/assets/javascripts/application.js", /\/\/= require h5bp/ do |contents|
+      assert_no_match /require_tree \./, contents
+    end
+  end
+
+  test "html5:assets should generate polyfills.js" do
+    run_generator
+    assert_file "app/assets/javascripts/polyfills.js"
+  end
+
+  test "html5:assets" do
+    run_generator
+
+    assert_file "app/assets/stylesheets/_defaults.css.scss"
+    assert_file "app/assets/stylesheets/application.css.scss", /@import "application\/document";/
+    %w(_defaults document media_queries).each do |file|
+      assert_file "app/assets/stylesheets/application/#{ file }.css.scss"
+    end
+  end
+
+  test "html5:assets application" do
+    run_generator %w(application)
+
+    assert_file "app/assets/stylesheets/_defaults.css.scss"
+    assert_file "app/assets/stylesheets/application.css.scss", /@import "application\/document";/
+    %w(_defaults document media_queries).each do |file|
+      assert_file "app/assets/stylesheets/application/#{ file }.css.scss"
+    end
+  end
+
+  test "html5:assets pancakes" do
+    run_generator %w(pancakes)
+
+    assert_file "app/assets/stylesheets/_defaults.css.scss"
+    assert_file "app/assets/stylesheets/pancakes.css.scss", /@import "pancakes\/document";/
+    %w(_defaults document media_queries).each do |file|
+      assert_file "app/assets/stylesheets/pancakes/#{ file }.css.scss"
+    end
+  end
+
+  test "html5:assets admin/pancakes" do
+    run_generator %w(admin/pancakes)
+
+    assert_file "app/assets/stylesheets/_defaults.css.scss"
+    assert_file "app/assets/stylesheets/admin_pancakes.css.scss", /@import "admin\/pancakes\/document";/
+    %w(_defaults document media_queries).each do |file|
+      assert_file "app/assets/stylesheets/admin_pancakes/#{ file }.css.scss"
+    end
+  end
+end

data/test/generators/install_generator_test.rb

@@ -1,12 +1,53 @@
 require "test_helper"
+require "generators/html5/install/install_generator"
 
 class InstallGeneratorTest < Rails::Generators::TestCase
+  include GeneratorTestHelper
   tests Html5::Generators::InstallGenerator
-  destination File.expand_path("../../tmp", __FILE__)
-  setup :prepare_destination
 
-  test "Assert config file is generated" do
+  test "Compass config file should be generated" do
     run_generator
     assert_file "config/compass.rb"
   end
+
+  test "html5_rails.yml config file should be generated" do
+    run_generator
+    assert_file "config/html5_rails.yml"
+  end
+  
+  test "application layout should be generated" do
+    run_generator
+    assert_file "app/views/layouts/application.html.erb"
+  end
+
+  test "with flag --template-engine=haml" do
+    run_generator ["--template-engine=haml"]
+    assert_no_file "app/views/layouts/application.html.erb"
+    assert_file "app/views/layouts/application.html.haml"
+  end
+
+  test "minimal application partials should be generated" do
+    run_generator
+    %w(_footer _head _header).each do |file|
+      assert_file "app/views/application/#{ file }.html.erb"
+    end
+    %w(_flashes _javascripts _stylesheets).each do |file|
+      assert_no_file "app/views/application/#{ file }.html.erb"
+    end
+  end
+
+  test "assets should be generated" do
+    run_generator
+
+    assert_file "app/assets/stylesheets/_defaults.css.scss"
+    assert_file "app/assets/stylesheets/application.css.scss", /@import "application\/document";/
+    %w(_defaults document media_queries).each do |file|
+      assert_file "app/assets/stylesheets/application/#{ file }.css.scss"
+    end
+  end
+
+  test "application.css gets removed" do
+    run_generator
+    assert_no_file "app/assets/stylesheets/application.css"
+  end
 end