speedo 0.0.4 → 0.0.5

data/app/views/layouts/speedo/application.html.haml

@@ -1,16 +1,16 @@
 !!!
-!= cc_html(:class => "no-js", :lang => 'en') do
+!= cc_html(class: "no-js", lang: 'en') do
   %head
-    %meta{:charset => "utf-8"}
-    %meta{:content => "", :name => "author"}
-    %meta{:content => "", :name => "description"}
-    %meta{:content => "IE=edge,chrome=1", "http-equiv" => "X-UA-Compatible"}
-    %meta{:content => "width=device-width, initial-scale=1.0", :name => "viewport"}
-    -#%link{:href => '#insert-web-fonts-here', :rel => 'stylesheet', :type => 'text/css'}
+    %meta{charset: 'utf-8'}
+    %meta{content: '', name: 'author'}
+    %meta{content: '', name: 'description'}
+    %meta{content: 'IE=edge,chrome=1', 'http-equiv' => 'X-UA-Compatible'}
+    %meta{content: 'width=device-width, initial-scale=1.0', name: 'viewport'}
+    -#%link{href: '#insert-web-fonts-here', rel: 'stylesheet', type: 'text/css'}
     = csrf_meta_tags
 
     %title
-      = t "app_name"
+      = t 'app_name'
       = yield :page_title
     
     = javascript_include_tag 'modernizr.min.js'
@@ -23,22 +23,27 @@
     %noscript#noscript_warning This site works best with JavaScript enabled. Some features may not be available
     #wrapper
       %header.branding.clearfix
-        = link_to image_tag('speedo/logo.png'), root_url, :class => 'logo'
+        = link_to image_tag('speedo/logo.png'), root_url, class: 'logo'
 
         .user
-          = link_to "current_user.name", "account_url", class: "user_name"
-          |
-          = link_to 'Logout', "destroy_user_session_url", class: "user_logout"
-
+          - if @user_signed_in
+            = link_to 'current_user.name', 'account_url', class: 'user_name'
+            |
+            = link_to 'Logout', 'destroy_user_session_url', class: 'user_logout'
+          - else
+            = link_to 'Sign in', 'new_user_session_path', rel: 'sign_in'
+            or
+            = link_to 'Sign up', 'new_user_registration_path', rel: 'sign_up'
+            
       %nav.main_nav.clearfix
         %form.right.search
-          %input{:type => "search", :name => "search[name]", :placeholder => "Search", :results => 5, :autosave => "site_search"}
+          %input{type: 'search', name: 'search[name]', placeholder: 'Search', results: 5, autosave: 'site_search'}
 
-        = link_to "Home", root_url, {:class => "active home"}
-        = link_to "Section1", root_url
-        = link_to "Section2", root_url
-        = link_to "Section3", root_url
-        = link_to "Section4", root_url
+        = link_to 'Home', root_url, {class: 'active home'}
+        = link_to 'Section1', root_url
+        = link_to 'Section2', root_url
+        = link_to 'Section3', root_url
+        = link_to 'Section4', root_url
 
 
       - if flash[:success]
@@ -49,7 +54,7 @@
         .flash.alert= flash[:alert]
       - if flash[:error]
         .flash.error= flash[:error]
-      .colmask{:class => @col_layout || @col_layout = "leftcol"} 
+      .colmask{class: @col_layout || @col_layout = 'leftcol'} 
         -# options: leftcol, rightcol, threecol, onecol
         .colmid
           .colleft
@@ -62,5 +67,5 @@
       %footer
         Copyright © 
         = Time.now.year 
-        = link_to "CrankApps", "http://www.crankapps.com", :target => "_blank"
+        = link_to 'CrankApps', 'http://www.crankapps.com', target: '_blank'
 

data/app/views/speedo/home/examples.html.haml

@@ -1,10 +1,10 @@
-- @col_layout = "threecol"
+- @col_layout = 'threecol'
 
 %h1 Buttons - h1
 %button.button.icon.add Click
 .button-group
