mix-rails 0.22.0 → 0.23.0

data/mix-rails-songs/app/models/song.rb

@@ -1,13 +1,11 @@
-class Song
-  
-  include Mongoid::Document
-  include Mongoid::Timestamps
+class Song < ActiveRecord::Base
   extend Enumerize
+  extend FriendlyId
+
+  attr_accessible :author, :mp3, :slug, :status, :title
 
-  field :title,         type: String
-  field :author,        type: String
-  field :status,        type: String
   enumerize :status, in: [:published, :unpublished], default: :published, predicates: true
+  friendly_id :title, use: :slugged
 
   mount_uploader :mp3, Songs::SongUploader
 
@@ -15,5 +13,7 @@ class Song
   validates_presence_of :author
 
   scope :published, where(status: :published)
-  
-end
+
+  belongs_to :related, polymorphic: true
+
+end

data/mix-rails-songs/app/uploaders/songs/song_uploader.rb

@@ -12,13 +12,13 @@ class Songs::SongUploader < CarrierWave::Uploader::Base
   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-songs/db/migrate/20130208034029_create_songs.rb

@@ -0,0 +1,14 @@
+class CreateSongs < ActiveRecord::Migration
+  def change
+    create_table :songs do |t|
+      t.string :title
+      t.string :author
+      t.string :status
+      t.string :mp3
+      t.string :slug
+      
+      t.references :related, polymorphic: true
+      t.timestamps
+    end
+  end
+end

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

@@ -1,6 +1,11 @@
 module MixRailsSongs
   class Engine < ::Rails::Engine
     
+    config.generators do |g|                                                               
+      g.test_framework :rspec
+      g.integration_tool :rspec
+    end
+
     def navigation
       if defined? Admix
         Admix::Navigation::NavBar.post_menu do

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

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

data/mix-rails-videos/app/models/video.rb

@@ -1,31 +1,18 @@
-class Video
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  include Mongoid::Slug
+class Video < ActiveRecord::Base
+  extend FriendlyId
 
-  scope :most_recent, order_by(published_at: -1, name: 1)
-
-  field :url, type: String
-  field :title, type: String
-  field :description, type: String
-  field :title, type: String
-  field :likes, type: Integer
-  field :dislikes, type: Integer
-  field :views, type: Integer
-  field :youtube_code, type: String
-  field :published_at, type: Time
-  field :seconds, type: Integer
-  field :category, type: String
-  field :active, type: Boolean, default: true
+  attr_accessible :active, :category, :description, :dislikes, :likes, :published_at, :seconds, :title, :url, :views, :youtube_code
+  
+  friendly_id :title, use: :slugged
 
   validates :url, presence: true, youtube: true
 
-  slug :title, history: true do |video|
-    video.title.parameterize
-  end
+  belongs_to :related, polymorphic: true
 
   after_validation :insert_youtube_data
 
+  scope :most_recent, order('published_at DESC, title ASC')
+
   def insert_youtube_data
     if self.errors.blank?
       yt_code = self.extract_youtube_code

data/mix-rails-videos/db/migrate/20130208040346_create_videos.rb

@@ -0,0 +1,21 @@
+class CreateVideos < ActiveRecord::Migration
+  def change
+    create_table :videos do |t|
+      t.string :title
+      t.string :url
+      t.string :description
+      t.integer :likes
+      t.integer :dislikes
+      t.integer :views
+      t.string :youtube_code
+      t.datetime :published_at
+      t.integer :seconds
+      t.string :category
+      t.boolean :active
+      t.string :slug
+
+      t.references :related, polymorphic: true
+      t.timestamps
+    end
+  end
+end

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

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

data/mix-rails-vouchers/Gemfile

@@ -1,7 +1,5 @@
 source "http://rubygems.org"
 
-gem 'carrierwave-mongoid', '~> 0.3.0', :require => 'carrierwave/mongoid'
-
 # Declare your gem's dependencies in mix-vouchers.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
 # development dependencies will be added by default to the :development group.

data/mix-rails-vouchers/app/models/admix/vouchers_datagrid.rb

@@ -2,7 +2,7 @@ class Admix::VouchersDatagrid
   include Datagrid
 
   scope do
-    Voucher.all
+    Voucher
   end
   column :name, header: I18n.t('vouchers.fields.name')
 

data/mix-rails-vouchers/app/models/voucher.rb

@@ -1,22 +1,18 @@
-class Voucher
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  include Mongoid::Slug
+class Voucher < ActiveRecord::Base
+  extend FriendlyId
 
-  scope :actives, -> { where({:date_from.lte => Date.today, :date_to.gte => Date.today}) }
+  attr_accessible :date_from, :date_to, :name, :partner_photo, :photo, :rules
+  attr_accessible :photo_cache, :partner_photo_cache
+
+  scope :actives, -> { where("date_from <= ? and date_to >= ?", Date.today, Date.today) }
+
+  has_many :users, class_name: 'VoucherUser', dependent: :delete_all
 
-  field :name, type: String
-  field :rules, type: Array
-  field :date_from, type: Date
-  field :date_to, type: Date
   mount_uploader :photo, Vouchers::PhotoUploader
   mount_uploader :partner_photo, Vouchers::PhotoUploader
 
-  has_many :users, class_name: 'VoucherUser', dependent: :delete
-
   validates_presence_of :name, :rules, :photo
 
-  slug :name, history: true do |voucher|
-    voucher.name.parameterize
-  end
+  friendly_id :name, use: :slugged
+
 end

data/mix-rails-vouchers/app/models/voucher_user.rb

@@ -1,48 +1,43 @@
-class VoucherUser
-    include Mongoid::Document
-    include Mongoid::Timestamps
-
-    field :name, type: String
-    field :email, type: String
-    field :confirmed, type: Boolean, default: false
-    field :confirmation_date, type: Date
-
-    belongs_to :voucher
-
-    attr_protected :confirmed, :confirmation_date
-    validates_presence_of :name, :email
-    validates :email, email: true
-
-    after_create :send_confirmation_email
-
-
-    def confirm
-        @confirmed = true
-        @confirmation_date = Time.now
-        @save
-    end
-
-    # @param voucher instance of Voucher
-    def already_required(voucher)
-        user = VoucherUser.where({voucher_id: voucher[:_id], _id: @attributes['_id']}).first
-        if user
-            true
-        else
-            false
-        end
-    end
-
-    def has_confirmed(voucher)
-        user = VoucherUser.where({voucher_id: voucher[:_id], _id: @attributes['_id'], confirmed: true}).first
-        if user
-            true
-        else
-            false
-        end
-    end
-
-    def send_confirmation_email
-        VoucherMailer.send_confirmation_link(self).deliver
-    end
+class VoucherUser < ActiveRecord::Base
+  attr_accessible :confirmation_date, :confirmed, :email, :name
+  
+  belongs_to :voucher
+
+  attr_protected :confirmed, :confirmation_date
+  validates_presence_of :name, :email
+  validates :email, email: true
+
+  after_create :send_confirmation_email
+
+
+  def confirm
+      @confirmed = true
+      @confirmation_date = Time.now
+      @save
+  end
+
+  # @param voucher instance of Voucher
+  def already_required(voucher)
+      user = VoucherUser.where({voucher_id: voucher[:id], id: @attributes['id']}).first
+      if user
+          true
+      else
+          false
+      end
+  end
+
+  def has_confirmed(voucher)
+      user = VoucherUser.where({voucher_id: voucher[:id], id: @attributes['id'], confirmed: true}).first
+      if user
+          true
+      else
+          false
+      end
+  end
+
+  def send_confirmation_email
+      VoucherMailer.send_confirmation_link(self).deliver
+  end
+
 
 end

data/mix-rails-vouchers/app/uploaders/vouchers/photo_uploader.rb

@@ -15,13 +15,13 @@ class Vouchers::PhotoUploader < CarrierWave::Uploader::Base
   # 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-vouchers/db/migrate/20130208143458_create_vouchers.rb

@@ -0,0 +1,15 @@
+class CreateVouchers < ActiveRecord::Migration
+  def change
+    create_table :vouchers do |t|
+      t.string :name
+      t.text :rules
+      t.date :date_from
+      t.date :date_to
+      t.string :photo
+      t.string :partner_photo
+      t.string :slug
+      
+      t.timestamps
+    end
+  end
+end

data/mix-rails-vouchers/db/migrate/20130208143613_create_voucher_users.rb

@@ -0,0 +1,13 @@
+class CreateVoucherUsers < ActiveRecord::Migration
+  def change
+    create_table :voucher_users do |t|
+      t.string :name
+      t.string :email
+      t.boolean :confirmed
+      t.date :confirmation_date
+
+      t.references :voucher
+      t.timestamps
+    end
+  end
+end

data/mix-rails-vouchers/lib/mix-rails-vouchers.rb

@@ -1,5 +1,4 @@
 require "mix-rails-vouchers/engine"
-require "carrierwave/mongoid"
 
 module MixRailsVouchers
 end

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

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

data/mix-rails-vouchers/mix-rails-vouchers.gemspec

@@ -17,5 +17,4 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'mail_form', '~> 1.4.0'
   s.add_dependency "rails", "~> 3.2.9"
-  s.add_dependency 'carrierwave-mongoid', '~> 0.3.0'
 end

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

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

data/mix-rails-writer/app/controllers/news_controller.rb

@@ -2,12 +2,12 @@ class NewsController < PostsController
   
 
   def index
-    @news = News.published.desc(:date).paginate(per_page: 10)
+    @news = News.published.order('date DESC').paginate(page: params[:page],per_page: 10)
   end
 
   def show
     @news = News.find(params[:id])
-    @other_news = News.published.not_in(:id => @news.id).desc(:date).paginate(per_page: 10)
+    @other_news = News.published.not_in(:id => @news.id).order('date DESC').paginate(page: params[:page], per_page: 10)
   end
 
 end

data/mix-rails-writer/app/models/admix/news_datagrid.rb

@@ -4,7 +4,7 @@ class Admix::NewsDatagrid
 
 
   scope do
-    News.desc(:date)
+    News.order('id DESC')
   end
 
   filter :date do |value|
@@ -24,12 +24,8 @@ class Admix::NewsDatagrid
     end
   end
 
-  column :published, header: I18n.t('posts.published') do |post|
-    if post.published 
-      I18n.t("posts.published_yes")
-    else 
-      I18n.t("posts.published_no")
-    end
+  column :status, header: I18n.t('posts.status') do |post|
+    post.status.text
   end
   
 

data/mix-rails-writer/app/models/news.rb

@@ -1,3 +1,2 @@
 class News < Post
-  
 end

data/mix-rails-writer/app/models/post.rb

@@ -1,26 +1,17 @@
-class Post
-  
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  include Mongoid::Paranoia
-  include Mongoid::Slug
+class Post < ActiveRecord::Base
+  extend Enumerize
+  extend FriendlyId
 
-  field :title,         type: String
-  field :text,          type: String
-  field :source,        type: String
-  field :date,          type: DateTime
-  field :published,     type: Boolean, default: true
+  attr_accessible :content, :date, :slug, :source, :status, :title, :type, :image, :image_cache
+  friendly_id :title, use: :slugged
+  enumerize :status, in: [:published, :unpublished], default: :published, predicates: true
 
 
-  validates_presence_of :title
-  validates_presence_of :date
+  validates_presence_of :title, :date
 
-  slug :title, history: true do |current_object|
-    current_object.title.parameterize
-  end
 
-  scope :published, where(published: true)
+  scope :published, where(status: :published)
 
   mount_uploader :image, Writer::ImageUploader
-  
-end
+
+end