rsvp 0.1.5 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzc3MTQzNzQ1OWU0MjY1Njc5ZTAyOWI3YWY3Mjc1ZDVlOTE5ZTA4Mg==
+    ODU3YTY1Y2UwZmVjZTllMjJiNzI2ZWE2ZDQyYzNhZTAyMjE3NjM0OA==
   data.tar.gz: !binary |-
-    NjdlMmZkY2JjNWYwNGQ5NjQwNTZjN2QzZDE3MGYyYzZjM2UwYWM2Yw==
+    OGRhMjNmNTZmZjRiZWExNjczY2FkODA3NjQwNTBkYzQxNjg3YzgwNw==
 SHA512:
   metadata.gz: !binary |-
-    NmYyNWVmZWY0MmM4Mzk2OWE1Mjc4NDVlZjRhZmNlZjk5MDMzYjA0MmI2YzI3
-    MjQ1OGQ3OGViMjE2YjM1MTMwYTBiY2MxMmZjMzBjZjEyMjc2NDM1YTNjNTdh
-    MjVhMjQxODc5YTVjYWM5ODQ3M2MyYWRhZTIyNDRkNWM3MzhkZGY=
+    YzA5ZTdhZGI3Y2VjZmFmMDJhYTFlYmZhM2Y1OTA0NWYyMGQzZWQwMjJiMWQ4
+    NWViMmE3OTM2MGM4ZmNmNzA0YjUxMjgzYWY5MTMwZDU3MDIxNmUyZGVhNGJj
+    N2RkYjA1NDE3ZDQ4NjMzNThiOGE2MDY2YzFmNjFhYWQ5ZTcwOWY=
   data.tar.gz: !binary |-
-    OWY1ODhjNTkzNGFkMDExYTU3NDVmZDNiOTNiYjJhOThiODI4NjA1OGM0NDJl
-    MmI2NzVjMTEzZDhiYzA2NzAxOGI3NWY1MzBkZGQ1YWQ5YjcyNmM1YmI4YzZl
-    ODc3NDE2Nzc5MmJlZjk0NjliOGU5ZDlmNGNlZTk4NjhkM2E0ZDk=
+    MTA0NzlhZmZhZDk1MDE2ZWY1YWIyOWE5MWQzNTMxY2MyZDk1ZDQ2YTZhNTA3
+    ZjUyYjIxYTg0MjBiOWEwM2U1MjdlOTI1MWFhZmE2MDVlNzZkYWY3OTU2ZDg5
+    ZjViZGUxZGU4NmZhMTllMzFiMWY4YjcwZmEwNzA3YmE1Mzg5Nzk=

data/app/controllers/rsvp/session_controller.rb

@@ -34,12 +34,11 @@ module Rsvp
     end
 
     def get_access_attempt
-      @access_attempt ||= AccessAttempt.find_or_create_by_remote_ip(request.remote_ip)
+      @access_attempt ||= AccessAttempt.find_or_create_by(remote_ip: request.remote_ip)
     end
 
     def record_failed_access_attempt
       @access_attempt.record_attempt
-      @access_attempt.save
     end
 
     def redirect_locked

data/app/models/rsvp/access_attempt.rb

@@ -1,50 +1,39 @@
 module Rsvp
   class AccessAttempt < ActiveRecord::Base
-    attr_accessible :locked_at, :locks_incurred
+    attr_accessible :remote_ip
 
-    ALLOWED_ATTEMPTS = 5
+    ALLOWED_ATTEMPTS = 7
     LOCK_DURATION = 15
 
-    def allowed_attempts
-      ALLOWED_ATTEMPTS
-    end
-
-    def lock_duration
-      LOCK_DURATION
-    end
-
-    def multiplier
-      locks_incurred + 1
-    end
-
-    def multiplied_allowed_attempts
-      allowed_attempts * multiplier
-    end
-
-    def multiplied_lock_duration
-      (lock_duration * multiplier).minutes
-    end
-
     def record_attempt
-      increment(:failed_attempts)
-      if failed_attempts >= multiplied_allowed_attempts
-        self.locked_at = Time.now
-        increment(:locks_incurred)
+      self.failed_attempts += 1
+      if failed_attempts >= allowed_attempts
+        self.locked_until = Time.now + lock_duration
+        self.locks_incurred += 1
       end
+      self.save
     end
 
     def locked?
-      unless locked_at.nil?
-        return (locked_at + multiplied_lock_duration) >= Time.now
+      unless locked_until.nil?
+        return locked_until >= Time.now
       else
         return false
       end
     end
 
-    def locked_until
-      if locked?
-        return locked_at + multiplied_lock_duration
-      end
+    def allowed_attempts
+      ALLOWED_ATTEMPTS * multiplier
+    end
+
+    private
+
+    def multiplier
+      locks_incurred + 1
+    end
+
+    def lock_duration
+      (LOCK_DURATION * (multiplier**3)).minutes
     end
   end
 end

data/db/migrate/20140304015111_create_rsvp_access_attempts.rb

@@ -3,7 +3,7 @@ class CreateRsvpAccessAttempts < ActiveRecord::Migration
     create_table :rsvp_access_attempts do |t|
       t.string :remote_ip
       t.integer :failed_attempts, default: 0
-      t.datetime :locked_at
+      t.datetime :locked_until
       t.integer :locks_incurred, default: 0
       t.timestamps
     end

data/lib/rsvp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsvp
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryan Ricard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails