mix-rails 0.22.0 → 0.23.0

data/mix-rails-auth/config/initializers/devise.rb

@@ -13,7 +13,7 @@ Devise.setup do |config|
   # Load and configure the ORM. Supports :active_record (default) and
   # :mongoid (bson_ext recommended) by default. Other ORMs may be
   # available as additional gems.
-  require 'devise/orm/mongoid'
+  require 'devise/orm/active_record'
 
   # ==> Configuration for any authentication mechanism
   # Configure which keys are used when authenticating a user. The default is
@@ -82,7 +82,7 @@ Devise.setup do |config|
   config.stretches = Rails.env.test? ? 1 : 10
 
   # Setup a pepper to generate the encrypted password.
-  # config.pepper = "4a428d33a7f2f1d8f58481c17987d070ebcfb5390d1159adff4b1f694f2007c4667ecd6e59fbfc3b7ed30e4fce4b6163fb72b83b778890f26d2d7172a4d9dbff"
+  # config.pepper = "5b046673f47fe250ab1561959eee00d884aff9d4e240994d83d0bcc1d6812cfb92a4a8fd6d69f8c00ffa55a03e57b732e0510137b1a585636ccea778ed19df68"
 
   # ==> Configuration for :confirmable
   # A period that the user is allowed to access the website even without

data/mix-rails-auth/config/initializers/rolify.rb

@@ -1,6 +1,6 @@
 Rolify.configure do |config|
   # By default ORM adapter is ActiveRecord. uncomment to use mongoid
-  config.use_mongoid
+  # config.use_mongoid
   
   # Dynamic shortcuts for User class (user.is_admin? like methods). Default is: false
   # Enable this feature _after_ running rake db:migrate as it relies on the roles table

data/mix-rails-auth/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-
+  
   devise_for :users, sign_out_via: 'get'
 
   scope Admix::namespace_path, as: :admix, module: :admix do

data/mix-rails-auth/db/migrate/20130206200605_devise_create_users.rb

@@ -0,0 +1,46 @@
+class DeviseCreateUsers < ActiveRecord::Migration
+  def change
+    create_table(:users) 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
+      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 # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
+
+      ## Token authenticatable
+      # t.string :authentication_token
+
+
+      t.timestamps
+    end
+
+    add_index :users, :email,                :unique => true
+    add_index :users, :reset_password_token, :unique => true
+    # add_index :users, :confirmation_token,   :unique => true
+    # add_index :users, :unlock_token,         :unique => true
+    # add_index :users, :authentication_token, :unique => true
+  end
+end

data/mix-rails-auth/db/migrate/20130206200717_rolify_create_roles.rb

@@ -0,0 +1,19 @@
+class RolifyCreateRoles < ActiveRecord::Migration
+  def change
+    create_table(:roles) do |t|
+      t.string :name
+      t.references :resource, :polymorphic => true
+
+      t.timestamps
+    end
+
+    create_table(:users_roles, :id => false) do |t|
+      t.references :user
+      t.references :role
+    end
+
+    add_index(:roles, :name)
+    add_index(:roles, [ :name, :resource_type, :resource_id ])
+    add_index(:users_roles, [ :user_id, :role_id ])
+  end
+end

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

@@ -1,5 +1,11 @@
 module MixRailsAuth
   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-auth/lib/mix-rails-auth/version.rb

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

data/mix-rails-auth/spec/models/user_spec.rb

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

data/mix-rails-core/Gemfile

@@ -16,13 +16,8 @@ gem "i18n_routing", "~> 0.6.2"
 
 gem 'rails-i18n'
 
-# TODO: Create two new to separate the mix-rails-core(class api) from the mix-rails-orm(database-access)
-gem 'mongoid'
 gem 'authority'
-gem 'mongoid_slug'
-gem 'bson_ext'
-gem 'mongo'
-gem 'carrierwave-mongoid'
+gem 'carrierwave'
 gem 'mini_magick'
 gem 'haml_coffee_assets'
 
@@ -39,7 +34,6 @@ group :test do
   gem 'cucumber-rails'
   gem 'capybara'
   gem 'database_cleaner'
-  gem 'mongoid-rspec'
 end
 
 

data/mix-rails-core/app/models/admix/categories_datagrid.rb

@@ -5,11 +5,10 @@ class Admix::CategoriesDatagrid
   extend AdmixHelper
 
   scope do
-    Category.all
+    Category
   end
 
   column :name, :header => input_label(:categories, :name)
-  column :_type, :header => input_label(:categories, :_type)
 
   include Admix::TableActions
 end

data/mix-rails-core/app/models/attachment.rb

@@ -1,3 +1,4 @@
-class Attachment
-  include Concerns::Attachment
-end
+class Attachment < ActiveRecord::Base
+  attr_accessible :file, :name
+  mount_uploader :file, Core::FileUploader
+end

data/mix-rails-core/app/models/categorization.rb

@@ -0,0 +1,5 @@
+class Categorization < ActiveRecord::Base
+  # attr_accessible :title, :body
+  belongs_to :categorizable, :polymorphic => true
+  belongs_to :category
+end

data/mix-rails-core/app/models/category.rb

@@ -1,3 +1,4 @@
-class Category
-  include Concerns::Category
+class Category < ActiveRecord::Base
+  attr_accessible :name
+  has_many :categorizations, :dependent => :restrict
 end

data/mix-rails-core/app/models/concerns/attachment.rb

@@ -2,11 +2,8 @@ module Concerns::Attachment
   extend ActiveSupport::Concern
 
   included do
-    include Mongoid::Document
-
     field :name
     validates_presence_of :name
-
     mount_uploader :file, Core::FileUploader
   end
 

data/mix-rails-core/app/uploaders/core/file_uploader.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'carrierwave/processing/mini_magick'
-require 'mix-rails-core/gridfs'
 
 class Core::FileUploader < CarrierWave::Uploader::Base
 
@@ -13,13 +12,12 @@ class Core::FileUploader < 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-core/config/initializers/carrierwave.rb

@@ -1,9 +1,5 @@
-require 'mongoid/railtie'
-
 CarrierWave.configure do |config|
-
-  config.storage              = :grid_fs
-  config.grid_fs_access_url   = "/system"
+  config.storage              = :file
   #config.cache_dir = "uploads"
   config.root = Rails.root.join('public')
 end

data/mix-rails-core/config/initializers/defaults_rails.rb

@@ -0,0 +1 @@
+ActiveRecord::Base.include_root_in_json = false

data/mix-rails-core/config/locales/core.pt-BR.yml

@@ -20,10 +20,10 @@ pt-BR:
   categories:
     categories: 'Categorias'
     category: 'Categoria'
-
   simple_form:
     labels:
       defaults:
+        cell: 'Celular'
         code: 'Código'
         lamina_image: 'Imagem de lâmina'
         featured_image: 'Imagem destaque'
@@ -69,3 +69,4 @@ pt-BR:
         password: 'Sua senha'
   errors:
     invalid_url: 'O formato da url está incorreto'
+    dependent: 'Não é possível deletar este registro pois está associado a outros.'

data/mix-rails-core/config/routes.rb

@@ -1,7 +1,5 @@
 Rails.application.routes.draw do
   
-  match "system/uploads/*path" => "gridfs#serve"
-
   scope Admix::namespace_path, as: :admix, module: :admix do
     resources :categories
   end

data/mix-rails-core/db/migrate/20130206195145_create_attachments.rb

@@ -0,0 +1,10 @@
+class CreateAttachments < ActiveRecord::Migration
+  def change
+    create_table :attachments do |t|
+      t.string :name
+      t.string :file
+
+      t.timestamps
+    end
+  end
+end

data/mix-rails-core/db/migrate/20130206195329_create_categories.rb

@@ -0,0 +1,8 @@
+class CreateCategories < ActiveRecord::Migration
+  def change
+    create_table :categories do |t|
+      t.string :name
+      t.timestamps
+    end
+  end
+end

data/mix-rails-core/db/migrate/20130207132351_create_categorizations.rb

@@ -0,0 +1,9 @@
+class CreateCategorizations < ActiveRecord::Migration
+  def change
+    create_table :categorizations do |t|
+      t.references :categorizable, polymorphic: true
+      t.references :category
+      t.timestamps
+    end
+  end
+end

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

@@ -1,45 +1,26 @@
-require 'mix-rails-core/railtie' if defined?(Rails)
-
-
+require 'mix-rails-core/railtie'
 require 'mix-rails-core/engine'
-
 require 'enumerize'
-
 require 'fancybox-rails'
-
 require 'rails-i18n'
-
 require 'activevalidators'
 require 'i18n_routing'
-
 require 'simple-navigation'
 require 'simple-navigation-bootstrap'
 require 'breadcrumbs'
 require 'will_paginate'
-
 require 'coffee-script'
 require 'coffee-filter'
-#require 'sass-rails'
-
-# TODO: Create two new to separate the mix-rails-core-core(class api) from the mix-rails-orm(database-access)
-require 'mongoid'
-require 'mongoid_slug'
-
-#require 'bson_ext'
-require 'mongo'
-require 'carrierwave/mongoid'
+require 'carrierwave'
 require 'mini_magick'
 require 'haml_coffee_assets'
-
 require 'mail_form'
 require 'simple_form'
-
 require 'rails-backbone'
-
 require 'bootstrap-sass'
 require 'jquery-qtip2-rails'
-
 require 'authority'
+require 'default_value_for'
 
 module MixRailsCore
 end

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

@@ -1,10 +1,8 @@
 module MixRailsCore
   class Engine < ::Rails::Engine
 
-    config.autoload_paths += Dir["#{config.root}/lib/**/"]
-    config.autoload_paths += Dir["#{config.root}/app/models/**/"]
-
-
+    # config.autoload_paths += Dir["#{config.root}/lib/**/"]
+    # config.autoload_paths += Dir["#{config.root}/app/models/**/"]
 
     config.generators do |g|                                                               
       g.test_framework :rspec

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

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

data/mix-rails-core/mix-rails-core.gemspec

@@ -26,12 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "i18n_routing"
 
   gem.add_dependency "rails-i18n"
-
-  gem.add_dependency "mongoid"  
-  gem.add_dependency "mongoid_slug"
-  gem.add_dependency "bson_ext"
-  gem.add_dependency "mongo"
-  gem.add_dependency "carrierwave-mongoid"
+  gem.add_dependency "carrierwave"
   gem.add_dependency "mini_magick"
   gem.add_dependency "haml_coffee_assets"
   

data/mix-rails-core/spec/models/attachment_spec.rb

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

data/mix-rails-core/spec/models/categorization_spec.rb

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

data/mix-rails-core/spec/models/category_spec.rb

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

data/mix-rails-core/spec/spec_helper.rb

@@ -38,15 +38,15 @@ RSpec.configure do |config|
 
 
   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/mix-rails-message-board/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