bootstrap-generators 1.0.0 → 1.0.1

data/README.md

@@ -28,3 +28,13 @@ Once you've done that, any time you generate a controller or scaffold, you'll ge
 
   `rails generate bootstrap:install --form_builder=simple_form`
 
+## Layouts
+
+There are three layouts available, based on the quick-start examples:
+
+* hero (default; based on [this template](http://twitter.github.com/bootstrap/examples/hero.html))
+* fluid (based on [this template](http://twitter.github.com/bootstrap/examples/fluid.html))
+* container-app (based on [this template](http://twitter.github.com/bootstrap/examples/container-app.html))
+
+To select one of these layouts just pass the option '--layout=LAYOUT' to the install generator.
+

data/lib/bootstrap/generators/version.rb

@@ -1,5 +1,5 @@
 module Bootstrap
   module Generators
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/lib/generators/bootstrap/install/install_generator.rb

@@ -9,6 +9,7 @@ module Bootstrap
       class_option :form_builder, :desc => "Select your form builder (form_builder or simple_form)", :default => "simple_form", :type => :string
 
       class_option :template_engine
+      class_option :stylesheet_engine
 
       def copy_lib
         directory "lib/templates/#{options[:template_engine]}"
@@ -36,8 +37,17 @@ module Bootstrap
 
       def create_layout
         template "layouts/#{options[:layout]}.html.#{options[:template_engine]}", "app/views/layouts/application.html.#{options[:template_engine]}"
-        copy_file "layouts/#{options[:layout]}.css.scss", "app/assets/stylesheets/bootstrap-generators.css.scss"
-        copy_file "bootstrap-generators.js", "app/assets/javascripts/bootstrap-generators.js"
+      end
+
+      def create_assets
+        if options[:stylesheet_engine].intern == :css
+          stylesheet_extension = 'css'
+        else
+          stylesheet_extension = "css.#{options[:stylesheet_engine]}"
+        end
+
+        copy_file "assets/stylesheets/#{options[:layout]}.#{stylesheet_extension}", "app/assets/stylesheets/bootstrap-generators.#{stylesheet_extension}"
+        copy_file "assets/javascripts/bootstrap-generators.js", "app/assets/javascripts/bootstrap-generators.js"
       end
     end
   end

data/lib/generators/bootstrap/install/templates/assets/stylesheets/container-app.css

@@ -0,0 +1,54 @@
+/*
+ *= require bootstrap
+*/
+
+.page-header a.btn {
+  float: right;
+}
+
+.page-header a.btn + a.btn {
+  margin-right: 8px;
+}
+
+.form-stacked div.alert-message {
+  margin-left: -10px;
+}
+
+/* Override some defaults */
+html, body {
+  background-color: #eee;
+}
+body {
+  padding-top: 40px; /* 40px to make the container go all the way to the bottom of the topbar */
+}
+.container > footer p {
+  text-align: center; /* center align it with the container */
+}
+.container {
+  width: 820px; /* downsize our container to make the content feel a bit tighter and more cohesive. NOTE: this removes two full columns from the grid, meaning you only go to 14 columns and not 16. */
+}
+
+/* The white background content wrapper */
+.content {
+  background-color: #fff;
+  padding: 20px;
+  margin: 0 -20px; /* negative indent the amount of the padding to maintain the grid system */
+  -webkit-border-radius: 0 0 6px 6px;
+     -moz-border-radius: 0 0 6px 6px;
+          border-radius: 0 0 6px 6px;
+  -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.15);
+     -moz-box-shadow: 0 1px 2px rgba(0,0,0,.15);
+          box-shadow: 0 1px 2px rgba(0,0,0,.15);
+}
+
+/* Page header tweaks */
+.content > .page-header {
+  background-color: #f5f5f5;
+  padding: 20px 20px 10px;
+  margin: -20px -20px 20px;
+}
+
+.topbar .btn {
+  border: 0;
+}
+

data/lib/generators/bootstrap/install/templates/assets/stylesheets/fluid.css

@@ -0,0 +1,20 @@
+/*
+ *= require bootstrap
+*/
+
+body {
+  padding-top: 60px;
+}
+
+.page-header a.btn {
+  float: right;
+}
+
+.page-header a.btn + a.btn {
+  margin-right: 8px;
+}
+
+.form-stacked div.alert-message {
+  margin-left: -10px;
+}
+

data/lib/generators/bootstrap/install/templates/{layouts → assets/stylesheets}/fluid.css.scss

@@ -19,3 +19,4 @@ body {
 .form-stacked div.alert-message {
   margin-left: -10px;
 }
+

data/lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css

@@ -0,0 +1,20 @@
+/*
+ *= require bootstrap
+*/
+
+body {
+  padding-top: 60px;
+}
+
+.page-header a.btn {
+  float: right;
+}
+
+.page-header a.btn + a.btn {
+  margin-right: 8px;
+}
+
+.form-stacked div.alert-message {
+  margin-left: -10px;
+}
+

data/lib/generators/bootstrap/install/templates/{layouts → assets/stylesheets}/hero.css.scss

@@ -19,3 +19,4 @@ body {
 .form-stacked div.alert-message {
   margin-left: -10px;
 }
+

data/test/lib/generators/bootstrap/install_generator_test.rb

@@ -40,13 +40,24 @@ class Bootstrap::Generators::InstallGeneratorTest < ::Rails::Generators::TestCas
     }
   end
 
-  test "should copy css and javascript files" do
+  test "should copy javascript files" do
     run_generator
 
-    assert_file "app/assets/stylesheets/bootstrap-generators.css.scss"
     assert_file "app/assets/javascripts/bootstrap-generators.js"
   end
 
+  test "should copy css files" do
+    run_generator %w(--stylesheet-engine css)
+
+    assert_file "app/assets/stylesheets/bootstrap-generators.css"
+  end
+
+  test "should copy scss files" do
+    run_generator %w(--stylesheet-engine scss)
+
+    assert_file "app/assets/stylesheets/bootstrap-generators.css.scss"
+  end
+
   test "should create erb layout" do
     run_generator
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-generators
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-27 00:00:00.000000000Z
+date: 2011-10-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157041520 !ruby/object:Gem::Requirement
+  requirement: &2152487860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2157041520
+  version_requirements: *2152487860
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &2157040700 !ruby/object:Gem::Requirement
+  requirement: &2152487300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157040700
+  version_requirements: *2152487300
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2157036900 !ruby/object:Gem::Requirement
+  requirement: &2152486480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *2157036900
+  version_requirements: *2152486480
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &2157025620 !ruby/object:Gem::Requirement
+  requirement: &2152485720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157025620
+  version_requirements: *2152485720
 description: Bootstrap-generators provides Twitter Bootstrap generators for Rails
   3. Bootstrap is a toolkit from Twitter designed to kickstart development of webapps
   and sites. Checkout http://twitter.github.com/bootstrap.
@@ -83,19 +83,22 @@ files:
 - lib/generators/bootstrap/install/templates/app/inputs/password_input.rb
 - lib/generators/bootstrap/install/templates/app/inputs/string_input.rb
 - lib/generators/bootstrap/install/templates/app/inputs/text_input.rb
-- lib/generators/bootstrap/install/templates/bootstrap-generators.js
+- lib/generators/bootstrap/install/templates/assets/javascripts/bootstrap-generators.js
+- lib/generators/bootstrap/install/templates/assets/stylesheets/container-app.css
+- lib/generators/bootstrap/install/templates/assets/stylesheets/container-app.css.scss
+- lib/generators/bootstrap/install/templates/assets/stylesheets/fluid.css
+- lib/generators/bootstrap/install/templates/assets/stylesheets/fluid.css.scss
+- lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css
+- lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css.scss
 - lib/generators/bootstrap/install/templates/config/initializers/simple_form.rb
 - lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.erb
 - lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.haml
 - lib/generators/bootstrap/install/templates/form_builders/simple_form/_form.html.erb
 - lib/generators/bootstrap/install/templates/form_builders/simple_form/_form.html.haml
-- lib/generators/bootstrap/install/templates/layouts/container-app.css.scss
 - lib/generators/bootstrap/install/templates/layouts/container-app.html.erb
 - lib/generators/bootstrap/install/templates/layouts/container-app.html.haml
-- lib/generators/bootstrap/install/templates/layouts/fluid.css.scss
 - lib/generators/bootstrap/install/templates/layouts/fluid.html.erb
 - lib/generators/bootstrap/install/templates/layouts/fluid.html.haml
-- lib/generators/bootstrap/install/templates/layouts/hero.css.scss
 - lib/generators/bootstrap/install/templates/layouts/hero.html.erb
 - lib/generators/bootstrap/install/templates/layouts/hero.html.haml
 - lib/generators/bootstrap/install/templates/lib/templates/erb/controller/view.html.erb