prepare 6.1.1 release (#174)

Author: LaunchDarklyCI

.gitignore

@@ -13,3 +13,4 @@
 mkmf.log
 *.gem
 .DS_Store
+Gemfile.lock

Gemfile.lock

@@ -45,7 +45,7 @@ jobs:
           workingDirectory: $(System.DefaultWorkingDirectory)
           script: |
             ruby -v
-            gem install bundler:2.2.7
+            gem install bundler
             bundle install
             mkdir rspec
             bundle exec rspec --format progress --format RspecJunitFormatter -o ./rspec/rspec.xml spec

azure-pipelines.yml

@@ -443,15 +443,15 @@ def make_output_event(event)
         if @inline_users || is_debug
           out[:user] = process_user(event)
         else
-          out[:userKey] = event[:user].nil? ? nil : event[:user][:key]
+          out[:userKey] = event[:user][:key]
         end
         out[:reason] = event[:reason] if !event[:reason].nil?
         out
       when "identify"
         {
           kind: "identify",
           creationDate: event[:creationDate],
-          key: event[:user].nil? ? nil : event[:user][:key].to_s,
+          key: event[:user][:key].to_s,
           user: process_user(event)
         }
       when "custom"
@@ -464,7 +464,7 @@ def make_output_event(event)
         if @inline_users
           out[:user] = process_user(event)
         else
-          out[:userKey] = event[:user].nil? ? nil : event[:user][:key]
+          out[:userKey] = event[:user][:key]
         end
         out[:metricValue] = event[:metricValue] if event.has_key?(:metricValue)
         out[:contextKind] = event[:contextKind] if event.has_key?(:contextKind)

lib/ldclient-rb/events.rb

@@ -401,6 +401,12 @@ def evaluate_internal(key, user, default, event_factory)
         return Evaluator.error_result(EvaluationReason::ERROR_CLIENT_NOT_READY, default)
       end
 
+      unless user
+        @config.logger.error { "[LDClient] Must specify user" }
+        detail = Evaluator.error_result(EvaluationReason::ERROR_USER_NOT_SPECIFIED, default)
+        return detail
+      end
+
       if !initialized?
         if @store.initialized?
           @config.logger.warn { "[LDClient] Client has not finished initializing; using last known values from feature store" }
@@ -421,13 +427,6 @@ def evaluate_internal(key, user, default, event_factory)
         return detail
       end
 
-      unless user
-        @config.logger.error { "[LDClient] Must specify user" }
-        detail = Evaluator.error_result(EvaluationReason::ERROR_USER_NOT_SPECIFIED, default)
-        @event_processor.add_event(event_factory.new_default_event(feature, user, default, detail.reason))
-        return detail
-      end
-
       begin
         res = @evaluator.evaluate(feature, user, event_factory)
         if !res.events.nil?

lib/ldclient-rb/ldclient.rb

@@ -145,19 +145,11 @@ def event_processor
       client.variation("key", user, "default")
     end
 
-    it "queues a feature event for an existing feature when user is nil" do
+    it "does not send an event if user is nil" do
       config.feature_store.init({ LaunchDarkly::FEATURES => {} })
       config.feature_store.upsert(LaunchDarkly::FEATURES, feature_with_value)
-      expect(event_processor).to receive(:add_event).with(hash_including(
-        kind: "feature",
-        key: "key",
-        version: 100,
-        user: nil,
-        value: "default",
-        default: "default",
-        trackEvents: true,
-        debugEventsUntilDate: 1000
-      ))
+      expect(event_processor).not_to receive(:add_event)
+      expect(logger).to receive(:error)
       client.variation("key", nil, "default")
     end
 
@@ -313,6 +305,14 @@ def event_processor
       ))
       client.variation_detail("key", user, "default")
     end
+
+    it "does not send an event if user is nil" do
+      config.feature_store.init({ LaunchDarkly::FEATURES => {} })
+      config.feature_store.upsert(LaunchDarkly::FEATURES, feature_with_value)
+      expect(event_processor).not_to receive(:add_event)
+      expect(logger).to receive(:error)
+      client.variation_detail("key", nil, "default")
+    end
   end
 
   describe '#all_flags' do