devise_password_sharing_extension 0.0.6 → 0.0.7

data/app/models/login_event.rb

@@ -7,9 +7,8 @@ class LoginEvent < ActiveRecord::Base
   attr_accessible :ip_address, :latitude, :longitude
   attr_accessible :city, :country_code, :region_name
 
-  def self.grouped_by_city(time_frame = 1.hour)
-    select('COUNT(*) AS count, login_events.city').
-    where('login_events.created_at >= ?', Time.now - time_frame).
-    group('login_events.city')
+  def self.cities_in_the_last(time_frame = 2.hours)
+    select('DISTINCT login_events.city').
+    where('login_events.created_at >= ?', time_frame.ago)
   end
 end

data/lib/devise_password_sharing_extension/models/password_sharing.rb

@@ -47,9 +47,7 @@ module Devise
 
       def password_sharing?
         return true unless banned_for_password_sharing_at.nil?
-        login_events.grouped_by_city(self.class.time_frame).any? do |g|
-          g.count.to_i >= self.class.number_of_cities
-        end
+        login_events.cities_in_the_last(self.class.time_frame).count >= self.class.number_of_cities
       end
     end
   end

data/lib/devise_password_sharing_extension/version.rb

@@ -1,3 +1,3 @@
 module DevisePasswordSharingExtension
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_password_sharing_extension
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70130537766360 !ruby/object:Gem::Requirement
+  requirement: &70135952639800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.7
   type: :development
   prerelease: false
-  version_requirements: *70130537766360
+  version_requirements: *70135952639800
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70130537765540 !ruby/object:Gem::Requirement
+  requirement: &70135952635100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70130537765540
+  version_requirements: *70135952635100
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70130537764800 !ruby/object:Gem::Requirement
+  requirement: &70135952632540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,10 +46,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70130537764800
+  version_requirements: *70135952632540
 - !ruby/object:Gem::Dependency
   name: geoip
-  requirement: &70130537764260 !ruby/object:Gem::Requirement
+  requirement: &70135952628180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,7 +57,7 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70130537764260
+  version_requirements: *70135952628180
 description: A devise extension to curb password sharing.
 email:
 - russ@bashme.org