templus_models 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5416eadc5dfb02b33423613e21ecd0d4112b64d1
-  data.tar.gz: 4ed46660ad993f61e05a08d8690bcb3e413db680
+  metadata.gz: 6ae4ac517bb260f07241bc4dcda339dee552a95d
+  data.tar.gz: efac55165abfa827d5579bf7cd2e84375127ff1f
 SHA512:
-  metadata.gz: 07e8a4ca8cbd5561af6a8892ecd279a54ebacdfaa6c887f578846bc7a00a8be32e38e5a26bccfb565dbf259fa67bf263c6d8e1733a1ea7cfaab5d05f155b8066
-  data.tar.gz: f57354012a1de695d90378856005f381345fc671a5a12200ea17bcc4db40f03e39a3cb2c8985a86cb81437173cd7a1f4b1a2c0b73c8f5e32f922119383721b31
+  metadata.gz: 5f0b6acb81a5f1361d9ce228fabf6f3708cebdfb24ae8e042da7e67418a534c074f23d89de40d6d165ef04fb4c6c9a41af5b06d70485c927254189aa0d6f3dd3
+  data.tar.gz: 71a4c2b6cad80f5ca692a46f392816d1409263ca858775a758469cd6ed1d34a91fe93bc0fdcee722946afa55d0e8db704935b44c29dd63b68e2d085833e91076

data/app/controllers/crud_controller.rb

@@ -144,9 +144,19 @@ class CrudController < ApplicationController
       end
     end
   	@crud_helper.form_groups.each do |key, groups|
-      group = {"#{key}_attributes" => [:id, :_destroy]}
-  		groups.each do |field|
-        group["#{key}_attributes"] << field[:attribute]
+      chave = "#{key}_attributes"
+      group = {chave => [:id, :_destroy]}
+      groups.each do |field|
+        modelo = key.to_s.camelcase.constantize
+        if modelo.reflect_on_association(field[:attribute])
+          if modelo.reflect_on_association(field[:attribute]).macro == :belongs_to
+            group[chave] << "#{field[:attribute]}_id".to_sym
+          else
+            group[chave] << {"#{field[:attribute].to_s.singularize}_ids".to_sym => []}
+          end
+        elsif (modelo.columns_hash[field[:attribute].to_s] || (modelo.respond_to?(:params_permitt) && modelo.params_permitt.include?(field[:attribute].to_sym)))
+          group[chave] << field[:attribute]
+        end
       end
       fields << group
     end

data/app/raro_crud/raro_crud.rb

@@ -267,6 +267,33 @@ class RaroCrud
     end
   end
   
+  def self.adicionar_endereco
+    @@form_group[self.to_s.to_sym] ||= {}
+    @@form_group[self.to_s.to_sym][:endereco] ||= []
+    [
+     {campo: :cep,  label: "CEP"},
+     {campo: :logradouro,  label: "Endereço"},
+     {campo: :numero,  label: "Número"},
+     {campo: :complemento,  label: "Complemento"},
+     {campo: :bairro,  label: "Bairro"},
+     {campo: :estado,  label: "Estado", collection: Estado.order(:sigla).pluck(:sigla)},
+     {campo: :cidade_id,  label: "Cidade", collection_if: Proc.new{|f| f.try(:object).try(:new_record?) ? [] : (f.try(:object).try(:estado).try(:cidades) || [])}}
+    ].each do |field|
+      value = {}
+      field.each do |atr|
+        if atr[0] == :campo
+          value[:attribute] = atr[1]
+        else
+          value[:sf] ||= {}
+          value[:sf][atr[0]] = atr[1]
+        end
+      end
+      @@form_group[self.to_s.to_sym][:endereco].push({attribute: value[:attribute],sf: value[:sf]})
+    end
+    @@form_scripts[self.to_s.to_sym] ||= []
+    @@form_scripts[self.to_s.to_sym] << "cidade_estado"
+  end
+  
   def self.script_formulario(script)
     @@form_scripts[self.to_s.to_sym] ||= []
     @@form_scripts[self.to_s.to_sym] << script.to_s

data/app/views/crud/_show.html.erb

@@ -16,7 +16,7 @@
 								<% else %>
 									<td><%= l @record.send(field[:attribute]) if @record.send(field[:attribute]).present?%></td>
 								<% end %>
-							<% elsif @model.reflect_on_association(field[:attribute]) &&  @model.reflect_on_association(field[:attribute]).macro != :belongs_to%>
+							<% elsif @model.reflect_on_association(field[:attribute]) &&  @model.reflect_on_association(field[:attribute]).macro != :belongs_to && @model.reflect_on_association(field[:attribute]).macro != :has_one%>
 								<td>
 									<% @record.send(field[:attribute]).each do |rec| %>
 										<li>

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/test/dummy/app/assets/javascripts/crud/cidade_estado.js

@@ -0,0 +1,17 @@
+$(document).ready(function (){
+	$("select[id$='_estado']").on('change', function() {
+		$.getJSON('/api/cidades/busca?estado=' + $(this).val(), {
+			format: 'json'
+		}, function(data) {
+			var i, options;
+			options = "";
+			i = 0;
+			while (i < data.length) {
+				options += "<option value='" + data[i].id + "'>" + data[i].nome + "</option>";
+				i++;
+			}
+			$("select[id$='cidade_id']").html(options).show();
+			$("select[id$='cidade_id']").trigger('select');
+		});
+	});
+});

data/test/dummy/app/controllers/api/cidades_controller.rb

@@ -0,0 +1,12 @@
+class Api::CidadesController < ApplicationController
+  def busca
+    respond_to do |format|
+      @estado = Estado.find_by(sigla: params[:estado])
+      puts "*******************************************"
+      p @estado
+      puts "*******************************************"
+      @cidades = Cidade.por_estado(@estado.try(:id))
+      format.json  { render json: @cidades }
+    end
+  end
+end

data/test/dummy/app/models/cidade.rb

@@ -0,0 +1,7 @@
+class Cidade < ActiveRecord::Base
+  belongs_to :estado
+  scope :por_estado, -> (estado_id) {where(estado_id: estado_id)}
+  def to_s
+    nome
+  end
+end

data/test/dummy/app/models/endereco.rb

@@ -0,0 +1,10 @@
+class Endereco < ActiveRecord::Base
+  belongs_to :cidade
+  delegate :estado, to: :cidade, allow_nil: true
+  belongs_to :usuario, :class_name => "Usuario", :foreign_key => "usuario_id"
+  def to_s
+    if logradouro.present?
+      "#{logradouro}, #{numero} #{complemento}, #{bairro}, #{cidade.try(:cidade_estado)}"
+    end
+  end
+end

data/test/dummy/app/models/estado.rb

@@ -0,0 +1,6 @@
+class Estado < ActiveRecord::Base
+  has_many :cidades, :class_name => "Cidade", :foreign_key => "estado_id"
+  def to_s
+    sigla
+  end
+end

data/test/dummy/app/models/usuario.rb

@@ -0,0 +1,22 @@
+class Usuario < ActiveRecord::Base
+
+  validates_presence_of :nome, :email
+  has_one :endereco, :class_name => "Endereco", :foreign_key => "usuario_id"
+  accepts_nested_attributes_for :endereco, :allow_destroy => true
+
+  def to_s
+    nome
+  end
+
+  def ability
+    @ability ||= Ability.new(self)
+  end
+  
+  def self.current
+    return Thread.current[:current_usuario]
+  end
+  
+  def self.current=(usuario)
+    Thread.current[:current_usuario] = usuario
+  end
+end

data/test/dummy/app/raro_crud/usuario_crud.rb

@@ -0,0 +1,21 @@
+class UsuarioCrud < RaroCrud
+  titulo "Usuários"
+
+  link_superior "Novo Usuário", id: "novo-button", icon: "plus", link: "new"
+
+  ordenar_por :nome
+
+  campo_tabela :nome,  label: "Nome"
+  campo_tabela :email, label: "email"
+
+  campo_formulario :nome, label: "Nome"
+  campo_formulario :email, label: "Email", default_test_pos: "@rarolabs.com"
+  adicionar_endereco
+
+  campo_visualizacao :nome,  label: "Nome"
+  campo_visualizacao :email, label: "email"
+  campo_visualizacao :endereco, label: "Endereço"
+
+  campo_busca :nome,  label: "Nome"
+  campo_busca :email, label: "email"
+end

data/test/dummy/config/routes.rb

@@ -53,4 +53,12 @@ Rails.application.routes.draw do
   #     # (app/controllers/admin/products_controller.rb)
   #     resources :products
   #   end
+  
+  namespace :api do
+    resources :cidades, only: [] do
+      collection do
+        get 'busca'
+      end
+    end
+  end
 end

data/test/dummy/db/migrate/20150413190054_devise_create_usuarios.rb

@@ -0,0 +1,48 @@
+class DeviseCreateUsuarios < ActiveRecord::Migration
+  def change
+    create_table(:usuarios) do |t|
+      ## Database authenticatable
+      t.string :email,              null: false, default: ""
+      t.string :encrypted_password, null: false, default: ""
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Rememberable
+      t.datetime :remember_created_at
+
+      ## Trackable
+      t.integer  :sign_in_count, default: 0, null: false
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+
+      ## Confirmable
+      # t.string   :confirmation_token
+      # t.datetime :confirmed_at
+      # t.datetime :confirmation_sent_at
+      # t.string   :unconfirmed_email # Only if using reconfirmable
+
+      ## Lockable
+      t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      t.datetime :locked_at
+
+      ## Permissions
+      t.references :papel, index: true
+      t.boolean :root, default: false
+      
+      ## Informações adicionais
+      t.string :nome
+      
+      t.timestamps
+    end
+
+    add_index :usuarios, :email,                unique: true
+    add_index :usuarios, :reset_password_token, unique: true
+    # add_index :usuarios, :confirmation_token,   unique: true
+    # add_index :usuarios, :unlock_token,         unique: true
+  end
+end

data/test/dummy/db/migrate/20150422182314_create_estados.rb

@@ -0,0 +1,10 @@
+class CreateEstados < ActiveRecord::Migration
+  def change
+    create_table :estados do |t|
+      t.string :nome
+      t.string :sigla
+
+      t.timestamps null: false
+    end
+  end
+end

data/test/dummy/db/migrate/20150422182356_create_cidades.rb

@@ -0,0 +1,10 @@
+class CreateCidades < ActiveRecord::Migration
+  def change
+    create_table :cidades do |t|
+      t.string :nome
+      t.references :estado, index: true, foreign_key: true
+
+      t.timestamps null: false
+    end
+  end
+end

data/test/dummy/db/migrate/20150422191007_create_enderecos.rb

@@ -0,0 +1,15 @@
+class CreateEnderecos < ActiveRecord::Migration
+  def change
+    create_table :enderecos do |t|
+      t.string :cep
+      t.string :logradouro
+      t.string :complemento
+      t.string :numero
+      t.string :bairro
+      t.references :cidade, index: true, foreign_key: true
+      t.references :usuario, index: true, foreign_key: true
+      
+      t.timestamps null: false
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,38 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150416220930) do
+ActiveRecord::Schema.define(version: 20150422191007) do
+
+  create_table "cidades", force: :cascade do |t|
+    t.string   "nome"
+    t.integer  "estado_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  add_index "cidades", ["estado_id"], name: "index_cidades_on_estado_id"
+
+  create_table "enderecos", force: :cascade do |t|
+    t.string   "cep"
+    t.string   "logradouro"
+    t.string   "complemento"
+    t.string   "numero"
+    t.string   "bairro"
+    t.integer  "cidade_id"
+    t.integer  "usuario_id"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
+  end
+
+  add_index "enderecos", ["cidade_id"], name: "index_enderecos_on_cidade_id"
+  add_index "enderecos", ["usuario_id"], name: "index_enderecos_on_usuario_id"
+
+  create_table "estados", force: :cascade do |t|
+    t.string   "nome"
+    t.string   "sigla"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
 
   create_table "teste1s", force: :cascade do |t|
     t.string   "descricao"
@@ -28,4 +59,28 @@ ActiveRecord::Schema.define(version: 20150416220930) do
     t.datetime "updated_at"
   end
 
+  create_table "usuarios", force: :cascade do |t|
+    t.string   "email",                  default: "",    null: false
+    t.string   "encrypted_password",     default: "",    null: false
+    t.string   "reset_password_token"
+    t.datetime "reset_password_sent_at"
+    t.datetime "remember_created_at"
+    t.integer  "sign_in_count",          default: 0,     null: false
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
+    t.integer  "failed_attempts",        default: 0,     null: false
+    t.datetime "locked_at"
+    t.integer  "papel_id"
+    t.boolean  "root",                   default: false
+    t.string   "nome"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "usuarios", ["email"], name: "index_usuarios_on_email", unique: true
+  add_index "usuarios", ["papel_id"], name: "index_usuarios_on_papel_id"
+  add_index "usuarios", ["reset_password_token"], name: "index_usuarios_on_reset_password_token", unique: true
+
 end