redis_monitor 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ff1b1686ad016eb88f4b708cac2efb620c32add
-  data.tar.gz: 7724f8bb31f5823191ebdd6ea088c92128f0ff58
+  metadata.gz: ff13da4a5a6d6d3b4965964e669d6790b8aa88eb
+  data.tar.gz: db3f048bdb23af208771e50116923c962b4b520f
 SHA512:
-  metadata.gz: a75d85f681f8f0ef8c7c25b16c63a96bd670fb9d45be4273299ca288bf8508b918b7b27bddbb7ddcc0fa4095143f1a3f88543ea5365725ef7636d8140c5db651
-  data.tar.gz: 16f7a6580468f0daff350e9b24cb9afd120d8879e9d637353f4dcaf4d9550c94bd10cddb17a347867fa938387f7adfd3d5bf2e6de9454b87434aaa5e5651a3f4
+  metadata.gz: 0008c8e625d7c73d2fe4ad6f554f4ea648557c6d308b4538e870000df576ad8cf052cd78d4931d1f2f62983622356851a2d47fd3444b79e964366250127942cf
+  data.tar.gz: b63cd187913745965bc002e4928f9b72df5a6490ed7febe98615290ed9646ed6bd13e57c76e11bdb7bb73de50fe6f593e51fbad437b2f9503cc296e36e3b81d3

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

@@ -7,4 +7,7 @@ class ApplicationController < ActionController::Base
     http_basic_authenticate_with name: Authentication.credentials[:user], password: Authentication.credentials[:password]
   end
 
+  def backend
+    @backend ||= BackendConnection.build(current_database: session[:database])
+  end
 end

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

@@ -1,21 +1,24 @@
 class ContentController < ApplicationController
   skip_before_action :verify_authenticity_token
   before_action :load_section
+  before_action :load_database_list, only: [:index, :search]
+  before_action :load_current_database, only: [:index, :search]
 
   def index
   end
 
   def search
-    @results = Backend.search(params[:key]).paginate(:page => params[:page], :per_page => 20)
+    results = SearchKey.new(backend, params[:key]).result
+    @results = results.paginate(:page => params[:page], :per_page => 20)
   end
 
   def delete
-    Backend.remove(params[:key])
+    RemoveKey.new(backend, params[:key]).execute
     redirect_to :back
   end
 
   def change_database
-    set_database(params[:database])
+    ChangeDatabase.new(backend, session, params[:database]).execute
     redirect_to :back
   end
 
@@ -24,9 +27,12 @@ class ContentController < ApplicationController
     @section = 'content'
   end
 
-  def set_database(database)
-    session[:database] = database
-    Backend.change_database(database)
+  def load_database_list
+    @databases = DatabaseList.new(backend).result
+  end
+
+  def load_current_database
+    @current_database = backend.current_database
   end
 end
 

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

@@ -1,6 +1,6 @@
 class InfoController < ApplicationController
   def index
     @section = 'info'
-    @info = Backend.info
+    @info = backend.info
   end
 end

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

@@ -3,6 +3,6 @@ class PerformanceController < ApplicationController
   end
 
   def check
-    @stats = Backend.performance_stats
+    @stats = PerformanceStats.new(backend).result
   end
 end

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

@@ -1,21 +1,17 @@
 module DatabaseHelper
-  def current_database
-    session[:database].to_i
-  end
-
-  def databases
-    Backend.databases.each do |database|
+  def databases(dbs)
+    dbs.each do |database|
       database_option(database)
     end
   end
 
   def database_option(database)
-    haml_tag :option, {selected: (database.to_i == current_database.to_i)} do
+    haml_tag :option, {selected: (database.to_i == @current_database.to_i)} do
       haml_concat database
     end
   end
 
-  def choose_database_select
+  def choose_database_select(dbs)
     capture_haml do
       haml_tag :form, action: '/content/change_database', method: 'post' do
         haml_tag :div, class: 'form-group' do
@@ -24,7 +20,7 @@ module DatabaseHelper
           end
 
           haml_tag :select, id: 'database_select', name: 'database', class: 'selectpicker form-control', data: {style: 'btn-info'} do
-            databases
+            databases(dbs)
           end
         end
       end

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

@@ -1,45 +1,19 @@
 require 'redis'
-require 'forwardable'
 
 class Backend
-  extend SingleForwardable
+  attr_accessor :host, :port, :current_database
 
-  def_delegators :redis, :get, :set, :info, :keys, :dbsize, :select
+  delegate :get, :set, :info, :keys, :select, :del, :to => :redis
 
-  def self.config(arguments)
-    @@host = arguments[:redis_host]
-    @@port = arguments[:redis_port]
+  def initialize(opts = {})
+    @host = opts[:host]
+    @port = opts[:port]
+    @current_database = opts[:current_database]
   end
 
-  def self.host
-    @@host
-  end
-
-  def self.port
-    @@port
-  end
-
-  def self.redis
-    @@redis ||= Redis.new(:host => host, :port => port)
-  end
-
-  def self.performance_stats
-    PerformanceStats.new(self).results
-  end
-
-  def self.search(key)
-    keys(key).map{|found| {key: found, value: get(found)} }
-  end
-
-  def self.change_database(*args)
-    select(*args)
-  end
-
-  def self.remove(key)
-    redis.del(key) if Authorization.authorized_for?(:remove_content)
-  end
-
-  def self.databases
-    info.keys.map{|d| d.match(/db(\d+)/);$1}.compact
+  def redis
+    @redis ||= Redis.new(host: host, port: port)
+    @redis.select(current_database)
+    @redis
   end
 end

data/lib/engine/app/lib/backend_connection.rb

@@ -0,0 +1,11 @@
+class BackendConnection
+  cattr_accessor :host, :port, :current_database
+
+  def self.setup
+    yield(self) if block_given?
+  end
+
+  def self.build(opts = {})
+    Backend.new(opts.merge(host: host, port: port))
+  end
+end

data/lib/engine/app/lib/commands/change_database.rb

@@ -0,0 +1,6 @@
+class ChangeDatabase < Struct.new(:backend, :session, :database)
+  def execute
+    backend.current_database = database
+    session[:database] = database
+  end
+end

data/lib/engine/app/lib/commands/database_list.rb

@@ -0,0 +1,5 @@
+class DatabaseList < Struct.new(:backend)
+  def result
+    backend.info.keys.map{|d| d.match(/db(\d+)/);$1}.compact
+  end
+end

data/lib/engine/app/lib/{performance_stats.rb → commands/performance_stats.rb}

@@ -36,7 +36,7 @@ class PerformanceStats < Struct.new(:backend)
     time.real / CREATE_AND_DELETE_ACCESS_TIMES
   end
 
-  def results
+  def result
     { average_access: format_result_in_ms(average_access),
       average_write: format_result_in_ms(average_write),
       average_create_and_delete: format_result_in_ms(average_create_and_delete)}

data/lib/engine/app/lib/commands/remove_key.rb

@@ -0,0 +1,7 @@
+class RemoveKey < Struct.new(:backend, :key)
+  def execute
+    Authorization.execute_if_authorized_for(:remove_content) do
+      backend.del(key)
+    end
+  end
+end

data/lib/engine/app/lib/commands/search_key.rb

@@ -0,0 +1,5 @@
+class SearchKey < Struct.new(:backend, :key)
+  def result
+    backend.keys(key).map{|found| {key: found, value: backend.get(found)} }
+  end
+end

data/lib/engine/app/lib/security/authentication.rb

@@ -1,14 +1,11 @@
-module Authentication
+class Authentication
+  cattr_accessor :credentials
 
-  def self.config(credentials)
+  def self.setup(credentials)
     @@credentials = credentials
   end
 
   def self.authentication_required?
     !!credentials
   end
-
-  def self.credentials
-    @@credentials
-  end
 end

data/lib/engine/app/lib/security/authorization.rb

@@ -1,16 +1,18 @@
 class Authorization
+  cattr_accessor :permissions
+
   DEFAULTS = {remove_content: true}
 
