scaffolding_extensions 1.5.4 → 1.5.5

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2011 Jeremy Evans
+Copyright (c) 2005-2012 Jeremy Evans
 
 Permission is hereby granted, free of charge, to any person obtaining a copy 
 of this software and associated documentation files (the "Software"), to deal

data/README

@@ -21,14 +21,14 @@ to better suit your needs.
 Scaffolding Extensions currently supports:
 
 * Web Frameworks
-  * Rails 3.1.0
-  * Ramaze 2011.01.30
+  * Rails 3.2.3
+  * Ramaze 2011.12.28
   * Camping 2.1
-  * Sinatra 1.2.6
-  * Rack 1.2.2
+  * Sinatra 1.3.1
+  * Rack 1.4.0
 * Object Relational Mappers
-  * ActiveRecord 3.1.0
-  * Sequel 3.27.0
+  * ActiveRecord 3.2.3
+  * Sequel 3.34.0
   * DataMapper 1.0.2 (see doc/datamapper.txt for details)
 * Javascript Libaries (used for Ajax/Autocompleting, default is now JQuery)
   * Prototype 1.6.0.3

data/doc/rails.txt

@@ -0,0 +1,4 @@
+Note that using Scaffolding Extensions with Rails requires that the
+Rails app has the catch-all route (/controller/action/index), at
+least for the controllers in which you are using Scaffolding
+Extensions.

data/lib/scaffolding_extensions/helper.rb

@@ -50,13 +50,13 @@ module ScaffoldingExtensions
       # Simple button with label text that submits a form to the given url, options are
       # passed to scaffold_form.
       def scaffold_button_to(text, url, options={})
-        "#{scaffold_form(url, options)}\n<input type='submit' value='#{text}' />\n</form>"
+        "#{scaffold_form(url, options)}\n<input class=\"btn #{options[:class]}\" type='submit' value='#{text}' />\n</form>"
       end
       
       # Simple button with label text that submits a form via Ajax to the given action,
       # options are passed to scaffold_form_remote_tag.
       def scaffold_button_to_remote(text, action, options)  
-        "#{scaffold_form_remote_tag(action, options)}\n<input type='submit' value=#{text} />\n</form>"
+        "#{scaffold_form_remote_tag(action, options)}\n<input class=\"btn btn-primary\" type='submit' value=#{text} />\n</form>"
       end
       
       # If scaffolding didn't create the action, return the empty string if blank is true
@@ -163,7 +163,7 @@ module ScaffoldingExtensions
         soid = so.scaffold_id
         content = "<div class='habtm_ajax_add_associations' id='#{sn}_habtm_ajax_add_associations'>"
         klass.scaffold_habtm_associations.reject{|association| !scaffolded_method?("add_#{association}_to_#{sn}")}.each do |association|
-          content << "#{scaffold_form_remote_tag("add_#{association}_to_#{sn}", :id=>soid)}\n#{scaffold_habtm_ajax_tag("#{sn}_#{association}_id", so, sn, association)}\n<input name='commit' type='submit' value='Add #{klass.scaffold_associated_human_name(association).singularize}' /></form>\n"
+          content << "#{scaffold_form_remote_tag("add_#{association}_to_#{sn}", :id=>soid)}\n#{scaffold_habtm_ajax_tag("#{sn}_#{association}_id", so, sn, association)}\n<input name='commit' class=\"btn btn-primary\" type='submit' value='Add #{klass.scaffold_associated_human_name(association).singularize}' /></form>\n"
         end
         content << "</div><div class='habtm_ajax_remove_associations' id='#{sn}_habtm_ajax_remove_associations'><ul id='#{sn}_associated_records_list'>"
         klass.scaffold_habtm_associations.reject{|association| !scaffolded_method?("remove_#{association}_from_#{sn}")}.each do |association|
@@ -269,7 +269,7 @@ module ScaffoldingExtensions
         #{scaffold_form(scaffold_url("#{action}#{@scaffold_suffix}", options), :attributes=>scaffold_form_enctype(fields))}
         #{scaffold_model_field_tags(fields)}
         #{(yield content; content) if block_given?}
-        <input type='submit' value="#{@scaffold_submit_value || "#{action.capitalize} #{@scaffold_options[:singular_lc_human_name]}"}" />
+        <input class='btn btn-primary' type='submit' value="#{@scaffold_submit_value || "#{action.capitalize} #{@scaffold_options[:singular_lc_human_name]}"}" />
         </form>
         END
       end

data/lib/scaffolding_extensions/meta_controller.rb

@@ -180,7 +180,9 @@ module ScaffoldingExtensions
         if add_methods.include?(:browse)
           scaffold_define_method("browse#{suffix}") do
             @page ||= scaffold_request_param(:page).to_i > 1 ? scaffold_request_param(:page).to_i : 1
-            @next_page, @scaffold_objects = klass.scaffold_browse_find_objects(:session=>scaffold_session, :page=>@page)
+            unless @scaffold_objects
+              @next_page, @scaffold_objects = klass.scaffold_browse_find_objects(:session=>scaffold_session, :page=>@page)
+            end
             @scaffold_listtable_type = :browse
             send(render_meth, :listtable) 
           end

data/lib/scaffolding_extensions/meta_model.rb

@@ -72,7 +72,7 @@ module ScaffoldingExtensions::MetaModel
   # - :auto_complete: Hash containing the default options to use for the scaffold
   #   autocompleter (iv: @scaffold_auto_complete_options)
   SCAFFOLD_OPTIONS = {:text_to_string=>false, 
-    :table_classes=>{:form=>'formtable', :list=>'sortable', :show=>'sortable'},
+    :table_classes=>{:form=>'table formtable', :list=>'table table-bordered table-condensed sortable', :show=>'table sortable'},
     :column_type_options=>{},
     :column_types=>{},
     :column_options=>{},

data/scaffolds/habtm.rhtml

@@ -16,7 +16,7 @@
 <% end %>
 
 <br /><br />
-<input type='submit' value="Update <%= sn %>'s <%= mpn %>" />
+<input class="btn btn-primary" type='submit' value="Update <%= sn %>'s <%= mpn %>" />
 </form>
 
 <% if '' != (edit_link = scaffold_check_link("Edit #{sn}", true, "edit_#{@scaffold_options[:singular_name]}", :id=>soid)) %>

data/scaffolds/layout.rhtml

@@ -1,6 +1,8 @@
+<!DOCTYPE html>
 <html>
 <head>
   <title>Scaffolding Extensions<%= " - #{@scaffold_title}" if @scaffold_title %></title>
+  <link rel="stylesheet" type="text/css" href="/css/bootstrap.min.css" />
   <style type="text/css">
     body { background-color: #fff; color: #333; }
 
@@ -10,6 +12,7 @@
       line-height: 18px;
     }
     
+    h1, h4 { margin-bottom: 10px; }
     h4 { font-size: 16px; }
 
     pre {

data/scaffolds/list.rhtml

@@ -7,7 +7,7 @@
   <%=scaffold_raw scaffold_select_tag('id', @scaffold_objects) %>
 <% end %>
 <br /><br />
-<input type="submit" value="<%= haction %> <%= hn %>" />
+<input class="btn btn-<%= scaffold_idempotent_action?(action) ? 'primary' : 'danger' %>" type="submit" value="<%= haction %> <%= hn %>" />
 </form>
 
 <%=scaffold_raw scaffold_manage_link %>

data/scaffolds/listtable.rhtml

@@ -21,13 +21,13 @@
     <td><%=h entry.scaffold_value(column).to_s %></td>
   <% end %>
   <% if show %>
-    <td><%=scaffold_raw scaffold_button_to(s, scaffold_url(ss, :id=>eid), :method=>:get) %></td>
+    <td><%=scaffold_raw scaffold_button_to(s, scaffold_url(ss, :id=>eid), :method=>:get, :class=>'btn-info') %></td>
   <% end %>
   <% if edit %>
-    <td><%=scaffold_raw scaffold_button_to(e, scaffold_url(es, :id=>eid), :method=>:get) %></td>
+    <td><%=scaffold_raw scaffold_button_to(e, scaffold_url(es, :id=>eid), :method=>:get, :class=>'btn-primary') %></td>
   <% end %>
   <% if delete %>
-    <td><%=scaffold_raw scaffold_button_to(d, scaffold_url(ds, :id=>eid)) %></td>
+    <td><%=scaffold_raw scaffold_button_to(d, scaffold_url(ds, :id=>eid), :class=>'btn-danger') %></td>
   <% end %>
   </tr>
 <% end %>
@@ -55,10 +55,10 @@
     <%=scaffold_raw scaffold_field_tag(:hidden, :value=>field, :name=>"null#{scaffold_param_list_suffix}") %>
   <% end %>
   <% if @scaffold_search_results_form_params[:page] > 1 %>
-    <input type="submit" name="page_previous" value="Previous Page" />
+    <input class="btn btn-info" type="submit" name="page_previous" value="Previous Page" />
   <% end %>
   <% if @scaffold_search_results_form_params[:next_page] %>
-    <input type="submit" name="page_next" value="Next Page" />
+    <input class="btn btn-primary" type="submit" name="page_next" value="Next Page" />
   <% end %>
   </form>
 <% end %>

data/scaffolds/merge.rhtml

@@ -17,7 +17,7 @@
 <% end %>
 </p>
 
-<input type="submit" value="Merge <%= @scaffold_options[:plural_lc_human_name] %>" />
+<input class="btn btn-danger" type="submit" value="Merge <%= @scaffold_options[:plural_lc_human_name] %>" />
 </form>
 
 <%=scaffold_raw scaffold_manage_link %>

data/scaffolds/search.rhtml

@@ -2,8 +2,8 @@
 
 <%=scaffold_raw(scaffold_model_form('results', @scaffold_class.scaffold_fields(:search)) do |form|
   form << "<table class='#{@scaffold_class.scaffold_table_class(:form)}'><tbody>"
-  form << "<tr><td><label for='null'>Null Fields</label>:</td><td><select name='null#{scaffold_param_list_suffix}' id='null' multiple='multiple'>#{@scaffold_class.scaffold_search_null_options.collect{|name, i| "<option value='#{i}'>#{name}</option>"}.join("\n")}</select></td></tr>\n"
-  form << "<tr><td><label for='notnull'>Not Null Fields</label>:</td><td><select name='notnull#{scaffold_param_list_suffix}' id='notnull' multiple='multiple'>#{@scaffold_class.scaffold_search_null_options.collect{|name, i| "<option value='#{i}'>#{name}</option>"}.join("\n")}</select></td></tr>\n"
+  form << "<tr><td><label for='null'>Null Fields</label></td><td><select name='null#{scaffold_param_list_suffix}' id='null' multiple='multiple'>#{@scaffold_class.scaffold_search_null_options.collect{|name, i| "<option value='#{i}'>#{name}</option>"}.join("\n")}</select></td></tr>\n"
+  form << "<tr><td><label for='notnull'>Not Null Fields</label></td><td><select name='notnull#{scaffold_param_list_suffix}' id='notnull' multiple='multiple'>#{@scaffold_class.scaffold_search_null_options.collect{|name, i| "<option value='#{i}'>#{name}</option>"}.join("\n")}</select></td></tr>\n"
   form << '</tbody></table>'
   @scaffold_submit_value = @scaffold_title
 end)%>

metadata

@@ -1,33 +1,22 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: scaffolding_extensions
-version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
-  segments: 
-  - 1
-  - 5
-  - 4
-  version: 1.5.4
+version: !ruby/object:Gem::Version
+  version: 1.5.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-14 00:00:00 -07:00
-default_executable: 
+date: 2012-04-05 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: code@jeremyevans.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - MIT-LICENSE
 - README
 - lib/scaffolding_extensions/model/active_record.rb
@@ -59,6 +48,7 @@ files:
 - doc/advanced.txt
 - doc/datamapper.txt
 - doc/rack.txt
+- doc/rails.txt
 - contrib/scaffold_associations_tree/README
 - contrib/scaffold_associations_tree/bullet.gif
 - contrib/scaffold_associations_tree/minus.gif
@@ -84,16 +74,14 @@ files:
 - scaffolds/new.rhtml
 - scaffolds/search.rhtml
 - scaffolds/edit.rhtml
-has_rdoc: true
 homepage: http://scaffolding-ext.rubyforge.org/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --inline-source
 - --line-numbers
 - README
-- LICENSE
+- MIT-LICENSE
 - lib
 - doc/merb.txt
 - doc/camping.txt
@@ -106,34 +94,25 @@ rdoc_options:
 - doc/advanced.txt
 - doc/datamapper.txt
 - doc/rack.txt
-require_paths: 
+- doc/rails.txt
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 59
-      segments: 
-      - 1
-      - 8
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: scaffolding-ext
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Administrative database front-end for multiple web-frameworks and ORMs
 test_files: []
-