pointless_feedback 4.1.2 → 4.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: d53eed87ef989df133f64d5f4fa0900eb0d6aee928d3dffcfdafbf68eb053d11
-  data.tar.gz: a02e3a8589e71aaeff63f3c3de7fc43e91517735fb5e56593d63f92a08df8fb2
+SHA1:
+  metadata.gz: 7ec9ec8e911135c9097ba31c372f50865a753375
+  data.tar.gz: 2b1bc459727d4a9200b16d10da89a7322f3cb7fe
 SHA512:
-  metadata.gz: fd9f9db0beb9fc3dc24b43aba150c476aaf9aff9a94994da1df9fe63e6d08ebad7a59cc100b9fbeac15b80f62028e61b2725d631ca9f114ffd33dbb5d753e4bc
-  data.tar.gz: b055d4ceaebbe4b094629ca0c7451cc8dcaee96b3cc904ba129a76ab1b4941d3390ea656f4f1e5d49903f5d0d3ac8f8a857fb1ca025dd462dbb827a52b824991
+  metadata.gz: 23b8e08fd74c50e8d8a7d2589dbad010ae4ecc5e73e687196454dae4637069cf898ada68c8d05f6c6f11cf611fa3daef697433ad2315249d8518a747cfda2081
+  data.tar.gz: a8f3ee1d7b955529613dabb366e9b4227bb621650ac306561a171b639b1dd046d314361b7f0ca23c627f73794eae508d3e9f81729ccdb330563e6587decdbc96

data/README.md

@@ -92,6 +92,15 @@ Specifies what address the feedback email is sent from.
 **table_name:**
 Defaults to engine's namespace, e.g. `pointless_feedback_messages`.  Change to any desired table for `PointlessFeedback::Message` model.
 
+**invalid_words:**
+List of words in the feedback description that would prevent an email from sending.
+
+**show_url_field:**
+Defaults to `false`. If set to `true`, will show an additional URL field in the form.
+
+**url_label:**
+Defaults to `URL`. The label for the URL field that will be shown if `show_url_field` is `true`.
+
 **google_captcha_site_key & google_captcha_secret_key:**
 If you'd like to block out the robots, set up a Google Captcha instance:
 

data/app/controllers/pointless_feedback/messages_controller.rb

@@ -29,7 +29,8 @@ module PointlessFeedback
         :email_address,
         :name,
         :topic,
-        :contact_info
+        :contact_info,
+        :url
       ])
     end
 

data/app/models/pointless_feedback/message.rb

@@ -11,7 +11,7 @@ module PointlessFeedback
     validates :email_address, :format => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
     validate :is_not_spam
 
-    after_save :export_feedback, :unless => :honeypot_filled_in?
+    after_save :export_feedback, :unless => :ignore_feedback?
 
     private
 
@@ -35,7 +35,8 @@ module PointlessFeedback
             "Email"       => email_address,
             "Topic"       => topic,
             "Description" => description,
-            "Date"        => created_at
+            "Date"        => created_at.strftime("%m/%d/%y"),
+            "URL"         => url
           )
         rescue => e
           # ignore errors in production, last thing you want is a 500
@@ -45,10 +46,24 @@ module PointlessFeedback
       end
     end
 
+    def ignore_feedback?
+      honeypot_filled_in? || contains_invalid_words?
+    end
+
     def honeypot_filled_in?
       contact_info.present?
     end
 
+    def contains_invalid_words?
+      PointlessFeedback.invalid_words.each do |word|
+        if description.downcase.include? word.downcase
+          return true
+        end
+      end
+
+      false
+    end
+
     def is_not_spam
       if URI.extract(description || "").count >= 3
         errors.add(:description, "can not contain more than 2 http links (often a sign of spam)")

data/app/views/pointless_feedback/feedback_mailer/feedback.html.erb

@@ -3,4 +3,7 @@ You've got feedback!
 <p>Name: <%= @message.name %></p>
 <p>Email Address: <%= @message.email_address %></p>
 <p>Topic: <%= @message.topic %></p>
