redis-browser 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff7e71ad7ca6d00fdd7bf652d7a0905cf04b3c3e
-  data.tar.gz: 9ba1d711f8db4b1500c834e6d6ec13f4a6cf15a9
+  metadata.gz: be0e2ba8d6a3009374dc91c621899fbb8d247ba5
+  data.tar.gz: c37ef89c7903b1902a1b8b86ea2851ae09182647
 SHA512:
-  metadata.gz: 7a1773a0652654b6759e2dcdb52e6fdf3763a5c8a929ddc8b00594d5bcd3554b44551713d329bbc4586e3c6d9cd14cf92dc1ef22fcf5b957d5a52c6e8705d6c8
-  data.tar.gz: b0913ff743bcb6b8ee038f4708e9cdcf9b1b6a89c6376ceebcf3aad1eb1a6416394b2cdee612eb137411a9e5ef759f0452c62e60acd7636ff9e4413950bc4c79
+  metadata.gz: 0302aa3ad6b395a35e4de6b04fb159e9df086834d14c6f7f5748c271db56923cb52607e748db48b71e215f443abd808d9268fd0c6f1e0110b6112735e9674d37
+  data.tar.gz: 87a612ae892bb71b4099b03f64e7b2edb1d6635cbd1d6f72df24372c8a157200baa617c382863fea4eff526410569f6112dc017dd88bf5a01b381437d1b7a117

data/lib/redis-browser/app.rb

@@ -21,34 +21,38 @@ class Browser
     @db = db
   end
 
-  def keys_tree(sep = /:+|\//)
-    keys = {}
-    full = {}
-
-    redis.keys.each do |key|
-      chunks = key.split(sep, 7)
-      full[chunks] = key
-      chunks.inject([keys,[]]) do |(xs,n), x|
-        xs[x] ||= {}
-        xs[x]
-
-        [xs[x], n]
-      end
+  def split_key(key)
+    if key =~ /^(.+?)(:+|\/+|\.+).+$/
+      [$1, $2]
+    else
+      [key, nil]
+    end
+  end
+
+  def keys(namespace = nil)
+    if namespace.to_s.strip.empty?
+      pattern = "*"
+      namespace = ""
+    else
+      pattern = namespace + "*"
     end
 
-    f = lambda do |prefix, hash|
+    redis.keys(pattern).inject({}) do |acc, key|
+      key.slice!(namespace) if namespace
 
-      hash.map do |k,v|
-        np = (prefix + [k])
-        {
-          :name => k,
-          :full => full[np] || np.join("*"),
-          :children => f.call(np, v)
+      ns, sep = split_key(key)
+
+      unless ns.strip.empty?
+        acc[ns] ||= {
+          :name => ns,
+          :full => namespace + ns + sep.to_s,
+          :count => 0
         }
-      end.sort_by {|k| k[:name] }
-    end
+        acc[ns][:count] += 1
+      end
 
-    f.call([], keys)
+      acc
+    end.values.sort_by {|e| e[:name] }
   end
 
   def item_type(e)
@@ -137,6 +141,13 @@ class Browser
     }.merge(data)
   end
 
+  def ping
+    redis.ping == "PONG"
+    {:ok => 1}
+  rescue => ex
+    {:error => ex.message}
+  end
+
   def redis
     @redis ||= begin
       conn = @conn || "127.0.0.1:6379"
@@ -167,12 +178,12 @@ class App < Sinatra::Base
     slim :index
   end
 
-  get '/keys_tree.json' do
-    json browser.keys_tree
+  get '/ping.json' do
+    json browser.ping
   end
 
   get '/keys.json' do
-    json browser.keys(params[:pattern])
+    json browser.keys(params[:namespace])
   end
 
   get '/key.json' do

data/lib/redis-browser/public/css/app.css

@@ -40,3 +40,14 @@ body {
 .per-page { margin-top: 25px; }
 .connection-info { padding-right: 20px; }
 .keys-search { width: 100px; }
+
+#http-loader {
+    position: fixed;
+    left: 0;
+    top: 0;
+    display: none;
+    background: gold;
+    padding: 5px 10px;
+    font-weight: bold;
+    z-index: 10000;
+}

data/lib/redis-browser/templates/coffee/app.coffee

@@ -1,15 +1,35 @@
 app = angular.module('browser', ['ui.bootstrap', 'LocalStorageModule'])
 
-# app.run ($rootScope) ->
+app.config ($httpProvider) ->
+  funShow = (data, headersGetter) ->
+    document.getElementById('http-loader').style.display = "block"
+    data
+
+  $httpProvider.defaults.transformRequest.push(funShow)
+  $httpProvider.responseInterceptors.push('HttpLoader')
+
+app.factory 'HttpLoader', ['$q', ($q) ->
+  (promise) ->
+    promise.then (response) ->
+      document.getElementById('http-loader').style.display = "none"
+      response
+    , (response) ->
+      document.getElementById('http-loader').style.display = "none"
+      response
+]
 
-angular.module('browser').factory 'API', ['$http', ($http) ->
+app.factory 'API', ['$http', ($http) ->
   (connection, database) ->
     ps = {connection: connection, database: database}
     {
-      keysTree: (pattern) -> $http.get("/keys_tree.json", {
+      ping: () -> $http.get("/ping.json", {
         params: ps
       }).then (e) -> e.data,
 
+      keys: (namespace) -> $http.get("/keys.json", {
+        params: angular.extend({}, ps, {namespace: namespace})
+      }).then (e) -> e.data,
+
       get: (params) -> $http.get("/key.json", {
         params: angular.extend({}, ps, params)
       }).then (e) -> e.data
@@ -53,14 +73,22 @@ angular.module('browser').factory 'API', ['$http', ($http) ->
     close: ->
       $scope.config.show = false
     save: ->
-      db.add("connection", $scope.config.connection)
-      db.add("database", $scope.config.database)
-      $scope.api = API($scope.config.connection, $scope.config.database)
+      # Check connection
+      $scope.config.error = null
 
-      $scope.fetchKeys()
-      $scope.show($scope.key)
+      test = API($scope.config.connection, $scope.config.database)
+      test.ping().then (resp) ->
+        if resp.ok
+          db.add("connection", $scope.config.connection)
+          db.add("database", $scope.config.database)
+          $scope.api = API($scope.config.connection, $scope.config.database)
+
+          $scope.fetchKeys()
+          $scope.show($scope.key)
 
-      $scope.config.close()
+          $scope.config.close()
+        else
+          $scope.config.error = resp.error
 
     setHashView: (view) ->
       $scope.config.hashView = view
@@ -75,10 +103,10 @@ angular.module('browser').factory 'API', ['$http', ($http) ->
 
   # Scope functions
   $scope.fetchKeys = ->
-    $scope.keys = $scope.api.keysTree()
+    $scope.keys = $scope.api.keys()
 
   $scope.show = (key) ->
-    key.open = true
+    $scope.keyOpen(key)
     $scope.api.get(key: key.full).then((e) ->
       $scope.key = e
 
@@ -97,6 +125,17 @@ angular.module('browser').factory 'API', ['$http', ($http) ->
             e.json[k] = v.value
     )
 
+  $scope.keyOpen = (key) ->
+    console.log key.children
+    if key.count > 1 && !key.children
+      $scope.api.keys(key.full).then (keys) ->
+        key.children = keys
+
+    key.open = true
+
+  $scope.keyClose = (key) ->
+    key.open = false
+
 
   $scope.setPerPage = (i) ->
     db.add("per_page", i)

data/lib/redis-browser/templates/index.slim

@@ -12,12 +12,15 @@ html ng-app="browser"
     link rel="stylesheet" href="/css/app.css"
 
     script type="text/ng-template" id="nav-tree-item.html"
-      span ng-show="key.children.length > 0"
-        button.btn.tree-toggle ng-hide="key.open" ng-click="key.open = true" +
-        button.btn.tree-toggle ng-show="key.open" ng-click="key.open = false" -
-      span ng-show="key.children.length == 0" - 
+      span ng-show="key.count > 1"
+        button.btn.tree-toggle ng-hide="key.open" ng-click="keyOpen(key)" +
+        button.btn.tree-toggle ng-show="key.open" ng-click="keyClose(key)" -
+      span ng-show="key.count == 1" - 
 
-      a href="#" ng-click="show(key)" {{ key.name }}
+      a href="#" ng-click="show(key)"
+        ' {{ key.name }}
+        small ng-show="key.count > 1"
+          | ({{ key.count }})
 
       ul.tree ng-show="key.open"
         li ng-repeat="key in key.children" ng-include="'nav-tree-item.html'"
@@ -25,6 +28,7 @@ html ng-app="browser"
 
 
   body ng-controller="BrowserCtrl"
+    #http-loader Loading...
     div modal="config.show" close="config.close()" options="config.modalOpts"
       .form-horizontal
         .modal-header
@@ -48,6 +52,8 @@ html ng-app="browser"
               select id="config-database" ng-model="config.database" ng-options="i for i in config.databases"
 
         .modal-footer
+          span.alert.alert-error.pull-left ng-show="config.error"
+            ' {{ config.error }}
           button.btn.btn-success type="submit" ng-click="config.save()" Save
 
     .navbar.navbar-inverse.navbar-fixed-top
@@ -63,7 +69,10 @@ html ng-app="browser"
               button.btn.btn-success ng-click="config.open()" Configure
             p.navbar-text.pull-right.connection-info
               ' Connected to
-              strong {{ config.connection }}
+              strong
+                ' {{ config.connection }}
+              small
+                ' ({{ config.database }})
 
 
     .container-fluid

data/lib/redis-browser/version.rb

@@ -1,3 +1,3 @@
 module RedisBrowser
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-browser
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Tymon Tobolski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-20 00:00:00.000000000 Z
+date: 2013-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler