RubyGems - suspenders - Versions diffs - 0.2.6 → 0.2.7 - Mend

suspenders 0.2.6 → 0.2.7

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 (11) hide show

data/README.md +2 -1
data/lib/create.rb +2 -1
data/suspenders.gemspec +4 -5
data/template/files/_javascript.html.erb +1 -1
data/template/files/import_scss_styles +4 -0
data/template/files/suspenders_layout.html.erb.erb +3 -3
data/template/suspenders.rb +14 -14
data/template/trout/Gemfile +19 -10
metadata +59 -94
data/template/files/body_class_helper.rb +0 -7
data/template/trout/public/javascripts/prefilled_input.js +0 -59

data/README.md CHANGED Viewed

@@ -13,7 +13,7 @@ Then run:
     suspenders create projectname
-This will create a Rails 3 app in `projectname'. This script creates a new
+This will create a Rails 3.1 app in `projectname'. This script creates a new
 new git repository. It is not meant to be used against an existing repo.
 Suspenders uses [Trout](https://github.com/thoughtbot/trout) to make it
@@ -37,6 +37,7 @@ It includes application gems like:
 * [Formtastic](https://github.com/justinfrench/formtastic) for better forms
 * [Hoptoad Notifier](https://github.com/thoughtbot/hoptoad_notifier) for exception notification
 * [Flutie](https://github.com/thoughtbot/flutie) for default CSS styles
+* [Bourbon](https://github.com/thoughtbot/bourbon) for classy sass mixins
 * [Clearance](https://github.com/thoughtbot/clearance) for authentication
 And testing gems like:

data/lib/create.rb CHANGED Viewed

@@ -24,7 +24,8 @@ module Suspenders
         rails #{rails_version} new #{project_path} \
           --template=#{template} \
           --skip-test-unit \
-          --skip-prototype
+          --skip-prototype \
+          --database=postgresql
       COMMAND
       command_with_repo = if repo
                             "REPO='#{repo}' #{command}"

data/suspenders.gemspec CHANGED Viewed

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
   s.name    = 'suspenders'
-  s.version = '0.2.6'
-  s.date    = '2011-07-26'
+  s.version = '0.2.7'
+  s.date    = '2011-10-03'
   s.summary     = "Generate a Rails app using thoughtbot's best practices."
   s.description = <<-HERE
@@ -24,7 +24,7 @@ rush to build something amazing; don't use it if you like missing deadlines.
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md LICENSE]
-  s.add_dependency('rails', '3.0.9')
+  s.add_dependency('rails', '3.1.0')
   s.add_dependency('bundler', '>= 1.0.7')
   s.add_dependency('trout', '>= 0.3.0')
   s.add_development_dependency('cucumber', '~> 1.0.2')
@@ -44,17 +44,16 @@ rush to build something amazing; don't use it if you like missing deadlines.
     template/files/README_FOR_SUSPENDERS
     template/files/_flashes.html.erb
     template/files/_javascript.html.erb
-    template/files/body_class_helper.rb
     template/files/cucumber_assertions_hack
     template/files/errors.rb
     template/files/factory_girl_steps.rb
+    template/files/import_scss_styles
     template/files/postgresql_database.yml.erb
     template/files/suspenders_gitignore
     template/files/suspenders_layout.html.erb.erb
     template/files/time_formats.rb
     template/suspenders.rb
     template/trout/Gemfile
-    template/trout/public/javascripts/prefilled_input.js
   ]
   # = MANIFEST =

data/template/files/_javascript.html.erb CHANGED Viewed

@@ -1,4 +1,4 @@
-<%= javascript_include_tag 'jquery.min', 'jquery-ui.min', 'jquery_ujs', 'prefilled_input', 'application', :cache => true %>
+<%= javascript_include_tag :application, :cache => true %>
 <%= yield :javascript %>

data/template/files/import_scss_styles ADDED Viewed

@@ -0,0 +1,4 @@
+@import 'flutie';
+@import 'bourbon';

data/template/files/suspenders_layout.html.erb.erb CHANGED Viewed

@@ -2,9 +2,9 @@
 <html>
 <head>
   <meta charset="utf-8" />
-  <title><%= app_name %></title>
-  <%%= stylesheet_link_tag :flutie, 'screen', :media => 'all', :cache => true %>
-  <%%= csrf_meta_tag %>
+  <title><%%= page_title %></title>
+  <%%= stylesheet_link_tag :application, :media => 'all', :cache => true %>
+  <%%= csrf_meta_tags %>
 </head>
 <body class="<%%= body_class %>">
   <div id="header">

data/template/suspenders.rb CHANGED Viewed

@@ -73,22 +73,23 @@ template "suspenders_layout.html.erb.erb",
          "app/views/layouts/application.html.erb",
          :force => true
+say "Get ready for bundler... (this will take a while)"
 trout 'Gemfile'
 run "bundle install"
-say "Let's use jQuery"
-generate "jquery:install", "--ui"
 say "Pulling in some common javascripts"
-trout "public/javascripts/prefilled_input.js"
+trout "app/assets/javascripts/prefilled_input.js"
+say "Add jQuery ui to the standard application.js"
+inject_into_file "app/assets/javascripts/application.js", "//= require jquery-ui\n", :before => "//= require_tree ."
 say "Documentation"
 copy_file "README_FOR_SUSPENDERS", "doc/README_FOR_SUSPENDERS"
-say "Get ready for bundler... (this will take a while)"
 say "Let's use PostgreSQL"
 template "postgresql_database.yml.erb", "config/database.yml", :force => true
@@ -113,9 +114,6 @@ generate "cucumber:install", "--rspec --capybara"
 generate "clearance:install"
 generate "clearance:features"
-create_file "public/stylesheets/sass/screen.scss"
-create_file "public/stylesheets/screen.css"
 copy_file "factory_girl_steps.rb", "features/step_definitions/factory_girl_steps.rb"
 replace_in_file "spec/spec_helper.rb", "mock_with :rspec", "mock_with :mocha"
@@ -125,7 +123,12 @@ inject_into_file "features/support/env.rb",
                  %{Capybara.javascript_driver = :webkit\n},
                  :before => %{Capybara.default_selector = :css}
-rake "flutie:install"
+say "Set up stylesheets"
+copy_file "app/assets/stylesheets/application.css", "app/assets/stylesheets/application.css.scss"
+remove_file "app/assets/stylesheets/application.css"
+concat_file "import_scss_styles", "app/assets/stylesheets/application.css.scss"
+create_file "app/assets/stylesheets/_screen.scss"
 say "Ignore the right files"
@@ -153,13 +156,10 @@ say "Copying miscellaneous support files"
 copy_file "errors.rb", "config/initializers/errors.rb"
 copy_file "time_formats.rb", "config/initializers/time_formats.rb"
-copy_file "body_class_helper.rb", "app/helpers/body_class_helper.rb"
 say "Setting up a root route"
 route "root :to => 'Clearance::Sessions#new'"
 say "Congratulations! You just pulled our suspenders."
-say "Remember to run 'rails generate hoptoad' with your API key."
+say "Remember to run 'rails generate airbrake' with your API key."

data/template/trout/Gemfile CHANGED Viewed

@@ -1,19 +1,28 @@
 source :rubygems
-gem "rails", "3.0.9"
-gem "rack"
-gem "clearance", "~> 0.11.1"
+gem "rails", "3.1.0"
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem "sass-rails", "  ~> 3.1.0"
+  gem "coffee-rails", "~> 3.1.0"
+  gem "uglifier", ">= 1.0.3"
+end
+gem "pg"
+gem "jquery-rails"
 gem "sass"
-gem "high_voltage"
-gem "hoptoad_notifier", "~> 2.4.11"
 gem "RedCloth", :require => "redcloth"
+gem "clearance", "~> 0.11.1"
+gem "high_voltage"
 gem "paperclip"
-gem "validation_reflection"
 gem "formtastic"
-gem "pg"
-gem "flutie", "~> 1.1.8"
+gem "flutie"
+gem "bourbon"
+gem "airbrake"
 gem "dynamic_form"
-gem "jquery-rails"
 gem "rake", "0.9.2"
 # RSpec needs to be in :development group to expose generators
@@ -24,7 +33,7 @@ group :development, :test do
 end
 group :test do
-  gem "cucumber-rails", "0.4.1"
+  gem "cucumber-rails", "1.0.2"
   gem "factory_girl_rails"
   gem "bourne"
   gem "database_cleaner"

metadata CHANGED Viewed

@@ -1,101 +1,76 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
 name: suspenders
-version: !ruby/object:Gem::Version
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.2.7
   prerelease:
-  segments:
-  - 0
-  - 2
-  - 6
-  version: 0.2.6
 platform: ruby
-authors:
+authors:
 - thoughtbot
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-07-26 00:00:00 -04:00
-default_executable: suspenders
-dependencies:
-- !ruby/object:Gem::Dependency
+date: 2011-10-03 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement
+  requirement: &2156880180 !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - "="
-      - !ruby/object:Gem::Version
-        hash: 21
-        segments:
-        - 3
-        - 0
-        - 9
-        version: 3.0.9
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 3.1.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement
+  version_requirements: *2156880180
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2156879720 !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        hash: 25
-        segments:
-        - 1
-        - 0
-        - 7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.7
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency
-  name: trout
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement
+  version_requirements: *2156879720
+- !ruby/object:Gem::Dependency
+  name: trout
+  requirement: &2156879080 !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        hash: 19
-        segments:
-        - 0
-        - 3
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency
-  name: cucumber
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement
+  version_requirements: *2156879080
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &2156878400 !ruby/object:Gem::Requirement
     none: false
-    requirements:
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        hash: 19
-        segments:
-        - 1
-        - 0
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.0.2
   type: :development
-  version_requirements: *id004
-description: |
-  Suspenders is a base Rails project that you can upgrade. It is used by
-  thoughtbot to get a jump start on a working app. Use Suspenders if you're in a
-  rush to build something amazing; don't use it if you like missing deadlines.
+  prerelease: false
+  version_requirements: *2156878400
+description: ! 'Suspenders is a base Rails project that you can upgrade. It is used
+  by
+  thoughtbot to get a jump start on a working app. Use Suspenders if you''re in a
+  rush to build something amazing; don''t use it if you like missing deadlines.
+'
 email: support@thoughtbot.com
-executables:
+executables:
 - suspenders
 extensions: []
-extra_rdoc_files:
+extra_rdoc_files:
 - README.md
 - LICENSE
-files:
+files:
 - CONTRIBUTING.md
 - LICENSE
 - README.md
@@ -109,51 +84,41 @@ files:
 - template/files/README_FOR_SUSPENDERS
 - template/files/_flashes.html.erb
 - template/files/_javascript.html.erb
-- template/files/body_class_helper.rb
 - template/files/cucumber_assertions_hack
 - template/files/errors.rb
 - template/files/factory_girl_steps.rb
+- template/files/import_scss_styles
 - template/files/postgresql_database.yml.erb
 - template/files/suspenders_gitignore
 - template/files/suspenders_layout.html.erb.erb
 - template/files/time_formats.rb
 - template/suspenders.rb
 - template/trout/Gemfile
-- template/trout/public/javascripts/prefilled_input.js
-has_rdoc: true
 homepage: http://github.com/thoughtbot/suspenders
 licenses: []
 post_install_message:
-rdoc_options:
+rdoc_options:
 - --charset=UTF-8
-require_paths:
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      hash: 3
-      segments:
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      hash: 3
-      segments:
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key:
 specification_version: 2
 summary: Generate a Rails app using thoughtbot's best practices.
-test_files:
+test_files:
 - features/rake_clean.feature
 - features/step_definitions/shell.rb

data/template/files/body_class_helper.rb DELETED Viewed

@@ -1,7 +0,0 @@
-module BodyClassHelper
-  # TODO: move this into a gem/plugin
-  def body_class
-    qualified_controller_name = controller.controller_path.gsub('/','-')
-    "#{qualified_controller_name} #{qualified_controller_name}-#{controller.action_name}"
-  end
-end

data/template/trout/public/javascripts/prefilled_input.js DELETED Viewed

@@ -1,59 +0,0 @@
-// clear inputs with starter values
-new function($) {
-  $.fn.prefilledInput = function() {
-    var focus = function () {
-      $(this).removeClass('prefilled');
-      if (this.value == this.prefilledValue) {
-        this.value = '';
-      }
-    };
-    var blur = function () {
-      if (this.value == '') {
-        $(this).addClass('prefilled').val(this.prefilledValue);
-      } else if (this.value != this.prefilledValue) {
-        $(this).removeClass('prefilled');
-      }
-    };
-    var extractPrefilledValue = function () {
-      if (this.title) {
-        this.prefilledValue = this.title;
-        this.title = '';
-      } else if (this.id) {
-        this.prefilledValue = $('label[for=' + this.id + ']').hide().text();
-      }
-      if (this.prefilledValue) {
-        this.prefilledValue = this.prefilledValue.replace(/\*$/, '');
-      }
-    };
-    var initialize = function (index) {
-      if (!this.prefilledValue) {
-        this.extractPrefilledValue = extractPrefilledValue;
-        this.extractPrefilledValue();
-        $(this).trigger('blur');
-      }
-    };
-    return this.filter(":input").
-      focus(focus).
-      blur(blur).
-      each(initialize);
-  };
-  var clearPrefilledInputs = function () {
-    var form = this.form || this;
-    $(form).find("input.prefilled, textarea.prefilled").val("");
-  };
-  var prefilledSetup = function () {
-    $('input.prefilled, textarea.prefilled').prefilledInput();
-    $('form').submit(clearPrefilledInputs);
-    $('input:submit, button:submit').click(clearPrefilledInputs);
-  };
-  $(document).ready(prefilledSetup);
-  $(document).ajaxComplete(prefilledSetup);
-}(jQuery);