redis_monitor 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a8d5a1c405c057ecdd004a3311792975a2817e4
-  data.tar.gz: b28d9a3b18b26bb9d0cf5f292e0ca5d8d2d533d7
+  metadata.gz: 6bfd5c7207c7570d9c7e902752ccd64f5630c965
+  data.tar.gz: 5292f747d52d970b75b61323bba55975d7cd1410
 SHA512:
-  metadata.gz: fb4cfb34c575b90efc0b87164a20578b8bf30c5dac35bb3592dccd50a82a412adf416b2f3b65709e22a453ca50d5ff1b55726cdf468753529c42679a02ea0b17
-  data.tar.gz: 84b833ac4f52990241ba7ca870def1dd25cf319d53a4bff0df73cc9e422bd2969a98a32eebcb0586dd2786d87c1b8b2ce9cb0d9f8cacab2884c8547376a05ff7
+  metadata.gz: 7483993062c4a562904bc4f61a52a64b013914657698c0a961781d00b9a6c2600d0dfca4e93b8d8c1dbefcfbff0c7a0e07987050aa01137a98356eb6ef9ae00f
+  data.tar.gz: 03987d561f9a6036afa897f0fed88f92f19ea5b3ddc71cdb9b4775e848c1be79c5691703abee25daff971b4d52c3da9c83dc1dbda750f596412868be446fbc02

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/README.md

@@ -1,7 +1,5 @@
 # RedisMonitor
 
-TODO: Write a gem description
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -18,7 +16,13 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+    $ redis_monitor --http-port http_port --host host --port port
+
+Then browse http://localhost:http_port
+
+For more information about the parameters:
+
+    $ redis_monitor --help
 
 ## Contributing
 
@@ -27,3 +31,7 @@ TODO: Write usage instructions here
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+Please write meaningful test, ff you need to execute them:
+
+    $ rspec spec

data/lib/controllers/base_controller.rb

@@ -1,14 +1,31 @@
 require 'modules/backend'
+require 'errors/errors'
 
 module RedisMonitor
   module Controllers
     class BaseController
       attr_accessor :context, :params
 
+      include RedisMonitor::Helpers::BaseHelper
+      include RedisMonitor::Helpers::LayoutsHelper
+
       def initialize(opts = {})
         @context = opts.delete(:context)
         @params = opts
       end
+
+      def execute(action)
+        begin
+          send(action)
+        rescue RedisMonitor::Errors::RedisNotAvailable
+          redis_not_available
+        end
+      end
+
+      def redis_not_available
+        haml 'errors/redis_not_available'.to_sym, layout: main_layout,
+                     locals: {host: Backend.host, port: Backend.port}
+      end
     end
   end
 end

data/lib/controllers/info_controller.rb

@@ -5,7 +5,7 @@ module RedisMonitor
       include RedisMonitor::Helpers::LayoutsHelper
 
       def index
-        context.haml 'info/info'.to_sym, :layout => main_layout, :locals => {:info => Backend.info}
+        haml 'info/info'.to_sym, layout: main_layout, locals: {info: Backend.info}
       end
     end
   end

data/lib/errors/errors.rb

@@ -0,0 +1 @@
+require 'errors/redis_not_available'

data/lib/errors/redis_not_available.rb

@@ -0,0 +1,7 @@
+module RedisMonitor
+  module Errors
+    class RedisNotAvailable < Exception
+
+    end
+  end
+end

data/lib/helpers/base_helper.rb

@@ -0,0 +1,9 @@
+module RedisMonitor
+  module Helpers
+    module BaseHelper
+      def haml(*arguments)
+        context.haml(*arguments)
+      end
+    end
+  end
+end

data/lib/modules/backend.rb

@@ -1,4 +1,5 @@
 require 'redis'
+require 'errors/errors'
 
 module RedisMonitor
   class Backend
@@ -7,8 +8,26 @@ module RedisMonitor
       @@port = arguments[:redis_port]
     end
 
+    def self.host
+      @@host
+    end
+
+    def self.port
+      @@port
+    end
+
+    def self.ensure_connected(redis)
+      begin
+        redis.ping
+      rescue Redis::CannotConnectError => e
+        raise RedisMonitor::Errors::RedisNotAvailable
+      end
+    end
+
     def self.redis
-      Redis.new(:host => @@host, :port => @@port)
+      redis = Redis.new(:host => host, :port => port)
+      ensure_connected(redis)
+      redis
     end
 
     def self.info

data/lib/modules/helpers.rb

@@ -1,8 +1,10 @@
+require 'helpers/base_helper'
 require 'helpers/layouts_helper'
 
 module RedisMonitor
   module Helpers
     module AllHelpers
+      include BaseHelper
       include LayoutsHelper
     end
   end

data/lib/modules/router.rb

@@ -7,7 +7,7 @@ module RedisMonitor
 
     def self.included(server)
       server.get('/'){ redirect '/info' }
-      server.get('/info'){ InfoController.new(context: self).index }
+      server.get('/info'){ InfoController.new(context: self).execute(:index) }
     end
   end
 end

data/lib/modules/version.rb

@@ -1,3 +1,3 @@
 module RedisMonitor
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/static/styles/custom.css

@@ -1,3 +1,8 @@
 body {
   padding-top: 60px;
+}
+
+.message_centered {
+  text-align: center;
+  padding-top: 20%;
 }

data/lib/views/errors/redis_not_available.haml

@@ -0,0 +1,2 @@
+.message_centered
+  Can't connect to a redis instance in host: #{host} and port: #{port}

data/redis_monitor.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = %w(javiyu7@gmail.com)
   spec.description   = %q{Get general information of a running redis instance}
   spec.summary       = %q{Get general information of a running redis instance}
-  spec.homepage      = ''
+  spec.homepage      = 'https://github.com/javiyu/redis_monitor'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)

data/spec/controllers/base_controller_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe BaseController do
+  before :each do
+    @context = double(:context)
+    @controller = BaseController.new(context: @context)
+  end
+
+  describe 'execute method' do
+    it 'should not raise error if the action executed raised RedisNotAvailable' do
+      @controller.stub(:action) { raise RedisNotAvailable }
+      @controller.should_receive(:redis_not_available)
+      expect{ @controller.execute(:action) }.not_to raise_error
+    end
+  end
+
+  describe 'redis_not_available method' do
+    it 'should render redis not available error page' do
+      Backend.stub(:host)
+      Backend.stub(:port)
+      @context.should_receive(:haml).with('errors/redis_not_available'.to_sym, anything)
+      @controller.redis_not_available
+    end
+  end
+end

data/spec/controllers/info_controller_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe InfoController do
+  before :each do
+    @context = double(:context)
+    @controller = InfoController.new(context: @context)
+  end
+
+  describe 'index action' do
+    before :each do
+      Backend.stub(:info){ {} }
+    end
+
+    it 'should not fail' do
+      @context.stub(:haml)
+      expect{ @controller.index }.not_to raise_error
+    end
+
+    it 'should render info page' do
+      @context.should_receive(:haml).with('info/info'.to_sym, anything)
+      @controller.index
+    end
+  end
+end

data/spec/modules/backend_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Backend do
+  before :each do
+    Backend.stub(:host)
+    Backend.stub(:port)
+  end
+
+  describe 'ensure_connected method' do
+    it 'should raise RedisNotAvailable if redis throws an exception' do
+      redis = double(:redis)
+      redis.stub(:ping){ raise Redis::CannotConnectError }
+      expect{ Backend.ensure_connected(redis) }.to raise_error RedisNotAvailable
+    end
+  end
+
+  describe 'redis method' do
+    it 'should call to ensure_connected' do
+      Backend.should_receive(:ensure_connected)
+      Backend.redis
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,19 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.order = 'random'
+end
+
+require 'modules/helpers'
+require 'modules/controllers'
+require 'modules/backend'
+
+include RedisMonitor
+include RedisMonitor::Controllers
+include RedisMonitor::Errors

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_monitor
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Javier Jimenez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -117,6 +117,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -124,6 +125,9 @@ files:
 - bin/redis_monitor
 - lib/controllers/base_controller.rb
 - lib/controllers/info_controller.rb
+- lib/errors/errors.rb
+- lib/errors/redis_not_available.rb
+- lib/helpers/base_helper.rb
 - lib/helpers/layouts_helper.rb
 - lib/modules/backend.rb
 - lib/modules/controllers.rb
@@ -135,11 +139,15 @@ files:
 - lib/server/server.rb
 - lib/static/styles/bootstrap.min.css
 - lib/static/styles/custom.css
-- lib/views/algo.haml
+- lib/views/errors/redis_not_available.haml
 - lib/views/info/info.haml
 - lib/views/layouts/main.haml
 - redis_monitor.gemspec
-homepage: ''
+- spec/controllers/base_controller_spec.rb
+- spec/controllers/info_controller_spec.rb
+- spec/modules/backend_spec.rb
+- spec/spec_helper.rb
+homepage: https://github.com/javiyu/redis_monitor
 licenses:
 - MIT
 metadata: {}
@@ -163,4 +171,8 @@ rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Get general information of a running redis instance
-test_files: []
+test_files:
+- spec/controllers/base_controller_spec.rb
+- spec/controllers/info_controller_spec.rb
+- spec/modules/backend_spec.rb
+- spec/spec_helper.rb

data/lib/views/algo.haml

@@ -1,45 +0,0 @@
-%table.table.table-striped
-  %thead
-    %tr
-      %th
-        Student
-      %th
-        First name
-      %th
-        Last name
-      %th
-        Grade
-
-  %tbody
-    %tr
-      %td
-        Example
-      %td
-        Example
-      %td
-        Example
-      %td
-        Example
-
-    %tr
-      %td
-        Example
-      %td
-        Example
-      %td
-        Example
-      %td
-        Example
-
-    %tr
-      %td
-        Example
-      %td
-        Example
-      %td
-        Example
-      %td
-        Example
-
-
-= info