ridler 0.1.1.alpha → 0.1.1.beta

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzJhZDczNDY2ZTcxNjQxOTJkNTIyMTJjY2IyZGUyMTJhZmUyOWI4Ng==
+  data.tar.gz: !binary |-
+    NDBmODU4ZjlkYmFjOWMzY2ZiMTljNjkzY2FkMGM1NTI4YWE1YTM4OQ==
+SHA512:
+  metadata.gz: !binary |-
+    NTU0ZTQ3ZGRmNThlNmUyMjMyNjRhMGZiMzYwNTU2ZjlmNmFkMGMzZWYzYjU1
+    N2Y0ZTYyOGNkMWI4NjBlYTkxNTg1OTkxMjFmNDgzM2UwOGY4ZGFlMTU1Y2Ux
+    NWE1NGM2NDkwY2I3NzExOThhZTVjOTA2ZTU0YzQ4MDQ3ZWExZGE=
+  data.tar.gz: !binary |-
+    OWFiZDQ0ZWZkZThhZGIyMGNjYjAwNmE1YjFiM2Y4YjJkNGViNWMyNzIxZDVj
+    ODYwMDJiZmY3OGE3MDBhN2FjMjNkYTdiNTc0YWM2NjYwNmE1MDQyZTI0NDU2
+    MWNlNTdlMmE3MjYzNGZiY2YwNmE3Nzc3ZjMyMDM4YTBkOGE3ZjE=

data/lib/ridler/reader.rb

@@ -6,12 +6,18 @@ class Ridler::Reader
     @redis = Redis.new(:host => host, :port => port)
   end
 
-  def search( key )
-    result = nil
+  def search( *keys )
+    result = []
 
-    store = @redis.get(key)
+    keys.each do |key|
+      if @redis.exists(key)
+        data = JSON.parse(@redis.get(key))
 
-    result = JSON.parse(store)["log"].values.sort if store
+        data.each do |item|
+          result.push(item[1])
+        end
+      end
+    end
 
     result
   end

data/lib/ridler/writer.rb

@@ -1,6 +1,7 @@
+require 'date'
 require 'ridler'
 
-Struct.new("Entry",:store_key, :sort_key, :param_name, :param_value)
+Struct.new("Entry",:store_key, :timestamp, :param_name, :param_value)
 
 class Ridler::Writer
   @@redis = nil
@@ -24,7 +25,8 @@ class Ridler::Writer
     rip = /^(.+)\s[-a-z]+\sdhcpd:\s(([A-Z]+)\sfrom\s(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}).+)$/        
     data = rip.match( line ) unless data
     
-    result = Struct::Entry.new(data[4], data[1], data[3], data[2]) if data
+    timestamp = DateTime.parse(data[1]).to_time.to_i
+    result = Struct::Entry.new(data[4], timestamp, data[3], data[2]) if data
 
     result
   end
@@ -38,14 +40,11 @@ class Ridler::Writer
 
     if store
       store = JSON.parse(store)
-      store["count"] += 1
     else
       store = Hash.new
-      store["log"] = Hash.new
-      store["count"] = 0
     end
 
-    store["log"][data[:param_name]] = "%s %s" % [data[:sort_key], data[:param_value]]
+    store[data[:param_name]] = {timestamp: data[:timestamp], log: data[:param_value]}
 
     @@redis.set(store_key,store.to_json)
   end

data/lib/ridler.rb

@@ -2,5 +2,5 @@ require 'redis'
 require 'json'
 
 module Ridler
-  VERSION = '0.1.1.alpha'
+  VERSION = '0.1.1.beta'
 end

data/test/test_ridler.rb

@@ -20,11 +20,15 @@ class RidlerTest < Test::Unit::TestCase
   end
 
   def test_search_mac
-    assert_not_nil @reader.search("14:da:e9:96:26:3b")
+    assert_equal 2, @reader.search("14:da:e9:96:26:3b").count
   end
 
   def test_search_ip
-    assert_not_nil @reader.search("10.1.114.210")
+    assert_equal 1, @reader.search("10.1.114.210").count
+  end
+
+  def test_search_mac_ip
+    assert_equal 3, @reader.search("14:da:e9:96:26:3b","10.1.114.210").count
   end
 
   def teardown

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ridler
 version: !ruby/object:Gem::Version
-  version: 0.1.1.alpha
-  prerelease: 6
+  version: 0.1.1.beta
 platform: ruby
 authors:
 - Adam Kubica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -51,38 +46,37 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- Rakefile
 - LICENSE
+- Rakefile
 - bin/ridler
+- lib/ridler.rb
 - lib/ridler/reader.rb
 - lib/ridler/writer.rb
-- lib/ridler.rb
 - test/data/rsyslog_isc-dhcpd.log
 - test/test_ridler.rb
 homepage: http://github.org/caffecoder/ridler
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Redis ISC DHCP Log Entry Resolver
 test_files:
 - test/data/rsyslog_isc-dhcpd.log