tb_core 1.2.8 → 1.3.0.beta1

data/lib/generators/spud/setup_generator.rb

@@ -3,19 +3,23 @@ class Spud::SetupGenerator < ::Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
 
   def setup
+    if ask('NOTICE: Setup will now attempt to delete and/or overwrite existing files. Continue?', :limited_to => ['y', 'n']) == 'n'
+      return
+    end
+
     template "views/layouts/application.html.erb", "app/views/layouts/application.html.erb"
     template "application_controller.rb", "app/controllers/application_controller.rb"
     template 'assets/admin.css.scss', 'app/assets/stylesheets/admin/application.css.scss'
 
-    update_base_stylesheet()
-
+    remove_file 'app/assets/stylesheets/application.css'
+    template 'assets/application.css.scss', 'app/assets/stylesheets/application.css.scss'
     template 'assets/application.js', 'app/assets/javascripts/application.js'
     template 'assets/admin/application.js', 'app/assets/javascripts/admin/application.js'
 
     environment(spud_core_configs())
     rake('railties:install:migrations')
 
-    if ask("Migrate the database? [Yn] ").downcase == 'y'
+    if ask("Migrate the database?", :limited_to => ['y', 'n']).downcase == 'y'
       rake('db:migrate')
     end
   end
@@ -33,42 +37,6 @@ Spud::Core.configure do |config|
 EOF
   end
 
-  def update_base_stylesheet()
-    extensions = ['css', 'css.scss']
-    extensions.each do |ext|
-      path = File.join(Rails.root, "app/assets/stylesheets/application.#{ext}")
-      if File.exist?(path)
-        replace_with_require_directory(path)
-        return
-      end
-    end
-  end
-
-  def update_base_javascript()
-    extensions = ['js', 'js.coffee']
-    extensions.each do |ext|
-      path = File.join(Rails.root, "app/assets/javascripts/application.#{ext}")
-      if File.exist?(path)
-        replace_with_require_directory(path)
-        remove_turbolinks(path)
-        return
-      end
-    end
-  end
-
-  def replace_with_require_directory(path)
-    text = File.read(path)
-    text.gsub!('require_tree', 'require_directory')
-    File.open(path, 'w'){ |f| f.puts(text) }
-  end
-
-  def remove_turbolinks(path)
-    text = File.read(path)
-    require_turbolinks = "//= require turbolinks\n"
-    text.gsub!(require_turbolinks, '')
-    File.open(path, 'w'){ |f| f.puts(text) }
-  end
-
   def application_name
     Rails.application.class.name.split('::').first.underscore
   end

data/lib/generators/spud/templates/assets/application.css.scss

@@ -0,0 +1,5 @@
+//= require_self
+//= require_directory .
+
+@import "bootstrap-sprockets";
+@import "bootstrap";

data/lib/generators/spud/templates/assets/application.js

@@ -1,6 +1,7 @@
 //= require jquery
 //= require jquery_ujs
 //= require tb_core
+//= require bootstrap-sprockets
 //= require_self
 //= require_directory .
 

data/lib/generators/spud/templates/views/admin/_form.html.erb

@@ -1,21 +1,10 @@
-<%%= form_for [:admin, @<%=module_name_formatted.singularize%>], :html => {:class => 'form-horizontal'} do |f| %>
-
-  <%%= error_messages_for(f.object) %>
-
-  <fieldset>
-    <legend>Details</legend> <%attributes.each do |attribute|%>
-      <%attribute_args = attribute.split(":")%>
-      <div class="control-group">
-        <%%= f.label :<%=attribute_args[0]%>, :class => "control-label" %>
-        <div class="controls">
-          <%= field_for_attribute(attribute_args[1], attribute_args[0]) %>
-        </div>
-      </div> <%end%>
-  </fieldset>
-
-  <div class="form-actions">
-    <%%= f.submit "Save <%=module_name_formatted.singularize.humanize.titlecase%>", :class => "btn btn-primary form-btn", "data-loading-text" => "Saving..." %> or <%%= link_to "Cancel", admin_<%= module_name_formatted %>_path, :class => "btn" %>
-  </div>
+<%%= form_for [:admin, @<%=module_name_formatted.singularize%>], :builder => TbCore::FormBuilder, :html => {:class => 'form-horizontal'} do |f| %>
+  
+  <%%= tb_form_error_header(f.object) %>
+  <%- attributes.collect{ |att| att.split(':') }.each do |arg_0, arg_1| %>
+  <%= field_for_attribute(arg_1, arg_0) %>
+  <%- end %>
+  <%%= f.tb_save_buttons('<%= module_name_formatted.singularize.humanize.titlecase %>', @<%= module_name_formatted.singularize %>.new_record? ? admin_<%= module_name_formatted %>_path : admin_<%= module_name_formatted.singularize %>_path(@<%= module_name_formatted.singularize %>)) %>
 
 <%% end %>
 

data/lib/generators/spud/templates/views/admin/index.html.erb

@@ -1,37 +1,48 @@
 <%% content_for :data_controls do %>
-  <%%= form_tag admin_<%= module_name_formatted %>_path, :method => :get, :class => 'form-search' do %>
-    <%%= text_field_tag 'search', params[:search], :placeholder => 'Search', :class => 'input-medium search-query' %>
+  <%%= form_tag admin_<%= module_name_formatted %>_path, :method => :get, :class => 'form-inline' do %>
+    <div class="form-group">
+      <div class="input-group">
+        <div class="input-group-addon"><span class="glyphicon glyphicon-search"></span></div>
+        <%%= text_field_tag 'search', params[:search], :placeholder => 'Search', :class => 'form-control' %>
+        <%% if params[:search] %>
+          <div class="input-group-addon">
+            <%%= link_to raw('<span class="glyphicon glyphicon-remove"></span>'), admin_<%= module_name_formatted %>_path %>
+          </div>
+        <%% end %>
+      </div>
+    </div>
+    <div class="form-group">
+      <%%= link_to "New <%=module_name_formatted.singularize.humanize.titlecase%>", new_admin_<%=module_name_formatted.singularize%>_path, :class => "btn btn-primary", :title => "New <%=module_name_formatted.singularize.humanize.titlecase%>" %>
+    </div>
   <%% end %>
-  <%% if params[:search] %>
-    <%%= link_to 'Clear', admin_<%= module_name_formatted %>_path, :class => 'btn' %>
-  <%% end %>
-  <%%= link_to "New <%=module_name_formatted.singularize.humanize.titlecase%>", new_admin_<%=module_name_formatted.singularize%>_path, :class => "btn btn-primary", :title => "New <%=module_name_formatted.singularize.humanize.titlecase%>" %>
 <%% end %>
 
 <%% content_for :detail do %>
-  <table class="table table-striped">
-    <thead>
-      <tr><%attribute_names.each do |attribute|%>
-        <th><%=attribute.humanize.titlecase%></th><% end %>
-        <th>Actions</th>
-      </tr>
-    </thead>
-    <tbody>
-      <%% @<%=module_name_formatted%>.each do |<%=module_name_formatted.singularize%>| %>
-        <tr>
-          <%-attribute_names.each do |attribute|-%>
-          <td><%%= <%=module_name_formatted.singularize%>.<%=attribute%> %></td>
-          <%-end-%>
-          <td align="right" width="150" class="no-wrap">
-            <%%= link_to 'Details', admin_<%=module_name_formatted.singularize%>_path(<%=module_name_formatted.singularize%>), :class => 'btn btn-mini' %>
-            <%%= link_to 'Edit', edit_admin_<%=module_name_formatted.singularize%>_path(<%=module_name_formatted.singularize%>), :class => 'btn btn-mini' %>
-            <%%= link_to 'Delete', admin_<%=module_name_formatted.singularize%>_path(<%=module_name_formatted.singularize%>), :method => :delete, :data => {:confirm => 'Are you sure you want to delete this <%=module_name_formatted.singularize.humanize%>?'}, :class => 'btn btn-danger btn-mini' %>
-          </td>
+  <div class="table-responsive">
+    <table class="table table-striped table-hover">
+      <thead>
+        <tr><%attribute_names.each do |attribute|%>
+          <th><%=attribute.humanize.titlecase%></th><% end %>
+          <th>&nbsp;</th>
         </tr>
-      <%% end %>
-    </tbody>
-  </table>
-  <%%= will_paginate @<%=module_name_formatted%> %>
+      </thead>
+      <tbody>
+        <%% @<%=module_name_formatted%>.each do |<%=module_name_formatted.singularize%>| %>
+          <tr>
+            <%-attribute_names.each do |attribute|-%>
+            <td><%%= <%=module_name_formatted.singularize%>.<%=attribute%> %></td>
+            <%-end-%>
+            <td class="table-actions">
+              <%%= link_to 'Details', admin_<%=module_name_formatted.singularize%>_path(<%=module_name_formatted.singularize%>), :class => 'btn btn-default btn-sm' %>
+              <%%= link_to 'Edit', edit_admin_<%=module_name_formatted.singularize%>_path(<%=module_name_formatted.singularize%>), :class => 'btn btn-default btn-sm' %>
+              <%%= link_to 'Delete', admin_<%=module_name_formatted.singularize%>_path(<%=module_name_formatted.singularize%>), :method => :delete, :data => {:confirm => 'Are you sure you want to delete this <%=module_name_formatted.singularize.humanize%>?'}, :class => 'btn btn-danger btn-sm' %>
+            </td>
+          </tr>
+        <%% end %>
+      </tbody>
+    </table>
+  </div>
+  <%%= will_paginate @<%=module_name_formatted%>, :renderer => BootstrapPagination::Rails %>
 
   <script>
     $(document).ready(app.admin.<%= module_name_formatted %>.index);

data/lib/generators/spud/templates/views/admin/show.html.erb

@@ -1,16 +1,15 @@
 <%% content_for :data_controls do %>
-  <%%= link_to 'Edit', edit_admin_<%=module_name_formatted.singularize%>_path(@<%=module_name_formatted.singularize%>), :class => 'btn' %>
+  <%%= link_to 'Edit', edit_admin_<%=module_name_formatted.singularize%>_path(@<%=module_name_formatted.singularize%>), :class => 'btn btn-default' %>
 <%% end %>
 
-<ul>
+<dl class="dl-horizontal">
   <%- attribute_names.each do |attribute| -%>
-  <li><strong><%= attribute.humanize.titlecase %>:</strong> <%%= @<%= module_name_formatted.singularize %>.<%= attribute %> %></li>
+  <dt><%= attribute.humanize.titlecase %>:</dt>
+  <dd><%%= @<%= module_name_formatted.singularize %>.<%= attribute %> %></dd>
   <%- end -%>
-</ul>
+</dl>
 
-<div class="form-actions">
-  <%%= link_to "Back", admin_<%= module_name_formatted %>_path, :class => "btn" %>
-</div>
+<%%= link_to "Back", admin_<%= module_name_formatted %>_path, :class => "btn btn-default" %>
 
 <script>
   $(document).ready(app.admin.<%= module_name_formatted %>.show);

data/lib/generators/spud/templates/views/frontend/index.html.erb

@@ -1,10 +1,11 @@
 <h1><%= module_name_formatted.pluralize.camelize %></h1>
 
-<table>
+<table class="table">
   <thead>
     <tr><%attributes.each do |attribute|%>
         <%-attribute_args = attribute.split(":")-%>
         <th><%=attribute_args[0].humanize.titlecase%></th> <%end%>
+      <th>&nbsp;</th>
     </tr>
   </thead>
   <tbody>

data/lib/generators/spud/templates/views/frontend/show.html.erb

@@ -1,9 +1,11 @@
 <h1><%= module_name_formatted.singularize.camelize %></h1>
 
-<%-attributes.each do |attribute|-%>
-<%-attribute_args = attribute.split(":")-%>
-<p><strong><%=attribute_args[0].humanize.titlecase%></strong> <%%=@<%=module_name_formatted.singularize%>.<%=attribute_args[0]%> %></p>
-<%-end-%>
+<dl class="dl-horizontal">
+  <%- attribute_names.each do |attribute| -%>
+  <dt><%= attribute.humanize.titlecase %>:</dt>
+  <dd><%%= @<%= module_name_formatted.singularize %>.<%= attribute %> %></dd>
+  <%- end -%>
+</dl>
 
 <p><%%= link_to 'Back', <%=module_name_formatted.pluralize%>_path %></p>
 

data/lib/generators/spud/templates/views/layouts/application.html.erb

@@ -3,6 +3,8 @@
 <head>
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta name="viewport" content="width=device-width"/>
   <%%= tb_page_title() %>
   <%%= stylesheet_link_tag "application", :media => "all" %>
   <%%= javascript_include_tag "application" %>
@@ -10,14 +12,22 @@
   <%%= yield :head %>
 </head>
 <body>
+  <div class="container">
 
-  <%% if flash[:notice] %>
-    <p class="flash flash-notice"><%%= flash[:notice] %> <a href="#" class="flash-remove">X</a></p>
-  <%% elsif flash[:error] %>
-    <p class="flash flash-error"><%%= flash[:error] %> <a href="#" class="flash-remove">X</a></p>
-  <%% end %>
+    <%% if flash[:notice] %>
+      <div class="alert alert-info alert-dismissible">
+        <%%= flash[:notice] %> <a href="#" class="flash-remove">X</a>
+        <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+      </div>
+    <%% elsif flash[:error] %>
+      <div class="alert alert-danger alert-dismissible">
+        <%%= flash[:error] %> <a href="#" class="flash-remove">X</a>
+        <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+      </div>
+    <%% end %>
 
-  <%%= content_for?(:body) ? yield(:body) : yield %>
+    <%%= content_for?(:body) ? yield(:body) : yield %>
 
+  </div>
 </body>
 </html>

data/lib/spud_core/configuration.rb

@@ -13,7 +13,7 @@ module Spud
     self.stylesheets = []
     self.multisite_mode_enabled = false
     self.multisite_config = []
-    self.from_address = "no-reply@spudengine.com"
+    self.from_address = "no-reply@companyname.com"
     self.permissions = []
     self.admin_javascripts = ['admin/core/application', 'admin/application']
     self.admin_stylesheets = ['admin/core/application', 'admin/application']

data/lib/spud_core/engine.rb

@@ -1,9 +1,16 @@
 require 'jquery-rails'
 require 'authlogic'
-require 'breadcrumbs_on_rails'
+require 'bootstrap-sass'
+require 'autoprefixer-rails'
 require 'will_paginate'
+require 'will_paginate-bootstrap'
+require 'breadcrumbs_on_rails'
 require 'tinymce-rails'
 
+# this should eventually replace the Spud::Core namespace
+module TbCore
+end
+
 module Spud
   module Core
     class Engine < ::Rails::Engine
@@ -14,6 +21,7 @@ module Spud
 
       engine_name :tb_core
       config.autoload_paths << "#{root}/lib"
+      #config.autoload_paths << File.expand_path("../lib", __FILE__)
 
       initializer 'tb_core.controller_overrides' do |config|
          ActionController::Base.class_eval do

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Core
-    VERSION = "1.2.8"
+    VERSION = "1.3.0.beta1"
   end
 end

data/lib/tb_core/form_builder.rb

