reso 0.1.5.3 → 0.1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c202e32239858f7328d6d4405ece6d57fc8b2eb2
-  data.tar.gz: 61689e070b733a8fb724d602f748fb55e57a2677
+  metadata.gz: 0158ffcc5ee57dbd9dad799714d6e9243a2a0fd0
+  data.tar.gz: ad6ff43d4dff5096cb6c8c39c71812e5527a478a
 SHA512:
-  metadata.gz: 6402750a552b05f4361dd74c27c24ba749266d0e653620302ee1b9a8461b3d82619bf4eaf6074ac9d7492c7114b0c9db4c3f1192be5cbc34ae062490a1b89008
-  data.tar.gz: 9dd9872160c71ad30605c667c14c145f820b8e3e65fecceff146b370046f2cff1bd6b13175dcc95c791f3626213b6fdff1c14690a21a6ed3be7a2d62c788db7e
+  metadata.gz: bf2411a7ecda8969c36cca764e7a00dd2e5d571d7223b4d061cac7568576d239a7a3879c48bd2675ad57c762869c9cd18a2ef802a7c36e820addaf5e2f0c9710
+  data.tar.gz: d767028deaefd8b65230d4be186bda89324f9c1a7592d3dd73cdaf53bd8a184f2133fbd6dc355a9157eba9f04b5cf323b7da47352b2212390a0fcb16e5df41e9

data/app/models/import.rb

@@ -49,7 +49,7 @@ class Import < ActiveRecord::Base
         source_data_modified = self.source_url_last_modified
         self.update_attribute(:source_data_modified, source_data_modified)
 
-        l, count, found_listing_keys, snapshots, stream = 0, 0, [], [], ''
+        listing_count, count, found_listing_keys, snapshots, stream = 0, 0, [], [], ''
         open_tag, close_tag = get_open_and_closing_tag_for self.repeating_element
 
         # Grab a file to work with
@@ -68,16 +68,16 @@ class Import < ActiveRecord::Base
             doc = Nokogiri::XML([xml_header, xml].join).remove_namespaces!
             found_listing_keys << create_queued_listing_and_return_listing_key(doc, self)
             stream.gsub!(xml, '')
-            if ((l += 1) % 100).zero?
+            if ((listing_count += 1) % 100).zero?
               GC.start
-              snapshots << [l, l/(Time.now - start_time)]
+              snapshots << [listing_count, listing_count/(Time.now - start_time)]
               import_result.update_attribute(:snapshots, snapshots)
-              import_result.update_attribute(:found_listing_keys, found_listing_keys)
+              import_result.update_attribute(:found_listing_keys, found_listing_keys) unless listing_count > 10000
               puts snapshots.last.inspect if Rails.env.development?
             end
           end
         end
-        snapshots << [l, l/(Time.now - start_time)]
+        snapshots << [listing_count, listing_count/(Time.now - start_time)]
         end_time = Time.now
         self.update_attribute(:status, :active)
         removed_listing_keys = self.remove_listings_not_present(found_listing_keys)

data/app/models/import_result.rb

@@ -1,6 +1,12 @@
 class ImportResult < ActiveRecord::Base
   belongs_to :import
+  enum status: [ :starting, :running, :finishing, :finished, :stalled, :aborted ]
   serialize :found_listing_keys
   serialize :removed_listing_keys
   serialize :snapshots
+  
+  def found_count_difference
+    previous_run = self.import.import_results.where(['start_time < ?', self.start_time]).order("start_time DESC").limit(1).first
+    previous_run.present? ? self.found_listing_keys.count - previous_run.found_listing_keys.count : nil
+  end
 end

data/lib/generators/reso/templates/create_import_results.rb

@@ -2,6 +2,7 @@ class CreateImportResults < ActiveRecord::Migration
   def change
     create_table :import_results do |t|
       t.references  :import, index: true, foreign_key: true
+      t.integer     :status, default: 0
       t.datetime    :source_data_modified
       t.datetime    :start_time
       t.datetime    :end_time

data/lib/reso/version.rb

@@ -1,3 +1,3 @@
 module Reso
-  VERSION = "0.1.5.3"
+  VERSION = "0.1.5.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reso
 version: !ruby/object:Gem::Version
-  version: 0.1.5.3
+  version: 0.1.5.4
 platform: ruby
 authors:
 - Michael Edlund
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake