biovision-comment 0.1.170914 → 0.7.190905.0

data/config/routes.rb

@@ -1,17 +1,25 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
-  resources :comments, except: [:index, :new]
+  resources :comments, only: %i[update destroy]
+
+  scope '/(:locale)', constraints: { locale: /ru|en|sv|cn/ } do
+    resources :comments, only: %i[create edit show] do
+      post 'check', on: :collection
+    end
 
-  namespace :admin do
-    resources :comments, only: [:index, :show] do
-      member do
-        post 'toggle', defaults: { format: :json }
-        put 'lock', defaults: { format: :json }
-        delete 'lock', action: :unlock, defaults: { format: :json }
+    namespace :admin do
+      resources :comments, only: %i[index show] do
+        member do
+          post 'toggle', defaults: { format: :json }
+          put 'lock', defaults: { format: :json }
+          delete 'lock', action: :unlock, defaults: { format: :json }
+        end
       end
     end
-  end
 
-  namespace :my do
-    resources :comments, only: [:index]
+    namespace :my do
+      resources :comments, only: :index
+    end
   end
 end

data/db/migrate/20170914000001_create_comments.rb

@@ -1,31 +1,56 @@
+# frozen_string_literal: true
+
+# Migration for comments table
 class CreateComments < ActiveRecord::Migration[5.0]
   def up
-    unless Comment.table_exists?
-      create_table :comments do |t|
-        t.timestamps
-        t.integer :parent_id
-        t.references :user, foreign_key: true, on_update: :cascade, on_delete: :cascade
-        t.references :agent, foreign_key: true, on_update: :cascade, on_delete: :nullify
-        t.inet :ip
-        t.boolean :visible, default: true, null: false
-        t.boolean :locked, default: false, null: false
-        t.boolean :deleted, default: false, null: false
-        t.integer :upvote_count, default: 0, null: false
-        t.integer :downvote_count, default: 0, null: false
-        t.integer :vote_result, default: 0, null: false
-        t.integer :commentable_id, null: false
-        t.string :commentable_type, null: false
-        t.text :body, null: false
-      end
-
-      add_index :comments, [:commentable_id, :commentable_type]
-      add_foreign_key :comments, :comments, column: :parent_id, on_update: :cascade, on_delete: :cascade
-    end
+    create_component_record
+    create_comments_table unless Comment.table_exists?
   end
 
   def down
-    if Comment.table_exists?
-      drop_table :comments
+    drop_table :comments if Comment.table_exists?
+  end
+
+  private
+
+  def create_comments_table
+    create_table :comments, comment: 'Comment for commentable item' do |t|
+      t.timestamps
+      t.integer :parent_id
+      t.references :user, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      t.references :agent, foreign_key: { on_update: :cascade, on_delete: :nullify }
+      t.inet :ip
+      t.boolean :visible, default: true, null: false
+      t.boolean :locked, default: false, null: false
+      t.boolean :deleted, default: false, null: false
+      t.boolean :spam, default: false, null: false
+      t.boolean :approved, default: true, null: false
+      t.integer :upvote_count, default: 0, null: false
+      t.integer :downvote_count, default: 0, null: false
+      t.integer :vote_result, default: 0, null: false
+      t.integer :commentable_id, null: false
+      t.string :commentable_type, null: false
+      t.string :author_name
+      t.string :author_email
+      t.text :body, null: false
+      t.jsonb :data, default: {}, null: false
     end
+
+    add_index :comments, :data, using: :gin
+    add_index :comments, %i[commentable_id commentable_type]
+    add_foreign_key :comments, :comments, column: :parent_id, on_update: :cascade, on_delete: :cascade
+  end
+
+  def create_component_record
+    slug = Biovision::Components::CommentsComponent::SLUG
+    return if BiovisionComponent.exists?(slug: slug)
+
+    BiovisionComponent.create!(
+      slug: slug,
+      settings: {
+        premoderation: false,
+        auto_approve_threshold: 3
+      }
+    )
   end
 end

data/db/migrate/20190203090909_add_fields_to_comments.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# Adding "spam" flag and anonymous contact fields to comment
+class AddFieldsToComments < ActiveRecord::Migration[5.2]
+  def up
+    add_column(:comments, :spam, :boolean, default: false, null: false) unless column_exists?(:comments, :spam)
+    add_column(:comments, :author_name, :string) unless column_exists?(:comments, :author_name)
+    add_column(:comments, :author_email, :string) unless column_exists?(:comments, :author_email)
+  end
+
+  def down
+    # No rollback needed
+  end
+end

data/db/migrate/20190428212121_add_approved_to_comments.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# Add column with approval flag to comments
+class AddApprovedToComments < ActiveRecord::Migration[5.2]
+  def up
+    return if column_exists?(:comments, :approved)
+
+    add_column :comments, :approved, :boolean, default: true, null: false
+  end
+
+  def down
+    # No rollback needed
+  end
+end

