rocket_cms 0.5.20 → 0.5.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 441d92e65a93736affc737d6b3553502b501dfe0
-  data.tar.gz: dbd7853c197d8aaf01e89a2037b8d43981acb4d1
+  metadata.gz: 93821dd64e38c2cba0c1b8df382f67b95213a641
+  data.tar.gz: 76ffee3cd546f074d7400a0c916e965abeed38a5
 SHA512:
-  metadata.gz: 8d393bdcf0c623bdad37bfaf38b5ad3c5a60d5e302e62ce1e11b2e47e7feab1925191ee8819b1a6f50c09f256f9e1bba215686ecd14dfd208c785cb303e0722f
-  data.tar.gz: 8994fc3ee4aa32700a640a80047381bd63999dd88a472827ff168b397a731839d099798937947cd11a324351d831f21fc2b66dba91c31e10103d4dd504ecb344
+  metadata.gz: 07cba499da79fa9184d3431643cf32cd253b0373e6a860ce6d194cf58ee6b02e10177385f3b05245f50fa762e391a9ccb464c5280483f0579b8b475f779063b3
+  data.tar.gz: 5ed17db9dcad5df57b928cc3b5fc42f752622bbdc13f82241c9467986b5a30eed89e41bbd38e6b69db2ac531fb93cb43321487c2291ec1878fa48d4388d9d029

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.5.20)
+    rocket_cms (0.5.21)
       addressable
       coffee-rails
       devise

data/app/models/concerns/mappable.rb

@@ -23,14 +23,21 @@ module Mappable
       end
     end
     
-    
-    after_validation do
-      if geo_address.blank?
+    geocoded_by :geo_address
+    after_validation :do_geocode
+  end
+
+  def do_geocode
+    if geo_address.blank?
+      if RocketCMS.mongoid?
         self.coordinates = nil
       else
-        if new_record? || address_changed? || coordinates.nil? || map_address_changed?
-          geocode
-        end
+        self.latitude = nil
+        self.longitude = nil
+      end
+    else
+      if (lat.nil? || lon.nil?) && (new_record? || address_changed? || coordinates.nil? || map_address_changed?)
+        geocode
       end
     end
   end
@@ -61,8 +68,6 @@ module Mappable
   def has_map?
     (!lat.blank? && !lon.blank?) || !coordinates.nil?
   end
-
-  geocoded_by :geo_address
   
   def to_map
     {

data/lib/rocket_cms/migration.rb

@@ -24,6 +24,8 @@ module RocketCMS
       t.string :map_hint
       t.float :latitude
       t.float :longitude
+      t.float :lat
+      t.float :lon
     end
   end
 end

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.5.20"
+  VERSION = "0.5.21"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.20
+  version: 0.5.21
 platform: ruby
 authors:
 - glebtv