-  def self.config(opts = {})
+  def self.setup(opts = {})
     opts = {} unless opts
     @@permissions = DEFAULTS.merge(opts)
   end
 
-  def self.permissions
-    @@permissions
-  end
-
   def self.authorized_for?(action)
     !!permissions[action]
   end
+
+  def self.execute_if_authorized_for(action)
+    yield if authorized_for?(action) && block_given?
+  end
 end

data/lib/engine/app/views/content/_search_form.haml

@@ -1,6 +1,6 @@
 - search_term ||= nil
 
-= choose_database_select
+= choose_database_select(@databases)
 %hr
 
 %form{action: '/content/search', method: 'get', style: 'margin-top: 5px'}

data/lib/engine/app/views/content/search.haml

@@ -1,4 +1,4 @@
-= render 'search_form', locals: {search_term: params[:key]}
+= render 'search_form', search_term: params[:key]
 
 %table.table.table-striped
   %thead

data/lib/engine/config/environments/production.rb

@@ -20,7 +20,7 @@ Engine::Application.configure do
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  #config.serve_static_assets = false
 
 
   # Specifies the header that your server uses for sending files.

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

@@ -1,5 +1,8 @@
 if defined?(REDIS_MONITOR_OPTS)
-  Backend.config(redis_host: REDIS_MONITOR_OPTS[:redis_host], redis_port: REDIS_MONITOR_OPTS[:redis_port])
-  Authorization.config(REDIS_MONITOR_OPTS[:permissions])
-  Authentication.config(REDIS_MONITOR_OPTS[:credentials])
+  BackendConnection.setup do |config|
+    config.host = REDIS_MONITOR_OPTS[:redis_host]
+    config.port = REDIS_MONITOR_OPTS[:redis_port]
+  end
+  Authorization.setup(REDIS_MONITOR_OPTS[:permissions])
+  Authentication.setup(REDIS_MONITOR_OPTS[:credentials])
 end

data/lib/engine/spec/controllers/content_controller_spec.rb

@@ -1,27 +1,31 @@
 require_relative '../spec_helper'
 
 describe ContentController do
+  let(:backend){ double() }
   before :each do
     request.env['HTTP_REFERER'] = '/'
+    controller.stub(:backend){ backend }
+    controller.stub(:load_database_list)
+    controller.stub(:load_current_database)
   end
 
   describe 'search action' do
     it 'should search on backend' do
-      Backend.should_receive(:search){ [] }
+      SearchKey.any_instance.should_receive(:result){ [] }
       get :search
     end
   end
 
   describe 'delete action' do
     it 'should call remove on Backend' do
-      Backend.should_receive(:remove)
+      RemoveKey.any_instance.should_receive(:execute)
       post :delete
     end
   end
 
   describe 'change_database' do
     it 'should call set_database' do
-      controller.should_receive(:set_database)
+      ChangeDatabase.any_instance.should_receive(:execute)
       post :change_database
     end
   end

data/lib/engine/spec/controllers/info_controller_spec.rb

@@ -1,9 +1,12 @@
 require_relative '../spec_helper'
 
 describe InfoController do
+  let(:backend){ BackendConnection.build }
+
   describe 'index action' do
     it 'should get info from backend' do
-      Backend.should_receive(:info)
+      controller.stub(:backend){ backend }
+      backend.should_receive(:info)
       get :index
     end
   end

data/lib/engine/spec/controllers/performance_controller_spec.rb

@@ -3,7 +3,7 @@ require_relative '../spec_helper'
 describe PerformanceController do
   describe 'check action' do
     it 'should get performance stats from backend' do
-      Backend.should_receive(:performance_stats)
+      PerformanceStats.any_instance.should_receive(:result)
       get :check
     end
   end

data/lib/engine/spec/lib/backend_spec.rb

@@ -1,63 +1,11 @@
 require_relative '../spec_helper'
 
 describe Backend do
-  let(:redis){ double(del: '') }
+  let(:backend){ BackendConnection.build }
 
-  before :each do
-    Backend.stub(:host)
-    Backend.stub(:port)
-    Backend.stub(:redis){ redis }
-  end
-
-  describe 'performance_stats' do
-    before :each do
-      PerformanceStats.any_instance.stub(:results){ {} }
-    end
-
-    it 'should return a hash with the stats' 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
-
-  describe 'del' do
-    it 'should not delete content if not allowed' do
-      Authorization.stub(:authorized_for?).with(:remove_content){ false }
-      redis.should_receive(:del).never
-      Backend.remove('key')
-    end
-
-    it 'should remove content if allowed' do
-      Authorization.stub(:authorized_for?).with(:remove_content){ true }
-      redis.should_receive(:del)
-      Backend.remove('key')
-    end
-  end
-
-  describe 'databases' do
-    it 'should retrieve databases' do
-      info_keys = {db0: '', db1: '', example: ''}
-      Backend.stub(:info){ info_keys }
-      Backend.databases.should include('0')
-      Backend.databases.should include('1')
+  it 'should respond to basic redis methods' do
+    [:get, :set, :del, :info, :keys, :select].each do |method|
+      backend.should respond_to(method)
     end
   end
 end

data/lib/engine/spec/lib/commands/change_database_spec.rb

@@ -0,0 +1,24 @@
+require_relative '../../spec_helper'
+
+describe ChangeDatabase do
+  let(:backend){ Struct.new(:current_database).new(0) }
+  let(:database){ '2' }
+  let(:session){ Struct.new(:database).new(0) }
+  let(:command){ ChangeDatabase.new(backend, session, database) }
+
+  describe 'execute' do
+    before :each do
+      backend.stub(:select)
+    end
+
+    it 'should change current_database' do
+      command.execute
+      backend.current_database.should eq(database)
+    end
+
+    it 'should save current_database in session' do
+      command.execute
+      session[:database].should eq(database)
+    end
+  end
+end

data/lib/engine/spec/lib/commands/database_list_spec.rb

@@ -0,0 +1,15 @@
+require_relative '../../spec_helper'
+
+describe DatabaseList do
+  let(:backend){ double() }
+  let(:command){ DatabaseList.new(backend) }
+
+  describe 'result' do
+    it 'should retrieve all database identifiers' do
+      backend.stub(:info){ {db0: '', db1: '', example: ''} }
+
+      command.result.should include('0')
+      command.result.should include('1')
+    end
+  end
+end

data/lib/engine/spec/lib/{performance_stats_spec.rb → commands/performance_stats_spec.rb}

@@ -1,4 +1,4 @@
-require_relative '../spec_helper'
+require_relative '../../spec_helper'
 
 describe PerformanceStats do
   let(:backend){ double(get: nil, set: nil, del: nil) }
@@ -42,7 +42,7 @@ describe PerformanceStats do
     end
   end
 
-  describe 'results' do
+  describe 'result' do
     before :each do
       performance_stats.stub(:average_access)
       performance_stats.stub(:average_write)
@@ -50,9 +50,9 @@ describe PerformanceStats do
     end
 
     it 'should include performance stats' do
-      performance_stats.results.should include(:average_access)
-      performance_stats.results.should include(:average_write)
-      performance_stats.results.should include(:average_create_and_delete)
+      performance_stats.result.should include(:average_access)
+      performance_stats.result.should include(:average_write)
+      performance_stats.result.should include(:average_create_and_delete)
     end
   end
 end

data/lib/engine/spec/lib/commands/remove_key_spec.rb

@@ -0,0 +1,21 @@
+require_relative '../../spec_helper'
+
+describe RemoveKey do
+  let(:backend){ double() }
+  let(:key){ 'key' }
+  let(:command){ RemoveKey.new(backend, key) }
+
+  describe 'execute' do
+    it 'should not delete content if not allowed' do
+      Authorization.stub(:authorized_for?).with(:remove_content){ false }
+      backend.should_receive(:del).never
+      command.execute
+    end
+
+    it 'should remove content if allowed' do
+      Authorization.stub(:authorized_for?).with(:remove_content){ true }
+      backend.should_receive(:del)
+      command.execute
+    end
+  end
+end

data/lib/engine/spec/lib/commands/search_key_spec.rb

@@ -0,0 +1,25 @@
+require_relative '../../spec_helper'
+
+describe SearchKey do
+  let(:backend){ double() }
+  let(:key){ 'key' }
+  let(:command){ SearchKey.new(backend, key) }
+  let(:keys_found){ ['k1', 'k2', 'k3'] }
+
+  describe 'result' do
+    before :each do
+      backend.stub(:keys){ keys_found }
+      backend.stub(:get){ 'value' }
+    end
+
+    it 'should return an array of hashes' do
+      command.result.should be_kind_of(Array)
+      command.result[0].should be_kind_of(Hash)
+    end
+
+    it 'every entry should have key and value data' do
+      command.result[0][:key].should_not be_nil
+      command.result[0][:value].should_not be_nil
+    end
+  end
+end

data/lib/engine/spec/lib/security/authentication_spec.rb

@@ -5,18 +5,18 @@ describe Authentication do
 
   describe 'config' do
     it 'should inject authentication in server class' do
-      Authentication.config(credentials)
+      Authentication.setup(credentials)
     end
   end
 
   describe 'authentication_required??' do
     it 'should return true if it has some credentials' do
-      Authentication.config(credentials)
+      Authentication.setup(credentials)
       Authentication.authentication_required?.should eq(true)
     end
 
     it 'should return false if no credentials were provided' do
-      Authentication.config(nil)
+      Authentication.setup(nil)
       Authentication.authentication_required?.should eq(false)
     end
   end

data/lib/engine/spec/spec_helper.rb

@@ -41,7 +41,11 @@ RSpec.configure do |config|
   config.order = "random"
 end
 
-Backend.config(redis_host: 'localhost', redis_port: 6379)
-Authorization.config({})
-Authentication.config(nil)
+BackendConnection.setup do |config|
+  config.host = 'localhost'
+  config.port = 6379
+end
+
+Authorization.setup({})
+Authentication.setup(nil)
 

data/lib/redis_monitor.rb

@@ -14,7 +14,6 @@ module RedisMonitor
     args = parse_arguments
     store_arguments(args)
 
-    system('lib/engine/bin/rails', 's', '-p', args[:http_port].to_s)
-    #system('lib/engine/bin/rails', 's', '-e', 'production')
+    system('lib/engine/bin/rails', 's', '-p', args[:http_port].to_s, '-e', 'production')
   end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module RedisMonitor
-  VERSION = '0.2'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_monitor
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - Javier Jimenez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -209,7 +209,12 @@ files:
 - lib/engine/app/helpers/database_helper.rb
 - lib/engine/app/helpers/pagination_helper.rb
 - lib/engine/app/lib/backend.rb
-- lib/engine/app/lib/performance_stats.rb
+- lib/engine/app/lib/backend_connection.rb
+- lib/engine/app/lib/commands/change_database.rb
+- lib/engine/app/lib/commands/database_list.rb
+- lib/engine/app/lib/commands/performance_stats.rb
+- lib/engine/app/lib/commands/remove_key.rb
+- lib/engine/app/lib/commands/search_key.rb
 - lib/engine/app/lib/security/authentication.rb
 - lib/engine/app/lib/security/authorization.rb
 - lib/engine/app/mailers/.keep
@@ -266,7 +271,11 @@ files:
 - lib/engine/spec/controllers/info_controller_spec.rb
 - lib/engine/spec/controllers/performance_controller_spec.rb
 - lib/engine/spec/lib/backend_spec.rb
-- lib/engine/spec/lib/performance_stats_spec.rb
+- lib/engine/spec/lib/commands/change_database_spec.rb
+- lib/engine/spec/lib/commands/database_list_spec.rb
+- lib/engine/spec/lib/commands/performance_stats_spec.rb
+- lib/engine/spec/lib/commands/remove_key_spec.rb
+- lib/engine/spec/lib/commands/search_key_spec.rb
 - lib/engine/spec/lib/security/authentication_spec.rb
 - lib/engine/spec/lib/security/authorization_spec.rb
 - lib/engine/spec/spec_helper.rb