foldscaf 0.0.8 → 1.0.0

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v1.0.0
+* Eliminación de mini_form generator
+* Eliminación de vista _mini_form.erb
+* Index ahora tiene buscador y paginación
+* Controller ahora usa Ordenable en lugar de Sortable
+* Controller adaptado a buscador
+* Botones importantes ahora a la derecha del titulo
+
 ## v0.0.7
 * Mejorado boton para Ordenar
 * Id de tablas ahora corresponde al tableize de la clase del elemento, en lugar de a :listado (esto permite trabajar con multiples tablas).

data/README.md

@@ -2,7 +2,8 @@
 
 Incluye varios generadores adaptados a las necesidades de Xaver.
 Debe usarse en conjunto con el template de Xaver.
-
+Versión 1.0.0 Presenta incompatibilidades con versiones pasadas y con XaverTemplates <= 1.0.0
+Con recaudos, puede usarse en versiones anteriores de XaverTemplate, 
 
 ## Instalación
 

data/lib/generators/fold/fold_generator.rb

@@ -43,7 +43,7 @@ class FoldGenerator < Rails::Generators::Base
     template 'controller.erb', "app/controllers/#{@plural}_controller.rb"
     template 'admin_controller.erb', "app/controllers/admin/#{@plural}_controller.rb"
     
-    %w[_form _mini_form edit index new].each do |action| 
+    %w[_form edit index new].each do |action| 
     template "views/#{action}.erb", "app/views/admin/#{@plural}/#{action}.html.erb"
     end
     template "views/nombre.erb", "app/views/admin/#{@plural}/_#{@singular}.html.erb"

data/lib/generators/fold/templates/admin_controller.erb

@@ -2,14 +2,16 @@
 class Admin::<%= @classes %>Controller < Admin::AdminController
   load_and_authorize_resource
 <%- if @con_orden -%>
-  include Sortable
+  include Ordenable
 <%- end -%>
 
   def index
-    @<%= @singular %> = <%= @class %>.new
+    @q = <%= @class %>.search params[:q]
+    @<%= @plural %> = @q.relation.page(params[:page]).per(50)
   end
 
   def new
+    @<%= @plural %> = <%= @class %>.last(5)
   end
   
   def create

data/lib/generators/fold/templates/views/_form.erb

@@ -1,4 +1,4 @@
-<%%= simple_form_for <%= @singular %>, :url => url, :html => { :class => 'form-horizontal' } do |f| %>
+<%%= simple_form_for <%= @singular %>, :url => url, :remote => remote, :html => { :class => 'form-horizontal' } do |f| %>
 <%- @atributos.each do |a| -%>
   <%%= f.<%= a.clase == :references ? :association : :input %> :<%= a.nombre %> %>
 <%- end -%>

data/lib/generators/fold/templates/views/edit.erb

@@ -1,9 +1,10 @@
 <div class="page-header">
-  <h1>Editar <%= @class %></h1>
+  <div class="row">
+    <div class="span6"><h1>Editar <%= @class %></h1></div>
+    <div class="span3" style="text-align:right;">
+      <%%= link_to icono('arrow-left', :blanco) + ' Volver', <%= @plural_path %>, :class => 'btn btn-primary btn-large' %>
+    </div>
+  </div>
 </div>
 
-<nav class="well">
-  <%%= link_to "Volver", <%= @plural_path %>, :class => 'btn' %>
-</nav>
-
-<%%= render "form", :<%= @singular %> => @<%= @singular %>, :url => <%=  @singular_path %>(@<%= @singular %>) %>
+<%%= render "form", :<%= @singular %> => @<%= @singular %>, :url => <%=  @singular_path %>(@<%= @singular %>), :remote => false %>

data/lib/generators/fold/templates/views/index.erb

@@ -1,19 +1,24 @@
 <div class="page-header">
-  <h1><%= @classes %></h1>
+  <div class="row">
+    <div class="span6"><h1><%= @classes %></h1></div>
+    <div class="span3" style="text-align:right;"><%%= link_to icono('plus', :blanco) + " Agregar <%= @singular %>", <%= @new_path %>, :class => 'btn btn-primary btn-large' %></div>
+  </div>
 </div>
 
-<nav class="well">
-  <%%= button_tag icono('zoom-in') + " Mostrar formulario", :class => :btn, :data => { :toggle => :collapse, :target => '#mini'} %>
-  <%%= link_to icono('plus', :blanco) + " Agregar <%= @singular %>", <%= @new_path %>, :class => 'btn btn-primary' %>
-</nav>
+<%%= simple_form_for @q, :as => :q, :url => <%= @plural_path %>, :method => :get do |f| %>
+  <%%= f.input :<%= @identificador %>_contains, :placeholder => '<%= @identificador.humanize %>', :required => false, :wrapper => :mini, :input_html => { :class => 'input-large search-query' }, :autofocus => true %>
+  <%%= f.button :submit, "Buscar", :name => nil, :disable_with => t("espere"), :class => 'btn btn-primary' %>
+<%% end %>
 
-<%%= render "mini_form", :<%= @singular %> => @<%= @singular %>, :url => <%= @plural_path %> %>
+<%%= paginate @<%= @plural %>, :theme => :bootstrap %>
 
-<%%= content_tag :table, :id => @<%= @singular %>.class.name.tableize, :class => [:table, :"table-striped", :ordenable] do %>
+<%%= content_tag :table, :id => nombre_tabla(<%= @class %>), :class => [:table, :"table-striped", :ordenable] do %>
   <%%= thead :<%= @identificador %> %>
   <%%= content_tag :tbody, render(@<%= @plural %>) %>
 <%% end %>
 
+<%%= paginate @<%= @plural %>, :theme => :bootstrap %>
+
 <%- if @con_orden -%>
 <%%= hidden_field_tag :url, <%= @reordenar_path %>, :class => :url %>
 <%- end -%>

data/lib/generators/fold/templates/views/new.erb

@@ -1,9 +1,15 @@
 <div class="page-header">
-  <h1>Agregar <%= @class %></h1>
+  <div class="row">
+    <div class="span6"><h1>Agregar <%= @class %></h1></div>
+    <div class="span3" style="text-align:right;">
+      <%%= link_to icono('arrow-left', :blanco) + ' Volver', <%= @plural_path %>, :class => 'btn btn-primary btn-large' %>
+    </div>
+  </div>
 </div>
 
-<nav class="well">
-  <%%= link_to "Volver", <%= @plural_path %>, :class => 'btn' %>
-</nav>
+<%%= content_tag :table, :id => nombre_tabla(<%= @class %>), :class => [:table, :"table-striped", :ordenable] do %>
+  <%%= thead :<%= @identificador %> %>
+  <%%= content_tag :tbody, render(@<%= @plural %>) %>
+<%% end %>
 
-<%%= render "form", :<%= @singular %> => @<%= @singular %>, :url => <%=  @plural_path %> %>
+<%%= render "form", :<%= @singular %> => @<%= @singular %>, :url => <%=  @plural_path %>, :remote => true %>

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Foldscaf
-  VERSION = "0.0.8"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foldscaf
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000Z
+date: 2012-05-16 00:00:00.000000000Z
 dependencies: []
 description: Generadores adaptados a las necesidades de Xaver
 email:
@@ -34,14 +34,10 @@ files:
 - lib/generators/fold/templates/migration.erb
 - lib/generators/fold/templates/model.erb
 - lib/generators/fold/templates/views/_form.erb
-- lib/generators/fold/templates/views/_mini_form.erb
 - lib/generators/fold/templates/views/edit.erb
 - lib/generators/fold/templates/views/index.erb
 - lib/generators/fold/templates/views/new.erb
 - lib/generators/fold/templates/views/nombre.erb
-- lib/generators/mini_form/USAGE
-- lib/generators/mini_form/mini_form_generator.rb
-- lib/generators/mini_form/templates/mini_form.rb
 - lib/version.rb
 homepage: http://github.com/nicanorperera/foldscaf
 licenses: []

data/lib/generators/fold/templates/views/_mini_form.erb

@@ -1,4 +0,0 @@
-<%%= mini_form_for <%= @singular %>, :url => url, :remote => true do |f| %>
-  <%%= f.input :<%= @identificador %>, :placeholder => '<%= @identificador.humanize %>' %>
-  <%%= f.button :submit, :name => nil, :disable_with => t("espere"), :class => 'btn btn-primary' %>
-<%% end %>

data/lib/generators/mini_form/USAGE

@@ -1,8 +0,0 @@
-Description:
-    Instala los componentes necesarios para que funcione mini_form.
-
-Example:
-    rails generate mini_form
-
-    This will create:
-        lib/mini_form.rb

data/lib/generators/mini_form/mini_form_generator.rb

@@ -1,11 +0,0 @@
-# -*- encoding : utf-8 -*-
-class MiniFormGenerator < Rails::Generators::Base
-  source_root File.expand_path('../templates', __FILE__)
-  
-  def initialize(*arguments, &block)
-    super
-  end
-  def body
-    copy_file 'mini_form.rb', 'lib/mini_form.rb'
-  end
-end

data/lib/generators/mini_form/templates/mini_form.rb

@@ -1,25 +0,0 @@
-module MiniForm
-  def mini_form_for(object, *args, &block)
-    args ||= []
-    options = args.extract_options!.merge!({:wrapper => :mini, :html => {:id => :mini, :class => 'collapse form-inline'}})
-    simple_form_for(object, *(args << options.merge(:builder => MiniFormBuilder)), &block)
-  end
-  
-  class MiniFormBuilder < SimpleForm::FormBuilder
-    def input(attribute_name, options = {}, &block)
-      options[:input_html] = { :class => 'input-medium'}
-      super
-    end
-  end
-  
-  # Wrapper para Mini Formularios 
-  # TODO: encontrar la manera de cambiar la clase de todos los input por 'input-medium'
-  SimpleForm.setup do |config|
-    config.wrappers :mini, :tag => 'span' , :class => 'controls', :error_class => 'error' do |b|
-      b.use :html5
-      b.use :placeholder
-      b.use :input
-      b.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
-    end
-  end
-end