flutie 1.3.3 → 1.3.4

data/.gitignore

@@ -0,0 +1,9 @@
+.bundle/
+log/*.log
+pkg/
+spec/dummy/db/*.sqlite3
+spec/dummy/log/*.log
+spec/dummy/tmp/
+.sass-cache/*
+gemfiles/*.lock
+*.gem

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+gemfile:
+  - gemfiles/rails_3.0.20.gemfile
+  - gemfiles/rails_3.1.11.gemfile
+  - gemfiles/rails_3.2.11.gemfile

data/Appraisals

@@ -0,0 +1,5 @@
+['3.2.12', '3.1.11', '3.0.20'].each do |rails_version|
+  appraise "rails-#{rails_version}" do
+    gem "rails", rails_version
+  end
+end

data/CONTRIBUTING.md

@@ -0,0 +1,38 @@
+We love pull requests. Here's a quick guide:
+
+1. Fork the repo.
+
+2. Run the tests. We only take pull requests with passing tests, and it's great
+to know that you have a clean slate: `bundle && rake`
+
+3. Add a test for your change. Only refactoring and documentation changes
+require no new tests. If you are adding functionality or fixing a bug, we need
+a test!
+
+4. Make the test pass.
+
+5. Push to your fork and submit a pull request.
+
+
+At this point you're waiting on us. We like to at least comment on, if not
+accept, pull requests within three business days (and, typically, one business
+day). We may suggest some changes or improvements or alternatives.
+
+Some things that will increase the chance that your pull request is accepted,
+taken straight from the Ruby on Rails guide:
+
+* Use Rails idioms and helpers
+* Include tests that fail without your code, and pass with it
+* Update the documentation, the surrounding one, examples elsewhere, guides,
+  whatever is affected by your contribution
+
+Syntax:
+
+* Two spaces, no tabs.
+* No trailing whitespace. Blank lines should not have any space.
+* Prefer &&/|| over and/or.
+* MyClass.my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
+* a = b and not a=b.
+* Follow the conventions you see used in the source already.
+
+And in case we didn't emphasize it enough: we love tests!

data/Gemfile

@@ -1,9 +1,3 @@
 source "http://rubygems.org"
-gemspec
 
-gem "appraisal"
-gem "rspec-rails"
-gem "capybara", ">= 0.4.0"
-gem "sqlite3"
-gem "sass"
-gem "mocha"
+gemspec

data/Gemfile.lock

@@ -0,0 +1,108 @@
+PATH
+  remote: .
+  specs:
+    flutie (1.3.4)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
+      builder (~> 3.0.0)
+    activesupport (3.2.9)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    addressable (2.3.2)
+    appraisal (0.5.1)
+      bundler
+      rake
+    builder (3.0.4)
+    capybara (2.0.1)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 1.0.0)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    ffi (1.2.0)
+    hike (1.2.1)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.5)
+    libwebsocket (0.1.7.1)
+      addressable
+      websocket
+    mime-types (1.19)
+    multi_json (1.5.0)
+    nokogiri (1.5.5)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    railties (3.2.9)
+      actionpack (= 3.2.9)
+      activesupport (= 3.2.9)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec-core (2.12.1)
+    rspec-expectations (2.12.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.0)
+    rspec-rails (2.12.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rubyzip (0.9.9)
+    sass (3.2.3)
+    selenium-webdriver (2.27.2)
+      childprocess (>= 0.2.5)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
+      rubyzip
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.6)
+    thor (0.16.0)
+    tilt (1.3.3)
+    websocket (1.0.4)
+    xpath (1.0.0)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  capybara (>= 0.4.0)
+  flutie!
+  rspec-rails
+  sass
+  sqlite3

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010 Mike Burns
+Copyright (c) 2010-2013 thoughtbot, inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -5,6 +5,8 @@ Flutie
 
 Basic, default styles for rails applications
 
+We also have a [Bourbon](https://github.com/thoughtbot/bourbon) gem available, which can be used to extend flutie with a set of vanilla sass mixins.
+
 Installation & Upgrading
 ------------------------
 
@@ -14,30 +16,30 @@ Flutie is recommended to be run as a gem and included in your Gemfile:
 
     gem "flutie"
 
-After you've bundled, if you are using Rails < 3.1, run the installer:
+### Rails 3.1 & Rails 3.2
 
-    rake flutie:install
+After you've bundled, if you are using rails 3.1 or greater with asset pipelining enabled, simply add:
 
-The installer will copy the Flutie stylesheets sass into public/stylesheets/sass/flutie, and a static flutie.css into public/stylesheets/ in your app.
+    @import 'flutie';
 
-Once Flutie is installed, with your application running (not in production environment) you can browse to /styleguides.  This will present you with many standard markup elements that are present in a Rails application, in your default application layout.
+as a sass import in the application stylesheet manifest (app/assets/stylesheets/application.css.scss).
 
-Click on the "Default styles" link to view the same markup with a barebones layout that only contains the Flutie stylesheets. Click on "Application styles" to view the markup in your application layout.
+If this is a new Rails 3.1 or 3.2 project you will need to rename the application.css manifest to application.css.scss so it is processed
+by the asset pipeline and sass to perform the @import.
 
-To upgrade, bump the gem version in your Gemfile, and then run 'rake flutie:install' again to get the latest changes moved into your application.
+### Rails 3.0
 
-If you are using rails 3.1 or greater with asset pipelining enabled, you don't need to run the installer.  Simply add:
+After you've bundled, run the installer:
 
-    *= require _flutie
+    rake flutie:install
 
-in the application stylesheet manifest (app/assets/stylesheets/application.css), or:
+The installer will copy the Flutie stylesheets sass into public/stylesheets/sass/flutie, and a static flutie.css into public/stylesheets/ in your app.
 
-    @import 'flutie';
+Once Flutie is installed, with your application running (not in production environment) you can browse to /styleguides.  This will present you with many standard markup elements that are present in a Rails application, in your default application layout.
 
-as a sass import.
+Click on the "Default styles" link to view the same markup with a barebones layout that only contains the Flutie stylesheets. Click on "Application styles" to view the markup in your application layout.
 
-Usage
------
+To upgrade, bump the gem version in your Gemfile, and then run `rake flutie:install` again to get the latest changes moved into your application.
 
 Flutie registers a :flutie shortcut for stylesheets, so in your layout you can do...
 
@@ -45,7 +47,7 @@ Flutie registers a :flutie shortcut for stylesheets, so in your layout you can d
 
 ...this will include all the flutie stylesheets, then the 'admin' stylesheet, and it will cache them all into one file.
 
-### Sass
+#### Sass
 
 If you use Sass in your application, the flutie stylesheets are also available as scss files, installed in public/stylesheets/sass/flutie.  These files can be imported into your own sass files for use with the following:
 
@@ -53,34 +55,13 @@ If you use Sass in your application, the flutie stylesheets are also available a
 
 You'll want to import flutie before any of your own styles so that you can do things like extend your classes with flutie classes.
 
-We also have a [Bourbon](https://github.com/thoughtbot/bourbon) gem available, which can be used to extend flutie with a set of vanilla sass mixins.
-
-### Custom Styles
-
-To add custom styles to the styleguide add partials to the app/views/styleguides directory. For example:
-
-    app/views/styleguides/_todo_item.erb:
-
-    <ol>
-      <li class="todo">This is a todo item</li>
-    </ol>
-
-Plugin authors can also add to the styleguide by ensuring that their view path is in ActionController::Base.view_paths and by placing a partial under the styleguides directory. For example:
-
-    ActionController::Base.append_view_path(File.join(File.dirname(__FILE__), 'views'))
-
-    my_awesome_plugin/views/styleguides/_pagination.erb:
-
-    <div class="pagination">
-      <a href="#prev">Previous</a>
-      <a href="#next">Next</a>
-    </div>
-
 Helpers
 -------
 
 Flutie provides several helper methods for layouts as well.
 
+#### page_title
+
 The `page_title` method can be used like:
 
     <title><%= page_title %></title>
@@ -90,7 +71,7 @@ By default, it will produce results like:
     <title>Appname : page title</title>
 
 * "App name" comes from the module name of the rails application created by your app, i.e. `Appname::Application` will produce "Appname"
-* "page" comes from trying `content_for(:page_title)` and assumes you are setting :page_title on your pages.
+* "page" comes from trying `content_for(:page_title)` and assumes you are using `content_for` with `:page_title` symbol on your pages.
 * The separator defaults to " : "
 
 These can be overridden by passing an options hash including `:app_name`, `:page_title_symbol` and `:separator` hash keys, ie:
@@ -99,6 +80,8 @@ These can be overridden by passing an options hash including `:app_name`, `:page
     page_title(:app_name => 'My app name', :page_title_symbol => :site_page_title, :separator => " | ")
     => "My app name | My title of my page"
 
+#### body_class
+
 The `body_class` method can be used like:
 
     <body class="<%= body_class %>">
@@ -113,6 +96,27 @@ Anything which has been added via `content_for(:extra_body_classes)` will be add
     <body class="<%= body_class %>">
     <body class="widgets widgets-show special-page">
 
+Custom Styles
+-------------
+
+To add custom styles to the styleguide add partials to the app/views/styleguides directory. For example:
+
+    app/views/styleguides/_todo_item.erb:
+
+    <ol>
+      <li class="todo">This is a todo item</li>
+    </ol>
+
+Plugin authors can also add to the styleguide by ensuring that their view path is in `ActionController::Base.view_paths` and by placing a partial under the styleguides directory. For example:
+
+    ActionController::Base.append_view_path(File.join(File.dirname(__FILE__), 'views'))
+
+    my_awesome_plugin/views/styleguides/_pagination.erb:
+
+    <div class="pagination">
+      <a href="#prev">Previous</a>
+      <a href="#next">Next</a>
+    </div>
 
 Suggestions, Bugs, Refactoring?
 -------------------------------
@@ -129,7 +133,7 @@ To rebuild the static flutie.css file, you can run:
 
     sass --update app/assets/stylesheets/_flutie.scss:public/stylesheets/flutie.css
 
-You can run a server which will allow you to view the flutie styleguide locally:
+You can also run a local server which will allow you to view the flutie styleguide:
 
     ruby server.rb
 
@@ -149,4 +153,4 @@ The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 License
 -------
 
-Flutie is Copyright © 2010-2011 thoughtbot. It is free software, and may be redistributed under the terms specified in the LICENSE file.
+Flutie is Copyright © 2010-2013 thoughtbot. It is free software, and may be redistributed under the terms specified in the LICENSE file.

data/Rakefile

@@ -1,31 +1,18 @@
-# encoding: UTF-8
-require 'rubygems'
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'rake'
-require 'rdoc/task'
+require 'bundler/setup'
+require 'bundler/gem_tasks'
 require 'appraisal'
 
-require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-desc "Default: run the unit tests."
-task :default => [:all]
-
-desc 'Test the plugin under all supported Rails versions.'
-task :all => ["appraisal:install"] do |t|
-  exec('rake appraisal spec')
+task :default do |t|
+  if ENV['BUNDLE_GEMFILE'] =~ /gemfiles/
+    exec 'rake spec'
+  else
+    Rake::Task['appraise'].execute
+  end
 end
 
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Flutie'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+task :appraise => ['appraisal:install'] do |t|
+  exec 'rake appraisal'
 end

data/app/assets/stylesheets/_defaults.scss

@@ -1,6 +1,6 @@
 body {
   color: #333;
-  font-size: 13px;
+  font-size: 100%;
   font-family: "helvetica neue", arial, helvetica, "lucida grande", sans-serif;
 }
 
@@ -14,8 +14,10 @@ h1, h2, h3, h4, h5, h6 {
 /* Use a .box to create a padded box inside a column.  */
 .box {
   background: #eee;
-  margin-bottom: 16px;
-  padding: 16px;
+  margin-bottom: 1em;
+  margin-bottom: 1rem;
+  padding: 1em;
+  padding: 1rem;
 }
 
 /* Use this to create a horizontal ruler across a column. */
@@ -26,7 +28,7 @@ hr {
   color: #ddd;
   float: none;
   height: 1px;
-  margin: 0 0 12px;
+  margin: 0 0 .75rem;
   width: 100%;
 }
 

data/app/assets/stylesheets/_flashes.scss

@@ -1,11 +1,13 @@
 /* Success, error & notice boxes for messages and errors. */
 div.error, div.notice, div.success, #flash_failure, #flash_success, #flash_notice {
   border: 1px solid #ddd;
-  -moz-border-radius: 8px;
-  -webkit-border-radius: 8px;
-  border-radius: 8px;
-  margin-bottom: 12px;
-  padding: 10px;
+  -moz-border-radius: .5rem;
+  -webkit-border-radius: .5rem;
+  border-radius: .5rem;
+  margin-bottom: .75em;
+  margin-bottom: .75rem;
+  padding: .75em;
+  padding: .75rem;
 }
 
 div.error, #flash_failure {

data/app/assets/stylesheets/_forms.scss

@@ -11,7 +11,8 @@ input[type="submit"]::-moz-focus-inner {
 
 form ol {
   list-style: none;
-  margin: 0 0 12px 0;
+  margin: 0 0 .75em 0;
+  margin: 0 0 .75rem 0;
 }
 
 form ol ol {
@@ -20,13 +21,15 @@ form ol ol {
 
 form ol li {
   list-style-position: outside;
-  margin: 0 0 12px 0;
+  margin: 0 0 .75em 0;
+  margin: 0 0 .75rem 0;
 }
 
 /*list-style-position fixes IE label margin bug*/
 form ol ol li {
   list-style-position: outside;
-  margin: 0 0 4px 0;
+  margin: 0 0 .25em 0;
+  margin: 0 0 .25rem 0;
 }
 
 form ol li.error input {
@@ -40,7 +43,8 @@ p.inline-errors {
 form ol li.file {
   background: #e1e1e1;
   border: 1px solid #c8c8c8;
-  padding: 10px;
+  padding: .75em;
+  padding: .75rem;
 }
 
 form abbr {
@@ -66,16 +70,20 @@ a.cancel {
 
 .inline-hints {
   color: #666;
-  font-size: 11px;
-  margin-bottom: 4px;
+  font-size: .75em;
+  font-size: .75rem;
+  margin-bottom: .25em;
+  margin-bottom: .25rem;
 }
 
 /* Fieldsets */
 fieldset {
   background: #f1f1f1;
   border: 1px solid #e3e3e3;
-  margin: 0 0 16px 0;
-  padding: 16px 16px 12px 16px;
+  margin: 0 0 1em 0;
+  margin: 0 0 1rem 0;
+  padding: 1rem 1rem .75em 1em;
+  padding: 1rem 1rem .75rem 1rem;
 }
 
 fieldset fieldset, fieldset fieldset fieldset {
@@ -86,7 +94,10 @@ fieldset fieldset, fieldset fieldset fieldset {
 legend {
   font-weight: bold;
 }
-.ie6 legend, .ie7 legend { margin-left: -7px; }
+.ie6 legend, .ie7 legend { 
+  margin-left: .5em; 
+  margin-left: .5rem; 
+}
 
 fieldset.buttons {
   background: inherit;
@@ -120,8 +131,8 @@ input[type="time"],
 input[type="url"],
 input[type="week"] {
   font-size: inherit;
-  padding: 3px 2px;
-  width: 300px;
+  padding: .25em;
+  padding: .25rem;
 }
 .ie6 input {
   vertical-align: text-bottom;
@@ -133,9 +144,9 @@ input[disabled='disabled'] {
 }
 
 input[type="checkbox"] {
-  margin: 0 3px 0 0;
+  margin: 0 .25em 0 0;
+  margin: 0 .25rem 0 0;
   position: relative;
-  top: -2px;
   vertical-align: middle;
 }
 .ie7 input[type="checkbox"] {
@@ -143,9 +154,9 @@ input[type="checkbox"] {
 }
 
 input[type="radio"] {
-  margin: 0 3px 0 0;
+  margin: 0 .25em 0 0;
+  margin: 0 .25rem 0 0;
   position: relative;
-  top: -2px;
   vertical-align: middle;
 }
 
@@ -162,21 +173,22 @@ input[type="radio"] {
 /* Textareas */
 textarea {
   font-size: inherit;
-  height: 200px;
-  margin: 0 6px 6px 0;
-  padding: 5px;
-  width: 440px;
+  margin: 0 .5em .5em 0;
+  margin: 0 .5rem .5rem 0;
+  padding: .5em;
+  padding: .5rem;
   overflow: auto;
 }
 
 /* Select fields */
 fieldset .select select {
-  width: 200px;
-  font-size: 11px;
+  font-size: .75em;
+  font-size: .75rem;
 }
 
 optgroup {
-  margin: 0 0 6px 0;
+  margin: 0 0 .5em 0;
+  margin: 0 0 .5rem 0;
 }
 
 /* Date & Time */