rails_admin_comments 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92d36ad9f7b2fe74672829bd9e8ece9f6e857886
-  data.tar.gz: 1ddf10c71da28a28c6e21b1163a2146b84e6629e
+  metadata.gz: 94998642dc3466c7483b166998e21c4a297ed5af
+  data.tar.gz: b1ec593416764e283ef3f631088e645da13a9849
 SHA512:
-  metadata.gz: 44100a7f7b7aa06c0b66c2842cd8831f36258447576c52136c337bb0f0f2e37555a7c3e4730a30b22f013b4adf5c39cdecc17519cca5f4cbb526a463c86ee83d
-  data.tar.gz: cbe891563d599013255d0ef4a77038df53c48af4c38a85171e58887c69ba4de354f3800a2b2fe81863e2dda4e6a950deae5b40acdbf7fde9bff1b32a63b5f863
+  metadata.gz: 7241a5c99a57620fed57585af142c05d2ef615ea16931c5a21e5aca888a849d4f0ed223a6da177871b1802e74cd0f1c44293890da63d41eb5cb415fcfa465ad8
+  data.tar.gz: dd14b0b239baf29ea56f459f06a00dd40ba28248f952a55359be6fe0776f1ca846d48342f0227c313a4a5cd58ce7ae01d869e2c0452da83a249afb1f4a135879

data/README.md

@@ -25,7 +25,8 @@ Or install it yourself as:
 Add in model what you need to be commentable
 
 ```ruby
-  include RailsAdminComments::Commentable
+  include RailsAdminComments::Commentable # comments for objects
+  include RailsAdminComments::ModelCommentable # comments for model (from v.0.2.0)
 ```
 
 And add action available for this model_name
@@ -38,9 +39,18 @@ And add action available for this model_name
       ].include? bindings[:abstract_model].model_name
     end
   end
+
+  # from v.0.2.0
+  model_comments do
+    visible do
+      [
+        "SomeModel"
+      ].include? bindings[:abstract_model].model_name
+    end
+  end
 ```
 
-Also you need to add method name_for_rails_admin_comments for user model_name 
+Also you need to add method name_for_rails_admin_comments for user model_name
 
 ```ruby
   def name_for_rails_admin_comments

data/app/assets/javascripts/rails_admin/rails_admin_comments.coffee

@@ -4,3 +4,9 @@ $(document).delegate ".comment_edit_form_link", 'click', (e)->
   target = $(link.attr('href'))
   $('.comment_edit_form').addClass('hidden').closest('.comment_block').find(".content_block").removeClass('hidden')
   target.removeClass('hidden').closest('.comment_block').find(".content_block").addClass('hidden')
+
+$(document).delegate ".comment_delete_form_link", 'click', (e)->
+  e.preventDefault()
+  link = $(e.currentTarget)
+  target = $(link.attr('href'))
+  target.find('form').prepend("<input type='hidden' name='_method' value='delete'></input>").submit()

data/app/assets/stylesheets/rails_admin/rails_admin_comments.sass

@@ -19,6 +19,9 @@
       margin-left: 10px
       text-decoration: none
       border-bottom: 1px dotted
+    .comment_delete_form_link
+      margin-left: 0px
+
 
   textarea
     width: 70%

data/app/models/concerns/rails_admin_comments/model_commentable.rb

@@ -0,0 +1,12 @@
+module RailsAdminComments
+  module ModelCommentable
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def rails_admin_model_comments
+        RailsAdminComments::ModelComment.where(model_name: self)
+      end
+    end
+
+  end
+end

data/app/models/rails_admin_comments/comment.rb

@@ -9,12 +9,12 @@ module RailsAdminComments
   class Comment
     #binding.pry
     if RailsAdminComments.mongoid?
-      include RailsAdminComments::Mongoid
+      include RailsAdminComments::Comments::Mongoid
     end
 
     if RailsAdminComments.active_record?
       self.table_name = "rails_admin_comments"
     end
-      
+
   end
 end

data/app/models/rails_admin_comments/model_comment.rb

@@ -0,0 +1,20 @@
+if RailsAdminComments.active_record?
+  module RailsAdminComments
+    class ModelComment < ActiveRecord::Base
+    end
+  end
+end
+
+module RailsAdminComments
+  class ModelComment
+    #binding.pry
+    if RailsAdminComments.mongoid?
+      include RailsAdminComments::ModelComments::Mongoid
+    end
+
+    if RailsAdminComments.active_record?
+      self.table_name = "rails_admin_model_comments"
+    end
+
+  end
+end

data/app/views/rails_admin/main/comments.html.slim

@@ -1,3 +1,6 @@
+- available_users = User.admins.to_a + User.managers.to_a
+- available_users.uniq!
+
 #rails_admin_comments_wrapper
   = stylesheet_link_tag 'rails_admin/rails_admin_comments'
   = javascript_include_tag 'rails_admin/rails_admin_comments'
@@ -16,7 +19,10 @@
               = link_to creator.name_for_rails_admin_comments, show_path(model_name: model_name, id: creator._id), class: "creator_link"
             span.created_at= Russian::strftime c.c_at, "%d.%m.%Y в %H:%M:%S"
             span.updated_at= " (изм. #{Russian::strftime c.u_at, "%d.%m.%Y в %H:%M:%S"})" if Russian::strftime c.u_at
-            = link_to 'изменить', "##{edit_form_id}", class: 'comment_edit_form_link' if creator == current_user
+            - if creator == current_user or (current_user.respond_to?(:admin?) and current_user.admin?)
+              = link_to 'изменить', "##{edit_form_id}", class: 'comment_edit_form_link'  
+              = " | " 
+              = link_to 'удалить', "##{edit_form_id}",  class: 'comment_delete_form_link'
             p.content_block= c.content
           p
             .comment_edit_form.hidden{id="#{edit_form_id}"}
@@ -27,6 +33,8 @@
                   - @comment = @message = nil
                 
               = form_for c, url: url, method: :post do |f|
+                - if current_user.admin?
+                  p= f.collection_check_boxes :visible_for_user_ids, available_users, :id, :name_for_rails_admin_comments
                 p= f.hidden_field :id
                 p= f.text_area :content
                 p= f.submit
@@ -35,8 +43,12 @@
     hr
     - @comment ||= RailsAdminComments::Comment.new
     p
+      - unless @message.blank?
+        p== @message
       = form_for @comment, url: url, method: :post do |f|
-        - unless @message.blank?
-          p== @message
+        - if current_user.admin?
+          - if @comment.visible_for_users.blank?
+            - @comment.visible_for_users << available_users.select { |u| u.roles.include?("admin")}
+          p= f.collection_check_boxes :visible_for_user_ids, available_users, :id, :email
         p= f.text_area :content
         p= f.submit

data/app/views/rails_admin/main/model_comments.html.slim

@@ -0,0 +1,54 @@
+- available_users = User.admins.to_a + User.managers.to_a
+- available_users.uniq!
+
+#rails_admin_comments_wrapper
+  = stylesheet_link_tag 'rails_admin/rails_admin_comments'
+  = javascript_include_tag 'rails_admin/rails_admin_comments'
+
+  #rails_admin_comments
+
+    - url = model_comments_path(model_name: @abstract_model)
+    .controls
+      - @comments.each do |c|
+        .comment_block
+          - edit_form_id = "comment_#{c.id}_edit" 
+          p
+            - creator = c.creator
+            - if creator
+              - model_name = creator.class.to_param.gsub("::", "~").underscore
+              = link_to creator.name_for_rails_admin_comments, show_path(model_name: model_name, id: creator._id), class: "creator_link"
+            span.created_at= Russian::strftime c.c_at, "%d.%m.%Y в %H:%M:%S"
+            span.updated_at= " (изм. #{Russian::strftime c.u_at, "%d.%m.%Y в %H:%M:%S"})" if Russian::strftime c.u_at
+            - if creator == current_user or (current_user.respond_to?(:admin?) and current_user.admin?)
+              = link_to 'изменить', "##{edit_form_id}", class: 'comment_edit_form_link'  
+              = " | " 
+              = link_to 'удалить', "##{edit_form_id}",  class: 'comment_delete_form_link'
+            p.content_block= c.content
+          p
+            .comment_edit_form.hidden{id="#{edit_form_id}"}
+              - if @comment and @comment._id == c._id
+                - c = @comment
+                - unless @message.blank?
+                  p== @message
+                  - @comment = @message = nil
+                
+              = form_for c, url: url, method: :post do |f|
+                - if current_user.admin?
+                  p= f.collection_check_boxes :visible_for_user_ids, available_users, :id, :name_for_rails_admin_comments
+                p= f.hidden_field :id
+                p= f.text_area :content
+                p= f.submit
+          br
+
+    hr
+    - @comment ||= RailsAdminComments::ModelComment.new
+    p
+      - unless @message.blank?
+        p== @message
+      = form_for @comment, url: url, method: :post do |f|
+        - if current_user.admin?
+          - if @comment.visible_for_users.blank?
+            - @comment.visible_for_users << available_users.select { |u| u.roles.include?("admin")}
+          p= f.collection_check_boxes :visible_for_user_ids, available_users, :id, :email
+        p= f.text_area :content
+        p= f.submit

data/config/initializers/rails_admin.rb

@@ -2,7 +2,8 @@ if defined?(RailsAdmin)
   RailsAdmin.config do |config|
     config.excluded_models ||= []
     config.excluded_models << [
-        'RailsAdminComments::Comment'
+        'RailsAdminComments::Comment',
+        'RailsAdminComments::ModelComment'
     ]
     config.excluded_models.flatten!
   end

data/config/locales/ru.rails_admin_comments.yml

@@ -2,9 +2,17 @@ ru:
   admin:
     actions:
       comments:
-        menu:           "Коментарии"
-        breadcrumb:     "Коментарии"
+        menu:           "Комментарии"
+        breadcrumb:     "Комментарии"
         error:          "Ошибка"
         error_no_data:  "Нет данных"
         success:        "Успешно"
-        title:          "Коментарии"
+        title:          "Комментарии"
+
+      model_comments:
+        menu:           "Комментарии"
+        breadcrumb:     "Комментарии"
+        error:          "Ошибка"
+        error_no_data:  "Нет данных"
+        success:        "Успешно"
+        title:          "Комментарии"

data/lib/rails_admin_comments/action.rb

@@ -24,11 +24,10 @@ module RailsAdmin
 
         register_instance_option :controller do
           Proc.new do |klass|
-            @config = ::RailsAdminComments::Configuration.new @abstract_model
-
             if params['id'].present?
-              @comments = @object.rails_admin_comments.by_date.enabled
+              @config = ::RailsAdminComments::Configuration.new @abstract_model
               if request.get?
+                @comments = @object.rails_admin_comments.by_date.enabled.for_user(current_user) || []
                 render action: @action.template_name
 
               elsif request.post?
@@ -40,6 +39,7 @@ module RailsAdmin
                     @comment = @object.rails_admin_comments.new if @comment.nil?
 
                     @comment.content = params['rails_admin_comments_comment']['content']
+                    @comment.visible_for_user_ids = params['rails_admin_comments_comment']['visible_for_user_ids']
 
                     if @comment.save
                       @comment = nil
@@ -72,7 +72,91 @@ module RailsAdmin
         end
 
         register_instance_option :http_methods do
-          [:get, :post]
+          [:get, :post, :delete]
+        end
+      end
+    end
+  end
+end
+
+
+
+module RailsAdmin
+  module Config
+    module Actions
+      class ModelComments < Comments
+        RailsAdmin::Config::Actions.register(self)
+
+        register_instance_option :collection? do
+          true
+        end
+
+        register_instance_option :member? do
+          false
+        end
+
+        register_instance_option :route_fragment do
+          'model_comments'
+        end
+
+        register_instance_option :controller do
+          Proc.new do |klass|
+            @config = ::RailsAdminComments::Configuration.new @abstract_model
+            @model = @abstract_model.model
+            if request.get?
+              @comments = @model.rails_admin_model_comments.by_date.enabled.for_user(current_user) || []
+              render action: @action.template_name
+
+            elsif request.post?
+              begin
+                if params['rails_admin_comments_model_comment'].present?
+                  if params['rails_admin_comments_model_comment']['id'].present?
+                    @comment = @model.rails_admin_model_comments.find(params['rails_admin_comments_model_comment']['id'])
+                  end
+                  @comment ||= @model.rails_admin_model_comments.new
+
+                  @comment.content = params['rails_admin_comments_model_comment']['content']
+                  @comment.visible_for_user_ids = params['rails_admin_comments_model_comment']['visible_for_user_ids']
+
+                  if @comment.save
+                    @comment = nil
+                    @message = "<strong class='success'>#{I18n.t('admin.actions.model_comments.success')}!</strong>"
+
+                  else
+                    @message = []
+                    @message << "<strong class='error'>#{I18n.t('admin.actions.model_comments.error')}!</strong>"
+                    @comment.errors.each do |e|
+                      @message << "<p>#{e.message}</p>"
+                    end
+                    @message = @message.join
+                  end
+                else
+                  @message = "<strong class='error'>#{I18n.t('admin.actions.model_comments.error')}</strong>:<p>#{I18n.t('admin.actions.model_comments.error_no_data')}</p>"
+                end
+
+              rescue Exception => e
+                @message = "<strong class='error'>#{I18n.t('admin.actions.comments.error')}</strong>: #{e}"
+              end
+
+              render action: @action.template_name
+
+            elsif request.delete?
+              if params['rails_admin_comments_model_comment']['id'].present?
+                @comment = @model.rails_admin_model_comments.find(params['rails_admin_comments_model_comment']['id'])
+              end
+              if @comment and @comment.destroy
+                @comment = nil
+                @message = "Удалено"
+              else
+                @message = "Удаление не удалось"
+              end
+              render action: @action.template_name
+            end
+          end
+        end
+
+        register_instance_option :link_icon do
+          'icon-comment'
         end
       end
     end

data/lib/rails_admin_comments/models/mongoid/comments.rb

@@ -0,0 +1,29 @@
+module RailsAdminComments
+  module Comments
+    module Mongoid
+      extend ActiveSupport::Concern
+      included do
+        include ::Mongoid::Document
+        include ::Mongoid::Timestamps::Short
+        include ::Mongoid::Userstamp
+
+        belongs_to :rails_admin_commentable, polymorphic: true
+
+        store_in collection: "rails_admin_comments"
+
+        field :enabled, type: ::Mongoid::VERSION.to_i < 4 ? Boolean : ::Mongoid::Boolean, default: true
+        scope :enabled, -> { where(enabled: true) }
+
+        scope :by_date, -> { order([:c_at, :asc]) }
+
+        field :content
+        validates_presence_of :content
+
+        has_and_belongs_to_many :visible_for_users, class_name: "User", inverse_of: nil
+        scope :for_user, ->(user) {
+          any_of({visible_for_user_ids: user}, {visible_for_user_ids: nil})
+        }
+      end
+    end
+  end
+end

data/lib/rails_admin_comments/models/mongoid/model_comments.rb

@@ -0,0 +1,29 @@
+module RailsAdminComments
+  module ModelComments
+    module Mongoid
+      extend ActiveSupport::Concern
+      included do
+        include ::Mongoid::Document
+        include ::Mongoid::Timestamps::Short
+        include ::Mongoid::Userstamp
+
+        field :model_name, type: String
+
+        store_in collection: "rails_admin_model_comments"
+
+        field :enabled, type: ::Mongoid::VERSION.to_i < 4 ? Boolean : ::Mongoid::Boolean, default: true
+        scope :enabled, -> { where(enabled: true) }
+
+        scope :by_date, -> { order([:c_at, :asc]) }
+
+        field :content
+        validates_presence_of :content
+
+        has_and_belongs_to_many :visible_for_users, class_name: "User", inverse_of: nil
+        scope :for_user, ->(user) {
+          any_of({visible_for_user_ids: user}, {visible_for_user_ids: nil})
+        }
+      end
+    end
+  end
+end

data/lib/rails_admin_comments/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminComments
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/rails_admin_comments.rb

@@ -4,8 +4,15 @@ require "rails_admin_comments/version"
 require 'mongoid'
 require 'mongoid_userstamp'
 
+require "rails_admin_comments/engine"
+
+require 'rails_admin_comments/configuration'
+
 require 'rails_admin/config/actions'
 require 'rails_admin/config/model'
+require 'rails_admin_comments/action'
+# require 'rails_admin_comments/model'
+require 'rails_admin_comments/helper'
 
 module RailsAdminComments
   class << self
@@ -27,14 +34,11 @@ module RailsAdminComments
     end
   end
 
-  autoload :Mongoid,           "rails_admin_comments/mongoid"
+  module Comments
+    autoload :Mongoid,           "rails_admin_comments/models/mongoid/comments"
+  end
+  module ModelComments
+    autoload :Mongoid,           "rails_admin_comments/models/mongoid/model_comments"
+  end
   # autoload :RailsAdminConfig,  "rails_admin_comments/rails_admin_config"
 end
-
-
-require "rails_admin_comments/engine"
-
-require 'rails_admin_comments/configuration'
-require 'rails_admin_comments/action'
-# require 'rails_admin_comments/model'
-require 'rails_admin_comments/helper'

data/rails_admin_comments.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
-
-  spec.add_dependency "rails"
+  
+  spec.add_dependency "rails_admin"
   spec.add_dependency "mongoid", [">= 5.0", "< 6.0"]
   spec.add_dependency "glebtv_mongoid_userstamp"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_comments
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rails_admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -104,8 +104,11 @@ files:
 - app/assets/javascripts/rails_admin/rails_admin_comments.coffee
 - app/assets/stylesheets/rails_admin/rails_admin_comments.sass
 - app/models/concerns/rails_admin_comments/commentable.rb
+- app/models/concerns/rails_admin_comments/model_commentable.rb
 - app/models/rails_admin_comments/comment.rb
+- app/models/rails_admin_comments/model_comment.rb
 - app/views/rails_admin/main/comments.html.slim
+- app/views/rails_admin/main/model_comments.html.slim
 - bin/console
 - bin/setup
 - config/initializers/rails_admin.rb
@@ -115,7 +118,8 @@ files:
 - lib/rails_admin_comments/configuration.rb
 - lib/rails_admin_comments/engine.rb
 - lib/rails_admin_comments/helper.rb
-- lib/rails_admin_comments/mongoid.rb
+- lib/rails_admin_comments/models/mongoid/comments.rb
+- lib/rails_admin_comments/models/mongoid/model_comments.rb
 - lib/rails_admin_comments/version.rb
 - rails_admin_comments.gemspec
 - release.sh

data/lib/rails_admin_comments/mongoid.rb

@@ -1,24 +0,0 @@
-module RailsAdminComments
-  module Mongoid
-    extend ActiveSupport::Concern
-    included do
-      include ::Mongoid::Document
-      include ::Mongoid::Timestamps::Short
-      include ::Mongoid::Userstamp
-
-      belongs_to :rails_admin_commentable, polymorphic: true
-
-      store_in collection: "rails_admin_comments"
-
-      field :enabled, type: ::Mongoid::VERSION.to_i < 4 ? Boolean : ::Mongoid::Boolean, default: true
-      scope :enabled, -> { where(enabled: true) }
-
-      scope :by_date, -> { order([:c_at, :asc]) }
-
-      field :content
-      validates_presence_of :content
-
-      scope :for_user, ->(user) {}
-    end
-  end
-end