speedo 0.0.8 → 0.1.0

data/app/assets/stylesheets/application.css.scss

@@ -0,0 +1,2 @@
+// @import files below speedo (in order) so you can use the bourbon's jazzy mixins. Don't *=require
+@import "speedo";

data/app/assets/stylesheets/speedo.css.scss

@@ -1,14 +1,11 @@
-/*
- *= require normalize
- *= require autoSuggest
- *= require chosen
- *= require gh-buttons
- *= require jquery.dataTables
- *= require jquery.fancybox-1.3.4
- *= require jquery-ui-1.8.18.custom
- *= require uniform.default
-*/
-
+@import "normalize";
+@import "autoSuggest";
+@import "chosen";
+@import "gh-buttons";
+@import "jquery.dataTables";
+@import "jquery.fancybox-1.3.4";
+@import "jquery-ui-1.8.18.custom";
+@import "uniform.default";
 @import "bourbon";
 
 
@@ -310,9 +307,11 @@ ul.as-selections {
 */
 
 #wrapper {
-  max-width: 964px;      /* Set the width of the page here, +4px for colmask box-shadow */
-  padding:0 2px 4px;     /* (for colmask box-shadow) */
-  margin: 0 auto;
+  max-width: 960px;      /* Set the width of the page here */
+  padding:0;
+  margin: 0 auto 20px;
+  @include border-bottom-radius(3px);
+  @include box-shadow(0 2px 2px rgba(0,0,0,0.5));
 }
 
 /* Layout for mobile < 480px width screens (see below for media queries) */
@@ -322,7 +321,6 @@ ul.as-selections {
   float:left;
   width:100%;            /* width of whole page */
   @include border-radius(0 0 3px 3px);
-  @include box-shadow(0 2px 2px rgba(0,0,0,0.5));
   background:#fff;
   overflow:hidden;       /* This chops off any overhanging divs, including the leftcol bg */
 }

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

@@ -21,7 +21,7 @@
 
   %body
     %noscript#noscript_warning This site works best with JavaScript enabled. Some features may not be available
-    #wrapper
+    #wrapper.clearfix
       %header.branding.clearfix
         = link_to image_tag('speedo/logo.png'), root_url, class: 'logo'
 

data/lib/generators/speedo/install_generator.rb

@@ -7,33 +7,52 @@ module Speedo
       
       # app/views/layouts/application.html.haml
       def layout
-        if yes? 'Do you want to replace the application layout? [yN]'
+        if File.exist? 'app/views/layouts/application.html.haml'
+          if yes? 'application.html.haml already exists. Do you want the template as speedo.html.haml (for manual integration)? [yN]'
+            template 'app/views/layouts/speedo/application.html.haml', 
+                     'app/views/layouts/speedo.html.haml'
+          end
+        else
           template 'app/views/layouts/speedo/application.html.haml', 
                    'app/views/layouts/application.html.haml'
-          remove_file 'app/views/layouts/application.html.erb'
+        end
+        
+        if File.exist? 'app/views/layouts/application.html.erb'
+          if yes? 'Do you want to remove the application.html.erb layout (otherwise delete it manually)? [yN]'
+            remove_file 'app/views/layouts/application.html.erb'
+          end
         end
       end
 
       # app/assets/stylesheets/speedo.css.scss
       def copy_stylesheet
-        template 'app/assets/stylesheets/speedo.css.scss', 
-                 'app/assets/stylesheets/speedo.css.scss'
+        copy_file 'app/assets/stylesheets/speedo.css.scss', 
+                  'app/assets/stylesheets/speedo.css.scss'
       end
 
-      def alter_application_css
-        if_file 'app/assets/stylesheets/application.css' do |path|
-          unless File.read(path).match /require speedo/
-            inject_into_file path, after: '*= require_self' do
-              "\n *= require speedo"
-            end
+      
+      # app/assets/stylesheets/application.css.scss
+      def copy_application_css
+        if File.exist? 'app/assets/stylesheets/application.css.scss'
+          if yes? 'application.css.scss already exists. Do you want to replace it? [yN]'
+            copy_file 'app/assets/stylesheets/application.css.scss', 
+                      'app/assets/stylesheets/application.css.scss'
+          else
+            say 'Make sure to @import "speedo"; in your application.css.scss, and @import other files - do NOT use *=require.'
+          end
+        end
+        
+        if File.exist? 'app/assets/stylesheets/application.css'
+          if yes? 'Do you want to remove application.css (otherwise delete it manually)? [yN]'
+            remove_file 'app/assets/stylesheets/application.css'
           end
         end
       end
 
       # app/assets/javascripts/swim.js.coffee
       def javascript
-        template 'app/assets/javascripts/swim.js.coffee', 
-                 'app/assets/javascripts/swim.js.coffee'
+        copy_file 'app/assets/javascripts/swim.js.coffee', 
+                  'app/assets/javascripts/swim.js.coffee'
       end
 
       def alter_application_js
@@ -48,8 +67,16 @@ module Speedo
       
       # config/locales/speedo.en.yml
       def locales
-        template 'config/locales/speedo.en.yml', 
-                 'config/locales/speedo.en.yml'
+        if File.exist? 'config/locales/en.yml'
+          unless File.read('config/locales/en.yml').match /app_name/
+            inject_into_file 'config/locales/en.yml', after: 'en:' do
+              "\n  app_name: 'See config/locales to name this app'"
+            end
+          end
+        else
+          copy_file 'config/locales/speedo.en.yml', 
+                    'config/locales/speedo.en.yml'
+        end
       end
 
       def routes
@@ -62,7 +89,7 @@ module Speedo
         if File.exist? path
           yield path
         else
-          say "#{path} not found. Please manually require speedo."
+          say "#{path} not found. Add '//= require_tree .' to application.js."
         end
       end
 

data/lib/speedo/sass.rb

@@ -1,5 +1,13 @@
 require 'bourbon'
-
-Sass::Engine::DEFAULT_OPTIONS[:load_paths].tap do |load_paths|
-  load_paths << "#{Gem.loaded_specs['bourbon'].full_gem_path}/app/assets/stylesheets/"
-end
+# 
+module Speedo
+  class Railtie < ::Rails::Railtie
+    initializer "speedo.initialize_rails", :group => :all do
+      Sass::Engine::DEFAULT_OPTIONS[:load_paths].tap do |load_paths|
+        load_paths << "#{Gem.loaded_specs['bourbon'].full_gem_path}/app/assets/stylesheets/"
+        load_paths << "#{Rails.root}/app/assets/stylesheets"
+        load_paths << "#{Rails.root}/vendor/assets/stylesheets"
+      end
+    end
+  end
+end

data/lib/speedo/version.rb

@@ -1,3 +1,3 @@
 module Speedo
-  VERSION = "0.0.8"
+  VERSION = "0.1.0"
 end

data/lib/speedo.rb

@@ -1,4 +1,4 @@
-require "speedo/engine"
+require 'speedo/engine'
 require 'speedo/sass'
 require 'speedo/layout_helper'
 require 'haml'