hieraviz 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4ae953c395227dd73942bc1faa14ab82e0d670c
-  data.tar.gz: 5a1e231af94bedf3f98770dab19e305d022c938d
+  metadata.gz: b4eaf9279a8b9ffdd555aa1d48fcf395a648b5e2
+  data.tar.gz: 3325be3798ce496aea8ce0f99e1c58348ef72805
 SHA512:
-  metadata.gz: 8866fb2b55e06453abfbc2c22a6ec425c20c16c0aff3a4692baa11a495256bd8082eb8579507ab1bc310094b97d78518d2054a25bcdf6df9f6bae07878953f6c
-  data.tar.gz: b34d079696205abd7f81902f796cef8e1577b0215ae004532ae867195152d2117b87c7b5e0cf16fb84cf8504f7e73dcceee582720763e64009c9af0460afc619
+  metadata.gz: 1365f4a1804d57eae53a2ea56fa47a8a0be87eb605a98e575ba075dc76a68ca398c5e33125a5dcc73e9a9f95fa8dc6c30b1a38fb98270cc6e248c66f67941f77
+  data.tar.gz: f46e79ebd53ade534fad598bf09ce5584b41e6ff943ff65fca029fffc9089e1ea9a9d0598994a87f4c6bad2b87f7a5a2f00878757d6b361c0ec25507200e8907

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Hieraviz Changelog
 ========================
 
+### v0.2.0 - 2014-03-03
+- fix button display on firefox
+- fixes on http simple auth
+- various refactoring
+
 ### v0.1.2 - 2016-02-22
 - add a way to write custom local facts
 - add display of nodes info on node panel

data/app/apiv1.rb

@@ -19,29 +19,39 @@ module HieravizApp
 
     case settings.configdata['auth_method']
     when 'dummy'
+
       helpers do
         def check_authorization
+          logger.info session['access_token']
+          if !session['access_token'] && !request.env['HTTP_X_AUTH']
+            redirect '/v1/not_logged'
+          end
           true
         end
       end
+
     when 'gitlab', 'http'
+
       helpers do
         def check_authorization
           if !session['access_token'] && !request.env['HTTP_X_AUTH']
             redirect '/v1/not_logged'
           else
             token = session['access_token'] || request.env['HTTP_X_AUTH']
-            session_info = Hieraviz::Store.get(token, settings.configdata['session_renew'])
-            if !session_info
+            session_info = settings.store.get(token, settings.configdata['session_renew'])
+            unless session_info['username']
               redirect '/v1/unauthorized'
             end
           end
         end
       end
+
     end
 
     helpers do
-
+      def get_facts(base, node)
+        Hieraviz::Facts.new(settings.configdata['tmpdir'], base, node, username)
+      end
     end
 
     get %r{^/?([-_\.a-zA-Z0-9]+)?/nodes} do |base|
@@ -73,23 +83,20 @@ module HieravizApp
 
     get %r{^/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/facts} do |base, node|
       check_authorization
-      hieracles_config = prepare_config(base, node)
-      facts = Hieraviz::Facts.new(settings.configdata['tmpdir'], base, node, get_username)
+      facts = get_facts(base, node)
       json facts.read
     end
 
     post %r{^/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/facts} do |base, node|
       check_authorization
-      hieracles_config = prepare_config(base, node)
-      facts = Hieraviz::Facts.new(settings.configdata['tmpdir'], base, node, get_username)
+      facts = get_facts(base, node)
       data = JSON.parse(request.body.read.to_s)
       json facts.write(data)
     end
 
     delete %r{^/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/facts} do |base, node|
       check_authorization
-      hieracles_config = prepare_config(base, node)
-      facts = Hieraviz::Facts.new(settings.configdata['tmpdir'], base, node, get_username)
+      facts = get_facts(base, node)
       json facts.remove
     end
 
@@ -118,9 +125,8 @@ module HieravizApp
       hieracles_config = prepare_config(base, node)
       hiera = Hieracles::Hiera.new(hieracles_config)
       nodeinfo = Hieracles::Node.new(node, hieracles_config)
-      facts = Hieraviz::Facts.new(settings.configdata['tmpdir'], base, node, get_username)
-      puts facts.instance_variable_get(:@filename)
-      res = { 
+      facts = get_facts(base, node)
+      res = {
         'hiera'    => hiera.hierarchy,
         'vars'     => hiera.params,
         'info'     => nodeinfo.info,
@@ -134,9 +140,8 @@ module HieravizApp
     get %r{^/?([-_\.a-zA-Z0-9]+)?/farm/([-_\.a-zA-Z0-9]+)$} do |base, farm|
       check_authorization
       hieracles_config = prepare_config(base)
-      nodes =  Hieracles::Registry.nodes_data(hieracles_config, base).reduce({}) do |a, (k, v)|
-        a[k] = v if v['farm'] == farm
-        a
+      nodes =  Hieracles::Registry.nodes_data(hieracles_config, base).each_with_object({}) do |(key, val), acc|
+        acc[key] = val if val['farm'] == farm
       end
       json nodes
     end
@@ -148,15 +153,15 @@ module HieravizApp
     end
 
     get '/not_logged' do
-      json({ error: "Not connected." })
+      json(error: 'Not connected.')
     end
 
     get '/unauthorized' do
-      json({ error: "Unauthorized" })
+      json(error: 'Unauthorized')
     end
 
     not_found do
-      json({ error: "endpoint not found" })
+      json(error: 'Endpoint not found')
     end
 
   end

data/app/common.rb

@@ -7,99 +7,91 @@ module HieravizApp
     configure do
       set :app_name, 'HieraViz'
       set :configdata, Hieraviz::Config.load
-      set :config, Hieracles::Config.new({ config: Hieraviz::Config.configfile })
       set :basepaths, Hieraviz::Config.basepaths
+      set :store, Hieraviz::Store.new(settings.configdata['tmpdir'])
       enable :session
       enable :logging
     end
 
     helpers do
-
       case settings.configdata['auth_method']
       when 'dummy'
 
-        def get_username
+        def username
           'Dummy'
         end
-        def get_userinfo
+
+        def userinfo
           { 'username' => 'Dummy' }
         end
 
       when 'http'
 
-        def get_username
+        def username
           settings.configdata['http_auth']['username']
         end
-        def get_userinfo
+
+        def userinfo
           { 'username' => settings.configdata['http_auth']['username'] }
         end
 
       when 'gitlab'
-        
-        def get_username
+
+        def username
           if session['access_token']
-            session_info = Hieraviz::Store.get(session['access_token'], settings.configdata['session_renew'])
-            if session_info
-              session_info['username']
-            else
-              ''
-            end
+            session_info = settings.store.get(session['access_token'], settings.configdata['session_renew'])
+            session_info['username'] || ''
+          else
+            ''
           end
         end
 
-        def get_userinfo
-          Hieraviz::Store.get(session['access_token'], settings.configdata['session_renew'])
+        def userinfo
+          settings.store.get(session['access_token'], settings.configdata['session_renew'])
         end
-        
+
       end
 
-      def prepare_config(e, node = nil)
-        e ||= File.basename(settings.configdata['basepath'])
-        path = get_path(e)[0]
+      def prepare_config(paths, node = nil)
+        paths ||= File.basename(settings.configdata['basepath'])
+        path = get_path(paths)[0]
         if path
           @base = get_base(path)
-          @base_name = @base.gsub(/\//,'')
-          get_config(path, cached_params(e, node))
+          @base_name = @base.gsub(%r{/}, '')
+          get_config(path, cached_params(paths, node))
         end
       end
 
       def cached_params(base, node)
         if node
-          cache = Hieraviz::Facts.new settings.configdata['tmpdir'], base, node, get_username
-          if cache.exist?
-            return cache.read
-          end
+          cache = Hieraviz::Facts.new settings.configdata['tmpdir'], base, node, username
+          return cache.read if cache.exist?
         end
         {}
       end
 
-      def prepare_params(e)
-        e ||= File.basename(settings.configdata['basepath'])
-        path = get_path(e)[0]
-        if path
-          settings.configdata['basepath'] = path
-          settings.configdata
-        end        
+      def prepare_params(paths)
+        paths ||= File.basename(settings.configdata['basepath'])
+        path = get_path(paths)[0]
+        return unless path
+        settings.configdata['basepath'] = path
+        settings.configdata
       end
-      
+
       def get_path(path)
         if settings.basepaths
-          settings.basepaths.select do |p|
-            path == File.basename(p)
+          settings.basepaths.select do |file|
+            path == File.basename(file)
           end
         else
-          [ settings.configdata['basepath'] ]
+          [settings.configdata['basepath']]
         end
       end
-      
+
       def get_config(path, extra)
         args = { config: Hieraviz::Config.configfile }
-        if path
-          args[:basepath] = path
-        end
-        if extra.length > 0
-          args[:params] = format_params(extra)
-        end
+        args[:basepath] = path if path
+        args[:params] = format_params(extra) unless extra.empty?
         Hieracles::Config.new args
       end
 
@@ -108,12 +100,10 @@ module HieravizApp
       end
 
       def format_params(params)
-        params.reduce([]) do |a, (k, v)|
-          a << "#{k}=#{v}"
-          a
+        params.each_with_object([]) do |(key, val), acc|
+          acc << "#{key}=#{val}"
         end.join(',')
       end
-
     end
 
   end

data/app/public/js/base-switch.js

@@ -1,27 +1,29 @@
-
 ready( () => {
   var bases = document.querySelectorAll('.base .all .select');
-  var button = document.querySelector(".base .current");
-  var menu = document.querySelector(".base .all");
-  var menuvisible = false;
-  filterBox(".base .all .filter input", bases);
+  if (bases.length > 0) {
+    var button = document.querySelector(".base .current");
+    var menu = document.querySelector(".base .all");
+    var menuvisible = false;
+    filterBox(".base .all .filter input", bases);
+
 
-  button.addEventListener('click', (ev) => {
-    if (menuvisible) {
-      removeClass(menu, "focus");
-    } else {
-      addClass(menu, "focus");
-    }
-    menuvisible = !menuvisible;
-  });
+    button.addEventListener('click', (ev) => {
+      if (menuvisible) {
+        removeClass(menu, "focus");
+      } else {
+        addClass(menu, "focus");
+      }
+      menuvisible = !menuvisible;
+    });
 
-  /* declaration of events for the bases menu */
-  Array.prototype.forEach.call(bases, (item, i) => {
-    item.addEventListener('click', (ev) => {
-      var url = window.location;
-      base = ev.target.textContent;
-      url.pathname = url.pathname.replace(/^\/[^\/]+/,"/"+base);
+    /* declaration of events for the bases menu */
+    Array.prototype.forEach.call(bases, (item, i) => {
+      item.addEventListener('click', (ev) => {
+        var url = window.location;
+        base = ev.target.textContent;
+        url.pathname = url.pathname.replace(/^\/[^\/]+/,"/"+base);
+      });
     });
-  });
 
+  }
 });

data/app/public/js/farms.js

@@ -10,7 +10,7 @@ https://fetch.spec.whatwg.org
 */
 
 function ready(fn) {
-  if (document.readyState != 'loading') {
+  if (document.readyState !== 'loading') {
     fn();
   } else {
     document.addEventListener('DOMContentLoaded', fn);
@@ -24,25 +24,6 @@ ready( () => {
   focusNav('farms');
   filterBox(".side .filter input", farms);
 
-  function restore_url(list) {
-    if (window.location.hash != '') {
-      var target = window.location.hash.replace(/#/,'');
-      var parts = target.split('/');
-      Array.prototype.forEach.call(list, (item, i) => {
-        if (item.textContent == parts[0]) {
-          if (parts[1] != undefined) {
-            Farm[parts[1]](parts[0]);
-          } else {
-            var event = document.createEvent('HTMLEvents');
-            event.initEvent('click', true, false);
-            item.dispatchEvent(event);
-          }
-        }
-      });
-    }
-  }
-
-
   function build_list(top, title, hash) {
     window.location.hash = '#'+title;
     top.innerHTML = "<h3>Farm "+title+"</h3>";
@@ -74,7 +55,7 @@ ready( () => {
       fetch('/v1/' + base + '/farm/' + farm, auth_header()).
         then(res => res.json()).
         then(j => {
-          if (j.error != undefined) {
+          if (j.error !== undefined) {
             show_error(meat, j['error']);
           } else {
             build_list(meat, farm, j);
@@ -86,7 +67,7 @@ ready( () => {
           }
           removeClass(meat, 'wait');
         });
-    },
+    }
   };
 
   Array.prototype.forEach.call(farms, (item, i) => {
@@ -96,6 +77,6 @@ ready( () => {
   });
 
   update_footer('/v1/' + base + '/farms');
-  restore_url(farms);
+  restore_url(farms, Farm);
 
 });

data/app/public/js/main.js

@@ -9,6 +9,7 @@ let's use the fetch API for ajax calls
 https://fetch.spec.whatwg.org
 */
 
+// "use strict";
 
 function ready(fn) {
   if (document.readyState != 'loading') {
@@ -27,7 +28,7 @@ function make_base_auth(user, password) {
 }
 
 function addClass(el, className) {
-  if (el.classList != null)
+  if (el.classList !== null)
     el.classList.add(className);
   else
     el.className += ' ' + className;
@@ -59,21 +60,23 @@ function shortParamFile(path) {
 
 function filterBox(input, els) {
   var filterinput = document.querySelector(input);
-  filterinput.focus();
-  filterinput.addEventListener('keyup', (ev) => {
-    el = ev.target;
-    if (el.value == '') 
-      Array.prototype.forEach.call(els, (item, i) => {
-        item.style.display = 'block';
-      });
-    else
-      Array.prototype.forEach.call(els, (item, i) => {
-        if (item.textContent.match(el.value))
+  if (filterinput !== null) {
+    filterinput.focus();
+    filterinput.addEventListener('keyup', (ev) => {
+      el = ev.target;
+      if (el.value === '') 
+        Array.prototype.forEach.call(els, (item, i) => {
           item.style.display = 'block';
-        else
-          item.style.display = 'none';
-      });
-  });
+        });
+      else
+        Array.prototype.forEach.call(els, (item, i) => {
+          if (item.textContent.match(el.value))
+            item.style.display = 'block';
+          else
+            item.style.display = 'none';
+        });
+    });
+  }
 }
 
 function start_wait(meat) {
@@ -95,6 +98,23 @@ function auth_header() {
   return { headers: h }
 }
 
+function restore_url(list, someclass) {
+  if (window.location.hash !== '') {
+    var target = window.location.hash.replace(/#/,'');
+    var parts = target.split('/');
+    Array.prototype.forEach.call(list, (item, i) => {
+      if (item.textContent.split(' ')[0] === parts[0]) {
+        if (parts[1] !== undefined) {
+          someclass[parts[1]](parts[0]);
+        } else {
+          var event = document.createEvent('HTMLEvents');
+          event.initEvent('click', true, false);
+          item.dispatchEvent(event);
+        }
+      }
+    });
+  }
+}
 
 ready( () => {
 

data/app/public/js/nodes.js

@@ -17,24 +17,6 @@ ready( () => {
   focusNav('nodes');
   filterBox(".side .filter input", nodes);
 
-  function restore_url(list) {
-    if (window.location.hash != '') {
-      var target = window.location.hash.replace(/#/,'');
-      var parts = target.split('/');
-      Array.prototype.forEach.call(list, (item, i) => {
-        if (item.textContent == parts[0]) {
-          if (parts[1] != undefined) {
-            Node[parts[1]](parts[0]);
-          } else {
-            var event = document.createEvent('HTMLEvents');
-            event.initEvent('click', true, false);
-            item.dispatchEvent(event);
-          }
-        }
-      });
-    }
-  }
-
   function build_line(top, file, key, value, overriden) {
     if (overriden === true) {
       rowclass = "row overriden";
@@ -50,7 +32,7 @@ ready( () => {
 
   function build_row(top, key, params) {
     build_line(top, params['file'], key, params['value'], false);
-    if (params['overriden'] == true) {
+    if (params['overriden'] === true) {
       Array.prototype.forEach.call(params['found_in'], (values, i) => {
         build_line(top, values['file'], key, values['value'], true);
       });
@@ -111,7 +93,7 @@ ready( () => {
     fetch(req, auth_header()).
       then(res => res.json()).
       then(j => {
-        if (j.error != undefined) {
+        if (j.error !== undefined) {
           show_error(hierachy, j['error']);
         } else {
           location.reload();
@@ -136,7 +118,7 @@ ready( () => {
     fetch(req, auth_header()).
       then(res => res.json()).
       then(j => {
-        if (j.error != undefined) {
+        if (j.error !== undefined) {
           show_error(hierachy, j['error']);
         } else {
           location.reload();
@@ -152,10 +134,9 @@ ready( () => {
       then(res => res.json()).
       then(j => {
         var hierachy = document.querySelector('div.hierarchy');
-        if (j.error != undefined) {
+        if (j.error !== undefined) {
           show_error(hierachy, j['error']);
         } else {
-          console.debug(j);
           // --------------------
           addTo(hierarchy, "<h3>From hiera config</h3>");
           var hierafiles = document.createElement('div');
@@ -171,7 +152,7 @@ ready( () => {
           hierarchy.appendChild(nodeinfo);
           Array.prototype.forEach.call(Object.keys(j.info), (item, k) => {
             var index = j.vars.indexOf(item);
-            if (index > -1 && (j.facts == null || j.facts[item] == undefined)) {
+            if (index > -1 && (Object.keys(j.facts).length === 0 || j.facts[item] === undefined)) {
               addTo(nodeinfo, "<div class=\"var\"><div class=\"label\">"+item+"</div>" + 
                               "<div><input type=\"text\" name=\""+item+"\" value=\""+j.info[item]+"\" disabled></div></div>");
               j.vars.splice(index, 1);
@@ -182,9 +163,9 @@ ready( () => {
           var factinfo = document.createElement('div');
           factinfo.className = "factinfo";
           hierarchy.appendChild(factinfo);
-          if (j.facts == null) {
+          if (Object.keys(j.facts).length === 0) {
             Array.prototype.forEach.call(Object.keys(j.vars), (item, k) => {
-              if (j.defaults != null && j.defaults[j.vars[item]] != undefined) {
+              if (j.defaults !== null && j.defaults[j.vars[item]] !== undefined) {
                 addTo(factinfo, "<div class=\"var\"><div class=\"label\">"+j.vars[item]+"</div>" +
                                 "<div><input type=\"text\" class=\"userinput\" name=\"" +
                                 j.vars[item]+"\" value=\"" + 
@@ -192,7 +173,7 @@ ready( () => {
               }
             });
             Array.prototype.forEach.call(Object.keys(j.vars), (item, k) => {
-              if (j.defaults == null || j.defaults[j.vars[item]] == undefined) {
+              if (Object.keys(j.defaults).length === 0 || j.defaults[j.vars[item]] === undefined) {
                 addTo(factinfo, "<div class=\"var\"><div class=\"label\">"+j.vars[item]+"</div>" +
                                 "<div><input type=\"text\" class=\"userinput\" name=\"" + 
                                 j.vars[item]+"\" value=\"\"></div></div>");
@@ -201,7 +182,7 @@ ready( () => {
           } else {
             Array.prototype.forEach.call(Object.keys(j.facts), (item, k) => {
               var override = '';
-              if (j.defaults != null && j.defaults[item] != undefined) {
+              if (j.defaults !== null && j.defaults[item] !== undefined) {
                 override = " <i>("+j.defaults[item]+")</i>";
               }
               addTo(factinfo, "<div class=\"var\"><div class=\"label\">" +
@@ -218,7 +199,7 @@ ready( () => {
           // . . . . . . . . . . .
           var updateinfo = document.createElement('button');
           updateinfo.id = 'updateinfo';
-          updateinfo.innerText = 'Update';
+          updateinfo.textContent = 'Update';
           updatediv.appendChild(updateinfo);
           updateinfo.addEventListener('click', (ev) => {
             var fields = get_input();
@@ -227,7 +208,7 @@ ready( () => {
           // // . . . . . . . . . . .
           // var checkinfo = document.createElement('button');
           // checkinfo.id = 'checkinfo';
-          // checkinfo.innerText = 'Check';
+          // checkinfo.textContent = 'Check';
           // updatediv.appendChild(checkinfo);
           // checkinfo.addEventListener('click', (ev) => {
 
@@ -235,7 +216,7 @@ ready( () => {
           // . . . . . . . . . . .
           var restoreinfo = document.createElement('button');
           restoreinfo.id = 'restoreinfo';
-          restoreinfo.innerText = 'Restore Defaults';
+          restoreinfo.textContent = 'Restore Defaults';
           updatediv.appendChild(restoreinfo);
           restoreinfo.addEventListener('click', (ev) => {
             clear_input(node);
@@ -294,7 +275,7 @@ ready( () => {
         then(j => {
           // console.log(auth_header().headers.getAll('x-auth'));
           build_top(node);
-          if (j.error != undefined) {
+          if (j.error !== undefined) {
             show_error(meat, j['error']);
           } else {
             build_params(meat, node, j);
@@ -313,7 +294,7 @@ ready( () => {
         then(res => res.json()).
         then(j => {
           build_top(node);
-          if (j.error != undefined) {
+          if (j.error !== undefined) {
             show_error(meat, j['error']);
           } else {
             build_info(meat, node, j);
@@ -332,7 +313,7 @@ ready( () => {
         then(res => res.json()).
         then(j => {
           build_top(node);
-          if (j.error != undefined) {
+          if (j.error !== undefined) {
             show_error(meat, j['error']);
           } else {
             build_params(meat, node, j);
@@ -343,7 +324,7 @@ ready( () => {
           }
           end_wait(meat);
         });
-    },
+    }
   }
 
   /* declaration of events for the nodes menu */
@@ -354,6 +335,6 @@ ready( () => {
   });
 
   update_footer('/v1/' + base + '/nodes');
-  restore_url(nodes);
+  restore_url(nodes, Node);
 
 });

data/app/views/_head.erb

@@ -4,8 +4,8 @@
 </a>
 </div>
 
-<% if session[:access_token] && @username != ''  and @base -%>
 <div class="nav">
+<% if session[:access_token] && @username != ''  and @base -%>
 <% if settings.basepaths -%>
 <div class="base">
 <span class="current"><%= @base_name %></span>
@@ -21,13 +21,15 @@
 </div>
 </div>
 <% end -%>
+<% end -%>
 
+<% if session[:access_token] -%>
 <a href="<%= @base %>/nodes" class="nodes">Nodes</a>
 <a href="<%= @base %>/farms" class="farms">Farms</a>
 <a href="<%= @base %>/modules" class="modules">Modules</a>
 <a href="<%= @base %>/resources" class="resources">Resources</a>
-</div>
 <% end -%>
+</div>
 
 <% if session[:access_token] && @username != '' -%>
 <div class="auth">