redis-ui 0.1.3 → 0.2.0

data/.gitignore

@@ -1,3 +1,4 @@
 .bundle
 .DS_Store
-pkg/**
+pkg/**
+.rvmrc

data/Gemfile.lock

@@ -1,29 +1,34 @@
 PATH
   remote: .
   specs:
-    redis-ui (0.1.1)
-      hiredis (~> 0.3.1)
+    redis-ui (0.2.0)
       json
-      redis-namespace (~> 1.0.2)
+      redis
+      redis-namespace
       sinatra
       sinatra-respond_to
+      vegas
 
 GEM
   remote: http://rubygems.org/
   specs:
     bacon (1.1.0)
-    hiredis (0.3.2)
-    json (1.5.1)
-    rack (1.3.0)
-    redis (2.2.0)
-    redis-namespace (1.0.3)
-      redis (< 3.0.0)
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
-    sinatra-respond_to (0.7.0)
-      sinatra (~> 1.2)
-    tilt (1.3.1)
+    json (1.7.3)
+    rack (1.4.1)
+    rack-protection (1.2.0)
+      rack
+    redis (3.0.1)
+    redis-namespace (1.2.0)
+      redis (~> 3.0.0)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    sinatra-respond_to (0.8.0)
+      sinatra (~> 1.3)
+    tilt (1.3.3)
+    vegas (0.1.11)
+      rack (>= 1.0.0)
 
 PLATFORMS
   ruby

data/README.rdoc

@@ -1,11 +1,22 @@
-= redis-ui
+== RedisUI
 
-web accessible panel to view/manage redisdb
-requires ruby 1.8.7
+* web accessible panel to view/manage redisdb
+* requires ruby 1.8.7+ or ruby 1.9+
 
-/keys
-/keys/:id
-/server
+    $ gem install redis-ui
+    $ redis-ui [redis://<ip:port>] [--namespace <redis-namespace>]
+
+== Features
+
+* specify which redis server to connect to (or default to localhost at port 5678 or 5679)
+* specify a namespace (see redis-namespace gem) to show only keys in that namespace
+* view all keys in a paged, sortable, as-you-type-filterable table
+
+== urls
+
+* /keys (json)
+* /keys/:id (html or json)
+* /server (json)
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/redis-ui.rb

@@ -1,5 +1,6 @@
-require 'hiredis'
+require 'redis'
 require 'redis/namespace'
+require 'pp'
 
 begin
   require 'yajl'
@@ -51,37 +52,66 @@ module RedisUI
     set :sessions, true
     set :logging, true
     set :views, File.dirname(__FILE__) + '/views'
-    set :public, File.dirname(__FILE__) + '/static'
+    set :public_folder, File.dirname(__FILE__) + '/static'
       
     helpers do 
       include Rack::Utils
       alias_method :h, :escape_html
+
+      def redis
+        RedisUI.redis
+      end
       
       def get_key(key)
-        data = case RedisUI.redis.type(key)
-        when "string"
-          Array(RedisUI.redis[key])
-        when "list"
-          RedisUI.redis.lrange(key, 0, -1)
-        when "set"
-          RedisUI.redis.smembers(key)
+        data = case redis.type(key)
+               when "string"
+                 redis[key]
+               when "list"
+                 redis.lrange(key, 0, -1)
+               when "set"
+                 redis.smembers(key)
+               when 'zset'
+                 redis.zrange(key, 0, -1)
+               when 'hash'
+                 redis.hgetall(key)
+               else
+                 []
+               end
+
+        {:key => key, :type => redis.type(key), :data => data}
+      end
+
+      def show(val)
+        case val
+        when String
+          val
+        when Array
+          str = "<ul><li>"
+          str << val.join('</li><li>')
+          str << '</li></ul>'
+        when Hash
+          str = "<ul><li>"
+          arr = []
+          val.map do |k, v|
+            arr << "#{k} => #{v}"
+          end
+          str << arr.join('</li><li>')
+          str << '</li></ul>'
         else
-          []
+          val.to_s
         end
-        
-        {:key => key, :type => RedisUI.redis.type(key), :data => data}
       end
       
     end
     
     get "/" do
-      @keys = RedisUI.redis.keys.collect{ |key| get_key(key) }
+      @keys = RedisUI.redis.keys.map{ |key| get_key(key) }
       erb :index
     end
     
     get "/keys" do
       content_type :json
-      @keys = {:keys => RedisUI.redis.keys.collect{ |key| get_key(key) }}
+      @keys = {:keys => RedisUI.redis.keys.map{ |key| get_key(key) }}
       @keys.to_json
     end
 
@@ -105,4 +135,4 @@ module RedisUI
     end
 
   end
-end
+end

data/lib/redis-ui/version.rb

@@ -1,5 +1,5 @@
 module Redis
   module Ui
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

data/lib/static/js/lib/redis-ui.js

@@ -0,0 +1,3 @@
+$(function() {
+  $('table.keys').dataTable();
+})

data/lib/static/stylesheets/redis-ui.css

@@ -42,7 +42,15 @@ table td {
     border-right: 1px solid #CCCCCC;
     margin: 0pt;
     padding: 0.5em 1em 0.5em 0.5em;
+    vertical-align: top;
 }
 
-ul{padding:0.5em; margin:1em;}
-li{padding:0.5em 0;}
+table ul {
+    list-style: none;
+}
+table li {
+    padding-bottom: 3px;
+}
+
+#container>ul{padding:0.5em; margin:1em;}
+#container>li{padding:0.5em 0;}

data/lib/views/index.html.erb

@@ -1,18 +1,29 @@
 <table class="keys">
-	<tr>
-		<th>Key</th>
-		<th>Type</th>
-	</tr>
-	<tbody>
-		<% @keys.each do |key| %>
-		<tr class="key">
-			<td>
-				<a href="/keys/<%= key[:key] %>">
-					<%= key[:key] %>
-				</a>
-			</td>
-			<td><%= key[:type] %></td>
-		</tr>
-		<% end %>
-	</tbody>
-</table>
+  <thead>
+    <tr>
+      <th>Key</th>
+      <th>Type</th>
+      <th>Value</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @keys.each do |key| %>
+      <tr class="key">
+        <td>
+          <a href="/keys/<%= key[:key] %>">
+            <%= key[:key] %>
+          </a>
+        </td>
+
+        <td>
+          <%= key[:type] %>
+        </td>
+
+        <td>
+          <%= show(key[:data]) %>
+        </td>
+
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/lib/views/layout.html.erb

@@ -1,30 +1,17 @@
 <html>
-<head>
-	<title>RedisUI</title>
-	<link rel="stylesheet" href="/stylesheets/redis-ui.css" type="text/css" media="screen" charset="utf-8">
-</head>
-<body>
-	<div id="container">
-		<h1>RedisUI</h1>
-		<div id="main"></div>
-	<%= yield %>
-	</div>
-	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6/jquery.js"></script>
-	<script src="/js/lib/underscore.js"></script>
-	<script src="/js/lib/backbone.js"></script>
-	
-	<script src="/js/app/app.js"></script>
-	<script src="/js/app/models.js"></script>
-	
-	<script type="text/javascript">
-	 	//RUI.view.app = new RUI.view.main({collection : RUI.data.keys})
-		//RUI.data.keys.fetch();
-		
-		/*
-		setInterval(function() {
-		  RUI.data.keys.fetch();
-		}, 1000);
-		*/
-	</script>
-</body>
+  <head>
+    <title>RedisUI</title>
+    <link rel="stylesheet" href="/stylesheets/redis-ui.css" type="text/css" media="screen" charset="utf-8" />
+    <link rel="stylesheet" href="http://ajax.aspnetcdn.com/ajax/jquery.dataTables/1.9.1/css/jquery.dataTables.css" type="text/css" media="screen" charset="utf-8" />
+    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6/jquery.js"></script>
+    <script src="http://ajax.aspnetcdn.com/ajax/jquery.dataTables/1.9.1/jquery.dataTables.min.js"></script>
+    <script src="/js/lib/redis-ui.js"></script>
+  </head>
+
+  <body>
+    <div id="container">
+      <h1>RedisUI</h1>
+      <%= yield %>
+    </div>
+  </body>
 </html>

data/redis-ui.gemspec

@@ -23,9 +23,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'bacon'
   
   s.add_runtime_dependency 'json'
-  s.add_runtime_dependency 'hiredis', '~> 0.3.1'
-  s.add_runtime_dependency 'redis-namespace', '~> 1.0.2'
+  s.add_runtime_dependency 'redis'
+  s.add_runtime_dependency 'redis-namespace'
   s.add_runtime_dependency 'sinatra'
   s.add_runtime_dependency 'sinatra-respond_to'
   s.add_runtime_dependency 'vegas'
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-ui
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-10 00:00:00.000000000Z
+date: 2012-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &70244677408460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244677408460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70244677408020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,32 +38,47 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70244677408020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: hiredis
-  requirement: &70244677407420 !ruby/object:Gem::Requirement
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70244677407420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70244677406660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70244677406660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70244677406000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +86,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70244677406000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-respond_to
-  requirement: &70244677405020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +102,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70244677405020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &70244677386880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +118,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70244677386880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: View and manage redis store
 email:
 - james@supermatter.com
@@ -109,10 +144,7 @@ files:
 - lib/redis-ui.rb
 - lib/redis-ui/version.rb
 - lib/static/js/.DS_Store
-- lib/static/js/app/app.js
-- lib/static/js/app/models.js
-- lib/static/js/lib/backbone.js
-- lib/static/js/lib/underscore.js
+- lib/static/js/lib/redis-ui.js
 - lib/static/stylesheets/redis-ui.css
 - lib/views/index.html.erb
 - lib/views/layout.html.erb
@@ -141,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: redis-ui
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Sinatra backed redis ui