redis_monitor 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6375769808ae00a232eee7ef5d3041bbf59a87d3
-  data.tar.gz: 438135f40a526ce33941500707572cac3b96aa97
+  metadata.gz: 79092e09550d8bcba8120074790e62443fd811ab
+  data.tar.gz: add45fdc52392f1f031555b680509f587ad7224b
 SHA512:
-  metadata.gz: 73887e219724b5898ac8d1220a617865d58893df6078aa7af8e2ea2c5d257310cd1f6274132d248ad3475cdc272667373dbc542b9fe47cb5b935895ca92ece09
-  data.tar.gz: e08e9cebbfe515692dbf3ad48da2c095c235a7caf00f2abc4d723ae30cd0701bc7cb7b1b58a52063947b48bcc87e6f967a2519cd9c05bf09d7c94104d620c083
+  metadata.gz: 2e1da2f8ffa882d255f841ee2420c92ca5dd2e0064a4d503be353d95069aa972683767d668fcde2891dce2dac3da570d9b9f280a5896ebe774275b06f049eb74
+  data.tar.gz: eaf4029ffd01a860eca9f4006a484e3f2c631a9afceac765ab8392d47fd9e83e9452e102c61378a0c3a077e49488d36246c820f12d183953503b6fcb3435fbd9

data/lib/controllers/base_controller.rb

@@ -14,9 +14,9 @@ module RedisMonitor
         @params = opts
       end
 
-      def execute(action)
+      def execute(action, params = {})
         begin
-          send(action)
+          send(action, params)
         rescue RedisMonitor::Errors::RedisNotAvailable
           redis_not_available
         end

data/lib/controllers/content_controller.rb

@@ -0,0 +1,19 @@
+
+module RedisMonitor
+  module Controllers
+    class ContentController < BaseController
+      include RedisMonitor::Helpers::LayoutsHelper
+
+      SECTION = 'content'
+
+      def index(params = {})
+        haml 'content/index'.to_sym, layout: main_layout, locals: {section: SECTION}
+      end
+
+      def search(params = {})
+        results = Backend.search(params[:key])
+        haml 'content/search'.to_sym, layout: main_layout, locals: {results: results, section: SECTION}
+      end
+    end
+  end
+end

data/lib/controllers/info_controller.rb

@@ -4,8 +4,10 @@ module RedisMonitor
     class InfoController < BaseController
       include RedisMonitor::Helpers::LayoutsHelper
 
-      def index
-        haml 'info/info'.to_sym, layout: main_layout, locals: {info: Backend.info, section: 'info'}
+      SECTION = 'info'
+
+      def index(params={})
+        haml 'info/info'.to_sym, layout: main_layout, locals: {info: Backend.info, section: SECTION}
       end
     end
   end

data/lib/controllers/performance_controller.rb

@@ -4,13 +4,15 @@ module RedisMonitor
     class PerformanceController < BaseController
       include RedisMonitor::Helpers::LayoutsHelper
 
-      def warning
-        haml 'performance/warning'.to_sym, layout: main_layout, locals: {section: 'performance'}
+      SECTION = 'performance'
+
+      def warning(params = {})
+        haml 'performance/warning'.to_sym, layout: main_layout, locals: {section: SECTION}
       end
 
-      def check
+      def check(params = {})
         stats = Backend.performance_stats
-        haml 'performance/check'.to_sym, layout: main_layout, locals: {stats: stats, section: 'performance'}
+        haml 'performance/check'.to_sym, layout: main_layout, locals: {stats: stats, section: SECTION}
       end
 
     end

data/lib/helpers/layouts_helper.rb

@@ -5,19 +5,22 @@ module RedisMonitor
         'layouts/main'.to_sym
       end
 
-      def selected_section(section, selected)
+      def selected_is_selected(section, selected)
         'active' if section == selected
       end
 
+      def section(opts = {})
+        haml_tag :li, class: selected_is_selected(opts[:name], opts[:selected_section]) do
+          haml_tag :a, opts[:title], href: opts[:url]
+        end
+      end
+
       def content_menu(selected_section)
         capture_haml do
           haml_tag :ul, class: 'nav navbar-nav' do
-            haml_tag :li, class: selected_section('info', selected_section) do
-              haml_tag :a, 'Info', href: '/info'
-            end
-            haml_tag :li, class: selected_section('performance', selected_section) do
-              haml_tag :a, 'Performance', href: '/performance'
-            end
+            section(name: 'info', title: 'Info', url: '/info', selected_section: selected_section)
+            section(name: 'content', title: 'Content', url: '/content', selected_section: selected_section)
+            section(name: 'performance', title: 'Performance', url: '/performance', selected_section: selected_section)
           end
         end
       end

data/lib/modules/backend.rb

@@ -7,7 +7,7 @@ module RedisMonitor
   class Backend
     extend SingleForwardable
 
-    def_delegators :redis, :get, :set, :del, :info, :keys, :dbsize
+    def_delegators :redis, :get, :set, :del, :info, :keys, :dbsize, :monitor
 
     def self.config(arguments)
       @@host = arguments[:redis_host]
@@ -29,5 +29,9 @@ module RedisMonitor
     def self.performance_stats
       PerformanceStats.new(self).results
     end
+
+    def self.search(key)
+      keys(key).map{|found| {key: found, value: get(found)} }
+    end
   end
 end

data/lib/modules/controllers.rb

@@ -1,3 +1,4 @@
 require 'controllers/base_controller'
 require 'controllers/info_controller'
+require 'controllers/content_controller'
 require 'controllers/performance_controller'

data/lib/modules/router.rb

@@ -7,11 +7,14 @@ module RedisMonitor
 
     def self.included(server)
       server.get('/'){ redirect '/info' }
-      server.get('/info'){ InfoController.new(context: self).execute(:index) }
+      server.get('/info'){ InfoController.new(context: self).execute(:index, params) }
+
+      server.get('/content'){ ContentController.new(context: self).execute(:index, params) }
+      server.get('/content/search'){ ContentController.new(context: self).execute(:search, params) }
 
       server.get('/performance'){ redirect '/performance/warning' }
-      server.get('/performance/warning'){ PerformanceController.new(context: self).execute(:warning) }
-      server.get('/performance/check'){ PerformanceController.new(context: self).execute(:check) }
+      server.get('/performance/warning'){ PerformanceController.new(context: self).execute(:warning, params) }
+      server.get('/performance/check'){ PerformanceController.new(context: self).execute(:check, params) }
     end
   end
 end

data/lib/modules/version.rb

@@ -1,3 +1,3 @@
 module RedisMonitor
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/views/content/_search_form.haml

@@ -0,0 +1,10 @@
+- search_term ||= nil
+
+%form{action: '/content/search', method: 'get', style: 'margin-top: 5px'}
+  .form-group
+    %label{for: 'input_key'}
+      Introduce search terms (wildcards allowed)
+    %input.form-control{type: 'text', id: 'input_key', name: 'key', placeholder: 'Search terms', value: search_term}
+  .form-group
+    %button.btn.btn-default{type: 'submit'}
+      Search

data/lib/views/content/index.haml

@@ -0,0 +1 @@
+= haml 'content/_search_form'.to_sym

data/lib/views/content/search.haml

@@ -0,0 +1,17 @@
+= haml 'content/_search_form'.to_sym, locals: {search_term: params[:key]}
+
+%table.table.table-striped
+  %thead
+    %tr
+      %th
+        Key
+      %th
+        Value
+
+  %tbody
+    - results.each do |result|
+      %tr
+        %td
+          = result[:key]
+        %td
+          = result[:value]

data/spec/controllers/content_controller_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe ContentController do
+  before :each do
+    @context = double(:context)
+    @controller = ContentController.new(context: @context)
+  end
+
+  describe 'index action' do
+    it 'should render index template' do
+      @context.should_receive(:haml).with('content/index'.to_sym, anything)
+      @controller.index
+    end
+  end
+
+  describe 'search action' do
+    it 'should render search template' do
+      Backend.stub(:search){ {} }
+      @context.should_receive(:haml).with('content/search'.to_sym, anything)
+      @controller.search
+    end
+  end
+end

data/spec/modules/backend_spec.rb

@@ -24,4 +24,23 @@ describe Backend do
       Backend.performance_stats.should be_kind_of(Hash)
     end
   end
+
+  describe 'search' do
+    let(:keys){ ['k1', 'k2', 'k3'] }
+
+    before :each do
+      Backend.stub(:keys){ keys }
+      Backend.stub(:get){ 'value' }
+    end
+
+    it 'should return an array of hashes' do
+      Backend.search('*').should be_kind_of(Array)
+      Backend.search('*')[0].should be_kind_of(Hash)
+    end
+
+    it 'every entry should have key and value data' do
+      Backend.search('*')[0][:key].should_not be_nil
+      Backend.search('*')[0][:value].should_not be_nil
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_monitor
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Javier Jimenez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2013-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -124,6 +124,7 @@ files:
 - Rakefile
 - bin/redis_monitor
 - lib/controllers/base_controller.rb
+- lib/controllers/content_controller.rb
 - lib/controllers/info_controller.rb
 - lib/controllers/performance_controller.rb
 - lib/errors/errors.rb
@@ -143,6 +144,9 @@ files:
 - lib/static/scripts/jquery-2.0.3.min.js
 - lib/static/styles/bootstrap.min.css
 - lib/static/styles/custom.css
+- lib/views/content/_search_form.haml
+- lib/views/content/index.haml
+- lib/views/content/search.haml
 - lib/views/errors/redis_not_available.haml
 - lib/views/info/info.haml
 - lib/views/layouts/main.haml
@@ -150,6 +154,7 @@ files:
 - lib/views/performance/warning.haml
 - redis_monitor.gemspec
 - spec/controllers/base_controller_spec.rb
+- spec/controllers/content_controller_spec.rb
 - spec/controllers/info_controller_spec.rb
 - spec/controllers/performance_controller_spec.rb
 - spec/modules/backend_spec.rb
@@ -182,6 +187,7 @@ specification_version: 4
 summary: Get general information of a running redis instance
 test_files:
 - spec/controllers/base_controller_spec.rb
+- spec/controllers/content_controller_spec.rb
 - spec/controllers/info_controller_spec.rb
 - spec/controllers/performance_controller_spec.rb
 - spec/modules/backend_spec.rb