rollout_ui2 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a202103c0ae6445adcba865e7fdeb391e4b7cbe
-  data.tar.gz: 7c5de71b01e84d0dbbe004401959509962a24633
+  metadata.gz: 64002c1fb49d0e15c4fec912f5960dd86b9af94d
+  data.tar.gz: 797c8dfcea7849943abd07c1ea72532ebfe7c94c
 SHA512:
-  metadata.gz: d130d972401708102c4e3678ae5a2d27166d6d577a8970c3f2b0e762fe7c01db991597aed9743e883734a9a7569ce24868c15798b98366afa965b9c0c66c172c
-  data.tar.gz: 152d123daabe0f7af2a594de57254acf9a1aea5c56d8ad2d6b1dd5a1464669e53772f7872c2a252d2479678920aa842f28db03062453093b7745023dfa76cbfb
+  metadata.gz: 5c7249d7ad063ad68fc1ebda86a74eec6a5ea2c1ebf69f3043332ec131c82c31377f92d154450852da9acd22612f8d458dd7b2e8b02047eacefc0c92ec7693f0
+  data.tar.gz: da1213298d6d5d02ec7fd69e00092a44d4700053f15e025fd8d1fcec7bbe060ba1fe2a51bbb8e88296d4d73b685843dc16cb3bef71f06a1b4f9a84cc0c148a27

data/Rakefile

@@ -1,6 +1 @@
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec

data/example_rack/.ruby-version

@@ -0,0 +1 @@
+2.3.0

data/example_rack/Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+gem 'rerun'
+gem 'pry'
 gem 'redis'
 gem 'rollout', '>= 2.0.0'
 

data/example_rack/Gemfile.lock

@@ -1,28 +1,48 @@
 PATH
   remote: ..
   specs:
-    rollout_ui2 (0.1.1)
+    rollout_ui2 (0.2.0)
       sinatra (~> 1.4, >= 1.4.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.1)
+    ffi (1.9.14)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    method_source (0.8.2)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rack (1.6.5)
     rack-protection (1.5.3)
       rack
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.7)
+      ffi (>= 0.5.0)
     redis (3.3.2)
+    rerun (0.11.0)
+      listen (~> 3.0)
     rollout (2.4.0)
+    ruby_dep (1.5.0)
     sinatra (1.4.7)
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
+    slop (3.6.0)
     tilt (2.0.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  pry
   redis
+  rerun
   rollout (>= 2.0.0)
   rollout_ui2!
 

data/example_rack/config.ru

@@ -1,7 +1,55 @@
+require 'rollout'
 require 'rollout_ui2'
-
 require 'redis'
-RolloutUi2.wrap(Rollout.new(Redis.new))
+
+USERS = [ { id: 1,
+            text: "jimi.lepisto@example.com",
+            picture: "https://randomuser.me/api/portraits/thumb/men/21.jpg" },
+          { id: 2,
+            text: "emilia.koskinen@example.com",
+            picture: "https://randomuser.me/api/portraits/thumb/women/61.jpg" },
+          { id: 3,
+            text: "ron.perez@example.com",
+            picture: "https://randomuser.me/api/portraits/thumb/men/96.jpg" },
+          { id: 4,
+            text: "tim.carpenter@example.com",
+            picture: "https://randomuser.me/api/portraits/thumb/men/79.jpg" },
+          { id: 5,
+            text: "aatu.marttila@example.com",
+            picture: "https://randomuser.me/api/portraits/thumb/men/36.jpg" },
+          { id: 6,
+            text: "طاها.نكونظر@example.com",
+            picture: "https://randomuser.me/api/portraits/thumb/men/86.jpg" },
+          { id: 7,
+            text: "gabrielle.chu@example.com",
+            picture: "https://randomuser.me/api/portraits/thumb/women/40.jpg" },
+          { id: 8,
+            text: "hans.philipp@example.com",
+            picture: "https://randomuser.me/api/portraits/thumb/men/49.jpg" },
+          { id: 9,
+            text: "isabella.harris@example.com",
+            picture: "https://randomuser.me/api/portraits/thumb/women/32.jpg" },
+          { id: 10,
+            text: "stacey.olson@example.com",
+            picture: "https://randomuser.me/api/portraits/thumb/women/3.jpg" } ]
+
+class User
+  def self.find_by_id(ids)
+    USERS.select { |it| ids.include?(it[:id].to_s) }
+  end
+
+  def self.search(query, page)
+    result = USERS.select { |it| %r{#{query}} =~ it[:text] }
+    per_page = 3
+    {
+      results: result[(page-1) * per_page...page * per_page],
+      per_page: per_page,
+      total_count: result.count
+    }
+  end
+end
+
+RolloutUi2.wrap(Rollout.new(Redis.new)).with_finder(User)
 
 RolloutUi2::Server.use Rack::Auth::Basic do |user, pass|
   user == pass

data/lib/rollout_ui2/version.rb

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

data/lib/rollout_ui2.rb

@@ -4,8 +4,18 @@ require 'yaml'
 
 module RolloutUi2
   class << self
+    def with_finder(finder)
+      @finder = finder
+      self
+    end
+
+    def finder
+      @finder
+    end
+
     def wrap(rollout)
       @rollout = rollout
+      self
     end
 
     def store
@@ -39,6 +49,10 @@ module RolloutUi2
       rollout.deactivate(feature.name)
     end
 
+    def groups
+
+    end
+
     private
 
     def multi(keys)
@@ -73,8 +87,27 @@ module RolloutUi2
 
   class Server < Sinatra::Base
     helpers do
+      def active_for(feature, key, user)
+        return unless user && user != ""
+        case key
+        when :any
+          feature.active?(RolloutUi2.rollout, 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
+        end && yield || nil
+      end
+
+      def user
+        params[:user]
+      end
+
       def all_groups(features)
-        features.reduce([]) { |a, e| a | e.groups }
+        defined_groups = RolloutUi2.rollout.instance_eval("@groups").keys rescue []
+        defined_groups | features.reduce([]) { |a, e| a | e.groups }
       end
 
       def as_array(param)
@@ -103,6 +136,27 @@ module RolloutUi2
         return "eye-open" if public?(feature)
         "filter"
       end
+
+      def users_2_select2(users)
+        return users unless users_provided?
+        RolloutUi2
+          .finder
+          .find_by_id(Array(users))
+          .map { |it| it.merge!(selected: true, placeholder: it[:text]) }
+          .to_json
+      end
+
+      def users_provided?
+        !RolloutUi2.finder.nil?
+      end
+    end
+
+    get '/users' do
+      return status 404 unless users_provided?
+      RolloutUi2
+        .finder
+        .search(params["q"], (params["page"] || 1).to_i)
+        .to_json
     end
 
     get '/' do
@@ -127,7 +181,7 @@ module RolloutUi2
         RolloutUi2.save(feature)
       end
 
-      redirect to('/')
+      redirect to("#{request.path_info}?#{request.query_string}")
     end
   end
 end

data/lib/views/index.erb

@@ -1,24 +1,22 @@
-<div class="panel panel-default">
-  <div class="panel-body">
-    <form class="form-inline" method="post">
-      <div class="form-group form-group-sm">
-        <label for="newfeature">New feature</label>
-        <input type="hidden" name="action" value="new" >
-        <input type="text" name="name" placeholder="feature name" class="form-control" id="newfeature">
-      </div>
-      <button type="submit" class="btn btn-default btn-sm">Create</button>
-    </form>
-  </div>
+<div class="jumbotron">
+  <label for="newfeature">New feature</label>
+  <form class="form-inline" method="post" action="<%= request.fullpath %>">
+    <div class="form-group form-group-sm">
+      <input type="hidden" name="action" value="new" >
+      <input type="text" name="name" placeholder="feature name" class="form-control" id="newfeature">
+    </div>
+    <button type="submit" class="btn btn-default btn-sm">Create</button>
+  </form>
 </div>
 
-<div>
-  <% @features.each do |feature| %>
-   <div id="feature-<%= feature.name.to_s %>"
-        class="panel panel-default <%= 'has-success panel-success' if public?(feature) %>"
-        style="<%= 'opacity:0.5' if hidden?(feature) %>">
+<% @features.each_with_index do |feature, index| %>
+<div class="row">
+  <div id="feature-<%= feature.name.to_s %>"
+       class="panel panel-default <%= active_for(feature, :any, user) { "panel-success" } %> <%= 'panel-success' if public?(feature) %>"
+       style="<%= 'opacity:0.5' if hidden?(feature) %>">
     <div class="panel-heading">
       <div >
-        <form class="form-inline pull-right" data-require-confirm="true" method="post">
+        <form class="form-inline pull-right" data-require-confirm="true" method="post" action="<%= request.fullpath %>">
           <input type="hidden" name="action" value="delete" >
           <input type="hidden" name="name" value="<%= feature.name.to_s %>" >
           <button type="submit" class="glyphicon glyphicon-trash" style="background:none;border:none"><span class="sr-only">Delete</span></button>
@@ -33,10 +31,10 @@
     <div class="panel-body" style="position:relative">
       <div style="background:#F8F8F8;position:absolute;left:0;bottom:0px;height:8px;width:100%"></div>
       <div style="background:#EEEEEE;position:absolute;left:0;bottom:0px;height:8px;width:<%= feature.percentage %>%"></div>
-      <form class="form-horizontal" method="post">
+      <form class="form-horizontal" method="post" action="<%= request.fullpath %>">
         <input type="hidden" name="action" value="update" >
         <input type="hidden" name="name" value="<%= feature.name.to_s %>" >
-        <div class="form-group form-group-sm">
+        <div class="form-group form-group-sm <%= active_for(feature, :percentage, user) { "has-success" }  %>">
           <label class="col-sm-2 control-label" for="percentage">Pecentage</label>
           <div class="col-sm-2">
             <div class="input-group">
@@ -46,10 +44,11 @@
           </div>
         </div>
 
-        <div class="form-group form-group-sm">
+        <div class="form-group form-group-sm <%= active_for(feature, :group, user) { "has-success" } %>">
           <label class="col-sm-2 control-label" for="groups">Groups</label>
-          <div class="col-sm-5">
-            <select class="form-control" data-role="select2-tags" multiple="multiple" id="groups" name="groups[]">
+
+          <div class="col-sm-10">
+            <select data-tags="true" style="height:5ex" class="form-control" data-role="select2" multiple="multiple" id="groups" name="groups[]">
               <% (@groups - feature.groups).each do |f| %><option><%= f %></option><% end %>
               <% feature.groups.each do |f| %><option selected=true><%= f %></option><% end %>
             </select>
@@ -57,18 +56,29 @@
           </div>
         </div>
 
-        <div class="form-group form-group-sm">
+        <div class="form-group form-group-sm <%= active_for(feature, :user, user) { "has-success" } %>">
           <label class="col-sm-2 control-label" for="users">Users</label>
-          <div class="col-sm-5">
-            <select class="form-control" data-role="select2-tags" multiple="multiple" id="users" name="users[]">
-              <% feature.users.each do |f| %><option selected=true><%= f %></option><% end %>
-            </select>
+          <div class="col-sm-10">
+            <% if users_provided? %>
+              <select
+                data-tags="true"
+                class="form-control user-api"
+                multiple="multiple"
+                id="users"
+                name="users[]"
+                data-data='<%= users_2_select2(feature.users) %>'>
+              </select>
+            <% else %>
+              <select class="form-control" data-role="select2" multiple="multiple" id="users" name="users[]">
+                <% feature.users.each do |f| %><option selected=true><%= f %></option><% end %>
+              </select>
+            <% end %>
           </div>
         </div>
 
         <% if feature.data? %>
           <div class="form-group form-group-sm">
-            <div class="col-sm-offset-2 col-sm-5">
+            <div class="col-sm-offset-2 col-sm-10">
               <pre><%= feature.data %></pre>
             </div>
           </div>
@@ -81,6 +91,6 @@
         </div>
       </form>
      </div>
-   </div>
-  <% end %>
+  </div>
 </div>
+<% end %>

data/lib/views/layout.erb

@@ -7,43 +7,144 @@
     <link href="<%= u "vendor/bootstrap/css/bootstrap.min.css" %>" rel="stylesheet">
     <link href="<%= u "vendor/select2/css/select2.min.css" %>" rel="stylesheet">
     <link href="<%= u "vendor/bootstrap/css/bootstrap-theme.css" %>" rel="stylesheet">
+    <link href="https://fk.github.io/select2-bootstrap-css/css/select2-bootstrap.css" rel="stylesheet">
+    <style>
+      .main {
+        margin: auto;
+        max-width: 980px;
+        max-width: 750px;
+      }
+      /* pull-right on all except xs devices */
+      @media (min-width: 768px) {
+        .pull-right-sm {
+          float: right;
+        }
+      }
+
+      /*Make select2 responsive*/
+      [class*="col-"] .select2-container, .select2-container{
+          width:100%!important;
+      }
+      [class*="col-"] .select2-container .select2-search input[type="text"],
+       {
+          padding:2px 4%!important;
+          width:90%!important;
+          margin:5px 2%;
+      }
+      [class*="col-"] .select2-container .select2-drop {
+          width: 100%!important;
+      }
+
+      .has-success .select2-selection__choice,
+      .has-success .select2-selection__choice__remove {
+        color: #3c763d !important;
+        background-color: #dff0d8 !important;
+        border-color: #3c763d !important;
+      }
+
+      .select2-selection__rendered img {
+        width: 2.5ex !important;
+      }
+
+      .select2-selection--single, .select2-selection__arrow {
+        height: 34px !important;
+        padding: 2px;
+      }
+
+      .select2-selection__clear {
+        position: absolute;
+        z-index: 200
+      }
+
+    </style>
   </head>
   <body>
-    <div class="container">
-      <!-- Static navbar -->
-      <nav class="navbar navbar-default" role="navigation">
-        <div class="navbar-header">
-          <a class="navbar-brand" href="/">RolloutUi2</a>
+    <nav class="navbar navbar-default">
+      <div class="container">
+        <div class="row">
+          <div class="navbar-header"><a class="navbar-brand" href="/">RolloutUi2</a></div>
+          <form method="get">
+            <div class="col-sm-6 col-sm-offset-4" style="top:7px">
+              <div class="form-group">
+                <div class="input-group select2-bootstrap-append">
+                  <% if users_provided? %>
+                    <select
+                      data-tags="true"
+                      class="form-control user-api"
+                      id="user"
+                      name="user"
+                      data-allow-clear="true"
+                      data-placeholder="Select a user"
+                      data-data='<%= users_2_select2(params["user"]) %>'>
+                      <option></option>
+                    </select>
+                  <% else %>
+                    <input type="text" class="form-control" name="user" value="<%= params[:user] %>" placeholder="Select a user">
+                  <% end %>
+                  <span class="input-group-btn">
+                    <button class="btn btn-default" type="submit" data-select2-open="multi-append">
+                      <span class="glyphicon glyphicon-user"></span>
+                    </button>
+                  </span>
+                </div>
+              </div>
+            </div>
+          </form>
         </div>
-      </nav>
-
+      </div><!-- /.container-fluid -->
+    </nav>
+    <main class="container main">
       <div>
-        <%if @error then %>
-            <div class="alert alert-error"><%=@error%></div>
-        <% end %>
+        <%if @error then %><div class="alert alert-error"><%=@error%></div><% end %>
         <%= yield %>
       </div>
-  </div>
+    </main>
     <script src="<%= u "vendor/jquery-1.9.1.min.js" %>"></script>
     <script src="<%= u "vendor/bootstrap/js/bootstrap.min.js" %>"></script>
-    <script src="<%= u "vendor/select2/js/select2.min.js" %>"></script>
+    <script src="<%= u "vendor/select2/js/select2.js" %>"></script>
     <script src="<%= u "vendor/jq-debounce.min.js" %>"></script>
     <script type="text/javascript">
+      $('[data-role="select2"]').select2({tokenSeparators: [',', ' ']})
 
+      function template(item) {
+        if (!item.text) return null;
+        if (!item.picture) return '' + item.text;
+        return "<span><img src=\"" + item.picture + "\"> " + item.text + "</span>";
+      }
 
-
-      $('[data-role="select2-tags"]').select2({
-        tags: true,
-        tokenSeparators: [',', ' ']
-      })
+      $("select.user-api").select2({
+        ajax: {
+          url: "<%= u 'users' %>",
+          dataType: 'json',
+          delay: 250,
+          data: function (params) {
+            return { q: params.term, page: params.page };
+          },
+          processResults: function (data, params) {
+            params.page = params.page || 1;
+            return {
+              results: data.results,
+              pagination: { more: (params.page * data.per_page) < data.total_count }
+            };
+          },
+          cache: true
+        },
+        escapeMarkup: function (markup) { return markup; },
+        minimumInputLength: 1,
+        templateResult: template,
+        templateSelection: template
+      });
 
       $('[data-require-confirm="true"]').submit(function() {
           return confirm("Are you sure?");
       });
 
-      $("input").focusout(function () {
-        $(this).parents("form").submit();
+
+      $(".js-example-placeholder-single").select2({
+        placeholder: "Select a state",
+        allowClear: true
       });
+
     </script>
 
   </body>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollout_ui2
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Manuel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-05 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,6 +103,7 @@ files:
 - bin/console
 - bin/setup
 - example_rack/.bundle/config
+- example_rack/.ruby-version
 - example_rack/Gemfile
 - example_rack/Gemfile.lock
 - example_rack/config.ru
@@ -160,3 +161,4 @@ signing_key:
 specification_version: 4
 summary: WebUI for rollout 2
 test_files: []
+has_rdoc: