antispam 0.2.0 → 0.2.3

data/app/controllers/antispam/blocks_controller.rb

@@ -1,28 +1,28 @@
-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
+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,50 +1,50 @@
-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
-      head :ok
-    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
+      head :ok
+    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,28 +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
-
-    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/controllers/antispam/validate_controller.rb

@@ -1,12 +1,12 @@
-require_dependency "antispam/application_controller"
-
-module Antispam
-  class ValidateController < ApplicationController
-    def index
-      respond_to do |format|
-        format.html
-        format.js { render js: 'window.location = "/antispam/validate"'}
-      end
-    end
-  end
-end
+require_dependency "antispam/application_controller"
+
+module Antispam
+  class ValidateController < ApplicationController
+    def index
+      respond_to do |format|
+        format.html
+        format.js { render js: 'window.location = "/antispam/validate"'}
+      end
+    end
+  end
+end

data/app/helpers/antispam/application_helper.rb

@@ -1,4 +1,4 @@
-module Antispam
-  module ApplicationHelper
-  end
-end
+module Antispam
+  module ApplicationHelper
+  end
+end

data/app/helpers/antispam/blocks_helper.rb

@@ -1,4 +1,4 @@
-module Antispam
-  module BlocksHelper
-  end
-end
+module Antispam
+  module BlocksHelper
+  end
+end

data/app/helpers/antispam/challenges_helper.rb

@@ -1,4 +1,4 @@
-module Antispam
-  module ChallengesHelper
-  end
-end
+module Antispam
+  module ChallengesHelper
+  end
+end

data/app/helpers/antispam/clears_helper.rb

@@ -1,4 +1,4 @@
-module Antispam
-  module ClearsHelper
-  end
-end
+module Antispam
+  module ClearsHelper
+  end
+end

data/app/jobs/antispam/application_job.rb

@@ -1,4 +1,4 @@
-module Antispam
-  class ApplicationJob < ActiveJob::Base
-  end
-end
+module Antispam
+  class ApplicationJob < ActiveJob::Base
+  end
+end

data/app/mailers/antispam/application_mailer.rb

@@ -1,6 +1,6 @@
-module Antispam
-  class ApplicationMailer < ActionMailer::Base
-    default from: 'from@example.com'
-    layout 'mailer'
-  end
-end
+module Antispam
+  class ApplicationMailer < ActionMailer::Base
+    default from: 'from@example.com'
+    layout 'mailer'
+  end
+end

data/app/models/antispam/application_record.rb

@@ -1,5 +1,5 @@
-module Antispam
-  class ApplicationRecord < ActiveRecord::Base
-    self.abstract_class = true
-  end
-end
+module Antispam
+  class ApplicationRecord < ActiveRecord::Base
+    self.abstract_class = true
+  end
+end

data/app/models/antispam/block.rb

@@ -1,4 +1,4 @@
-module Antispam
-  class Block < ApplicationRecord
-  end
-end
+module Antispam
+  class Block < ApplicationRecord
+  end
+end

data/app/models/antispam/challenge.rb

@@ -1,26 +1,26 @@
-module Antispam
-  class Challenge < ApplicationRecord
-    before_create :generate
-
-    def generate
-      self.question = create_string
-      self.answer = self.question
-    end
-    def create_string
-      o = [('a'..'z'), ('A'..'Z')].map(&:to_a).flatten
-      (0...8).map { o[rand(o.length)] }.join
-    end
-    def get_image
-      require "image_processing/vips"
-      image = Vips::Image.text(self.answer, dpi: 300)
-      image.draw_line(255, 5+rand(20).to_i, 5+rand(20).to_i, 150+rand(50).to_i, 10+rand(10).to_i)
-    end
-    def validate?(check)
-      return false if self.answer.nil?
-      result = false
-      result = true if self.answer.downcase == check.downcase
-      self.update_column(:answer,nil)
-      return result
-    end
-  end
-end
+module Antispam
+  class Challenge < ApplicationRecord
+    before_create :generate
+
+    def generate
+      self.question = create_string
+      self.answer = self.question
+    end
+    def create_string
+      o = [('a'..'z'), ('A'..'Z')].map(&:to_a).flatten
+      (0...8).map { o[rand(o.length)] }.join
+    end
+    def get_image
+      require "image_processing/vips"
+      image = Vips::Image.text(self.answer, dpi: 300)
+      image.draw_line(255, 5+rand(20).to_i, 5+rand(20).to_i, 150+rand(50).to_i, 10+rand(10).to_i)
+    end
+    def validate?(check)
+      return false if self.answer.nil?
+      result = false
+      result = true if self.answer.downcase == check.downcase
+      self.update_column(:answer,nil)
+      return result
+    end
+  end
+end

data/app/models/antispam/clear.rb

@@ -1,4 +1,4 @@
-module Antispam
-  class Clear < ApplicationRecord
-  end
-end
+module Antispam
+  class Clear < ApplicationRecord
+  end
+end

data/app/models/antispam/ip.rb

@@ -1,7 +1,12 @@
-module Antispam
-  class Ip < ApplicationRecord
-    def expired?
-      self.expires_at < Time.now
-    end
-  end
+module Antispam
+  class Ip < ApplicationRecord
+    after_initialize :set_default_expires_at
+    def expired?
+      self.expires_at < Time.now
+    end
+    private
+    def set_default_expires_at
+      self.expires_at ||= 24.hours.from_now
+    end
+  end
 end

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

@@ -1,39 +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>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', formats: :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', formats: :html %>
+  </div>
 </div>

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

@@ -1,24 +1,24 @@
-<p id="notice"><%= notice %></p>
-
-<p>
-  <strong>Ip:</strong>
-  <%= @block.ip %>
-</p>
-
-<p>
-  <strong>Provider:</strong>
-  <%= @block.provider %>
-</p>
-
-<p>
-  <strong>Controllername:</strong>
-  <%= @block.controllername %>
-</p>
-
-<p>
-  <strong>Actionname:</strong>
-  <%= @block.actionname %>
-</p>
-
-<%= link_to 'Edit', edit_block_path(@block) %> |
-<%= link_to 'Back', blocks_path %>
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong>Ip:</strong>
+  <%= @block.ip %>
+</p>
+
+<p>
+  <strong>Provider:</strong>
+  <%= @block.provider %>
+</p>
+
+<p>
+  <strong>Controllername:</strong>
+  <%= @block.controllername %>
+</p>
+
+<p>
+  <strong>Actionname:</strong>
+  <%= @block.actionname %>
+</p>
+
+<%= link_to 'Edit', edit_block_path(@block) %> |
+<%= link_to 'Back', blocks_path %>

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

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

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

@@ -1,6 +1,6 @@
-<h1>Editing Challenge</h1>
-
-<%= render 'form', challenge: @challenge %>
-
-<%= link_to 'Show', @challenge %> |
-<%= link_to 'Back', challenges_path %>
+<h1>Editing Challenge</h1>
+
+<%= render 'form', challenge: @challenge %>
+
+<%= link_to 'Show', @challenge %> |
+<%= link_to 'Back', challenges_path %>