simple_webmon 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 595c8a1adfb0f5a28b61372756116f0d87f4b9a7
-  data.tar.gz: 61bba8babdf95e1ea3e1eac190caad363ad61572
+  metadata.gz: 0e3a74a386aff7a597f0897fa06aa000b389ea26
+  data.tar.gz: ee0b37c6d506206e38dab34bc363be86b152844a
 SHA512:
-  metadata.gz: a07eb5abf9bfc4979fb7d8930d97f7413a536590babc1ed94e67de68d1e8f376e2050de7439c0b711cb33c5a2dfa9c0ac0fc20f36a438eb208da62626fa7e471
-  data.tar.gz: 50ac4a44a586c1b53d55bcd8326eb34596d5c50335d4e64e4faeb8a184bc242e3622272daac172dfe9fd17d2c3451eda8e5f846513222afd58770c99864bdc68
+  metadata.gz: 0c2695aac94859d2cbbc50c6345433a76a8a39dec6470297ec05397e75b0565020c791612aa499c441794efcc8a55c0c775761cbf24ca6125b76d410600b2d01
+  data.tar.gz: 7ce04cd2f066fad0a8566d09fdb8346a616aedda6d232c03c983339de4407a01be78e279bb4e42bbc600ce700be5c159c9b80d05109b75d14f90a777546e1a3a

data/lib/simple_webmon.rb

@@ -4,10 +4,24 @@ require 'uri'
 require 'timeout'
 
 module SimpleWebmon
+
+  class Site
+    attr_reader :url, :timeout
+    attr_accessor :status
+
+    def initialize(url, timeout = 30)
+      @url = url
+      @timeout = timeout
+    end
+  end
+
   class Monitor
 
     def get_status(url)
       res = Net::HTTP.get_response(URI.parse(url))
+      if res.code == "301"
+	res = Net::HTTP.get_response(URI.parse(res.header['location']))
+      end
       res.message
     end
 
@@ -23,5 +37,12 @@ module SimpleWebmon
       status == 'OK' ? status : "ERROR: #{status}"
     end
 
+    def check_sites(site_list)
+      site_list.each do |site|
+	site.status = check(site.url, site.timeout)
+      end
+      site_list
+    end
+
   end
 end

data/lib/simple_webmon/version.rb

@@ -1,3 +1,3 @@
 module SimpleWebmon
-  VERSION = "1.0.0"
+  VERSION = "1.1.1"
 end

data/spec/lib/simple_webmon_spec.rb

@@ -2,54 +2,107 @@ require 'spec_helper'
 require 'simple_webmon'
 
 describe SimpleWebmon do
-  before(:all) do
-    FakeWeb.allow_net_connect = false
+  context 'Monitor' do
+    before(:all) do
+      FakeWeb.allow_net_connect = false
 
-    FakeWeb.register_uri(:get, "http://good.example.com/",
-			 body: "Hello World!")
+      FakeWeb.register_uri(:get, "http://good.example.com/",
+			   body: "Hello World!")
 
-    FakeWeb.register_uri(:get, "http://servererror.example.com/",
-			 body: "Internal Server Error",
-			 status: ["500", "Internal Server Error"])
+      FakeWeb.register_uri(:get, "http://servererror.example.com/",
+			   body: "Internal Server Error",
+			   status: ["500", "Internal Server Error"])
 
-    FakeWeb.register_uri(:get, "http://notfound.example.com/",
-			 body: "Page Not Found",
-			 status: ["404", "Not Found"])
+      FakeWeb.register_uri(:get, "http://notfound.example.com/",
+			   body: "Page Not Found",
+			   status: ["404", "Not Found"])
 
-    FakeWeb.register_uri(:get, "http://slow.example.com/",
-			 response: sleep(10))
-  end
-
-  let(:monitor) { SimpleWebmon::Monitor.new }
+      FakeWeb.register_uri(:get, "http://slow.example.com/",
+			   response: sleep(10))
 
-  describe '.get_status' do
-    it "returns 'OK' when given a URL for a properly responding site" do
-      expect(monitor.get_status("http://good.example.com/")).to eq 'OK'
+      FakeWeb.register_uri(:get, "https://redirect.example.com/",
+			   status: ["301", "Moved Permanently"],
+			   location: "http://good.example.com/")
     end
 
-    it "returns correct status message when given a URL that responds with an Internal Server Error" do
-      expect(monitor.get_status("http://servererror.example.com/")).to eq 'Internal Server Error'
-    end
-  end
+    let(:monitor) { SimpleWebmon::Monitor.new }
 
-  describe '.check' do
+    describe '.get_status' do
+      it "returns 'OK' when given a URL for a properly responding site" do
+	expect(monitor.get_status("http://good.example.com/")).to eq 'OK'
+      end
 
-    it "returns 'DOWN' when given a URL that doesn't respond in time" do
-      expect(monitor.check("http://slow.example.com/", 1)).to eq 'ERROR: Timeout'
+      it "returns correct status message when given a URL that responds with an Internal Server Error" do
+	expect(monitor.get_status("http://servererror.example.com/")).to eq 'Internal Server Error'
+      end
     end
 
-    it "returns 'OK' when given a URL that responds correctly" do
-      expect(monitor.check("http://good.example.com/")).to eq 'OK'
+    describe '.check' do
+      it "returns 'ERROR' and timeout message when given a URL that doesn't respond in time" do
+	expect(monitor.check("http://slow.example.com/", 1)).to eq 'ERROR: Timeout'
+      end
+
+      it "returns 'OK' when given a URL that responds correctly" do
+	expect(monitor.check("http://good.example.com/")).to eq 'OK'
+      end
+
+      it "returns 'ERROR' and the correct status message when given a URL that fails" do
+	expect(monitor.check("http://servererror.example.com/")).to eq 'ERROR: Internal Server Error'
+      end
+
+      it "returns 'ERROR' and the correct status message when given a URL that fails" do
+	expect(monitor.check("http://notfound.example.com/")).to eq 'ERROR: Not Found'
+      end
+
+      it "returns 'OK' when given a URL that redirects to a site that responds correctly" do
+	expect(monitor.check("https://redirect.example.com")).to eq 'OK'
+      end
+
     end
 
-    it "returns 'ERROR' and the correct status message when given a URL that fails" do
-      expect(monitor.check("http://servererror.example.com/")).to eq 'ERROR: Internal Server Error'
+    describe '.check_sites' do
+      let(:sites) {
+	[
+	  SimpleWebmon::Site.new("http://good.example.com"),
+	  SimpleWebmon::Site.new("http://slow.example.com", 1),
+	  SimpleWebmon::Site.new("http://servererror.example.com"),
+	  SimpleWebmon::Site.new("http://notfound.example.com")
+	]
+      }
+
+      it "accepts an array of Site objects and returns the same" do
+	expect(monitor.check_sites(sites)).to be_an(Array)
+      end
+
+      it "returned array has hostname and check response" do
+	response = monitor.check_sites(sites)
+	expect(response[0].status).to eq 'OK'
+      end
+
+      it "passes the timeout parameter along to check" do
+	response = monitor.check_sites(sites)
+	expect(response[1].status).to eq 'ERROR: Timeout'
+      end
+
+      it "returns correct status messages for each element passed in" do
+	response = monitor.check_sites(sites)
+	expect(response[0].status).to eq 'OK'
+	expect(response[1].status).to eq 'ERROR: Timeout'
+	expect(response[2].status).to eq 'ERROR: Internal Server Error'
+	expect(response[3].status).to eq 'ERROR: Not Found'
+      end
     end
+  end
 
-    it "returns 'ERROR' and the correct status message when given a URL that fails" do
-      expect(monitor.check("http://notfound.example.com/")).to eq 'ERROR: Not Found'
+  describe 'Site' do
+    it "can be created" do
+      expect(SimpleWebmon::Site.new("http://good.example.com")).to be_a(SimpleWebmon::Site)
     end
 
+    it "stores a site URL and timeout settings" do
+      site = SimpleWebmon::Site.new("http://good.example.com", 10)
+      expect(site.url).to eq("http://good.example.com")
+      expect(site.timeout).to eq(10)
+    end
   end
-
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: simple_webmon
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Mike Admire
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-12-25 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: rspec
   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: fakeweb
   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'
 description: Simple website monitoring.
@@ -73,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -94,12 +94,12 @@ 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: []