caboose-rets 0.0.44 → 0.0.45

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDA0MzczZmY4NzU0ZjA3NGM4NzViYjkzZWU5ZmI1ODk1MTZkYmUyYg==
+    M2FkOTQ0NTVhZTIyMjQ0NjBhZGY3NjMwYjcwZDZhNWJkZDhjNTdiZQ==
   data.tar.gz: !binary |-
-    NWEwZmNlOTE3MTFmNzczZjU4MzY2ZjVjZTMzOGM3M2U3OWQ0ZTE5Ng==
+    OWVkOTE1NGUyYWViNmYzZTliOGRiODlhNTM1NGQ0NThiYjkyOTg3OQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OWVkZWM3MmNlMjhlM2YzN2VlNGZkN2U5ZTViZjc5YmFjY2Y5NmRjMDA4ZmM5
-    Y2MwMmRmOGRhOGM0NzMyZmM2MjhmNGE0ZGRiMWZjMDI4N2RiZDJhM2FhY2Vj
-    MWE0NjM4MDAyYTAwMGE2NDMxOGFmYWMyMzBlYTY4N2E4ZTUyNjg=
+    YzUxMThkYmE1MTFhMjM2MGY2OGZjYzU1ZTlkZGEzNzg5NDNhMWUwMzIxMzRm
+    YjI0NTdmMWVlNjBmZGYzOWQ3YjQ5YjkxNjVkNjNlNjZmMzg4NjA4YWEwMDY2
+    NTZlZjYyNmNhNzJmNGE4NzZhMzk4MTIyMzBiM2Y0NTUyNjc4ODk=
   data.tar.gz: !binary |-
-    NTQ1ZjE0NDZkMmZiMjM3MzlmNGQxMTljNTVjMGRlZDg3YmVhNzljNzYxNzIx
-    NjM5MWQyNTYyMjUxNzAxMDFjNmY4NDY0NjhlZTA5OWQyNWE2YWI5MmQ2NDk1
-    OWU1ZTdjNDQ4NjZmNThjYTcxYzM3M2MyYWY0MDcyNzZjZjM4MTE=
+    YTA5Yzc2NDExNjMwMTk5M2Y4NjYzMzY5NDNlOGQ1NDgxM2U4Y2EwNTIyZWVk
+    M2EzOGViNDA2OGQzZmIwMTk1Nzk2NWYxN2JkNGI2ODFkNTFiOGI5OGQ4N2E0
+    NDRjODkxMjJkZGI2OGUwZmJlNGUwNDUxMmU0OGMxNWFlNGEzY2Q=

data/app/models/caboose_rets/commercial_property.rb

@@ -21,10 +21,7 @@ class CabooseRets::CommercialProperty < ActiveRecord::Base
   end
   
   def self.import_from_mls(mls_acct)
-    CabooseRets::RetsImporter.import("(MLS_ACCT=*#{mls_acct}*)", 'Property', 'COM')
-    return if !self.exists?(:id => mls_acct.to_i)
-    p = self.find(mls_acct.to_i)
-    CabooseRets::RetsImporter.download_property_images(p)
+    CabooseRets::RetsImporter.import_property(mls_acct)          
   end
   
   def parse(data)

data/app/models/caboose_rets/land_property.rb

@@ -21,10 +21,7 @@ class CabooseRets::LandProperty < ActiveRecord::Base
   end
   
   def self.import_from_mls(mls_acct)
-    CabooseRets::RetsImporter.import("(MLS_ACCT=*#{mls_acct}*)", 'Property', 'LND')
-    return if !self.exists?(:id => mls_acct.to_i)
-    p = self.find(mls_acct.to_i)
-    CabooseRets::RetsImporter.download_property_images(p)
+    CabooseRets::RetsImporter.import_property(mls_acct)          
   end
   
   def parse(data)

data/app/models/caboose_rets/multi_family_property.rb

@@ -21,10 +21,7 @@ class CabooseRets::MultiFamilyProperty < ActiveRecord::Base
   end
   
   def self.import_from_mls(mls_acct)
-    CabooseRets::RetsImporter.import("(MLS_ACCT=*#{mls_acct}*)", 'Property', 'MUL')
-    return if !self.exists?(:id => mls_acct.to_i)
-    p = self.find(mls_acct.to_i)
-    CabooseRets::RetsImporter.download_property_images(p)
+    CabooseRets::RetsImporter.import_property(mls_acct)          
   end
   
   def parse(data)

data/app/models/caboose_rets/residential_property.rb

@@ -21,10 +21,7 @@ class CabooseRets::ResidentialProperty < ActiveRecord::Base
   end
   
   def self.import_from_mls(mls_acct)
-    CabooseRets::RetsImporter.import("(MLS_ACCT=*#{mls_acct}*)", 'Property', 'RES')
-    return if !self.exists?(:id => mls_acct.to_i)
-    p = self.find(mls_acct.to_i)
-    CabooseRets::RetsImporter.download_property_images(p)
+    CabooseRets::RetsImporter.import_property(mls_acct)          
   end
   
   def parse(data)

data/app/models/caboose_rets/rets_importer.rb

@@ -106,9 +106,22 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
   # Data
   #=============================================================================
   
-  def self.import_property(mls_acct)
-    self.import("(MLS_ACCT=*#{mls_acct}*)", 'Property', 'RES')
-    p = CabooseRets::ResidentialProperty.find(mls_acct.to_i)
+  def self.import_property(mls_acct)    
+    p = nil
+    self.import("(MLS_ACCT=*#{mls_acct}*)", 'Property', 'RES')    
+    if !CabooseRets::ResidentialProperty.exists?(:id => mls_acct.to_i)
+      self.import("(MLS_ACCT=*#{mls_acct}*)", 'Property', 'COM')
+      p = CabooseRets::ResidentialProperty.where(:id => mls_acct.to_i).first      
+      if p.nil?
+        self.import("(MLS_ACCT=*#{mls_acct}*)", 'Property', 'LND')
+        p = CabooseRets::LandProperty.where(:id => mls_acct.to_i).first
+        if p.nil?
+          self.import("(MLS_ACCT=*#{mls_acct}*)", 'Property', 'MUL')
+          p = CabooseRets::MultiFamilyProperty.where(:id => mls_acct.to_i).first
+          return if p.nil?
+        end
+      end
+    end
     self.download_property_images(p)
   end
   

data/app/views/caboose_rets/rets/admin_import_form.html.erb

@@ -3,12 +3,6 @@
 <form action='/admin/rets/import' method='post' id='import_form' onsubmit="import_property(); return false;">
 <input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>' />
 <p><input type='text' name='mls_acct' id='mls_acct' placeholder='MLS #' value="" style='width: 300px;' /></p>
-<p><select name='type'>
-  <option value='RES'>Residential</option>
-  <option value='COM'>Commercial</option>
-  <option value='LND'>Land</option>
-  <option value='MUL'>Multi-Family</option>
-</select></p>
 <div id='message'></div>
 <p><input type='submit' value='Import Property' /></p>
 </form>

data/lib/caboose_rets/version.rb

@@ -1,3 +1,3 @@
 module CabooseRets
-  VERSION = '0.0.44'
+  VERSION = '0.0.45'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-rets
 version: !ruby/object:Gem::Version
-  version: 0.0.44
+  version: 0.0.45
 platform: ruby
 authors:
 - William Barry