antispam 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0436bc2335d973b63d2ffb1e34a7a497ff9f86e2cf98d87c38fb2c5797f2fff
-  data.tar.gz: a8cfe2b31913ba9c7a4ad9f0153b5f59c9b140c36cdcca20086ea7db94a8a8ba
+  metadata.gz: 278c21161c08ebd08f8376df6ddb57fcda33d20d7ae9e9d804a7b3785c23cbae
+  data.tar.gz: dab176fb46e3d5ecaa6d2c304262adfc4bf612f413b392270e3b44ef03de7147
 SHA512:
-  metadata.gz: 9755957fce4a89628c1e2b587ee046da5fccaf4692a5f0a596fa2dc5afea282a68d05d04a8ad82689f5e9d30c3660bad5fcbf75184141648b8e17ab0d693dfef
-  data.tar.gz: 769deceafe70aafc9b5f98e1b1d995876ad98542a8c75a1633c75f6ea226331d5ce55270fce438f322927947fca539f59d60e6ea5e48603095c1e5656f906e96
+  metadata.gz: 3491eb8c49c91b0cc468440cde3b965ac359d6e3d561e8893a5e48079da0441a2128dd9cb118d30b79e147b8ad79d87ce2df78fcd074217880b1c6f9c4e60748
+  data.tar.gz: b1d49d286f4bc2d6885e40e7f20b0bd9cdec2f57c608dd443b9c060a8a49ca7799e69f05a0e3e5f422071f385a34fcd39e442a2ee5b5a89f0dfd56425574da5c

data/README.md

@@ -1,72 +1,72 @@
-# Antispam
-The antispam gem helps prevent spam in your Rails applications by
-checking against various antispam blacklists on the web.
-You can configure which spam blacklists are checked in your application configuration.
-
-## Usage
-
-The gem is used by adding this to your ApplicationController.rb
-
-```
-before_action do
-  check_ip_against_database(ip_blacklists: {default: 'yourcodehere'}, verbose: true)
-end
-```
-
-Once the filter is setup, everything else is handled for your application.
-The gem will run during any request that is not a GET request.
-
-Blacklist database lookups are cached for 24 hours, and cached results won't need
-to slowdown your app by additional http requests on the backend.
-
-The gem needs to create some database tables to function; these store the cached
-blacklist database lookups, and any actions caused by the gem.
-
-You need to add this to your routes.rb
-```
-  mount Antispam::Engine => "/antispam"
-```
-You can see what IP addresses have been blocked by going to /antispam/blocks
-but your applicationcontroller must have a user_has_role?("admin") function.
-
-
-## Installation
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'antispam'
-```
-
-And then execute:
-```bash
-$ bundle
-```
-
-Or install it yourself as:
-```bash
-$ gem install antispam
-$ rails antispam:install:migrations
-$ rails db:migrate SCOPE=antispam
-```
-The gem depends on image_processing, which depends on vips. We are using vips to
-generate captcha images.
-```
-sudo apt install libvips-tools
-```
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/ryankopf/antispam. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/antispam/blob/master/CODE_OF_CONDUCT.md).
-
-## License
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the Antispam project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/ryankopf/antispam/blob/master/CODE_OF_CONDUCT.md).
+# Antispam
+The antispam gem helps prevent spam in your Rails applications by
+checking against various antispam blacklists on the web.
+You can configure which spam blacklists are checked in your application configuration.
+
+## Usage
+
+The gem is used by adding this to your ApplicationController.rb
+
+```
+before_action do
+  check_ip_against_database(ip_blacklists: {default: 'yourcodehere'}, verbose: true)
+end
+```
+
+Once the filter is setup, everything else is handled for your application.
+The gem will run during any request that is not a GET request.
+
+Blacklist database lookups are cached for 24 hours, and cached results won't need
+to slowdown your app by additional http requests on the backend.
+
+The gem needs to create some database tables to function; these store the cached
+blacklist database lookups, and any actions caused by the gem.
+
+You need to add this to your routes.rb
+```
+  mount Antispam::Engine => "/antispam"
+```
+You can see what IP addresses have been blocked by going to /antispam/blocks
+but your applicationcontroller must respond to ```is_admin?``` function.
+
+
+## Installation
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'antispam'
+```
+
+And then execute:
+```bash
+$ bundle
+```
+
+Or install it yourself as:
+```bash
+$ gem install antispam
+$ rails antispam:install:migrations
+$ rails db:migrate SCOPE=antispam
+```
+The gem depends on image_processing, which depends on vips. We are using vips to
+generate captcha images.
+```
+sudo apt install libvips-tools
+```
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/ryankopf/antispam. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/antispam/blob/master/CODE_OF_CONDUCT.md).
+
+## License
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Code of Conduct
+
+Everyone interacting in the Antispam project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/ryankopf/antispam/blob/master/CODE_OF_CONDUCT.md).

data/app/controllers/antispam/application_controller.rb

@@ -1,4 +1,11 @@
 module Antispam
-  class ApplicationController < ActionController::Base
+  class ApplicationController < ::ApplicationController
+    def must_be_admin
+      begin
+        render plain: 'Not available.' unless is_admin?
+      rescue
+        render plain: 'Not available.'
+      end
+    end
   end
 end

data/app/controllers/antispam/blocks_controller.rb

@@ -1,70 +1,28 @@
-require_dependency "antispam/application_controller"
-
-module Antispam
-  class BlocksController < ApplicationController
-    before_action :must_be_admin
-    before_action :set_block, only: [:show, :edit, :update, :destroy]
-
-    # GET /blocks
-    def index
-      @blocks = Block.all
-    end
-
-    # GET /blocks/1
-    def show
-    end
-
-    # # GET /blocks/new
-    # def new
-    #   @block = Block.new
-    # end
-    #
-    # # GET /blocks/1/edit
-    # def edit
-    # end
-    #
-    # # POST /blocks
-    # def create
-    #   @block = Block.new(block_params)
-    #
-    #   if @block.save
-    #     redirect_to @block, notice: 'Block was successfully created.'
-    #   else
-    #     render :new
-    #   end
-    # end
-    #
-    # # PATCH/PUT /blocks/1
-    # def update
-    #   if @block.update(block_params)
-    #     redirect_to @block, notice: 'Block was successfully updated.'
-    #   else
-    #     render :edit
-    #   end
-    # end
-    #
-    # # DELETE /blocks/1
-    # def destroy
-    #   @block.destroy
-    #   redirect_to blocks_url, notice: 'Block was successfully destroyed.'
-    # end
-
-    private
-      # Use callbacks to share common setup or constraints between actions.
-      def set_block
-        @block = Block.find(params[:id])
-      end
-
-      # Only allow a list of trusted parameters through.
-      def block_params
-        params.require(:block).permit(:ip, :provider, :controllername, :actionname)
-      end
-      def must_be_admin
-        begin
-          return false unless user_has_role?("admin")
-        rescue
-          return false
-        end
-      end
-  end
-end
+require_dependency "antispam/application_controller"
+
+module Antispam
+  class BlocksController < ApplicationController
+    before_action :must_be_admin
+    before_action :set_block, only: [:show]
+
+    # GET /blocks
+    def index
+      @blocks = Block.all
+    end
+
+    # GET /blocks/1
+    def show
+    end
+
+    private
+      # Use callbacks to share common setup or constraints between actions.
+      def set_block
+        @block = Block.find(params[:id])
+      end
+
+      # Only allow a list of trusted parameters through.
+      def block_params
+        params.require(:block).permit(:ip, :provider, :controllername, :actionname)
+      end
+  end
+end

data/app/controllers/antispam/challenges_controller.rb

@@ -1,49 +1,49 @@
-require_dependency "antispam/application_controller"
-
-module Antispam
-  class ChallengesController < ApplicationController
-    before_action :set_challenge, only: [:show, :edit, :update, :destroy]
-
-    # GET /challenges/1
-    def show
-      respond_to do |format|
-        format.jpeg do
-          image = @challenge.get_image
-          render content_type: 'image/jpeg', plain: image.jpegsave_buffer
-        end
-      end
-    end
-
-    # GET /challenges/new
-    def new
-      # use in the future for changing code
-    end
-
-    # PATCH/PUT /challenges/1
-    def update
-      if @challenge.validate?(params[:challenge][:answer])
-        a = Antispam::Ip.find_or_create_by(address: request.remote_ip, provider: 'httpbl')
-        before = a.threat
-        a.threat = [(a.threat || 0) - 25, 0].max
-        c = Clear.create(ip: request.remote_ip, answer: params[:challenge][:answer], result: 'Passed', threat_before: before, threat_after: a.threat)
-        a.expires_at = 1.hour.from_now
-        a.save
-        redirect_to '/'
-      else
-        c = Clear.create(ip: request.remote_ip, answer: params[:challenge][:answer], result: 'Failed')
-        redirect_to '/antispam/validate', notice: 'Invalid answer.'
-      end
-    end
-
-    private
-      # Use callbacks to share common setup or constraints between actions.
-      def set_challenge
-        @challenge = Challenge.find(params[:id])
-      end
-
-      # Only allow a list of trusted parameters through.
-      def challenge_params
-        params.require(:challenge).permit(:answer, :code)
-      end
-  end
-end
+require_dependency "antispam/application_controller"
+
+module Antispam
+  class ChallengesController < ApplicationController
+    before_action :set_challenge, only: [:show, :edit, :update, :destroy]
+
+    # GET /challenges/1
+    def show
+      respond_to do |format|
+        format.jpeg do
+          image = @challenge.get_image
+          render content_type: 'image/jpeg', plain: image.jpegsave_buffer
+        end
+      end
+    end
+
+    # GET /challenges/new
+    def new
+      # use in the future for changing code
+    end
+
+    # PATCH/PUT /challenges/1
+    def update
+      if @challenge.validate?(params[:challenge][:answer])
+        a = Antispam::Ip.find_or_create_by(address: request.remote_ip, provider: 'httpbl')
+        before = a.threat
+        a.threat = [(a.threat || 0) - 25, 0].max
+        c = Clear.create(ip: request.remote_ip, answer: params[:challenge][:answer], result: 'Passed', threat_before: before, threat_after: a.threat)
+        a.expires_at = 1.hour.from_now
+        a.save
+        redirect_to '/'
+      else
+        c = Clear.create(ip: request.remote_ip, answer: params[:challenge][:answer], result: 'Failed')
+        redirect_to '/antispam/validate', notice: 'Invalid answer.'
+      end
+    end
+
+    private
+      # Use callbacks to share common setup or constraints between actions.
+      def set_challenge
+        @challenge = Challenge.find(params[:id])
+      end
+
+      # Only allow a list of trusted parameters through.
+      def challenge_params
+        params.require(:challenge).permit(:answer, :code)
+      end
+  end
+end

data/app/controllers/antispam/clears_controller.rb

@@ -1,63 +1,28 @@
-require_dependency "antispam/application_controller"
-
-module Antispam
-  class ClearsController < ApplicationController
-    before_action :must_be_admin
-    before_action :set_clear, only: [:show, :edit, :update, :destroy]
-
-    # GET /clears
-    def index
-      @clears = Clear.all
-    end
-
-    # GET /clears/1
-    def show
-    end
-    #
-    # # GET /clears/new
-    # def new
-    #   @clear = Clear.new
-    # end
-    #
-    # # GET /clears/1/edit
-    # def edit
-    # end
-    #
-    # # POST /clears
-    # def create
-    #   @clear = Clear.new(clear_params)
-    #
-    #   if @clear.save
-    #     redirect_to @clear, notice: 'Clear was successfully created.'
-    #   else
-    #     render :new
-    #   end
-    # end
-    #
-    # # PATCH/PUT /clears/1
-    # def update
-    #   if @clear.update(clear_params)
-    #     redirect_to @clear, notice: 'Clear was successfully updated.'
-    #   else
-    #     render :edit
-    #   end
-    # end
-    #
-    # # DELETE /clears/1
-    # def destroy
-    #   @clear.destroy
-    #   redirect_to clears_url, notice: 'Clear was successfully destroyed.'
-    # end
-
-    private
-      # Use callbacks to share common setup or constraints between actions.
-      def set_clear
-        @clear = Clear.find(params[:id])
-      end
-
-      # Only allow a list of trusted parameters through.
-      def clear_params
-        params.require(:clear).permit(:ip, :result, :answer, :threat_before, :threat_after)
-      end
-  end
-end
+require_dependency "antispam/application_controller"
+
+module Antispam
+  class ClearsController < ApplicationController
+    before_action :must_be_admin
+    before_action :set_clear, only: [:show, :edit, :update, :destroy]
+
+    # GET /clears
+    def index
+      @clears = Clear.all
+    end
+
+    # GET /clears/1
+    def show
+    end
+
+    private
+      # Use callbacks to share common setup or constraints between actions.
+      def set_clear
+        @clear = Clear.find(params[:id])
+      end
+
+      # Only allow a list of trusted parameters through.
+      def clear_params
+        params.require(:clear).permit(:ip, :result, :answer, :threat_before, :threat_after)
+      end
+  end
+end

data/app/views/antispam/blocks/index.html.erb

@@ -1,37 +1,39 @@
-<p id="notice"><%= notice %></p>
-
-<div class="row">
-  <div class="cx">
-    <h1>Blocks</h1>
-
-    <table>
-      <thead>
-        <tr>
-          <th>Ip</th>
-          <th>Provider</th>
-          <th>Controllername</th>
-          <th>Actionname</th>
-          <th colspan="3"></th>
-        </tr>
-      </thead>
-
-      <tbody>
-        <% Antispam::Block.all.order(create_at: :desc).limit(50).each do |block| %>
-          <tr>
-            <td><%= block.ip %></td>
-            <td><%= block.provider %></td>
-            <td><%= block.controllername %></td>
-            <td><%= block.actionname %></td>
-            <td><%= time_ago_in_words block.created_at %> ago</td>
-<!--            <td><%#= link_to 'Show', block %></td>-->
-<!--            <td><%#= link_to 'Edit', edit_block_path(block) %></td>-->
-<!--            <td><%#= link_to 'Destroy', block, method: :delete, data: { confirm: 'Are you sure?' } %></td>-->
-          </tr>
-        <% end %>
-      </tbody>
-    </table>
-  </div>
-  <div class="cx">
-    <%= render template: '/antispam/clears/index.html' %>
-  </div>
+<p id="notice"><%= notice %></p>
+
+<div class="row">
+  <div class="cx">
+    <h1>Blocks</h1>
+
+    <table>
+      <thead>
+        <tr>
+          <th>Ip</th>
+          <th>Provider</th>
+          <th>Controllername</th>
+          <th>Actionname</th>
+          <th>Threat</th>
+          <th colspan="3"></th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <% Antispam::Block.all.order(created_at: :desc).limit(50).each do |block| %>
+          <tr>
+            <td><%= block.ip %></td>
+            <td><%= block.provider %></td>
+            <td><%= block.controllername %></td>
+            <td><%= block.actionname %></td>
+            <td><%= block.threat %></td>
+            <td><%= time_ago_in_words block.created_at %> ago</td>
+<!--            <td><%#= link_to 'Show', block %></td>-->
+<!--            <td><%#= link_to 'Edit', edit_block_path(block) %></td>-->
+<!--            <td><%#= link_to 'Destroy', block, method: :delete, data: { confirm: 'Are you sure?' } %></td>-->
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+  <div class="cx">
+    <%= render template: '/antispam/clears/index.html' %>
+  </div>
 </div>

data/app/views/antispam/clears/index.html.erb

@@ -1,32 +1,32 @@
-<p id="notice"><%= notice %></p>
-
-<h1>Clears</h1>
-
-<table>
-  <thead>
-    <tr>
-      <th>Ip</th>
-      <th>Result</th>
-      <th>Answer</th>
-      <th>Threat before</th>
-      <th>Threat after</th>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% Antispam::Clear.all.order(create_at: :desc).limit(50).each do |clear| %>
-      <tr>
-        <td><%= clear.ip %></td>
-        <td><%= clear.result %></td>
-        <td><%= clear.answer %></td>
-        <td><%= clear.threat_before %></td>
-        <td><%= clear.threat_after %></td>
-        <td><%= time_ago_in_words clear.created_at %> ago</td>
-<!--        <td><%#= link_to 'Show', clear %></td>-->
-<!--        <td><%#= link_to 'Edit', edit_clear_path(clear) %></td>-->
-<!--        <td><%#= link_to 'Destroy', clear, method: :delete, data: { confirm: 'Are you sure?' } %></td>-->
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+<p id="notice"><%= notice %></p>
+
+<h1>Clears</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th>Ip</th>
+      <th>Result</th>
+      <th>Answer</th>
+      <th>Threat before</th>
+      <th>Threat after</th>
+      <th colspan="3"></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% Antispam::Clear.all.order(created_at: :desc).limit(50).each do |clear| %>
+      <tr>
+        <td><%= clear.ip %></td>
+        <td><%= clear.result %></td>
+        <td><%= clear.answer %></td>
+        <td><%= clear.threat_before %></td>
+        <td><%= clear.threat_after %></td>
+        <td><%= time_ago_in_words clear.created_at %> ago</td>
+<!--        <td><%#= link_to 'Show', clear %></td>-->
+<!--        <td><%#= link_to 'Edit', edit_clear_path(clear) %></td>-->
+<!--        <td><%#= link_to 'Destroy', clear, method: :delete, data: { confirm: 'Are you sure?' } %></td>-->
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/layouts/antispam/application.html.erb

@@ -1,15 +1,15 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Antispam</title>
-  <%= csrf_meta_tags %>
-  <%= csp_meta_tag %>
-  <style>.row { width:100%;display: flex;} .cx { width: 50%; }</style>
-  <%#= stylesheet_link_tag    "antispam/application", media: "all" %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Antispam</title>
+  <%= csrf_meta_tags %>
+  <%= csp_meta_tag %>
+  <style>.row { width:100%;display: flex;} .cx { width: 50%; }</style>
+  <%#= stylesheet_link_tag    "antispam/application", media: "all" %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/db/migrate/20210131165122_add_threat_to_antispam_blocks.rb

@@ -0,0 +1,5 @@
+class AddThreatToAntispamBlocks < ActiveRecord::Migration[6.1]
+  def change
+    add_column :antispam_blocks, :threat, :integer
+  end
+end

data/lib/antispam.rb

@@ -6,6 +6,9 @@ require "antispam/blacklists/httpbl"
 module Antispam
   ActiveSupport.on_load(:action_controller) do
     # self refers to ActionController::Base here
-    self.include Antispam::Tools
+    # This way is removed because below may be more compatible.
+    # self.include Antispam::Tools
+    # Would the below be a better (clearer? more compatible?) way to do this?
+    ActionController::Base.send(:include, Antispam::Tools)
   end
 end

data/lib/antispam/blacklists/httpbl.rb

@@ -2,15 +2,19 @@ require 'resolv'
 module Antispam
   module Blacklists
     class Httpbl
-      def self.check(ip, key)
+      def self.check(ip, key, verbose)
         threat = 0
         begin
-          return get_old_result(ip) if get_old_result(ip)
+          old_result = get_old_result(ip)
+          if old_result
+            Rails.logger.info "Returning old result for #{ip}." if verbose
+            return get_old_result(ip)
+          end
           check = ip.split('.').reverse.join('.')
           host = key + '.' + check + ".dnsbl.httpbl.org"
           address = Resolv::getaddress(host)
           z,days,threat,iptype = address.split('.')
-          Rails.logger.info "Spam located: #{iptype} type at #{threat} threat. (#{ip} - #{address})"
+          Rails.logger.info "Spam located: #{iptype} type at #{threat} threat. (#{ip} - #{address})" if verbose
           # Create or update
           if (threat.to_i > 30)
             Rails.logger.info "Spamcheck: Very high, over 30!"

data/lib/antispam/tools.rb

@@ -2,7 +2,15 @@ module Antispam
   module Tools
     # before_action :check_ip_against_database
     def check_ip_against_database(options = {ip_blacklists: {default: ''}})
-      return if request.get?
+      if (options[:methods])
+        return if request.get? unless options[:methods].include?(:get)
+        return if request.post? unless options[:methods].include?(:post)
+        return if request.put? unless options[:methods].include?(:put)
+        return if request.patch? unless options[:methods].include?(:patch)
+        return if request.delete? unless options[:methods].include?(:delete)
+      else
+        return if request.get?
+      end
       return if skip_if_user_whitelisted
       return if controller_name == "validate"
       ip = request.remote_ip
@@ -18,18 +26,16 @@ module Antispam
       if (options[:scrutinize_countries_except])
 
       end
-      Rails.logger.info "Got to this function. #{ip}"
-      puts "Got to this function. #{ip}"
+      Rails.logger.info "Completed IP database check. #{ip}" if options[:verbose]
     end
     def check_ip_against_blacklists(ip, lists, verbose)
       lists.each do |provider_name, provider_api_key|
         puts "Checking provider: #{provider_name}" if verbose
         if provider_name == :httpbl
-          result = Antispam::Blacklists::Httpbl.check(ip, provider_api_key)
-          puts result if verbose
-          result = 31
+          result = Antispam::Blacklists::Httpbl.check(ip, provider_api_key, verbose)
+          Rails.logger.info(result) if verbose
           if (result > 30)
-            Block.create(ip: ip, provider: provider_name)
+            Block.create(ip: ip, provider: provider_name, threat: result)
             redirect_to '/antispam/validate'
           end
         end

data/lib/antispam/version.rb

@@ -1,3 +1,3 @@
 module Antispam
-  VERSION = '0.1.0'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: antispam
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
 - Ryan Kopf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-31 00:00:00.000000000 Z
+date: 2021-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: image_processing
   requirement: !ruby/object:Gem::Requirement
@@ -83,20 +83,14 @@ files:
 - app/models/antispam/challenge.rb
 - app/models/antispam/clear.rb
 - app/models/antispam/ip.rb
-- app/views/antispam/blocks/_form.html.erb
-- app/views/antispam/blocks/edit.html.erb
 - app/views/antispam/blocks/index.html.erb
-- app/views/antispam/blocks/new.html.erb
 - app/views/antispam/blocks/show.html.erb
 - app/views/antispam/challenges/_form.html.erb
 - app/views/antispam/challenges/edit.html.erb
 - app/views/antispam/challenges/index.html.erb
 - app/views/antispam/challenges/new.html.erb
 - app/views/antispam/challenges/show.html.erb
-- app/views/antispam/clears/_form.html.erb
-- app/views/antispam/clears/edit.html.erb
 - app/views/antispam/clears/index.html.erb
-- app/views/antispam/clears/new.html.erb
 - app/views/antispam/clears/show.html.erb
 - app/views/antispam/validate/index.html.erb
 - app/views/layouts/antispam/application.html.erb
@@ -105,6 +99,7 @@ files:
 - db/migrate/20210130214835_create_antispam_challenges.rb
 - db/migrate/20210130234107_create_antispam_blocks.rb
 - db/migrate/20210130235537_create_antispam_clears.rb
+- db/migrate/20210131165122_add_threat_to_antispam_blocks.rb
 - lib/antispam.rb
 - lib/antispam/blacklists/httpbl.rb
 - lib/antispam/engine.rb

data/app/views/antispam/blocks/_form.html.erb

@@ -1,37 +0,0 @@
-<%= form_with(model: block) do |form| %>
-  <% if block.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(block.errors.count, "error") %> prohibited this block from being saved:</h2>
-
-      <ul>
-        <% block.errors.each do |error| %>
-          <li><%= error.full_message %></li>
-        <% end %>
-      </ul>
-    </div>
-  <% end %>
-
-  <div class="field">
-    <%= form.label :ip %>
-    <%= form.text_field :ip %>
-  </div>
-
-  <div class="field">
-    <%= form.label :provider %>
-    <%= form.text_field :provider %>
-  </div>
-
-  <div class="field">
-    <%= form.label :controllername %>
-    <%= form.text_field :controllername %>
-  </div>
-
-  <div class="field">
-    <%= form.label :actionname %>
-    <%= form.text_field :actionname %>
-  </div>
-
-  <div class="actions">
-    <%= form.submit %>
-  </div>
-<% end %>

data/app/views/antispam/blocks/edit.html.erb

@@ -1,6 +0,0 @@
-<h1>Editing Block</h1>
-
-<%= render 'form', block: @block %>
-
-<%= link_to 'Show', @block %> |
-<%= link_to 'Back', blocks_path %>

data/app/views/antispam/blocks/new.html.erb

@@ -1,5 +0,0 @@
-<h1>New Block</h1>
-
-<%= render 'form', block: @block %>
-
-<%= link_to 'Back', blocks_path %>

data/app/views/antispam/clears/_form.html.erb

@@ -1,42 +0,0 @@
-<%= form_with(model: clear) do |form| %>
-  <% if clear.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(clear.errors.count, "error") %> prohibited this clear from being saved:</h2>
-
-      <ul>
-        <% clear.errors.each do |error| %>
-          <li><%= error.full_message %></li>
-        <% end %>
-      </ul>
-    </div>
-  <% end %>
-
-  <div class="field">
-    <%= form.label :ip %>
-    <%= form.text_field :ip %>
-  </div>
-
-  <div class="field">
-    <%= form.label :result %>
-    <%= form.text_field :result %>
-  </div>
-
-  <div class="field">
-    <%= form.label :answer %>
-    <%= form.text_field :answer %>
-  </div>
-
-  <div class="field">
-    <%= form.label :threat_before %>
-    <%= form.number_field :threat_before %>
-  </div>
-
-  <div class="field">
-    <%= form.label :threat_after %>
-    <%= form.number_field :threat_after %>
-  </div>
-
-  <div class="actions">
-    <%= form.submit %>
-  </div>
-<% end %>

data/app/views/antispam/clears/edit.html.erb

@@ -1,6 +0,0 @@
-<h1>Editing Clear</h1>
-
-<%= render 'form', clear: @clear %>
-
-<%= link_to 'Show', @clear %> |
-<%= link_to 'Back', clears_path %>

data/app/views/antispam/clears/new.html.erb

@@ -1,5 +0,0 @@
-<h1>New Clear</h1>
-
-<%= render 'form', clear: @clear %>
-
-<%= link_to 'Back', clears_path %>