-  %input.button.danger{:type => :submit, :value => "Cancel"}
-  %a.button.icon.comment.popup{:href => "#popup", :title => "Popup title"} Popup
+  %input.button.danger{type: :submit, value: 'Cancel'}
+  %a.button.icon.comment.popup{href: '#popup', title: 'Popup title'} Popup
 .button Nothing
 
 
@@ -29,18 +29,18 @@
 
 
 %h3 Inputs with bonuses - h3
-%select.chzn{:style => "width:200px"}
+%select.chzn{style: 'width:200px'}
   %option Canada
   %option UK
   %option USA
 
 %br
-%input{:type => :date, :placeholder => "yy-mm-dd"}
+%input{type: :date, placeholder: 'yy-mm-dd'}
 
 
 
 %h4 AutoGrowing, AutoSuggesting - h4
-%textarea.autoGrow{:cols => "50", :placeholder => "AutoGrowing"}
+%textarea.autoGrow{cols: '50', placeholder: 'AutoGrowing'}
 
 %br
 %input.autoSuggest
@@ -49,24 +49,24 @@
 
 %h5 Uniformed Inputs - h5
 %label
-  %input{:type => :checkbox, :checked => "checked"}
+  %input{type: :checkbox, checked: 'checked'}
   One
 %label  
-  %input{:type => :checkbox}
+  %input{type: :checkbox}
   Two
 %label  
-  %input{:type => :checkbox}
+  %input{type: :checkbox}
   Three
 %br
 
 %label
-  %input{:type => :radio, :name => "radio", :checked => "checked"}
+  %input{type: :radio, name: 'radio', checked: 'checked'}
   One
 %label
-  %input{:type => :radio, :name => "radio"}
+  %input{type: :radio, name: 'radio'}
   Two
 %label
-  %input{:type => :radio, :name => "radio"}
+  %input{type: :radio, name: 'radio'}
   Three
 
 %br
@@ -74,7 +74,7 @@
   %option Select Something
 
 %br
-%input{:type => :file}
+%input{type: :file}
 
 
 
@@ -101,7 +101,6 @@
 .popups
   #popup.popup_content
     %h4 Help
-    %p See style.css.scss for classes
-    %p See normalize.css.scss for helper classes
-    %p See home.js.coffee for standard JS calls
+    %p See speedo.css.scss for classes and helper classes
+    %p See swim.js.coffee for standard JS calls
     %button.button.close.right Close

data/config/routes.rb

@@ -1,4 +1,4 @@
 Speedo::Engine.routes.draw do
-  get '/examples', :to => 'home#examples'
-  root :to => 'home#examples'
+  get '/examples', to: 'home#examples'
+  root to: 'home#examples'
 end

data/lib/generators/speedo/install_generator.rb

@@ -3,11 +3,11 @@ module Speedo
     class InstallGenerator < Rails::Generators::Base
       source_root File.expand_path("../../../../", __FILE__)
 
-      desc "Installs Speedo files to get you going fast."
+      desc 'Installs Speedo files to get you going fast.'
       
       # app/views/layouts/application.html.haml
       def layout
-        if yes? "Do you want to replace the application layout? [yN]"
+        if yes? 'Do you want to replace the application layout? [yN]'
           template 'app/views/layouts/speedo/application.html.haml', 
                    'app/views/layouts/application.html.haml'
           remove_file 'app/views/layouts/application.html.erb'

data/lib/speedo/sass.rb

@@ -1,6 +1,5 @@
 require 'bourbon'
 
 Sass::Engine::DEFAULT_OPTIONS[:load_paths].tap do |load_paths|
-  load_paths << "#{Gem.loaded_specs['bourbon'].full_gem_path}/app/assets/stylesheets"
-  load_paths << "vendor/assets/stylesheets"
+  load_paths << "#{Gem.loaded_specs['bourbon'].full_gem_path}/app/assets/stylesheets/"
 end

data/lib/speedo/version.rb

@@ -1,3 +1,3 @@
 module Speedo
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end