fortifier 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6ed6a9fcd00d6437c0c38ce81f6f96efcbfbf7c
-  data.tar.gz: f60fd7efc29b5417730fa253689a86ca4b621156
+  metadata.gz: 627acec90ae1d790dd438438de615d1ea3dfada8
+  data.tar.gz: 84be89b1d08e92ce0d38901526490c6b9925b4e4
 SHA512:
-  metadata.gz: 8c1b60d42998963ee270b24a23f984c04cddc7ea73ee339f76b591e8ccc6ca77bc80a53b347effe550a5591dc7cf29dd909ee7880d758aa13512920efca40c84
-  data.tar.gz: 47f5af0a072b921c33fbd5aba58894d40f17c8a7f4ff3798aadb33baebb92e3827c9267574885d81878904e68114ffd1c3acd5071457ffe162204f497a4b1914
+  metadata.gz: d298350e78d00abf9c6370762e8054b2f0f99133ef76ee8e72f53d93ea80bb426d92813de7b63060cd5a48f36106730c7f6387aadb9d4e04ff83b874805070db
+  data.tar.gz: 87c21c4ddf36eb364a76f08bed5c7d0efd464ccc161bdc78a228695e16948c94d457d178447ff4bfcfa5e07f84e001d3e0c8c7b646358c5cb5271f97ce2d5b6f

data/app/models/fortifier/auth_user.rb

@@ -26,7 +26,7 @@ module Fortifier
 
     # NOTE: These custom validations are used so that symbols/codes
     # can be returned to applications, rather than explicit text.
-    # Fortifier provides the symbols and the apps are responsible 
+    # Fortifier provides the symbols and the apps are responsible
     # for handling error messaging.
     def login_is_present
       return if login.present?
@@ -118,9 +118,9 @@ module Fortifier
       return nil if token.blank?
       AuthUser.
         joins(:secrets).
-        where("find_in_set(? , account_uuids_csv) 
+        where("find_in_set(? , account_uuids_csv)
           AND (expired IS NULL OR expired = false)
-          AND enc_type = '#{Secret::SSO_TOKEN}' 
+          AND enc_type = '#{Secret::SSO_TOKEN}'
           AND secret_value = ?", account_uuid, token).
         first
     end
@@ -129,9 +129,9 @@ module Fortifier
       return nil if token.blank?
       AuthUser.
         joins(:secrets).
-        where("find_in_set(? , account_uuids_csv) 
+        where("find_in_set(? , account_uuids_csv)
           AND (expired IS NULL OR expired = false)
-          AND enc_type = '#{Secret::SSO_TOKEN}' 
+          AND enc_type = '#{Secret::SSO_TOKEN}'
           AND secret_value = ?", account_uuid, token).
         first
     end
@@ -165,12 +165,12 @@ module Fortifier
 
     def public_attribute_hash
       auth_log = self.auth_logs.last
-      { 
-        uuid: self.uuid, 
-        email: self.email, 
-        login: self.login, 
-        name: self.name, 
-        note: self.note, 
+      {
+        uuid: self.uuid,
+        email: self.email,
+        login: self.login,
+        name: self.name,
+        note: self.note,
         disabled: self.disabled?,
         last_auth_log: ({user_agent: auth_log.user_agent, status: auth_log.status, created_at: auth_log.created_at.to_time} if auth_log)
       }
@@ -209,12 +209,12 @@ module Fortifier
         # joined with their most recent AuthLog,
         # sort by the AuthLog created_at date (according to user preference),
         # then paginate with WillPaginate. Capisce?
-        Fortifier::AuthUser.find_by_sql("SELECT * FROM fortifier_auth_users fau 
-                                          LEFT OUTER JOIN ( select auth_user_id, max(created_at) 
-                                              AS last_login_at 
-                                              FROM fortifier_auth_logs fal 
-                                              GROUP BY auth_user_id) 
-                                            AS last_seen  
+        Fortifier::AuthUser.find_by_sql("SELECT * FROM fortifier_auth_users fau
+                                          LEFT OUTER JOIN ( select auth_user_id, max(created_at)
+                                              AS last_login_at
+                                              FROM fortifier_auth_logs fal
+                                              GROUP BY auth_user_id)
+                                            AS last_seen
                                           ON fau.id = last_seen.auth_user_id
                                           #{'WHERE ' + aggregate_query}
                                           #{'AND ' + user_search_query if user_search_query.present?}
@@ -229,7 +229,7 @@ module Fortifier
     end
 
     private
-    
+
     def create_unique_uuid
       self.uuid = loop do
         uuid = SecureRandom.uuid

data/app/models/fortifier/max_mind.rb

@@ -1,5 +1,5 @@
 module Fortifier
-  class MaxMind 
+  class MaxMind
 
     def self.valid_ip?(auth_log)
       return true unless Rails.env=="production"
@@ -47,7 +47,7 @@ module Fortifier
 
     def self.local_ip?(ip)
       ip_regex = /(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1)|(^0:0:0:0:0:0:0:1)$/
-      return true if ip_regex.match(ip)
+      return ip_regex.match(ip).present?
     end
 
     def self.previously_validated_ip?(ip)

data/lib/fortifier/version.rb

@@ -1,3 +1,3 @@
 module Fortifier
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: fortifier
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Derek Koloditch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.4
 - !ruby/object:Gem::Dependency
-  name: bcrypt
+  name: bcrypt-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.7
+        version: 3.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.7
+        version: 3.1.5
 - !ruby/object:Gem::Dependency
   name: attr-csv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: foreigner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Different stuff.
@@ -159,17 +159,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: It does stuff.