data/db/migrate/20190428212122_create_comments_component.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# Create row for comments component in components table
+class CreateCommentsComponent < ActiveRecord::Migration[5.2]
+  def up
+    slug = Biovision::Components::CommentsComponent::SLUG
+    return if BiovisionComponent.exists?(slug: slug)
+
+    BiovisionComponent.create!(
+      slug: slug,
+      settings: {
+        premoderation: false,
+        auto_approve_threshold: 3
+      }
+    )
+  end
+
+  def down
+    # No rollback needed
+  end
+end

data/db/migrate/20190628101010_add_data_to_comments.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# Add data column to comments
+class AddDataToComments < ActiveRecord::Migration[5.2]
+  def up
+    return if column_exists? :comments, :data
+
+    add_column :comments, :data, :jsonb, default: {}, null: false
+    add_index :comments, :data, using: :gin
+  end
+
+  def down
+    # No rollback needed
+  end
+end

data/lib/biovision/comment/engine.rb

@@ -1,10 +1,15 @@
+require 'biovision/base'
+
 module Biovision
   module Comment
     class Engine < ::Rails::Engine
+      config.generators do |g|
+        g.test_framework :rspec
+        g.fixture_replacement :factory_bot, :dir => 'spec/factories'
+      end
+
       config.assets.precompile << %w(biovision/base/icons/*)
       config.assets.precompile << %w(biovision/base/placeholders/*)
     end
-
-    require 'biovision/base'
   end
 end

data/lib/biovision/comment/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Biovision
   module Comment
-    VERSION = '0.1.170914'
+    VERSION = '0.7.190905.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-comment
 version: !ruby/object:Gem::Version
-  version: 0.1.170914
+  version: 0.7.190905.0
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2019-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -134,33 +134,45 @@ files:
 - Rakefile
 - app/assets/config/biovision_comment_manifest.js
 - app/assets/javascripts/biovision/comment/application.js
+- app/assets/javascripts/biovision/comment/biovision-comments.js
 - app/assets/stylesheets/biovision/comment/comments.scss
 - app/controllers/admin/comments_controller.rb
 - app/controllers/biovision/comment/application_controller.rb
 - app/controllers/comments_controller.rb
 - app/controllers/my/comments_controller.rb
 - app/helpers/biovision/comment/application_helper.rb
+- app/helpers/comments_helper.rb
 - app/jobs/biovision/comment/application_job.rb
 - app/mailers/biovision/comment/application_mailer.rb
 - app/mailers/comment_mailer.rb
 - app/models/biovision/comment/application_record.rb
 - app/models/comment.rb
+- app/models/concerns/commentable_item.rb
+- app/services/biovision/components/comments_component.rb
+- app/services/comment_handler.rb
+- app/services/comments_manager.rb
 - app/views/admin/comments/_comment.html.erb
 - app/views/admin/comments/_nav_item.html.erb
 - app/views/admin/comments/entity/_in_list.html.erb
 - app/views/admin/comments/index.html.erb
 - app/views/admin/comments/show.html.erb
+- app/views/admin/components/links/_comments.html.erb
 - app/views/comment_mailer/entry_reply.text.erb
 - app/views/comments/_comment.html.erb
 - app/views/comments/_form.html.erb
 - app/views/comments/_list.html.erb
+- app/views/comments/_reply_container.html.erb
+- app/views/comments/_section.html.erb
 - app/views/comments/edit.html.erb
 - app/views/comments/new.html.erb
-- app/views/comments/show.html.erb
 - app/views/layouts/biovision/comment/application.html.erb
 - config/locales/comments-ru.yml
 - config/routes.rb
 - db/migrate/20170914000001_create_comments.rb
+- db/migrate/20190203090909_add_fields_to_comments.rb
+- db/migrate/20190428212121_add_approved_to_comments.rb
+- db/migrate/20190428212122_create_comments_component.rb
+- db/migrate/20190628101010_add_data_to_comments.rb
 - lib/biovision/comment.rb
 - lib/biovision/comment/engine.rb
 - lib/biovision/comment/version.rb
@@ -184,8 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Commenting for biovision-based applications

data/app/views/comments/show.html.erb

@@ -1,27 +0,0 @@
-<% content_for :meta_title, t('.title', id: @entity.id) %>
-<% content_for :options do %>
-      <ul>
-        <li><%= link_to t(:list), admin_comments_path %></li>
-        <li><%= link_to t(:edit), edit_comment_path(@entity) %></li>
-      </ul>
-<% end %>
-
-<article class="comment">
-  <h1><%= t('.title', id: @entity.id) %></h1>
-
-  <div class="comment">
-    <div class="title">
-      <%= @entity.commentable.model_name.human %>
-      <cite><%= link_to @entity.commentable.title, @entity.commentable %></cite>
-    </div>
-
-    <div class="author">
-      <%= user_link @entity.user %>
-      <%= time_tag @entity.created_at %>
-    </div>
-
-    <div class="body">
-      <%= prepare_comment_text(@entity) %>
-    </div>
-  </div>
-</article>