caboose-rets 0.1.173 → 0.1.178

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d696008a55d4db2c7e4355676577b1125127c58fbda6e18570f02db82b2d5c40
-  data.tar.gz: 8d87073dd33a633bc18ed370fdd5d7211fb7ad8918559062551955be50544a1c
+  metadata.gz: d1336b86c680261a9752197de165a1f305858cce9ca7f26f44a3ab3fba71c33a
+  data.tar.gz: 500e94bad563fbfc06ab78e248feeb8bd16c922512eee1afe3bcdb8c723c39c9
 SHA512:
-  metadata.gz: 7156982635d8c2588036a898809ac2101c975fcb69059b4047c2768186bdfc3d5beaeb2dd9294ed2a245460498bb3019a5531f71777bd2b97262e61f99646034
-  data.tar.gz: a3fafd917d276b72e04752df7c426ea939ad61408a52e26aafc81c0beca79467d8b63e238c06ec88eca5aa96090e1a790e99077f668eb11009f8a9f117f1878b
+  metadata.gz: 1e7bc97528befb03b32a1b135ed382da561178632e2c652521224daaa30a0325f755da8a3b2b0d6fa3173bcabb206dc3f5994031d449ff178962698f81a50cbb
+  data.tar.gz: 25a9f443649a6662354537ef68cb631dbd2a33362791784c9f393ece9fb16e90c1b50d3b4c5bd2136bd398925ac55db610dd8e4a6ea4a7a99e3742df89390a60

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

@@ -25,9 +25,8 @@ class CabooseRets::SearchOption < ActiveRecord::Base
         self.update_search_options_for_field(name, field)        
       end
     end
-    
-    
-    # Delete all flagged
+  
+    # Delete all flagged 
     self.where(:flag_for_delete => true).delete_all        
   end
   
@@ -75,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.173'
+  VERSION = '0.1.178'
 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.173
+  version: 0.1.178
 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