patronus_fati 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f846c13ed96d628de8bb8f4cc5d4db5dba18a18f
-  data.tar.gz: 213e462efeca90304442a3cdd0567d788e0c5e44
+  metadata.gz: 07f850ac1cb0f1dd2f7dfb513bd4ce335fbbf6a4
+  data.tar.gz: fb8c5272dca78ebf66d505ccb899fc2de44637dc
 SHA512:
-  metadata.gz: c01c8e041b55e645506de4c3d1004afe258d19dd8208cc3b1e1f0e3b5a175fa387491fe8420cbcfdcfacc2a78d9ecc85a9aa2af432893b8fd5f4356b09dae912
-  data.tar.gz: 65fe59c2a5c91caa39d25c8aa1b8c7e9024a157f4e0af4159765b212ce61054baf0dbb20875db24cdd99732f6cf461649df98510aaf8444d9c810ac42b63f30d
+  metadata.gz: 16a3e594dea7679cf076e53fbd762d0387a34f81e9d94e7ced43d79045fae10f1b96a8ed85fb7cb9b5e0440917be279e9c04f9b841c0c868d84cf76bdcce0496
+  data.tar.gz: f723d26a1a9e1f143612efc29322a268d67f6a8cc7ba30d38280043b81d03e312052469ac672a4fa571b4f8e2ba3eb593ec8080b5df26e910e137ebde4f35d4f

data/lib/patronus_fati/data_models/access_point.rb

@@ -15,18 +15,6 @@ module PatronusFati::DataModels
     property  :max_seen_rate,     Integer
     property  :type,              String, :required => true
 
-    property  :duplicate_iv_pkts, Integer,  :default => 0
-    property  :crypt_packets,     Integer,  :default => 0
-    property  :data_packets,      Integer,  :default => 0
-    property  :data_size,         Integer,  :default => 0
-
-    property  :fragments,         Integer,  :default => 0
-    property  :retries,           Integer,  :default => 0
-
-    property  :range_ip,          String
-    property  :netmask,           String
-    property  :gateway_ip,        String
-
     has n, :clients,        :through    => :connections
     has n, :connections,    :constraint => :destroy,
                             :child_key  => :access_point_id

data/lib/patronus_fati/data_models/client.rb

@@ -8,19 +8,8 @@ module PatronusFati::DataModels
     property  :id,              Serial
     property  :bssid,           String,   :length => 17, :unique_index => true
     property  :channel,         Integer
-
-    property  :crypt_packets,   Integer,  :default => 0
-    property  :data_packets,    Integer,  :default => 0
-    property  :data_size,       Integer,  :default => 0
-    property  :fragments,       Integer,  :default => 0
-    property  :retries,         Integer,  :default => 0
-
     property  :max_seen_rate,   Integer
 
-    property  :ip,              String
-    property  :gateway_ip,      String
-    property  :dhcp_host,       String,   :length => 64
-
     has n, :connections,    :constraint => :destroy
     has n, :access_points,  :through    => :connections
 

data/lib/patronus_fati/data_models/connection.rb

@@ -7,7 +7,7 @@ module PatronusFati::DataModels
     property :id,               Serial
 
     property :connected_at,     Integer, :default => Proc.new { Time.now.to_i }
-    property :disconnected_at,  Integer, :default => Proc.new { Time.now.to_i }
+    property :disconnected_at,  Integer
     property :duration,         Integer
 
     belongs_to :access_point

data/lib/patronus_fati/message_processor/bssid.rb

@@ -23,21 +23,6 @@ module PatronusFati::MessageProcessor::Bssid
       bssid: attrs[:bssid],
       type: attrs[:type],
       channel: attrs[:channel],
-
-      crypt_packets: attrs[:cryptpackets],
-      data_packets: attrs[:datapackets],
-      data_size: attrs[:datasize],
-
-      fragments: attrs[:fragments],
-      retries: attrs[:retries],
-
-      max_seen_rate: attrs[:maxseenrate],
-      duplicate_iv_pkts: attrs[:dupeivpackets],
-
-      range_ip: attrs[:rangeip],
-      netmask: attrs[:netmaskip],
-      gateway_ip: attrs[:gatewayip],
-
       last_seen_at: Time.now.to_i
     }.reject { |_, v| v.nil? }
   end

data/lib/patronus_fati/message_processor/client.rb

@@ -31,20 +31,7 @@ module PatronusFati::MessageProcessor::Client
     {
       bssid: attrs[:mac],
       channel: attrs[:channel],
-
-      crypt_packets: attrs[:cryptpackets],
-      data_packets: attrs[:datapackets],
-      data_size: attrs[:datasize],
-
-      fragments: attrs[:fragments],
-      retries: attrs[:retries],
-
       max_seen_rate: attrs[:maxseenrate],
-
-      ip: attrs[:ip],
-      gateway_ip: attrs[:gatewayip],
-      dhcp_host: attrs[:dhcphost],
-
       last_seen_at: Time.now.to_i
     }.reject { |_, v| v.nil? }
   end

data/lib/patronus_fati/version.rb

@@ -1,3 +1,3 @@
 module PatronusFati
-  VERSION = '0.8.8'
+  VERSION = '0.8.9'
 end

data/spec/data_models/connection_spec.rb

@@ -1,86 +1,82 @@
 require 'spec_helper'
 
-RSpec.describe 'DataModels::Connection' do
-  subject { PatronusFati::DataModels::Connection }
-
+RSpec.describe PatronusFati::DataModels::Connection do
+  let(:ap_model) { PatronusFati::DataModels::AccessPoint }
   let(:client_model) { PatronusFati::DataModels::Client }
-  let(:unsaved_client) { client_model.new(bssid: '11:22:33:00:00:00') }
 
-  let(:ap_model) { PatronusFati::DataModels::AccessPoint }
   let(:unsaved_ap) { ap_model.new(bssid: '22:33:44:00:00:01', type: 'adhoc', channel: 6) }
+  let(:unsaved_client) { client_model.new(bssid: '11:22:33:00:00:00') }
 
-  let(:instance) { subject.new(client: unsaved_client, access_point: unsaved_ap) }
+  let(:instance) { described_class.new(client: unsaved_client, access_point: unsaved_ap) }
 
-  it { expect(subject).to have_property(:id) }
+  it { expect(described_class).to have_property(:id) }
 
-  it { expect(subject).to have_property(:connected_at) }
-  it { expect(subject).to have_property(:disconnected_at) }
+  it { expect(described_class).to have_property(:connected_at) }
+  it { expect(described_class).to have_property(:disconnected_at) }
 
-  it { expect(subject).to belong_to(:access_point) }
-  it { expect(subject).to belong_to(:client) }
+  it { expect(described_class).to belong_to(:access_point) }
+  it { expect(described_class).to belong_to(:client) }
 
-  context '#active?' do
+  context '#connected?' do
     it 'should be true when a disconnection hasn\'t been registered' do
       inst = instance
       inst.disconnected_at = nil
 
-      expect(inst).to be_active
+      expect(inst).to be_connected
     end
 
     it 'should be false when a disconnection has been registered' do
       inst = instance
       inst.disconnected_at = Time.now
 
-      expect(inst).to_not be_active
+      expect(inst).to_not be_connected
     end
   end
 
   context '#disconnect!' do
-    it 'should change an active instance to be inactive' do
+    it 'should change a connected instance to be disconnected' do
       inst = instance
       inst.save
 
-      expect(inst).to be_active
+      expect(inst).to be_connected
       inst.disconnect!
-      expect(inst).to_not be_active
+      expect(inst).to_not be_connected
     end
   end
 
-  context '#active scope' do
+  context '#connected scope' do
     it 'should include active connections' do
       inst = instance
       inst.save
 
-      expect(inst).to be_active
-      expect(subject.active).to include(inst)
+      expect(described_class.connected).to include(inst)
     end
 
-    it 'should not include inactive connections' do
+    it 'should not include disconnected connections' do
       inst = instance
       inst.save
       inst.disconnect!
 
-      expect(inst).to_not be_active
-      expect(subject.active).to_not include(inst)
+      expect(described_class.connected).to_not include(inst)
     end
   end
 
-  context '#inactive scope' do
-    it 'should not include active connections' do
+  context '#disconnected scope' do
+    it 'should not include disconnected connections' do
       inst = instance
       inst.save
 
-      expect(inst).to be_active
-      expect(subject.inactive).to_not include(inst)
+      expect(inst).to be_connected
+      expect(described_class.disconnected).to_not include(inst)
     end
 
-    it 'should include inactive connections' do
+    it 'should include disconnected connections' do
       inst = instance
       inst.save
       inst.disconnect!
 
-      expect(inst).to_not be_active
-      expect(subject.inactive).to include(inst)
+      expect(inst).to_not be_connected
+      expect(described_class.disconnected).to include(inst)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patronus_fati
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - Sam Stelfox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-constraints