caboose-rets 0.1.36 → 0.1.37

data/lib/caboose_rets/version.rb

@@ -1,3 +1,3 @@
 module CabooseRets
-  VERSION = '0.1.36'
+  VERSION = '0.1.37'
 end

data/lib/rets/base/core.rb

@@ -243,6 +243,7 @@ module RETS
       # @see #request_size
       # @see #request_hash
       def search(args, &block)
+     #   puts "starting search..."
         if !block_given? and args[:count_mode] != :only
           raise ArgumentError, "No block found"
         end
@@ -264,8 +265,11 @@ module RETS
 
         @request_size, @request_hash, @request_time, @rets_data = nil, nil, nil, {}
 
+     #   puts "req: #{req.to_s}"
+
         start = Time.now.utc.to_f
         @http.request(req) do |response|
+    #      puts "URL: #{req[:url]}"
           if args[:disable_stream]
             stream = StringIO.new(response.body)
             @request_time = Time.now.utc.to_f - start

data/lib/rets/client.rb

@@ -63,7 +63,7 @@ module RETS
       end
 
       http.login_uri = urls[:login]
-
+   #   puts "URLS: #{urls.to_s}"
       RETS::Base::Core.new(http, urls)
     end
   end

data/lib/rets/http.rb

@@ -8,7 +8,7 @@ module RETS
     ##
     # Creates a new HTTP instance which will automatically handle authenting to the RETS server.
     def initialize(args)
-      @headers = {"User-Agent" => "Ruby RETS/v#{RETS::VERSION}", "Accept-Encoding" => "none"}
+      @headers = {"User-Agent" => "Ruby RETS/v#{RETS::VERSION}", "Accept-Encoding" => "none", "RETS-Version" => "1.8.0"}
       @request_count = 0
       @config = {:http => {}}.merge(args)
       @rets_data, @cookie_list = {}, {}
@@ -135,7 +135,7 @@ module RETS
           text = attr.last.value
         end
       end
-
+  #    puts "replycode: #{code}"
       return code, text
     end
 
@@ -179,6 +179,8 @@ module RETS
         request_uri = args[:url].request_uri
       end
 
+      request_uri = request_uri[0..-2] if request_uri[-1] == '&'
+
       headers = args[:headers]
 
       # Digest will change every time due to how its setup
@@ -204,6 +206,9 @@ module RETS
         http.ca_path = @config[:http][:ca_path] if @config[:http][:ca_path]
       end
 
+      puts "request_uri: #{request_uri}"
+  #    puts "headers: #{headers.to_s}"
+
       http.start do
         http.request_get(request_uri, headers) do |response|
           # Pass along the cookies
@@ -234,6 +239,10 @@ module RETS
             end
           end
 
+          # puts "response.code: #{response.code}"
+          # puts "response.body: #{response.body}"
+          # puts "response.message: #{response.message}"
+
           # Rather than returning HTTP 401 when User-Agent authentication is needed, Retsiq returns HTTP 200
           # with RETS error 20037. If we get a 20037, will let it pass through and handle it as if it was a HTTP 401.
           # Retsiq apparently returns a 20041 now instead of a 20037 for the same use case.
@@ -241,12 +250,13 @@ module RETS
           rets_code = nil
           if response.code != "401" and ( response.code != "200" or args[:check_response] )
             if response.body =~ /<RETS/i
+        #      puts "found RETS in response body"
               rets_code, text = self.get_rets_response(Nokogiri::XML(response.body).xpath("//RETS").first)
               unless rets_code == "20037" or rets_code == "20041" or rets_code == "20052" or rets_code == "0"
                 raise RETS::APIError.new("#{rets_code}: #{text}", rets_code, text)
               end
-
             elsif !args[:check_response]
+       #       puts "didn't find RETS in response body and check_response is false"
               raise RETS::HTTPError.new("#{response.code}: #{response.message}", response.code, response.message)
             end
           end

data/lib/tasks/caboose_rets.rake

@@ -13,26 +13,29 @@ namespace :caboose_rets do
   desc "Do a simple search"
   task :simple_search => :environment do
     type = ['p','a','o','oh']
-    rets_config = CabooseRets::RetsConfig.where("rets_url ILIKE ?","%mlsmatrix%").order('RANDOM()').first
+    @@config = nil
+    config = YAML::load(File.open("#{Rails.root}/config/rets_importer.yml"))    
+    config = config[Rails.env]
+    config.each { |key,val| @@config[key] = val }
     client = RETS::Client.login(
-      :url      => rets_config.rets_url,
-      :username => rets_config.rets_username,
-      :password => rets_config.rets_password
+      :url      => config['url'],
+      :username => config['username'],
+      :password => config['password']
     )
     type.each do |t|
       if t == 'p'
         params = {
           :search_type => 'Property',
-          :class       => 'Listing',
-          :query       => "(Matrix_Unique_ID=0+)",
-          :limit       => 100,
+          :class       => 'Property',
+          :query       => "(MlsStatus=Active)",
+          :limit       => 1,
           :timeout     => -1
         }
       elsif t == 'a'      
         params = {
-          :search_type => 'Agent',
-          :class       => 'Agent',
-          :query       => "(Matrix_Unique_ID=0+)",
+          :search_type => 'Member',
+          :class       => 'Member',
+          :query       => "(MemberStatus=Active)",
           :limit       => 1,
           :timeout     => -1
         }
@@ -40,7 +43,7 @@ namespace :caboose_rets do
         params = {
           :search_type => 'Office',
           :class       => 'Office',
-          :query       => "(Matrix_Unique_ID=0+)",
+          :query       => "(OfficeStatus=Active)",
           :limit       => 1,
           :timeout     => -1
         }
@@ -48,7 +51,7 @@ namespace :caboose_rets do
         params = {
           :search_type => 'OpenHouse',
           :class       => 'OpenHouse',
-          :query       => "(Matrix_Unique_ID=0+)",
+          :query       => "(OpenHouseKeyNumeric=0+)",
           :limit       => 1,
           :timeout     => -1
         }
@@ -69,36 +72,37 @@ namespace :caboose_rets do
   task :reimport_property_images => :environment do
     props = CabooseRets::Property.all
     props.each do |p|
-      CabooseRets::RetsImporter.log("- Reimporting images for #{p.matrix_unique_id}...")
-      CabooseRets::Media.where(:media_mui => p.matrix_unique_id, :media_type => 'Photo').destroy_all
+      CabooseRets::RetsImporter.log("- Reimporting images for #{p.mls_number}...")
+      CabooseRets::Media.where(:media_mui => p.mls_number, :media_type => 'Photo').destroy_all
       CabooseRets::RetsImporter.download_property_images(p)
     end
   end
 
   desc "Import rets data"
   task :import => :environment do
-    CabooseRets::RetsImporter.import('Agent'    , "(Matrix_Unique_ID=0+)")
-    CabooseRets::RetsImporter.import('Listing'  , "(Matrix_Unique_ID=0+)")
-    CabooseRets::RetsImporter.import('Office'   , "(Matrix_Unique_ID=0+)")    
-    CabooseRets::RetsImporter.import('OpenHouse', "(Matrix_Unique_ID=0+)")
+    CabooseRets::RetsImporter.import('Member'    , "(MemberStatus=Active)")
+    CabooseRets::RetsImporter.import('Property'  , "(MlsStatus=Active)")
+    CabooseRets::RetsImporter.import('Office'    , "(OfficeStatus=Active)")    
+    CabooseRets::RetsImporter.import('OpenHouse' , "(OpenHouseKeyNumeric=0+)")
   end
   
   desc "Single Import Test"
   task :import_one => :environment do
-    CabooseRets::RetsImporter.import_properties('9468475'  , "(Matrix_Unique_ID=9468475)")
+    #CabooseRets::RetsImporter.import_properties('130185',false)
+    CabooseRets::RetsImporter.import_agent('118596368',false)
   end
 
   desc "Purge rets data"
   task :purge => :environment do
-    CabooseRets::RetsImporter.purge_helper('Listing', '2013-08-06')
+    CabooseRets::RetsImporter.purge_helper('Property', '2013-08-06')
     CabooseRets::RetsImporter.purge_helper('Office', '2012-01-01')
-    CabooseRets::RetsImporter.purge_helper('Agent', '2012-01-01')
+    CabooseRets::RetsImporter.purge_helper('Member', '2012-01-01')
     CabooseRets::RetsImporter.purge_helper('OpenHouse', '2012-01-01')
   end
 
   desc "update helper"
   task :uh => :environment do
-    CabooseRets::RetsImporter.update_helper('Listing', last_updated)
+    CabooseRets::RetsImporter.update_helper('Property', last_updated)
   end
 
   #desc "Delete old rets properties"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-rets
 version: !ruby/object:Gem::Version
-  version: 0.1.36
+  version: 0.1.37
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-13 00:00:00.000000000 Z
+date: 2018-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms