RubyGems - html5-rails - Versions diffs - 0.0.7 → 0.1.0 - Mend

html5-rails 0.0.7 → 0.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (64) hide show

data/lib/generators/html5/install/templates/config/compass.rb CHANGED

@@ -1,4 +1,4 @@
 # Require any additional compass plugins here.
 require 'compass/h5bp'
-project_type = :rails
+project_type = :rails

data/lib/generators/html5/install/templates/config/html5_rails.yml CHANGED

@@ -10,8 +10,8 @@
 # e.g. ENV['google_account_id'] || yml[:google_account_id]
 defaults: &defaults
-  :google_account_id: ""  # Google Analytics
-  :google_api_key:    ""  # Google APIs
+  :google_account_id: ''  # Google Analytics
+  :google_api_key:    ''  # Google APIs
 :development:
   <<: *defaults

data/lib/generators/html5/layout/USAGE CHANGED

@@ -1,8 +1,8 @@
 Description:
-    Removes Erb layout and installs a html5-rails Haml layout.
+    Installs a new html5-rails layout in /app/views/layouts
 Example:
-    rails generate html5:layout layout_name
+    rails generate html5:layout my_new_layout
     This will create:
-        app/views/layouts/layout_name.html.haml
+        app/views/layouts/my_new_layout.html.(erb|haml|slim)

data/lib/generators/html5/layout/layout_generator.rb CHANGED

@@ -9,21 +9,21 @@ module Html5
       argument :name, :type => :string,
                       :required => false,
-                      :default => "application"
+                      :default => 'application'
       class_option :all_partials, :type => :boolean,
                                   :default => false,
-                                  :desc => "Generate all partials for this layout"
+                                  :desc => 'Generate all partials for this layout'
       class_option :minimal_partials, :type => :boolean,
                                       :default => false,
-                                      :desc => "Generate minimal partials for this layout"
+                                      :desc => 'Generate minimal partials for this layout'
       class_option :template_engine
       def generate_layout
-        if file_path == "application" && options[:template_engine].to_s != "erb"
-          remove_file File.join("app/views/layouts/application.html.erb")
+        if file_path == 'application' && options[:template_engine].to_s != 'erb'
+          remove_file "app/views/layouts/application.html.erb"
         end
         template filename_with_extensions("application"), File.join("app/views/layouts", class_path, filename_with_extensions(file_name))
       end

data/lib/generators/html5/layout/templates/application.html.erb CHANGED

@@ -1,20 +1,17 @@
 <!DOCTYPE html>
-<%%# http://paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither %>
 <%%= html_tag :class => "no-js" %>
   <%%= render "head" %>
   <body class="<%%= controller.controller_name %>">
     <%%= render "chromeframe" %>
     <%%= render "header" %>
+    <%%= render "flashes" %>
-    <div id="main" role="main">
-      <%%= render "flashes" %>
-      <%%= yield %>
-    </div>
+    <%%= yield %>
     <%%= render "footer" %>
     <%%# Javascript at the bottom for fast page loading %>
     <%%= render "javascripts" %>
   </body>
-</html>
+</html>

data/lib/generators/html5/layout/templates/application.html.haml CHANGED

@@ -1,17 +1,15 @@
 !!! 5
--# http://paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither
-- html_tag :class => "no-js" do
-  = render "head"
+- html_tag :class => 'no-js' do
+  = render 'head'
   %body{ :class => "#{ controller.controller_name }" }
-    = render "chromeframe"
-    = render "header"
+    = render 'chromeframe'
+    = render 'header'
+    = render 'flashes'
-    #main{ :role => "main" }
-      = render "flashes"
-      = yield
+    = yield
-    = render "footer"
+    = render 'footer'
     -# Javascript at the bottom for fast page loading
-    = render "javascripts"
+    = render 'javascripts'

data/lib/generators/html5/layout/templates/application.html.slim CHANGED

@@ -1,17 +1,24 @@
-doctype 5
-/ http://paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither
-- html_tag :class => "no-js" do
-  = render "head"
+doctype html
+/[if lt IE 7]
+  |<html class='no-js lt-ie9 lt-ie8 lt-ie7'>
+/[if IE 7]
+  |<html class='no-js lt-ie9 lt-ie8'>
+/[if IE 8]
+  |<html class='no-js lt-ie9'>
+/![if gt IE 8]><!
+html.no-js
+  /!<![endif]
+  = render 'head'
   body class=controller.controller_name
-    = render "chromeframe"
-    = render "header"
+    = render 'chromeframe'
+    = render 'header'
-    #main  role="main"
-      = render "flashes"
-      = yield
+    = render 'flashes'
+    = yield
-    = render "footer"
+    = render 'footer'
     / Javascript at the bottom for fast page loading
-    = render "javascripts"
+    = render 'javascripts'

data/lib/generators/html5/partial/USAGE CHANGED

@@ -1,8 +1,18 @@
 Description:
-    Generates a partial
+    Copies an existing html5-rails partial to the views folder so it can be editied.
 Example:
-    rails generate html5:partial _partial_name
+    rails generate html5:partial _javascripts
     This will create:
-        app/views/application/_partial_name.html.haml
+        app/views/application/_partial_name.html.(erb|haml|slim)
+    Choices include:
+      _head
+      _chromeframe
+      _flashes
+      _header
+      _footer
+      _javascripts
+      _stylesheets

data/lib/generators/html5/partial/partial_generator.rb CHANGED

@@ -9,27 +9,27 @@ module Html5
       argument :name, :type => :string,
                       :required => false,
-                      :default => ""
+                      :default => ''
       class_option :all, :type => :boolean,
                          :default => false,
-                         :desc => "Generate all partials"
+                         :desc => 'Generate all partials'
       class_option :minimal, :type => :boolean,
                              :default => false,
-                             :desc => "Generate minimal partials (_head, _header, _footer)"
+                             :desc => 'Generate minimal partials (_head, _header, _footer)'
        class_option :path, :type => :string,
                            :default => nil,
                            :required => false,
-                           :desc => "resource path to generate partials in"
+                           :desc => 'resource path to generate partials in'
       class_option :template_engine
       # def validate_name
       #   if options[:all] || options[:minimal]
       #     if partials.include?(file_name)
-      #       path = class_path.join("/")
+      #       path = class_path.join('/')
       #       message = "Argument '#{ file_path }' not allowed with --all or --minimal options."
       #       message << " Try using '#{ path }' instead." if !path.blank?
       #       raise Error, message
@@ -39,7 +39,7 @@ module Html5
       def generate_partials
         if partials.any?
-          empty_directory File.join("app/views", partial_path)
+          empty_directory File.join('app/views', partial_path)
         end
         partials.each do |partial|
           generate_partial(partial)
@@ -64,13 +64,13 @@ module Html5
         if !options.path.blank?
           path = options.path
         else
-          path = class_path.join("/")
+          path = File.join(class_path)
         end
-        path.blank? ? "application" : path
+        path.blank? ? 'application' : path
       end
       def generate_partial(partial_name)
-        template filename_with_extensions(partial_name), File.join("app/views", partial_path, filename_with_extensions(partial_name))
+        template filename_with_extensions(partial_name), File.join('app/views', partial_path, filename_with_extensions(partial_name))
       end
     end
   end

data/lib/generators/html5/partial/templates/_chromeframe.html.haml CHANGED

@@ -1,4 +1,4 @@
 /[if lt IE 7 ]
   %p.chromeframe
     You are using an <strong>outdated</strong> browser.
-    Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
+    Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.

data/lib/generators/html5/partial/templates/_chromeframe.html.slim CHANGED

@@ -1,4 +1,4 @@
 /[if lt IE 7 ]
   p.chromeframe
     | You are using an <strong>outdated</strong> browser.
-    | Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
+    | Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.

data/lib/generators/html5/partial/templates/_flashes.html.erb CHANGED

@@ -1,9 +1,7 @@
 <div id="flash">
   <%% flash.each do |key, value| %>
-    <div class="wrapper">
-      <div title="<%%= key.to_s.humanize %>" class="<%%= key %>">
-        <p><%%= value %></p>
-      </div>
+    <div title="<%%= key.to_s.humanize %>" class="<%%= key %>">
+      <p><%%= value %></p>
     </div>
   <%% end %>
 </div>

data/lib/generators/html5/partial/templates/_flashes.html.haml CHANGED

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

data/lib/generators/html5/partial/templates/_flashes.html.slim CHANGED

@@ -1,5 +1,4 @@
 #flash
   - flash.each do |key, value|
-    .wrapper
-      div  title=key.to_s.humanize class=key
-        p= value
+    div  title=key.to_s.humanize class=key
+      p= value

data/lib/generators/html5/partial/templates/_footer.html.erb CHANGED

@@ -2,4 +2,4 @@
   <small class="copyright">
     <%= application_title %>, Copyright &copy; <%%= Date.today.year %>
   </small>
-</footer>
+</footer>

data/lib/generators/html5/partial/templates/_footer.html.haml CHANGED

@@ -1,3 +1,3 @@
 %footer#footer
   %small.copyright
-    <%= application_title %>, Copyright &copy; #{ Date.today.year }
+    <%= application_title %>, Copyright &copy; #{ Date.today.year }

data/lib/generators/html5/partial/templates/_footer.html.slim CHANGED

@@ -1,3 +1,3 @@
 footer#footer
   small.copyright
-    | <%=application_title%>, Copyright &copy; #{Date.today.year}
+    | <%= application_title %>, Copyright &copy; #{ Date.today.year }

data/lib/generators/html5/partial/templates/_head.html.erb CHANGED

