caboose-rets 0.1.174 → 0.1.179

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baf444eb0223fddad35c7f67352e84f1a4fb8cacd53b1abe8b0837d673ccd043
-  data.tar.gz: a173545aee036e586a76493529d378e7d20248d534a1f7126166ea8e3dee4b6b
+  metadata.gz: 153c5b061caf36972cb829fa5bd3059daacdade6fc9841e75c5b14760b5b087e
+  data.tar.gz: 57d1bcde45bf5e180b93e33f5b649ad9cdb39966fb38bb0db418057464c23cc7
 SHA512:
-  metadata.gz: 4955fe9863b5978a4829a1fb53fb1935104c78d82e98b8f3383dbbcdf84e7feb7f3ce116477c43540a4d0545bbe631e446d76fbc16c99df953e4138ee4c4e618
-  data.tar.gz: 13726d625204a4a8655661dc90bc06b98f58f231809bdac4863582797fbeda97402679e69b0c369ca4a0223da3623a221c0e8745ff4dba09068cf0d965eabaaf
+  metadata.gz: 70da0fcdc60dff4f7879d0890cc4aa8fe46f537f9930bf4fbc4687d854208f2e745f68d44be586c7ff6be6c5591ab8893a4f934228e197e11161c84d4a1eacc3
+  data.tar.gz: 82a1c054feb766a3d8d832bf84fc28ce7fd85aa9b3d6114d6e660365b5d8fea37881c40ea77f24eabe57181cc16f63fb020f011d7926623f4107ef6108046acb

data/app/controllers/caboose_rets/agents_controller.rb

@@ -14,12 +14,12 @@ module CabooseRets
       @agent = Agent.where(:mls_id => params[:mls_id]).where("office_mls_id ILIKE ?", @site.rets_office_id).first if !params[:mls_id].blank?
       @agent = Agent.where(:slug => params[:slug]).where("office_mls_id ILIKE ?", @site.rets_office_id).first if !params[:slug].blank?
       @listings = Property.where("list_agent_mls_id ILIKE ? OR co_list_agent_mls_id ILIKE ?", @agent.mls_id, @agent.mls_id).where(:status => 'Active').order('list_price desc').all
-    end
+    end 
 
     # @route GET /real-estate/agents/:slug/contact
-    # @route GET /agents/:mls_id/contact
+    # @route GET /agents/:id/contact
     def contact
-      @agent = Agent.where(:mls_id => params[:mls_id]).where("office_mls_id ILIKE ?", @site.rets_office_id).first if !params[:mls_id].blank?
+      @agent = Agent.where(:id => params[:id]).first if !params[:id].blank?
       @agent = Agent.where(:slug => params[:slug]).where("office_mls_id ILIKE ?", @site.rets_office_id).first if !params[:slug].blank?
     end
 

data/app/controllers/caboose_rets/properties_controller.rb

@@ -143,27 +143,19 @@ module CabooseRets
 
       @related = Property.near("#{@property.latitude}, #{@property.longitude}", 50).where(:property_type => @property.property_type, :status => 'Active', :property_subtype => @property.property_subtype).where(price_where,price_min,price_max).where(beds_where,beds_min,beds_max).where("mls_number != ?",@property.mls_number).order('distance asc').limit(3) if @property
 
-      if @property.nil?
-        @mls_number = params[:mls_number]
-      #  CabooseRets::RetsImporter.delay(:priority => 10, :queue => 'rets').import_property(@mls_number.to_i) 
-        render 'caboose_rets/properties/property_not_exists'
-        return
-      end
+      render :file => "caboose/extras/error404", :layout => "caboose/application", :status => 404 and return if @property.nil?
 
       @block_options = {
         :mls_number => params[:mls_number],
         :property => @property,
         :saved    => @saved,
-  #      :agent    => @property ? @property.where(:list_agent_mls_id => @property.list_agent_mls_id).first : nil,
         :form_authenticity_token => form_authenticity_token
       }
 
-      if @property.nil?
-       @mls = params[:mls]
-    #   CabooseRets::RetsImporter.delay(:priority => 10, :queue => 'rets').import_property(@mls_number.to_i)
-       render 'caboose_rets/properties/property_not_exists'
-       return
-      end
+      @page.title = @property.full_address
+      @page.meta_description = @property.meta_description(@site)
+      @page.uri = "properties/#{@property.mls_number}/details"
+
     end
 
     #=============================================================================

data/app/models/caboose_rets/property.rb

@@ -41,12 +41,17 @@ class CabooseRets::Property <ActiveRecord::Base
 
     def full_address
         address = "#{self.unit_number.blank? ? '' : 'Unit ' + self.unit_number + ', '}#{self.street_number} #{self.street_dir_prefix.blank? ? '' : self.street_dir_prefix + ' '}#{self.street_name.blank? ? '' : self.street_name.titleize}#{self.street_suffix.blank? ? '' : ' ' + self.street_suffix.titleize}#{self.street_dir_suffix.blank? ? '' : ' ' + self.street_dir_suffix}"
-        return address.blank? ? '' : address.gsub('Mc ','Mc')
+        return address.blank? ? '' : address.gsub('Mc ','Mc').gsub('Mlk',"MLK").gsub(" Us ", " US ").gsub(" Th ", "th ").gsub("Mcfarland","McFarland")
     end
 
     def full_address_city
         address = "#{self.unit_number.blank? ? '' : 'Unit ' + self.unit_number + ', '}#{self.street_number} #{self.street_dir_prefix.blank? ? '' : self.street_dir_prefix + ' '}#{self.street_name.blank? ? '' : self.street_name.titleize}#{self.street_suffix.blank? ? '' : ' ' + self.street_suffix.titleize}#{self.street_dir_suffix.blank? ? '' : ' ' + self.street_dir_suffix}#{self.city.blank? ? '' : '<br />' + self.city.titleize + ', ' + self.state_or_province + ' ' + self.postal_code}"
-        return address.blank? ? '' : address.gsub('Mc ','Mc')
+        return address.blank? ? '' : address.gsub('Mc ','Mc').gsub('Mlk',"MLK").gsub(" Us ", " US ").gsub(" Th ", "th ").gsub("Mcfarland","McFarland")
+    end
+
+    def meta_description(site)
+        fa = self.full_address_city.blank? ? nil : self.full_address_city.gsub("<br />",", ")
+        return "View the property listed for sale at #{fa}. #{site.description}"
     end
 
     def parse(data)

data/app/models/caboose_rets/rets_importer.rb

@@ -723,10 +723,14 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
 		if count == 0 || (count == 1 && Delayed::Job.where(q).first.locked_at)
 		  self.delay(:run_at => 20.minutes.from_now, :priority => 10, :queue => 'rets').update_rets
 		end
-    # Delete old logs
-    CabooseRets::Log.where("timestamp < ?",(DateTime.now - 7.days)).destroy_all
+
+    # Delete RETS logs over 7 days old
+    dt = DateTime.now - 7.days
+    sql = "delete from rets_logs where timestamp < '#{dt}';"
+    ActiveRecord::Base.connection.select_all(sql)
+
     # Update search options
-    CabooseRets::SearchOption.delay(:queue => "rets").update_search_options
+    CabooseRets::SearchOption.delay(:queue => "rets", :priority => 15).update_search_options
   end
 
   def self.last_updated

data/app/models/caboose_rets/search_option.rb

@@ -26,7 +26,7 @@ class CabooseRets::SearchOption < ActiveRecord::Base
       end
     end
   
-    # Delete all flagged
+    # Delete all flagged 
     self.where(:flag_for_delete => true).delete_all        
   end
   
@@ -44,7 +44,7 @@ class CabooseRets::SearchOption < ActiveRecord::Base
           so.save
         end
       end
-    elsif field == 'street_address'
+    elsif field == 'street_address' 
       CabooseRets::Property.where(:status => "Active", :property_type => "Residential").where("street_name is not null and street_number is not null").order(:id).all.each do |prop|
         add = "#{prop.street_number} #{prop.street_name} #{prop.street_suffix}"
         val = add.blank? ? nil : add.strip
@@ -74,12 +74,13 @@ class CabooseRets::SearchOption < ActiveRecord::Base
     end
   end
   
-  def self.results(str, count_per_name = 10)      
+  def self.results(str, count_per_name = 10)
+    s = str.blank? ? '' : str.downcase.strip
     q = ["select * from (        
         select id, name, field, value, row_number() over (partition by name order by field) as rownum 
         from rets_search_options        
         where lower(value) like ?        
-      ) tmp where rownum < #{count_per_name}", "%#{str}%"]      
+      ) tmp where rownum < #{count_per_name}", "%#{s}%"]      
     rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, q))
     arr = rows.collect{ |row| { :id => row[0].to_i, :name => row[1], :field => row[2], :text => row[3] }}    
     return arr    

data/lib/caboose_rets/version.rb

@@ -1,3 +1,3 @@
 module CabooseRets
-  VERSION = '0.1.174'
+  VERSION = '0.1.179'
 end

data/lib/tasks/caboose_rets.rake

@@ -292,7 +292,6 @@ namespace :caboose_rets do
 		ensure
 		  unlock_task_if_last_updated(task_started)
     end
-    CabooseRets::SearchOption.delay(:queue => "rets").update_search_options
   end
 
   def last_updated

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-rets
 version: !ruby/object:Gem::Version
-  version: 0.1.174
+  version: 0.1.179
 platform: ruby
 authors:
 - William Barry
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2021-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms