caboose-rets 0.1.175 → 0.1.176

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 637b2123ba2412960a1763a4fcb8006166b5e1f7b507c98102afc47d01a45ea9
-  data.tar.gz: 7cac84f99f66ac4ebc8d0818b4fb36af5ad327e6f10f96ed6d7164a49bba2174
+  metadata.gz: e86f1969a90c7e45a4436194551bc7b5b9de528b7a4cd73a8f14049a6a130020
+  data.tar.gz: ce0f8ddd1d0b7a1dfb0a7da754e3be9f1fde2762e014a6f4ff3390005ed94c45
 SHA512:
-  metadata.gz: 86e921fa5cbb92297bce5af3fa3cdcc484c853d44ce0b2842c8d6f8ef47c99042beb0640aaca040a257d4af45560b0fdf7120424bd5d348329c119893c2d8597
-  data.tar.gz: 1800b4c1d0bd0544662727bc7c49d11f43d724a5989263ab3b989b12396cde93de55a8f8e0706eb2a5def9a4c9aefd8ce52fe6a6a3dbb9aab7fd51f08081111d
+  metadata.gz: 1f551b21679565aa2ecf873d925354b5add876e319e6f6fdd0ceb0b37f2d20cf6b1da7b60808f3de89dfabd72464fd8932a0170d26108b89900ab84669ebe8a8
+  data.tar.gz: 42e0c5f4853ecfb42bfa9111afdfbd596911f100f81fbb532def3de117dcbded2c55aa3d8f9ba2346de23db2cf660654f788c90231948d5dd5f900991dccb142

data/app/controllers/caboose_rets/agents_controller.rb

@@ -17,9 +17,9 @@ module CabooseRets
     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/lib/caboose_rets/version.rb

@@ -1,3 +1,3 @@
 module CabooseRets
-  VERSION = '0.1.175'
+  VERSION = '0.1.176'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-rets
 version: !ruby/object:Gem::Version
-  version: 0.1.175
+  version: 0.1.176
 platform: ruby
 authors:
 - William Barry
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-12 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms