rollout_ui2 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64002c1fb49d0e15c4fec912f5960dd86b9af94d
-  data.tar.gz: 797c8dfcea7849943abd07c1ea72532ebfe7c94c
+  metadata.gz: ce907ff7bbb649b20c8be24096131a1974de42c6
+  data.tar.gz: 834521e842e1738ffb7f985e1834b4e75ca5ba16
 SHA512:
-  metadata.gz: 5c7249d7ad063ad68fc1ebda86a74eec6a5ea2c1ebf69f3043332ec131c82c31377f92d154450852da9acd22612f8d458dd7b2e8b02047eacefc0c92ec7693f0
-  data.tar.gz: da1213298d6d5d02ec7fd69e00092a44d4700053f15e025fd8d1fcec7bbe060ba1fe2a51bbb8e88296d4d73b685843dc16cb3bef71f06a1b4f9a84cc0c148a27
+  metadata.gz: 23819008cfddccef9e4ce3b451a67a622dbc297092eef6a8e5b76f8ea13c8eb9127dc0f29df33f8213b241904552fe02bebcf4080780309d8ae730d5066eeb70
+  data.tar.gz: ae19ec26f138269cfaed6b63362182c843dbe4b832eabf928c1dcf2523476ad0bbfcc832dea9703c203c8089d9e74cb6f4b3ae65320b5150d382661e5ae1d244

data/lib/rollout_ui2.rb

@@ -49,10 +49,6 @@ module RolloutUi2
       rollout.deactivate(feature.name)
     end
 
-    def groups
-
-    end
-
     private
 
     def multi(keys)
@@ -91,13 +87,13 @@ module RolloutUi2
         return unless user && user != ""
         case key
         when :any
-          feature.active?(RolloutUi2.rollout, user)
+          feature.active?(RolloutUi2.rollout, current_user)
         when :percentage
           feature.feature.send(:user_in_percentage?, user) rescue nil
         when :user
           feature.feature.send(:user_in_active_users?, user) rescue nil
         when :group
-          feature.feature.send(:user_in_active_group?, user, RolloutUi2.rollout) rescue nil
+          feature.feature.send(:user_in_active_group?, current_user, RolloutUi2.rollout) rescue nil
         end && yield || nil
       end
 
@@ -105,6 +101,14 @@ module RolloutUi2
         params[:user]
       end
 
+      def current_user
+        @_current_user ||= if users_provided?
+                             RolloutUi2.finder.find(user)
+                           else
+                             user
+                           end
+      end
+
       def all_groups(features)
         defined_groups = RolloutUi2.rollout.instance_eval("@groups").keys rescue []
         defined_groups | features.reduce([]) { |a, e| a | e.groups }
@@ -141,7 +145,7 @@ module RolloutUi2
         return users unless users_provided?
         RolloutUi2
           .finder
-          .find_by_id(Array(users))
+          .find_by_ids(Array(users))
           .map { |it| it.merge!(selected: true, placeholder: it[:text]) }
           .to_json
       end

data/lib/rollout_ui2/version.rb

@@ -1,3 +1,3 @@
 module RolloutUi2
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollout_ui2
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Manuel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -161,4 +161,3 @@ signing_key:
 specification_version: 4
 summary: WebUI for rollout 2
 test_files: []
-has_rdoc: