flutie 1.3.4 → 2.0.0

data/.travis.yml

@@ -6,4 +6,4 @@ rvm:
 gemfile:
   - gemfiles/rails_3.0.20.gemfile
   - gemfiles/rails_3.1.11.gemfile
-  - gemfiles/rails_3.2.11.gemfile
+  - gemfiles/rails_3.2.12.gemfile

data/Gemfile.lock

@@ -1,108 +1,80 @@
 PATH
   remote: .
   specs:
-    flutie (1.3.4)
+    flutie (2.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    actionpack (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
-    activesupport (3.2.9)
+    activesupport (3.2.12)
       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)
+    json (1.7.7)
+    multi_json (1.5.1)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
+    railties (3.2.12)
+      actionpack (= 3.2.12)
+      activesupport (= 3.2.12)
       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)
+    rake (10.0.3)
+    rdoc (3.12.1)
       json (~> 1.4)
-    rspec-core (2.12.1)
-    rspec-expectations (2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
-    rspec-rails (2.12.0)
+    rspec-mocks (2.12.2)
+    rspec-rails (2.12.2)
       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)
+    sqlite3 (1.3.7)
+    thor (0.17.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/README.md

@@ -3,57 +3,18 @@ Flutie
 
 [![Build Status](https://secure.travis-ci.org/thoughtbot/flutie.png)](http://travis-ci.org/thoughtbot/flutie)
 
-Basic, default styles for rails applications
+Flutie provides extra ActionView view helpers for use with Rails applications.  Previous versions created default application styles.
 
-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.
+Please look to [Bourbon](https://github.com/thoughtbot/bourbon) and [Neat](https://github.com/thoughtbot/neat) gems for style defaults now.
 
 Installation & Upgrading
 ------------------------
 
-Flutie is a Rails engine. It works with versions of Rails greater than 3.0.
+Flutie is a Railtie meant for use with Rails. It works with versions of Rails greater than 3.0.
 
 Flutie is recommended to be run as a gem and included in your Gemfile:
 
-    gem "flutie"
-
-### Rails 3.1 & Rails 3.2
-
-After you've bundled, if you are using rails 3.1 or greater with asset pipelining enabled, simply add:
-
-    @import 'flutie';
-
-as a sass import in the application stylesheet manifest (app/assets/stylesheets/application.css.scss).
-
-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.
-
-### Rails 3.0
-
-After you've bundled, run the installer:
-
-    rake flutie:install
-
-The installer will copy the Flutie stylesheets sass into public/stylesheets/sass/flutie, and a static flutie.css into public/stylesheets/ in your app.
-
-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.
-
-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.
-
-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...
-
-    <%= stylesheet_link_tag :flutie, 'admin', :cache => true %>
-
-...this will include all the flutie stylesheets, then the 'admin' stylesheet, and it will cache them all into one file.
-
-#### 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:
-
-    @import "flutie/flutie";
-
-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.
+    gem 'flutie'
 
 Helpers
 -------
@@ -96,49 +57,11 @@ 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?
 -------------------------------
 
-Fork away and create a [Github Issue](http://github.com/thoughtbot/flutie/issues). Please don't send pull requests.
-
 Please see CONTRIBUTING.md for details.
 
-Development
------------
-
-The actual stylesheet source files are sass, so edit the files in app/assets/stylesheets/.
-To rebuild the static flutie.css file, you can run:
-
-    sass --update app/assets/stylesheets/_flutie.scss:public/stylesheets/flutie.css
-
-You can also run a local server which will allow you to view the flutie styleguide:
-
-    ruby server.rb
-
-Browsing to localhost at the port output by the above command will show you the styleguide.
-
 Credits
 -------
 

data/flutie.gemspec

@@ -8,17 +8,15 @@ Gem::Specification.new do |s|
   s.authors     = ['Matt Jankowski', 'Chad Pytel', 'Kevin Burg', 'Chad Mazzola', 'Phil LaPier', 'Dan Croak', 'Fred Yates', 'OZAWA Sakuro', 'Mike Burns', 'Greg Sterndale', 'Joe Ferris', 'J. Edward Dewyea', 'Emilien Taque', 'Aaron Suggs', 'Nick Quaranto']
   s.email       = ['support@thoughtbot.com']
   s.homepage    = 'http://github.com/thoughtbot/flutie'
-  s.summary     = 'Flutie adds default stylesheets to web apps'
+  s.summary     = 'Flutie provides extra Rails view helpers'
   s.description = 'Flutie is a starting point for personal discovery'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
   s.add_development_dependency('appraisal')
-  s.add_development_dependency('rspec-rails')
-  s.add_development_dependency('capybara', '>= 0.4.0')
   s.add_development_dependency('sqlite3')
-  s.add_development_dependency('sass')
+  s.add_development_dependency('rspec-rails')
 end

data/lib/flutie.rb

@@ -1,5 +1,5 @@
 require 'flutie/version'
 
 module Flutie
-  require 'flutie/engine' if defined?(Rails)
+  require 'flutie/railtie' if defined?(Rails)
 end

data/lib/flutie/{engine.rb → railtie.rb}

@@ -1,6 +1,9 @@
+require 'flutie/body_class_helper'
+require 'flutie/page_title_helper'
+
 module Flutie
 
-  class Engine < Rails::Engine
+  class Railtie < Rails::Railtie
     initializer 'page_title.helper' do |app|
       ActionView::Base.send :include, PageTitleHelper
     end

data/lib/flutie/version.rb

@@ -1,3 +1,3 @@
 module Flutie
-  VERSION = '1.3.4'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/spec/spec_helper.rb

@@ -11,11 +11,6 @@ ActionMailer::Base.default_url_options[:host] = "test.com"
 
 Rails.backtrace_cleaner.remove_silencers!
 
-# Configure capybara for integration testing
-require "capybara/rails"
-Capybara.default_driver   = :rack_test
-Capybara.default_selector = :css
-
 # Run any available migration
 ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flutie
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -41,38 +41,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -90,7 +58,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -121,32 +89,15 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/assets/stylesheets/_defaults.scss
-- app/assets/stylesheets/_flashes.scss
-- app/assets/stylesheets/_flutie.scss
-- app/assets/stylesheets/_forms.scss
-- app/assets/stylesheets/_lists.scss
-- app/assets/stylesheets/_reset.scss
-- app/assets/stylesheets/_tables.scss
-- app/assets/stylesheets/_type.scss
-- app/controllers/flutie/styleguides_controller.rb
-- app/helpers/body_class_helper.rb
-- app/helpers/page_title_helper.rb
-- app/views/flutie/styleguides/show.erb
-- app/views/layouts/flutie.erb
-- config/initializers/expansion.rb
-- config/routes.rb
 - flutie.gemspec
 - gemfiles/rails_3.0.20.gemfile
 - gemfiles/rails_3.1.11.gemfile
 - gemfiles/rails_3.2.12.gemfile
 - lib/flutie.rb
-- lib/flutie/engine.rb
+- lib/flutie/body_class_helper.rb
+- lib/flutie/page_title_helper.rb
+- lib/flutie/railtie.rb
 - lib/flutie/version.rb
-- lib/tasks/flutie.rake
-- public/stylesheets/flutie.css
-- server.rb
-- spec/controllers/styleguides_controller_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
@@ -178,13 +129,8 @@ files:
 - spec/dummy/public/javascripts/rails.js
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
-- spec/fixtures/app/views/styleguides/_one.erb
-- spec/fixtures/app/views/styleguides/_two.erb
-- spec/flutie_spec.rb
 - spec/helpers/body_class_helper_spec.rb
 - spec/helpers/page_title_helper_spec.rb
-- spec/initialization_spec.rb
-- spec/integration/navigation_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/thoughtbot/flutie
 licenses: []
@@ -209,9 +155,8 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Flutie adds default stylesheets to web apps
+summary: Flutie provides extra Rails view helpers
 test_files:
-- spec/controllers/styleguides_controller_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
@@ -243,11 +188,6 @@ test_files:
 - spec/dummy/public/javascripts/rails.js
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
-- spec/fixtures/app/views/styleguides/_one.erb
-- spec/fixtures/app/views/styleguides/_two.erb
-- spec/flutie_spec.rb
 - spec/helpers/body_class_helper_spec.rb
 - spec/helpers/page_title_helper_spec.rb
-- spec/initialization_spec.rb
-- spec/integration/navigation_spec.rb
 - spec/spec_helper.rb

data/app/assets/stylesheets/_defaults.scss

@@ -1,103 +0,0 @@
-body {
-  color: #333;
-  font-size: 100%;
-  font-family: "helvetica neue", arial, helvetica, "lucida grande", sans-serif;
-}
-
-h1, h2, h3, h4, h5, h6 {
-  color: #111;
-  font-family: "helvetica neue", Helvetica, arial, sans-serif;
-}
-
-
-/* Misc classes and elements */
-/* Use a .box to create a padded box inside a column.  */
-.box {
-  background: #eee;
-  margin-bottom: 1em;
-  margin-bottom: 1rem;
-  padding: 1em;
-  padding: 1rem;
-}
-
-/* Use this to create a horizontal ruler across a column. */
-hr {
-  background: #ddd;
-  border: none;
-  clear: both;
-  color: #ddd;
-  float: none;
-  height: 1px;
-  margin: 0 0 .75rem;
-  width: 100%;
-}
-
-hr.space {
-  background: #fff;
-  color: #fff;
-}
-
-/* for image replacement */
-.ir {
-  background-repeat: no-repeat;
-  direction: ltr;
-  display: block;
-  overflow: hidden;
-  text-align: left;
-  text-indent: -9999px;
-}
-
-/* Hide for both screenreaders and browsers
-css-discuss.incutio.com/wiki/Screenreader_Visibility */
-.hidden {
-  display: none;
-  visibility: hidden;
-}
-
-/* Hide only visually, but have it available for screenreaders
-www.webaim.org/techniques/css/invisiblecontent/  &  j.mp/visuallyhidden  */
-.visuallyhidden {
-  clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
-  clip: rect(1px, 1px, 1px, 1px);
-  position: absolute !important;
-}
-
-/* Hide visually and from screenreaders, but maintain layout */
-.invisible {
-  visibility: hidden;
-}
-
-/* >> The Magnificent CLEARFIX: Updated to prevent margin-collapsing on child elements << j.mp/bestclearfix */
-.clearfix:before, .clearfix:after {
-  content: "\0020";
-  display: block;
-  height: 0;
-  visibility: hidden;
-}
-
-.clearfix:after {
-  clear: both;
-}
-
-/* Fix clearfix: blueprintcss.lighthouseapp.com/projects/15318/tickets/5-extra-margin-padding-bottom-of-page */
-.clearfix {
-  zoom: 1;
-}
-
-.ie7 img {
-  -ms-interpolation-mode: bicubic;
-}
-
-@media print {
-  * { background: transparent !important; color: #444 !important; text-shadow: none !important; }
-  a, a:visited { color: #444 !important; text-decoration: underline; }
-  a:after { content: " (" attr(href) ")"; }
-  abbr:after { content: " (" attr(title) ")"; }
-  .ir a:after { content: ""; }  /* Don't show links for images */
-  pre, blockquote { border: 1px solid #999; page-break-inside: avoid; }
-  thead { display: table-header-group; } /* css-discuss.incutio.com/wiki/Printing_Tables */
-  tr, img { page-break-inside: avoid; }
-  @page { margin: 0.5cm; }
-  p, h2, h3 { orphans: 3; widows: 3; }
-  h2, h3{ page-break-after: avoid; }
-}