mix-rails 0.22.0 → 0.23.0

data/mix-rails-message-board/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/mix-rails-message-board/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/mix-rails-message-board/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/mix-rails-message-board/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/mix-rails-message-board/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/mix-rails-message-board/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/mix-rails-message-board/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/mix-rails-message-board/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/mix-rails-message-board/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/mix-rails-message-board/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/mix-rails-message-board/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/mix-rails-message-board/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/mix-rails-message-board/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/mix-rails-message-board/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/mix-rails-message-board/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/mix-rails-message-board/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
 

data/mix-rails-settings/Gemfile

@@ -9,6 +9,7 @@ gemspec
 
 gem "jquery-rails"
 gem "haml-rails"
+gem "rspec-rails"
 
 # Declare any dependencies that are still in development here instead of in
 # your gemspec. These might include edge Rails or gems from your path or

data/mix-rails-settings/app/models/admix/settings_datagrid.rb

@@ -3,7 +3,7 @@ class Admix::SettingsDatagrid
   include Datagrid
 
   scope do
-    Setting.desc(:name)
+    Setting
   end
 
   filter :name, :string

data/mix-rails-settings/app/models/setting.rb

@@ -1,19 +1,11 @@
-class Setting
-  include Mongoid::Document
-
-  field :name,      type: String
-  field :key,       type: String
-  field :value
-  field :activated,  type: Boolean
-  field :system,    type: Boolean, default: false
-
-  validates_uniqueness_of :key
+class Setting < ActiveRecord::Base
+  attr_accessible :activated, :key, :name, :system, :value, :image, :image_cache
 
   mount_uploader :image, Settings::ImageUploader
-
+  
   def self.app_title
     begin
-      Setting.find_by(key: 'app_title', activated: true).value
+      Setting.where(key: 'app_title', activated: true).first.value
     rescue
       false
     end
@@ -21,7 +13,7 @@ class Setting
 
   def self.app_email
     begin
-      Setting.find_by(key: 'app_email', activated: true).value
+      Setting.where(key: 'app_email', activated: true).first.value
     rescue
       false
     end
@@ -29,7 +21,7 @@ class Setting
   
   def self.admix_logo
     begin
-      Setting.find_by(key: 'admix_logo', activated: true)
+      Setting.where(key: 'admix_logo', activated: true).first
     rescue
       false
     end
@@ -37,7 +29,7 @@ class Setting
 
   def self.link_twitter
     begin
-      Setting.find_by(key: 'link_twitter', activated: true).value
+      Setting.where(key: 'link_twitter', activated: true).first.value
     rescue
       false
     end
@@ -45,7 +37,7 @@ class Setting
 
   def self.link_facebook
     begin
-      Setting.find_by(key: 'link_facebook', activated: true).value
+      Setting.where(key: 'link_facebook', activated: true).first.value
     rescue
       false
     end
@@ -53,7 +45,7 @@ class Setting
 
   def self.albums_watermark
     begin
-      Setting.find_by(key: 'albums_watermark', activated: true)
+      Setting.where(key: 'albums_watermark', activated: true).first
     rescue
       false
     end
@@ -61,10 +53,11 @@ class Setting
 
   def self.albums_title
     begin
-      Setting.find_by(key: 'albums_title', activated: true).value
+      Setting.where(key: 'albums_title', activated: true).first.value
     rescue
       false
     end
   end
 
+
 end

data/mix-rails-settings/app/uploaders/settings/image_uploader.rb

@@ -11,14 +11,13 @@ class Settings::ImageUploader < CarrierWave::Uploader::Base
   include Sprockets::Helpers::RailsHelper
   include Sprockets::Helpers::IsolatedHelper
 
-  # Choose what kind of storage to use for this uploader:
-  storage :grid_fs
+  
   # storage :fog
 
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:
   def store_dir
-    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+    "system/uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
 
   def cache_dir

data/mix-rails-settings/db/migrate/20130206201915_create_settings.rb

@@ -0,0 +1,13 @@
+class CreateSettings < ActiveRecord::Migration
+  def change
+    create_table :settings do |t|
+      t.string :name
+      t.string :key
+      t.string :value
+      t.boolean :activated
+      t.boolean :system
+
+      t.timestamps
+    end
+  end
+end

data/mix-rails-settings/db/migrate/20130206212203_add_image_to_setting.rb

@@ -0,0 +1,5 @@
+class AddImageToSetting < ActiveRecord::Migration
+  def change
+    add_column :settings, :image, :string
+  end
+end

data/mix-rails-settings/lib/mix-rails-settings/engine.rb

@@ -1,5 +1,10 @@
 module MixRailsSettings
   class Engine < ::Rails::Engine
+
+    config.generators do |g|                                                               
+      g.test_framework :rspec
+      g.integration_tool :rspec
+    end
     
     initializer "settings.default_settings" do |app|
 

data/mix-rails-settings/lib/mix-rails-settings/version.rb

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

data/mix-rails-settings/spec/models/setting_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Setting do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

data/mix-rails-songs/app/models/admix/songs_datagrid.rb

@@ -5,7 +5,7 @@ class Admix::SongsDatagrid
   extend AdmixHelper
 
   scope do
-    Song.desc(:date)
+    Song.order('id DESC')
   end
 
   column :title, header: input_label(:song, :title)