app/models/venue.rb in artfully_ose-1.2.0.beta.1 vs app/models/venue.rb in artfully_ose-1.2.0.pre

@@ -1,19 +1,18 @@
 require 'geocoder'
 
 class Venue < ActiveRecord::Base
   belongs_to :organization
-  has_one :event
-
+  belongs_to :event
+ 
   validates_presence_of :name
   
-  attr_accessible :name, :address1, :address2, :city, :state, :zip, :time_zone, :lat, :long
-  
-  geocoded_by :full_street_address, :latitude => :lat, :longitude => :long
+  attr_accessible :name, :address1, :address2, :city, :state, :zip, :time_zone
 
-  after_save :run_geocode, :if => :address1_changed?
-  after_save :refresh_show_stats, :if => :time_zone_changed?
+  geocoded_by :geocode_address, :latitude => :lat, :longitude => :long
+
+  before_save :geocode, :if => :address1_changed?
   
   def address_as_string
     street_as_string + " " + city_state_zip_as_string
   end
 
@@ -29,23 +28,10 @@
   
   def address_as_url_query
     URI::escape(street_as_string + " " + city_state_zip_as_string)
   end
 
-  def full_street_address
+  def geocode_address
     (address1 || "") + ", " + (address2 || "") + ", " + (city || "") +
       ", " + (state || "") + " " + (zip || "")
   end
-
-  def refresh_show_stats
-    unless self.event.nil?
-      self.event.shows.each {|s| s.delay.refresh_stats }
-    end
-  end
-  
-  private
-
-    def run_geocode
-      Delayed::Job.enqueue(GeocodeAddressJob.new(self))
-    end
-  
 end