timezone_detection 0.0.3 → 0.0.4

data/app/models/timezone_detection/ip_timezone.rb

@@ -1,17 +1,21 @@
 module TimezoneDetection
 
   class IpTimezone < ActiveRecord::Base
-    include TimezoneDetection::IpConvertion
+    extend TimezoneDetection::IpConvertion
 
     attr_accessor :ip
     attr_accessible :ip, :utc_offset
 
     before_save :cancel_if_current_ip_already_exists
 
+		def self.find_ip(ip)
+      IpTimezone.where(ip_in_longint: IpTimezone.ip2long(ip))
+		end
+
     private
 
     def cancel_if_current_ip_already_exists
-      self.ip_in_longint = ip2long(ip)
+      self.ip_in_longint = IpTimezone.ip2long(ip)
       !IpTimezone.where(ip_in_longint: self.ip_in_longint).exists? #Stops saving if return false
     end
   end

data/lib/timezone_detection/application_controller_extension.rb

@@ -1,9 +1,12 @@
 module TimezoneDetection
 	module ClassMethods
 		def set_timezone
-			ip_info = IpInfoDB.new
-			offset = ip_info.get_timezone_offset(request.remote_ip)
-			ip_timezone = IpTimezone.create(ip: request.remote_ip, utc_offset: offset)
+			ip_timezone = IpTimezone.find_ip(request.remote_ip).first
+			unless ip_timezone.present?
+				ip_info = IpInfoDB.new
+				offset = ip_info.get_timezone_offset(request.remote_ip)
+				ip_timezone = IpTimezone.create(ip: request.remote_ip, utc_offset: offset)
+			end
 			Time.zone = ActiveSupport::TimeZone[ip_timezone.utc_offset]
 		end
 	end

data/lib/timezone_detection/version.rb

@@ -1,3 +1,3 @@
 module TimezoneDetection
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/dummy/log/test.log

@@ -937,3 +937,32 @@ Connecting to database specified by database.yml
    (0.1ms)  rollback transaction
    (0.1ms)  begin transaction
    (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.6ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+  TimezoneDetection::IpTimezone Load (0.1ms)  SELECT "timezone_detection_ip_timezones".* FROM "timezone_detection_ip_timezones" 
+   (0.1ms)  SAVEPOINT active_record_1
+  TimezoneDetection::IpTimezone Exists (0.2ms)  SELECT 1 AS one FROM "timezone_detection_ip_timezones" WHERE "timezone_detection_ip_timezones"."ip_in_longint" = 1245284686 LIMIT 1
+  SQL (20.4ms)  INSERT INTO "timezone_detection_ip_timezones" ("ip_in_longint", "utc_offset") VALUES (?, ?)  [["ip_in_longint", 1245284686], ["utc_offset", 3]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SELECT COUNT(*) FROM "timezone_detection_ip_timezones" 
+   (0.2ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  TimezoneDetection::IpTimezone Exists (0.2ms)  SELECT 1 AS one FROM "timezone_detection_ip_timezones" WHERE "timezone_detection_ip_timezones"."ip_in_longint" = 1245284686 LIMIT 1
+  SQL (0.2ms)  INSERT INTO "timezone_detection_ip_timezones" ("ip_in_longint", "utc_offset") VALUES (?, ?)  [["ip_in_longint", 1245284686], ["utc_offset", 3]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  TimezoneDetection::IpTimezone Exists (0.2ms)  SELECT 1 AS one FROM "timezone_detection_ip_timezones" WHERE "timezone_detection_ip_timezones"."ip_in_longint" = 1245284686 LIMIT 1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.2ms)  SELECT COUNT(*) FROM "timezone_detection_ip_timezones" 
+   (0.2ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timezone_detection
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: