eots 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7333f8e012a365f06d6873c7e74d3c64921a4187
-  data.tar.gz: 74235b892a45452e64849da2dccb65a8463204c6
+  metadata.gz: 7c34e8989da8f7298f12e708af62be46a4392a2c
+  data.tar.gz: bbc994de39a28e60338a1075fcd64211add19425
 SHA512:
-  metadata.gz: 8663169bd4e64e78d1847d737d7880dda33b2444a20ef54e3cdef7d96e763e0a931590dc6290f64113b95a045efef8c8951f4e86416194b6c808832c86fa06a9
-  data.tar.gz: 3b7e7270746ee1ae2a435ddff965b7cfb910321b679f1282c866f5f81bb461b6e5927082ae09e74a954458ce1687f561286ed78bcee4d2731f20c69356aae1ce
+  metadata.gz: ec89ba3845b92a1ac9876cb34d8d61bdab8d567f029a4fba6f284c74b60c8c8fb51f7cccb00af46587e122c44048702285715efe6124bb7beee853153c142e30
+  data.tar.gz: ce6ec1ca9a3ebf3d941e7498259ee37fc5d0779a5d51f11c59fc86839464907d25080cf433f3ddd7e3de00b457d100dfabd936e064bae6e255c20d45ddc587b3

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2016 Dave Aronson
+Copyright 2016-2017 Dave Aronson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/models/eots/email.rb

@@ -1,6 +1,7 @@
 class EOTS::Email  # an instance, as opposed to the whole kind
 
   MissingRequiredFieldsError = Class.new(RuntimeError)
+  MismatchedFieldError = Class.new(RuntimeError)
 
   attr_reader :kind, :values
 
@@ -25,6 +26,7 @@ class EOTS::Email  # an instance, as opposed to the whole kind
     %w(action controller authenticity_token commit kind utf8).each { |k| values.delete k }
     check_value_names(values, kind) if values.any?
     check_required_fields(values, kind)
+    check_required_matches(values, kind)
     self.new(kind, values)
   end
 
@@ -46,9 +48,7 @@ class EOTS::Email  # an instance, as opposed to the whole kind
 
   def self.check_required_fields(values, kind)
     required = kind.form_fields.values.flatten.select { |f| f.required? }.map(&:name)
-    puts "required: #{ required.map { |n| "#{n} (#{n.class.name})" }.join(", ") }"
     given = values.keys
-    puts "given: #{ given.map { |n| "#{n} (#{n.class.name})" }.join(", ") }"
     missing = required - given
     if missing.any?
       raise(MissingRequiredFieldsError,
@@ -56,6 +56,17 @@ class EOTS::Email  # an instance, as opposed to the whole kind
     end
   end
 
+  def self.check_required_matches(values, kind)
+    mismatches = kind.form_fields.values.flatten.select do |f|
+      (reqd = f.must_match) && values[f.name] != reqd
+    end
+    if mismatches.any?
+      list = mismatches.map { |f| "'#{f.name}'" }.join(", ")
+      raise(EOTS::Email::MismatchedFieldError,
+            "Incorrect answers on field(s) #{list}")
+    end
+  end
+
   def self.check_value_names(values, kind)
     field_names = kind.form_fields.values.flatten.map &:name
     errs = values.keys.reject { |key| field_names.include? key }

data/app/models/eots/field.rb

@@ -3,7 +3,7 @@ class EOTS::Field
   AlreadyDefinedError = Class.new(RuntimeError)
   InvalidSectionError = Class.new(RuntimeError)
 
-  attr_reader :name, :label, :caption, :section, :html_options
+  attr_reader :name, :label, :caption, :section, :html_options, :must_match
 
   def initialize(name, label, options={})
     @name = name.to_s
@@ -11,6 +11,7 @@ class EOTS::Field
     opts = options.dup
     @caption = opts.delete(:caption)
     @section = opts.delete(:section) || :body
+    @must_match = opts.delete(:must_match)
     unless [:header, :body, :footer].include? @section
       raise(InvalidSectionError,
             "Invalid section '#{@section}' -- must be :header, :body, or :footer")

data/lib/eots/version.rb

@@ -1,3 +1,3 @@
 module EOTS
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/dummy/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/dave/computer/opensource/eots
   specs:
-    eots (0.0.2)
+    eots (0.0.4)
       rails
 
 GEM
@@ -126,4 +126,4 @@ DEPENDENCIES
   rspec-rails
 
 BUNDLED WITH
-   1.11.2
+   1.13.7

data/spec/dummy/log/test.log

@@ -695,3 +695,83 @@ Processing by EOTS::EOTSController#show as HTML
   Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.2ms)
   Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/show.html.erb within layouts/application (8.0ms)
 Completed 200 OK in 143ms (Views: 139.9ms)
+Started GET "/contact_emails/inner_kind" for 127.0.0.1 at 2016-07-24 19:17:02 -0400
+Processing by EOTS::EOTSController#show as HTML
+  Parameters: {"kind"=>"inner_kind"}
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.6ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.2ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.2ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/show.html.erb within layouts/application (6.2ms)
+Completed 200 OK in 145ms (Views: 141.4ms)
+Started GET "/contact_emails/inner_kind" for 127.0.0.1 at 2016-07-24 19:21:06 -0400
+Processing by EOTS::EOTSController#show as HTML
+  Parameters: {"kind"=>"inner_kind"}
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.5ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.2ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.2ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/show.html.erb within layouts/application (5.6ms)
+Completed 200 OK in 141ms (Views: 137.9ms)
+Started GET "/contact_emails/inner_kind" for 127.0.0.1 at 2017-06-14 12:50:50 -0400
+Processing by EOTS::EOTSController#show as HTML
+  Parameters: {"kind"=>"inner_kind"}
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.8ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.2ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.2ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/show.html.erb within layouts/application (8.6ms)
+Completed 200 OK in 171ms (Views: 166.7ms)
+Started GET "/contact_emails/inner_kind" for 127.0.0.1 at 2017-06-14 13:01:58 -0400
+Processing by EOTS::EOTSController#show as HTML
+  Parameters: {"kind"=>"inner_kind"}
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.6ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.2ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.2ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/show.html.erb within layouts/application (6.8ms)
+Completed 200 OK in 157ms (Views: 153.7ms)
+Started GET "/contact_emails/inner_kind" for 127.0.0.1 at 2017-06-14 13:03:06 -0400
+Processing by EOTS::EOTSController#show as HTML
+  Parameters: {"kind"=>"inner_kind"}
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.6ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.2ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.3ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/show.html.erb within layouts/application (5.8ms)
+Completed 200 OK in 148ms (Views: 145.0ms)
+Started GET "/contact_emails/inner_kind" for 127.0.0.1 at 2017-06-14 13:03:52 -0400
+Processing by EOTS::EOTSController#show as HTML
+  Parameters: {"kind"=>"inner_kind"}
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.7ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.3ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.3ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/show.html.erb within layouts/application (8.5ms)
+Completed 200 OK in 168ms (Views: 164.6ms)
+Started GET "/contact_emails/inner_kind" for 127.0.0.1 at 2017-06-14 13:04:44 -0400
+Processing by EOTS::EOTSController#show as HTML
+  Parameters: {"kind"=>"inner_kind"}
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.5ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.2ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.2ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/show.html.erb within layouts/application (5.7ms)
+Completed 200 OK in 151ms (Views: 147.7ms)
+Started GET "/contact_emails/inner_kind" for 127.0.0.1 at 2017-06-14 13:04:52 -0400
+Processing by EOTS::EOTSController#show as HTML
+  Parameters: {"kind"=>"inner_kind"}
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.5ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.2ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.2ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/show.html.erb within layouts/application (5.6ms)
+Completed 200 OK in 141ms (Views: 138.6ms)
+Started GET "/contact_emails/inner_kind" for 127.0.0.1 at 2017-06-14 13:05:44 -0400
+Processing by EOTS::EOTSController#show as HTML
+  Parameters: {"kind"=>"inner_kind"}
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.6ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.2ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.3ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/show.html.erb within layouts/application (5.9ms)
+Completed 200 OK in 153ms (Views: 149.3ms)
+Started GET "/contact_emails/inner_kind" for 127.0.0.1 at 2017-06-14 13:06:12 -0400
+Processing by EOTS::EOTSController#show as HTML
+  Parameters: {"kind"=>"inner_kind"}
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.6ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.2ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/_field.html.erb (0.2ms)
+  Rendered /Users/dave/computer/opensource/eots/app/views/eots/eots/show.html.erb within layouts/application (5.9ms)
+Completed 200 OK in 143ms (Views: 140.0ms)

data/spec/dummy/spec/feature/end_to_end_spec.rb

@@ -20,6 +20,10 @@ describe EOTS do
                   required: true,
                   section: :footer)
 
+      EOTS::field("captcha", "CAPTCHA",
+                  must_match: "Captcha",
+                  section: :footer)
+
       EOTS::email_kind("general") do
         EOTS::field("body", "What do you want to tell or ask us?",
                     type: :textarea, rows: 5, columns: 60, maxlength: 1024,
@@ -87,12 +91,21 @@ describe EOTS do
   describe "#send_email" do
     describe "checks requiredness of fields" do
       it "barfs if any are missing" do
-        params = HashWithIndifferentAccess.new({ kind: "general" })
+        params = HashWithIndifferentAccess.new({ kind: "general",
+                                                 captcha: "Captcha" })
         expect { EOTS::Email.create_from_params(params) }.
           to raise_error(EOTS::Email::MissingRequiredFieldsError)
       end
-      it "doesn't barfs if all are supplied" do
+      it "barfs if any mismatch a required specific answer" do
+        params = HashWithIndifferentAccess.new({ kind: "general",
+                                                 captcha: "something else",
+                                                 not_spambot: true })
+        expect { EOTS::Email.create_from_params(params) }.
+          to raise_error(EOTS::Email::MismatchedFieldError)
+      end
+      it "doesn't barfs if all are supplied and correct" do
         params = HashWithIndifferentAccess.new({ kind: "general",
+                                                 captcha: "Captcha",
                                                  not_spambot: true })
         expect { EOTS::Email.create_from_params(params) }.not_to raise_error
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eots
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Dave Aronson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-24 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -40,8 +40,7 @@ dependencies:
         version: '0'
 description: Gem to programmatically declare multiples kinds of email and automagically
   construct forms, including view, routes, controller, etc.
-email:
-- github.2.trex@codosaur.us
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []