foldscaf 2.0.0.rc1 → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f7d3d0b22f0d5aa42ce91cc8a8a3dda338fa28e
-  data.tar.gz: f236e61baca2a8a3ebf4d7258099dfa80d34ebb4
+  metadata.gz: ab40cfaef66dbc87c3b6b0da1383ef4064c7ff04
+  data.tar.gz: 799cb3ba0267dbb0d52c706e364e5f38aafc3588
 SHA512:
-  metadata.gz: 98657825eb56dfbbc320b1106005008eee6a2e59c630898f72f54931af5e9c2c4eb09a72ac0767eba0eff54e5310dbbfbd72db24e43788885e9fee0083eaa752
-  data.tar.gz: 4b2ce1bafa6e7d73e37f044d3bbb03907237ddbfa376100f9090d1761f3c36c95f5dbabc8fef0b34bc469e17d127433aee52e814618c903a2a16cf1881f5cbde
+  metadata.gz: ec552e383f7e163ade814fdf10ddca7286228913d0e34da90295154027d31a98c00d809ff86d9ee702913e2ad4480ef2f96d3888173a085c0b58b256abdefe8a
+  data.tar.gz: 8573cb1a3038988645cdbd53e8b7d755229a83c670538470a149d26cac5a755d095e2ec6cff28aa51d16e1f1674e1505b92a7b291fa10980aa54341ad867c1d6

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-## v2.0.0.beta1
+## v2.0.0.rc2
+* Minor fixes.
+* Tipo :imagen. Agrega todo lo necesario para hacer que ese atributo sea una imagen.
+* Opción -R: Crea un archivo cargar_modelo.rake en lib/tasks con el formato predeterminado de los rakes.
+
+## v2.0.0.rc1
 * Minor fixes.
 * Helpers.
 

data/lib/generators/fold/USAGE

@@ -2,7 +2,7 @@ Descripción:
     Generador Scaffold-Like adaptado a las necesidades de Xaver.
 
 Ejemplo:
-    rails generate fold recurso nombre descripcion contenido:text es_destacado:boolean:true
+    rails generate fold recurso nombre descripcion contenido:text es_destacado:boolean:true banner:imagen
 
     Esto generará:
         app/models/recurso
@@ -18,6 +18,8 @@ Ejemplo:
         app/views/admin/new.html.erb
         app/views/admin/index.html.erb
 
+        lib/tasks/cargar_recursos.html
+
     Se pueden utilizar muchas opciones. Por ejemplo:
-    
-    rails generate fold recurso nombre:index categoria:string{100}:uniq contenido:text precio:decimal{15.2} -O -A -S
+
+    rails generate fold recurso nombre:index categoria:string{100}:uniq contenido:text precio:decimal{15.2} banner:imagen -O -A -S -R

data/lib/generators/fold/fold_generator.rb

@@ -16,6 +16,7 @@ class FoldGenerator < ActiveRecord::Generators::Base
   class_option :ordenable, :desc => 'el modelo se puede reordenar', :type => :boolean, :aliases => "-O", :default => false
   class_option :archivable, :desc => 'el modelo tiene archivos', :type => :boolean, :aliases => "-A", :default => false
   class_option :sluggable, :desc => 'el modelo tiene una url amigable', :type => :boolean, :aliases => "-S", :default => false
+  class_option :rake, :desc => "crear archivo rake", :type => :boolean, :aliases => "-R", :default => false
   class_option :padre, :desc => "el padre del modelo", :type => :string, :aliases => "-P"
 
   class_option :orm, :type => :string, :required => true
@@ -34,6 +35,10 @@ class FoldGenerator < ActiveRecord::Generators::Base
     insert_into_file "app/views/admin/admin/_nav_lateral.html.erb", "\n    <li><%= link_to '#{plural_name.humanize}', #{@paths[:index]} if can? :index, #{class_name} %></li>", :after => '<li class="nav-header">General</li>'
   end
 
+  def rake_cargar_todo
+    insert_into_file "lib/tasks/cargar_todo.rake", "\n    cargar :#{table_name}", :before => "\n    puts 'Listo!'" if options.rake?
+  end
+
   private
 
   def attributes_with_index
@@ -44,6 +49,26 @@ class FoldGenerator < ActiveRecord::Generators::Base
     attributes.select &:reference?
   end
 
+  def imagen_attributes
+    attributes.select { |a| a.type == :imagen }
+  end
+
+  def estandar_attributes
+    attributes - reference_attributes - imagen_attributes
+  end
+
+  def listable_attributes
+    estandar_attributes + reference_attributes
+  end
+
+  def accessible_attributes
+    array = estandar_attributes.map { |a| ":#{a.name}" }
+    array.push imagen_attributes.map { |a| [":#{a.name}", ":remove_#{a.name}"] }
+    array.push reference_attributes.map { |a| ":#{a.name}_id" }
+    array.push [":adjuntos_attributes", ":fotos_attributes", ":videos_attributes"] if options.archivable?
+    array.flatten.join(', ')
+  end
+
   def parent_class_name
     options[:padre] || "ActiveRecord::Base"
   end

data/lib/generators/fold/helpers/paths.rb

@@ -25,6 +25,10 @@ module Fold
       File.join 'app/views', namespace.to_s, class_path, table_name, "#{action}.erb"
     end
 
+    def rake_path(filename)
+      File.join 'lib/tasks', "#{filename}.rake"
+    end
+
     private
 
     def fecha

data/lib/generators/fold/helpers/templates.rb

@@ -6,6 +6,7 @@ module Fold
       !options.padre? ? migrations : puts("Recuerde que debe agregar la columna :type a la tabla :#{options[:padre].tableize}")
       controllers
       views
+      rake if options.rake?
     end
 
     private
@@ -31,5 +32,9 @@ module Fold
       template "views/_partial.html.erb", view_path("_#{file_name}.html", :admin)
     end
 
+    def rake
+      template 'rake.rake', rake_path("cargar_#{table_name}")
+    end
+
   end
 end

data/lib/generators/fold/templates/migration.rb

@@ -1,9 +1,15 @@
 class <%= migration_class_name %> < ActiveRecord::Migration
   def change
     create_table :<%= table_name %> do |t|
-<% attributes.each do |attribute| -%>
+<% estandar_attributes.each do |attribute| -%>
       t.<%= attribute.type %> :<%= attribute.name %><%= attribute.inject_options %>
 <% end -%>
+<% imagen_attributes.each do |attribute| -%>
+      t.string :<%= attribute.name %>_uid, :<%= attribute.name %>_name
+<% end -%>
+<% reference_attributes.each do |attribute| -%>
+      t.references :<%= attribute.name %><%= attribute.inject_options %>
+<% end -%>
 
 <% if options.ordenable? %>
       t.integer :orden

data/lib/generators/fold/templates/model.rb

@@ -8,9 +8,12 @@ class <%= class_name %> < <%= parent_class_name.classify %>
   extend FriendlyId
   friendly_id <%= ":#{attributes.first.name}" if attributes.first.name != "nombre" %>
 <%- end -%>
-<% if attributes.any? %>
-  attr_accessible <%= attributes.map { |a| ":#{a.name}#{"_id" if a.reference?}" }.join(', ') %>
+<% if accessible_attributes.present? %>
+  attr_accessible <%= accessible_attributes %>
 <%- end -%>
+<% if imagen_attributes.any? %>
+  after_create :guardar_archivos!
+<% end -%>
 <% reference_attributes.each do |attribute| %>
   belongs_to :<%= attribute.name %>
 <%- end -%>
@@ -20,6 +23,11 @@ class <%= class_name %> < <%= parent_class_name.classify %>
   has_many :adjuntos, :as => :propietario
   has_many :videos, :as => :propietario
   accepts_nested_attributes_for :fotos, :adjuntos, :videos
+<% end %>
+<%- imagen_attributes.each do |attribute| -%>
+  image_accessor :<%= attribute.name %> do
+    storage_path { |f| File.join carpeta, "<%= attribute.name %>-#{rand(10000)}.#{f.format}" }
+  end
 <% end %>
   ##############################################################################
   #### SCOPES Y VALIDACIONES
@@ -32,7 +40,7 @@ class <%= class_name %> < <%= parent_class_name.classify %>
   ##############################################################################
   #### MÉTODOS PÚBLICOS
   ##############################################################################
-<% if options.archivable? %>
+<% if options.archivable? || imagen_attributes.any? %>
   def carpeta
     File.join Rails.env, self.class.name.tableize, id.to_s
   end
@@ -57,6 +65,10 @@ class <%= class_name %> < <%= parent_class_name.classify %>
   ##############################################################################
 
   private
-
+<% if imagen_attributes.any? %>
+  def guardar_archivos!
+    update_attributes! <%= imagen_attributes.map { |a| ":#{a.name} => #{a.name}" }.join(", ") %>
+  end
+<% end -%>
 end
 <% end -%>

data/lib/generators/fold/templates/rake.rake

@@ -0,0 +1,5 @@
+# -*- encoding : utf-8 -*-
+namespace :cargar do
+  task :<%= table_name %> => :environment do
+  end
+end

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

@@ -1,9 +1,15 @@
 <%%= simple_form_for <%= singular_table_name %>, :url => [:admin, <%= singular_table_name %>], :html => { :class => 'form-horizontal' }, :defaults => { :input_html => { :class => 'input-xlarge' } } do |f| %>
-<%- attributes.each_with_index do |atributo, i| -%>
+<%- estandar_attributes.each_with_index do |atributo, i| -%>
   <%%= f.<%= atributo.reference? ? :association : :input %> :<%= atributo.name %><%= ", :as => :date_html" if atributo.type.to_s.in? ["date", "datetime"] %><%= ", :autofocus => true" if i.zero? %> %>
 <%- end -%>
+<%- imagen_attributes.each_with_index do |atributo, i| -%>
+  <%%= render 'imagen', f: f, atributo: :<%= atributo.name %> %>
+<%- end -%>
+<%- reference_attributes.each_with_index do |atributo, i| -%>
+  <%%= f.association :<%= atributo.name %> %>  
+<%- end -%>
 
-<div class="form-actions">
-  <%%= f.button :submit, :name => nil, :data => { :disable_with => t('espere') }, :class => 'btn btn-primary' %>
-</div>
+  <div class="form-actions">
+    <%%= f.button :submit, :name => nil, :data => { :disable_with => t('espere') }, :class => 'btn btn-primary' %>
+  </div>
 <%% end %>

data/lib/generators/fold/templates/views/_partial.html.erb

@@ -1,5 +1,5 @@
 <%%= tr_for <%= singular_table_name %> do %>
-<%- for atributo in attributes.first(3) -%>
+<%- for atributo in listable_attributes.first(3) -%>
   <td><%%= <%= "number_to_currency " if atributo.name =~ /precio/ %><%= singular_table_name %>.<%= atributo.name %> %></td>
 <%- end -%>
   <td><%%= acciones <%= ":mover => boton_mover(#{class_name}), " if options.ordenable? %><%= ":archivos => boton_archivos(#{singular_table_name}), " if options.archivable? %>:editar => boton_editar(<%= singular_table_name %>), :eliminar => boton_eliminar(<%= singular_table_name %>) %></td>

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

@@ -5,8 +5,8 @@
   <h1><%= plural_name.humanize %></h1>
 </div>
 
-<%%= content_tag :table, :id => nombre_tabla(<%= class_name %>), :class => [:table, :"table-striped"<%= ", :ordenable" if options.ordenable? %>] do %>
-  <%%= thead <%= attributes.first(3).map{ |a| ":#{a.name}" }.join(", ") %> %>
+<%%= content_tag :table, :id => nombre_tabla(<%= class_name %>), :class => ["table", "table-condensed", "table-hover"<%= ", :ordenable" if options.ordenable? %>] do %>
+  <%%= thead <%= listable_attributes.first(3).map{ |a| ":#{a.name}" }.join(", ") %> %>
   <%%= content_tag :tbody, render(@<%= plural_table_name %>) %>
 <%- if options.ordenable? -%>
   <%%= hidden_field_tag :url, url_for(<%= @paths[:reordenar] %>), :class => :url %>

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Foldscaf
-  VERSION = "2.0.0.rc1"
+  VERSION = "2.0.0.rc2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foldscaf
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Nicanor Perera
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sorcery
@@ -106,6 +106,7 @@ files:
 - lib/generators/fold/templates/controller.rb
 - lib/generators/fold/templates/migration.rb
 - lib/generators/fold/templates/model.rb
+- lib/generators/fold/templates/rake.rake
 - lib/generators/fold/templates/views/_form.html.erb
 - lib/generators/fold/templates/views/_partial.html.erb
 - lib/generators/fold/templates/views/edit.html.erb
@@ -131,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: foldscaf
-rubygems_version: 2.0.2
+rubygems_version: 2.0.0.rc.2
 signing_key: 
 specification_version: 4
 summary: Generadores adaptados a las necesidades de Xaver