gem-firewall 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 212cc75989d7c42720f2b20f4ca5b3909667d20e
-  data.tar.gz: b08472fadd74a539fedf15d083b06b6219251d22
+  metadata.gz: 10538f049bdf3b5bb0ca3171ee3c1db4458d136e
+  data.tar.gz: 75de8d77276e7861293129a904c6324c55da6272
 SHA512:
-  metadata.gz: f81cfb5d72f334dd2ecb71b531163b97e4a511f17043e005c674abed510769d1570f684bb37f92b896df698da44f2d0423765177f6298216d1925ef53c1b5d26
-  data.tar.gz: 5f313f93cc99ad51ecf26c175591b4e56b9c2758b6c0b911ddb4f1437458cd4911da4c31a7cae497a8dd967d8c91cc2b51297ddd3833c43a2cdaa06e690d47fd
+  metadata.gz: 1f4ca85a3debfd05e87f8d157fd5c6c201c63ab4fb0ed39014e8ce3db48dc653f6c618f3993fe68bfc966814f53910c5321ee66a66483567bd5ac54ad265d4ee
+  data.tar.gz: 9e468862086d1f8e280425a5213b7341a988977f59bd2ec95ce7a9ed9c0e1d2dab1fc43f6a0e17e2f33d3e62f0b7ecedd9620448f61b5116cbfb572210e628b9

data/README.md

@@ -63,6 +63,17 @@ fw.allowed?("192.168.1.1", true) # true
 fw.allowed?("192.168.1.1", false) # false
 ```
 
+or
+
+```
+fw = Firewall::Firewall.new(false)
+r = Firewall::ComplexRule.new("192.168.1.1", true, {value: true})
+fw.add_rule(r)
+
+fw.allowed?("192.168.1.1", true) # true
+fw.allowed?("192.168.1.1", false) # false
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/davidterranova/firewall/fork )

data/lib/complex_rule.rb

@@ -1,16 +1,19 @@
 module Firewall
   class ComplexRule < Rule
 
-    def initialize(ip, allowed, check = {delegate: nil, method: nil})
+    def initialize(ip, allowed, check = {delegate: nil, method: nil, value: nil})
       super(ip, allowed)
       @delegate = check[:delegate]
       @method = check[:method]
+      @value = check[:value]
     end
 
     def pass?(ip, value = nil)
       pass = false
       if @delegate
         pass = (super(ip) and (value == @delegate.send(@method)))
+      elsif @value
+        pass = (super(ip) and (value == @value))
       else
         pass = super(ip)
       end

data/lib/firewall/version.rb

@@ -1,3 +1,3 @@
 module Firewall
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/complex_rule_test.rb

@@ -51,5 +51,13 @@ class ComplexRuleTest < Minitest::Unit::TestCase
     assert_equal r1.pass?(ip2), false
   end
 
+  def test_complex_rule_with_value
+    ip = "192.168.1.10/24"
+
+    r1 = Firewall::ComplexRule.new(ip, true, {value: 'value'})
+    assert_equal r1.pass?(ip, 'value'), true
+    assert_equal r1.pass?(ip, 'plop'), false
+  end
+
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem-firewall
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Terranova David