redis_monitor 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26945d3beb81a7f251aae5d4d976656b7a1cffaa
-  data.tar.gz: 454ce3146a697ca9dd7792f5ecebb4420803ca26
+  metadata.gz: 35f60167efa6552a21e54a934d0fd3fc39c5593d
+  data.tar.gz: ebc40b4984cba2595124b25933909e23deb2b28d
 SHA512:
-  metadata.gz: ebd6dc834fd6c67c9b04e8aaae0566f4f6d7e6f5df5a1b0ac0133ff4d91bb64f8c1082b80231b03576403768f63bd2c869825c14d6f97b1d4b570cea695a133c
-  data.tar.gz: 1d39a1fcc48714c37c7e423bb9cd66212ab0be0f04a937b329581d4e9a052faa273cd93a3f3edfc020333abf412749853d7d6a0899bb2fb74441a469a262e158
+  metadata.gz: e5d036c628c417d0731147c34d0f8062b570ca166397eb1734bfa3596e06e985e594bd0d1c486a5f5788db047ddf5965218c6ff3b1de252ac5d032f4efcab535
+  data.tar.gz: efa9bf5529f187609333e1df2b0bee8cc093339ae8fd0e3c6787c467e3c0c91ba794be1b868188c7d602db7ae09d2c69be25ca51a8d6b55fc1a61113c1046eae

data/README.md

@@ -16,6 +16,11 @@ Then browse http://localhost:http_port
 --editable or --not-editable can be use to indicate if the user should be able to edit the database content.
 --credentials user:password if only users with credentials can access the application.
 
+If no database config is specified a sqlite3 database will be created inside the gem. To define database configuration you can use --database-adapter, --database-host, --database-port, --database-name
+
+For example:
+
+    $ redis_monitor --database-adapter mysql2 --database-name redis_monitor --database-host localhost --database-port 3306
 
 For more information about the parameters:
 
@@ -27,6 +32,18 @@ You can define tasks in 'Task' tab and they will be running in background. There
 - Watch query, it will watch the query introduced in 'trigger' field and in the result of the query changes it will create a notification.
 Be careful with this one, don't watch queries too generic because it can affect to the performance of your database.
 
+## Screenshots
+
+![](https://dl.dropboxusercontent.com/u/434578/redis_monitor_images/1.png)
+
+![](https://dl.dropboxusercontent.com/u/434578/redis_monitor_images/2.png)
+
+![](https://dl.dropboxusercontent.com/u/434578/redis_monitor_images/3.png)
+
+![](https://dl.dropboxusercontent.com/u/434578/redis_monitor_images/4.png)
+
+![](https://dl.dropboxusercontent.com/u/434578/redis_monitor_images/5.png)
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -4,6 +4,8 @@ require File.expand_path('../lib/engine/config/application', __FILE__)
 
 Engine::Application.load_tasks
 
+Rake.application.instance_variable_get('@tasks').delete('spec')
+
 RSpec::Core::RakeTask.new(:spec) do |config|
   config.rspec_opts = '--default-path lib/engine/spec'
 end

data/lib/command_line_parser.rb

@@ -11,6 +11,7 @@ module RedisMonitor
 
     def self.parse(argv)
       arguments = DEFAULTS.dup
+      arguments[:database] ||= {}
 
       parser = OptionParser.new do |op|
         op.on('--http-port port',  'specify http port (default is 6369)') do |val|
@@ -34,6 +35,22 @@ module RedisMonitor
           user, password = val.to_s.split(':')
           arguments[:credentials] = {user: user, password: password}
         end
+        op.on('--database-adapter database-adapter', 'database adapter (mysql2, sqlite3...)') do |val|
+          arguments[:database][:adapter] = val
+          arguments[:database_config] = true
+        end
+        op.on('--database-host database-host', 'database host') do |val|
+          arguments[:database][:host] = val
+          arguments[:database_config] = true
+        end
+        op.on('--database-port database-port', 'database port') do |val|
+          arguments[:database][:port] = val
+          arguments[:database_config] = true
+        end
+        op.on('--database-name database-name', 'database name') do |val|
+          arguments[:database][:database] = val
+          arguments[:database_config] = true
+        end
       end
       parser.parse!(argv)
 

data/lib/engine/app/controllers/application_controller.rb

@@ -1,8 +1,10 @@
 class ApplicationController < ActionController::Base
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
 
+  rescue_from Redis::CannotConnectError, :with => :redis_not_available
+
+  helper_method :backend
+
   if Authentication.authentication_required?
     http_basic_authenticate_with name: Authentication.credentials[:user], password: Authentication.credentials[:password]
   end
@@ -10,4 +12,8 @@ class ApplicationController < ActionController::Base
   def backend
     @backend ||= BackendConnection.build(current_database: session[:database])
   end
+
+  def redis_not_available
+    render 'layouts/redis_not_available'
+  end
 end

data/lib/engine/app/controllers/notifications_controller.rb

@@ -3,7 +3,7 @@ class NotificationsController < ApplicationController
   before_action :load_section
 
   def index
-    @notifications = Notification.all
+    @notifications = Notification.paginate(:page => params[:page], :per_page => 20)
   end
 
   def destroy

data/lib/engine/app/controllers/performance_controller.rb

@@ -1,8 +1,15 @@
 class PerformanceController < ApplicationController
+  before_action :load_section
+
   def index
   end
 
   def check
     @stats = PerformanceStats.new(backend).result
   end
+
+  private
+  def load_section
+    @section = 'performance'
+  end
 end

data/lib/engine/app/helpers/application_helper.rb

@@ -28,4 +28,8 @@ module ApplicationHelper
   def edit_class
     'btn btn-primary'
   end
+
+  def redis_configuration_string
+    "#{backend.host}:#{backend.port}"
+  end
 end

data/lib/engine/app/helpers/pagination_helper.rb

@@ -2,7 +2,7 @@ require 'will_paginate-bootstrap'
 
 module PaginationHelper
   def bootstrap_paginate(results)
-    will_paginate results, renderer: BootstrapPagination::Rails
+    will_paginate results, renderer: BootstrapPagination::Rails, previous_label: '<<', next_label: '>>'
   end
 end
 

data/lib/engine/app/lib/backend.rb

@@ -1,5 +1,3 @@
-require 'redis'
-
 class Backend
   attr_accessor :host, :port, :current_database
 

data/lib/engine/app/views/layouts/redis_not_available.haml

@@ -0,0 +1,3 @@
+.message_centered
+  = "Can not connect to redis instance #{redis_configuration_string}"
+

data/lib/engine/app/views/notifications/index.haml

@@ -12,3 +12,5 @@
 
   %tbody
     = render @notifications
+
+= bootstrap_paginate @notifications

data/lib/engine/config/initializers/configuration.rb

@@ -5,4 +5,8 @@ if defined?(REDIS_MONITOR_OPTS)
   end
   Authorization.setup(REDIS_MONITOR_OPTS[:permissions])
   Authentication.setup(REDIS_MONITOR_OPTS[:credentials])
+
+  if REDIS_MONITOR_OPTS[:database_config]
+    ActiveRecord::Base.establish_connection(REDIS_MONITOR_OPTS[:database])
+  end
 end

data/lib/engine/config/initializers/redis.rb

@@ -0,0 +1 @@
+require 'redis'

data/lib/engine/config/initializers/will_paginate.rb

@@ -1 +1,2 @@
-require 'will_paginate/array'
+require 'will_paginate/array'
+require 'will_paginate/active_record'

data/lib/engine/db/migrate/20140118183403_create_notifications.rb

@@ -2,7 +2,7 @@ class CreateNotifications < ActiveRecord::Migration
   def change
     create_table :notifications do |t|
       t.string :reporter, default: ''
-      t.text :message, default: ''
+      t.text :message
 
       t.timestamps
     end

data/lib/engine/db/schema.rb

@@ -27,11 +27,11 @@ ActiveRecord::Schema.define(version: 20140118183403) do
     t.datetime "updated_at"
   end
 
-  add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority"
+  add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree
 
   create_table "notifications", force: true do |t|
     t.string   "reporter",   default: ""
-    t.text     "message",    default: ""
+    t.text     "message"
     t.datetime "created_at"
     t.datetime "updated_at"
   end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module RedisMonitor
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/redis_monitor.gemspec

@@ -24,13 +24,14 @@ Gem::Specification.new do |spec|
 
   if defined?(JRUBY_VERSION)
     spec.add_runtime_dependency 'activerecord-jdbcsqlite3-adapter'
+    spec.add_runtime_dependency 'activerecord-jdbcmysql-adapter'
   else
     spec.add_runtime_dependency 'sqlite3'
+    spec.add_runtime_dependency 'mysql2'
   end
 
   spec.add_runtime_dependency 'jquery-rails'
   spec.add_runtime_dependency 'haml', '~> 4.0'
-  spec.add_runtime_dependency 'twitter-bootstrap-rails'
   spec.add_runtime_dependency 'will_paginate', '~> 3.0.5'
   spec.add_runtime_dependency 'will_paginate-bootstrap'
   spec.add_runtime_dependency 'delayed_job_active_record'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_monitor
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Javier Jimenez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -67,33 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: haml
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: twitter-bootstrap-rails
+  name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -261,6 +261,7 @@ files:
 - lib/engine/app/views/content/search.haml
 - lib/engine/app/views/info/index.haml
 - lib/engine/app/views/layouts/application.haml
+- lib/engine/app/views/layouts/redis_not_available.haml
 - lib/engine/app/views/notifications/_notification.haml
 - lib/engine/app/views/notifications/index.haml
 - lib/engine/app/views/performance/check.haml
@@ -289,6 +290,7 @@ files:
 - lib/engine/config/initializers/haml.rb
 - lib/engine/config/initializers/inflections.rb
 - lib/engine/config/initializers/mime_types.rb
+- lib/engine/config/initializers/redis.rb
 - lib/engine/config/initializers/secret_token.rb
 - lib/engine/config/initializers/session_store.rb
 - lib/engine/config/initializers/will_paginate.rb
@@ -337,7 +339,6 @@ files:
 - lib/engine/spec/models/watch_key_task_spec.rb
 - lib/engine/spec/models/watch_query_task_spec.rb
 - lib/engine/spec/spec_helper.rb
-- lib/engine/tmp/.keep
 - lib/engine/vendor/assets/javascripts/.keep
 - lib/engine/vendor/assets/stylesheets/.keep
 - lib/redis_monitor.rb