mix-rails-core 0.22.0 → 0.23.0

data/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/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/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/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/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/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/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/config/initializers/defaults_rails.rb

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

data/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/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/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/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/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/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/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/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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mix-rails-core
 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
@@ -124,71 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongoid_slug
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongo
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: carrierwave-mongoid
+  name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -441,7 +377,6 @@ files:
 - app/inputs/datepicker_input.rb
 - app/controllers/admix/categories_controller.rb
 - app/controllers/mix_controller.rb
-- app/controllers/gridfs_controller.rb
 - app/assets/stylesheets/jplayer/jplayer.pink.flag.css
 - app/assets/stylesheets/colorbox.css
 - app/assets/stylesheets/colorbox/colorbox.css.erb
@@ -1189,17 +1124,20 @@ files:
 - app/models/attachment.rb
 - app/models/concerns/attachment.rb
 - app/models/concerns/category.rb
+- app/models/categorization.rb
 - app/models/category.rb
 - app/views/mix/_title.html.haml
 - app/views/admix/categories/_form_fields.haml
 - app/views/admix/categories/_show.haml
 - config/locales/core.pt-BR.yml
 - config/initializers/authority.rb
-- config/initializers/mongoid.rb
+- config/initializers/defaults_rails.rb
 - config/initializers/carrierwave.rb
 - config/routes.rb
+- db/migrate/20130207132351_create_categorizations.rb
+- db/migrate/20130206195145_create_attachments.rb
+- db/migrate/20130206195329_create_categories.rb
 - lib/tasks/mix-rails_tasks.rake
-- lib/mix-rails-core/gridfs.rb
 - lib/mix-rails-core/railtie.rb
 - lib/mix-rails-core/concerns/engine.rb
 - lib/mix-rails-core/version.rb
@@ -1222,7 +1160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3901875410246843969
+      hash: 4297422372143745569
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -1231,7 +1169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3901875410246843969
+      hash: 4297422372143745569
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/app/controllers/gridfs_controller.rb

@@ -1,31 +0,0 @@
-require 'mongo'
-require 'mix-rails-core/gridfs'
-require 'fileutils'
-
-class GridfsController < ActionController::Metal
-  def serve
-      
-    file_dir =  File.expand_path '../', "#{Rails.root.join('public')}#{env['PATH_INFO']}"
-    FileUtils.mkdir_p file_dir unless Dir.exists?(file_dir)
-    gridfs_file = MixRailsCore::Gridfs::read_file(env["PATH_INFO"])
-    tmp_file_name = "#{Rails.root.join('public')}#{env['PATH_INFO']}"
-    file_content = gridfs_file.read
-    File.open(tmp_file_name, 'wb') do |f|
-      f.write(file_content)
-      f.close
-    end
-
-    begin
-      
-
-
-      self.response_body = file_content
-
-      self.content_type = gridfs_file.content_type
-    rescue
-      self.status = :not_found
-      self.content_type = 'text/plain'
-      self.response_body = ''
-    end
-  end
-end

data/config/initializers/mongoid.rb

@@ -1 +0,0 @@
-#Mongoid.include_root_in_json = false

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

@@ -1,32 +0,0 @@
-module MixRailsCore
-  module Gridfs
-
-    mattr_accessor :read_file
-
-    def self.read_file(filepath)
-      gridfs_path = filepath.gsub("/system/", "")
-
-      database_name   = Mongoid::Config.sessions[:default][:database]
-      host_and_port   = Mongoid::Config.sessions[:default][:hosts][0].split(':')
-
-      host            = host_and_port[0]
-      port            = host_and_port[1]
-
-      username        = Mongoid::Config.sessions[:default][:username]
-      password        = Mongoid::Config.sessions[:default][:password]
-
-      con = Mongo::MongoClient.new(host, port)
-      
-      if username
-        con.add_auth(database_name, username, password)
-      end
-      
-      db = con.db(database_name) 
-
-      gridfs_file = Mongo::GridFileSystem.new(db).open(gridfs_path, 'r')
-      
-      gridfs_file
-
-    end
-  end
-end