openldap_monitor_extractor 0.0.6 → 0.0.7

data/lib/openldap_monitor_extractor.rb

@@ -1,4 +1,3 @@
-require "openldap_monitor_extractor/version"
 require "openldap_monitor_extractor/core"
 
 

data/lib/openldap_monitor_extractor/mapper.rb

@@ -2,11 +2,10 @@ module OpenldapMonitorExtractor
 
   class Mapper
     
-    private
     MAPPER = {
     
-      :start_time           =>{ :dn =>"cn=Start,cn=Time,cn=Monitor",          :attribute =>:monitorTimestamp,   :type =>:timestamp },
-      :current_time         =>{ :dn =>"cn=Current,cn=Time,cn=Monitor",        :attribute =>:monitorTimestamp,   :type =>:timestamp },
+      :start_time           =>{ :dn =>"cn=Start,cn=Time,cn=Monitor",          :attribute =>:monitortimestamp,   :type =>:timestamp },
+      :current_time         =>{ :dn =>"cn=Current,cn=Time,cn=Monitor",        :attribute =>:monitortimestamp,   :type =>:timestamp },
     
       :total_connections    =>{ :dn =>"cn=Total,cn=Connections,cn=Monitor",   :attribute =>:monitorcounter,     :type =>:counter },
 
@@ -33,8 +32,8 @@ module OpenldapMonitorExtractor
     }
   
     KEYS = MAPPER.keys
+
   
-    public
     def self.validate_key(key)  
       key == :all || KEYS.include?(key)
     end

data/lib/openldap_monitor_extractor/monitor_data.rb

@@ -1,5 +1,6 @@
 require "time"
 require "ostruct"
+require "openldap_monitor_extractor/mapper"
 
 
 module OpenldapMonitorExtractor
@@ -14,7 +15,7 @@ module OpenldapMonitorExtractor
         when :counter   then data.to_i
         when :timestamp then Time.parse(data)
       else 
-        ArgumentError.new("Invalid data type: #{type}")
+        raise ArgumentError.new("Invalid data type: #{type}")
       end      
     end
     
@@ -28,19 +29,15 @@ module OpenldapMonitorExtractor
     
     def add(key, entry)
       
+      raise ArgumentError.new("Invalid key: #{key}") unless @mapper.validate_key(key)
+      
       type    = @mapper.type(key)
       value   = entry[0][@mapper.attribute(key)][0]
       t_value = MonitorData.transform(value, type)
       
       @data.send("#{key}=", t_value)
-    end
-    
-    def inspect()
-      @data.inspect
-    end
-    
-    def to_s()
-      "#{inspect()}"
+      
+      self
     end
   end
 end

data/lib/openldap_monitor_extractor/version.rb

@@ -1,4 +1,4 @@
 module OpenldapMonitorExtractor
 
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/openldap_monitor_extractor.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "syntax"
 end

data/spec/mapper_spec.rb

@@ -0,0 +1,93 @@
+$:.unshift File.dirname(__FILE__)
+
+
+require 'spec_helper'
+require 'openldap_monitor_extractor/monitor_data'
+
+
+describe OpenldapMonitorExtractor::Mapper do
+
+  describe "#validate_key" do
+
+    it 'should validate keys' do
+      
+      OpenldapMonitorExtractor::Mapper::KEYS.each { |k| OpenldapMonitorExtractor::Mapper.validate_key(k).should eq(true) }
+    end
+
+    it 'should validate :all as key' do
+      
+      OpenldapMonitorExtractor::Mapper.validate_key(:all).should eq(true)
+    end
+  end
+
+  describe "#keys" do
+  
+    it 'should return all the keys' do
+      
+      OpenldapMonitorExtractor::Mapper.dns().should eq(OpenldapMonitorExtractor::Mapper::KEYS)
+    end
+    
+    it 'should return all the keys as an Array' do
+      
+      OpenldapMonitorExtractor::Mapper.dns().should be_an_instance_of(Array)
+    end
+  end
+
+  describe "#dn" do
+    
+    it 'should return the DN for a key' do
+      
+      OpenldapMonitorExtractor::Mapper::KEYS.each do |k| 
+        OpenldapMonitorExtractor::Mapper.dn(k).should eq(OpenldapMonitorExtractor::Mapper::MAPPER[k][:dn])
+      end
+    end
+    
+    it "should return the DN as a String" do
+    
+      OpenldapMonitorExtractor::Mapper::KEYS.each do |k| 
+        OpenldapMonitorExtractor::Mapper.dn(k).should be_an_instance_of(String)
+      end
+    end
+    
+    it "should retulr the DN as a base of cn=Monitor" do
+      
+      OpenldapMonitorExtractor::Mapper::KEYS.each do |k| 
+        OpenldapMonitorExtractor::Mapper.dn(k).should match(/(.+),cn=Monitor/)
+      end        
+    end
+  end
+
+  describe "#attribute" do
+    
+    it 'should return the attribute for a key' do
+      
+      OpenldapMonitorExtractor::Mapper::KEYS.each do |k|         
+        OpenldapMonitorExtractor::Mapper.attribute(k).should eq(OpenldapMonitorExtractor::Mapper::MAPPER[k][:attribute])
+      end
+    end
+      
+    it 'should return the attribute for a key as a Symbol' do
+      
+      OpenldapMonitorExtractor::Mapper::KEYS.each do |k| 
+        OpenldapMonitorExtractor::Mapper.attribute(k).should be_an_instance_of(Symbol)
+      end
+    end
+  end
+  
+  describe "#type" do
+    
+    it 'should return the type for a key' do
+      
+      OpenldapMonitorExtractor::Mapper::KEYS.each do |k|      
+        OpenldapMonitorExtractor::Mapper.type(k).should eq(OpenldapMonitorExtractor::Mapper::MAPPER[k][:type])
+      end  
+    end
+      
+    it 'should return the type for a key as a Symbol' do
+
+      OpenldapMonitorExtractor::Mapper::KEYS.each do |k|      
+        OpenldapMonitorExtractor::Mapper.type(k).should be_an_instance_of(Symbol)
+      end
+    end
+  end
+end

data/spec/monitor_data_spec.rb

@@ -0,0 +1,49 @@
+$:.unshift File.dirname(__FILE__)
+
+
+require 'spec_helper'
+require 'openldap_monitor_extractor/monitor_data'
+
+
+describe OpenldapMonitorExtractor::MonitorData do
+
+  describe "#transform" do
+
+    it '#should transform to an integer' do
+  
+      OpenldapMonitorExtractor::MonitorData.transform(10,     :counter).should equal(10)
+      OpenldapMonitorExtractor::MonitorData.transform("Fail", :counter).should equal(0)
+
+      expect { OpenldapMonitorExtractor::MonitorData.transform(10, :foo) }.to raise_error(ArgumentError)
+    end
+
+    it '#should transform to a timestamp' do
+  
+      OpenldapMonitorExtractor::MonitorData.transform("20130530Z", :timestamp).should be_an_instance_of Time
+      OpenldapMonitorExtractor::MonitorData.transform("20130530Z", :timestamp).should eq(Time.parse("20130530Z"))
+
+      expect { OpenldapMonitorExtractor::MonitorData.transform("fodate", :timestamp) }.to raise_error(ArgumentError)
+    end
+  end
+
+  describe "#add" do
+  
+    it 'should create a valid object whit add method' do
+  
+      md = OpenldapMonitorExtractor::MonitorData.new(OpenldapMonitorExtractor::Mapper)
+
+      md.should be_an_instance_of OpenldapMonitorExtractor::MonitorData   
+      md.should respond_to :add
+      
+      md.add(:total_connections, [{ :monitorcounter =>0, :type =>:counter }]).should be_an_instance_of OpenldapMonitorExtractor::MonitorData
+      md.data.should be_an_instance_of OpenStruct 
+      md.data.should respond_to :total_connections
+      md.data.total_connections.should equal(0)
+      
+      expect { md.add(:foo, [{ :monitorcounter =>0, :type =>:counter }]) }.to raise_error(ArgumentError)
+      md.data.should be_an_instance_of OpenStruct 
+      md.data.should respond_to :total_connections
+      md.data.total_connections.should equal(0)      
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1 +1,2 @@
-$:.unshift File.expand_path(File.join(%w{.. .. lib}, __FILE__))
+$:.unshift File.join(File.dirname(__FILE__), %w{.. lib})
+$:.unshift File.join(File.dirname(__FILE__), %w{.. lib openldap_monitor_extractor})

data/spec/{openldap_monitor_extractor_spec.rb → version_spec.rb}

@@ -1,3 +1,6 @@
+$:.unshift File.dirname(__FILE__)
+
+
 require 'spec_helper'
 require 'openldap_monitor_extractor/version'
 
@@ -8,9 +11,4 @@ describe OpenldapMonitorExtractor do
     
     OpenldapMonitorExtractor::VERSION.should_not be_nil
   end
-
-  it 'should do something useful' do
-    
-    false.should be_true
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openldap_monitor_extractor
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ldap
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: syntax
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: OpenLDAP stats gem extractor
 email:
 - javier.juarez@gmail.com
@@ -96,8 +112,10 @@ files:
 - lib/openldap_monitor_extractor/monitor_data.rb
 - lib/openldap_monitor_extractor/version.rb
 - openldap_monitor_extractor.gemspec
-- spec/openldap_monitor_extractor_spec.rb
+- spec/mapper_spec.rb
+- spec/monitor_data_spec.rb
 - spec/spec_helper.rb
+- spec/version_spec.rb
 homepage: http://github.com/jjuarez/openldap_monitor_extractor
 licenses:
 - MIT
@@ -113,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2902660141660861386
+      hash: -1420333256945599315
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -122,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2902660141660861386
+      hash: -1420333256945599315
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -130,5 +148,7 @@ signing_key:
 specification_version: 3
 summary: OpenLDAP Monitor database handler utility
 test_files:
-- spec/openldap_monitor_extractor_spec.rb
+- spec/mapper_spec.rb
+- spec/monitor_data_spec.rb
 - spec/spec_helper.rb
+- spec/version_spec.rb