the_comments 1.1.0 → 2.0.0

data/spec/dummy_app/spec/spec_helper.rb

@@ -0,0 +1,29 @@
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path("../../config/environment", __FILE__)
+
+require 'rspec/rails'
+require 'rspec/autorun'
+
+Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
+
+RSpec.configure do |config|
+  config.infer_base_class_for_anonymous_controllers = false
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  config.use_transactional_fixtures = true
+  config.order = "random"
+
+  # DatabaseCleaner
+  # config.before(:suite) do
+  #   DatabaseCleaner.strategy = :transaction
+  #   DatabaseCleaner.clean_with(:truncation)
+  # end
+
+  # config.before(:each) do
+  #   DatabaseCleaner.start
+  # end
+
+  # config.after(:each) do
+  #   DatabaseCleaner.clean
+  # end
+end

data/spec/dummy_app/test/test_helper.rb

@@ -0,0 +1,15 @@
+ENV["RAILS_ENV"] ||= "test"
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
+
+class ActiveSupport::TestCase
+  ActiveRecord::Migration.check_pending!
+
+  # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
+  #
+  # Note: You'll currently still have to declare fixtures explicitly in integration tests
+  # -- they do not yet inherit this setting
+  fixtures :all
+
+  # Add more helper methods to be used by all tests here...
+end

data/views_converter.rb

@@ -0,0 +1,16 @@
+# gem install haml2slim --nori --nordoc
+# ruby views_converter.rb
+
+from = "./app/views/the_comments/haml"
+to   = "./app/views/the_comments/slim"
+
+`haml2slim #{from} #{to} --trace`
+
+Dir.glob("#{to}/*.slim") do |slim_file|
+  content = File.read slim_file
+  content = content.gsub "haml", "slim"
+
+  file = File.open slim_file, "w"
+  file.write content
+  file.close
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: the_comments
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &85480050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *85480050
 - !ruby/object:Gem::Dependency
   name: the_sortable_tree
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &85479700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,12 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *85479700
 description: ! ' Comments with threading for Rails 4 '
 email:
 - zykin-ilya@ya.ru
@@ -51,6 +41,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rvmrc.example
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -58,49 +50,155 @@ files:
 - app/assets/javascripts/the_comments.js.coffee
 - app/assets/javascripts/the_comments_manage.js.coffee
 - app/assets/stylesheets/the_comments.css.scss
-- app/controllers/concerns/the_comments_controller.rb
-- app/controllers/concerns/the_comments_ip_controller.rb
-- app/controllers/concerns/the_comments_user_agent_controller.rb
+- app/controllers/_templates_/comments_controller.rb
+- app/controllers/concerns/controller.rb
 - app/helpers/render_comments_tree_helper.rb
-- app/models/concerns/the_comments_base.rb
-- app/models/concerns/the_comments_black_ip.rb
-- app/models/concerns/the_comments_black_user_agent.rb
-- app/models/concerns/the_comments_commentable.rb
-- app/models/concerns/the_comments_states.rb
-- app/models/concerns/the_comments_user.rb
-- app/views/ip_black_lists/index.html.haml
-- app/views/the_comments/_comment.html.haml
-- app/views/the_comments/_comment_body.html.haml
-- app/views/the_comments/_form.html.haml
-- app/views/the_comments/_manage_controls.html.haml
-- app/views/the_comments/_tree.html.haml
-- app/views/the_comments/index.html.haml
-- app/views/the_comments/manage.html.haml
-- app/views/user_agent_black_lists/index.html.haml
+- app/models/_templates_/comment.rb
+- app/models/concerns/comment.rb
+- app/models/concerns/comment_states.rb
+- app/models/concerns/commentable.rb
+- app/models/concerns/user.rb
+- app/views/the_comments/_tree.html.erb
+- app/views/the_comments/haml/_additional_info.html.haml
+- app/views/the_comments/haml/_comment.html.haml
+- app/views/the_comments/haml/_comment_body.html.haml
+- app/views/the_comments/haml/_comment_edit.html.haml
+- app/views/the_comments/haml/_form.html.haml
+- app/views/the_comments/haml/_manage_controls.html.haml
+- app/views/the_comments/haml/_sidebar.html.haml
+- app/views/the_comments/haml/_tree.html.haml
+- app/views/the_comments/haml/index.html.haml
+- app/views/the_comments/haml/manage.html.haml
+- app/views/the_comments/haml/my_comments.html.haml
+- app/views/the_comments/slim/_additional_info.html.slim
+- app/views/the_comments/slim/_comment.html.slim
+- app/views/the_comments/slim/_comment_body.html.slim
+- app/views/the_comments/slim/_comment_edit.html.slim
+- app/views/the_comments/slim/_form.html.slim
+- app/views/the_comments/slim/_manage_controls.html.slim
+- app/views/the_comments/slim/_sidebar.html.slim
+- app/views/the_comments/slim/_tree.html.slim
+- app/views/the_comments/slim/index.html.slim
+- app/views/the_comments/slim/manage.html.slim
+- app/views/the_comments/slim/my_comments.html.slim
+- config/initializers/the_comments.rb
 - config/locales/en.yml
+- config/locales/ru.yml
 - config/routes.rb
-- db/migrate/20130101010101_create_comments.rb
+- db/migrate/20130101010101_change_user.rb
+- db/migrate/20130101010102_create_comments.rb
+- db/migrate/20130101010103_change_commentable.rb
+- docs/admin_ui_installation.md
+- docs/advanced_installation.md
+- docs/comment_api.md
+- docs/commentable_api.md
+- docs/config_file.md
+- docs/content_preprocessors.md
+- docs/customazation_of_views.md
+- docs/denormalization_and_recent_comments.md
+- docs/documentation.md
+- docs/mountable_routes.md
+- docs/pagination.md
+- docs/screencast.jpg
 - docs/the_comments.jpg
 - docs/the_comments_view_1.gif
 - docs/the_comments_view_2.gif
 - docs/the_comments_view_3.gif
 - docs/the_comments_view_4.gif
 - docs/the_comments_view_5.gif
+- docs/user_api.md
+- docs/what_is_comcoms.md
+- docs/whats_wrong_with_other_gems.md
+- docs/where_is_example_application.md
+- gem_version.rb
 - lib/generators/the_comments/USAGE
-- lib/generators/the_comments/templates/comments_controller.rb
-- lib/generators/the_comments/templates/ip_black_list.rb
-- lib/generators/the_comments/templates/ip_black_lists_controller.rb
-- lib/generators/the_comments/templates/the_comments.rb
-- lib/generators/the_comments/templates/the_comments_black_ip.rb
-- lib/generators/the_comments/templates/the_comments_black_user_agent.rb
-- lib/generators/the_comments/templates/user_agent_black_list.rb
-- lib/generators/the_comments/templates/user_agent_black_lists_controller.rb
 - lib/generators/the_comments/the_comments_generator.rb
 - lib/generators/the_comments/views_generator.rb
 - lib/the_comments.rb
 - lib/the_comments/config.rb
 - lib/the_comments/version.rb
+- spec/dummy_app/.gitignore
+- spec/dummy_app/.rspec
+- spec/dummy_app/.ruby-gemset
+- spec/dummy_app/.ruby-version
+- spec/dummy_app/Gemfile
+- spec/dummy_app/README.md
+- spec/dummy_app/Rakefile
+- spec/dummy_app/app/assets/images/.keep
+- spec/dummy_app/app/assets/javascripts/admin_panel.js
+- spec/dummy_app/app/assets/javascripts/application.js
+- spec/dummy_app/app/assets/stylesheets/admin_panel.css
+- spec/dummy_app/app/assets/stylesheets/app.css.scss
+- spec/dummy_app/app/assets/stylesheets/application.css
+- spec/dummy_app/app/controllers/application_controller.rb
+- spec/dummy_app/app/controllers/comments_controller.rb
+- spec/dummy_app/app/controllers/concerns/.keep
+- spec/dummy_app/app/controllers/posts_controller.rb
+- spec/dummy_app/app/controllers/users_controller.rb
+- spec/dummy_app/app/helpers/application_helper.rb
+- spec/dummy_app/app/mailers/.keep
+- spec/dummy_app/app/models/.keep
+- spec/dummy_app/app/models/comment.rb
+- spec/dummy_app/app/models/concerns/.keep
+- spec/dummy_app/app/models/post.rb
+- spec/dummy_app/app/models/user.rb
+- spec/dummy_app/app/views/layouts/admin.html.haml
+- spec/dummy_app/app/views/layouts/application.html.haml
+- spec/dummy_app/app/views/posts/index.html.haml
+- spec/dummy_app/app/views/posts/show.html.haml
+- spec/dummy_app/bin/bundle
+- spec/dummy_app/bin/rails
+- spec/dummy_app/bin/rake
+- spec/dummy_app/config.ru
+- spec/dummy_app/config/application.rb
+- spec/dummy_app/config/boot.rb
+- spec/dummy_app/config/database.yml
+- spec/dummy_app/config/environment.rb
+- spec/dummy_app/config/environments/development.rb
+- spec/dummy_app/config/environments/production.rb
+- spec/dummy_app/config/environments/test.rb
+- spec/dummy_app/config/initializers/backtrace_silencers.rb
+- spec/dummy_app/config/initializers/filter_parameter_logging.rb
+- spec/dummy_app/config/initializers/inflections.rb
+- spec/dummy_app/config/initializers/mime_types.rb
+- spec/dummy_app/config/initializers/secret_token.rb
+- spec/dummy_app/config/initializers/session_store.rb
+- spec/dummy_app/config/initializers/sorcery.rb
+- spec/dummy_app/config/initializers/the_comments.rb
+- spec/dummy_app/config/initializers/wrap_parameters.rb
+- spec/dummy_app/config/locales/en.yml
+- spec/dummy_app/config/routes.rb
+- spec/dummy_app/db/migrate/20130712061503_sorcery_core.rb
+- spec/dummy_app/db/migrate/20130712065951_create_posts.rb
+- spec/dummy_app/db/migrate/20131027185332_change_user.the_comments_engine.rb
+- spec/dummy_app/db/migrate/20131027185333_create_comments.the_comments_engine.rb
+- spec/dummy_app/db/migrate/20131027185334_change_commentable.the_comments_engine.rb
+- spec/dummy_app/db/schema.rb
+- spec/dummy_app/db/seeds.rb
+- spec/dummy_app/lib/assets/.keep
+- spec/dummy_app/lib/tasks/.keep
+- spec/dummy_app/lib/tasks/app_bootstrap.rake
+- spec/dummy_app/log/.keep
+- spec/dummy_app/public/404.html
+- spec/dummy_app/public/422.html
+- spec/dummy_app/public/500.html
+- spec/dummy_app/public/favicon.ico
+- spec/dummy_app/public/robots.txt
+- spec/dummy_app/spec/factories/post.rb
+- spec/dummy_app/spec/factories/user.rb
+- spec/dummy_app/spec/models/user_counters_spec.rb
+- spec/dummy_app/spec/spec_helper.rb
+- spec/dummy_app/test/controllers/.keep
+- spec/dummy_app/test/fixtures/.keep
+- spec/dummy_app/test/helpers/.keep
+- spec/dummy_app/test/integration/.keep
+- spec/dummy_app/test/mailers/.keep
+- spec/dummy_app/test/models/.keep
+- spec/dummy_app/test/test_helper.rb
+- spec/dummy_app/vendor/assets/javascripts/.keep
+- spec/dummy_app/vendor/assets/stylesheets/.keep
 - the_comments.gemspec
+- views_converter.rb
 homepage: https://github.com/open-cook/the_comments
 licenses: []
 post_install_message: 
@@ -121,8 +219,88 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: the_comments by the-teacher
-test_files: []
+test_files:
+- spec/dummy_app/.gitignore
+- spec/dummy_app/.rspec
+- spec/dummy_app/.ruby-gemset
+- spec/dummy_app/.ruby-version
+- spec/dummy_app/Gemfile
+- spec/dummy_app/README.md
+- spec/dummy_app/Rakefile
+- spec/dummy_app/app/assets/images/.keep
+- spec/dummy_app/app/assets/javascripts/admin_panel.js
+- spec/dummy_app/app/assets/javascripts/application.js
+- spec/dummy_app/app/assets/stylesheets/admin_panel.css
+- spec/dummy_app/app/assets/stylesheets/app.css.scss
+- spec/dummy_app/app/assets/stylesheets/application.css
+- spec/dummy_app/app/controllers/application_controller.rb
+- spec/dummy_app/app/controllers/comments_controller.rb
+- spec/dummy_app/app/controllers/concerns/.keep
+- spec/dummy_app/app/controllers/posts_controller.rb
+- spec/dummy_app/app/controllers/users_controller.rb
+- spec/dummy_app/app/helpers/application_helper.rb
+- spec/dummy_app/app/mailers/.keep
+- spec/dummy_app/app/models/.keep
+- spec/dummy_app/app/models/comment.rb
+- spec/dummy_app/app/models/concerns/.keep
+- spec/dummy_app/app/models/post.rb
+- spec/dummy_app/app/models/user.rb
+- spec/dummy_app/app/views/layouts/admin.html.haml
+- spec/dummy_app/app/views/layouts/application.html.haml
+- spec/dummy_app/app/views/posts/index.html.haml
+- spec/dummy_app/app/views/posts/show.html.haml
+- spec/dummy_app/bin/bundle
+- spec/dummy_app/bin/rails
+- spec/dummy_app/bin/rake
+- spec/dummy_app/config.ru
+- spec/dummy_app/config/application.rb
+- spec/dummy_app/config/boot.rb
+- spec/dummy_app/config/database.yml
+- spec/dummy_app/config/environment.rb
+- spec/dummy_app/config/environments/development.rb
+- spec/dummy_app/config/environments/production.rb
+- spec/dummy_app/config/environments/test.rb
+- spec/dummy_app/config/initializers/backtrace_silencers.rb
+- spec/dummy_app/config/initializers/filter_parameter_logging.rb
+- spec/dummy_app/config/initializers/inflections.rb
+- spec/dummy_app/config/initializers/mime_types.rb
+- spec/dummy_app/config/initializers/secret_token.rb
+- spec/dummy_app/config/initializers/session_store.rb
+- spec/dummy_app/config/initializers/sorcery.rb
+- spec/dummy_app/config/initializers/the_comments.rb
+- spec/dummy_app/config/initializers/wrap_parameters.rb
+- spec/dummy_app/config/locales/en.yml
+- spec/dummy_app/config/routes.rb
+- spec/dummy_app/db/migrate/20130712061503_sorcery_core.rb
+- spec/dummy_app/db/migrate/20130712065951_create_posts.rb
+- spec/dummy_app/db/migrate/20131027185332_change_user.the_comments_engine.rb
+- spec/dummy_app/db/migrate/20131027185333_create_comments.the_comments_engine.rb
+- spec/dummy_app/db/migrate/20131027185334_change_commentable.the_comments_engine.rb
+- spec/dummy_app/db/schema.rb
+- spec/dummy_app/db/seeds.rb
+- spec/dummy_app/lib/assets/.keep
+- spec/dummy_app/lib/tasks/.keep
+- spec/dummy_app/lib/tasks/app_bootstrap.rake
+- spec/dummy_app/log/.keep
+- spec/dummy_app/public/404.html
+- spec/dummy_app/public/422.html
+- spec/dummy_app/public/500.html
+- spec/dummy_app/public/favicon.ico
+- spec/dummy_app/public/robots.txt
+- spec/dummy_app/spec/factories/post.rb
+- spec/dummy_app/spec/factories/user.rb
+- spec/dummy_app/spec/models/user_counters_spec.rb
+- spec/dummy_app/spec/spec_helper.rb
+- spec/dummy_app/test/controllers/.keep
+- spec/dummy_app/test/fixtures/.keep
+- spec/dummy_app/test/helpers/.keep
+- spec/dummy_app/test/integration/.keep
+- spec/dummy_app/test/mailers/.keep
+- spec/dummy_app/test/models/.keep
+- spec/dummy_app/test/test_helper.rb
+- spec/dummy_app/vendor/assets/javascripts/.keep
+- spec/dummy_app/vendor/assets/stylesheets/.keep

data/app/controllers/concerns/the_comments_controller.rb

@@ -1,229 +0,0 @@
-module TheCommentsController
-  COMMENTS_COOKIES_TOKEN = 'JustTheCommentsCookies'
-
-  # Cookies and View token for spam protection
-  #
-  # class ApplicationController < ActionController::Base
-  #   include TheCommentsController::ViewToken
-  # end
-  module ViewToken
-    extend ActiveSupport::Concern
-    included { before_action :set_the_comments_cookies }
-
-    def comments_view_token
-      cookies[:comments_view_token]
-    end
-
-    private
-
-    def set_the_comments_cookies
-      cookies[:the_comment_cookies] = { value: TheCommentsController::COMMENTS_COOKIES_TOKEN, expires: 1.year.from_now }
-      cookies[:comments_view_token] = { value: SecureRandom.hex, expires: 7.days.from_now } unless cookies[:comments_view_token]
-    end
-  end
-
-  # Base functionality of Comments Controller
-  #
-  # class CommentsController < ApplicationController
-  #   include TheCommentsController::Base
-  # end
-  module Base
-    extend ActiveSupport::Concern
-
-    included do
-      include TheCommentsController::ViewToken
-
-      before_action -> { @errors = [] }
-
-      # Attention! We should not set TheComments cookie before create
-      skip_before_action :set_the_comments_cookies, only: [:create]
-
-      # Black lists
-      before_action :stop_black_ip,           only: [:create]
-      before_action :stop_black_user_agent,   only: [:create]
-
-      # Spam protection
-      before_action :ajax_requests_required,  only: [:create]
-      before_action :cookies_required,        only: [:create]
-      before_action :empty_trap_required,     only: [:create]
-      before_action :tolerance_time_required, only: [:create]
-
-      # preparation
-      before_action :define_commentable, only: [:create]
-    end
-
-    # App side methods (overwrite it)
-    def index
-      @comments = Comment.with_state(:published).order('created_at DESC').page(params[:page])
-      render template: 'the_comments/index'
-    end
-
-    # Methods based on *current_user* helper
-    def edit
-      @comments = current_user.comcoms.where(id: params[:id]).page(params[:page])
-      render template: 'the_comments/manage'
-    end
-
-    def my
-      @comments = current_user.my_comments.order('created_at DESC').page(params[:page])
-      render template: 'the_comments/index'
-    end
-
-    def new
-      @comments = current_user.comcoms.with_state(:draft).order('created_at DESC').page(params[:page])
-      render template: 'the_comments/manage'
-    end
-
-    def incoming
-      @comments = current_user.comcoms.with_state(:draft, :published).order('created_at DESC').page(params[:page])
-      render template: 'the_comments/manage'
-    end
-
-    def trash
-      @comments = current_user.comcoms.with_state(:deleted).order('created_at DESC').page(params[:page])
-      render template: 'the_comments/manage'
-    end
-
-    # BASE METHODS
-
-    # Public methods
-
-    def update
-      comment = Comment.where(id: params[:id]).first
-      comment.update_attributes!(patch_comment_params)
-      render(layout: false, partial: 'the_comments/comment_body', locals: { comment: comment })
-    end
-
-    def create
-      @comment = @commentable.comments.new comment_params
-      if @comment.valid?
-        @comment.save
-        return render layout: false, partial: 'the_comments/comment', locals: { tree: @comment }
-      end
-      render json: { errors: @comment.errors.full_messages }
-    end
-
-    # Protected methods
-
-    def to_published
-      Comment.where(id: params[:id]).first.to_published
-      render nothing: :true
-    end
-
-    def to_draft
-      Comment.where(id: params[:id]).first.to_draft
-      render nothing: :true
-    end
-
-    def to_spam
-      comment = Comment.where(id: params[:id]).first
-      IpBlackList.where(ip: comment.ip).first_or_create.increment!(:count)
-      UserAgentBlackList.where(user_agent: comment.user_agent).first_or_create.increment!(:count)
-      comment.to_deleted
-      render nothing: :true
-    end
-
-    def to_trash
-      Comment.where(id: params[:id]).first.to_deleted
-      render nothing: :true
-    end
-
-    private
-
-    def denormalized_fields
-      title = @commentable.commentable_title
-      url   = @commentable.commentable_url
-      @commentable ? { commentable_title: title, commentable_url: url } : {}
-    end
-
-    def request_data_for_black_lists
-      r = request
-      { ip: r.ip, referer: CGI::unescape(r.referer  || 'direct_visit'), user_agent: r.user_agent }
-    end
-
-    def define_commentable
-      commentable_klass = params[:comment][:commentable_type].constantize
-      commentable_id    = params[:comment][:commentable_id]
-
-      @commentable = commentable_klass.where(id: commentable_id).first
-      return render(json: { errors: ['Commentable object is undefined'] }) unless @commentable
-    end
-
-    def comment_params
-      params
-        .require(:comment)
-        .permit(:title, :contacts, :raw_content, :parent_id)
-        .merge(user: current_user, view_token: comments_view_token)
-        .merge(denormalized_fields)
-        .merge( tolerance_time: params[:tolerance_time].to_i )
-        .merge(request_data_for_black_lists)
-    end
-
-    def patch_comment_params
-      params
-        .require(:comment)
-        .permit(:title, :contacts, :raw_content, :parent_id)
-    end
-
-    # Protection tricks
-    def cookies_required
-      unless cookies[:the_comment_cookies] == TheCommentsController::COMMENTS_COOKIES_TOKEN
-        @errors << [t('the_comments.cookies'), t('the_comments.cookies_required')].join(' ')
-        return render(json: { errors: @errors })
-      end
-    end
-
-    def ajax_requests_required
-      unless request.xhr?
-        IpBlackList.where(ip: request.ip).first_or_create.increment!(:count)
-        UserAgentBlackList.where(user_agent: request.user_agent).first_or_create.increment!(:count)
-        return render(text: t('the_comments.ajax_requests_required'))
-      end
-    end
-
-    def empty_trap_required
-      # TODO: 1) inject ?, 2) fields can be removed on client site
-      is_user = true
-      params.slice(*TheComments.config.empty_inputs).values.each{|v| is_user = is_user && v.blank? }
-
-      unless is_user
-        IpBlackList.where(ip: request.ip).first_or_create.increment!(:count)
-        UserAgentBlackList.where(user_agent: request.user_agent).first_or_create.increment!(:count)
-        @errors << [t('the_comments.trap'), t('the_comments.trap_message')].join(' ')
-        return render(json: { errors: @errors })
-      end
-    end
-
-    def tolerance_time_required
-      min_time  = TheComments.config.tolerance_time
-      this_time = params[:tolerance_time].to_i
-      if this_time < min_time
-        @errors << [t('the_comments.tolerance_time'), t('the_comments.tolerance_time_message', time: min_time - this_time )].join(' ')
-        return render(json: { errors: @errors })
-      end
-    end
-
-    def stop_black_ip
-      if IpBlackList.where(ip: request.ip, state: :banned).first
-        @errors << [t('the_comments.black_ip'), t('the_comments.black_ip_message')].join(' ')
-        return render(json: { errors: @errors })
-      end
-    end
-
-    def stop_black_user_agent
-      if UserAgentBlackList.where(user_agent: request.user_agent, state: :banned).first
-        @errors << [t('the_comments.black_user_agent'), t('the_comments.black_user_agent_message')].join(' ')
-        return render(json: { errors: @errors })
-      end
-    end
-
-    def time_tolerance_required
-      if params[:time_tolerance].to_i < TheComments.config.tolerance_time
-        errors = {}
-        errors[t('the_comments.time_tolerance')] = [t('the_comments.time_tolerance_message')]
-        return render(json: { errors: errors })
-      end
-    end
-
-  end#Base
-end

data/app/controllers/concerns/the_comments_ip_controller.rb

@@ -1,17 +0,0 @@
-module TheCommentsIpController
-  extend ActiveSupport::Concern
-
-  included do
-    def index
-      @ip_black_lists = if params[:ip]
-        IpBlackList.where(ip: params[:ip])
-      else
-        IpBlackList.order('count DESC').page(params[:page])
-      end
-    end
-
-    def to_state
-      return render text: IpBlackList.where(id: params[:ip_black_list_id]).first.update!(state: params[:state])
-    end
-  end
-end

data/app/controllers/concerns/the_comments_user_agent_controller.rb

@@ -1,15 +0,0 @@
-module TheCommentsUserAgentController
-  # extend ActiveSupport::Concern
-  # included do; end
-  def index
-    @ip_black_lists = if params[:ip]
-      UserAgentBlackList.where(ip: params[:ip])
-    else
-      UserAgentBlackList.order('count DESC').page(params[:page])
-    end
-  end
-
-  def to_state
-    return render text: UserAgentBlackList.where(id: params[:user_agent_black_list_id]).first.update!(state: params[:state])
-  end
-end