caboose-rets 0.0.37 → 0.0.38

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjQ2MGMwMDQxY2M2ODI5MzAxNjc0N2NkMGJmNzUwZTA1ZGMyZjhjYw==
+    ZmU1ZGYzYTkwZjc4NDY4MjcyY2U1OTQ5M2YyNjY3NDQyNmYwODJmNg==
   data.tar.gz: !binary |-
-    NzEzMDdlODFmODkzODZkNTgxMDcxNmUzMWMxMjZlOTEzMzIwYzgxOA==
+    ZjU1OGJjMGExNmQ1ZTlmZGUzNTkyYmNlZGJkOTE0MjNlZDc4NzhlMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzNmMGM5ZmFiYWIxNTUzOTdmMGJhZjQyOGQwYjU3ZTE0ZWEzNjk1ODgyMTc4
-    NTUxZjFlNjkxZWYxYTFjMGRiZGE2MDY2NzU2OTljMDZiYTE0MjAxMjY0MWUw
-    YzJmZGRmODY4MTFkYjliMGY1YjRjZTBhZGYxYzgzMGE0YTkwZTU=
+    NzE1NzI4MWE3ZTc0NzVmNWZjNTJhMmM1NDMzYzI0NTQwNTQ0NjZjOWNlMTIy
+    MmI0MTA0YjllZmQ5NThkOTMwZDExZWExMTBlNzU2ZTdmZjhiMGE5Y2QzMzM4
+    Y2NlNzI2M2IwMWNlM2I3ODAyZmM3MmE1ZDkxMDE3NzVkYmZlYzQ=
   data.tar.gz: !binary |-
-    Y2NmYzg1MThiYWM1YzdjNzI3Nzk4MWRjYzE2MDY2MWMwMDNkYzYzZTVlNDAw
-    YTRlNmVlMzUxZTExMjMzZDFlOTAwZDI2YmUyNWY4ODE3MWRmMjc0NTEzODcx
-    N2VkZDAyMDNjN2EwNmU5ZWZjZDQxNTVjNTQxNDQyNjUzZjFjNWQ=
+    ZTY2ZDRjYjczODAwM2U2YzBmZmUzMmRmMjJiNzA5ZmZlNTQ3ODdkOGMzNjk3
+    OTNhNWRlYmVjYzVmMjk4YWE3YzVhMmJlMzRkZmZhYzY0NjEyYTU3MDFlODAx
+    YjE1YjE5ZDgwZmE4NzM1Njc2MWYxY2E2N2U2MWE3NmFkMzhiNDM=

data/app/controllers/caboose_rets/agents_controller.rb

@@ -22,8 +22,8 @@ module CabooseRets
     # GET /agents/:la_code/listings
     def listings
       @agent = Agent.where(:la_code => params[:la_code]).first
-      is_agents = "la_code = ? AND (status = 'Active' OR status = 'Pending')"
-      is_coagents = "co_la_code = ? AND (status = 'Active' OR status = 'Pending')"
+      is_agents = "la_code = ? AND status = 'Active'"
+      is_coagents = "co_la_code = ? AND status = 'Active'"
   
       residential_properties = ResidentialProperty.where(is_agents, params[:la_code])
       residential_properties += ResidentialProperty.where(is_coagents, params[:la_code]).select{ |p| defined? p && p.mls_acct }

data/app/models/caboose_rets/agent.rb

@@ -10,6 +10,7 @@ class CabooseRets::Agent < ActiveRecord::Base
       :thumb => '100x150>',
       :large => '200x300>'
     }
+  do_not_validate_attachment_file_type :image
   after_initialize :fix_name
   
   def assistants

data/app/models/caboose_rets/media.rb

@@ -2,7 +2,8 @@
 class CabooseRets::Media < ActiveRecord::Base
   self.table_name = "rets_media"
   
-  has_attached_file :file, :path => 'rets/media/:mls_acct_:id.:extension' 
+  has_attached_file :file, :path => 'rets/media/:mls_acct_:id.:extension'
+  do_not_validate_attachment_file_type :file
   has_attached_file :image, 
     :path => 'rets/media/:mls_acct_:media_order_:style.:extension', 
     :styles => {
@@ -10,6 +11,7 @@ class CabooseRets::Media < ActiveRecord::Base
       :thumb => '400x300>',
       :large => '640x480>'
     }
+  do_not_validate_attachment_file_type :image
   attr_accessible :date_modified, :file_name, :media_id, :media_order, :media_remarks, :media_type, :mls_acct, :url
   
   def parse(data)

data/app/models/caboose_rets/rets_importer.rb

@@ -90,7 +90,7 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
     self.import_modified_after(date_modified, 'Agent'     , 'AGT')
     self.import_modified_after(date_modified, 'Office'    , 'OFF')
     self.import_modified_after(date_modified, 'OpenHouse' , 'OPH')        
-    self.import_modified_after(date_modified, 'Property'  , 'COM')
+    #self.import_modified_after(date_modified, 'Property'  , 'COM')
     self.import_modified_after(date_modified, 'Property'  , 'LND')
     self.import_modified_after(date_modified, 'Property'  , 'MUL')
     self.import_modified_after(date_modified, 'Property'  , 'RES')
@@ -106,6 +106,12 @@ 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)
+    self.download_property_images(p)
+  end
+  
   def self.import_modified_after(date_modified, search_type = nil, class_type = nil)
     self.get_config if @@config.nil? || @@config['url'].nil?
                 
@@ -158,11 +164,17 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
       }
       obj = nil
       self.client.search(params) do |data|        
-        m = @@models[class_type].constantize
+        m = @@models[class_type]
         #key_field = @@key_fields[search_type]
         #id = data[key_field].to_i
         #obj = m.exists?(id) ? m.find(id) : m.new
         obj = self.get_instance_with_id(m, data)
+        if obj.nil?
+          puts "Error: object is nil"
+          puts m.inspect
+          puts data.inspect
+          next
+        end
         obj.parse(data)
         #obj.id = id
         obj.save        
@@ -175,19 +187,20 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
     end
   end
   
-  def self.get_instance_with_id(model, data)
-    m = nil
+  def self.get_instance_with_id(model, data)            
+    obj = nil
+    m = model.constantize
     case model
-      when CabooseRets::OpenHouse             then m = model.where(:id       => data['ID']            ).exists? ? model.where(:id       => data['ID']            ).first : model.new(:id       => data['ID']            )
-      when CabooseRets::Media                 then m = model.where(:media_id => data['MEDIA_ID']      ).exists? ? model.where(:media_id => data['MEDIA_ID']      ).first : model.new(:media_id => data['MEDIA_ID']      )
-      when CabooseRets::CommercialProperty    then m = model.where(:id       => data['MLS_ACCT'].to_i ).exists? ? model.where(:id       => data['MLS_ACCT'].to_i ).first : model.new(:id       => data['MLS_ACCT'].to_i )
-      when CabooseRets::LandProperty          then m = model.where(:id       => data['MLS_ACCT'].to_i ).exists? ? model.where(:id       => data['MLS_ACCT'].to_i ).first : model.new(:id       => data['MLS_ACCT'].to_i )   
-      when CabooseRets::MultiFamilyProperty   then m = model.where(:id       => data['MLS_ACCT'].to_i ).exists? ? model.where(:id       => data['MLS_ACCT'].to_i ).first : model.new(:id       => data['MLS_ACCT'].to_i )   
-      when CabooseRets::ResidentialProperty   then m = model.where(:id       => data['MLS_ACCT'].to_i ).exists? ? model.where(:id       => data['MLS_ACCT'].to_i ).first : model.new(:id       => data['MLS_ACCT'].to_i )   
-      when CabooseRets::Agent                 then m = model.where(:la_code  => data['LA_LA_CODE']    ).exists? ? model.where(:la_code  => data['LA_LA_CODE']    ).first : model.new(:la_code  => data['LA_LA_CODE']    )
-      when CabooseRets::Office                then m = model.where(:lo_code  => data['LO_LO_CODE']    ).exists? ? model.where(:lo_code  => data['LO_LO_CODE']    ).first : model.new(:lo_code  => data['LO_LO_CODE']    )
+      when 'CabooseRets::OpenHouse'             then obj = m.where(:id       => data['ID'].to_i       ).exists? ? m.where(:id       => data['ID'].to_i       ).first : m.new(:id       => data['ID'].to_i       )
+      when 'CabooseRets::Media'                 then obj = m.where(:media_id => data['MEDIA_ID']      ).exists? ? m.where(:media_id => data['MEDIA_ID']      ).first : m.new(:media_id => data['MEDIA_ID']      )
+      when 'CabooseRets::CommercialProperty'    then obj = m.where(:id       => data['MLS_ACCT'].to_i ).exists? ? m.where(:id       => data['MLS_ACCT'].to_i ).first : m.new(:id       => data['MLS_ACCT'].to_i )
+      when 'CabooseRets::LandProperty'          then obj = m.where(:id       => data['MLS_ACCT'].to_i ).exists? ? m.where(:id       => data['MLS_ACCT'].to_i ).first : m.new(:id       => data['MLS_ACCT'].to_i )   
+      when 'CabooseRets::MultiFamilyProperty'   then obj = m.where(:id       => data['MLS_ACCT'].to_i ).exists? ? m.where(:id       => data['MLS_ACCT'].to_i ).first : m.new(:id       => data['MLS_ACCT'].to_i )   
+      when 'CabooseRets::ResidentialProperty'   then obj = m.where(:id       => data['MLS_ACCT'].to_i ).exists? ? m.where(:id       => data['MLS_ACCT'].to_i ).first : m.new(:id       => data['MLS_ACCT'].to_i )   
+      when 'CabooseRets::Agent'                 then obj = m.where(:la_code  => data['LA_LA_CODE']    ).exists? ? m.where(:la_code  => data['LA_LA_CODE']    ).first : m.new(:la_code  => data['LA_LA_CODE']    )
+      when 'CabooseRets::Office'                then obj = m.where(:lo_code  => data['LO_LO_CODE']    ).exists? ? m.where(:lo_code  => data['LO_LO_CODE']    ).first : m.new(:lo_code  => data['LO_LO_CODE']    )
     end
-    return m    
+    return obj    
   end
   
   #=============================================================================

data/lib/caboose_rets/version.rb

@@ -1,3 +1,3 @@
 module CabooseRets
-  VERSION = '0.0.37'
+  VERSION = '0.0.38'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-rets
 version: !ruby/object:Gem::Version
-  version: 0.0.37
+  version: 0.0.38
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms