mix-rails-message-board 0.22.0 → 0.23.0

data/app/controllers/admix/board_messages_controller.rb

@@ -1,14 +1,14 @@
 class Admix::BoardMessagesController < Admix::InheritedController
 
   def approve
-    resource.approved = :approved
+    resource.status = :approved
     resource.save!
     flash[:notice] = t('boardmessages.flashes.approved')
     redirect_to collection_url
   end
 
   def disapprove
-    resource.approved = :disapproved
+    resource.status = :disapproved
     resource.save!
     flash[:notice] = t('boardmessages.flashes.disapproved')
     redirect_to collection_url

data/app/controllers/board_messages_controller.rb

@@ -17,7 +17,7 @@ class BoardMessagesController < ApplicationController
   end
 
   def show
-    @board_message = BoardMessage.find(params[:id])
+    @board_message = BoardMessage.includes(:board_replies).find(params[:id])
   end
 
 end

data/app/models/admix/board_messages_datagrid.rb

@@ -4,7 +4,7 @@ class Admix::BoardMessagesDatagrid
   extend AdmixHelper
 
   scope do
-    BoardMessage.desc(:date)
+    BoardMessage.order('date DESC')
   end
 
   filter :date do |value|
@@ -22,8 +22,8 @@ class Admix::BoardMessagesDatagrid
     board_message.board_replies.count
   end
 
-  column :approved, header: input_label(:board_message, :approved) do |board_message|
-    board_message.approved.text
+  column :status, header: input_label(:board_message, :status) do |board_message|
+    board_message.status.text
   end
 
   include Admix::TableActions

data/app/models/admix/board_replies_datagrid.rb

@@ -6,7 +6,7 @@ class Admix::BoardRepliesDatagrid
 
 
   scope do
-    BoardReply
+    BoardReply.order('date DESC')
   end
 
   filter :date do |value|
@@ -20,8 +20,8 @@ class Admix::BoardRepliesDatagrid
     board_reply.date.strftime("%d/%m/%Y")
   end
 
-  column :approved, header: input_label(:board_reply, :approved) do |board_reply|
-    board_reply.approved.text
+  column :status, header: input_label(:board_reply, :status) do |board_reply|
+    board_reply.status.text
   end
 
   include Admix::TableActions

data/app/models/board_message.rb

@@ -1,29 +1,20 @@
-class BoardMessage
-  
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  include Mongoid::Paranoia
-
+class BoardMessage < ActiveRecord::Base
   extend Enumerize
 
-  field :name,          type: String
-  field :email,         type: String
-  field :message,       type: String
-  field :date,          type: DateTime, default: -> { Time.now }
-  field :approved,      type: String
-  enumerize :approved, in: [:pending, :approved, :disapproved], default: :pending, predicates: true
-
-
-  validates_presence_of :name
-  validates_presence_of :email
-  validates_presence_of :message
-  validates_presence_of :date
+  attr_accessible :date, :email, :message, :name, :status
+  enumerize :status, in: [:pending, :approved, :disapproved], default: :pending, predicates: true
 
+  validates_presence_of :name, :email, :message, :date
   validates :email, email: true
 
-  scope :approved, where(approved: :approved)
-  scope :pending, where(approved: :pending)
+  scope :approved, where(status: :approved)
+  scope :pending, where(status: :pending)
+
+  has_many :board_replies
 
-  embeds_many :board_replies, cascade_callbacks: true
 
+  default_value_for :date do
+    Time.now
+  end
+  
 end

data/app/models/board_reply.rb

@@ -1,28 +1,27 @@
-class BoardReply
+class BoardReply < ActiveRecord::Base
+  extend Enumerize
   
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  include Mongoid::Paranoia
+  attr_accessible :date, :email, :message, :name, :status
+  enumerize :status, in: [:pending, :approved, :disapproved], default: :pending, predicates: true
 
-  extend Enumerize
+  validates_presence_of :name, :email, :message, :date
+  validates :email, email: true
 
-  field :name,          type: String, default: -> { Setting.app_title }
-  field :email,         type: String, default: -> { Setting.app_email }
-  field :message,       type: String
-  field :date,          type: DateTime, default: -> { Time.now }
-  field :approved,      type: String
-  enumerize :approved, in: [:pending, :approved, :disapproved], default: :approved, predicates: true
-  
+  scope :approved, where(status: :approved)
+  scope :pending, where(status: :pending)
 
-  validates_presence_of :name
-  validates_presence_of :email
-  validates_presence_of :date
+  belongs_to :board_message
 
-  validates :email, email: true
+  default_value_for :name do
+    Setting.app_title
+  end
 
-  scope :approved, where(approved: :approved)
-  scope :pending, where(approved: :pending)
+  default_value_for :email do
+    Setting.app_email
+  end
 
-  embedded_in :board_message
+  default_value_for :date do
+    Time.now
+  end
 
-end
+end

data/app/views/admix/board_messages/_form_fields.html.haml

@@ -2,4 +2,4 @@
 = f.input :email,         as: 'email'
 = f.input :message,       as: 'text'
 = f.input :date,          as: 'datepicker'
-= f.input :approved
+= f.input :status

data/app/views/admix/board_messages/_show.html.haml

@@ -7,10 +7,10 @@
   %dd= resource.message
   %dt= input_label(:board_message, :date)
   %dd= localize(resource.date)
-  %dt= input_label(:board_message, :approved)
+  %dt= input_label(:board_message, :status)
   %dd 
