ldclient-rb 0.0.10 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 587e55c3ef0efd34923cf2ad2bf2dec7e0246288
-  data.tar.gz: 1157e0acbe4b364ff1f6948945c72929b951068d
+  metadata.gz: 80585fb99df9069ece05ebb56d7bb8368daba554
+  data.tar.gz: 4e159d25726a447551f0b40dd53796b4a919027b
 SHA512:
-  metadata.gz: f0498d182b82a3ddf9943d33407797c03eb7e95dcdfe1a2d8a6009de9e48a60b8e0e755921d5fc10655e0e918f463395469291dc33c25d83dbe2309a1662d7a0
-  data.tar.gz: e4520dcc50c5999fff9f35a99678f0311b2b9ffe3cc60f7e97d56fd1ccf52eff92024ac53b484c71270c1cef6a3ef4734aaea15f1663d2f5d4d0124f7e2c1bc7
+  metadata.gz: 2664a3dc182dea123051ab19f34ef094c189c9f07bed2793de3681c5d11d229b4e86d5d3a7c276406023250b69293024432085f2cc03425770ee5fcc4c514ff2
+  data.tar.gz: 92711ce5b40245a1b4c153c069f0075e2ddde2a89e3769b8f00677c0c253de4b51c91f944af665b877d978aa72dd8d1db79a194fd9c4fbf88212c5a89c17457b

data/lib/ldclient-rb/ldclient.rb

@@ -5,6 +5,9 @@ require 'thread'
 require 'logger'
 
 module LaunchDarkly
+
+  BUILTINS = [:key, :ip, :country, :email, :firstName, :lastName, :avatar, :name]
+
   # 
   # A client for the LaunchDarkly API. Client instances are thread-safe. Users 
   # should create a single client instance for the lifetime of the application.
@@ -36,30 +39,39 @@ module LaunchDarkly
       @worker = create_worker()
     end
 
+    def flush()
+      events = []
+      num_events = @queue.length()
+      begin
+        num_events.times do 
+          events << @queue.pop(true)
+        end
+      rescue
+      end
+
+
+      if !events.empty?()
+        res =
+        @client.post (@config.base_uri + "/api/events/bulk") do |req|
+          req.headers['Authorization'] = 'api_key ' + @api_key
+          req.headers['User-Agent'] = 'RubyClient/' + LaunchDarkly::VERSION
+          req.headers['Content-Type'] = 'application/json'
+          req.body = events.to_json
+          req.options.timeout = @config.read_timeout          
+          req.options.open_timeout = @config.connect_timeout               
+        end
+        if res.status != 200
+          @config.logger.error("[LDClient] Unexpected status code while processing events: #{res.status}")
+        end
+      end      
+    end
+
+
     def create_worker()
       Thread.new do
         while true do
           begin
-            events = []
-            num_events = @queue.length()
-            num_events.times do 
-              events << @queue.pop()
-            end
-
-            if !events.empty?()
-              res =
-              @client.post (@config.base_uri + "/api/events/bulk") do |req|
-                req.headers['Authorization'] = 'api_key ' + @api_key
-                req.headers['User-Agent'] = 'RubyClient/' + LaunchDarkly::VERSION
-                req.headers['Content-Type'] = 'application/json'
-                req.body = events.to_json
-                req.options.timeout = @config.read_timeout          
-                req.options.open_timeout = @config.connect_timeout               
-              end
-              if res.status != 200
-                @config.logger.error("[LDClient] Unexpected status code while processing events: #{res.status}")
-              end
-            end
+            flush()
 
             sleep(@config.flush_interval)
           rescue Exception => exn
@@ -136,7 +148,7 @@ module LaunchDarkly
     # @param [Hash] The user to register
     # 
     def identify(user)
-      add_event({:kind => 'identify', :key => user.key, :user => user})
+      add_event({:kind => 'identify', :key => user[:key], :user => user})
     end
 
     def set_offline()
@@ -221,7 +233,7 @@ module LaunchDarkly
     def match_target?(target, user)
       attrib = target[:attribute].to_sym
 
-      if attrib == :key or attrib == :ip or attrib == :country
+      if BUILTINS.include?(attrib)
         if user[attrib]
           u_value = user[attrib]
           return target[:values].include? u_value
@@ -247,8 +259,19 @@ module LaunchDarkly
 
     end
 
+    def match_user?(variation, user)
+      if !!variation[:userTarget]
+        return match_target?(variation[:userTarget], user)
+      end
+      return false
+    end
+
     def match_variation?(variation, user)
       variation[:targets].each do |target|
+        if !!variation[:userTarget] and target[:attribute].to_sym == :key
+          next
+        end
+
         if match_target?(target, user)
           return true
         end
@@ -267,6 +290,12 @@ module LaunchDarkly
         return nil
       end
 
+      feature[:variations].each do |variation|
+        if match_user?(variation, user)
+          return variation[:value]
+        end
+      end
+
       feature[:variations].each do |variation|
         if match_variation?(variation, user)
           return variation[:value]
@@ -286,7 +315,7 @@ module LaunchDarkly
 
     end
 
-    private :add_event, :get_flag_int, :param_for_user, :match_target?, :match_variation?, :evaluate, :create_worker
+    private :add_event, :get_flag_int, :param_for_user, :match_target?, :match_user?, :match_variation?, :evaluate, :create_worker
 
 
   end

data/lib/ldclient-rb/version.rb

@@ -1,3 +1,3 @@
 module LaunchDarkly
-  VERSION = "0.0.10"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ldclient-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors:
 - Catamorphic Co
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler