da-suspenders 1.2.5 → 1.3.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.3.0 (2012-04-01)
+ * Use twitter bootstrap instead of jQuery UI.
+ * Update compass-rails to ~> 1.0. 
+ * Add Pry (development and testing environment only).
+ * Disable jQuery effects in test environment.
+ * Make --with-mongoid work correctly again.
+ 
 ## 1.2.5 (2012-03-23)
  * Lock version of factory\_girl\_rails to <= 2, as newer versions require Ruby 1.9.
  

data/README.md

@@ -39,6 +39,7 @@ To see the latest and greatest gems, look at DA-Suspenders'
 
 It includes application gems like:
 
+* [bootstrap-rails](https://github.com/anjlab/bootstrap-rails), bringing [Twitter Bootstrap](http://twitter.github.com/bootstrap/) to the Rails asset pipeline.
 * [Compass](https://github.com/chriseppstein/compass), a [Sass-based](http://sass-lang.com/) CSS Meta-Framework
 * [will_paginate](https://github.com/mislav/will_paginate/wiki/) for easy pagination
 * [Paperclip](https://github.com/thoughtbot/paperclip) or [CarrierWave](https://github.com/jnicklas/carrierwave) for file uploads
@@ -46,7 +47,6 @@ It includes application gems like:
 * [Devise](https://github.com/plataformatec/devise) and [CanCan](https://github.com/ryanb/cancan) for authentication and authorization
 * [AppConfig](https://github.com/die-antwort/app_config) for simple application configuration
 * [Airbrake](https://github.com/thoughtbot/airbrake) for exception notification
-* [jquery-rails-aristo](https://github.com/die-antwort/jquery-rails-aristo), a beautiful theme for jQuery UI
 * [da-js](https://github.com/die-antwort/da-js), our collection of small, useful JavaScripts
 
 And testing gems like:
@@ -55,6 +55,7 @@ And testing gems like:
 * [RSpec](https://github.com/rspec/rspec) for awesome, readable isolation testing
 * [Factory Girl](https://github.com/thoughtbot/factory_girl) for easier creation of test data
 * [Timecop](https://github.com/jtrupiano/timecop) for dealing with time
+* [Pry](http://pry.github.com/), a powerful alternative to IRB (try `binding.pry` inside a test method)
 
 Some gems are commented out by default in the Gemfile – just uncomment the ones you want to use.
 

data/features/running_cucumber.feature

@@ -20,14 +20,14 @@ Feature: Running cucumber in the generated project
         Scenario: Stylesheets are generated correctly
           Given there are no cached assets
           When I visit the application stylesheet
-          Then it should contain the css reset rules from compass
+          Then it should contain bootstrap
       """
     And I create a file named "features/step_definitions/test_steps.rb" with:
       """
       When /^I visit the users page/ do
         visit "/users"
       end
-      
+
       Given /^there are no cached assets$/ do
         FileUtils.rm_rf ["#{Rails.root}/tmp/cache/assets", "#{Rails.root}/tmp/cache/sass"]
       end
@@ -36,8 +36,8 @@ Feature: Running cucumber in the generated project
         visit "/assets/application.css"
       end
 
-      Then /^it should contain the css reset rules from compass$/ do
-        page.should have_content "compass/reset"
+      Then /^it should contain bootstrap$/ do
+        page.should have_content "Bootstrap v2"
       end
       """
     When I run the rake task "cucumber"

data/lib/da-suspenders/version.rb

@@ -1,3 +1,3 @@
 module DaSuspenders
-  VERSION = "1.2.5"
+  VERSION = "1.3.0"
 end

data/template/da-suspenders.rb

@@ -34,8 +34,8 @@ def create_gemfile_and_install_gems
     inject_into_file "Gemfile",
                      %Q{gem "mongoid", "~> 2.4"\n} +
                      %Q{gem "bson_ext", "~> 1.5"},
-                     :after => 'gem "mysql"'
-    gsub_file "Gemfile", 'gem "mysql"', ""
+                     :after => 'gem "mysql2"'
+    gsub_file "Gemfile", 'gem "mysql2"', ""
   end
   run "bundle install"
 end
@@ -108,6 +108,7 @@ def install_misc_support_files
   trout "config/initializers/localize_with_fallback.rb"
   trout "config/initializers/silence_asset_logging.rb"
   trout "app/helpers/body_class_helper.rb"
+  trout "app/helpers/bootstrap_helper.rb"
 end
 
 def install_app_config
@@ -123,7 +124,7 @@ end
 
 def install_simple_form
   say "Installing simple_form", :yellow
-  generate "simple_form:install"
+  generate "simple_form:install --with-bootstrap"
 end
 
 def install_javascripts
@@ -141,6 +142,9 @@ def install_rspec_and_cucumber
                    %{Capybara.save_and_open_page_path = "tmp"\n} +
                    %{Capybara.javascript_driver = :webkit\n},
                    :before => %{Capybara.default_selector = :css}
+  if ENV["WITH_MONGOID"]
+    gsub_file "features/support/env.rb", "DatabaseCleaner.strategy = :transaction", "DatabaseCleaner.strategy = :truncation"
+  end
   copy_file "factory_girl_steps.rb", "features/step_definitions/factory_girl_steps.rb"
   trout "features/step_definitions/js_steps.rb"
 end

data/template/trout/Gemfile

@@ -11,7 +11,7 @@ group :assets do
   gem 'sass-rails',   '~> 3.2.3'
   gem 'coffee-rails', '~> 3.2.1'
   gem 'uglifier', '>= 1.0.3'
-  gem 'compass-rails', '~> 1.0.0.rc.2'
+  gem 'compass-rails', '~> 1.0'
 end
 
 gem "trout", :git => "git://github.com/die-antwort/trout.git"
@@ -19,7 +19,7 @@ gem "app_config", :git => "git://github.com/die-antwort/app_config.git"
 gem "simple_form"
 gem "airbrake"
 gem "will_paginate", "~> 3.0"
-gem "jquery-rails-aristo"
+gem 'anjlab-bootstrap-rails', '~> 2.0', :require => 'bootstrap-rails'
 gem "da-js"
 
 # Optional gems (from Rails 3.2 default Gemfile):
@@ -59,6 +59,7 @@ gem "da-js"
 # and rake tasks without having to type RAILS_ENV=test.
 group :development, :test do
   gem "rspec-rails", "~> 2.6.0"
+  gem "pry"
 end
 
 group :test do

data/template/trout/app/assets/javascripts/application.js.coffee

@@ -2,9 +2,19 @@
 #= require jquery
 #= require jquery_ujs
 
-# Activate if you want to use jquery-ui 
-#  require jquery-ui
-#  require jquery-ui-i18n
+# Activate whatever bootstrap-components you need
+#= require bootstrap-transition
+#= require bootstrap-alert
+# require bootstrap-modal
+# require bootstrap-dropdown
+# require bootstrap-scrollspy
+# require bootstrap-tab
+# require bootstrap-tooltip
+# require bootstrap-popover
+# require bootstrap-button
+# require bootstrap-collapse
+# require bootstrap-carousel
+# require bootstrap-typeahead
 
 #= require da-js
 #= require_tree .

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

@@ -1,10 +1,8 @@
-// Remove if not using jQuery UI:
-//= require jqueryui-aristo/aristo
+//= require bootstrap
 //
 //= require_self
 //= require_tree .
 
-@import 'compass/reset';
 @import 'compass/utilities';
 @import 'compass/css3';
 

data/template/trout/app/helpers/bootstrap_helper.rb

@@ -0,0 +1,9 @@
+module BootstrapHelper
+  def alert_class_for_flash_key(key)
+    case key
+    when :notice then "alert-info"
+    when :alert then "alert-error"
+    when :success then "alert-success"
+    end
+  end
+end

data/template/trout/app/views/layouts/application.html.erb

@@ -4,12 +4,14 @@
   <title>Testapp</title>
   <%= stylesheet_link_tag "application", :media => "all" %>
   <%= javascript_include_tag "application" %>
-  <%= javascript_tag "$.ajaxSetup({ async: false });" if Rails.env.test? %>
+  <%= javascript_tag "$.ajaxSetup({ async: false }); $.fx.off = true;" if Rails.env.test? %>
   <%= csrf_meta_tags %>
 </head>
 <body class="<%= body_class %>">
-  <%= render :partial => "shared/flashes" %>
-  <%= yield %>
+  <div class="container">
+    <%= render :partial => "shared/flashes" %>
+    <%= yield %>
+  </div>
 </body>
 </html>
 <!-- Created with care by DIE ANTWORT · Büro für Informationstechnik GmbH -->

data/template/trout/app/views/shared/_flashes.html.erb

@@ -1,5 +1,8 @@
 <div id="flash">
   <% flash.each do |key, value| -%>
-    <div id="flash_<%= key %>"><%= value %></div>
+    <div class="alert <%= alert_class_for_flash_key key %>">
+       <a class="close" data-dismiss="alert">×</a>
+       <%= value %>
+    </div>
   <% end -%>
 </div>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: da-suspenders
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 5
-  version: 1.2.5
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - thoughtbot
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-23 00:00:00 Z
+date: 2012-03-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -140,6 +140,7 @@ files:
 - template/trout/app/assets/javascripts/application.js.coffee
 - template/trout/app/assets/stylesheets/application.css.scss
 - template/trout/app/helpers/body_class_helper.rb
+- template/trout/app/helpers/bootstrap_helper.rb
 - template/trout/app/views/layouts/application.html.erb
 - template/trout/app/views/shared/_flashes.html.erb
 - template/trout/config/initializers/errors.rb