@@ -0,0 +1,254 @@
+class TbCore::FormBuilder < ActionView::Helpers::FormBuilder
+
+  ###############
+  # Basic Helpers
+  #
+  # Use the following methods as the basic building blocks for your forms
+  #
+
+  # Build a form group
+  #
+  def tb_form_group(content=nil, options={})
+    content_tag :div, options.merge(:class => 'form-group') do
+      if block_given?
+        yield
+      else
+        content
+      end
+    end
+  end
+
+  # Build a label
+  #
+  def tb_label(attribute)
+    label(attribute, @object.class.human_attribute_name(attribute), :class => 'col-sm-2 control-label')
+  end
+
+  # Builds an input field with error message
+  #
+  def tb_input_field_tag(attribute, input_type=nil, options={})
+    content_tag(:div, :class => 'col-sm-10') do
+      if block_given?
+        concat(yield(attribute))
+      else
+        concat send(input_type, attribute, objectify_options(
+          :placeholder => @object.class.human_attribute_name(attribute),
+          :class => 'form-control'
+        ))
+      end
+      error_message = @object.errors[attribute].first
+      if error_message
+        concat content_tag(:p, error_message, :class => 'help-block form-field-error')
+      end
+    end
+  end
+
+  # Builds a text field
+  #
+  def tb_text_field_tag(attribute, options={})
+    tb_input_field_tag(attribute, :text_field, options)
+  end
+
+  # Builds a text area
+  #
+  def tb_text_area_tag(attribute, options={})
+    tb_input_field_tag(attribute, :text_area, options)
+  end
+
+  # Builds a password field
+  #
+  def tb_password_field_tag(attribute, options={})
+    tb_input_field_tag(attribute, :password_field, options)
+  end
+
+  # Builds a number field
+  #
+  def tb_number_field_tag(attribute, options={})
+    tb_input_field_tag(attribute, :number_field, options)
+  end
+
+  # Builds a check box
+  #
+  def tb_check_box_tag(attribute, options={})
+    tb_input_field_tag(attribute, :check_box, options)
+  end
+
+  # Builds a select tag
+  #
+  def tb_select_tag(attribute, option_tags, options={}, html_options={})
+    tb_input_field_tag(attribute) do
+      select(attribute, option_tags, objectify_options(options), html_options.merge(:class => 'form-control'))
+    end
+  end
+
+  # Builds a date select tag
+  #
+  def tb_date_select_tag(attribute, options={}, html_options={})
+    options[:with_css_classes] = true
+    tb_input_field_tag(attribute) do
+      date_select(attribute, objectify_options(options), html_options.merge(:class => 'form-control date-select'))
+    end
+  end  
+
+  # Builds a date select tag
+  #
+  def tb_datetime_select_tag(attribute, options={}, html_options={})
+    options[:with_css_classes] = true
+    tb_input_field_tag(attribute) do
+      datetime_select(attribute, objectify_options(options), html_options.merge(:class => 'form-control datetime-select'))
+    end
+  end
+
+  # Builds a time select tag
+  #
+  def tb_time_select_tag(attribute, options={}, html_options={})
+    options[:with_css_classes] = true
+    tb_input_field_tag(attribute) do
+      time_select(attribute, objectify_options(options), html_options.merge(:class => 'form-control datetime-select'))
+    end
+  end 
+
+  # Builds a row of save/cancel buttons
+  #
+  def tb_save_buttons(model_name, cancel_path)
+    content_tag :div, :class => 'form-group' do
+      content_tag :div, :class => 'col-sm-offset-2 col-sm-10' do
+        concat submit "Save #{model_name}", :class => 'btn btn-primary'
+        concat ' '
+        concat @template.link_to 'Cancel', cancel_path, :class => 'btn btn-default'
+      end
+    end
+  end
+
+  ##################
+  # Advanced Helpers
+  #
+  # These helpers are designed to output an entire form group with child elements
+  # ie, container div + label + input + error message
+  #
+
+  # Builds a form group, label, and input tag all in one
+  #
+  def tb_input_field(attribute, input_type=nil, options={})
+    tb_form_group() do
+      concat tb_label(attribute)
+      if block_given?
+        concat(
+          tb_input_field_tag(attribute) do
+            yield
+          end
+        )
+      else
+        if input_type.nil?
+          input_type = determine_input_type_from_attribute(attribute)
+        end
+        concat tb_input_field_tag(attribute, input_type, options)
+      end
+    end
+  end
+
+  # Builds a text field group
+  #
+  def tb_text_field(attribute, options={})
+    tb_input_field(attribute, :text_field, options)
+  end
+
+  # Builds a text area group
+  #
+  def tb_text_area(attribute, options={})
+    tb_input_field(attribute, :text_area, options)
+  end
+
+  # Builds a password field group
+  #
+  def tb_password_field(attribute, options={})
+    tb_input_field(attribute, :password_field, options)
+  end
+
+  # Builds a number field group
+  #
+  def tb_number_field(attribute, options={})
+    tb_input_field(attribute, :number_field, options)
+  end
+
+  # Builds a check box
+  #
+  def tb_check_box(attribute, options={})
+    tb_input_field(attribute) do
+      check_box(attribute, options)
+    end
+  end
+
+  # Builds a file field group
+  #
+  def tb_file_field(attribute, options={})
+    tb_input_field(attribute) do
+      file_field(attribute)
+    end
+  end
+
+  # Builds a select group
+  #
+  def tb_select(attribute, option_tags, options={}, html_options={})
+    tb_input_field(attribute) do
+      select(attribute, option_tags, objectify_options(options), html_options.merge(:class => 'form-control'))
+    end
+  end
+
+  # Builds a date select tag
+  #
+  def tb_date_select(attribute, options={}, html_options={})
+    options[:with_css_classes] = true
+    tb_input_field(attribute) do
+      date_select(attribute, objectify_options(options), html_options.merge(:class => 'form-control date-select'))
+    end
+  end
+
+  # Builds a date select tag
+  #
+  def tb_datetime_select(attribute, options={}, html_options={})
+    options[:with_css_classes] = true
+    tb_input_field(attribute) do
+      datetime_select(attribute, objectify_options(options), html_options.merge(:class => 'form-control datetime-select'))
+    end
+  end
+
+  # Builds a time select tag
+  #
+  def tb_time_select(attribute, options={}, html_options={})
+    options[:with_css_classes] = true
+    tb_input_field(attribute) do
+      time_select(attribute, objectify_options(options), html_options.merge(:class => 'form-control datetime-select'))
+    end
+  end 
+
+  # Builds a time zone select group
+  #
+  def tb_time_zone_select(attribute, priority_zones, options={}, html_options={})
+    tb_input_field(attribute) do
+      time_zone_select(attribute, priority_zones, objectify_options(options), html_options.merge(:class => 'form-control'))
+    end
+  end
+
+private
+
+  def concat(*args)
+    @template.concat(*args)
+  end
+
+  def content_tag(*args)
+    if block_given?
+      @template.content_tag(*args) do
+        yield
+      end
+    else
+      @template.content_tag(*args)
+    end
+  end
+
+  def determine_input_type_from_attribute(attribute)
+    # TODO: Intelligently return the correct input for the given attribute
+    return :text_field
+  end
+
+end

data/spec/helpers/spud/admin/application_helper_spec.rb

@@ -120,31 +120,31 @@ describe Admin::ApplicationHelper do
     end
   end
 
-  describe :error_messages_for do
+  describe :tb_form_errors do
     before(:each) do
       @user = FactoryGirl.create(:spud_user)
     end
 
     it "should return blank when no errors exist" do
-      helper.error_messages_for(@user).should == ''
+      helper.tb_form_errors(@user).should == ''
     end
 
     it "should display 1 error when the subject has 2 errors" do
       @user.errors[:base] << "error 1"
-      helper.error_messages_for(@user).should include("1 error")
+      helper.tb_form_errors(@user).should include("1 error")
     end
 
     (1..3).each do |error_count|
       it "should display #{error_count} errors when the subject has #{error_count} errors" do
         error_count.times {|x| @user.errors[:base] << "error #{x}" }
-        helper.error_messages_for(@user).should include("#{@user.errors[:base].size} error")
+        helper.tb_form_errors(@user).should include("#{@user.errors[:base].size} error")
       end
     end
 
     it "should display the error" do
       error = "You're invalid"
       @user.errors[:base] << error
-      helper.error_messages_for(@user).should include(error)
+      helper.tb_form_errors(@user).should include(error)
     end
   end
 end