rad_kit 0.0.8 → 0.0.9

data/lib/components/captcha.rb

@@ -1,9 +1,9 @@
 class Rad::Captcha
   attr_accessor :public_key, :private_key, :timeout, :enabled, :verify_url
-  attr_required :private_key, :public_key 
+  attr_required :private_key, :public_key
   def enabled?; !!enabled end
-  
-  def verify request, params    
+
+  def verify request, params
     recaptcha = nil
     Timeout::timeout(timeout || 3) do
       recaptcha = Net::HTTP.post_form URI.parse(verify_url), {
@@ -19,6 +19,6 @@ class Rad::Captcha
   end
 end
 
-rad.register :captcha, depends_on: [:template, :controller] do  
+rad.register :captcha, depends_on: [:template, :controller] do
   Rad::Captcha.new
 end

data/lib/components/kit.rb

@@ -1,16 +1,16 @@
-rad.register :kit, depends_on: [:web, :assets, :common_interface, :models] do        
+rad.register :kit, depends_on: [:web, :assets, :common_interface, :models] do
   require 'kit/kit'
-  
+
   rad.router.default_url = '/'
   (rad.face.availiable_layouts[:default] ||= []) << :default
-  
-  rad.configure :web, "#{__FILE__}/../../.." do |c|    
+
+  rad.configure :web, "#{__FILE__}/../../.." do |c|
     c.routes
     c.locales
     c.template_paths 'app/views'
     c.asset_paths 'app/static'
     c.autoload_paths 'app'
   end
-  
+
   Rad::Kit.new
 end

data/lib/components/kit.yml

@@ -1,3 +1 @@
-fs_prefix: '/fs'
-fs_type: :file
 tags_count: 40

data/lib/components/models.rb

@@ -1,7 +1,4 @@
-rad.register :models do    
-  require 'kit/models'  
+rad.register :models do
+  require 'kit/models'
   Rad::Models.new
-end
-rad.after :models do
-  require 'kit/models_after'
 end

data/lib/components/models.yml

@@ -0,0 +1,3 @@
+fs:
+  host: http://localhost
+  prefix: /fs

data/lib/kit/controller/authorized.rb

@@ -2,19 +2,20 @@ module Rad::Controller::Authorized
   inherited do
     helper_method :can?, :owner?
   end
-  
+
   module ClassMethods
     def require_permission operation, *args, &object_proc
-      operation = operation.must_be.a(String, Symbol).to_s
-  
+      operation.must_be.a Symbol
+
       options = args.extract_options!
       # object_proc = args.size > 0 ? args.first : lambda{}
       object_proc ||= lambda{|controller|}
-  
-      method = "require_permission_#{operation}"
+
+      method = "require_permission_#{operation}".to_sym
       define_method method do
         require_permission operation, instance_eval(&object_proc)
       end
+
       before method, options
     end
   end
@@ -22,7 +23,7 @@ module Rad::Controller::Authorized
   protected
     def can? *args
       rad.user.can? *args
-    end          
+    end
 
     def owner? *args
       rad.user.owner? *args
@@ -37,7 +38,7 @@ module Rad::Controller::Authorized
     end
 
     def require_permission operation, object = nil
-      operation = operation.must_be.a(String, Symbol).to_s
+      operation.must_be.a Symbol
 
       unless rad.user.can? operation, object
         rad.logger.warn "RAD access denied, #{rad.user.name} hasn't rights to #{operation}!"
@@ -45,7 +46,7 @@ module Rad::Controller::Authorized
       end
     end
 
-    def access_denied!            
+    def access_denied!
       raise_user_error t(:access_denied)
     end
 end

data/lib/kit/controller/captcha.rb

@@ -3,19 +3,19 @@ module Rad::Controller::Captcha
     around :ensure_registered_or_human
   end
 
-  protected     
-    def ensure_registered_or_human      
+  protected
+    def ensure_registered_or_human
       if rad.captcha.enabled? and rad.user.anonymous? and !request.get?
-        # right now we support capcha for :js format only        
-        if request.from_browser? and params.format == 'js' 
+        # right now we support capcha for :js format only
+        if request.from_browser? and params.format == 'js'
           if rad.captcha.verify request, params
             yield
           else
             render '/kit/captcha/action'
           end
-        else          
+        else
           raise_user_error t(:registered_user_or_human_required)
-        end                    
+        end
       else
         yield
       end

data/lib/kit/controller/localized.rb

@@ -3,10 +3,10 @@ module Rad::Controller::Localized
     before :prepare_locale
   end
 
-  protected     
+  protected
     def prepare_locale
       language = rad.environment.language
-      I18n.locale = params.l || language        
+      I18n.locale = params.l || language
       # Delete l from params if language is the same as default
       params.delete :l if params.l == language
     end

data/lib/kit/gems.rb

@@ -1,19 +1,23 @@
 # core gems
-gem 'i18n',          '0.5.0'
-gem 'redcarpet',     '1.17.2'
-gem 'sanitize',      '1.2.1'
-gem 'stringex',      '1.2.0'
-gem 'state_machine', '0.10.4'
+gem 'i18n',          '~> 0.5'
+gem 'redcarpet',     '~> 1.17'
+gem 'sanitize',      '~> 1.2'
+gem 'stringex',      '~> 1.2'
+# gem 'state_machine', '~> 0.10'
+gem 'nokogiri',      '~> 1.4'
 # gem 'factory_girl',  '1.3.3'
-gem 'recaptcha',     '0.3.1'
+gem 'recaptcha',     '~> 0.3'
+gem 'mini_magick',   '~> 3.2'
 
-if respond_to? :fake_gem  
+if respond_to? :fake_gem
   fake_gem 'rad_core'
   fake_gem 'rad_common_interface'
   fake_gem 'rad_assets'
-  fake_gem 'mongoid_misc'
+  fake_gem 'mongodb_model'
 end
 
+# TODO2 remove dependencies
+
 # old
 # gem 'bluecloth',     '2.0.9'
 # gem 'paperclip',     '2.3.1.1'

data/lib/kit/i18n.rb

@@ -2,15 +2,15 @@
 # gem 'i18n', '>= 0.4.1'
 # require 'i18n'
 
-require "i18n/backend/pluralization" 
+require "i18n/backend/pluralization"
 I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization)
 
 I18n.load_path += Dir["#{__FILE__.dirname}/i18n/locales/*/*.{rb,yml}"]
 
 
-# 
+#
 # Helpers for Rad
-# 
+#
 [Rad::Controller::Abstract, Rad::Controller::Context].each do |klass|
   klass.delegate :t, to: I18n
 end

data/lib/kit/i18n/locales/ru/pluralization.rb

@@ -1,6 +1,6 @@
 # {
 #   :'ru' => {
-#     pluralize: lambda { |n| 
+#     pluralize: lambda { |n|
 #       # Правило плюрализации для русского языка, взято из CLDR, http://unicode.org/cldr/
 #       #
 #       #
@@ -19,7 +19,7 @@
 #       #   :other = 1.31, 2.31, 5.31...
 #       modulo10 = n.modulo(10)
 #       modulo100 = n.modulo(100)
-#       
+#
 #       if modulo10 == 1 && modulo100 != 11
 #         :one
 #       elsif (modulo10 == 2 || modulo10 == 3 || modulo10 == 4) && !(modulo100 == 12 || modulo100 == 13 || modulo100 == 14)
@@ -54,7 +54,7 @@
           #   :few  = 2-4, 22-24, 32-34...
           #   :many = 0, 5-20, 25-30, 35-40...
           #   :other = 1.31, 2.31, 5.31...
-          n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other 
+          n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other
         }
       }
     }

data/lib/kit/kit.rb

@@ -2,9 +2,9 @@ require 'kit/support'
 
 # Configs
 class Rad::Kit
-  attr_accessor :default_item, :fs_prefix, :fs_type, :fs_cache_path, :fs_path, :tags_count, :use_code_highlighter
-  attr_required :tags_count, :fs_prefix, :fs_type, :fs_path, :fs_cache_path
-  def items; @items ||= [] end  
+  attr_accessor :default_item, :tags_count, :use_code_highlighter
+  attr_required :tags_count
+  def items; @items ||= [] end
 end
 
 rad.router.class.class_eval do
@@ -12,21 +12,21 @@ rad.router.class.class_eval do
   attr_required :default_url
 end
 
-rad.config.class.class_eval do  
+rad.config.class.class_eval do
   def custom_roles; @custom_roles ||= [] end
   def permissions; @permissions ||= {} end
   def default_viewers; @default_viewers ||= [] end
 end
 
 # Kit
-# 
+#
 # TODO3 move :text_utils to standalone gem
-%w(  
+%w(
   support
   controller
   i18n
   kit_text_utils
-  
+
   misc/prepare_model
   misc/user_error
 ).each{|f| require "kit/#{f}"}

data/lib/kit/kit_text_utils.rb

@@ -3,20 +3,20 @@ require 'text_utils'
 module TextUtils
   class << self
     # TODO2 rename
-    def markup data      
+    def markup data
       ps = []
       ps << EnsureUtf
       ps << HtmlSanitizer
-      ps << FormatQualifier                
+      ps << FormatQualifier
       ps << CodeHighlighter if rad.config.use_code_highlighter
       ps << CustomMarkdown
-      ps << Markdown        
+      ps << Markdown
 
       markup = Pipe.new *ps
       markup.call data
     end
-  
-  
+
+
     def truncate data, length
       truncate = Pipe.new(
         EnsureUtf,
@@ -26,5 +26,5 @@ module TextUtils
       )
       truncate.call data
     end
-  end  
+  end
 end

data/lib/kit/misc/prepare_model.rb

@@ -1,12 +1,12 @@
 Rad::Controller::Abstract::ClassMethods.class_eval do
   def prepare_model aclass, opt = {}
     opt = opt.symbolize_keys
-    id = opt.delete(:id) || :id    
+    id = opt.delete(:id) || :id
     variable = opt.delete(:variable) || aclass.alias.underscore
-    
+
     finder = opt.delete(:finder) || :find!
-    
-    method = "prepare_#{variable}"
+
+    method = "prepare_#{variable}".to_sym
     define_method method do
       model = aclass.send finder, params[id]
       instance_variable_set "@#{variable}", model

data/lib/kit/models.rb

@@ -1,8 +1,25 @@
 require 'kit/support'
-require 'kit/mongoid'
-require 'state_machine'
-StateMachine::Integrations::Mongoid.defaults[:action] = nil
+require 'kit/mongodb_model'
 
 class Rad::Models
-  attr_accessor :config
-end
+  attr_accessor :db
+  attr_required :db
+
+  attr_accessor :fs
+  attr_required :fs
+end
+
+%w(
+  config
+  tags
+  tags_mixin
+  miscellaneous
+  role
+  authorized
+  authorized_object
+  base_file
+  attachment_file
+  attachments_helper
+).each{|n| require "kit/models/#{n}"}
+
+Mongo::Model.inherit Mongo::Model::AttachmentsHelper, Models::Miscellaneous

data/lib/kit/models/attachment_file.rb

@@ -0,0 +1,27 @@
+class Models::AttachmentFile < Models::BaseFile
+  rad.extension :attachment_file_path, self do
+    define_method :build_path do |*args|
+      "#{rad.models.fs['prefix']}/#{model_id}" + build_standard_path(*args)
+    end
+
+    define_method :build_url do |*args|
+      "#{rad.models.fs['prefix']}/#{model_id}" + build_standard_url(*args)
+    end
+  end
+
+  version :icon do
+    def process &block
+      mini_magic block do |image|
+        image.resize '50x50'
+      end
+    end
+  end
+
+  version :thumb do
+    def process &block
+      mini_magic block do |image|
+        image.resize '150x150'
+      end
+    end
+  end
+end

data/lib/kit/models/{attachments_uploader_helper.rb → attachments_helper.rb}

@@ -1,79 +1,85 @@
-module Mongoid::AttachmentsUploaderHelper
-  extend ActiveSupport::Concern
-  
+module Mongo::Model::AttachmentsHelper
   class FileHelper
     attr_reader :object
     def initialize object
       @object = object
     end
-    
+
     def file?
-      object.is_a?(Hash) or object.is_a?(IO)
+      object.is_a?(Hash) or object.is_a?(IO) or object.is_a?(Vfs::File)
     end
-    
+
     def name
       if object.is_a?(Hash)
         object['filename'] || object[:filename]
       elsif object.is_a?(IO)
         File.basename(object.path)
+      elsif object.is_a?(Vfs::File)
+        object.name
       else
         object
       end
     end
   end
-  
+
   def get_attachments association_name, field_name
     send(association_name).
-      sort{|a, b| a.send(field_name).name <=> b.send(field_name).name}.
-      collect{|o| {name: o.send(field_name).name, url: o.send(field_name).url}.to_openobject}
+      sort{|a, b| a.send(field_name).file.name <=> b.send(field_name).file.name}.
+      collect{|o| {name: o.send(field_name).file.name, url: o.send(field_name).url}.to_openobject}
   end
-  
-  def set_attachments association_name, field_name, values
+
+  def set_attachments association_name, field_name, values, &block
     association = send(association_name)
-    existing_names = association.collect{|o| o.send(field_name).name}.sort    
-    
-    add = values.select do |o| 
+    existing_names = association.collect{|o| o.send(field_name).file.name}.sort
+
+    add = values.select do |o|
       h = FileHelper.new o
       h.file? and !existing_names.include?(h.name)
-    end        
-    update = values.select do |o| 
+    end
+    update = values.select do |o|
       h = FileHelper.new o
-      h.file? and existing_names.include?(h.name) 
-    end     
+      h.file? and existing_names.include?(h.name)
+    end
     remove = association.select do |model|
       values.none? do |o|
         h = FileHelper.new o
         model.send(field_name).name == h.name
       end
-    end    
+    end
 
-    add.each{|file| association.build field_name => file}    
+    add.each do |file|
+      model = block.call
+      model._parent = self
+      model.send "#{field_name}=", file
+      association << model
+    end
     update.each do |file|
       h = FileHelper.new file
       association.each do |model|
-        if model.send(field_name).name == h.name
+        if model.send(field_name).file.name == h.name
           model.send "#{field_name}=", file
           break
         end
       end
-    end    
+    end
     remove.each do |model|
-      association.where(_id: model.id).destroy_all
+      association.delete model
+      # association.where(_id: model._id).destroy_all
     end
   end
 
   module ClassMethods
-    def mount_attachments_uploader association_name, field_name
+    def mount_attachments association_name, field_name, &block
       define_method "#{association_name}_as_attachments" do
         get_attachments association_name, field_name
       end
-      
+
       define_method "#{association_name}_as_attachments=" do |values|
-        set_attachments association_name, field_name, values
+        set_attachments association_name, field_name, values, &block
       end
-      
+
       # we can't allow to destroy model with changed attachments because it's too complicated to support this case.
-      before_destroy{|o| raise "Can't destroy item with changed attachments!" if o.changes.include? association_name}
+      # before_destroy{|o| raise "Can't destroy item with changed attachments!" if o.changes.include? association_name}
     end
   end
 end