intercom-rails 0.2.19 → 0.2.20

data/lib/intercom-rails/import.rb

@@ -15,7 +15,7 @@ module IntercomRails
       new(*args).run
     end
 
-    attr_reader :uri, :http
+    attr_reader :uri, :http, :max_batch_size
     attr_accessor :failed, :total_sent
 
     def initialize(options = {})
@@ -23,6 +23,7 @@ module IntercomRails
       @http = Net::HTTP.new(@uri.host, @uri.port)
       @failed = []
       @total_sent = 0
+      @max_batch_size = [(options[:max_batch_size] || 100), 100].min
 
       @status_enabled = !!options[:status_enabled]
 
@@ -58,7 +59,7 @@ module IntercomRails
     def run
       assert_runnable
 
-      info "Sending users in batches of #{MAX_BATCH_SIZE}:"
+      info "Sending users in batches of #{max_batch_size}:"
       batches do |batch, number_in_batch|
         failures = send_users(batch)['failed']
         self.failed += failures
@@ -78,17 +79,17 @@ module IntercomRails
     end
 
     private
-    MAX_BATCH_SIZE = 100
+
     def batches
       if active_record?(user_klass)
-        user_klass.find_in_batches(:batch_size => MAX_BATCH_SIZE) do |users|
+        user_klass.find_in_batches(:batch_size => max_batch_size) do |users|
           users_for_wire = map_to_users_for_wire(users)
 
           yield(prepare_batch(users_for_wire), users_for_wire.count) unless users_for_wire.count.zero?
         end
       elsif mongoid?(user_klass)
-        0.step(user_klass.all.count, MAX_BATCH_SIZE) do |offset|
-          users_for_wire = map_to_users_for_wire(user_klass.limit(MAX_BATCH_SIZE).skip(offset))
+        0.step(user_klass.all.count, max_batch_size) do |offset|
+          users_for_wire = map_to_users_for_wire(user_klass.limit(max_batch_size).skip(offset))
           yield(prepare_batch(users_for_wire), users_for_wire.count) unless users_for_wire.count.zero?
         end
       end
@@ -145,7 +146,7 @@ module IntercomRails
 
       return response if successful_response?(response)
       perform_request(request, attempts + 1, :failed_response => response)
-    rescue Timeout::Error, Errno::ECONNREFUSED => e
+    rescue Timeout::Error, Errno::ECONNREFUSED, EOFError => e
       perform_request(request, attempts + 1, :exception => e)
     end
 

data/lib/intercom-rails/version.rb

@@ -1,3 +1,3 @@
 module IntercomRails
-  VERSION = "0.2.19"
+  VERSION = "0.2.20"
 end

data/test/intercom-rails/import_unit_test.rb

@@ -107,4 +107,19 @@ class ImportUnitTest < MiniTest::Unit::TestCase
     User.rspec_reset
   end
 
+  def test_max_batch_size_default
+    @import = IntercomRails::Import.new
+    assert_equal 100, @import.max_batch_size
+  end
+
+  def test_max_batch_size_settable
+    @import = IntercomRails::Import.new(:max_batch_size => 50)
+    assert_equal 50, @import.max_batch_size
+  end
+
+  def test_max_batch_size_hard_limit
+    @import = IntercomRails::Import.new(:max_batch_size => 101)
+    assert_equal 100, @import.max_batch_size
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intercom-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.20
   prerelease: 
 platform: ruby
 authors: