bootstrapped 1.0.0 → 1.0.1

data/README.rdoc

@@ -2,7 +2,7 @@
 
 Bootstrapped is a gem that helps you quickly integrate Twitter's Bootstrap in to your project to enable you to build user interfaces rapidly. 
 
-Bootstrapped also contains generators based off of Ryan Bates's nifty-generators https://github.com/ryanb/nifty-generators/ to help you rapidly scaffold. Unlike generators nifty-generators, Bootstrapped generators do not support HAML.
+Bootstrapped also contains generators based off of Ryan Bates's nifty-generators https://github.com/ryanb/nifty-generators/ to help you rapidly scaffold. Unlike generators nifty-generators.
 
 == Setup
 
@@ -32,12 +32,14 @@ Bootstrapped contains layout and scaffold generators that have been modified to
 
 * bootstrapped:layout: generates generic layout, stylesheet, and helper files.
 * bootstrapped:scaffold: generates a controller and optional model/migration.
+* Note suppliying the --haml option to either generator will generate haml templates instead of the dafault erb
 
 === The Layout Generator
 
 The layout generator allows you to quickly generate a fixed Twitter Bootstrap layout by running the following command:
 
   rails g bootstrapped:layout
+  OR rails g bootstrapped:layout --haml
   
 You can change the name of the layout by specifying the layout name. For example, the following command will generate a layout called photos
 
@@ -68,6 +70,13 @@ If you are having a problem with Bootstrapped, first look at the FAQs above. If
 
 http://github.com/entropillc/bootstrapped/issues
 
+== Change Log
+
+=== Version 1.0.1
+  
+  * Added HAML support in scaffolding
+  * Fixed assets:precompile issue preventing LESS to be compiled for production deployment.
+
 == License
 
 Copyright 2011 Entropi Software, LLC.

data/bootstrapped.gemspec

@@ -4,7 +4,7 @@ require "bootstrapped/version"
 
 Gem::Specification.new do |s|
   s.name        = "bootstrapped"
-  s.version     ='1.0.0'
+  s.version     ='1.0.1'
   s.authors     = ["Nicholas Watson"]
   s.email       = ["nwwatson@gmail.com"]
   s.homepage    = "http://github.com/entropillc/bootstrapped"
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency             'railties',   '>= 3.1'
   s.add_dependency             'actionpack', '>= 3.1'
-  s.add_dependency             'less-rails' unless RUBY_PLATFORM == 'java'  
+  s.add_dependency             'less-rails', '~> 2.1.6' unless RUBY_PLATFORM == 'java'  
   s.add_development_dependency 'rails', '>= 3.1'
   s.add_development_dependency 'rspec-rails', '~> 2.6.1'
   s.add_development_dependency 'mocha', '~> 0.9.12'

data/lib/bootstrapped.rb

@@ -1,8 +1,6 @@
 unless RUBY_PLATFORM.eql?('java')
-  require 'less'
   require 'less-rails'
 end
 
 require 'bootstrapped/version'
 require 'bootstrapped/engine'
-

data/lib/bootstrapped/engine.rb

@@ -2,11 +2,12 @@ require 'rails'
 
 module Bootstrapped
   class Engine < ::Rails::Engine
-    unless RUBY_PLATFORM.eql?('java')
-      initializer 'bootstrapped.setup', 
+    # If using JRUBY, don't load less configuration
+    unless RUBY_PLATFORM.eql?('java')    
+      initializer 'twitter-bootstrap-rails.setup', 
         :after => 'less-rails.after.load_config_initializers', 
         :group => :all do |app|
-          app.config.less.paths << File.join(config.root, 'vendor', 'less')
+          app.config.less.paths << File.join(config.root, 'vendor', 'less',)
       end
     end
   end

data/lib/bootstrapped/version.rb

@@ -1,3 +1,3 @@
 module Bootstrapped
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/generators/bootstrapped/layout/layout_generator.rb

@@ -7,6 +7,7 @@ module Bootstrapped
       argument :layout_name, :type => :string, :default => "application"
       argument :layout_type, :type => :string, :default => "fixed",
                :banner => "*fixed or fluid"
+      class_option :haml, :desc => 'Generate HAML for view, and SASS for stylesheet.', :type => :boolean
 
       attr_reader :app_name, :container_class
 
@@ -14,7 +15,11 @@ module Bootstrapped
         app = ::Rails.application
         @app_name = app.class.to_s.split("::").first
         @container_class = layout_type == "fluid" ? "container-fluid" : "container"
-        template "layout.html.erb", "app/views/layouts/#{layout_name}.html.erb"
+        if options.haml?
+          template "layout.html.haml", "app/views/layouts/#{layout_name}.html.haml"
+        else
+          template "layout.html.erb", "app/views/layouts/#{layout_name}.html.erb"
+        end
       end
 
       def copy_additional_files

data/lib/generators/bootstrapped/layout/templates/_flash.html.haml

@@ -0,0 +1,3 @@
+%div{:class => [".alert-message", css] }
+  %a.close(href = "#") x
+  %s#error= message

data/lib/generators/bootstrapped/layout/templates/layout.html.haml

@@ -0,0 +1,80 @@
+!!!
+%html(lang="en")
+  %head
+    %meta(charset="utf-8")
+    %title= content_for?(:title) ? yield(:title) : "<%= app_name %>"
+    %meta(name="viewport" content="width=device-width, initial-scale=1.0")
+    %meta(name="description" content="")
+    %meta(name="author" content="")
+    = csrf_meta_tags
+    = yield(:head)
+    = stylesheet_link_tag "application", :media => "all"
+
+    :css
+      body {
+        padding-top: 60px;
+        padding-bottom: 40px;
+      }
+      .sidebar-nav {
+        padding: 9px 0;
+      }
+
+    /[if lt IE 9]
+      %script(src="http://html5shiv.googlecode.com/svn/trunk/html5.js")
+
+    %link(rel="shortcut icon" href="images/favicon.ico")
+    %link(rel="apple-touch-icon" href="images/apple-touch-icon.png")
+    %link(rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png")
+    %link(rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png")
+
+  %body
+    .navbar.navbar-fixed-top
+      .navbar-inner
+        <%- if layout_type == "fluid" -%>
+        .container-fluid
+        <%- else -%>
+        .container
+        <%- end -%>
+          %a.btn.btn-navbar{ :data => { :toggle => "collapse", :target => ".nav-collapse" }}
+            %span.icon-bar
+            %span.icon-bar
+            %span.icon-bar
+          %a.brand(href="#") <%= app_name %>
+          .nav-collapse
+            %ul.nav
+              %li.active= link_to "Home", "#"
+              %li= link_to "About", "#about"
+              %li= link_to "Contact", "#contact"
+            %p.navbar-text.pull-right
+              Logged in as
+              = link_to "username", "#"
+
+  <%- if layout_type == "fluid" -%>
+    .container-fluid
+  <%- else -%>
+    .container
+  <%- end -%>
+    <%- if layout_type == "fluid" -%>
+      .row-fluid
+    <%- else -%>
+      .row
+    <%- end -%>
+        .span3
+          .well.sidebar-nav
+            %ul.nav.nav-list
+              %li.nav-header Sidebar
+              %li= link_to "Link", "#"
+              %li= link_to "Link", "#"
+              %li= link_to "Link", "#"
+        .span9
+          = content_tag :h1, yield(:title) if show_title
+          = yield
+
+      %hr
+
+      %footer
+        %p
+          = app_name
+          Copyright &copy;  <%= Time.now.year %>. All Rights Reserved.
+
+    = javascript_include_tag "application"

data/lib/generators/bootstrapped/scaffold/scaffold_generator.rb

@@ -17,6 +17,7 @@ module Bootstrapped
       class_option :skip_controller, :desc => 'Don\'t generate controller, helper, or views.', :type => :boolean
       class_option :invert, :desc => 'Generate all controller actions except these mentioned.', :type => :boolean
       class_option :namespace_model, :desc => 'If the resource is namespaced, include the model in the namespace.', :type => :boolean
+      class_option :haml, :desc => 'Generate HAML views instead of ERB.', :type => :boolean
 
       class_option :testunit, :desc => 'Use test/unit for test files.', :group => 'Test framework', :type => :boolean
       class_option :rspec, :desc => 'Use RSpec for test files.', :group => 'Test framework', :type => :boolean
@@ -179,8 +180,12 @@ module Bootstrapped
       end
 
       def render_form
-        if form_partial?         
+        if form_partial?
+          if options.haml?
+            "= render \"form\""
+          else
             "<%= render \"form\" %>"
+          end
         else
           read_template("views/#{view_language}/_form.html.#{view_language}")
         end
@@ -262,7 +267,7 @@ module Bootstrapped
       end
 
       def view_language
-        'erb'
+        options.haml? ? 'haml' : 'erb'
       end
 
       def test_framework

data/lib/generators/bootstrapped/scaffold/templates/views/haml/_form.html.haml

@@ -0,0 +1,14 @@
+= form_for <%= item_path :instance_variable => true %>, :html => { :class => 'form-horizontal' } do |f|
+  %fieldset
+    %legend
+      = form_action_title
+      <%= singular_name.titleize %>
+    <%- model_attributes.each do |attribute| -%>
+    .control-group
+      = f.label :<%= attribute.name %>, :class => 'control-label'
+      .controls
+        = f.<%= attribute.field_type %> :<%= attribute.name %>, :class => '<%= attribute.field_type %>'
+    <%- end -%>
+    .form-actions
+      = f.submit nil, :class => 'btn btn-primary'
+      = link_to 'Cancel', <%= items_path %>, :class => 'btn'

data/lib/generators/bootstrapped/scaffold/templates/views/haml/edit.html.haml

@@ -0,0 +1 @@
+= render :partial => 'form', :locals => { :form_action_title => 'Edit' }

data/lib/generators/bootstrapped/scaffold/templates/views/haml/index.html.haml

@@ -0,0 +1,25 @@
+- title "<%= plural_name.titleize %>"
+
+.well
+  %table.table.table-striped
+    %thead
+      %tr
+      <%- model_attributes.each do |attribute| -%>
+        %th <%= attribute.human_name.titleize %>
+      <%- end -%>
+        %th
+    %tbody
+      - @<%= instances_name %>.each do |<%= instance_name %>|
+        %tr
+        <%- model_attributes.each do |attribute| -%>
+          %td= <%= instance_name %>.<%= attribute.name %>
+        <%- end -%>
+
+          %td
+            = link_to "Show", <%= item_path %>, :class => 'btn btn-mini btn-primary'
+            = link_to "Edit", <%= item_path :action => :edit %>, :class => 'btn btn-mini'
+            = link_to "Destroy", <%= item_path %>, :confirm => 'Are you sure?', :method => :delete, :class => 'btn btn-mini btn-danger'
+
+<%- if action? :new -%>
+%p= link_to "New <%= singular_name.titleize %>", <%= item_path :action => :new %>, :class => 'btn primary'
+<%- end -%>

data/lib/generators/bootstrapped/scaffold/templates/views/haml/new.html.haml

@@ -0,0 +1 @@
+= render :partial => 'form', :locals => { :form_action_title => 'New' }

data/lib/generators/bootstrapped/scaffold/templates/views/haml/show.html.haml

@@ -0,0 +1,18 @@
+- title "<%= singular_name.titleize %> Details"
+
+.well
+  <%- model_attributes.each do |attribute| -%>
+  %p
+    %strong <%= attribute.human_name.titleize %>:
+    = @<%= instance_name %>.<%= attribute.name %>
+  <% end -%>
+%p
+<%- if action? :edit -%>
+  = link_to "Edit", <%= item_path :action => :edit, :instance_variable => true %>, :class => 'btn'
+<%- end -%>
+<%- if action? :destroy -%>
+  = link_to "Destroy", <%= item_path :instance_variable => true %>, :confirm => 'Are you sure?', :method => :delete, :class => 'btn btn-danger'
+<%- end -%>
+<%- if action? :index -%>
+  = link_to "View All", <%= items_path %>, :class => 'btn'
+<%- end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrapped
 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: 2012-03-01 00:00:00.000000000 Z
+date: 2012-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70330102311200 !ruby/object:Gem::Requirement
+  requirement: &70328630842640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70330102311200
+  version_requirements: *70328630842640
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70330102310720 !ruby/object:Gem::Requirement
+  requirement: &70328630842160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70330102310720
+  version_requirements: *70328630842160
 - !ruby/object:Gem::Dependency
   name: less-rails
-  requirement: &70330102310320 !ruby/object:Gem::Requirement
+  requirement: &70328630841680 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70330102310320
+  version_requirements: *70328630841680
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70330102309780 !ruby/object:Gem::Requirement
+  requirement: &70328630841220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70330102309780
+  version_requirements: *70328630841220
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70330102309280 !ruby/object:Gem::Requirement
+  requirement: &70328630840760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *70330102309280
+  version_requirements: *70328630840760
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70330102308820 !ruby/object:Gem::Requirement
+  requirement: &70328630840300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70330102308820
+  version_requirements: *70328630840300
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70330102308360 !ruby/object:Gem::Requirement
+  requirement: &70328630839840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *70330102308360
+  version_requirements: *70328630839840
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70330102307900 !ruby/object:Gem::Requirement
+  requirement: &70328630839380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70330102307900
+  version_requirements: *70328630839380
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70330102307440 !ruby/object:Gem::Requirement
+  requirement: &70328630838920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70330102307440
+  version_requirements: *70328630838920
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70330102306980 !ruby/object:Gem::Requirement
+  requirement: &70328630838460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,7 +120,7 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70330102306980
+  version_requirements: *70328630838460
 description: Twitters Bootstrap CSS and JS files all in one nice little gem
 email:
 - nwwatson@gmail.com
@@ -152,8 +152,10 @@ files:
 - lib/generators/bootstrapped/layout/USAGE
 - lib/generators/bootstrapped/layout/layout_generator.rb
 - lib/generators/bootstrapped/layout/templates/_flash.html.erb
+- lib/generators/bootstrapped/layout/templates/_flash.html.haml
 - lib/generators/bootstrapped/layout/templates/error_messages_helper.rb
 - lib/generators/bootstrapped/layout/templates/layout.html.erb
+- lib/generators/bootstrapped/layout/templates/layout.html.haml
 - lib/generators/bootstrapped/layout/templates/layout_helper.rb
 - lib/generators/bootstrapped/scaffold/USAGE
 - lib/generators/bootstrapped/scaffold/scaffold_generator.rb
@@ -192,6 +194,11 @@ files:
 - lib/generators/bootstrapped/scaffold/templates/views/erb/index.html.erb
 - lib/generators/bootstrapped/scaffold/templates/views/erb/new.html.erb
 - lib/generators/bootstrapped/scaffold/templates/views/erb/show.html.erb
+- lib/generators/bootstrapped/scaffold/templates/views/haml/_form.html.haml
+- lib/generators/bootstrapped/scaffold/templates/views/haml/edit.html.haml
+- lib/generators/bootstrapped/scaffold/templates/views/haml/index.html.haml
+- lib/generators/bootstrapped/scaffold/templates/views/haml/new.html.haml
+- lib/generators/bootstrapped/scaffold/templates/views/haml/show.html.haml
 - vendor/assets/images/glyphicons-halflings-white.png
 - vendor/assets/images/glyphicons-halflings.png
 - vendor/assets/javascripts/bootstrap-alert.js
@@ -207,43 +214,43 @@ files:
 - vendor/assets/javascripts/bootstrap-transition.js
 - vendor/assets/javascripts/bootstrap-typeahead.js
 - vendor/assets/javascripts/modernizr.js
-- vendor/assets/stylesheets/twitter/bootstrap/less/accordion.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/alerts.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/bootstrap.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/bootstrap_base.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/breadcrumbs.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/button-groups.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/buttons.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/carousel.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/close.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/code.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/component-animations.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/dropdowns.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/forms.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/grid.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/hero-unit.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/labels.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/layouts.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/mixins.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/modals.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/navbar.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/navs.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/pager.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/pagination.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/popovers.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/progress-bars.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/reset.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/responsive.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/scaffolding.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/sprites.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/tables.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/thumbnails.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/tooltip.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/type.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/utilities.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/variables.less
-- vendor/assets/stylesheets/twitter/bootstrap/less/wells.less
 - vendor/assets/stylesheets/twitter/bootstrap/static/bootstrap.css
+- vendor/less/twitter/bootstrap/less/accordion.less
+- vendor/less/twitter/bootstrap/less/alerts.less
+- vendor/less/twitter/bootstrap/less/bootstrap.less
+- vendor/less/twitter/bootstrap/less/bootstrap_base.less
+- vendor/less/twitter/bootstrap/less/breadcrumbs.less
+- vendor/less/twitter/bootstrap/less/button-groups.less
+- vendor/less/twitter/bootstrap/less/buttons.less
+- vendor/less/twitter/bootstrap/less/carousel.less
+- vendor/less/twitter/bootstrap/less/close.less
+- vendor/less/twitter/bootstrap/less/code.less
+- vendor/less/twitter/bootstrap/less/component-animations.less
+- vendor/less/twitter/bootstrap/less/dropdowns.less
+- vendor/less/twitter/bootstrap/less/forms.less
+- vendor/less/twitter/bootstrap/less/grid.less
+- vendor/less/twitter/bootstrap/less/hero-unit.less
+- vendor/less/twitter/bootstrap/less/labels.less
+- vendor/less/twitter/bootstrap/less/layouts.less
+- vendor/less/twitter/bootstrap/less/mixins.less
+- vendor/less/twitter/bootstrap/less/modals.less
+- vendor/less/twitter/bootstrap/less/navbar.less
+- vendor/less/twitter/bootstrap/less/navs.less
+- vendor/less/twitter/bootstrap/less/pager.less
+- vendor/less/twitter/bootstrap/less/pagination.less
+- vendor/less/twitter/bootstrap/less/popovers.less
+- vendor/less/twitter/bootstrap/less/progress-bars.less
+- vendor/less/twitter/bootstrap/less/reset.less
+- vendor/less/twitter/bootstrap/less/responsive.less
+- vendor/less/twitter/bootstrap/less/scaffolding.less
+- vendor/less/twitter/bootstrap/less/sprites.less
+- vendor/less/twitter/bootstrap/less/tables.less
+- vendor/less/twitter/bootstrap/less/thumbnails.less
+- vendor/less/twitter/bootstrap/less/tooltip.less
+- vendor/less/twitter/bootstrap/less/type.less
+- vendor/less/twitter/bootstrap/less/utilities.less
+- vendor/less/twitter/bootstrap/less/variables.less
+- vendor/less/twitter/bootstrap/less/wells.less
 homepage: http://github.com/entropillc/bootstrapped
 licenses: []
 post_install_message: 
@@ -264,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: bootstrapped
-rubygems_version: 1.8.10
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Twitters Bootstrap CSS in a gem