rsvp 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODU3YTY1Y2UwZmVjZTllMjJiNzI2ZWE2ZDQyYzNhZTAyMjE3NjM0OA==
+    NDQ3Y2M4YzcwMTI4ZjA3YTk3ZjNmOTQzOTMwNDQ1YzY4NTA4N2ZmZQ==
   data.tar.gz: !binary |-
-    OGRhMjNmNTZmZjRiZWExNjczY2FkODA3NjQwNTBkYzQxNjg3YzgwNw==
+    Mjg5MWZjYTZhNmY3MjBmMWJlZTM2YWZmZDY0NjgwMmU5ZWVmZmI1Yg==
 SHA512:
   metadata.gz: !binary |-
-    YzA5ZTdhZGI3Y2VjZmFmMDJhYTFlYmZhM2Y1OTA0NWYyMGQzZWQwMjJiMWQ4
-    NWViMmE3OTM2MGM4ZmNmNzA0YjUxMjgzYWY5MTMwZDU3MDIxNmUyZGVhNGJj
-    N2RkYjA1NDE3ZDQ4NjMzNThiOGE2MDY2YzFmNjFhYWQ5ZTcwOWY=
+    ZTFiMmQxZmExNzc5ZWM1ZmNhNzRhZTFmYWJkMTAxNTIxMzgyYTA0NmM2YzU3
+    YTBjMjEyYTliZmU1MTQwMTRlODQyNTRmZGEyZmU2NDg3MTZkN2YyZjFlNzgw
+    MjJjMzBkY2QxZmNhMjU3ZTEyODU1ODkwNDA5NmU3MzZlZGUzZTA=
   data.tar.gz: !binary |-
-    MTA0NzlhZmZhZDk1MDE2ZWY1YWIyOWE5MWQzNTMxY2MyZDk1ZDQ2YTZhNTA3
-    ZjUyYjIxYTg0MjBiOWEwM2U1MjdlOTI1MWFhZmE2MDVlNzZkYWY3OTU2ZDg5
-    ZjViZGUxZGU4NmZhMTllMzFiMWY4YjcwZmEwNzA3YmE1Mzg5Nzk=
+    ODZiZWE2NzU0M2I5YWRlNGE5MzljMDk2NzIwYTI1NzYzMDNmNjZhYzVjMGJl
+    ZTQxNTJhNzcyN2NkNDNkOGFiMDY0Mzk2Mjk0OTg4MjM0ZjIxNGYzMTIyNDU5
+    ZjkwYjNiMmFhNmE1MTdkNWJkNWUyMDk0ZTVkMDVhMmNiMDE4MmE=

data/app/controllers/rsvp/session_controller.rb

@@ -2,7 +2,8 @@ module Rsvp
   class SessionController < ApplicationController
     skip_before_filter :require_session, :only => [:index, :create]
     before_filter :get_access_attempt
-    before_filter :redirect_locked, :only => [:create]
+    before_filter :flash_message_when_locked, :only => [:index]
+    before_filter :redirect_when_locked, :only => [:create]
 
     # GET /session
     def index; end
@@ -14,9 +15,12 @@ module Rsvp
         session[:invitation_id] = invitation.id
         redirect_to (invitation.responses.any? ? show_response_index_path : response_index_path)
       else
-        record_failed_access_attempt
-        flash.alert = "Oops!! The code you entered is not valid. Please try again."
-        redirect_to root_path
+        if exceeded_access_attempts?
+          redirect_when_locked
+        else
+          flash.alert = "Oops!! The code you entered is not valid. Please try again."
+          redirect_to root_path
+        end
       end
     end
 
@@ -37,15 +41,21 @@ module Rsvp
       @access_attempt ||= AccessAttempt.find_or_create_by(remote_ip: request.remote_ip)
     end
 
-    def record_failed_access_attempt
+    def exceeded_access_attempts?
       @access_attempt.record_attempt
+      @access_attempt.locked?
     end
 
-    def redirect_locked
+    def redirect_when_locked
       if @access_attempt.locked?
-        flash[:alert] = "You surpassed the attempt threshold. You may try again on #{@access_attempt.locked_until.strftime('%B %d at %I:%M %p')}."
         redirect_to root_path
       end
     end
+
+    def flash_message_when_locked
+      if @access_attempt.locked?
+        flash.now[:alert] = "You surpassed the attempt threshold. You may try again on #{@access_attempt.locked_until.strftime('%A, %B %d at %l:%M %p').gsub(/[\ ]{2}/, " ")}."
+      end
+    end
   end
 end

data/app/views/rsvp/session/index.html.erb

@@ -1,5 +1,7 @@
-<%= form_tag sign_in_path, :method => :post do |f| %>
-  <%= label_tag :rsvp_code, "Enter your RSVP Code" %>
-  <%= text_field_tag :rsvp_code %>
-  <%= submit_tag "Begin RSVP" %>
+<% unless @access_attempt.locked? %>
+  <%= form_tag sign_in_path, :method => :post do |f| %>
+    <%= label_tag :rsvp_code, "Enter your RSVP Code" %>
+    <%= text_field_tag :rsvp_code %>
+    <%= submit_tag "Begin RSVP" %>
+  <% end %>
 <% end %>

data/lib/rsvp/version.rb

@@ -1,3 +1,3 @@
 module Rsvp
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsvp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ryan Ricard