+<% if PointlessFeedback.show_url_field %>
+  <p><%= PointlessFeedback.url_label %>: <%= @message.url %></p>
+<% end %>
 <p>Description: <%= @message.description %></p>

data/app/views/pointless_feedback/messages/new.html.erb

@@ -45,6 +45,13 @@
       <%= f.select :topic, PointlessFeedback.message_topics, { :prompt => true } %>
     </div>
 
+    <% if PointlessFeedback.show_url_field %>
+      <div class="field">
+        <%= f.label :url, PointlessFeedback.url_label %>
+        <%= f.text_field :url %>
+      </div>
+    <% end %>
+
     <div class="field">
       <%= f.label :description %>
       <%= f.text_area :description %>

data/db/migrate/20220518205500_add_url_to_pointless_feedback_messages.rb

@@ -0,0 +1,5 @@
+class AddUrlToPointlessFeedbackMessages < ActiveRecord::Migration
+  def change
+    add_column :pointless_feedback_messages, :url, :string
+  end
+end

data/lib/pointless_feedback/version.rb

@@ -1,3 +1,3 @@
 module PointlessFeedback
-  VERSION = "4.1.2"
+  VERSION = "4.1.5"
 end

data/lib/pointless_feedback.rb

@@ -52,6 +52,15 @@ module PointlessFeedback
   mattr_accessor :airtable_table_name
   @@airtable_table_name = nil
 
+  mattr_accessor :invalid_words
+  @@invalid_words = []
+
+  mattr_accessor :show_url_field
+  @@show_url_field = false
+
+  mattr_accessor :url_label
+  @@url_label = "URL"
+
   # Default way to setup PointlessFeedback. Run rails generate
   # pointless_feedback_install to create a fresh initializer with all
   # configuration values.

data/test/dummy/db/schema.rb

@@ -11,15 +11,16 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20130501182659) do
+ActiveRecord::Schema.define(version: 20220518205500) do
 
-  create_table "pointless_feedback_messages", force: true do |t|
+  create_table "pointless_feedback_messages", force: :cascade do |t|
     t.string   "name"
     t.string   "email_address"
     t.string   "topic"
     t.text     "description"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "url"
   end
 
 end

data/test/dummy/log/development.log

@@ -0,0 +1,37 @@
+   (1.4ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (1.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreatePointlessFeedbackMessages (20130501182659)
+   (0.1ms)  begin transaction
+DEPRECATION WARNING: `#timestamp` was called without specifying an option for `null`. In Rails 5, this behavior will change to `null: false`. You should manually specify `null: true` to prevent the behavior of your existing migrations from changing. (called from block in change at /Users/noahover/projects/pointless-feedback/db/migrate/20130501182659_create_pointless_feedback_messages.rb:9)
+   (0.5ms)  CREATE TABLE "pointless_feedback_messages" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "email_address" varchar, "topic" varchar, "description" text, "created_at" datetime, "updated_at" datetime) 
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20130501182659"]]
+   (1.1ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (1.5ms)  CREATE TABLE "pointless_feedback_messages" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "email_address" varchar, "topic" varchar, "description" text, "created_at" datetime, "updated_at" datetime) 
+   (1.4ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (1.4ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130501182659')
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to AddUrlToPointlessFeedbackMessages (20220518205500)
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to AddUrlToPointlessFeedbackMessages (20220518205500)
+   (0.0ms)  begin transaction
+   (0.5ms)  ALTER TABLE "pointless_feedback_messages" ADD "url" varchar
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20220518205500"]]
+   (1.1ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.8ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (1.2ms)  CREATE TABLE "pointless_feedback_messages" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "email_address" varchar, "topic" varchar, "description" text, "created_at" datetime, "updated_at" datetime, "url" varchar) 
+   (1.2ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (1.1ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (1.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20220518205500')
+   (1.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130501182659')