bootstrap-generators 0.0.3 → 0.0.4

data/README.md

@@ -6,10 +6,8 @@ Add it to your Gemfile:
 
   `gem "bootstrap-generators"`
 
-Add simple_form to your Gemfile
-
-  `gem "simple_form"`
-
 Run the generator:
 
   `rails generate bootstrap:install`
+
+Once you've done that, any time you generate a controller or scaffold, you'll get [Bootstrap](http://twitter.github.com/bootstrap/) templates.

data/bootstrap-generators.gemspec

@@ -27,5 +27,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rails", "~> 3.0"
 
   s.add_runtime_dependency "railties", "~> 3.0"
-  s.add_runtime_dependency "simple_form", "~> 1.5.0"
 end

data/lib/bootstrap-generators.rb

@@ -1,3 +1,5 @@
+require 'rails'
+
 module Bootstrap
   module Generators
     class Railtie < ::Rails::Railtie

data/lib/bootstrap/generators/version.rb

@@ -1,5 +1,5 @@
 module Bootstrap
   module Generators
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

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

@@ -6,14 +6,6 @@ module Bootstrap
       desc "Copy BootstrapGenerators default files"
       source_root File.expand_path('../templates', __FILE__)
 
-      def copy_simple_form_inputs
-        directory 'app'
-      end
-
-      def copy_simple_form_config
-        directory 'config'
-      end
-
       def copy_lib
         directory 'lib'
       end

data/lib/generators/bootstrap/install/templates/lib/templates/erb/controller/view.html.erb

@@ -0,0 +1,4 @@
+<div class="page-header">
+  <h1><%= class_name %>#<%= @action %></h1>
+</div>
+<p>Find me in <%= @path %></p>

data/lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/_form.html.erb

@@ -1,17 +1,25 @@
-<%%= simple_form_for(@<%= singular_table_name %>) do |f| %>
-  <%% if f.object.errors.any? %>
-    <div class="alert-message error">
-      <%%= f.error_notification %>
+<%%= form_for(@<%= singular_table_name %>) do |f| %>
+  <%% if @<%= singular_table_name %>.errors.any? %>
+    <div class="alert-message block-message error">
+      <p><%%= pluralize(@<%= singular_table_name %>.errors.count, "error") %> prohibited this <%= singular_table_name %> from being saved:</p>
+
+      <ul>
+      <%% @<%= singular_table_name %>.errors.full_messages.each do |msg| %>
+        <li><%%= msg %></li>
+      <%% end %>
+      </ul>
     </div>
   <%% end %>
 
-  <div class="inputs">
-  <%- attributes.each do |attribute| -%>
-    <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %>, :input_html => { :class => '<%= [:datetime_select, :date_select].include?(attribute.field_type) ? 'small' : 'xxlarge' %>' } %>
-  <%- end -%>
+<% attributes.each do |attribute| -%>
+  <div class="clearfix">
+    <%%= f.label :<%= attribute.name %> %>
+    <div class="input">
+      <%%= f.<%= attribute.field_type %> :<%= attribute.name %>, :class => "<%= [:datetime_select, :date_select].include?(attribute.field_type) ? 'small' : 'xxlarge' %>" %>
+    </div>
   </div>
-
+<% end -%>
   <div class="actions">
-    <%%= f.button :submit, :class => "btn primary" %>
+    <%%= f.submit :class => "btn primary" %>
   </div>
-<%% end %>
+<%% end %>

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

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class Bootstrap::Generators::InstallGeneratorTest < ::Rails::Generators::TestCase
+  destination File.join(Rails.root)
+  tests Bootstrap::Generators::InstallGenerator
+
+  setup :prepare_destination
+  setup :copy_routes
+
+  test "should copy controller templates" do
+    run_generator
+
+    assert_file "lib/templates/erb/controller/view.html.erb"
+  end
+
+  test "should copy scaffold templates" do
+    run_generator
+
+    %w(index edit new show _form).each { |view| assert_file "lib/templates/erb/scaffold/#{view}.html.erb" }
+  end
+end

data/test/test_helper.rb

@@ -31,44 +31,4 @@ def copy_routes
   FileUtils.cp File.expand_path(routes), destination
 end
 
-# Asserts the given class exists in the given content. When a block is given,
-# it yields the content of the class.
-#
-#   assert_file "test/functional/accounts_controller_test.rb" do |controller_test|
-#     assert_class "AccountsControllerTest", controller_test do |klass|
-#       assert_match /context "index action"/, klass
-#     end
-#   end
-#
-def assert_class(klass, content)
-  assert content =~ /class #{klass}(\(.+\))?(.*?)\nend/m, "Expected to have class #{klass}"
-  yield $2.strip if block_given?
-end
-
-def generator_list
-  {
-    :rails        => ['scaffold', 'controller'],
-    :erubis       => ['scaffold']
-  }
-end
-
-def path_prefix(name)
-  case name
-  when :rails
-    'rails/generators'
-  else
-    'generators'
-  end
-end
-
-def require_generators(generator_list)
-  generator_list.each do |name, generators|
-    generators.each do |generator_name|
-      require File.join(path_prefix(name), name.to_s, generator_name.to_s, "#{generator_name}_generator")
-    end
-  end
-end
-alias :require_generator :require_generators
-
-require_generators generator_list
-
+require 'generators/bootstrap/install/install_generator'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-generators
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-10 00:00:00.000000000Z
+date: 2011-10-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152295500 !ruby/object:Gem::Requirement
+  requirement: &2152076780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152295500
+  version_requirements: *2152076780
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &2152256980 !ruby/object:Gem::Requirement
+  requirement: &2152089360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152256980
+  version_requirements: *2152089360
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152255600 !ruby/object:Gem::Requirement
+  requirement: &2152102240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *2152255600
+  version_requirements: *2152102240
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &2152253880 !ruby/object:Gem::Requirement
+  requirement: &2152243120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,18 +54,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152253880
-- !ruby/object:Gem::Dependency
-  name: simple_form
-  requirement: &2152253220 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *2152253220
+  version_requirements: *2152243120
 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.
@@ -85,23 +74,17 @@ files:
 - lib/bootstrap/generators/railtie.rb
 - lib/bootstrap/generators/version.rb
 - lib/generators/bootstrap/install/install_generator.rb
-- lib/generators/bootstrap/install/templates/app/inputs/boolean_input.rb
-- lib/generators/bootstrap/install/templates/app/inputs/date_time_input.rb
-- lib/generators/bootstrap/install/templates/app/inputs/mapping_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/application.html.erb
 - lib/generators/bootstrap/install/templates/bootstrap-generators.css.scss
 - lib/generators/bootstrap/install/templates/bootstrap-generators.js
-- lib/generators/bootstrap/install/templates/config/initializers/simple_form.rb
+- lib/generators/bootstrap/install/templates/lib/templates/erb/controller/view.html.erb
 - lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/_form.html.erb
 - lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/edit.html.erb
 - lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/index.html.erb
 - lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/new.html.erb
 - lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/show.html.erb
 - test/fixtures/routes.rb
-- test/lib/generators/erubis/controller_generator_test.rb
-- test/lib/generators/erubis/scaffold_generator_test.rb
+- test/lib/generators/bootstrap/install_generator_test.rb
 - test/test_helper.rb
 - vendor/assets/javascripts/bootstrap-alerts.js
 - vendor/assets/javascripts/bootstrap-dropdown.js
@@ -139,6 +122,5 @@ specification_version: 3
 summary: Bootstrap-generators provides Twitter Bootstrap generators for Rails 3.
 test_files:
 - test/fixtures/routes.rb
-- test/lib/generators/erubis/controller_generator_test.rb
-- test/lib/generators/erubis/scaffold_generator_test.rb
+- test/lib/generators/bootstrap/install_generator_test.rb
 - test/test_helper.rb

data/lib/generators/bootstrap/install/templates/app/inputs/boolean_input.rb

@@ -1,11 +0,0 @@
-class BooleanInput < SimpleForm::Inputs::BooleanInput
-  def label_input
-    content = "".html_safe
-    [ :input, :error, :hint ].each do |component|
-      next if options[component] == false
-      rendered = send(component)
-      content.safe_concat rendered.to_s if rendered
-    end
-    (options[:label] == false ? "" : label) + "<div class=\"input\"><ul class=\"inputs-list\"><li><label>#{content}</label></li></ul></div>".html_safe
-  end
-end

data/lib/generators/bootstrap/install/templates/app/inputs/date_time_input.rb

@@ -1,11 +0,0 @@
-class DateTimeInput < SimpleForm::Inputs::DateTimeInput
-  def label_input
-    content = "".html_safe
-    [ :input, :error, :hint ].each do |component|
-      next if options[component] == false
-      rendered = send(component)
-      content.safe_concat rendered.to_s if rendered
-    end
-    (options[:label] == false ? "" : label) + "<div class=\"input\">#{content}</div>".html_safe
-  end
-end

data/lib/generators/bootstrap/install/templates/app/inputs/mapping_input.rb

@@ -1,11 +0,0 @@
-class MappingInput < SimpleForm::Inputs::MappingInput
-  def label_input
-    content = "".html_safe
-    [ :input, :error, :hint ].each do |component|
-      next if options[component] == false
-      rendered = send(component)
-      content.safe_concat rendered.to_s if rendered
-    end
-    (options[:label] == false ? "" : label) + "<div class=\"input\">#{content}</div>".html_safe
-  end
-end

data/lib/generators/bootstrap/install/templates/app/inputs/string_input.rb

@@ -1,11 +0,0 @@
-class StringInput < SimpleForm::Inputs::StringInput
-  def label_input
-    content = "".html_safe
-    [ :input, :error, :hint ].each do |component|
-      next if options[component] == false
-      rendered = send(component)
-      content.safe_concat rendered.to_s if rendered
-    end
-    (options[:label] == false ? "" : label) + "<div class=\"input\">#{content}</div>".html_safe
-  end
-end

data/lib/generators/bootstrap/install/templates/app/inputs/text_input.rb

@@ -1,11 +0,0 @@
-class TextInput < SimpleForm::Inputs::TextInput
-  def label_input
-    content = "".html_safe
-    [ :input, :error, :hint ].each do |component|
-      next if options[component] == false
-      rendered = send(component)
-      content.safe_concat rendered.to_s if rendered
-    end
-    (options[:label] == false ? "" : label) + "<div class=\"input\">#{content}</div>".html_safe
-  end
-end

data/lib/generators/bootstrap/install/templates/config/initializers/simple_form.rb

@@ -1,93 +0,0 @@
-# Use this setup block to configure all options available in SimpleForm.
-SimpleForm.setup do |config|
-  # Components used by the form builder to generate a complete input. You can remove
-  # any of them, change the order, or even add your own components to the stack.
-  config.components = [ :placeholder, :label_input ]
-
-  # Default tag used on hints.
-  # config.hint_tag = :span
-
-  # CSS class to add to all hint tags.
-  config.hint_class = :"help-block"
-
-  # CSS class used on errors.
-  config.error_class = :"help-inline"
-
-  # Default tag used on errors.
-  # config.error_tag = :span
-
-  # Method used to tidy up errors.
-  # config.error_method = :first
-
-  # Default tag used for error notification helper.
-  # config.error_notification_tag = :p
-
-  # CSS class to add for error notification helper.
-  # config.error_notification_class = :error_notification
-
-  # ID to add for error notification helper.
-  # config.error_notification_id = nil
-
-  # You can wrap all inputs in a pre-defined tag.
-  # config.wrapper_tag = :div
-
-  # CSS class to add to all wrapper tags.
-  config.wrapper_class = :clearfix
-
-  # CSS class to add to the wrapper if the field has errors.
-  config.wrapper_error_class = :error
-
-  # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none.
-  # config.collection_wrapper_tag = nil
-
-  # You can wrap each item in a collection of radio/check boxes with a tag, defaulting to span.
-  # config.item_wrapper_tag = :span
-
-  # Series of attempts to detect a default label method for collection.
-  # config.collection_label_methods = [ :to_label, :name, :title, :to_s ]
-
-  # Series of attempts to detect a default value method for collection.
-  # config.collection_value_methods = [ :id, :to_s ]
-
-  # How the label text should be generated altogether with the required text.
-  # config.label_text = lambda { |label, required| "#{required} #{label}" }
-
-  # You can define the class to use on all labels. Default is nil.
-  # config.label_class = nil
-
-  # You can define the class to use on all forms. Default is simple_form.
-  # config.form_class = :"form-stacked"
-
-  # Whether attributes are required by default (or not). Default is true.
-  # config.required_by_default = true
-
-  # Tell browsers whether to use default HTML5 validations (novalidate option).
-  # Default is enabled.
-  # config.browser_validations = true
-
-  # Determines whether HTML5 types (:email, :url, :search, :tel) and attributes
-  # (e.g. required) are used or not. True by default.
-  # Having this on in non-HTML5 compliant sites can cause odd behavior in
-  # HTML5-aware browsers such as Chrome.
-  # config.html5 = true
-
-  # Custom mappings for input types. This should be a hash containing a regexp
-  # to match as key, and the input type that will be used when the field name
-  # matches the regexp as value.
-  # config.input_mappings = { /count/ => :integer }
-
-  # Collection of methods to detect if a file type was given.
-  # config.file_methods = [ :mounted_as, :file?, :public_filename ]
-
-  # Default priority for time_zone inputs.
-  # config.time_zone_priority = nil
-
-  # Default priority for country inputs.
-  # config.country_priority = nil
-
-  # Default size for text inputs.
-  # config.default_input_size = 50
-
-  # When false, do not use translations for labels, hints or placeholders.
-  # config.translate = true
-end

data/test/lib/generators/erubis/controller_generator_test.rb

@@ -1,17 +0,0 @@
-require 'test_helper'
-
-class Erubis::Generators::ControllerGeneratorTest < Rails::Generators::TestCase
-  destination File.join(Rails.root)
-  tests Rails::Generators::ControllerGenerator
-  arguments %w(Account foo bar --template-engine erubis)
-
-  setup :prepare_destination
-  setup :copy_routes
-
-  test "should invoke template engine" do
-    run_generator
-    assert_file "app/views/account/foo.html.erb", %r(app/views/account/foo\.html\.erb)
-    assert_file "app/views/account/bar.html.erb", %r(app/views/account/bar\.html\.erb)
-  end
-end
-

data/test/lib/generators/erubis/scaffold_generator_test.rb

@@ -1,31 +0,0 @@
-require 'test_helper'
-
-class Erubis::Generators::ScaffoldGeneratorTest < Rails::Generators::TestCase
-  destination File.join(Rails.root)
-  tests Rails::Generators::ScaffoldGenerator
-  arguments %w(product_line title:string price:integer --template-engine erubis)
-
-  setup :prepare_destination
-  setup :copy_routes
-
-  test "should invoke template engine" do
-    run_generator
-
-    %w(index edit new show _form).each { |view| assert_file "app/views/product_lines/#{view}.html.erb" }
-    assert_no_file "app/views/layouts/product_lines.html.erb"
-  end
-
-  test "should revoke template engine" do
-    run_generator
-    run_generator ["product_line"], :behavior => :revoke
-
-    assert_no_file "app/views/product_lines"
-    assert_no_file "app/views/layouts/product_lines.html.erb"
-  end
-
-  test "should invoke form builder" do
-    run_generator %w(product_line title:string price:integer --template-engine erubis --form-builder some-form-builder)
-    assert_no_file "app/views/product_lines/_form.html.erb"
-  end
-end
-