mix-rails 0.22.0 → 0.23.0

data/MIX_RAILS_VERSION

@@ -1 +1 @@
-0.22.0
+0.23.0

data/README.md

@@ -3,14 +3,14 @@
 [![Build Status](https://travis-ci.org/mixinternet/mix-rails.png)](https://travis-ci.org/mixinternet/mix-rails)
 [![Dependency Status](https://gemnasium.com/mixinternet/mix-rails.png)](https://gemnasium.com/mixinternet/mix-rails)
 
-MixRails is a CMS based on Ruby on Rails and uses Mongoid as ORM(MongoDB).
+MixRails is a CMS based on Ruby on Rails.
 
 
 ## Usage
 
 Create a new rails project.
 
-    $ rails new myproject -T --skip-active-record --skip-bundle --dummy-path=spec/dummy
+    $ rails new myproject -T --skip-bundle --dummy-path=spec/dummy
 
 Add this line to your application's Gemfile:
 
@@ -25,20 +25,11 @@ And then execute:
 In your config/application.rb add require 'mix-rails/all'.
 
 ```ruby
-require "action_controller/railtie"
-require "action_mailer/railtie"
-require "active_resource/railtie"
-require "sprockets/railtie"
-require "rails/test_unit/railtie"
-
+require 'rails/all'
 # After rails requiring mix-rails!!
 require "mix-rails/all"
 ```
 
-Configure a mongoid instance with:
-
-    $ rails generate mongoid:config
-
 And then run the application
 
     $ bundle exec rails server
@@ -84,5 +75,5 @@ TODO: Add some docs for admix
 
 ## Creating a extension
 
-    $ rails plugin new mix-rails-pluginame -T --skip-active-record --skip-bundle --dummy-path=spec/dummy --full
+    $ rails plugin new mix-rails-pluginame -T --skip-bundle --dummy-path=spec/dummy --full
 s

data/admix/app/controllers/admix/inherited_controller.rb

@@ -1,11 +1,23 @@
 module Admix
   class InheritedController < Admix::AdmixController
+    helper :all
 
     inherit_resources
+    include InheritedResources::DSL
+
+    rescue_from ActiveRecord::DeleteRestrictionError do |exception|
+      #resource.errors.add(:base, exception)
+      flash[:alert] = I18n.t('errors.dependent')
+      redirect_to collection_url
+    end
+
+    # destroy! do |success, failure|
+    #   failure.html { redirect_to polymorphic_path(resource) }
+    # end
 
     # TODO: Add authorization here.
 
-    helper :all
+    
 
     before_filter :generate_datagrid , only: [:index ]
 

data/admix/lib/admix/version.rb

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

data/admix/spec/spec_helper.rb

@@ -39,20 +39,16 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = "random"
 
-
-  #DatabaseCleaner.orm = "mongoid"
-  #DatabaseCleaner.strategy = :truncation
-
   config.before(:suite) do
-    DatabaseCleaner[:mongoid].strategy = :truncation
+    DatabaseCleaner.strategy = :truncation
   end
 
   config.before(:each) do
-    DatabaseCleaner[:mongoid].start
+    DatabaseCleaner.start
   end
 
   config.after(:each) do
-    DatabaseCleaner[:mongoid].clean
+    DatabaseCleaner.clean
   end
 
 end

data/lib/mix-rails.rb

@@ -1,2 +1,3 @@
+autoload :FriendlyId, 'friendly_id'
 module MixRails
 end

data/mix-rails-albums/Gemfile

@@ -12,14 +12,6 @@ end
 # jquery-rails is used by the dummy application
 gem "jquery-rails"
 gem "haml-rails"
-gem 'bson_ext'
-gem 'mongo'
-
-# gem 'carrierwave'
-# gem 'carrierwave-mongoid', require: 'carrierwave/mongoid'
-# gem 'mini_magick'
-# 
-gem "carrierwave-mongoid", :git => "git://github.com/jnicklas/carrierwave-mongoid.git", :branch => "master"
 gem 'mini_magick', :git => 'git://github.com/probablycorey/mini_magick.git'
 
 # Declare any dependencies that are still in development here instead of in

data/mix-rails-albums/app/assets/javascripts/backbone/models/photo.js.coffee

@@ -1,6 +1,5 @@
 class Application.Models.Photo extends Backbone.Model
   paramRoot: 'photo'
-  idAttribute: '_id'
   defaults:
     image: null
     description: ''

data/mix-rails-albums/app/assets/javascripts/backbone/templates/photos/photo_modal_edit.hamlc.erb

@@ -1,10 +1,10 @@
-.modal.hide.fade.admix-photo-modal{id: "photo-modal-#{@_id}"}
+.modal.hide.fade.admix-photo-modal{id: "photo-modal-#{@id}"}
   .modal-header
     %button.close{"aria-hidden" => "true", "data-dismiss" => "modal", :type => "button"} ×
     %h3 Detalhes da foto
   .modal-body
     .edit-area.pull-right
-      %textarea.span5{id: "input_photo_description_#{@_id}",placeholder: 'Adicione uma descrição para esta foto.'}
+      %textarea.span5{id: "input_photo_description_#{@id}",placeholder: 'Adicione uma descrição para esta foto.'}
         #{@description}
     .photo
       %img{src: @image.medium.url}

data/mix-rails-albums/app/assets/javascripts/models/fileitem.js

@@ -1,7 +1,6 @@
 var FileItem = Backbone.Model.extend({
     name: 'photo',
     url: 'photos',
-    idAttribute: '_id',
     defaults: {
         progress:0
     },

data/mix-rails-albums/app/models/admix/albums_datagrid.rb

@@ -6,7 +6,7 @@ class Admix::AlbumsDatagrid
 
 
   scope do
-    Album.desc(:date)
+    Album.order("date DESC")
   end
 
   filter :title, :string

data/mix-rails-albums/app/models/admix/photos_datagrid.rb

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

data/mix-rails-albums/app/models/album.rb

@@ -1,3 +1,3 @@
-class Album
-  include MixRailsAlbums::Concerns::Models::Album
-end
+class Album < ActiveRecord::Base
+  include Concerns::Album
+end

data/mix-rails-albums/app/models/concerns/album.rb

@@ -0,0 +1,36 @@
+module Concerns::Album
+  extend ActiveSupport::Concern
+
+  included do
+    extend Enumerize
+    extend FriendlyId
+
+    attr_accessible :date, :description, :status, :title
+
+    enumerize :status, in: [:published, :unpublished], default: :published, predicates: true
+    friendly_id :title, use: :slugged
+
+    has_many :photos, :as => :related
+    belongs_to :related, :polymorphic => true
+
+    validation_for_title
+    validation_for_date
+
+
+    scope :published, where(status: :published).joins(:photos).having("count(photos.id) > 1")
+
+  end
+
+  module ClassMethods
+    
+    def validation_for_title
+      validates_presence_of :title
+    end
+
+    def validation_for_date
+      validates_presence_of :date
+    end
+
+  end
+
+end

data/mix-rails-albums/app/models/photo.rb

@@ -1,12 +1,11 @@
-class Photo
-  
-  include Mongoid::Document
-  include Mongoid::Timestamps
+class Photo < ActiveRecord::Base
+  extend FriendlyId
 
-  field :description
+  attr_accessible :description, :image, :image_cache
   
-  embedded_in :album
+  friendly_id :description, use: :slugged
 
+  belongs_to :related, :polymorphic => true
+  
   mount_uploader :image, Albums::ImageUploader
-
-end
+end

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

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'carrierwave/processing/mini_magick'
-require 'mix-rails-core/gridfs'
 
 class Albums::ImageUploader < CarrierWave::Uploader::Base
 
@@ -13,13 +12,13 @@ class Albums::ImageUploader < 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
@@ -51,6 +50,8 @@ class Albums::ImageUploader < CarrierWave::Uploader::Base
       
       albums_watermark = Setting.albums_watermark
       
+      #raise albums_watermark.image
+
       watermark_image = if albums_watermark
         gridfs_file = MixRailsCore::Gridfs::read_file(albums_watermark.image.url)
         MiniMagick::Image.read(gridfs_file, "png")

data/mix-rails-albums/db/migrate/20130208020540_create_albums.rb

@@ -0,0 +1,17 @@
+class CreateAlbums < ActiveRecord::Migration
+  def change
+    create_table :albums do |t|
+      t.string :title
+      t.text :description
+      t.date :date
+      t.string :status
+      t.string :slug
+
+      t.references :related, polymorphic: true
+      t.timestamps
+    end
+    
+    add_index :albums, :slug, unique: true
+
+  end
+end

data/mix-rails-albums/db/migrate/20130208021030_create_photos.rb

@@ -0,0 +1,15 @@
+class CreatePhotos < ActiveRecord::Migration
+  def change
+    create_table :photos do |t|
+      t.text :description
+      t.string :image
+      t.string :slug
+
+      t.references :related, polymorphic: true
+      t.timestamps
+    end
+    
+    add_index :photos, :slug, unique: true
+
+  end
+end

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

@@ -1,9 +1,5 @@
 require "mix-rails-albums/engine"
-
-require "mongoid/railtie"
-require "carrierwave/mongoid"
 require "mini_magick"
-
 require "haml_coffee_assets"
 
 module MixRailsAlbums
@@ -11,6 +7,4 @@ module MixRailsAlbums
     module Models
     end
   end
-end
-
-require 'concerns/models/album'
+end

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

@@ -1,6 +1,11 @@
 module MixRailsAlbums
   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-albums/lib/mix-rails-albums/version.rb

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

data/mix-rails-albums/mix-rails-albums.gemspec

@@ -16,9 +16,6 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
 
   s.add_dependency "rails", "~> 3.2.9"
-  s.add_dependency 'bson_ext'
-  s.add_dependency 'mongo'
-  s.add_dependency 'carrierwave-mongoid'
   s.add_dependency 'mini_magick'
   s.add_dependency 'haml_coffee_assets'
   

data/mix-rails-albums/spec/models/album_spec.rb

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

data/mix-rails-albums/spec/models/picture_spec.rb

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

data/mix-rails-auth/Gemfile

@@ -6,7 +6,6 @@ source "http://rubygems.org"
 gemspec
 
 # jquery-rails is used by the dummy application
-gem "mongoid"
 gem "rolify"
 gem "jquery-rails"
 gem "rspec-rails"

data/mix-rails-auth/app/models/admix/roles_datagrid.rb

@@ -4,7 +4,7 @@ class Admix::RolesDatagrid
   extend AdmixHelper
 
   scope do
-    Role.all
+    Role
   end
 
   column :name, header: input_label(:role, :name)

data/mix-rails-auth/app/models/admix/users_datagrid.rb

@@ -3,7 +3,7 @@ class Admix::UsersDatagrid
   include Datagrid
 
   scope do
-    User.desc(:email)
+    User
   end
 
   filter :email, :string

data/mix-rails-auth/app/models/role.rb

@@ -1,19 +1,6 @@
-class Role
-  include Mongoid::Document
-  
-  has_and_belongs_to_many :users
+class Role < ActiveRecord::Base
+  has_and_belongs_to_many :users, :join_table => :users_roles
   belongs_to :resource, :polymorphic => true
   
-  field :name, :type => String
-  index({ :name => 1 }, { :unique => true })
-
-
-  index({
-    :name => 1,
-    :resource_type => 1,
-    :resource_id => 1
-  },
-  { :unique => true})
-  
   scopify
 end

data/mix-rails-auth/app/models/user.rb

@@ -1,52 +1,12 @@
-class User
-  include Mongoid::Document
+class User < ActiveRecord::Base
   rolify
-  include Authority::UserAbilities
-
-  ROLES = %w[admin manager]
-
   # Include default devise modules. Others available are:
   # :token_authenticatable, :confirmable,
   # :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :recoverable, :rememberable,
-         :trackable, :validatable, :registerable
-
-  ## Database authenticatable
-  field :email,              :type => String, :default => ""
-  field :encrypted_password, :type => String, :default => ""
-
-  validates_presence_of :email
-  validates_presence_of :encrypted_password
-
-  ## Recoverable
-  field :reset_password_token,   :type => String
-  field :reset_password_sent_at, :type => Time
-
-  ## Rememberable
-  field :remember_created_at, :type => Time
-
-  ## Trackable
-  field :sign_in_count,      :type => Integer, :default => 0
-  field :current_sign_in_at, :type => Time
-  field :last_sign_in_at,    :type => Time
-  field :current_sign_in_ip, :type => String
-  field :last_sign_in_ip,    :type => String
-
-
-  ## Confirmable
-  # field :confirmation_token,   :type => String
-  # field :confirmed_at,         :type => Time
-  # field :confirmation_sent_at, :type => Time
-  # field :unconfirmed_email,    :type => String # Only if using reconfirmable
-
-  ## Lockable
-  # field :failed_attempts, :type => Integer, :default => 0 # Only if lock strategy is :failed_attempts
-  # field :unlock_token,    :type => String # Only if unlock strategy is :email or :both
-  # field :locked_at,       :type => Time
-
-  ## Token authenticatable
-  # field :authentication_token, :type => String
-  
-  #has_and_belongs_to_many :roles
+  devise :database_authenticatable, :registerable,
+         :recoverable, :rememberable, :trackable, :validatable
 
+  # Setup accessible (or protected) attributes for your model
+  attr_accessible :email, :password, :password_confirmation, :remember_me
+  # attr_accessible :title, :body
 end