-    = resource.approved.text
-    - if resource.disapproved? or resource.approved.pending?
+    = resource.status.text
+    - if resource.disapproved? or resource.status.pending?
       = link_to image_tag('admix/icons/shield_go.png'), approve_admix_board_message_path(resource), method: :put, data: { confirm: t('message_board.confirms.approve') }, class: 'btn', title:'Aprovar'
-    - if resource.approved.approved? or resource.approved.pending?
+    - if resource.status.approved? or resource.status.pending?
       = link_to image_tag('admix/icons/shield_delete.png'), disapprove_admix_board_message_path(resource), method: :put,data: { confirm: t('message_board.confirms.disapprove') }, class: 'btn', title:'Reprovar'

data/app/views/admix/board_messages/_table_actions.html.haml

@@ -1,6 +1,6 @@
-- if resource.disapproved? or resource.approved.pending?
+- if resource.disapproved? or resource.status.pending?
   = link_to image_tag('admix/icons/shield_go.png'), approve_admix_board_message_path(resource), method: :put, data: { confirm: t('message_board.confirms.approve') }, class: 'btn', title:'Aprovar'
-- if resource.approved.approved? or resource.approved.pending?
+- if resource.status.approved? or resource.status.pending?
   = link_to image_tag('admix/icons/shield_delete.png'), disapprove_admix_board_message_path(resource), method: :put,data: { confirm: t('message_board.confirms.disapprove') }, class: 'btn', title:'Reprovar'
 
 = link_to image_tag('admix/icons/comment_add.png'), new_admix_board_message_board_reply_path(resource), class: 'btn', title:'Adicionar comentário'

data/app/views/admix/board_replies/_form_fields.html.haml

@@ -2,4 +2,4 @@
 = f.input :email,         as: 'email'
 = f.input :message,       as: 'text'
 = f.input :date,          as: 'datepicker'
-= f.input :approved
+= f.input :status

data/app/views/admix/board_replies/_show.html.haml

@@ -7,5 +7,5 @@
   %dd= resource.message
   %dt= input_label(:board_message, :date)
   %dd= localize(resource.date)
-  %dt= input_label(:board_message, :approved)
-  %dd= resource.approved.text
+  %dt= input_label(:board_message, :status)
+  %dd= resource.status.text

data/app/views/admix/board_replies/_table_actions.html.haml

@@ -1,6 +1,6 @@
-- if resource.disapproved? or resource.approved.pending?
+- if resource.disapproved? or resource.status.pending?
   = link_to image_tag('admix/icons/shield_go.png'), approve_admix_board_message_path(resource), method: :put, data: { confirm: t('message_board.confirms.approve') }, class: 'btn', title:'Aprovar'
-- if resource.approved.approved? or resource.approved.pending?
+- if resource.status.approved? or resource.status.pending?
   = link_to image_tag('admix/icons/shield_delete.png'), disapprove_admix_board_message_path(resource), method: :put,data: { confirm: t('message_board.confirms.disapprove') }, class: 'btn', title:'Reprovar'
 
 = link_to image_tag('admix/zoom.png'), resource_url(resource), class: 'btn', title:'Visualizar registro'

data/app/views/board_messages/_board_message.html.haml

@@ -5,7 +5,7 @@
     %small
       %span.white= I18n.localize(board_message.date)
   %p.muted.p.super= board_message.message
-  - if board_message.board_replies?
+  - if board_message.board_replies
     - board_message.board_replies.each do |r|
       .pad.p
         %span.yellow= r.name

data/config/locales/message-board.pt-BR.yml

@@ -11,7 +11,12 @@ pt-BR:
     models:
         board_message: 'Mensagem'
         board_reply: 'Resposta'
-
+  board_messages:
+    board_messages: 'Mural de recados'
+    board_message: 'Recado'
+  board_replies:
+    board_replies: 'Respostas do mural'
+    board_message: 'Resposta'
   simple_form:
     labels:
         board_message:

data/db/migrate/20130208130406_create_board_messages.rb

@@ -0,0 +1,13 @@
+class CreateBoardMessages < ActiveRecord::Migration
+  def change
+    create_table :board_messages do |t|
+      t.string :name
+      t.string :email
+      t.text :message
+      t.datetime :date
+      t.string :status
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20130208130716_create_board_replies.rb

@@ -0,0 +1,14 @@
+class CreateBoardReplies < ActiveRecord::Migration
+  def change
+    create_table :board_replies do |t|
+      t.string :name
+      t.string :email
+      t.text :message
+      t.datetime :date
+      t.string :status
+      
+      t.references :board_message
+      t.timestamps
+    end
+  end
+end

data/lib/mix-rails-message-board/version.rb

@@ -1,7 +1,7 @@
 module MixRailsMessageBoard
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 22
+    MINOR = 23
     TINY  = 0
     PRE   = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mix-rails-message-board
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -56,6 +56,8 @@ files:
 - app/views/message_board_mailer/message_replied.text.erb
 - config/locales/message-board.pt-BR.yml
 - config/routes.rb
+- db/migrate/20130208130406_create_board_messages.rb
+- db/migrate/20130208130716_create_board_replies.rb
 - lib/tasks/message-board_tasks.rake
 - lib/mix-rails-message-board/version.rb
 - lib/mix-rails-message-board/engine.rb
@@ -77,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4450806048339087000
+      hash: -1981333585521857004
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -86,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4450806048339087000
+      hash: -1981333585521857004
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24