@@ -1,22 +1,14 @@
 <head>
   <meta charset="utf-8">
-  <%%# Use the .htaccess and remove these lines to avoid edge case issues. %>
-  <%%# More info: h5bp.com/b/378 %>
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <title></title>
-  <meta name="description" content="">
+  <title><%%= "#{ controller.controller_name.titleize } - #{ controller.action_name.titleize }" %></title>
-  <%%# Mobile viewport optimized: h5bp.com/viewport %>
+  <meta name="description" content="">
   <meta name="viewport" content="width=device-width">
   <%%= render "stylesheets" %>
-  <%%# More ideas for your <head> here: h5bp.com/d/head-Tips %>
-  <%%# All JavaScript at the bottom, except polyfills %>
   <%%= javascript_include_tag "polyfills" %>
   <%%= csrf_meta_tag %>
-</head>
+</head>

data/lib/generators/html5/partial/templates/_head.html.haml CHANGED

@@ -1,25 +1,14 @@
 %head
-  %meta{ :charset => "utf-8" }/
-  -# Use the .htaccess and remove these lines to avoid edge case issues.
-  -# More info: h5bp.com/b/378
+  %meta{ :charset => 'utf-8' }/
   %meta{ 'http-equiv' => 'X-UA-Compatible', :content => 'IE=edge,chrome=1' }/
   %title
     == #{ controller.controller_name.titleize } - #{ controller.action_name.titleize }
-  %meta{ :name => "description", :content => "" }/
-  -# Mobile viewport optimized: h5bp.com/viewport
-  %meta{ :name => "viewport", :content => "width=device-width" }/
-  -# Place favicon.ico and apple-touch-icon.png in the root directory: mathiasbynens.be/notes/touch-icons
-  = render "stylesheets"
-  -# More ideas for your <head> here: h5bp.com/d/head-Tips
+  %meta{ :name => 'description', :content => '' }/
+  %meta{ :name => 'viewport', :content => 'width=device-width' }/
-  -# All JavaScript at the bottom, except polyfills
-  = javascript_include_tag "polyfills"
+  = render 'stylesheets'
+  = javascript_include_tag 'polyfills'
-  = csrf_meta_tag
+  = csrf_meta_tag

data/lib/generators/html5/partial/templates/_head.html.slim CHANGED

@@ -1,25 +1,14 @@
 head
-  meta  charset="utf-8"
-  / Use the .htaccess and remove these lines to avoid edge case issues.
-  / More info: h5bp.com/b/378
-  meta  http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'
+  meta charset='utf-8'
+  meta content='IE=edge,chrome=1' http-equiv='X-UA-Compatible'
   title
     | #{ controller.controller_name.titleize } - #{ controller.action_name.titleize }
+  meta content='' name='description'
+  meta content='width=device-width' name='viewport'
-  meta  name="description" content=""
-  / Mobile viewport optimized: h5bp.com/viewport
-  meta  name="viewport" content="width=device-width"
-  / Place favicon.ico and apple-touch-icon.png in the root directory: mathiasbynens.be/notes/touch-icons
-  = render "stylesheets"
-  / More ideas for your <head> here: h5bp.com/d/head-Tips
+  = render 'stylesheets'
   / All JavaScript at the bottom, except polyfills
-  = javascript_include_tag "polyfills"
+  = javascript_include_tag 'polyfills'
   = csrf_meta_tag

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

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

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

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

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

@@ -3,7 +3,7 @@
 <%%# Append your own using content_for :javascripts %>
 <%%= yield :javascripts %>
-<%%# asynchronous google analytics: mathiasbynens.be/notes/async-analytics-snippet %>
+<%%# Google Analytics %>
 <%%# Looks for google_account_id first in ENV['GOOGLE_ACCOUNT_ID'] then in config/html5_rails.yml %>
 <%% if !google_account_id.blank? %>
   <script>
@@ -14,4 +14,4 @@
       s.parentNode.insertBefore(g,s)}(document,'script'));
     //]]>
   </script>
-<%% end %>
+<%% end %>

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

@@ -1,13 +1,13 @@
-= javascript_include_tag "application"
+= javascript_include_tag 'application'
 -#  Append your own using content_for :javascripts
 = yield :javascripts
--# asynchronous google analytics: mathiasbynens.be/notes/async-analytics-snippet
+-# Google Analytics
 -# 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'));
+    s.parentNode.insertBefore(g,s)}(document,'script'));

data/lib/generators/html5/partial/templates/_javascripts.html.slim CHANGED

@@ -1,13 +1,13 @@
-= javascript_include_tag "application"
+= javascript_include_tag 'application'
 /  Append your own using content_for :javascripts
 = yield :javascripts
-/ asynchronous google analytics: mathiasbynens.be/notes/async-analytics-snippet
+/ Google Analytics
 / 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']];
+  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'));

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

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