log_logins 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 581e8265dfc64a46c6de15e6c749d8c077ba70ee16a8f6e818308fc8efb4c4c0
-  data.tar.gz: 56f013a4cb2cd1fb874521870750aebc50781310fec99f9345aa702c4ffefb2c
+  metadata.gz: 1f3655e03a98292ce6a41e5b0959a1868ad68309673582e009b5cd8135dcadab
+  data.tar.gz: 3075213d75edd56880de2afe1e9f6439bc7b3925d84380cfa94fcaa1aa80e1d1
 SHA512:
-  metadata.gz: 130450acaef54354b45a9f02f5ef30b1e83c725022781f5a8cd8d2326f94aab73580ddc552075329dd50e5d1077a7b31f4615245cf58b9f371dcb9ba7aad7c44
-  data.tar.gz: 396c2c8631f477521e22317c3600978f6d803baa38d932fdcfebf67510034110dcfbbda482dd700eb6e4520009c6c47c5abf7569edfdff04b385698b465833bd
+  metadata.gz: 961d975520465a29cae7a60fd3fd1d6bde72a45fc2edfd2b27dbabb06f74431c2610fe16c1913bdc9f4964f40f877cfc8c3f063bedcf3d678d179001bb62ebf1
+  data.tar.gz: d834bad436326730e642f86e97009ba8e150df5a0d1844366633bdbb3ddbc9f403532f95283afc13c0dc00cefde718919f1754f2a0bc55fa9c8d689aecc8159c

data/db/migrate/20180307161400_add_additional_indexes.rb

@@ -0,0 +1,8 @@
+class AddAdditionalIndexes < ActiveRecord::Migration[4.2]
+
+  def change
+    add_index :login_events, [:user_id, :id]
+    add_index :login_events, [:ip, :id], :length => {:ip => 50}
+  end
+
+end

data/lib/log_logins/event.rb

@@ -77,7 +77,7 @@ module LogLogins
     # @return [Boolean]
     def self.user_blocked?(user)
       return false unless user.is_a?(ActiveRecord::Base)
-      last_success = self.success_or_unblock.order(:id => :desc).select(:id).first.try(:id) || 0
+      last_success = self.where(:user => user).success_or_unblock.order(:id => :desc).select(:id).first.try(:id) || 0
       self.failed_in_block_time.where(:user => user).where("id > ?", last_success).count >= LogLogins.config.attempts_before_block
     end
 
@@ -87,9 +87,20 @@ module LogLogins
     # @return [Boolean]
     def self.ip_blocked?(ip)
       return false if ip.nil?
-      last_success = self.success_or_unblock.order(:id => :desc).select(:id).first.try(:id) || 0
+      last_success = self.where(:user => nil, :ip => ip.to_s).success_or_unblock.order(:id => :desc).select(:id).first.try(:id) || 0
       self.failed_in_block_time.where(:user => nil, :ip => ip.to_s).where("id > ?", last_success).count >= LogLogins.config.attempts_before_block_on_ip
     end
 
+    # Delete old login data
+    #
+    # @return [Integer] the number of removed items
+    def self.prune(max_age = 6.months)
+      if last_to_keep = self.where("created_at <= ?", max_age.ago).order(:created_at => :desc).first.try(:id)
+        self.where("id <= ?", last_to_keep).delete_all
+      else
+        0
+      end
+    end
+
   end
 end

data/lib/log_logins/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LogLogins
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: log_logins
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Adam Cooke
@@ -59,6 +59,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - db/migrate/20180307100300_create_log_logins_events_table.rb
+- db/migrate/20180307161400_add_additional_indexes.rb
 - lib/log_logins.rb
 - lib/log_logins/config.rb
 - lib/log_logins/engine.rb