redis-browser 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37d0ff56203919cb9c9410c192224e8f2cad3ab6
-  data.tar.gz: 5f47d5d2485446e8a6567c29bfbd57097ea48030
+  metadata.gz: ff6b4c9893603331bde51f11323e7db04c7a76b1
+  data.tar.gz: 27a55cfae0916125f1e38bc621ebdb454dc5f014
 SHA512:
-  metadata.gz: 7278bff64d5fdba0cc39611901501745a78dac6e801ccc722a52f425c6074384acf052b544d1f1a5db78e7e231bf590093b626e446a3604dba94ea0c881c0238
-  data.tar.gz: 6b1a36d1da3440e536d988a03b5281362b9899ae3f68d4d5fe21864f52b5bc1f3cace4c9dfa5aa91f75d08ed5ed0d9d3e47c470876f357c78694eb0d6ea4edf9
+  metadata.gz: 9cea07b936c42a39bc56bca4628b224edf786f66395d54fc23f306bf8900ea20267a535353caaa30b63dde1ad1cee6fdae13f2222d65322ea84ec9db8c228428
+  data.tar.gz: 6bdb82caef0777e9cab46455751444a5c1b800cf3109b7044f55296c8c1d179e747149d8881c62f0fb1738ce85c0424caaae728cc4c52fc817b583fedc4d9268

data/README.md

@@ -8,6 +8,7 @@
 * Pretty print json values
 * Search keys
 * Can be mounted to Rails applications as engine
+* Can connect to multiple databases
 
 ## Installation
 
@@ -23,6 +24,26 @@ $ gem install redis-browser
 $ redis-browser
 ```
 
+You can predefine a list of available connections in a YAML file in couple of ways.
+
+```yaml
+connections:
+  default:
+    url: redis://127.0.0.1:6379/0
+  production:
+    host: mydomain.com
+    port: 6666
+    db: 1
+```
+
+Then start with
+
+```bash
+$ redis-browser -C path/to/config.yml
+```
+
+Run with `--help` to see what other options are available.
+
 ### As engine
 
 Add to gemfile
@@ -37,13 +58,20 @@ And to routes.rb
 mount RedisBrowser::Web => '/redis-browser'
 ```
 
+Use `config/initializers/redis-browser.rb` to predefine a list of available connections
+
+```ruby
+config = Rails.root.join('config', 'redis-browser.yml')
+settings = YAML.load(ERB.new(IO.read(config)).result)
+RedisBrowser.configure(settings)
+```
+
 ## Screenshots
 
 ![Browse keys](https://dl.dropboxusercontent.com/u/70986/redis-browser/2.png)
 ![See list with pagination](https://dl.dropboxusercontent.com/u/70986/redis-browser/3.png)
 ![ZSET support](https://dl.dropboxusercontent.com/u/70986/redis-browser/4.png)
 ![JSON pretty print](https://dl.dropboxusercontent.com/u/70986/redis-browser/5.png)
-![Configuration](https://dl.dropboxusercontent.com/u/70986/redis-browser/6.png)
 
 ## Contributing
 

data/bin/redis-browser

@@ -3,7 +3,34 @@
 $:.unshift File.expand_path('../../lib', File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__)
 
 require 'rubygems' unless Object.const_defined?(:Gem)
+require 'optparse'
 
 require "redis-browser"
 
-RedisBrowser::Web.run! :port => 4569
+# Sinatra runtime options
+options = {
+  bind: '127.0.0.1',
+  port: 4567
+}
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: redis-browser [options]"
+
+  opts.on("-C PATH", "--config PATH", "Path to YAML config file") do |v|
+    require 'yaml'
+    require 'erb'
+
+    config = YAML.load(ERB.new(IO.read(v)).result)
+    RedisBrowser.configure(config)
+  end
+
+  opts.on("-B ADDRESS", "--bind ADDRESS", "Server hostname or IP address to listen on") do |v|
+    options['bind'] = v
+  end
+
+  opts.on("-P PORT", "--port PORT", "Port number to listen on") do |v|
+    options['port'] = v
+  end
+end.parse!
+
+RedisBrowser::Web.run! options

data/config.yml

@@ -0,0 +1,8 @@
+connections:
+  localhost:
+    url: redis://127.0.0.1:6379/0
+  other:
+    host: 127.0.0.1
+    port: 6379
+    db: 1
+  url_db_1: redis://127.0.0.1:6379/1

data/lib/redis-browser.rb

@@ -8,3 +8,18 @@ require 'redis-browser/version'
 require 'redis-browser/browser'
 require 'redis-browser/web'
 
+module RedisBrowser
+  DEFAULTS = {
+    'connections' => {
+      'default' => 'redis://127.0.0.1:6379/0'
+    }
+  }
+
+  def self.configure(opts)
+    Web.configure do |config|
+      config.set opts
+    end
+  end
+end
+
+RedisBrowser.configure RedisBrowser::DEFAULTS

data/lib/redis-browser/browser.rb

@@ -1,8 +1,7 @@
 module RedisBrowser
   class Browser
-    def initialize(conn = nil, db = 0)
+    def initialize(conn = {})
       @conn = conn
-      @db = db
     end
 
     def split_key(key)
@@ -88,6 +87,7 @@ module RedisBrowser
     end
 
     def get_keys(key)
+      key ||= ""
       key << "*" unless key.end_with?("*")
 
       values = redis.keys(key).map do |k|
@@ -134,18 +134,7 @@ module RedisBrowser
 
     def redis
       @redis ||= begin
-        conn = @conn || "127.0.0.1:6379"
-        db = @db || 0
-
-        opts = if conn.start_with?("/")
-          {:path => conn}
-        else
-          host, port = conn.split(":", 2)
-          {:host => host, :port => port}
-        end
-
-        r = Redis.new(opts)
-        r.select(db)
+        r = Redis.new(@conn)
         r
       end
     end

data/lib/redis-browser/public/css/ng-prettyjson.css

@@ -0,0 +1,6 @@
+pre {outline: 1px solid #e9e9e9; padding: 5px; margin: 5px; width: 100%; height:100%;}
+.string { color: green; }
+.number { color: darkorange; }
+.boolean { color: blue; }
+.null { color: magenta; }
+.key { color: red; }

data/lib/redis-browser/public/css/ng-prettyjson.min.css

@@ -0,0 +1,7 @@
+/** 
+* @license ng-prettyjson - v0.1.2
+* (c) 2013 Julien VALERY https://github.com/darul75/ng-prettyjson
+* License: MIT 
+**/
+
+pre{outline:1px solid #e9e9e9;padding:5px;margin:5px;width:100%;height:100%}.string{color:green}.number{color:#ff8c00}.boolean{color:#00f}.null{color:#ff00ff}.key{color:red}

data/lib/redis-browser/public/js/ng-prettyjson.min.js

@@ -0,0 +1,15 @@
+/** 
+* @license ng-prettyjson - v0.1.2
+* (c) 2013 Julien VALERY https://github.com/darul75/ng-prettyjson
+* License: MIT 
+**/
+angular.module("ngPrettyJson",[]).directive("prettyJson",["ngPrettyJsonFunctions",function(a){"use strict";var b=angular.isDefined;return{restrict:"AE",scope:{json:"=",prettyJson:"="},replace:!0,template:'<div><button ng-click="edit()" ng-show="edition && !editActivated">Edit</button><button ng-click="edit()" ng-show="edition && editActivated">Cancel</button><button ng-click="update()" ng-show="editActivated && parsable">Update</button><pre id="prettyjson"></pre></div>',link:function(c,d,e){var f={},g="prettyjson",h=null;c.editActivated=!1,c.edition=e.edition;// prefer the "json" attribute over the "prettyJson" one.
+// the value on the scope might not be defined yet, so look at the markup.
+var i,j=b(e.json)?"json":"prettyJson",k=function(c){return b(c)?d.find("pre").html(a.syntaxHighlight(c)):d.empty()};i=c.$watch(j,function(a){// BACKWARDS COMPATIBILITY:
+// if newValue is an object, and we find a `json` property,
+// then stop watching on `exp`.
+angular.isObject(a)&&b(a.json)?(i(),c.$watch(j+".json",function(a){k(a),f=a},!0)):(k(a),f=a)},!0);var l=function(){try{c.currentValue=JSON.parse(h.getValue()),c.parsable=!0}catch(a){c.parsable=!1}// trigger update
+c.$apply(function(){})};c.edit=function(){c.editActivated?(h&&(document.getElementById(g).env=null),k(f)):(h=ace.edit(g),h.on("change",l),h.getSession().setMode("ace/mode/json")),c.editActivated=!c.editActivated},c.update=function(){c.$emit("json-updated",c.newValue)}}}}]).factory("ngPrettyJsonFunctions",function(){// cache some regular expressions
+var a={entities:/((&)|(<)|(>))/g,json:/"(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|(null))\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g},b=["&amp;","&lt;","&gt;"],c=["number","string","key","boolean","null"],d=function(){var a=arguments.length-2;do a--;while(!arguments[a]);return a},e=function(a){var b;// the final two arguments are the length, and the entire string itself;
+// we don't care about those.
+if(arguments.length<7)throw new Error("markup() must be called from String.prototype.replace()");return b=d.apply(null,arguments),'<span class="'+c[b]+'">'+a+"</span>"},f=function(){var a;if(arguments.length<5)throw new Error("makeEntities() must be called from String.prototype.replace()");return a=d.apply(null,arguments),b[a-2]},g=function(b){return angular.isString(b)||(b=JSON.stringify(b,null,2)),angular.isDefined(b)?b.replace(a.entities,f).replace(a.json,e):void 0};return{syntaxHighlight:g,makeEntities:f,markup:e,rx:a}});

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

@@ -19,8 +19,8 @@ app.factory 'HttpLoader', ['$q', ($q) ->
 ]
 
 app.factory 'API', ['$http', ($http) ->
-  (connection, database) ->
-    ps = {connection: connection, database: database}
+  (connection) ->
+    ps = {connection: connection}
     {
       ping: () -> $http.get("#{jsEnv.root_path}ping.json", {
         params: ps
@@ -59,14 +59,14 @@ app.factory 'API', ['$http', ($http) ->
   $scope.keys = []
   $scope.key = {type: "empty"}
   $scope.list = {}
+  $scope.connections = jsEnv.connections
+  $scope.config = {connection: jsEnv.connection}
 
   db = localStorageService
 
   $scope.config =
-    connection: db.get("connection") || "127.0.0.1:6379"
-    database:   parseInt(db.get("database")) || 0
+    connection: db.get("connection") || $scope.config.connection
     hashView:   db.get("hashView") || "table"
-    databases:  [0..15]
 
     open: ->
       $scope.config.show = true
@@ -76,12 +76,11 @@ app.factory 'API', ['$http', ($http) ->
       # Check connection
       $scope.config.error = null
 
-      test = API($scope.config.connection, $scope.config.database)
+      test = API($scope.config.connection)
       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.api = API($scope.config.connection)
 
           $scope.fetchKeys()
           $scope.show($scope.key)
@@ -98,7 +97,7 @@ app.factory 'API', ['$http', ($http) ->
       backdropFade: true
       dialogFade: true
 
-  $scope.api = API($scope.config.connection, $scope.config.database)
+  $scope.api = API($scope.config.connection)
 
 
   # Scope functions

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

@@ -41,18 +41,7 @@ html ng-app="browser"
           .control-group
             label.control-label for="config-connection" Connection
             .controls
-              input type="text" id="config-connection" ng-model="config.connection"
-              span.help-block
-                | Examples:
-                code 127.0.0.1:6379
-                | ,
-                code= "/tmp/redis.sock"
-                | etc.
-
-          .control-group
-            label.control-label for="config-database" Database
-            .controls
-              select id="config-database" ng-model="config.database" ng-options="i for i in config.databases"
+              select id="config-connection" ng-model="config.connection" ng-options="name as name for (name, opts) in connections" ng-required="required"
 
         .modal-footer
           span.alert.alert-error.pull-left ng-show="config.error"
@@ -74,8 +63,6 @@ html ng-app="browser"
               ' Connected to
               strong
                 ' {{ config.connection }}
-              small
-                ' ({{ config.database }})
 
 
     .container-fluid

data/lib/redis-browser/version.rb

@@ -1,3 +1,3 @@
 module RedisBrowser
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/redis-browser/web.rb

@@ -6,7 +6,9 @@ module RedisBrowser
 
     def js_env
       jsEnv = {
-        root_path: "#{root_path}"
+        root_path: root_path,
+        connections: settings.connections,
+        connection: params[:connection] || settings.connections.keys.first
       }
 
       "jsEnv = #{MultiJson.dump(jsEnv)};"
@@ -50,12 +52,9 @@ module RedisBrowser
     end
 
     def browser
-      connection = if ENV['REDIS_URL']
-        ENV['REDIS_URL'].sub(/\Aredis:\/\//, '')
-      else
-        params[:connection]
-      end
-      @browser ||= Browser.new(connection, params[:database])
+      conn = settings.connections[params[:connection]]
+      conn = {url: conn} unless conn.is_a?(Hash)
+      @browser ||= Browser.new(conn)
     end
   end
 end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: redis-browser
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Tymon Tobolski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-05 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Redis browser
@@ -144,20 +144,24 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/redis-browser
+- config.yml
 - lib/redis-browser.rb
 - lib/redis-browser/browser.rb
 - lib/redis-browser/public/css/app.css
 - lib/redis-browser/public/css/bootstrap.min.css
+- lib/redis-browser/public/css/ng-prettyjson.css
+- lib/redis-browser/public/css/ng-prettyjson.min.css
 - lib/redis-browser/public/img/glyphicons-halflings-white.png
 - lib/redis-browser/public/img/glyphicons-halflings.png
 - lib/redis-browser/public/js/angular.min.js
 - lib/redis-browser/public/js/localStorageModule.js
+- lib/redis-browser/public/js/ng-prettyjson.min.js
 - lib/redis-browser/public/js/ui-bootstrap-tpls-0.2.0.min.js
 - lib/redis-browser/templates/coffee/app.coffee
 - lib/redis-browser/templates/index.slim
@@ -174,17 +178,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Redis browser