analytics-ruby 2.2.3.pre → 2.2.4.pre

data/spec/segment/analytics/worker_spec.rb

@@ -3,11 +3,14 @@ require 'spec_helper'
 module Segment
   class Analytics
     describe Worker do
-      describe "#init" do
+      describe '#init' do
         it 'accepts string keys' do
           queue = Queue.new
-          worker = Segment::Analytics::Worker.new(queue, 'secret', 'batch_size' => 100)
-          expect(worker.instance_variable_get(:@batch_size)).to eq(100)
+          worker = Segment::Analytics::Worker.new(queue,
+                                                  'secret',
+                                                  'batch_size' => 100)
+          batch = worker.instance_variable_get(:@batch)
+          expect(batch.instance_variable_get(:@max_message_count)).to eq(100)
         end
       end
 
@@ -35,25 +38,29 @@ module Segment
           end.to_not raise_error
         end
 
-        it 'executes the error handler, before the request phase ends, if the request is invalid' do
-          Segment::Analytics::Request.any_instance.stub(:post).and_return(Segment::Analytics::Response.new(400, "Some error"))
+        it 'executes the error handler if the request is invalid' do
+          Segment::Analytics::Request
+            .any_instance
+            .stub(:post)
+            .and_return(Segment::Analytics::Response.new(400, 'Some error'))
 
           status = error = nil
-          on_error = Proc.new do |yielded_status, yielded_error|
+          on_error = proc do |yielded_status, yielded_error|
             sleep 0.2 # Make this take longer than thread spin-up (below)
             status, error = yielded_status, yielded_error
           end
 
           queue = Queue.new
           queue << {}
-          worker = Segment::Analytics::Worker.new queue, 'secret', :on_error => on_error
+          worker = described_class.new(queue, 'secret', :on_error => on_error)
 
-          # This is to ensure that Client#flush doesn’t finish before calling the error handler.
+          # This is to ensure that Client#flush doesn't finish before calling
+          # the error handler.
           Thread.new { worker.run }
           sleep 0.1 # First give thread time to spin-up.
           sleep 0.01 while worker.is_requesting?
 
-          Segment::Analytics::Request::any_instance.unstub(:post)
+          Segment::Analytics::Request.any_instance.unstub(:post)
 
           expect(queue).to be_empty
           expect(status).to eq(400)
@@ -61,7 +68,7 @@ module Segment
         end
 
         it 'does not call on_error if the request is good' do
-          on_error = Proc.new do |status, error|
+          on_error = proc do |status, error|
             puts "#{status}, #{error}"
           end
 
@@ -69,7 +76,9 @@ module Segment
 
           queue = Queue.new
           queue << Requested::TRACK
-          worker = Segment::Analytics::Worker.new queue, 'testsecret', :on_error => on_error
+          worker = described_class.new(queue,
+                                       'testsecret',
+                                       :on_error => on_error)
           worker.run
 
           expect(queue).to be_empty
@@ -89,12 +98,11 @@ module Segment
           queue << Requested::TRACK
           worker = Segment::Analytics::Worker.new(queue, 'testsecret')
 
-          Thread.new do
-            worker.run
-            expect(worker.is_requesting?).to eq(false)
-          end
-
+          worker_thread = Thread.new { worker.run }
           eventually { expect(worker.is_requesting?).to eq(true) }
+
+          worker_thread.join
+          expect(worker.is_requesting?).to eq(false)
         end
       end
     end

data/spec/spec_helper.rb

@@ -1,5 +1,12 @@
+# https://github.com/codecov/codecov-ruby#usage
+require 'simplecov'
+SimpleCov.start
+require 'codecov'
+SimpleCov.formatter = SimpleCov::Formatter::Codecov
+
 require 'segment/analytics'
 require 'active_support/time'
+require './spec/helpers/runscope_client'
 
 # Setting timezone for ActiveSupport::TimeWithZone to UTC
 Time.zone = 'UTC'
@@ -18,7 +25,7 @@ module Segment
       }
     }
 
-    IDENTIFY =  {
+    IDENTIFY = {
       :traits => {
         :likes_animals => true,
         :instrument => 'Guitar',
@@ -77,6 +84,25 @@ module Segment
   end
 end
 
+# A worker that doesn't consume jobs
+class NoopWorker
+  def run
+    # Does nothing
+  end
+end
+
+# A backoff policy that returns a fixed list of values
+class FakeBackoffPolicy
+  def initialize(interval_values)
+    @interval_values = interval_values
+  end
+
+  def next_interval
+    raise 'FakeBackoffPolicy has no values left' if @interval_values.empty?
+    @interval_values.shift
+  end
+end
+
 # usage:
 # it "should return a result of 5" do
 #   eventually(options: {timeout: 1}) { long_running_thing.result.should eq(5) }
@@ -90,13 +116,13 @@ module AsyncHelper
     loop do
       begin
         yield
-      rescue => error
+        return
+      rescue RSpec::Expectations::ExpectationNotMetError => error
+        raise error if Time.now >= time_limit
+        sleep interval
       end
-      return if error.nil?
-      raise error if Time.now >= time_limit
-      sleep interval
     end
   end
 end
 
-include AsyncHelper
+include AsyncHelper

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: analytics-ruby
 version: !ruby/object:Gem::Version
-  version: 2.2.3.pre
+  version: 2.2.4.pre
 platform: ruby
 authors:
 - Segment.io
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -70,22 +70,72 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.1.11
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.1.11
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+- !ruby/object:Gem::Dependency
+  name: pmap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 0.51.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.51.0
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
+        version: 0.1.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 0.1.4
 description: The Segment.io ruby analytics library
 email: friends@segment.io
 executables:
@@ -94,28 +144,34 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- Gemfile.lock
 - History.md
 - Makefile
 - README.md
 - RELEASING.md
 - Rakefile
-- analytics-ruby-2.0.13.gem
-- analytics-ruby-2.1.0.gem
-- analytics-ruby-2.2.2.gem
 - analytics-ruby.gemspec
 - bin/analytics
+- codecov.yml
+- lib/analytics-ruby.rb
 - lib/segment.rb
 - lib/segment/analytics.rb
+- lib/segment/analytics/backoff_policy.rb
 - lib/segment/analytics/client.rb
 - lib/segment/analytics/defaults.rb
 - lib/segment/analytics/logging.rb
+- lib/segment/analytics/message.rb
+- lib/segment/analytics/message_batch.rb
 - lib/segment/analytics/request.rb
 - lib/segment/analytics/response.rb
 - lib/segment/analytics/utils.rb
 - lib/segment/analytics/version.rb
 - lib/segment/analytics/worker.rb
+- spec/helpers/runscope_client.rb
+- spec/segment/analytics/backoff_policy_spec.rb
 - spec/segment/analytics/client_spec.rb
+- spec/segment/analytics/e2e_spec.rb
+- spec/segment/analytics/message_batch_spec.rb
+- spec/segment/analytics/message_spec.rb
 - spec/segment/analytics/request_spec.rb
 - spec/segment/analytics/response_spec.rb
 - spec/segment/analytics/worker_spec.rb
@@ -141,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Segment.io analytics library

data/Gemfile.lock

@@ -1,43 +0,0 @@
-PATH
-  remote: .
-  specs:
-    analytics-ruby (2.2.2)
-      commander (~> 4.4)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.2.22)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    commander (4.4.3)
-      highline (~> 1.7.2)
-    diff-lcs (1.2.5)
-    highline (1.7.8)
-    i18n (0.7.0)
-    multi_json (1.11.2)
-    rake (10.4.2)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.4)
-    thread_safe (0.3.5)
-    tzinfo (1.2.1)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (>= 3.0.0, < 4.0.0)
-  analytics-ruby!
-  rake (~> 10.3)
-  rspec (~> 2.0)
-  tzinfo (= 1.2.1)
-
-BUNDLED WITH
-   1.15.4